@omercnet/paseo-omp 0.3.0 → 0.4.0-next.114.1

package/README.md

@@ -4,16 +4,30 @@ Community OMP integration for Paseo. The plugin registers the distinct `omp-plug
 
 > **Alpha preview:** persistence and protocol contracts are tested, but upgrades may still require re-importing sessions created by an earlier preview.
 
+## Screenshots
+
+Both PNGs come from the plugin's isolated Paseo development daemon at 2× pixel density. Browser
+DevTools rewrites local filesystem paths and verifies that no private organization names remain
+before capture.
+
+### Native plugin manager
+
+![OMP native plugin manager](https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-omp/docs/images/plugin-manager.png)
+
+### Typed OMP configuration
+
+![OMP typed configuration editor](https://raw.githubusercontent.com/omercnet/paseo-plugins/main/paseo-omp/docs/images/workspace-settings.png)
+
 ## Quick start
 
-Requirements: Paseo `>=0.8.0 <0.10.0`, OMP `18.1.15` or newer, and OMP RPC protocol v2. Paseo `0.9.0-beta.1` is recommended for npm-managed installation and the complete client integration.
+Requirements: Paseo `>=0.9.0-beta.1 <0.10.0`, OMP `18.1.15` or newer, and OMP RPC protocol v2. Paseo 0.9 is required for the Help report's supported copy and external-link APIs, nested provider-subagent ancestry, spawning-tool links, npm-managed installation, and the complete client integration.
 
 ```bash
 paseo plugin install npm:@omercnet/paseo-omp@<version>
 paseo plugin ls paseo-omp
 ```
 
-Open the **OMP** sidebar to review the provider-profile contract, choose which composer pills appear, browse and edit native scalar settings, manage OMP-native plugins, verify runtime health, and inspect storage and process diagnostics. Then create an agent and select **OMP Plugin**. Its optional **MCP** composer control runs OMP-native management commands in the current session; setup questions and authorization stay in that chat timeline, where OAuth can open in a workspace-scoped Paseo Browser or on the current device. Composer pill preferences are shared by clients connected to the same host; normal use requires no other plugin-specific settings.
+Open the **OMP** sidebar to review the provider-profile contract, choose which composer pills appear, browse and edit native scalar settings, manage OMP-native plugins, verify runtime health, and generate a bounded support report under **Help**. The same tabs are available in the workspace OMP panel, except for the global Composer preference tab. Then create an agent and select **OMP Plugin**. Its optional **MCP** composer control runs OMP-native management commands in the current session; setup questions and authorization stay in that chat timeline, where OAuth can open in a workspace-scoped Paseo Browser or on the current device. Composer pill preferences are shared by clients connected to the same host; normal use requires no other plugin-specific settings.
 
 - [Install, update, rollback, and local development](docs/installation.md)
 - [Configuration and every provider option](docs/configuration.md)
@@ -22,13 +36,13 @@ Open the **OMP** sidebar to review the provider-profile contract, choose which c
 - [Core-provider issue and parity audit](docs/core-provider-issue-audit.md)
 - [Alpha release checklist](docs/alpha-release-checklist.md)
 
-The plugin uses public Paseo 0.8 and 0.9 beta provider contracts and registers distinct `omp-plugin` and `omp-plugin-<profile>` identities; it does not modify the bundled `omp` provider.
+The plugin uses public Paseo 0.9 beta provider and client contracts and registers distinct `omp-plugin` and `omp-plugin-<profile>` identities; it does not modify the bundled `omp` provider.
 
 ## Named OMP profiles
 
 At startup the plugin discovers directory names under `~/.omp/profiles/` (or `PI_CONFIG_DIR`) and registers **OMP · <profile>** for each valid lowercase name. Select that provider when creating a profile-backed agent. Discovery, launch, recovery and persisted session listing share its fixed profile and session root. Matching command wrappers, including Doppler, remain supported; conflicting profile or session-directory overrides fail before launch. Plain `env NAME=value omp` wrappers are supported, but environment-control flags such as `env -i` and `env -u` are rejected because they can discard the selected store. Profile-specific XDG roots cannot be overridden by per-launch environment values. Reload the plugin after adding a profile.
 
-Paseo 0.8 does not pass agent launch options to its model picker. Separate provider identities let the picker request the correct profile catalog before an agent exists. Existing `omp-plugin` and bundled `omp` agents retain their provider; they are not migrated automatically. Profile names use OMP's lowercase grammar, including dotted names such as `team.prod`.
+Separate provider identities let the model picker request the correct profile catalog before an agent exists. Existing `omp-plugin` and bundled `omp` agents retain their provider; they are not migrated automatically. Profile names use OMP's lowercase grammar, including dotted names such as `team.prod`.
 
 The OMP sidebar and memory panel expose an explicit store selector. Settings, plugins, quota, history, memory and diagnostics use that selection, and profile-agent popovers derive it from the provider ID. OMP-compatible XDG data and state roots are honored when a migrated profile uses them. Default-provider views are labelled **Daemon default store**; changing `providerOptions.command` on the default provider does not make those views profile-aware. Workspace configuration remains project-scoped, with the selected profile supplying inherited settings. Hub records are daemon-wide. The RPCs also accept an explicit absolute `store.agentDir` for custom stores; it is mutually exclusive with `store.profile`.
 
@@ -99,7 +113,7 @@ Existing agents whose provider is `omp` remain owned by the bundled provider. Ne
 
 OMP `18.1.15` is the oldest version tested end to end. The direct provider's hard compatibility gate is `rpc-ui` protocol v2: metadata-free legacy ready frames and v1-only runtimes are rejected before a provider session opens because they cannot support the advertised persistence and conversation-rewind capabilities. Typed tool approvals remain capability-gated and fall back as described above. For terminal completion, a matching `agent_end.requestId` is authoritative and mismatches are ignored before state changes. Released OMP 18.2.x builds that omit that field use an ordered fallback requiring a fresh correlated native user entry followed by current-turn assistant activity, an idle non-compacting runtime, and no conflicting permission, tool, steer, or child-session work. Ambiguous events while OMP is active are ignored; unresolved ambiguity after confirmed idle fails only the Paseo turn. This trades a bounded residual same-agent stale-event risk for compatibility with released OMP instead of terminating and lazily restarting the runtime after every later prompt. Paseo clients, including mobile clients inside reconnect grace, do not own or terminate the daemon-managed OMP session.
 
-Paseo 0.9.0-beta.1 is the canary target and provides npm-managed plugin sources, platform-owned external URL opening, and whole-item timeline transforms before Overview grouping. Paseo 0.8.x remains supported for provider operation and Git or directory installation; its clients do not provide the external URL opener and retain their older timeline presentation semantics.
+Paseo 0.9.0-beta.1 is the verified canary target and minimum supported release. It preserves nested provider-subagent ancestry and spawning-tool links, and provides npm-managed plugin sources, platform-owned external URL opening, and whole-item timeline transforms before Overview grouping. The required full Docker canary passes there with OMP 18.1.15 and 18.2.0.
 
 Install, update, disable, or remove `paseo-omp` independently of the bundled provider. Verify the provider snapshot contains `omp-plugin` after installation; a bundled `omp` entry may remain present and is not modified by this plugin.
 

package/client/omp-config-surface.tsx

@@ -5,7 +5,8 @@ import {
   useRpc,
   useWorkspace,
 } from "@getpaseo/plugin/client";
-import { Icon, TextInput } from "@getpaseo/plugin/client/react-native";
+import { copyText, Icon, TextInput } from "@getpaseo/plugin/client/react-native";
+import { ExternalLink } from "@getpaseo/plugin/client/ui";
 import { useIsMutating, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { ReactNode } from "react";
 import { useCallback, useMemo, useState } from "react";
@@ -13,20 +14,24 @@ import type { TextStyle, ViewStyle } from "react-native";
 import { Pressable, ScrollView, Switch, Text, View } from "react-native";
 import type { ComposerPillSettings } from "../shared/composer-pill-settings";
 import { listOmpConfig, type OmpConfig } from "../shared/omp-config";
+import { listOmpModels } from "../shared/omp-models";
 import {
   categorizeOmpSetting,
   formatOmpSettingLabel,
+  isOmpStructuredSettingPath,
   listOmpSettings,
   OMP_SETTING_CATEGORIES,
-  type OmpScalarValue,
   type OmpSetting,
   type OmpSettingCategory,
+  parseOmpStructuredSettingValue,
   updateOmpSettings,
 } from "../shared/omp-settings";
 import { type OmpStore, storeLabel } from "../shared/omp-store";
 import { getOmpProviderHealth, type OmpProviderHealth } from "../shared/provider-diagnostics";
+import { getOmpSupportReport, OMP_SUPPORT_ISSUE_URL } from "../shared/support-diagnostics";
 import { ComposerPillSettingsSection } from "./composer-pill-settings";
 import { openOmpExternalUrl } from "./external-url";
+import { type OmpConfigSurfaceView as SurfaceView, surfaceViewsForScope } from "./omp-config-views";
 import {
   documentationForSettingCategory,
   documentationForSettingPath,
@@ -34,7 +39,9 @@ import {
   OMP_SETTINGS_REFERENCE,
   type OmpDocumentationLink,
 } from "./omp-doc-links";
+import { normalizeOmpModels } from "./omp-model-picker-state";
 import { OmpPluginManagerSection } from "./omp-plugin-manager";
+import { type OmpModelCatalogState, StructuredRoutingEditor } from "./omp-routing-editor";
 import { OmpStorePicker } from "./omp-store-picker";
 import { ompStoreKey } from "./omp-store-state";
 import {
@@ -56,6 +63,11 @@ import {
   summarizeProviderStatus,
   summarizeRpcUiSupport,
 } from "./provider-diagnostics-state";
+import {
+  refreshSupportReport,
+  type SupportReportCopyState,
+  supportDiagnosticsViewState,
+} from "./support-diagnostics-state";
 
 const SETTINGS_QUERY_KEY = ["paseo-omp", "settings"] as const;
 const CONFIG_POLL_MS = 30_000;
@@ -91,6 +103,10 @@ export interface OmpConfigStyles {
   docLinkPressed: ViewStyle;
   docLinkText: TextStyle;
   refreshLabel: TextStyle;
+  helpActions: ViewStyle;
+  helpReport: ViewStyle;
+  helpReportText: TextStyle;
+  helpLinkText: TextStyle;
   card: ViewStyle;
   cardHeader: ViewStyle;
   cardTitle: TextStyle;
@@ -215,6 +231,26 @@ function useConfigStyles(theme: PluginSurfaceProps["theme"], compact: boolean):
         backgroundColor: theme.colors.surface1,
       },
       refreshLabel: { color: theme.colors.foreground, fontSize: 13 },
+      helpActions: {
+        flexDirection: "row",
+        alignItems: "center",
+        flexWrap: "wrap",
+        gap: 8,
+      },
+      helpReport: {
+        maxWidth: "100%",
+        padding: compact ? 10 : 12,
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        borderRadius: 10,
+        backgroundColor: theme.colors.surface1,
+      },
+      helpReportText: {
+        color: theme.colors.foreground,
+        fontSize: compact ? 11 : 12,
+        lineHeight: compact ? 16 : 18,
+      },
+      helpLinkText: { color: theme.colors.accent, fontSize: 13, fontWeight: "600" },
       cardHeader: {
         flexDirection: "row",
         alignItems: "center",
@@ -691,6 +727,131 @@ function ProviderHealthSection({
   );
 }
 
+function SupportDiagnosticsSection({
+  theme,
+  styles,
+  cwd,
+  store,
+}: {
+  theme: PluginSurfaceProps["theme"];
+  styles: OmpConfigStyles;
+  cwd?: string;
+  store?: OmpStore;
+}) {
+  const loadReport = useRpc(getOmpSupportReport);
+  const queryClient = useQueryClient();
+  const context = { store, ...(cwd ? { cwd } : {}) };
+  const queryKey = ["paseo-omp", "support-report", ompStoreKey(store), cwd ?? "global"];
+  const report = useQuery({
+    queryKey,
+    queryFn: () => loadReport(context),
+    staleTime: Number.POSITIVE_INFINITY,
+    retry: false,
+  });
+  const refreshReport = useMutation({
+    mutationFn: () => refreshSupportReport(loadReport, context),
+    onSuccess: (value) => queryClient.setQueryData(queryKey, value),
+  });
+  const [copyState, setCopyState] = useState<SupportReportCopyState>("idle");
+  const [linkError, setLinkError] = useState(false);
+  const viewState = supportDiagnosticsViewState({
+    loading: report.isLoading,
+    refreshing: refreshReport.isPending || (report.isFetching && !report.isLoading),
+    hasReport: Boolean(report.data?.report),
+    reportFailed: Boolean(report.error || refreshReport.error),
+    copyState,
+  });
+
+  const refresh = () => {
+    setCopyState("idle");
+    refreshReport.mutate();
+  };
+  const copyReport = async () => {
+    if (!report.data?.report) return;
+    setCopyState("copying");
+    try {
+      await copyText(report.data.report);
+      setCopyState("copied");
+    } catch {
+      setCopyState("error");
+    }
+  };
+
+  return (
+    <>
+      <View style={styles.sectionHeader}>
+        <Text style={styles.sectionTitle}>Support diagnostics</Text>
+        <Text style={styles.muted}>
+          Safe OMP runtime, compatibility, storage-state, and protocol counters for maintainers.
+        </Text>
+      </View>
+      <View style={styles.helpActions}>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel="Refresh OMP support report"
+          disabled={report.isFetching || refreshReport.isPending}
+          onPress={refresh}
+          style={styles.refresh}
+        >
+          <Icon name="RefreshCw" size={14} color={theme.colors.foreground} />
+          <Text style={styles.refreshLabel}>{viewState.refreshLabel}</Text>
+        </Pressable>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel="Copy OMP support report"
+          disabled={viewState.copyDisabled}
+          onPress={() => void copyReport()}
+          style={[styles.refresh, viewState.copyDisabled ? { opacity: 0.55 } : null]}
+        >
+          <Icon name="Copy" size={14} color={theme.colors.foreground} />
+          <Text style={styles.refreshLabel}>{viewState.copyLabel}</Text>
+        </Pressable>
+        <ExternalLink
+          href={OMP_SUPPORT_ISSUE_URL}
+          accessibilityLabel="Create paseo-omp GitHub issue"
+          onError={() => setLinkError(true)}
+        >
+          <Text style={styles.helpLinkText}>Create GitHub issue</Text>
+        </ExternalLink>
+      </View>
+      <Text style={styles.muted}>
+        Review before sharing. The report excludes prompts, transcripts, credentials, commands,
+        URLs, repository names, and private paths.
+      </Text>
+      {viewState.loadingMessage ? (
+        <Text accessibilityLiveRegion="polite" style={styles.muted}>
+          {viewState.loadingMessage}
+        </Text>
+      ) : null}
+      {viewState.reportError ? (
+        <Text accessibilityRole="alert" style={styles.error}>
+          {viewState.reportError}
+        </Text>
+      ) : null}
+      {viewState.copyFeedback ? (
+        <Text
+          accessibilityLiveRegion="polite"
+          style={copyState === "error" ? styles.error : styles.muted}
+        >
+          {viewState.copyFeedback}
+        </Text>
+      ) : null}
+      {linkError ? (
+        <Text accessibilityRole="alert" style={styles.error}>
+          Could not open GitHub. Copy the report and open the issue tracker manually.
+        </Text>
+      ) : null}
+      {report.data?.report ? (
+        <View style={styles.helpReport}>
+          <Text selectable style={styles.helpReportText}>
+            {report.data.report}
+          </Text>
+        </View>
+      ) : null}
+    </>
+  );
+}
+
 const CATEGORY_LABELS: Record<OmpSettingCategory, string> = {
   appearance: "Appearance",
   model: "Model",
@@ -736,16 +897,6 @@ function fallbackSettingsFromConfig(config: OmpConfig | null | undefined): OmpSe
   return settings;
 }
 
-type SurfaceView = "overview" | "plugin" | "plugins" | "composer" | "configuration" | "diagnostics";
-const SURFACE_VIEWS: readonly { id: SurfaceView; label: string }[] = [
-  { id: "overview", label: "Overview" },
-  { id: "plugin", label: "Plugin" },
-  { id: "plugins", label: "OMP plugins" },
-  { id: "composer", label: "Composer" },
-  { id: "configuration", label: "Configuration" },
-  { id: "diagnostics", label: "Diagnostics" },
-];
-
 function formatScalarValue(value: unknown): string {
   if (value === undefined || value === null) return "Not set";
   if (typeof value === "boolean") return value ? "Enabled" : "Disabled";
@@ -834,7 +985,7 @@ function StructuredSettingValue({
   );
 }
 
-type SettingDraft = { operation: "set"; value: string | boolean } | { operation: "reset" };
+type SettingDraft = { operation: "set"; value: unknown } | { operation: "reset" };
 
 function EditableScalarValue({
   setting,
@@ -891,6 +1042,9 @@ function ConfigurationCategory({
   styles,
   settings,
   drafts,
+  theme,
+  modelCatalog,
+  modelRoles,
   disabled,
   workspaceScoped,
   onDraft,
@@ -898,6 +1052,9 @@ function ConfigurationCategory({
 }: {
   category: { id: OmpSettingCategory; label: string };
   styles: OmpConfigStyles;
+  theme: PluginSurfaceProps["theme"];
+  modelCatalog: OmpModelCatalogState;
+  modelRoles: Readonly<Record<string, unknown>>;
   settings: readonly OmpSetting[];
   drafts: Readonly<Record<string, SettingDraft>>;
   disabled: boolean;
@@ -926,7 +1083,12 @@ function ConfigurationCategory({
           (setting.value !== null && typeof setting.value === "object");
         const editable =
           !setting.redacted && ["boolean", "number", "string", "enum"].includes(setting.type);
+        const structuredEditable =
+          !setting.redacted &&
+          isOmpStructuredSettingPath(setting.path) &&
+          setting.type === (setting.path === "cycleOrder" ? "array" : "record");
         const settingDocumentation = documentationForSettingPath(setting.path);
+        const draft = drafts[setting.path];
         return (
           <View key={setting.path} style={styles.setting}>
             <View style={styles.settingHeader}>
@@ -934,7 +1096,7 @@ function ConfigurationCategory({
               {setting.workspaceOverride ? (
                 <Text style={styles.source}>Workspace override</Text>
               ) : null}
-              {!complex && !editable ? (
+              {!complex && !editable && !structuredEditable ? (
                 <StructuredSettingValue setting={setting} styles={styles} />
               ) : null}
             </View>
@@ -953,7 +1115,7 @@ function ConfigurationCategory({
             {editable ? (
               <EditableScalarValue
                 setting={setting}
-                draft={drafts[setting.path]}
+                draft={draft}
                 disabled={disabled}
                 resetLabel={workspaceScoped ? "Remove workspace override" : "Reset to default"}
                 showReset={!workspaceScoped || setting.workspaceOverride === true}
@@ -961,6 +1123,21 @@ function ConfigurationCategory({
                 onSet={(value) => onDraft(setting.path, { operation: "set", value })}
                 onReset={() => onDraft(setting.path, { operation: "reset" })}
               />
+            ) : structuredEditable ? (
+              <StructuredRoutingEditor
+                setting={setting}
+                value={draft?.operation === "set" ? draft.value : setting.value}
+                disabled={disabled}
+                resetLabel={workspaceScoped ? "Remove workspace override" : "Reset to default"}
+                showReset={!workspaceScoped || setting.workspaceOverride === true}
+                resetPending={draft?.operation === "reset"}
+                styles={styles}
+                theme={theme}
+                modelCatalog={modelCatalog}
+                modelRoles={modelRoles}
+                onSet={(value) => onDraft(setting.path, { operation: "set", value })}
+                onReset={() => onDraft(setting.path, { operation: "reset" })}
+              />
             ) : complex ? (
               <StructuredSettingValue setting={setting} styles={styles} />
             ) : null}
@@ -1022,6 +1199,7 @@ function OmpConfigContent({
   const loadConfig = useRpc(listOmpConfig);
   const loadSettings = useRpc(listOmpSettings);
   const updateSettings = useRpc(updateOmpSettings);
+  const loadModels = useRpc(listOmpModels);
   const queryClient = useQueryClient();
   const context = { store, ...(cwd ? { cwd } : {}) };
   const pendingMutations = useIsMutating({ mutationKey: ["paseo-omp"] });
@@ -1036,6 +1214,11 @@ function OmpConfigContent({
     queryFn: () => loadSettings(context),
     staleTime: Number.POSITIVE_INFINITY,
   });
+  const modelsQuery = useQuery({
+    queryKey: ["paseo-omp", "models", ompStoreKey(store), cwd ?? "global"],
+    queryFn: () => loadModels(context),
+    staleTime: 30_000,
+  });
   const [view, setView] = useState<SurfaceView>("overview");
   const [activeCategory, setActiveCategory] = useState<OmpSettingCategory>("appearance");
   const [search, setSearch] = useState("");
@@ -1043,9 +1226,7 @@ function OmpConfigContent({
   const [documentationError, setDocumentationError] = useState<string | null>(null);
   const styles = useConfigStyles(theme, layout.compact);
   const normalizedSearch = search.trim().toLocaleLowerCase();
-  const surfaceViews = cwd
-    ? SURFACE_VIEWS.filter((candidate) => candidate.id !== "composer")
-    : SURFACE_VIEWS;
+  const surfaceViews = surfaceViewsForScope(cwd !== undefined);
   const catalog = useMemo(() => {
     const sourceSettings = settingsQuery.data?.available
       ? settingsQuery.data.settings
@@ -1065,6 +1246,24 @@ function OmpConfigContent({
     }
     return { sourceSettings, matching, byCategory };
   }, [configQuery.data?.config, normalizedSearch, settingsQuery.data]);
+  const modelCatalog: OmpModelCatalogState = {
+    models: normalizeOmpModels(modelsQuery.data?.models ?? []),
+    loading: modelsQuery.isLoading,
+    ...(modelsQuery.error
+      ? { error: "Could not list OMP models. Freeform selectors remain available." }
+      : {}),
+  };
+  const modelRolesValue = drafts.modelRoles
+    ? drafts.modelRoles.operation === "set"
+      ? drafts.modelRoles.value
+      : undefined
+    : catalog.sourceSettings.find((setting) => setting.path === "modelRoles")?.value;
+  const modelRoles =
+    modelRolesValue !== null &&
+    typeof modelRolesValue === "object" &&
+    !Array.isArray(modelRolesValue)
+      ? (modelRolesValue as Readonly<Record<string, unknown>>)
+      : {};
   const visibleCategories = CONFIG_CATEGORIES.filter(
     (category) => (catalog.byCategory.get(category.id)?.length ?? 0) > 0,
   );
@@ -1089,8 +1288,12 @@ function OmpConfigContent({
         if (draft.operation === "reset") return { operation: "reset" as const, path };
         const setting = byPath.get(path);
         if (!setting) throw new Error(`Setting ${path} is no longer available.`);
-        let value: OmpScalarValue = draft.value;
-        if (setting.type === "number") {
+        let value: unknown = draft.value;
+        if (isOmpStructuredSettingPath(path)) {
+          const parsed = parseOmpStructuredSettingValue(path, value);
+          if (parsed === undefined) throw new Error(`${path} contains invalid routing values.`);
+          value = parsed;
+        } else if (setting.type === "number") {
           const raw = String(draft.value).trim();
           if (!raw) throw new Error(`${path} requires a number.`);
           const parsed = Number(raw);
@@ -1099,7 +1302,8 @@ function OmpConfigContent({
         }
         return { operation: "set" as const, path, value };
       });
-      return updateSettings({ ...context, revision, changes });
+      const input = updateOmpSettings.input.parse({ ...context, revision, changes });
+      return updateSettings(input);
     },
     onSuccess: (result) => {
       queryClient.setQueryData(settingsQueryKey, result.catalog);
@@ -1212,6 +1416,10 @@ function OmpConfigContent({
         <ProviderHealthSection theme={theme} styles={styles} cwd={cwd} store={store} />
       ) : null}
 
+      {view === "help" ? (
+        <SupportDiagnosticsSection theme={theme} styles={styles} cwd={cwd} store={store} />
+      ) : null}
+
       {view === "configuration" ? (
         <>
           <View style={styles.sectionHeader}>
@@ -1221,14 +1429,22 @@ function OmpConfigContent({
                 accessibilityRole="button"
                 accessibilityLabel="Refresh OMP configuration"
                 style={styles.refresh}
-                disabled={configQuery.isFetching || settingsQuery.isFetching}
+                disabled={
+                  configQuery.isFetching || settingsQuery.isFetching || modelsQuery.isFetching
+                }
                 onPress={() => {
-                  void Promise.all([configQuery.refetch(), settingsQuery.refetch()]);
+                  void Promise.all([
+                    configQuery.refetch(),
+                    settingsQuery.refetch(),
+                    modelsQuery.refetch(),
+                  ]);
                 }}
               >
                 <Icon name="RefreshCw" size={14} color={theme.colors.foreground} />
                 <Text style={styles.refreshLabel}>
-                  {configQuery.isFetching || settingsQuery.isFetching ? "Refreshing…" : "Refresh"}
+                  {configQuery.isFetching || settingsQuery.isFetching || modelsQuery.isFetching
+                    ? "Refreshing…"
+                    : "Refresh"}
                 </Text>
               </Pressable>
             </View>
@@ -1364,6 +1580,9 @@ function OmpConfigContent({
                 {selectedCategory ? (
                   <ConfigurationCategory
                     category={selectedCategory}
+                    theme={theme}
+                    modelCatalog={modelCatalog}
+                    modelRoles={modelRoles}
                     styles={styles}
                     settings={catalog.byCategory.get(selectedCategory.id) ?? []}
                     drafts={drafts}

package/client/omp-config-views.ts

@@ -0,0 +1,24 @@
+export type OmpConfigSurfaceView =
+  | "overview"
+  | "plugin"
+  | "plugins"
+  | "composer"
+  | "configuration"
+  | "diagnostics"
+  | "help";
+
+const SURFACE_VIEWS: readonly { id: OmpConfigSurfaceView; label: string }[] = [
+  { id: "overview", label: "Overview" },
+  { id: "plugin", label: "Plugin" },
+  { id: "plugins", label: "OMP plugins" },
+  { id: "composer", label: "Composer" },
+  { id: "configuration", label: "Configuration" },
+  { id: "diagnostics", label: "Diagnostics" },
+  { id: "help", label: "Help" },
+];
+
+export function surfaceViewsForScope(workspaceScoped: boolean) {
+  return workspaceScoped
+    ? SURFACE_VIEWS.filter((candidate) => candidate.id !== "composer")
+    : SURFACE_VIEWS;
+}

package/client/omp-model-picker-state.ts

@@ -0,0 +1,145 @@
+import type { OmpModelCandidate } from "../shared/omp-models";
+import { isValidOmpModelSelector } from "../shared/omp-settings";
+
+export const OMP_MODEL_PICKER_RESULT_LIMIT = 8;
+
+export type OmpModelPickerModel = {
+  selector: string;
+  label: string;
+  provider: string;
+  reasoning: boolean;
+  imageInput: boolean;
+  contextWindow?: number;
+  thinkingLevels: readonly string[];
+};
+
+export type OmpModelPickerChoice =
+  | { kind: "alias"; selector: `@${string}`; label: string }
+  | { kind: "model"; model: OmpModelPickerModel; recommended: boolean };
+
+const REASONING_ROLES: Readonly<Record<string, true>> = {
+  default: true,
+  task: true,
+  plan: true,
+  slow: true,
+  advisor: true,
+  reviewer: true,
+};
+
+export function roleCapabilityMatch(role: string, model: OmpModelPickerModel): boolean | undefined {
+  const normalizedRole = role.trim().toLocaleLowerCase();
+  if (normalizedRole === "vision") return model.imageInput;
+  if (REASONING_ROLES[normalizedRole]) return model.reasoning;
+  return undefined;
+}
+
+export function normalizeOmpModels(models: readonly OmpModelCandidate[]): OmpModelPickerModel[] {
+  return models.map((model) => ({
+    selector: model.selector,
+    label: model.name || model.id,
+    provider: model.provider,
+    reasoning: model.reasoning,
+    imageInput: model.input.some((input) => input.toLocaleLowerCase() === "image"),
+    ...(model.contextWindow === null || model.contextWindow === undefined
+      ? {}
+      : { contextWindow: model.contextWindow }),
+    thinkingLevels: model.thinkingLevels,
+  }));
+}
+
+export function aliasChoices(
+  modelRoles: Readonly<Record<string, unknown>>,
+  currentRole?: string,
+): OmpModelPickerChoice[] {
+  return Object.keys(modelRoles)
+    .filter((role) => role.length > 0 && role !== currentRole)
+    .sort((left, right) => left.localeCompare(right))
+    .map((role) => ({ kind: "alias" as const, selector: `@${role}` as const, label: role }));
+}
+
+function choiceSearchText(choice: OmpModelPickerChoice): string {
+  if (choice.kind === "alias") return `${choice.label} ${choice.selector}`;
+  const model = choice.model;
+  return [
+    model.label,
+    model.selector,
+    model.provider,
+    model.reasoning ? "reasoning" : "standard",
+    model.imageInput ? "image vision" : "text",
+    model.contextWindow?.toString() ?? "",
+    ...model.thinkingLevels,
+  ].join(" ");
+}
+
+export function filterModelChoices(
+  models: readonly OmpModelPickerModel[],
+  aliases: readonly OmpModelPickerChoice[],
+  query: string,
+  role: string,
+  limit = OMP_MODEL_PICKER_RESULT_LIMIT,
+): OmpModelPickerChoice[] {
+  const normalizedQuery = query.trim().toLocaleLowerCase();
+  const choices: OmpModelPickerChoice[] = [
+    ...aliases,
+    ...models.map((model) => ({
+      kind: "model" as const,
+      model,
+      recommended: roleCapabilityMatch(role, model) === true,
+    })),
+  ];
+  return choices
+    .filter(
+      (choice) =>
+        normalizedQuery.length === 0 ||
+        choiceSearchText(choice).toLocaleLowerCase().includes(normalizedQuery),
+    )
+    .sort((left, right) => {
+      const leftRecommended = left.kind === "model" && left.recommended;
+      const rightRecommended = right.kind === "model" && right.recommended;
+      if (leftRecommended !== rightRecommended) return leftRecommended ? -1 : 1;
+      if (left.kind !== right.kind) return left.kind === "alias" ? -1 : 1;
+      return choiceSearchText(left).localeCompare(choiceSearchText(right));
+    })
+    .slice(0, Math.max(0, limit));
+}
+
+export function formatModelSelector(selector: string, thinkingLevel?: string): string {
+  return thinkingLevel ? `${selector}:${thinkingLevel}` : selector;
+}
+
+export type OmpThinkingSelectorChoice = {
+  selector: string;
+  available: boolean;
+};
+
+export function thinkingSelectorChoice(
+  selector: string,
+  thinkingLevel: string,
+): OmpThinkingSelectorChoice {
+  const suffixedSelector = formatModelSelector(selector, thinkingLevel);
+  return {
+    selector: suffixedSelector,
+    available: isValidOmpModelSelector(suffixedSelector),
+  };
+}
+
+export function updatePickerValue(
+  currentValue: string | readonly string[],
+  selector: string,
+  mode: "replace" | "append",
+): string | string[] {
+  if (mode === "replace") return selector;
+  const current = typeof currentValue === "string" ? [currentValue] : [...currentValue];
+  if (current.includes(selector)) return current;
+  return [...current, selector];
+}
+
+export function commitPickerSelection(
+  disabled: boolean,
+  selector: string,
+  onSelect: (selector: string) => void,
+): boolean {
+  if (disabled) return false;
+  onSelect(selector);
+  return true;
+}