@dxos/plugin-assistant 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/src/capabilities/app-graph-builder.ts

@@ -6,23 +6,20 @@ import * as Effect from 'effect/Effect';
 import { pipe } from 'effect/Function';
 import * as Option from 'effect/Option';
 
-import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities, AppNode, getActiveSpace, getPersonalSpace, LayoutOperation } from '@dxos/app-toolkit';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode, getActiveSpace, getPersonalSpace } from '@dxos/app-toolkit';
 import { Chat } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Blueprint, Routine, Operation } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { DXN, Database, Filter, Obj, type Ref } from '@dxos/echo';
 import { AtomObj } from '@dxos/echo-atom';
 import { invariant } from '@dxos/invariant';
-import { Operation, type OperationInvoker } from '@dxos/operation';
 import { AutomationCapabilities } from '@dxos/plugin-automation/types';
 import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { Query } from '@dxos/react-client/echo';
 import { linkedSegment } from '@dxos/react-ui-attention';
 
-import { ASSISTANT_COMPANION_VARIANT, ASSISTANT_DIALOG, meta } from '#meta';
+import { ASSISTANT_COMPANION_VARIANT, meta } from '#meta';
 import { AssistantOperation } from '#operations';
 import { AssistantCapabilities } from '#types';
 
@@ -68,39 +65,6 @@ export default Capability.makeModule(
         match: NodeMatcher.whenRoot,
         actions: () =>
           Effect.succeed([
-            Node.makeAction({
-              id: `${LayoutOperation.UpdateDialog.meta.key}.assistant.open`,
-              data: Effect.fnUntraced(function* () {
-                const capabilities = yield* Capability.Service;
-                const client = yield* Capability.get(ClientCapabilities.Client);
-                const operationInvoker = yield* Capability.get(Capabilities.OperationInvoker);
-                const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
-                if (!space) {
-                  return;
-                }
-                const chat = yield* Effect.tryPromise(() => getOrCreateChat(operationInvoker.invokePromise, space.db));
-                if (!chat) {
-                  return;
-                }
-
-                yield* Operation.invoke(LayoutOperation.UpdateDialog, {
-                  subject: ASSISTANT_DIALOG,
-                  state: true,
-                  blockAlign: 'end',
-                  props: { chat },
-                });
-              }),
-              properties: {
-                label: ['open-assistant.label', { ns: meta.id }],
-                icon: 'ph--sparkle--regular',
-                disposition: 'pin-end',
-                position: 'hoist',
-                keyBinding: {
-                  macos: 'shift+meta+k',
-                  windows: 'shift+ctrl+k',
-                },
-              },
-            }),
             Node.makeAction({
               id: 'reset-blueprints',
               data: Effect.fnUntraced(function* () {
@@ -163,7 +127,7 @@ export default Capability.makeModule(
         id: 'invocations',
         match: NodeMatcher.whenAny(
           NodeMatcher.whenEchoTypeMatches(Sequence),
-          NodeMatcher.whenEchoTypeMatches(Prompt.Prompt),
+          NodeMatcher.whenEchoTypeMatches(Routine.Routine),
         ),
         connector: () =>
           Effect.succeed([
@@ -195,23 +159,3 @@ export default Capability.makeModule(
     return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );
-
-// TODO(burdon): Factor out.
-const getOrCreateChat = async (
-  invokePromise: OperationInvoker.OperationInvoker['invokePromise'],
-  db: Database.Database,
-): Promise<Chat.Chat | undefined> => {
-  // TODO(wittjosiah): This should be possible with a single query.
-  const allChats = await db.query(Query.type(Chat.Chat)).run();
-  const relatedChats = await db.query(Query.type(Chat.Chat).sourceOf(Chat.CompanionTo).source()).run();
-
-  const chats = allChats.filter((chat) => !relatedChats.includes(chat));
-  if (chats.length > 0) {
-    return chats.at(-1);
-  }
-
-  const { data } = await invokePromise(AssistantOperation.CreateChat, { db });
-  invariant(Obj.instanceOf(Chat.Chat, data?.object));
-  await invokePromise(SpaceOperation.AddObject, { target: db, object: data.object });
-  return data.object;
-};

package/src/capabilities/blueprint-definition.ts

@@ -18,14 +18,14 @@ import {
   DatabaseBlueprint,
   DatabaseHandlers,
   DiscordBlueprint,
-  EntityExtractionHandlers,
   LinearBlueprint,
   PlanningBlueprint,
-  ResearchBlueprint,
   WebSearchBlueprint,
   MemoryBlueprint,
   AutomationBlueprint,
 } from '@dxos/assistant-toolkit';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Blueprint } from '@dxos/compute';
 
 import { AssistantBlueprint } from '#blueprints';
 
@@ -35,7 +35,6 @@ const blueprintDefinition: () => Effect.Effect<Capability.Capability<unknown>[]>
     Capability.contributes(AppCapabilities.BlueprintDefinition, AssistantBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, BrowserBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, DatabaseBlueprint),
-    Capability.contributes(AppCapabilities.BlueprintDefinition, ResearchBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, WebSearchBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, DiscordBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, LinearBlueprint),
@@ -50,7 +49,6 @@ const blueprintDefinition: () => Effect.Effect<Capability.Capability<unknown>[]>
     Capability.contributes(Capabilities.OperationHandler, AgentBlueprintHandlers),
     Capability.contributes(Capabilities.OperationHandler, BlueprintManagerHandlers),
     Capability.contributes(Capabilities.OperationHandler, DatabaseHandlers),
-    Capability.contributes(Capabilities.OperationHandler, EntityExtractionHandlers),
     Capability.contributes(Capabilities.OperationHandler, AgentWizardHandlers),
   ]),
 );

package/src/capabilities/index.ts

@@ -3,7 +3,8 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Blueprint, OperationHandlerSet } from '@dxos/compute';
 
 export const AiService = Capability.lazy('AiService', () => import('./ai-service'));
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));

package/src/capabilities/local-model-resolver.ts

@@ -4,22 +4,26 @@
 
 import * as OpenAiClient from '@effect/ai-openai/OpenAiClient';
 import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as HttpClient from '@effect/platform/HttpClient';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
-import { LMStudioResolver } from '@dxos/ai/resolvers';
+import { LMStudioResolver, OllamaResolver } from '@dxos/ai/resolvers';
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 
-export type LocalModelResolverCapabilities = [Capability.Capability<typeof AppCapabilities.AiModelResolver>];
-
 /**
  * To start LM Studio server:
  * ```bash
  * ~/.lmstudio/bin/lms server start --cors
  * ```
+ *
+ * To start Ollama server:
+ * ```bash
+ * OLLAMA_ORIGINS="*" ollama serve
+ * ```
  */
-const localModelResolver = Capability.makeModule<[], LocalModelResolverCapabilities>(() =>
+const localModelResolver = Capability.makeModule<[]>(() =>
   Effect.succeed([
     Capability.contributes(
       AppCapabilities.AiModelResolver,
@@ -32,6 +36,12 @@ const localModelResolver = Capability.makeModule<[], LocalModelResolverCapabilit
         Layer.provide(FetchHttpClient.layer),
       ),
     ),
+    Capability.contributes(
+      AppCapabilities.AiModelResolver,
+      OllamaResolver.make({
+        transformClient: HttpClient.withTracerPropagation(false),
+      }).pipe(Layer.provide(FetchHttpClient.layer)),
+    ),
   ]),
 );
 

package/src/capabilities/markdown.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { MarkdownCapabilities } from '@dxos/plugin-markdown';
+import { MarkdownCapabilities } from '@dxos/plugin-markdown/types';
 
 import { AssistantOperation } from '#operations';
 

package/src/capabilities/migrations.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { Chat, ResearchGraph } from '@dxos/assistant-toolkit';
+import { Chat } from '@dxos/assistant-toolkit';
 import { defineObjectMigration } from '@dxos/client/echo';
 import { ClientCapabilities } from '@dxos/plugin-client/types';
 
@@ -19,12 +19,6 @@ const migrations = [
     transform: identityTransform,
     onMigration: noopCallback,
   }),
-  defineObjectMigration({
-    from: ResearchGraph.LegacyResearchGraph,
-    to: ResearchGraph.ResearchGraph,
-    transform: identityTransform,
-    onMigration: noopCallback,
-  }),
 ];
 
 export default Capability.makeModule(

package/src/capabilities/operation-handler.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
 import { AssistantOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -3,17 +3,18 @@
 //
 
 import * as Effect from 'effect/Effect';
-import React from 'react';
+import React, { type ComponentProps, useEffect } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useSettingsState } from '@dxos/app-framework/ui';
 import { AppSurface, useActiveSpace } from '@dxos/app-toolkit/ui';
 import { Chat, Agent } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
+import { Blueprint, Routine } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { InvocationTraceContainer } from '@dxos/devtools';
-import { Obj } from '@dxos/echo';
+import { Feed, Obj } from '@dxos/echo';
+import { log } from '@dxos/log';
 import { Panel } from '@dxos/react-ui';
 
 import { AssistantSettings } from '#components';
@@ -24,8 +25,8 @@ import {
   ChatDialog,
   AgentArticle,
   AgentProperties,
-  PromptArticle,
-  PromptList,
+  RoutineArticle,
+  RoutineList,
   TracePanel,
   TriggerStatus,
 } from '#containers';
@@ -37,8 +38,7 @@ export default Capability.makeModule(() =>
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         id: 'plugin-settings',
-        role: 'article',
-        filter: AppSurface.settingsArticle(meta.id),
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<Assistant.Settings>(subject.atom);
           return <AssistantSettings settings={settings} onSettingsChange={updateSettings} />;
@@ -57,16 +57,14 @@ export default Capability.makeModule(() =>
       }),
       Surface.create({
         id: 'agent',
-        role: 'article',
-        filter: AppSurface.objectArticle(Agent.Agent),
+        filter: AppSurface.object(AppSurface.Article, Agent.Agent),
         component: ({ data, role }) => (
           <AgentArticle role={role} subject={data.subject} attendableId={data.attendableId} />
         ),
       }),
       Surface.create({
         id: 'agent-properties',
-        role: 'object-properties',
-        filter: AppSurface.objectProperties(Agent.Agent),
+        filter: AppSurface.object(AppSurface.ObjectProperties, Agent.Agent),
         component: ({ data }) => <AgentProperties subject={data.subject} />,
       }),
       Surface.create({
@@ -90,13 +88,15 @@ export default Capability.makeModule(() =>
         id: 'companion-invocations',
         role: 'article',
         filter: (data): data is { companionTo: Sequence } =>
-          (Obj.instanceOf(Sequence, data.companionTo) || Obj.instanceOf(Prompt.Prompt, data.companionTo)) &&
+          (Obj.instanceOf(Sequence, data.companionTo) || Obj.instanceOf(Routine.Routine, data.companionTo)) &&
           data.subject === 'invocations',
         component: ({ data, role }) => {
           const space = getSpace(data.companionTo);
-          const queueDxn = space?.properties.invocationTraceQueue?.dxn;
+          const feed = space?.properties.invocationTraceFeed?.target;
+          const queueDxn = feed ? Feed.getQueueDxn(feed) : undefined;
           // TODO(wittjosiah): Support invocation filtering for prompts.
-          const target = Obj.instanceOf(Prompt.Prompt, data.companionTo) ? undefined : data.companionTo;
+          const target = Obj.instanceOf(Routine.Routine, data.companionTo) ? undefined : data.companionTo;
+
           return (
             <Panel.Root role={role} className='dx-document'>
               <Panel.Content asChild>
@@ -108,34 +108,35 @@ export default Capability.makeModule(() =>
       }),
       Surface.create({
         id: 'blueprint',
-        role: 'article',
-        filter: AppSurface.objectArticle(Blueprint.Blueprint),
+        filter: AppSurface.object(AppSurface.Article, Blueprint.Blueprint),
         component: ({ data, role }) => (
           <BlueprintArticle role={role} subject={data.subject} attendableId={data.attendableId} />
         ),
       }),
       Surface.create({
         id: 'prompt',
-        role: 'article',
-        filter: AppSurface.objectArticle(Prompt.Prompt),
+        filter: AppSurface.object(AppSurface.Article, Routine.Routine),
         component: ({ data, role }) => (
-          <PromptArticle role={role} subject={data.subject} attendableId={data.attendableId} />
+          <RoutineArticle role={role} subject={data.subject} attendableId={data.attendableId} />
         ),
       }),
       Surface.create({
         id: ASSISTANT_DIALOG,
-        role: 'dialog',
-        filter: AppSurface.componentDialog(ASSISTANT_DIALOG),
+        filter: AppSurface.component<ComponentProps<typeof ChatDialog>>(AppSurface.Dialog, ASSISTANT_DIALOG),
         component: ({ data }) => <ChatDialog {...data.props} />,
       }),
       Surface.create({
         id: 'trace',
-        role: 'deck-companion--trace',
-        filter: AppSurface.literalSection('trace'),
+        filter: AppSurface.literal(Surface.makeType<{ subject: string }>('deck-companion--trace'), 'trace'),
         component: () => {
           const space = useActiveSpace();
+          useEffect(() => {
+            log('trace panel surface', { hasSpace: Boolean(space), spaceId: space?.id });
+          }, [space?.id]);
+
           if (!space) {
-            return null;
+            // TODO(dmaretskyi): Not really part of UX, but so we know what the error is.
+            return <span>No active space</span>;
           }
 
           return <TracePanel space={space} />;
@@ -144,13 +145,22 @@ export default Capability.makeModule(() =>
       Surface.create({
         id: 'status',
         role: 'status-indicator',
-        component: () => <TriggerStatus />,
+        component: () => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
+
+          return <TriggerStatus role='status-indicator' space={space} />;
+        },
       }),
       Surface.create({
         id: 'prompts',
-        role: 'prompts',
-        filter: AppSurface.anyObjectSection(),
-        component: ({ data }) => <PromptList subject={data.subject} />,
+        filter: AppSurface.subject(
+          Surface.makeType<{ subject: Obj.Any; attendableId: string }>('prompts'),
+          Obj.isObject,
+        ),
+        component: ({ data }) => <RoutineList subject={data.subject} />,
       }),
     ]),
   ),

package/src/capabilities/toolkit.ts

@@ -6,8 +6,8 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { WebSearchToolkitGeneric } from '@dxos/assistant-toolkit';
+import { WebSearchToolkitOpaque } from '@dxos/assistant-toolkit';
 
 export default Capability.makeModule(() =>
-  Effect.succeed([Capability.contributes(AppCapabilities.Toolkit, WebSearchToolkitGeneric)]),
+  Effect.succeed([Capability.contributes(AppCapabilities.Toolkit, WebSearchToolkitOpaque)]),
 );

package/src/{components/Typewriter → cli}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2026 DXOS.org
 //
 
-export * from './Typewriter';
+export * from './plugin';

package/src/cli/plugin.ts

@@ -0,0 +1,83 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { ActivationEvents, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { ContextBinding } from '@dxos/assistant';
+import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Blueprint, Routine } from '@dxos/compute';
+import { Sequence } from '@dxos/conductor';
+import { Feed } from '@dxos/echo';
+import { ClientEvents } from '@dxos/plugin-client/types';
+import { Text } from '@dxos/schema';
+import { HasSubject, Message } from '@dxos/types';
+
+import {
+  AiService,
+  BlueprintDefinition,
+  EdgeModelResolver,
+  LocalModelResolver,
+  Migrations,
+  OperationHandler,
+  Toolkit,
+} from '#capabilities';
+import { meta } from '#meta';
+import { AssistantEvents } from '#types';
+
+/**
+ * Headless variant of `AssistantPlugin` for Node-only contexts (CLI, tests).
+ * Omits modules that depend on browser globals or the React/UI stack:
+ * translations, ReactSurface, MarkdownExtension, AppGraphBuilder, Settings,
+ * AssistantState, CompanionChatProvisioner, metadata (`createObject` hooks),
+ * and the `on-space-created` hook.
+ */
+export const AssistantPlugin = Plugin.define(meta).pipe(
+  // Headless plugin has no ReactSurface; full Assistant fires SetupArtifactDefinition from the surface module.
+  // Activate blueprint definitions on Startup so AgentHandlers (and other blueprint ops) register in CLI/tests.
+  AppPlugin.addBlueprintDefinitionModule({
+    activate: BlueprintDefinition,
+    activatesOn: ActivationEvents.Startup,
+  }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({
+    schema: [
+      Chat.Chat,
+      Chat.CompanionTo,
+      Blueprint.Blueprint,
+      ContextBinding,
+      Feed.Feed,
+      HasSubject.HasSubject,
+      Message.Message,
+      Routine.Routine,
+      Agent.Agent,
+      McpServer.McpServer,
+      Plan.Plan,
+      Sequence,
+      Memory.Memory,
+      Text.Text,
+    ],
+  }),
+  Plugin.addModule({
+    activatesOn: AssistantEvents.SetupAiServiceProviders,
+    activate: EdgeModelResolver,
+  }),
+  Plugin.addModule({
+    activatesOn: AssistantEvents.SetupAiServiceProviders,
+    activate: LocalModelResolver,
+  }),
+  Plugin.addModule({
+    firesBeforeActivation: [AssistantEvents.SetupAiServiceProviders],
+    activatesOn: ActivationEvents.Startup,
+    activate: AiService,
+  }),
+  Plugin.addModule({
+    activatesOn: ActivationEvents.Startup,
+    activate: Toolkit,
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SetupMigration,
+    activate: Migrations,
+  }),
+  Plugin.make,
+);

package/src/components/AssistantSettings/AssistantSettings.stories.tsx

@@ -6,7 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { AssistantSettings } from './AssistantSettings';
 
 const meta = {
@@ -28,7 +29,7 @@ export const Default: Story = {
   args: {
     settings: {
       customPrompts: false,
-      llmProvider: 'edge',
+      modelProvider: 'edge',
     },
   },
 };

package/src/components/AssistantSettings/AssistantSettings.tsx

@@ -2,130 +2,41 @@
 // Copyright 2023 DXOS.org
 //
 
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from '@dxos/ai';
+import { DEFAULT_EDGE_MODELS, DEFAULT_LMSTUDIO_MODELS, DEFAULT_OLLAMA_MODELS } from '@dxos/ai';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { Input, Select, useTranslation } from '@dxos/react-ui';
-import { Settings as SettingsForm } from '@dxos/react-ui-form';
+import { useTranslation } from '@dxos/react-ui';
+import { Settings as SettingsForm, createSelectField } from '@dxos/react-ui-form';
 
 import { meta } from '#meta';
-import { type Assistant, LLM_PROVIDERS } from '#types';
-
-// TODO(burdon): Factor out default Selector.
-const DEFAULT_VALUE = '__default';
-
-const LLM_PROVIDER_LABELS = {
-  edge: 'DXOS',
-  ollama: 'Ollama',
-  lmstudio: 'LM Studio',
-} as const;
+import { Assistant } from '#types';
 
 export type AssistantSettingsProps = AppSurface.SettingsArticleProps<Assistant.Settings>;
 
 export const AssistantSettings = ({ settings, onSettingsChange }: AssistantSettingsProps) => {
   const { t } = useTranslation(meta.id);
+  const fieldMap = useMemo(
+    () => ({
+      modelDefaults: {
+        edge: createSelectField({ options: DEFAULT_EDGE_MODELS }),
+        ollama: createSelectField({ options: DEFAULT_OLLAMA_MODELS }),
+        lmstudio: createSelectField({ options: DEFAULT_LMSTUDIO_MODELS }),
+      },
+    }),
+    [],
+  );
 
   return (
     <SettingsForm.Viewport>
       <SettingsForm.Section title={t('settings.title', { ns: meta.id })}>
-        <SettingsForm.Item
-          title={t('settings.custom-prompts.label')}
-          description={t('settings.custom-prompts.description')}
-        >
-          <Input.Switch
-            disabled={!onSettingsChange}
-            checked={!!settings.customPrompts}
-            onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, customPrompts: checked }))}
-          />
-        </SettingsForm.Item>
-
-        <SettingsForm.Item
-          title={t('settings.llm-provider.label')}
-          description={t('settings.llm-provider.description')}
-        >
-          <Select.Root
-            disabled={!onSettingsChange}
-            value={settings.llmProvider ?? 'edge'}
-            onValueChange={(value) => {
-              onSettingsChange?.((s) => ({
-                ...s,
-                llmProvider: value === DEFAULT_VALUE ? undefined : (value as any),
-              }));
-            }}
-          >
-            <Select.TriggerButton disabled={!onSettingsChange} placeholder={t('settings.llm-provider.label')} />
-            <Select.Portal>
-              <Select.Content>
-                <Select.Viewport>
-                  <Select.Option value={DEFAULT_VALUE}>{t('settings.default.label')}</Select.Option>
-                  {LLM_PROVIDERS.map((model) => (
-                    <Select.Option key={model} value={model}>
-                      {LLM_PROVIDER_LABELS[model]}
-                    </Select.Option>
-                  ))}
-                </Select.Viewport>
-                <Select.Arrow />
-              </Select.Content>
-            </Select.Portal>
-          </Select.Root>
-        </SettingsForm.Item>
-
-        <SettingsForm.Item
-          title={t('settings.edge-llm-model.label')}
-          description={t('settings.edge-llm-model.description')}
-        >
-          <Select.Root
-            disabled={!onSettingsChange}
-            value={settings.edgeModel ?? DEFAULT_VALUE}
-            onValueChange={(value) => {
-              onSettingsChange?.((s) => ({ ...s, edgeModel: value === DEFAULT_VALUE ? undefined : value }));
-            }}
-          >
-            <Select.TriggerButton disabled={!onSettingsChange} placeholder={t('settings.default-llm-model.label')} />
-            <Select.Portal>
-              <Select.Content>
-                <Select.Viewport>
-                  <Select.Option value={DEFAULT_VALUE}>{t('settings.default.label')}</Select.Option>
-                  {DEFAULT_EDGE_MODELS.map((model) => (
-                    <Select.Option key={model} value={model}>
-                      {model}
-                    </Select.Option>
-                  ))}
-                </Select.Viewport>
-                <Select.Arrow />
-              </Select.Content>
-            </Select.Portal>
-          </Select.Root>
-        </SettingsForm.Item>
-
-        <SettingsForm.Item
-          title={t('settings.ollama-llm-model.label')}
-          description={t('settings.ollama-llm-model.description')}
-        >
-          <Select.Root
-            disabled={!onSettingsChange}
-            value={settings.ollamaModel ?? DEFAULT_VALUE}
-            onValueChange={(value) => {
-              onSettingsChange?.((s) => ({ ...s, ollamaModel: value === DEFAULT_VALUE ? undefined : value }));
-            }}
-          >
-            <Select.TriggerButton disabled={!onSettingsChange} placeholder={t('settings.default-llm-model.label')} />
-            <Select.Portal>
-              <Select.Content>
-                <Select.Viewport>
-                  <Select.Option value={DEFAULT_VALUE}>{t('settings.default.label')}</Select.Option>
-                  {DEFAULT_OLLAMA_MODELS.map((model) => (
-                    <Select.Option key={model} value={model}>
-                      {model}
-                    </Select.Option>
-                  ))}
-                </Select.Viewport>
-                <Select.Arrow />
-              </Select.Content>
-            </Select.Portal>
-          </Select.Root>
-        </SettingsForm.Item>
+        <SettingsForm.FieldSet<Assistant.Settings>
+          readonly={!onSettingsChange}
+          schema={Assistant.Settings}
+          fieldMap={fieldMap}
+          values={settings}
+          onValuesChanged={(values) => onSettingsChange?.(() => values)}
+        />
       </SettingsForm.Section>
     </SettingsForm.Viewport>
   );