@dxos/plugin-assistant 0.9.1-main.c7dcc2e112 → 0.10.0

package/src/components/ChatThread/registry.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 
 import { log } from '@dxos/log';
 import { ContentBlock, type Message } from '@dxos/types';
-import { type XmlWidgetRegistry, getXmlTextChild } from '@dxos/ui-editor';
+import { AnchorWidget, type XmlWidgetRegistry, getXmlTextChild } from '@dxos/ui-editor';
 
 import { type Assistant } from '../../types';
 import { type BlockRenderer, type MessageThreadContext } from './sync';
@@ -16,11 +16,12 @@ import {
   ReasoningWidget,
   ReferenceWidget,
   SelectWidget,
-  SuggestionWidget,
   StatsWidget,
+  StatusWidget,
+  SuggestionWidget,
   SummaryWidget,
+  SurfaceWidget,
   ToolWidget,
-  StatusWidget,
 } from './widgets';
 
 /**
@@ -39,7 +40,7 @@ export const componentRegistry: XmlWidgetRegistry = {
   // Block-only (no widget — see note above).
   //
 
-  prompt: {
+  'prompt': {
     block: true,
   },
 
@@ -47,7 +48,13 @@ export const componentRegistry: XmlWidgetRegistry = {
   // DOM Widgets
   //
 
-  synthetic: {
+  'link-preview': {
+    block: false,
+    urlSchemes: ['dxn:', 'echo:'],
+    factory: ({ label, dxn }) =>
+      typeof label === 'string' && typeof dxn === 'string' ? new AnchorWidget(label, dxn) : null,
+  },
+  'synthetic': {
     block: true,
     factory: ({ children, range }) => {
       const text = getXmlTextChild(children);
@@ -57,7 +64,7 @@ export const componentRegistry: XmlWidgetRegistry = {
       return text ? new ReasoningWidget(text, range.from) : null;
     },
   },
-  reasoning: {
+  'reasoning': {
     block: true,
     streaming: true,
     factory: ({ children, range }) => {
@@ -65,14 +72,14 @@ export const componentRegistry: XmlWidgetRegistry = {
       return text ? new ReasoningWidget(text, range.from) : null;
     },
   },
-  reference: {
+  'reference': {
     block: false,
     factory: ({ children, ref }) => {
       const text = getXmlTextChild(children);
       return text && ref ? new ReferenceWidget(text, ref) : null;
     },
   },
-  select: {
+  'select': {
     block: true,
     factory: ({ children }) => {
       const options = children
@@ -81,21 +88,21 @@ export const componentRegistry: XmlWidgetRegistry = {
       return options?.length ? new SelectWidget(options) : null;
     },
   },
-  suggestion: {
+  'suggestion': {
     block: true,
     factory: ({ children }) => {
       const text = getXmlTextChild(children);
       return text ? new SuggestionWidget(text) : null;
     },
   },
-  stats: {
+  'stats': {
     block: true,
     factory: ({ children }) => {
       const text = getXmlTextChild(children);
       return text ? new StatsWidget(text) : null;
     },
   },
-  status: {
+  'status': {
     block: true,
     streaming: true,
     factory: ({ children }) => {
@@ -108,11 +115,15 @@ export const componentRegistry: XmlWidgetRegistry = {
   // React Widgets (portaled outside of the editor)
   //
 
-  summary: {
+  'summary': {
     block: true,
     Component: SummaryWidget,
   },
-  toolCall: {
+  'surface': {
+    block: true,
+    Component: SurfaceWidget,
+  },
+  'toolCall': {
     block: true,
     Component: (props) => (
       <div className='py-2'>
@@ -120,11 +131,11 @@ export const componentRegistry: XmlWidgetRegistry = {
       </div>
     ),
   },
-  toolResult: {
+  'toolResult': {
     block: true,
     Component: FallbackWidget,
   },
-  toolkit: {
+  'toolkit': {
     block: true,
     Component: FallbackWidget,
   },
@@ -133,11 +144,11 @@ export const componentRegistry: XmlWidgetRegistry = {
   // Fallback
   //
 
-  json: {
+  'json': {
     block: true,
     Component: FallbackWidget,
   },
-};
+} as const;
 
 /**
  * Convert block to markdown.
@@ -261,6 +272,18 @@ const blockToMarkdownImpl = (context: MessageThreadContext, message: Message.Mes
       return renderXMLBlock('status', { content: block.statusText, pending: block.pending });
     }
 
+    case 'surface': {
+      if (block.pending) {
+        return;
+      }
+      // Carry the payload as JSON text content so it round-trips through the mixed XML parser
+      // without colliding with attribute quoting; `SurfaceWidget` re-parses it.
+      return renderXMLBlock('surface', {
+        content: JSON.stringify(block.data ?? {}),
+        attributes: `role="${escapeXmlAttribute(block.role)}"`,
+      });
+    }
+
     default: {
       // TODO(burdon): Needs stable ID.
       return `<json id="${message.id}">\n${JSON.stringify(block)}\n</json>`;
@@ -274,6 +297,9 @@ const blockToMarkdownImpl = (context: MessageThreadContext, message: Message.Mes
 const escapeXmlTextContent = (raw: string): string =>
   raw.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
+/** Escape a value embedded in a double-quoted XML attribute (e.g. a model-supplied surface role). */
+const escapeXmlAttribute = (raw: string): string => escapeXmlTextContent(raw).replace(/"/g, '&quot;');
+
 const renderXMLBlock = (tag: string, opts: { content?: string; pending?: boolean; attributes?: string }) => {
   // Replace paragraph breaks so that the markdown parser does not split the content into multiple paragraphs.
   // NOTE: do not strip leading list-marker prefixes (`-`, `*`, `1. `, ...) per line — the streaming

package/src/components/ChatThread/widgets/ReasoningWidget.stories.tsx

@@ -9,12 +9,12 @@ import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { ReasoningWidget } from './ReasoningWidget';
 
-export type DefaultStoryProps = {
+export type StoryArgs = {
   text: string;
 };
 
 // TODO(burdon): Generalize factory for DOM widgets.
-const DefaultStory = ({ text }: DefaultStoryProps) => {
+const DefaultStory = ({ text }: StoryArgs) => {
   const hostRef = useRef<HTMLDivElement>(null);
   useEffect(() => {
     const host = hostRef.current;

package/src/components/ChatThread/widgets/SurfaceWidget.tsx

@@ -0,0 +1,41 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+import { log } from '@dxos/log';
+import { type XmlWidgetProps, getXmlTextChild } from '@dxos/ui-editor';
+
+import { ChatSurface } from '#types';
+
+/**
+ * Renders an agent-requested UI surface (the `<surface>` content block) by dispatching to a
+ * registered {@link ChatSurface} surface keyed on its `role`. The payload is carried as JSON in the
+ * tag's text content; a malformed payload renders the surface with no data rather than throwing.
+ */
+export const SurfaceWidget = ({ role, children }: XmlWidgetProps<{ role?: string }>) => {
+  const data = useMemo(() => {
+    const raw = getXmlTextChild(children ?? []);
+    if (!raw) {
+      return undefined;
+    }
+    try {
+      const parsed: unknown = JSON.parse(raw);
+      // Model-supplied JSON payload: narrowed to a non-array object; no typed schema exists at this boundary.
+      return parsed != null && typeof parsed === 'object' && !Array.isArray(parsed)
+        ? (parsed as Record<string, unknown>)
+        : undefined;
+    } catch (err) {
+      log.warn('failed to parse surface data', { raw, err });
+      return undefined;
+    }
+  }, [children]);
+
+  if (!role) {
+    return null;
+  }
+
+  return <Surface.Surface type={ChatSurface} data={{ role, data }} limit={1} />;
+};

package/src/components/ChatThread/widgets/index.ts

@@ -9,5 +9,6 @@ export * from './SelectWidget';
 export * from './StatsWidget';
 export * from './StatusWidget';
 export * from './SummaryWidget';
+export * from './SurfaceWidget';
 export * from './SuggestionWidget';
 export * from './ToolWidget';

package/src/components/ProcessTree/ProcessTree.tsx

@@ -7,16 +7,8 @@ import * as Option from 'effect/Option';
 import React, { useMemo } from 'react';
 
 import { Process } from '@dxos/compute';
-import {
-  Icon,
-  IconButton,
-  ScrollArea,
-  Tooltip,
-  Treegrid,
-  TREEGRID_PATH_SEPARATOR,
-  composable,
-  composableProps,
-} from '@dxos/react-ui';
+import { Icon, IconButton, ScrollArea, Tooltip, composable, composableProps } from '@dxos/react-ui';
+import { Treegrid, TREEGRID_PATH_SEPARATOR } from '@dxos/react-ui-list';
 import { mx } from '@dxos/ui-theme';
 import { Unit } from '@dxos/util';
 

package/src/components/TaskList/TaskList.stories.tsx

@@ -15,12 +15,12 @@ import { TaskList } from './TaskList';
 const SUB_AGENT_PID = Process.ID.make('cf8f7243-5b1d-4902-b158-70d9107d5f43');
 const traceMessages = (subAgentFixture as unknown as Trace.Message[]).slice();
 
-type DefaultStoryProps = {
+type StoryArgs = {
   tasks?: Omit<Plan.Task, 'id'>[];
   traceMessages?: readonly Trace.Message[];
 };
 
-const DefaultStory = ({ tasks = [], traceMessages: traceMessagesProp }: DefaultStoryProps) => {
+const DefaultStory = ({ tasks = [], traceMessages: traceMessagesProp }: StoryArgs) => {
   const plan = React.useMemo(() => Plan.makePlan({ tasks }), [tasks]);
   return <TaskList plan={plan} traceMessages={traceMessagesProp} />;
 };

package/src/components/TaskList/TaskList.tsx

@@ -108,8 +108,8 @@ const TaskListItem = ({ task, space, traceMessages, conversationId }: TaskListIt
             {task.status === 'done' ? 'done' : task.status === 'in-progress' ? 'in progress' : 'to do'}
           </span>
           <span className='truncate flex-1'>{task.title}</span>
-          {task.status === 'in-progress' && <Tag palette='info'>pending</Tag>}
-          {task.agentPid && <Tag palette='info'>{Plan.formatAgentPidTag(task.agentPid)}</Tag>}
+          {task.status === 'in-progress' && <Tag hue='info'>pending</Tag>}
+          {task.agentPid && <Tag hue='info'>{Plan.formatAgentPidTag(task.agentPid)}</Tag>}
         </div>
         {showActivity && agentPid != null && <DelegatedTaskActivity agentPid={agentPid} lines={activityLines} />}
       </div>

package/src/components/Toolbox/Toolbox.tsx

@@ -4,7 +4,7 @@
 
 import React, { Fragment, useEffect, useState } from 'react';
 
-import { type Blueprint } from '@dxos/compute';
+import { type Skill } from '@dxos/compute';
 import { Operation } from '@dxos/compute';
 import { type Database, Filter, type Ref } from '@dxos/echo';
 import { log } from '@dxos/log';
@@ -21,19 +21,19 @@ export type ToolboxProps = {
   services?: { service: ServiceType }[];
   functions?: Operation.PersistentOperation[];
   // TODO(burdon): Combine into single array.
-  blueprints?: readonly Blueprint.Blueprint[];
-  activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
+  skills?: readonly Skill.Skill[];
+  activeSkills?: readonly Ref.Ref<Skill.Skill>[];
 };
 
 export const Toolbox = composable<HTMLDivElement, ToolboxProps>(
-  ({ functions, services, blueprints, activeBlueprints, ...props }, forwardedRef) => {
+  ({ functions, services, skills, activeSkills, ...props }, forwardedRef) => {
     return (
       <ScrollArea.Root {...composableProps(props)} thin orientation='vertical' ref={forwardedRef}>
         <ScrollArea.Viewport>
-          {blueprints && blueprints.length > 0 && (
+          {skills && skills.length > 0 && (
             <Section
-              title='Blueprints'
-              items={blueprints.map(({ name, description, tools }) => ({
+              title='Skills'
+              items={skills.map(({ name, description, tools }) => ({
                 name,
                 description,
                 subitems: tools.map((toolId) => ({ name: `∙ ${safeToolId(toolId)}` })),
@@ -41,10 +41,10 @@ export const Toolbox = composable<HTMLDivElement, ToolboxProps>(
             />
           )}
 
-          {activeBlueprints && activeBlueprints.length > 0 && (
+          {activeSkills && activeSkills.length > 0 && (
             <Section
-              title='Blueprints'
-              items={activeBlueprints.map(({ target }) => ({
+              title='Skills'
+              items={activeSkills.map(({ target }) => ({
                 name: target?.name ?? '',
                 description: target?.description ?? '',
                 subitems: target?.tools.map((toolId) => ({ name: `∙ ${safeToolId(toolId)}` })),
@@ -136,7 +136,7 @@ export const ToolboxPanel = ({ classNames, db, processor }: ToolboxPanelProps) =
   return (
     <Toolbox
       classNames={classNames}
-      blueprints={processor?.context.getBlueprints()}
+      skills={processor?.context.getSkills()}
       services={serviceTools}
       functions={functions}
     />

package/src/components/index.ts

@@ -3,17 +3,11 @@
 //
 // TODO(wittjosiah): Factor components out of plugin-assistant into a standalone package.
 
-import { type ComponentType, lazy } from 'react';
-
 export * from './AgentProperties';
 export * from './Chat';
 export { TracePanel } from '../containers/TracePanel/TracePanel';
 export * from './ProcessTree';
 export * from './TaskList';
-export * from './TemplateEditor';
 export * from './Toolbox';
 
-export const AssistantSettings: ComponentType<any> = lazy(() => import('./AssistantSettings'));
-export const RoutineProperties: ComponentType<any> = lazy(() => import('./RoutineProperties'));
-
 export { ChatPrompt, type ChatPromptProps } from './ChatPrompt/ChatPrompt';

package/src/constants.ts

@@ -2,7 +2,7 @@
 // Copyright 2026 DXOS.org
 //
 
-/** Stable id used by `plugin-integration` to look up the Anthropic provider entry. */
+/** Stable id used by `plugin-connector` to look up the Anthropic provider entry. */
 export const ANTHROPIC_PROVIDER_ID = 'anthropic';
 
 /** Source string used in `AccessToken.source` and matched by `Header.byokLayer('anthropic.com')`. */

package/src/containers/AgentArticle/AgentArticle.stories.tsx

@@ -7,18 +7,18 @@ import * as Effect from 'effect/Effect';
 import React from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Plan, Agent } from '@dxos/assistant-toolkit';
+import { Agent, Plan } from '@dxos/assistant-toolkit';
 import { Feed, Filter, Obj, Ref } from '@dxos/echo';
-import { AutomationPlugin } from '@dxos/plugin-automation/testing';
 import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { PreviewPlugin } from '@dxos/plugin-preview/testing';
+import { RoutinePlugin } from '@dxos/plugin-routine/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
 import { random } from '@dxos/random';
 import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { Loading, withTheme } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';
-import { createObjectFactory, TypeSpec } from '@dxos/schema/testing';
+import { TypeSpec, createObjectFactory } from '@dxos/schema/testing';
 import { Message, Organization, Person } from '@dxos/types';
 
 import { createMessage } from '#testing';
@@ -29,7 +29,7 @@ import { AgentArticle } from './AgentArticle';
 
 random.seed(1);
 
-type DefaultStoryProps = {
+type StoryArgs = {
   inputs?: boolean;
 };
 
@@ -42,7 +42,7 @@ const defaultSpec: TypeSpec[] = [
   { type: Person.Person, count: 10 },
 ];
 
-const DefaultStory = (_: DefaultStoryProps) => {
+const DefaultStory = (_: StoryArgs) => {
   const [space] = useSpaces();
   const [agent] = useQuery(space?.db, Filter.type(Agent.Agent));
   if (!agent) {
@@ -57,7 +57,7 @@ const meta = {
   render: DefaultStory,
   decorators: [
     withTheme(),
-    withPluginManager<DefaultStoryProps>(({ args: { inputs } }) => ({
+    withPluginManager<StoryArgs>(({ args: { inputs } }) => ({
       plugins: [
         ...corePlugins(),
         ClientPlugin({
@@ -87,7 +87,6 @@ const meta = {
               space.db.add(
                 Obj.make(Agent.Agent, {
                   instructions: Ref.make(Text.make()),
-                  plan: Ref.make(Plan.makePlan({ tasks: [] })),
                   artifacts: artifacts.map((obj) => ({
                     name: Obj.getLabel(obj) ?? 'Artifact',
                     data: Ref.make(obj),
@@ -98,7 +97,7 @@ const meta = {
               );
             }),
         }),
-        AutomationPlugin(),
+        RoutinePlugin(),
         AssistantPlugin(),
         PreviewPlugin(),
         StorybookPlugin({}),
@@ -109,7 +108,7 @@ const meta = {
     layout: 'fullscreen',
     translations,
   },
-} satisfies Meta<DefaultStoryProps>;
+} satisfies Meta<StoryArgs>;
 
 export default meta;
 

package/src/containers/AgentArticle/AgentArticle.tsx

@@ -34,7 +34,7 @@ export const AgentArticle = ({ role, subject: agent }: AgentArticleProps) => {
   // TODO(burdon): Clear input feed also.
   const resetHistory = useSpaceCallback(
     spaceId,
-    [Feed.FeedService, Database.Service] as const,
+    [Database.Service] as const,
     Effect.fnUntraced(function* () {
       yield* Agent.resetChatHistory(agent);
       if (!agent.feed) {

package/src/{components → containers}/AssistantSettings/AssistantSettings.stories.tsx

@@ -4,6 +4,7 @@
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 
+import { Provider } from '@dxos/ai';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '#translations';
@@ -11,7 +12,7 @@ import { translations } from '#translations';
 import { AssistantSettings } from './AssistantSettings';
 
 const meta = {
-  title: 'plugins/plugin-assistant/components/AssistantSettings',
+  title: 'plugins/plugin-assistant/containers/AssistantSettings',
   tags: ['settings'],
   component: AssistantSettings,
   decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
@@ -29,7 +30,7 @@ export const Default: Story = {
   args: {
     settings: {
       customPrompts: false,
-      modelProvider: 'edge',
+      modelProvider: Provider.edge.id,
     },
   },
 };

package/src/containers/AssistantSettings/AssistantSettings.tsx

@@ -0,0 +1,90 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { useAtomValue } from '@effect-atom/atom-react';
+import React, { useMemo } from 'react';
+
+import { Provider } from '@dxos/ai';
+import { useOptionalCapability } from '@dxos/app-framework/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { type DXN } from '@dxos/keys';
+import { useTranslation } from '@dxos/react-ui';
+import { Form, type FormFieldMap, createSelectField } from '@dxos/react-ui-form';
+
+import { meta } from '#meta';
+import { Assistant, AssistantCapabilities, Ollama } from '#types';
+
+import { presetsForProvider, resolveProvider } from '../../processor';
+import { OllamaModels } from './OllamaModels';
+
+export type AssistantSettingsProps = AppSurface.SettingsProps<Assistant.Settings>;
+
+// The per-provider model-default options must match the chat picker (usePresets): the catalog models
+// served by the provider, restricted to installed models when `installed` is supplied (local sidecar).
+const presetOptions = (provider: DXN.DXN, installed?: ReadonlySet<string>) =>
+  presetsForProvider(provider)
+    .filter((preset) => !installed || installed.has(preset.backend))
+    .map((preset) => ({ value: preset.model, label: preset.label }));
+
+export const AssistantSettings = ({ settings, onSettingsChange }: AssistantSettingsProps) => {
+  const { t } = useTranslation(meta.profile.key);
+
+  // The Ollama manager is the bundled sidecar (desktop only). Its presence selects the local
+  // provider: the managed `built-in` vs. an external `ollama` server.
+  const ollamaManager = useOptionalCapability(AssistantCapabilities.OllamaManager);
+  const localProvider = ollamaManager ? Provider.builtIn : Provider.ollama;
+  const localProviderKey = ollamaManager ? 'built-in' : 'ollama';
+
+  // Installed models reported by the bundled sidecar; restricts the local default to present models.
+  const localModels = useAtomValue(ollamaManager?.state ?? Ollama.emptyState);
+  const installed = useMemo(() => new Set(localModels.models.map((model) => model.name)), [localModels]);
+
+  // Reconcile a stored provider with the runtime (`ollama` → `built-in` on desktop) so the
+  // dropdown shows a concrete, available selection rather than blank.
+  const values = useMemo(
+    () => ({ ...settings, modelProvider: resolveProvider(settings.modelProvider, !!ollamaManager) }),
+    [settings, ollamaManager],
+  );
+
+  // Form `fieldMap` is keyed by dotted JSON path, so nested struct leaves are addressed directly.
+  const fieldMap = useMemo<FormFieldMap>(
+    () => ({
+      // `defaultLabel: null` drops the sentinel "Default" option — a provider is always concrete.
+      'modelProvider': createSelectField({
+        defaultLabel: null,
+        options: [
+          { value: Provider.edge.id, label: t('settings.provider.edge.label') },
+          { value: localProvider.id, label: t(`settings.provider.${localProviderKey}.label`) },
+          { value: Provider.lmStudio.id, label: t('settings.provider.lmstudio.label') },
+        ],
+      }),
+      'modelDefaults.edge': createSelectField({ options: presetOptions(Provider.edge.id) }),
+      // `built-in` and `ollama` share the `ollama` default key; the managed sidecar restricts to installed.
+      'modelDefaults.ollama': createSelectField({
+        options: presetOptions(localProvider.id, ollamaManager ? installed : undefined),
+      }),
+      'modelDefaults.lmstudio': createSelectField({ options: presetOptions(Provider.lmStudio.id) }),
+    }),
+    [t, localProvider, localProviderKey, ollamaManager, installed],
+  );
+
+  return (
+    <Form.Root
+      variant='settings'
+      schema={Assistant.Settings}
+      readonly={!onSettingsChange}
+      values={values}
+      onValuesChanged={(values) => onSettingsChange?.(() => values)}
+    >
+      <Form.Viewport scroll>
+        <Form.Content>
+          <Form.Section title={meta.profile.name ?? meta.profile.key}>
+            <Form.FieldSet fieldMap={fieldMap} />
+          </Form.Section>
+          <OllamaModels />
+        </Form.Content>
+      </Form.Viewport>
+    </Form.Root>
+  );
+};