@omercnet/paseo-omp 0.2.1 → 0.3.0-next.91.1

package/client/mcp-popover.tsx

@@ -0,0 +1,155 @@
+import { type PluginButtonContentProps, useAgent, usePaseo } from "@getpaseo/plugin/client";
+import { TextInput } from "@getpaseo/plugin/client/react-native";
+import { useMemo, useState } from "react";
+import { Pressable, Text, View } from "react-native";
+import { buildOmpMcpServerCommand, type OmpMcpServerAction } from "../shared/mcp";
+
+import { isOmpPluginProvider } from "./omp-store-state";
+
+const GENERAL_ACTIONS = [
+  { label: "List servers", command: "/mcp list" },
+  { label: "Add server", command: "/mcp add" },
+  { label: "Reload", command: "/mcp reload" },
+  { label: "Resources", command: "/mcp resources" },
+  { label: "Prompts", command: "/mcp prompts" },
+  { label: "Notifications", command: "/mcp notifications" },
+] as const;
+
+const SERVER_ACTIONS: ReadonlyArray<{ label: string; action: OmpMcpServerAction }> = [
+  { label: "Test", action: "test" },
+  { label: "Authorize", action: "reauth" },
+  { label: "Enable", action: "enable" },
+  { label: "Disable", action: "disable" },
+];
+
+export function McpPopover(props: PluginButtonContentProps) {
+  const { theme, layout, close } = props;
+  const agentId = props.context === "agent" ? props.agentId : "";
+  const agent = useAgent(agentId, ({ provider, status }) => ({ provider, status }));
+  const paseo = usePaseo();
+  const [serverName, setServerName] = useState("");
+  const [pendingCommand, setPendingCommand] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const styles = useMemo(
+    () => ({
+      root: { gap: layout.compact ? 10 : 12, width: layout.compact ? undefined : 340 },
+      title: { color: theme.colors.foreground, fontSize: 14, fontWeight: "700" as const },
+      muted: { color: theme.colors.foregroundMuted, fontSize: 12, lineHeight: 17 },
+      error: { color: theme.colors.statusDanger, fontSize: 12 },
+      actions: { flexDirection: "row" as const, flexWrap: "wrap" as const, gap: 7 },
+      action: {
+        paddingHorizontal: 10,
+        paddingVertical: 8,
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        borderRadius: 8,
+        backgroundColor: theme.colors.surface1,
+      },
+      actionPressed: { opacity: 0.72 },
+      actionDisabled: { opacity: 0.45 },
+      actionText: { color: theme.colors.foreground, fontSize: 12, fontWeight: "600" as const },
+      input: {
+        color: theme.colors.foreground,
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        borderRadius: 8,
+        backgroundColor: theme.colors.surface0,
+        paddingHorizontal: 10,
+        paddingVertical: 8,
+        fontSize: 13,
+      },
+    }),
+    [layout.compact, theme],
+  );
+
+  const targetCommands = SERVER_ACTIONS.map(({ label, action }) => ({
+    label,
+    command: buildOmpMcpServerCommand(action, serverName),
+  }));
+  const unavailable = !isOmpPluginProvider(agent?.provider);
+
+  async function send(command: string): Promise<void> {
+    setPendingCommand(command);
+    setError(null);
+    try {
+      await paseo.agents.ref(agentId).send(command);
+      close();
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "Could not send the OMP MCP command.");
+    } finally {
+      setPendingCommand(null);
+    }
+  }
+
+  if (unavailable)
+    return <Text style={styles.muted}>MCP controls require an OMP Plugin agent.</Text>;
+
+  return (
+    <View style={styles.root}>
+      <Text style={styles.title}>OMP MCP</Text>
+      <Text style={styles.muted}>
+        Commands run in this OMP session. Results, setup questions, and authorization stay in the
+        chat timeline so they remain usable from remote and mobile clients.
+      </Text>
+      <View style={styles.actions}>
+        {GENERAL_ACTIONS.map((action) => (
+          <Pressable
+            key={action.command}
+            accessibilityRole="button"
+            accessibilityLabel={action.label}
+            disabled={pendingCommand !== null}
+            onPress={() => void send(action.command)}
+            style={({ pressed }) => [
+              styles.action,
+              pressed ? styles.actionPressed : null,
+              pendingCommand !== null ? styles.actionDisabled : null,
+            ]}
+          >
+            <Text style={styles.actionText}>
+              {pendingCommand === action.command ? "Sending…" : action.label}
+            </Text>
+          </Pressable>
+        ))}
+      </View>
+      <TextInput
+        accessibilityLabel="OMP MCP server name"
+        autoCapitalize="none"
+        autoCorrect={false}
+        onChangeText={setServerName}
+        placeholder="Server name"
+        placeholderTextColor={theme.colors.foregroundMuted}
+        style={styles.input}
+        value={serverName}
+      />
+      <View style={styles.actions}>
+        {targetCommands.map((action) => (
+          <Pressable
+            key={action.label}
+            accessibilityRole="button"
+            accessibilityLabel={`${action.label} MCP server`}
+            disabled={!action.command || pendingCommand !== null}
+            onPress={() => action.command && void send(action.command)}
+            style={({ pressed }) => [
+              styles.action,
+              pressed ? styles.actionPressed : null,
+              !action.command || pendingCommand !== null ? styles.actionDisabled : null,
+            ]}
+          >
+            <Text style={styles.actionText}>
+              {pendingCommand === action.command ? "Sending…" : action.label}
+            </Text>
+          </Pressable>
+        ))}
+      </View>
+      {agent?.status === "running" ? (
+        <Text style={styles.muted}>The command may wait until the active turn finishes.</Text>
+      ) : null}
+      {serverName.trim() && targetCommands.every((action) => !action.command) ? (
+        <Text style={styles.error}>
+          Server names may contain letters, numbers, dash, underscore, dot, and colon.
+        </Text>
+      ) : null}
+      {error ? <Text style={styles.error}>{error}</Text> : null}
+    </View>
+  );
+}

package/client/memory-panel.tsx

@@ -1,18 +1,22 @@
 import type { PluginWorkspacePanelProps } from "@getpaseo/plugin/client";
 import { useRpc, useWorkspace } from "@getpaseo/plugin/client";
 import { useQuery } from "@tanstack/react-query";
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { ScrollView, Text, View } from "react-native";
 import { listOmpMemory } from "../shared/memory";
+import type { OmpStore } from "../shared/omp-store";
+import { OmpStorePicker } from "./omp-store-picker";
+import { ompStoreKey } from "./omp-store-state";
 
 const MEMORY_POLL_MS = 15_000;
 
 export function OmpMemoryPanel({ theme, layout, workspaceId }: PluginWorkspacePanelProps) {
   const directory = useWorkspace(workspaceId, (workspace) => workspace.directory) ?? "";
+  const [store, setStore] = useState<OmpStore>();
   const loadMemory = useRpc(listOmpMemory);
   const memory = useQuery({
-    queryKey: ["paseo-omp", "memory", directory],
-    queryFn: () => loadMemory({ cwd: directory }),
+    queryKey: ["paseo-omp", "memory", ompStoreKey(store), directory],
+    queryFn: () => loadMemory({ cwd: directory, store }),
     enabled: directory.length > 0,
     refetchInterval: MEMORY_POLL_MS,
   });
@@ -53,6 +57,7 @@ export function OmpMemoryPanel({ theme, layout, workspaceId }: PluginWorkspacePa
           {memory.data?.bank ? `Bank: ${memory.data.bank}` : "Retained workspace facts"}
         </Text>
       </View>
+      <OmpStorePicker theme={theme} store={store} onChange={setStore} />
       {memory.isLoading ? <Text style={styles.subtitle}>Loading retained facts…</Text> : null}
       {memory.error ? <Text style={styles.error}>Could not read workspace memory.</Text> : null}
       {!memory.isLoading && !memory.error && (memory.data?.facts.length ?? 0) === 0 ? (

package/client/memory-popover.tsx

@@ -3,6 +3,8 @@ import { useQuery } from "@tanstack/react-query";
 import { useMemo } from "react";
 import { Text, View } from "react-native";
 import { listOmpMemory } from "../shared/memory";
+import { storeForProvider, storeLabel } from "../shared/omp-store";
+import { ompStoreKey } from "./omp-store-state";
 
 const MEMORY_POLL_MS = 15_000;
 const PREVIEW_LIMIT = 20;
@@ -10,11 +12,13 @@ const PREVIEW_LIMIT = 20;
 export function MemoryPopover(props: PluginButtonContentProps) {
   const { theme, layout } = props;
   const agentId = props.context === "agent" ? props.agentId : "";
-  const cwd = useAgent(agentId, (agent) => agent.cwd) ?? "";
+  const agent = useAgent(agentId, ({ cwd, provider }) => ({ cwd, provider }));
+  const cwd = agent?.cwd ?? "";
+  const store = storeForProvider(agent?.provider);
   const loadMemory = useRpc(listOmpMemory);
   const memory = useQuery({
-    queryKey: ["paseo-omp", "memory", cwd],
-    queryFn: () => loadMemory({ cwd }),
+    queryKey: ["paseo-omp", "memory", ompStoreKey(store), cwd],
+    queryFn: () => loadMemory({ cwd, store }),
     enabled: cwd.length > 0,
     refetchInterval: MEMORY_POLL_MS,
   });
@@ -50,7 +54,7 @@ export function MemoryPopover(props: PluginButtonContentProps) {
   return (
     <View style={styles.root}>
       <View style={styles.header}>
-        <Text style={styles.title}>OMP Memory</Text>
+        <Text style={styles.title}>OMP Memory · {storeLabel(store)}</Text>
         <Text style={styles.muted}>{facts.length} facts</Text>
       </View>
       <Text style={styles.muted}>{memory.data?.bank ?? "Workspace memory"}</Text>

package/client/omp-config-surface.tsx

@@ -1,10 +1,17 @@
-import { type PluginSurfaceProps, usePaseo, useRpc } from "@getpaseo/plugin/client";
+import {
+  type PluginSurfaceProps,
+  type PluginWorkspacePanelProps,
+  usePaseo,
+  useRpc,
+  useWorkspace,
+} from "@getpaseo/plugin/client";
 import { Icon, TextInput } from "@getpaseo/plugin/client/react-native";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useIsMutating, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { ReactNode } from "react";
 import { useCallback, useMemo, useState } from "react";
 import type { TextStyle, ViewStyle } from "react-native";
-import { Linking, Pressable, ScrollView, Switch, Text, View } 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 {
   categorizeOmpSetting,
@@ -16,7 +23,10 @@ import {
   type OmpSettingCategory,
   updateOmpSettings,
 } from "../shared/omp-settings";
+import { type OmpStore, storeLabel } from "../shared/omp-store";
 import { getOmpProviderHealth, type OmpProviderHealth } from "../shared/provider-diagnostics";
+import { ComposerPillSettingsSection } from "./composer-pill-settings";
+import { openOmpExternalUrl } from "./external-url";
 import {
   documentationForSettingCategory,
   documentationForSettingPath,
@@ -25,6 +35,8 @@ import {
   type OmpDocumentationLink,
 } from "./omp-doc-links";
 import { OmpPluginManagerSection } from "./omp-plugin-manager";
+import { OmpStorePicker } from "./omp-store-picker";
+import { ompStoreKey } from "./omp-store-state";
 import {
   type BinaryHealthSummary,
   loadReadyProviderSnapshot,
@@ -560,7 +572,7 @@ function ProcessSection({
   health: OmpProviderHealth;
 }) {
   return (
-    <SectionCard styles={styles} title="Processes">
+    <SectionCard styles={styles} title="Hub metadata">
       <KeyValueRow
         styles={styles}
         label="OMP Hub"
@@ -574,16 +586,20 @@ function ProcessSection({
 function ProviderHealthSection({
   theme,
   styles,
+  cwd,
+  store,
 }: {
   theme: PluginSurfaceProps["theme"];
   styles: OmpConfigStyles;
+  cwd?: string;
+  store?: OmpStore;
 }) {
   const paseo = usePaseo();
   const queryClient = useQueryClient();
   const loadHealth = useRpc(getOmpProviderHealth);
   const health = useQuery({
-    queryKey: HEALTH_QUERY_KEY,
-    queryFn: () => loadHealth({}),
+    queryKey: [...HEALTH_QUERY_KEY, ompStoreKey(store), cwd ?? "global"],
+    queryFn: () => loadHealth({ store, ...(cwd ? { cwd } : {}) }),
   });
   const providers = useQuery({
     queryKey: PROVIDERS_QUERY_KEY,
@@ -593,8 +609,16 @@ function ProviderHealthSection({
     mutationFn: async () => {
       const result = await refreshProviderDiagnostics({
         providers: paseo.providers,
-        loadForcedHealth: () => loadHealth({ force: true }),
-        cacheHealth: (value) => queryClient.setQueryData(HEALTH_QUERY_KEY, value),
+        providerIds: [
+          ...selectKnownOmpProviders(providers.data?.entries ?? []).map((provider) => provider.id),
+          ...(store?.profile ? [`omp-plugin-${store.profile}`] : []),
+        ],
+        loadForcedHealth: () => loadHealth({ store, force: true, ...(cwd ? { cwd } : {}) }),
+        cacheHealth: (value) =>
+          queryClient.setQueryData(
+            [...HEALTH_QUERY_KEY, ompStoreKey(store), cwd ?? "global"],
+            value,
+          ),
         cacheProviders: (value) => queryClient.setQueryData(PROVIDERS_QUERY_KEY, value),
       });
       if (result.failed) throw new Error("Could not fully refresh OMP provider health.");
@@ -621,8 +645,9 @@ function ProviderHealthSection({
         </View>
       </View>
       <Text style={styles.muted}>
-        These checks use the daemon&apos;s global OMP command and default storage, not per-agent
-        profile overrides.
+        Binary probes run from {cwd ? "this workspace" : "the daemon working directory"}.
+        Configuration, storage, MCP, and databases use {storeLabel(store)}. Hub metadata remains
+        shared across profiles.
       </Text>
 
       {health.isLoading ? <Text style={styles.muted}>Checking the omp installation…</Text> : null}
@@ -711,11 +736,12 @@ function fallbackSettingsFromConfig(config: OmpConfig | null | undefined): OmpSe
   return settings;
 }
 
-type SurfaceView = "overview" | "plugin" | "plugins" | "configuration" | "diagnostics";
+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" },
 ];
@@ -814,6 +840,8 @@ function EditableScalarValue({
   setting,
   draft,
   disabled,
+  resetLabel,
+  showReset,
   styles,
   onSet,
   onReset,
@@ -821,6 +849,8 @@ function EditableScalarValue({
   setting: OmpSetting;
   draft: SettingDraft | undefined;
   disabled: boolean;
+  resetLabel: string;
+  showReset: boolean;
   styles: OmpConfigStyles;
   onSet(value: string | boolean): void;
   onReset(): void;
@@ -829,7 +859,7 @@ function EditableScalarValue({
   return (
     <View style={styles.recordList}>
       {draft?.operation === "reset" ? (
-        <Text style={styles.muted}>Will reset to the OMP default</Text>
+        <Text style={styles.muted}>{resetLabel} when changes are applied</Text>
       ) : setting.type === "boolean" ? (
         <Switch
           accessibilityLabel={`Toggle ${formatOmpSettingLabel(setting.path)}`}
@@ -847,9 +877,11 @@ function EditableScalarValue({
           style={styles.scalarInput}
         />
       )}
-      <Pressable accessibilityRole="button" disabled={disabled} onPress={onReset}>
-        <Text style={styles.resetAction}>Reset to default</Text>
-      </Pressable>
+      {showReset ? (
+        <Pressable accessibilityRole="button" disabled={disabled} onPress={onReset}>
+          <Text style={styles.resetAction}>{resetLabel}</Text>
+        </Pressable>
+      ) : null}
     </View>
   );
 }
@@ -860,6 +892,7 @@ function ConfigurationCategory({
   settings,
   drafts,
   disabled,
+  workspaceScoped,
   onDraft,
   onOpenDocumentation,
 }: {
@@ -868,6 +901,7 @@ function ConfigurationCategory({
   settings: readonly OmpSetting[];
   drafts: Readonly<Record<string, SettingDraft>>;
   disabled: boolean;
+  workspaceScoped: boolean;
   onDraft(path: string, draft: SettingDraft): void;
   onOpenDocumentation(link: OmpDocumentationLink): void;
 }) {
@@ -897,6 +931,9 @@ function ConfigurationCategory({
           <View key={setting.path} style={styles.setting}>
             <View style={styles.settingHeader}>
               <Text style={styles.cardTitle}>{formatOmpSettingLabel(setting.path)}</Text>
+              {setting.workspaceOverride ? (
+                <Text style={styles.source}>Workspace override</Text>
+              ) : null}
               {!complex && !editable ? (
                 <StructuredSettingValue setting={setting} styles={styles} />
               ) : null}
@@ -918,6 +955,8 @@ function ConfigurationCategory({
                 setting={setting}
                 draft={drafts[setting.path]}
                 disabled={disabled}
+                resetLabel={workspaceScoped ? "Remove workspace override" : "Reset to default"}
+                showReset={!workspaceScoped || setting.workspaceOverride === true}
                 styles={styles}
                 onSet={(value) => onDraft(setting.path, { operation: "set", value })}
                 onReset={() => onDraft(setting.path, { operation: "reset" })}
@@ -938,15 +977,17 @@ function ConfigurationCategory({
 function SurfaceTabs({
   styles,
   selected,
+  views,
   onSelect,
 }: {
   styles: OmpConfigStyles;
   selected: SurfaceView;
+  views: readonly { id: SurfaceView; label: string }[];
   onSelect: (view: SurfaceView) => void;
 }) {
   return (
     <View accessibilityRole="tablist" style={styles.topTabs}>
-      {SURFACE_VIEWS.map((view) => {
+      {views.map((view) => {
         const active = selected === view.id;
         return (
           <Pressable
@@ -965,19 +1006,34 @@ function SurfaceTabs({
     </View>
   );
 }
-export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
+function OmpConfigContent({
+  theme,
+  layout,
+  cwd,
+  store,
+  onStoreChange,
+  onComposerPillSettingsChange,
+}: PluginSurfaceProps & {
+  cwd?: string;
+  store?: OmpStore;
+  onStoreChange(store: OmpStore | undefined): void;
+  onComposerPillSettingsChange?: (settings: ComposerPillSettings) => void;
+}) {
   const loadConfig = useRpc(listOmpConfig);
   const loadSettings = useRpc(listOmpSettings);
   const updateSettings = useRpc(updateOmpSettings);
   const queryClient = useQueryClient();
+  const context = { store, ...(cwd ? { cwd } : {}) };
+  const pendingMutations = useIsMutating({ mutationKey: ["paseo-omp"] });
   const configQuery = useQuery({
-    queryKey: ["paseo-omp", "config"],
-    queryFn: () => loadConfig({}),
+    queryKey: ["paseo-omp", "config", ompStoreKey(store), cwd ?? "global"],
+    queryFn: () => loadConfig(context),
     refetchInterval: CONFIG_POLL_MS,
   });
+  const settingsQueryKey = [...SETTINGS_QUERY_KEY, ompStoreKey(store), cwd ?? "global"];
   const settingsQuery = useQuery({
-    queryKey: SETTINGS_QUERY_KEY,
-    queryFn: () => loadSettings({}),
+    queryKey: settingsQueryKey,
+    queryFn: () => loadSettings(context),
     staleTime: Number.POSITIVE_INFINITY,
   });
   const [view, setView] = useState<SurfaceView>("overview");
@@ -987,6 +1043,9 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
   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 catalog = useMemo(() => {
     const sourceSettings = settingsQuery.data?.available
       ? settingsQuery.data.settings
@@ -1014,13 +1073,14 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
   const openDocumentation = useCallback(async (link: OmpDocumentationLink) => {
     setDocumentationError(null);
     try {
-      await Linking.openURL(link.url);
+      await openOmpExternalUrl(link.url);
     } catch {
       setDocumentationError(`Could not open ${link.label.toLocaleLowerCase()}.`);
     }
   }, []);
 
   const save = useMutation({
+    mutationKey: ["paseo-omp", "settings", ompStoreKey(store)],
     mutationFn: async () => {
       const revision = settingsQuery.data?.revision;
       if (!revision) throw new Error("OMP settings cannot be edited without a current revision.");
@@ -1039,10 +1099,12 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
         }
         return { operation: "set" as const, path, value };
       });
-      return updateSettings({ revision, changes });
+      return updateSettings({ ...context, revision, changes });
     },
     onSuccess: (result) => {
-      queryClient.setQueryData(SETTINGS_QUERY_KEY, result.catalog);
+      queryClient.setQueryData(settingsQueryKey, result.catalog);
+      void queryClient.invalidateQueries({ queryKey: SETTINGS_QUERY_KEY });
+      void queryClient.invalidateQueries({ queryKey: ["paseo-omp", "config"] });
       if (
         !result.conflict &&
         !result.failed &&
@@ -1059,14 +1121,35 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
     },
   });
   const draftCount = Object.keys(drafts).length;
+  const workspaceOverrideCount = catalog.sourceSettings.filter(
+    (setting) => setting.workspaceOverride,
+  ).length;
   const displayedConfigPath = settingsQuery.data?.available
     ? settingsQuery.data.path
     : configQuery.data?.path;
 
   return (
     <ScrollView contentContainerStyle={styles.root}>
-      <Text style={styles.pageTitle}>OMP</Text>
-      <SurfaceTabs styles={styles} selected={view} onSelect={setView} />
+      <Text style={styles.pageTitle}>{cwd ? "Workspace OMP" : "OMP"}</Text>
+      {cwd ? (
+        <Text selectable style={styles.muted}>
+          Project-scoped view · {cwd}
+        </Text>
+      ) : null}
+      {view !== "composer" ? (
+        <>
+          <OmpStorePicker
+            theme={theme}
+            store={store}
+            onChange={onStoreChange}
+            disabled={pendingMutations > 0}
+          />
+          <Text style={styles.muted}>
+            Switching stores clears unapplied edits and pending confirmations.
+          </Text>
+        </>
+      ) : null}
+      <SurfaceTabs styles={styles} selected={view} views={surfaceViews} onSelect={setView} />
 
       {view === "overview" ? (
         <>
@@ -1078,12 +1161,29 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
               Could not read the native OMP configuration.
             </Text>
           ) : (
-            <SectionCard styles={styles} title="Native configuration">
+            <SectionCard
+              styles={styles}
+              title={cwd ? "Workspace configuration" : "Native configuration"}
+            >
               <KeyValueRow
                 styles={styles}
                 label="Source"
                 value={displayedConfigPath ?? "Source unavailable"}
               />
+              {cwd ? (
+                <>
+                  <KeyValueRow styles={styles} label="Scope" value="Workspace / project" />
+                  <KeyValueRow
+                    styles={styles}
+                    label="Overrides"
+                    value={`${workspaceOverrideCount} project-specific settings`}
+                  />
+                  <Text style={styles.muted}>
+                    Settings without a workspace override inherit their effective global or default
+                    value.
+                  </Text>
+                </>
+              ) : null}
               <KeyValueRow
                 styles={styles}
                 label="Status"
@@ -1102,10 +1202,15 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
       {view === "plugin" ? <PluginConfigurationSection styles={styles} /> : null}
 
       {view === "plugins" ? (
-        <OmpPluginManagerSection theme={theme} compact={layout.compact} />
+        <OmpPluginManagerSection theme={theme} compact={layout.compact} cwd={cwd} store={store} />
+      ) : null}
+      {view === "composer" && !cwd && onComposerPillSettingsChange ? (
+        <ComposerPillSettingsSection theme={theme} onChange={onComposerPillSettingsChange} />
       ) : null}
 
-      {view === "diagnostics" ? <ProviderHealthSection theme={theme} styles={styles} /> : null}
+      {view === "diagnostics" ? (
+        <ProviderHealthSection theme={theme} styles={styles} cwd={cwd} store={store} />
+      ) : null}
 
       {view === "configuration" ? (
         <>
@@ -1147,6 +1252,13 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
             ) : (
               <Text style={styles.source}>Source unavailable</Text>
             )}
+            {cwd ? (
+              <Text style={styles.muted}>
+                {workspaceOverrideCount} project-specific overrides. All other effective values
+                inherit global configuration or OMP defaults. Applying a change creates or updates
+                the override in .omp/config.yml; removing an override restores inheritance.
+              </Text>
+            ) : null}
           </View>
           {documentationError ? (
             <Text accessibilityRole="alert" style={styles.error}>
@@ -1256,6 +1368,7 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
                     settings={catalog.byCategory.get(selectedCategory.id) ?? []}
                     drafts={drafts}
                     disabled={!settingsQuery.data?.revision || save.isPending}
+                    workspaceScoped={cwd !== undefined}
                     onDraft={(path, draft) =>
                       setDrafts((current) => ({ ...current, [path]: draft }))
                     }
@@ -1272,3 +1385,50 @@ export function OmpConfigSurface({ theme, layout }: PluginSurfaceProps) {
     </ScrollView>
   );
 }
+
+function OmpStoreContent(
+  props: PluginSurfaceProps & {
+    cwd?: string;
+    onComposerPillSettingsChange?: (settings: ComposerPillSettings) => void;
+  },
+) {
+  const [store, setStore] = useState<OmpStore>();
+  // Remount every editor when its target changes: drafts, confirmations, and mutation notices
+  // belong to one store/workspace and must never be applied to the next selection.
+  return (
+    <OmpConfigContent
+      key={`${ompStoreKey(store)}:${props.cwd ?? "global"}`}
+      {...props}
+      store={store}
+      onStoreChange={setStore}
+    />
+  );
+}
+
+export function OmpConfigSurface(
+  props: PluginSurfaceProps & {
+    onComposerPillSettingsChange: (settings: ComposerPillSettings) => void;
+  },
+) {
+  return <OmpStoreContent {...props} />;
+}
+
+export function OmpWorkspacePanel(props: PluginWorkspacePanelProps) {
+  const cwd = useWorkspace(props.workspaceId, (workspace) => workspace.directory);
+  if (!cwd) {
+    return (
+      <View
+        style={{
+          flex: 1,
+          padding: props.layout.compact ? 16 : 24,
+          backgroundColor: props.theme.colors.surface0,
+        }}
+      >
+        <Text style={{ color: props.theme.colors.foregroundMuted }}>
+          Loading workspace OMP settings…
+        </Text>
+      </View>
+    );
+  }
+  return <OmpStoreContent {...props} cwd={cwd} />;
+}