@dxos/plugin-assistant 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0

package/src/capabilities/state.ts

@@ -2,21 +2,34 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes } from '@dxos/app-framework';
-import { LocalStorageStore } from '@dxos/local-storage';
+import { Atom } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
 
-import { meta } from '../meta';
+import { Capability } from '@dxos/app-framework';
+import { type Obj } from '@dxos/echo';
+import { createKvsStore } from '@dxos/effect';
 
-import { AssistantCapabilities } from './capabilities';
+import { meta } from '#meta';
+import { AssistantCapabilities } from '#types';
 
-export default () => {
-  // NOTE: This needs to be a chat object rather than a string id to avoid a query race.
-  // TODO(wittjosiah): Handle serialization and hydration for this so it can be cached.
-  const state = new LocalStorageStore<AssistantCapabilities.AssistantState>(meta.id, {
-    currentChat: {},
-  });
+export default Capability.makeModule(() =>
+  Effect.sync(() => {
+    // NOTE: This needs to be a chat object rather than a string id to avoid a query race.
+    // TODO(wittjosiah): Handle serialization and hydration for this so it can be cached.
+    const stateAtom = createKvsStore({
+      key: meta.id,
+      schema: AssistantCapabilities.StateSchema,
+      defaultValue: () => ({
+        currentChat: {},
+        pendingPrompts: {},
+      }),
+    });
 
-  state.prop({ key: 'currentChat', type: LocalStorageStore.json<Record<string, string | undefined>>() });
+    const companionChatCacheAtom = Atom.make<Record<string, Obj.Unknown | undefined>>({}).pipe(Atom.keepAlive);
 
-  return contributes(AssistantCapabilities.State, state.values, () => state.close());
-};
+    return [
+      Capability.contributes(AssistantCapabilities.State, stateAtom),
+      Capability.contributes(AssistantCapabilities.CompanionChatCache, companionChatCacheAtom),
+    ];
+  }),
+);

package/src/capabilities/toolkit.ts

@@ -2,16 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Layer from 'effect/Layer';
+import * as Effect from 'effect/Effect';
 
-import { Capabilities, type Capability, type PluginContext, contributes } from '@dxos/app-framework';
-import { GenericToolkit } from '@dxos/assistant';
-import { AssistantToolkit, SystemToolkit, WebSearchToolkit } from '@dxos/assistant-toolkit';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { WebSearchToolkitGeneric } from '@dxos/assistant-toolkit';
 
-export default (_context: PluginContext): Capability<any>[] => [
-  contributes(Capabilities.Toolkit, GenericToolkit.make(AssistantToolkit.AssistantToolkit, AssistantToolkit.layer())),
-
-  // TODO(burdon): How to manage dependencies across blueprints.
-  contributes(Capabilities.Toolkit, GenericToolkit.make(SystemToolkit.SystemToolkit, SystemToolkit.layer())),
-  contributes(Capabilities.Toolkit, GenericToolkit.make(WebSearchToolkit, Layer.empty)),
-];
+export default Capability.makeModule(() =>
+  Effect.succeed([Capability.contributes(AppCapabilities.Toolkit, WebSearchToolkitGeneric)]),
+);

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

@@ -0,0 +1,34 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '../../translations';
+import { AssistantSettings } from './AssistantSettings';
+
+const meta = {
+  title: 'plugins/plugin-assistant/components/AssistantSettings',
+  tags: ['settings'],
+  component: AssistantSettings,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof AssistantSettings>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    settings: {
+      customPrompts: false,
+      llmProvider: 'edge',
+    },
+  },
+};

package/src/components/AssistantSettings/AssistantSettings.tsx

@@ -5,11 +5,12 @@
 import React from 'react';
 
 import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from '@dxos/ai';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Input, Select, useTranslation } from '@dxos/react-ui';
-import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
+import { Settings as SettingsForm } from '@dxos/react-ui-form';
 
-import { meta } from '../../meta';
-import { type Assistant, LLM_PROVIDERS } from '../../types';
+import { meta } from '#meta';
+import { type Assistant, LLM_PROVIDERS } from '#types';
 
 // TODO(burdon): Factor out default Selector.
 const DEFAULT_VALUE = '__default';
@@ -20,93 +21,112 @@ const LLM_PROVIDER_LABELS = {
   lmstudio: 'LM Studio',
 } as const;
 
-export const AssistantSettings = ({ settings }: { settings: Assistant.Settings }) => {
+export type AssistantSettingsProps = AppSurface.SettingsArticleProps<Assistant.Settings>;
+
+export const AssistantSettings = ({ settings, onSettingsChange }: AssistantSettingsProps) => {
   const { t } = useTranslation(meta.id);
 
   return (
-    <ControlPage>
-      <ControlSection title={t('settings title', { ns: meta.id })}>
-        <ControlGroup>
-          <ControlItemInput title={t('settings custom prompts label')}>
-            <Input.Switch
-              checked={!!settings.customPrompts}
-              onCheckedChange={(checked) => (settings.customPrompts = checked)}
-            />
-          </ControlItemInput>
+    <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>
 
-          <ControlItemInput title={t('settings llm provider label')}>
-            <Select.Root
-              value={settings.llmProvider ?? 'edge'}
-              onValueChange={(value) => {
-                settings.llmProvider = value === DEFAULT_VALUE ? undefined : (value as any);
-              }}
-            >
-              <Select.TriggerButton 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>
-          </ControlItemInput>
+        <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>
 
-          <ControlItemInput title={t('settings edge llm model label')}>
-            <Select.Root
-              value={settings.edgeModel ?? DEFAULT_VALUE}
-              onValueChange={(value) => {
-                settings.edgeModel = value === DEFAULT_VALUE ? undefined : value;
-              }}
-            >
-              <Select.TriggerButton 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>
-          </ControlItemInput>
+        <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>
 
-          <ControlItemInput title={t('settings ollama llm model label')}>
-            <Select.Root
-              value={settings.ollamaModel ?? DEFAULT_VALUE}
-              onValueChange={(value) => {
-                settings.ollamaModel = value === DEFAULT_VALUE ? undefined : value;
-              }}
-            >
-              <Select.TriggerButton 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>
-          </ControlItemInput>
-        </ControlGroup>
-      </ControlSection>
-    </ControlPage>
+        <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.Section>
+    </SettingsForm.Viewport>
   );
 };

package/src/components/AssistantSettings/index.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 DXOS.org
+// Copyright 2025 DXOS.org
 //
 
-export * from './AssistantSettings';
+export { AssistantSettings as default } from './AssistantSettings';