@dxos/plugin-assistant 0.8.2-main.12df754 → 0.8.2-main.2f9c567

package/dist/types/src/types/types.d.ts

@@ -1,27 +1,27 @@
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
 import { AIChatType } from './chat';
 import { TemplateType } from './template';
 export declare namespace AssistantAction {
-    const CreateChat_base: S.TaggedClass<CreateChat, "dxos.org/plugin/assistant/action/create-chat", {
-        readonly _tag: S.tag<"dxos.org/plugin/assistant/action/create-chat">;
+    const CreateChat_base: Schema.TaggedClass<CreateChat, "dxos.org/plugin/assistant/action/create-chat", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/assistant/action/create-chat">;
     } & {
-        input: S.Struct<{
-            spaceId: S.optional<typeof S.String>;
-            name: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            spaceId: Schema.optional<typeof Schema.String>;
+            name: Schema.optional<typeof Schema.String>;
         }>;
-        output: S.Struct<{
+        output: Schema.Struct<{
             object: typeof AIChatType;
         }>;
     }>;
     export class CreateChat extends CreateChat_base {
     }
-    const CreateTemplate_base: S.TaggedClass<CreateTemplate, "dxos.org/plugin/assistant/action/create-template", {
-        readonly _tag: S.tag<"dxos.org/plugin/assistant/action/create-template">;
+    const CreateTemplate_base: Schema.TaggedClass<CreateTemplate, "dxos.org/plugin/assistant/action/create-template", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/assistant/action/create-template">;
     } & {
-        input: S.Struct<{
-            name: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            name: Schema.optional<typeof Schema.String>;
         }>;
-        output: S.Struct<{
+        output: Schema.Struct<{
             object: typeof TemplateType;
         }>;
     }>;
@@ -29,11 +29,13 @@ export declare namespace AssistantAction {
     }
     export {};
 }
-export declare const AssistantSettingsSchema: S.mutable<S.Struct<{
-    llmProvider: S.optional<S.Literal<["edge", "ollama"]>>;
-    edgeModel: S.optional<typeof S.String>;
-    ollamaModel: S.optional<typeof S.String>;
-    customPrompts: S.optional<typeof S.Boolean>;
+export declare const LLM_PROVIDERS: readonly ["edge", "ollama", "lmstudio"];
+export declare const AssistantSettingsSchema: Schema.mutable<Schema.Struct<{
+    llmProvider: Schema.optional<Schema.Literal<["edge", "ollama", "lmstudio"]>>;
+    edgeModel: Schema.optional<typeof Schema.String>;
+    ollamaModel: Schema.optional<typeof Schema.String>;
+    lmstudioModel: Schema.optional<typeof Schema.String>;
+    customPrompts: Schema.optional<typeof Schema.Boolean>;
 }>>;
-export type AssistantSettingsProps = S.Schema.Type<typeof AssistantSettingsSchema>;
+export type AssistantSettingsProps = Schema.Schema.Type<typeof AssistantSettingsSchema>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,yBAAiB,eAAe,CAAC;;;;;;;;;;;;IAG/B,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAOlC;KAAG;;CACN;AAED,eAAO,MAAM,uBAAuB;;;;;GAOnC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,yBAAiB,eAAe,CAAC;;;;;;;;;;;;IAG/B,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAOlC;KAAG;;CACN;AAED,eAAO,MAAM,aAAa,yCAA0C,CAAC;AAErE,eAAO,MAAM,uBAAuB;;;;;;GAQnC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,uBAAuB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.2-main.12df754",
+  "version": "0.8.2-main.2f9c567",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,79 +42,82 @@
     "@lezer/highlight": "^1.2.1",
     "@preact/signals-core": "^1.6.0",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
-    "effect": "3.13.3",
+    "effect": "3.14.21",
     "jsonpointer": "^5.0.1",
     "lodash.get": "^4.4.2",
     "unified": "^11.0.0",
-    "@dxos/app-framework": "0.8.2-main.12df754",
-    "@dxos/assistant": "0.8.2-main.12df754",
-    "@dxos/async": "0.8.2-main.12df754",
-    "@dxos/artifact": "0.8.2-main.12df754",
-    "@dxos/compute": "0.8.2-main.12df754",
-    "@dxos/conductor": "0.8.2-main.12df754",
-    "@dxos/context": "0.8.2-main.12df754",
-    "@dxos/client": "0.8.2-main.12df754",
-    "@dxos/echo-db": "0.8.2-main.12df754",
-    "@dxos/echo-protocol": "0.8.2-main.12df754",
-    "@dxos/echo-schema": "0.8.2-main.12df754",
-    "@dxos/edge-client": "0.8.2-main.12df754",
-    "@dxos/functions": "0.8.2-main.12df754",
-    "@dxos/invariant": "0.8.2-main.12df754",
-    "@dxos/effect": "0.8.2-main.12df754",
-    "@dxos/keys": "0.8.2-main.12df754",
-    "@dxos/log": "0.8.2-main.12df754",
-    "@dxos/live-object": "0.8.2-main.12df754",
-    "@dxos/plugin-client": "0.8.2-main.12df754",
-    "@dxos/plugin-deck": "0.8.2-main.12df754",
-    "@dxos/local-storage": "0.8.2-main.12df754",
-    "@dxos/plugin-graph": "0.8.2-main.12df754",
-    "@dxos/plugin-inbox": "0.8.2-main.12df754",
-    "@dxos/plugin-script": "0.8.2-main.12df754",
-    "@dxos/plugin-sketch": "0.8.2-main.12df754",
-    "@dxos/plugin-space": "0.8.2-main.12df754",
-    "@dxos/plugin-transcription": "0.8.2-main.12df754",
-    "@dxos/plugin-stack": "0.8.2-main.12df754",
-    "@dxos/plugin-markdown": "0.8.2-main.12df754",
-    "@dxos/plugin-wnfs": "0.8.2-main.12df754",
-    "@dxos/react-client": "0.8.2-main.12df754",
-    "@dxos/react-edge-client": "0.8.2-main.12df754",
-    "@dxos/react-ui-canvas-compute": "0.8.2-main.12df754",
-    "@dxos/react-ui-canvas-editor": "0.8.2-main.12df754",
-    "@dxos/react-ui-components": "0.8.2-main.12df754",
-    "@dxos/react-ui-dnd": "0.8.2-main.12df754",
-    "@dxos/react-ui-sfx": "0.8.2-main.12df754",
-    "@dxos/react-ui-list": "0.8.2-main.12df754",
-    "@dxos/react-ui-editor": "0.8.2-main.12df754",
-    "@dxos/react-ui-stack": "0.8.2-main.12df754",
-    "@dxos/react-ui-form": "0.8.2-main.12df754",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.12df754",
-    "@dxos/schema": "0.8.2-main.12df754",
-    "@dxos/util": "0.8.2-main.12df754"
+    "@dxos/app-framework": "0.8.2-main.2f9c567",
+    "@dxos/assistant": "0.8.2-main.2f9c567",
+    "@dxos/artifact": "0.8.2-main.2f9c567",
+    "@dxos/client": "0.8.2-main.2f9c567",
+    "@dxos/compute": "0.8.2-main.2f9c567",
+    "@dxos/conductor": "0.8.2-main.2f9c567",
+    "@dxos/async": "0.8.2-main.2f9c567",
+    "@dxos/echo": "0.8.2-main.2f9c567",
+    "@dxos/echo-db": "0.8.2-main.2f9c567",
+    "@dxos/echo-protocol": "0.8.2-main.2f9c567",
+    "@dxos/echo-schema": "0.8.2-main.2f9c567",
+    "@dxos/context": "0.8.2-main.2f9c567",
+    "@dxos/edge-client": "0.8.2-main.2f9c567",
+    "@dxos/effect": "0.8.2-main.2f9c567",
+    "@dxos/invariant": "0.8.2-main.2f9c567",
+    "@dxos/functions": "0.8.2-main.2f9c567",
+    "@dxos/keys": "0.8.2-main.2f9c567",
+    "@dxos/log": "0.8.2-main.2f9c567",
+    "@dxos/local-storage": "0.8.2-main.2f9c567",
+    "@dxos/live-object": "0.8.2-main.2f9c567",
+    "@dxos/plugin-deck": "0.8.2-main.2f9c567",
+    "@dxos/plugin-client": "0.8.2-main.2f9c567",
+    "@dxos/plugin-markdown": "0.8.2-main.2f9c567",
+    "@dxos/plugin-graph": "0.8.2-main.2f9c567",
+    "@dxos/plugin-inbox": "0.8.2-main.2f9c567",
+    "@dxos/plugin-script": "0.8.2-main.2f9c567",
+    "@dxos/plugin-sketch": "0.8.2-main.2f9c567",
+    "@dxos/plugin-space": "0.8.2-main.2f9c567",
+    "@dxos/plugin-stack": "0.8.2-main.2f9c567",
+    "@dxos/plugin-transcription": "0.8.2-main.2f9c567",
+    "@dxos/plugin-wnfs": "0.8.2-main.2f9c567",
+    "@dxos/react-client": "0.8.2-main.2f9c567",
+    "@dxos/react-edge-client": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-canvas-editor": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-components": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-editor": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-dnd": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-canvas-compute": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-form": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-list": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-stack": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-sfx": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.2f9c567",
+    "@dxos/schema": "0.8.2-main.2f9c567",
+    "@dxos/util": "0.8.2-main.2f9c567"
   },
   "devDependencies": {
     "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "effect": "3.14.21",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-db": "0.8.2-main.12df754",
-    "@dxos/artifact-testing": "0.8.2-main.12df754",
-    "@dxos/plugin-chess": "0.8.2-main.12df754",
-    "@dxos/plugin-map": "0.8.2-main.12df754",
-    "@dxos/plugin-table": "0.8.2-main.12df754",
-    "@dxos/plugin-inbox": "0.8.2-main.12df754",
-    "@dxos/random": "0.8.2-main.12df754",
-    "@dxos/react-ui-theme": "0.8.2-main.12df754",
-    "@dxos/storybook-utils": "0.8.2-main.12df754",
-    "@dxos/react-ui": "0.8.2-main.12df754"
+    "@dxos/artifact-testing": "0.8.2-main.2f9c567",
+    "@dxos/echo-db": "0.8.2-main.2f9c567",
+    "@dxos/plugin-chess": "0.8.2-main.2f9c567",
+    "@dxos/plugin-inbox": "0.8.2-main.2f9c567",
+    "@dxos/plugin-table": "0.8.2-main.2f9c567",
+    "@dxos/plugin-map": "0.8.2-main.2f9c567",
+    "@dxos/random": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
+    "@dxos/react-ui": "0.8.2-main.2f9c567",
+    "@dxos/storybook-utils": "0.8.2-main.2f9c567"
   },
   "peerDependencies": {
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.12df754",
-    "@dxos/react-ui-theme": "0.8.2-main.12df754"
+    "@dxos/react-ui": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -15,7 +15,7 @@ import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, AssistantSettings } from './capabilities';
+import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
 import { meta } from './meta';
 import translations from './translations';
 import { AssistantAction, AIChatType, ServiceType, TemplateType } from './types';
@@ -30,7 +30,7 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/settings`,
       activatesOn: Events.SetupSettings,
-      activate: AssistantSettings,
+      activate: Settings,
     }),
     defineModule({
       id: `${meta.id}/module/metadata`,

package/src/capabilities/ai-client.ts

@@ -22,7 +22,6 @@ export default (context: PluginsContext) => {
   const ai = signal<AIServiceClient>(new AIServiceEdgeClient({ endpoint }));
 
   const unsubscribe = effect(() => {
-    // TODO(burdon): Could be undefined.
     const settings = context
       .requestCapability(Capabilities.SettingsStore)
       .getStore<AssistantSettingsProps>(ASSISTANT_PLUGIN)?.value;

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

@@ -12,11 +12,11 @@ import {
 } from '@dxos/app-framework';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';
 import { memoizeQuery } from '@dxos/plugin-space';
 import { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
-import { type Space, Filter, fullyQualifiedId, getSpace, isLiveObject, parseId } from '@dxos/react-client/echo';
+import { type Space, Filter, fullyQualifiedId, getSpace, isLiveObject } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
 import { AIChatType, AssistantAction, TemplateType } from '../types';
@@ -83,30 +83,6 @@ export default (context: PluginsContext) =>
       ],
     }),
 
-    createExtension({
-      id: `${ASSISTANT_PLUGIN}/service-registry`,
-      filter: (node): node is Node<null> => node.id === 'root',
-      connector: ({ node }) => {
-        const layout = context.requestCapability(Capabilities.Layout);
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const { spaceId } = parseId(layout.workspace);
-        const space = spaceId ? client.spaces.get(spaceId) : null;
-
-        return [
-          {
-            id: [node.id, 'service-registry'].join(ATTENDABLE_PATH_SEPARATOR),
-            type: DECK_COMPANION_TYPE,
-            data: space,
-            properties: {
-              label: ['service registry label', { ns: ASSISTANT_PLUGIN }],
-              icon: 'ph--plugs--regular',
-              disposition: 'hidden',
-            },
-          },
-        ];
-      },
-    }),
-
     createExtension({
       id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
       filter: (node): node is Node<AIChatType> =>

package/src/capabilities/index.ts

@@ -8,6 +8,6 @@ export const AiClient = lazy(() => import('./ai-client'));
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
-export const AssistantSettings = lazy(() => import('./settings'));
+export const Settings = lazy(() => import('./settings'));
 
 export * from './capabilities';

package/src/capabilities/react-surface.tsx

@@ -7,16 +7,9 @@ import React, { useMemo } from 'react';
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { isInstanceOf, getTypename } from '@dxos/echo-schema';
 import { SettingsStore } from '@dxos/local-storage';
-import { fullyQualifiedId, getSpace, isLiveObject, isSpace, type Space, type SpaceId } from '@dxos/react-client/echo';
+import { fullyQualifiedId, getSpace, isLiveObject, type SpaceId } from '@dxos/react-client/echo';
 
-import {
-  AssistantDialog,
-  AssistantSettings,
-  ChatContainer,
-  PromptSettings,
-  ServiceRegistry,
-  TemplateContainer,
-} from '../components';
+import { AssistantDialog, AssistantSettings, ChatContainer, PromptSettings, TemplateContainer } from '../components';
 import { ASSISTANT_PLUGIN, ASSISTANT_DIALOG } from '../meta';
 import { AIChatType, type AssistantSettingsProps, TemplateType } from '../types';
 
@@ -67,12 +60,6 @@ export default () =>
       filter: (data): data is { subject: TemplateType } => isInstanceOf(TemplateType, data.subject),
       component: ({ data, role }) => <TemplateContainer role={role} template={data.subject} />,
     }),
-    createSurface({
-      id: `${ASSISTANT_PLUGIN}/service-registry`,
-      role: 'deck-companion--service-registry',
-      filter: (data): data is { subject: Space } => isSpace(data.subject),
-      component: ({ data }) => <ServiceRegistry space={data.subject} />,
-    }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/prompt-settings`,
       role: 'object-settings',

package/src/components/AssistantSettings/AssistantSettings.tsx

@@ -9,11 +9,17 @@ import { Input, Select, useTranslation } from '@dxos/react-ui';
 import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
 
 import { ASSISTANT_PLUGIN } from '../../meta';
-import { type AssistantSettingsProps } from '../../types';
+import { LLM_PROVIDERS, type AssistantSettingsProps } from '../../types';
 
-// TODO(burdon): Factor out.
+// TODO(burdon): Factor out default Selector.
 const DEFAULT_VALUE = '__default';
 
+const LLM_PROVIDER_LABELS = {
+  edge: 'DXOS',
+  ollama: 'Ollama',
+  lmstudio: 'LM Studio',
+} as const;
+
 export const AssistantSettings = ({ settings }: { settings: AssistantSettingsProps }) => {
   const { t } = useTranslation(ASSISTANT_PLUGIN);
 
@@ -27,10 +33,26 @@ export const AssistantSettings = ({ settings }: { settings: AssistantSettingsPro
       </DeprecatedFormInput>
 
       <DeprecatedFormInput label={t('settings llm provider label')}>
-        <Input.Switch
-          checked={settings.llmProvider === 'ollama'}
-          onCheckedChange={(checked) => (settings.llmProvider = checked ? 'ollama' : 'edge')}
-        />
+        <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.Content>
+          </Select.Portal>
+        </Select.Root>
       </DeprecatedFormInput>
 
       <DeprecatedFormInput label={t('settings edge llm model label')}>

package/src/components/PromptSettings.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Match, type Schema as S } from 'effect';
+import { Match, type Schema } from 'effect';
 import React, { type ChangeEvent, useCallback } from 'react';
 
 import { debounce } from '@dxos/async';
@@ -17,7 +17,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
   const handleKindChange = useCallback(
     (value: string) => {
       const kind = Match.type<string>().pipe(
-        Match.withReturnType<S.Schema.Type<typeof TemplateKindSchema>>(),
+        Match.withReturnType<Schema.Schema.Type<typeof TemplateKindSchema>>(),
         Match.when('always', () => ({ include: 'always' })),
         Match.when('schema-matching', () => ({ include: 'schema-matching', typename: '' })),
         Match.when('automatically', () => ({ include: 'automatically', description: '' })),

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Schema as S } from 'effect';
+import { type Schema } from 'effect';
 import React, { Fragment, useEffect } from 'react';
 
 import { Input, Select, useTranslation } from '@dxos/react-ui';
@@ -15,7 +15,7 @@ import { type TemplateInput, TemplateInputType, type TemplateType } from '../../
 
 export type TemplateFormProps = {
   template: TemplateType;
-  schema?: S.Schema<any, any, any>;
+  schema?: Schema.Schema<any, any, any>;
   commandEditable?: boolean;
 };
 

package/src/components/Thread/ThreadContainer.stories.tsx

@@ -18,8 +18,9 @@ import {
 } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Message, type Tool } from '@dxos/artifact';
-import { genericTools, localServiceEndpoints, type IsObject } from '@dxos/artifact-testing';
+import { genericTools, localServiceEndpoints } from '@dxos/artifact-testing';
 import { AIServiceEdgeClient } from '@dxos/assistant';
+import { type Type } from '@dxos/echo';
 import { create, ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { DXN } from '@dxos/keys';
@@ -30,7 +31,7 @@ import { InboxPlugin } from '@dxos/plugin-inbox';
 import { MapPlugin } from '@dxos/plugin-map';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { TablePlugin } from '@dxos/plugin-table';
-import { randomQueueDxn, useQueue, useSpace } from '@dxos/react-client/echo';
+import { createQueueDxn, useQueue, useSpace } from '@dxos/react-client/echo';
 import { IconButton, Input, Toolbar } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
@@ -43,7 +44,7 @@ import translations from '../../translations';
 const endpoints = localServiceEndpoints;
 
 type RenderProps = {
-  items?: IsObject[];
+  items?: Type.AnyObject[];
   prompts?: string[];
 } & Pick<ThreadProps, 'debug'>;
 
@@ -76,7 +77,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   }, [aiClient, tools, space, dispatch, artifactDefinitions]);
 
   // Queue.
-  const [queueDxn, setQueueDxn] = useState<string>(() => randomQueueDxn().toString());
+  const [queueDxn, setQueueDxn] = useState<string>(() => createQueueDxn().toString());
   const queue = useQueue<Message>(DXN.tryParse(queueDxn));
 
   useEffect(() => {
@@ -159,7 +160,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
               iconOnly
               label='Clear history'
               icon='ph--trash--regular'
-              onClick={() => setQueueDxn(randomQueueDxn().toString())}
+              onClick={() => setQueueDxn(createQueueDxn().toString())}
             />
             <IconButton iconOnly label='Stop' icon='ph--stop--regular' onClick={() => processor?.cancel()} />
           </Input.Root>

package/src/components/Thread/ThreadMessage.tsx

@@ -105,7 +105,7 @@ const components: Record<string, BlockComponent> = {
     return (
       <ToggleContainer
         // open={open}
-        defaultOpen={block.disposition === 'cot' && block.pending}
+        defaultOpen={systemDispositions.includes(block.disposition ?? '') && block.pending}
         title={title}
         icon={
           block.pending ? (
@@ -115,7 +115,7 @@ const components: Record<string, BlockComponent> = {
       >
         <MarkdownViewer
           content={block.text}
-          classNames={['pbe-2', block.disposition === 'cot' && 'text-sm text-subdued']}
+          classNames={['pbe-2', systemDispositions.includes(block.disposition ?? '') && 'text-sm text-subdued']}
         />
       </ToggleContainer>
     );
@@ -193,4 +193,7 @@ const titles: Record<string, string> = {
   ['tool_use' as const]: 'Tool request',
   ['tool_result' as const]: 'Tool result',
   ['tool_list' as const]: 'Tools',
+  ['artifact-update' as const]: 'Artifact(s) changed',
 };
+
+const systemDispositions: string[] = ['cot', 'artifact-update'];

package/src/components/Toolbox/Toolbox.tsx

@@ -6,7 +6,7 @@ import React, { useState, useEffect, Fragment, type FC } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { parseToolName, type ArtifactDefinition, type Tool } from '@dxos/artifact';
-import { FunctionType } from '@dxos/functions/types';
+import { FunctionType } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';

package/src/components/index.ts

@@ -6,7 +6,6 @@ import { lazy } from 'react';
 
 export * from './AssistantSettings';
 export * from './PromptSettings';
-export * from './ServiceRegistry';
 export * from './TemplateEditor';
 export * from './Thread';
 export * from './Toolbox';

package/src/hooks/index.ts

@@ -5,7 +5,6 @@
 export * from './processor';
 
 export * from './useChatProcessor';
-export * from './useLocalTriggerManager';
 export * from './useMessageQueue';
 export * from './useServices';
 export * from './useTextInputEvents';

package/src/hooks/processor.ts

@@ -9,7 +9,7 @@ import { type ArtifactDefinition, type Message, type MessageContentBlock, type T
 import { type AIServiceClient, AISession, DEFAULT_EDGE_MODEL, type GenerateRequest } from '@dxos/assistant';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { type Space } from '@dxos/react-client/echo';
+import { getVersion, type Space } from '@dxos/react-client/echo';
 
 // TODO(burdon): Factor out.
 declare global {
@@ -99,7 +99,7 @@ export class ChatProcessor {
    * Make GPT request.
    */
   async request(message: string, options: RequestOptions = {}): Promise<Message[]> {
-    this._session = new AISession({ operationModel: 'immediate' });
+    this._session = new AISession({ operationModel: 'configured' });
 
     // Message complete.
     this._session.message.on((message) => {
@@ -125,10 +125,33 @@ export class ChatProcessor {
         client: this._ai,
         history: options.history ?? [],
         artifacts: this._artifacts ?? [],
+        requiredArtifactIds: this._artifacts?.map((artifact) => artifact.id) ?? [],
         tools: this._tools ?? [],
         prompt: message,
         systemPrompt: this._options.systemPrompt,
         extensions: this._extensions,
+        artifactDiffResolver: async (artifacts) => {
+          const space = this._extensions?.space;
+          if (!space) {
+            return new Map();
+          }
+          const versions = new Map();
+          await Promise.all(
+            artifacts.map(async (artifact) => {
+              const {
+                objects: [object],
+              } = await space.db.query({ id: artifact.id }).run();
+              if (!object) {
+                return;
+              }
+              versions.set(artifact.id, {
+                version: getVersion(object),
+                diff: `Current state: ${JSON.stringify(object)}`,
+              });
+            }),
+          );
+          return versions;
+        },
         generationOptions: {
           model: this._options.model,
         },

package/src/hooks/useChatProcessor.tsx

@@ -7,7 +7,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { Capabilities, useCapabilities, useCapability, useIntentDispatcher } from '@dxos/app-framework';
 import { type AssociatedArtifact, createSystemPrompt, type Tool } from '@dxos/artifact';
 import { DEFAULT_EDGE_MODEL, DEFAULT_OLLAMA_MODEL } from '@dxos/assistant';
-import { FunctionType } from '@dxos/functions/types';
+import { FunctionType } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
 import { Filter, fullyQualifiedId, type Space, useQuery } from '@dxos/react-client/echo';
@@ -33,7 +33,8 @@ export const useChatProcessor = ({
   chat,
   space,
   settings,
-  part = 'deck',
+  // part = 'deck',
+  part,
   associatedArtifact,
 }: UseChatProcessorProps): ChatProcessor => {
   const aiClient = useCapability(AssistantCapabilities.AiClient);

package/src/tools/function.ts

@@ -5,8 +5,8 @@
 import { defineTool, ToolResult } from '@dxos/artifact';
 import type { Tool } from '@dxos/artifact';
 import { toEffectSchema } from '@dxos/echo-schema';
-import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions/types';
-import type { FunctionType } from '@dxos/functions/types';
+import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
+import type { FunctionType } from '@dxos/functions';
 import { log } from '@dxos/log';
 import type { SpaceId } from '@dxos/react-client/echo';
 import { getMeta } from '@dxos/react-client/echo';

package/src/tools/openapi.ts

@@ -2,11 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
 import jsonpointer from 'jsonpointer';
 import { type OpenAPIV2, type OpenAPIV3_1 } from 'openapi-types';
 
 import { ToolResult, type Tool } from '@dxos/artifact';
-import { JsonSchemaType, normalizeSchema, S, toEffectSchema } from '@dxos/echo-schema';
+import { JsonSchemaType, normalizeSchema, toEffectSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { deepMapValues } from '@dxos/util';
@@ -82,7 +83,7 @@ export const createToolsFromApi = async (url: string, options?: CreateToolsFromA
       }
 
       log('inputSchema', { inputSchema });
-      S.validateSync(JsonSchemaType)(inputSchema);
+      Schema.validateSync(JsonSchemaType)(inputSchema);
 
       const description = methodItem.description ?? methodItem.summary;
       if (!description) {
@@ -200,7 +201,7 @@ const callApiEndpoint = async (endpoint: EndpointDescriptor, input: any) => {
 
         // Client-side validation
         const effectSchema = toEffectSchema(parameter.schema);
-        S.validateSync(effectSchema)(value);
+        Schema.validateSync(effectSchema)(value);
 
         if (body) {
           throw new Error(`Duplicate body parameter: ${parameter.name}`);