@dxos/plugin-assistant 0.8.4-main.1068cf700f → 0.8.4-main.1c7ec43d41

package/src/capabilities/markdown.ts

@@ -0,0 +1,40 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Obj } from '@dxos/echo';
+import { MarkdownCapabilities } from '@dxos/plugin-markdown/types';
+
+import { AssistantOperation } from '#operations';
+
+import { promptRunExtension } from '../extensions';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+
+    return Capability.contributes(MarkdownCapabilities.Extensions, [
+      ({ document: doc }) => {
+        if (!doc) {
+          return undefined;
+        }
+
+        const db = Obj.getDatabase(doc);
+        if (!db) {
+          return undefined;
+        }
+
+        const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
+
+        return promptRunExtension({
+          onRun: (promptText) => {
+            void invokePromise(AssistantOperation.RunPromptInNewChat, { db, prompt: promptText });
+          },
+        });
+      },
+    ]);
+  }),
+);

package/src/capabilities/migrations.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Chat } from '@dxos/assistant-toolkit';
+import { defineObjectMigration } from '@dxos/client/echo';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+
+const identityTransform = async (from: any) => ({ ...from });
+const noopCallback = async () => {};
+
+const migrations = [
+  defineObjectMigration({
+    from: Chat.LegacyCompanionTo,
+    to: Chat.CompanionTo,
+    transform: identityTransform,
+    onMigration: noopCallback,
+  }),
+];
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(ClientCapabilities.Migration, migrations);
+  }),
+);

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/compute';
+
+import { AssistantOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, AssistantOperationHandlerSet);
+  }),
+);

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,167 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+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 { getSpace } from '@dxos/client/echo';
+import { Blueprint, Routine } from '@dxos/compute';
+import { Sequence } from '@dxos/conductor';
+import { InvocationTraceContainer } from '@dxos/devtools';
+import { Feed, Obj } from '@dxos/echo';
+import { log } from '@dxos/log';
+import { Panel } from '@dxos/react-ui';
+
+import { AssistantSettings } from '#components';
+import {
+  BlueprintArticle,
+  ChatCompanion,
+  ChatContainer,
+  ChatDialog,
+  AgentArticle,
+  AgentProperties,
+  RoutineArticle,
+  RoutineList,
+  TracePanel,
+  TriggerStatus,
+} from '#containers';
+import { ASSISTANT_COMPANION_VARIANT, ASSISTANT_DIALOG, meta } from '#meta';
+import { type Assistant } from '#types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'plugin-settings',
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
+        component: ({ data: { subject } }) => {
+          const { settings, updateSettings } = useSettingsState<Assistant.Settings>(subject.atom);
+          return <AssistantSettings settings={settings} onSettingsChange={updateSettings} />;
+        },
+      }),
+      Surface.create({
+        id: 'chat',
+        role: 'article',
+        filter: (data): data is { attendableId: string; subject: Chat.Chat; variant: undefined } =>
+          typeof data.attendableId === 'string' &&
+          Obj.instanceOf(Chat.Chat, data.subject) &&
+          data.variant !== ASSISTANT_COMPANION_VARIANT,
+        component: ({ data, role, ref }) => {
+          return <ChatContainer role={role} subject={data.subject} attendableId={data.attendableId} ref={ref} />;
+        },
+      }),
+      Surface.create({
+        id: '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',
+        filter: AppSurface.object(AppSurface.ObjectProperties, Agent.Agent),
+        component: ({ data }) => <AgentProperties subject={data.subject} />,
+      }),
+      Surface.create({
+        id: 'companion-chat',
+        role: 'article',
+        filter: (data): data is { subject: Chat.Chat | null; attendableId: string; companionTo: Obj.Unknown } =>
+          typeof data.attendableId === 'string' &&
+          Obj.isObject(data.companionTo) &&
+          (Obj.instanceOf(Chat.Chat, data.subject) || data.subject === null),
+        component: ({ data: { subject, attendableId, companionTo }, role, ref }) => (
+          <ChatCompanion
+            role={role}
+            subject={subject}
+            attendableId={attendableId}
+            companionTo={companionTo}
+            ref={ref}
+          />
+        ),
+      }),
+      Surface.create({
+        id: 'companion-invocations',
+        role: 'article',
+        filter: (data): data is { companionTo: Sequence } =>
+          (Obj.instanceOf(Sequence, data.companionTo) || Obj.instanceOf(Routine.Routine, data.companionTo)) &&
+          data.subject === 'invocations',
+        component: ({ data, role }) => {
+          const space = getSpace(data.companionTo);
+          const feed = space?.properties.invocationTraceFeed?.target;
+          const queueDxn = feed ? Feed.getQueueDxn(feed) : undefined;
+          // TODO(wittjosiah): Support invocation filtering for prompts.
+          const target = Obj.instanceOf(Routine.Routine, data.companionTo) ? undefined : data.companionTo;
+
+          return (
+            <Panel.Root role={role} className='dx-document'>
+              <Panel.Content asChild>
+                <InvocationTraceContainer db={space?.db} queueDxn={queueDxn} target={target} detailAxis='block' />
+              </Panel.Content>
+            </Panel.Root>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'blueprint',
+        filter: AppSurface.object(AppSurface.Article, Blueprint.Blueprint),
+        component: ({ data, role }) => (
+          <BlueprintArticle role={role} subject={data.subject} attendableId={data.attendableId} />
+        ),
+      }),
+      Surface.create({
+        id: 'prompt',
+        filter: AppSurface.object(AppSurface.Article, Routine.Routine),
+        component: ({ data, role }) => (
+          <RoutineArticle role={role} subject={data.subject} attendableId={data.attendableId} />
+        ),
+      }),
+      Surface.create({
+        id: ASSISTANT_DIALOG,
+        filter: AppSurface.component<ComponentProps<typeof ChatDialog>>(AppSurface.Dialog, ASSISTANT_DIALOG),
+        component: ({ data }) => <ChatDialog {...data.props} />,
+      }),
+      Surface.create({
+        id: '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) {
+            // 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} />;
+        },
+      }),
+      Surface.create({
+        id: 'status',
+        role: 'status-indicator',
+        component: () => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
+
+          return <TriggerStatus role='status-indicator' space={space} />;
+        },
+      }),
+      Surface.create({
+        id: 'prompts',
+        filter: AppSurface.subject(
+          Surface.makeType<{ subject: Obj.Any; attendableId: string }>('prompts'),
+          Obj.isObject,
+        ),
+        component: ({ data }) => <RoutineList subject={data.subject} />,
+      }),
+    ]),
+  ),
+);

package/src/capabilities/{settings/settings.ts → settings.ts}

@@ -8,8 +8,8 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
-import { meta } from '../../meta';
-import { Assistant, AssistantCapabilities } from '../../types';
+import { meta } from '#meta';
+import { Assistant, AssistantCapabilities } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {

package/src/capabilities/{state/state.ts → state.ts}

@@ -2,13 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Atom } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
+import { type Obj } from '@dxos/echo';
 import { createKvsStore } from '@dxos/effect';
 
-import { meta } from '../../meta';
-import { AssistantCapabilities } from '../../types';
+import { meta } from '#meta';
+import { AssistantCapabilities } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {
@@ -19,9 +21,15 @@ export default Capability.makeModule(() =>
       schema: AssistantCapabilities.StateSchema,
       defaultValue: () => ({
         currentChat: {},
+        pendingPrompts: {},
       }),
     });
 
-    return Capability.contributes(AssistantCapabilities.State, stateAtom);
+    const companionChatCacheAtom = Atom.make<Record<string, Obj.Unknown | undefined>>({}).pipe(Atom.keepAlive);
+
+    return [
+      Capability.contributes(AssistantCapabilities.State, stateAtom),
+      Capability.contributes(AssistantCapabilities.CompanionChatCache, companionChatCacheAtom),
+    ];
   }),
 );

package/src/capabilities/toolkit.ts

@@ -0,0 +1,13 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { WebSearchToolkitOpaque } from '@dxos/assistant-toolkit';
+
+export default Capability.makeModule(() =>
+  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

@@ -0,0 +1,35 @@
+//
+// 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,
+      modelProvider: 'edge',
+    },
+  },
+};

package/src/components/AssistantSettings/AssistantSettings.tsx

@@ -2,119 +2,42 @@
 // Copyright 2023 DXOS.org
 //
 
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from '@dxos/ai';
-import { Input, Select, useTranslation } from '@dxos/react-ui';
-import { Settings } from '@dxos/react-ui-form';
+import { DEFAULT_EDGE_MODELS, DEFAULT_LMSTUDIO_MODELS, DEFAULT_OLLAMA_MODELS } from '@dxos/ai';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+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';
+import { meta } from '#meta';
+import { Assistant } from '#types';
 
-// TODO(burdon): Factor out default Selector.
-const DEFAULT_VALUE = '__default';
+export type AssistantSettingsProps = AppSurface.SettingsArticleProps<Assistant.Settings>;
 
-const LLM_PROVIDER_LABELS = {
-  edge: 'DXOS',
-  ollama: 'Ollama',
-  lmstudio: 'LM Studio',
-} as const;
-
-export type AssistantSettingsComponentProps = {
-  settings: Assistant.Settings;
-  onSettingsChange: (fn: (current: Assistant.Settings) => Assistant.Settings) => void;
-};
-
-export const AssistantSettings = ({ settings, onSettingsChange }: AssistantSettingsComponentProps) => {
+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 (
-    <Settings.Root>
-      <Settings.Section title={t('settings title', { ns: meta.id })}>
-        <Settings.Group>
-          <Settings.ItemInput title={t('settings custom prompts label')}>
-            <Input.Switch
-              checked={!!settings.customPrompts}
-              onCheckedChange={(checked) => onSettingsChange((s) => ({ ...s, customPrompts: checked }))}
-            />
-          </Settings.ItemInput>
-
-          <Settings.ItemInput title={t('settings llm provider label')}>
-            <Select.Root
-              value={settings.llmProvider ?? 'edge'}
-              onValueChange={(value) => {
-                onSettingsChange((s) => ({
-                  ...s,
-                  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>
-          </Settings.ItemInput>
-
-          <Settings.ItemInput title={t('settings edge llm model label')}>
-            <Select.Root
-              value={settings.edgeModel ?? DEFAULT_VALUE}
-              onValueChange={(value) => {
-                onSettingsChange((s) => ({ ...s, 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>
-          </Settings.ItemInput>
-
-          <Settings.ItemInput title={t('settings ollama llm model label')}>
-            <Select.Root
-              value={settings.ollamaModel ?? DEFAULT_VALUE}
-              onValueChange={(value) => {
-                onSettingsChange((s) => ({ ...s, 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>
-          </Settings.ItemInput>
-        </Settings.Group>
-      </Settings.Section>
-    </Settings.Root>
+    <SettingsForm.Viewport>
+      <SettingsForm.Section title={t('settings.title', { ns: meta.id })}>
+        <SettingsForm.FieldSet<Assistant.Settings>
+          readonly={!onSettingsChange}
+          schema={Assistant.Settings}
+          fieldMap={fieldMap}
+          values={settings}
+          onValuesChanged={(values) => onSettingsChange?.(() => values)}
+        />
+      </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';