@dxos/plugin-assistant 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/src/containers/index.ts

@@ -0,0 +1,15 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export * from './Project';
+
+export const AssistantSettings: ComponentType<any> = lazy(() => import('./AssistantSettings'));
+export const BlueprintArticle: ComponentType<any> = lazy(() => import('./BlueprintArticle'));
+export const ChatCompanion: ComponentType<any> = lazy(() => import('./ChatCompanion'));
+export const ChatContainer: ComponentType<any> = lazy(() => import('./ChatContainer'));
+export const ChatDialog: ComponentType<any> = lazy(() => import('./ChatDialog'));
+export const PromptArticle: ComponentType<any> = lazy(() => import('./PromptArticle'));
+export const TriggerStatus: ComponentType<any> = lazy(() => import('./TriggerStatus'));

package/src/hooks/useBlueprintRegistry.ts

@@ -4,8 +4,8 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useCapabilities } from '@dxos/app-framework/react';
+import { useCapabilities } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { type AiContextBinder } from '@dxos/assistant';
 import { Blueprint } from '@dxos/blueprints';
 import { type Database, Filter, Obj, Ref } from '@dxos/echo';
@@ -17,8 +17,11 @@ import { distinctBy } from '@dxos/util';
  */
 // TODO(burdon): Reconcile with eventual public registry.
 export const useBlueprintRegistry = () => {
-  const blueprints = useCapabilities(Common.Capability.BlueprintDefinition);
-  return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
+  const blueprintDefinitions = useCapabilities(AppCapabilities.BlueprintDefinition);
+  return useMemo(
+    () => new Blueprint.Registry(blueprintDefinitions.map((blueprint) => blueprint.make())),
+    [blueprintDefinitions],
+  );
 };
 
 export const useBlueprints = ({

package/src/hooks/useChatProcessor.ts

@@ -7,6 +7,7 @@ import type * as Runtime from 'effect/Runtime';
 import { useContext, useMemo, useState } from 'react';
 
 import { AiConversation } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/blueprints';
 import { log } from '@dxos/log';
 import { type Queue, type Space } from '@dxos/react-client/echo';
@@ -17,7 +18,7 @@ import { type Assistant } from '../types';
 
 export type UseChatProcessorProps = {
   space?: Space;
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
   preset?: AiServicePreset;
   services?: () => Promise<Runtime.Runtime<AiChatServices>>;
   blueprintRegistry?: Blueprint.Registry;

package/src/hooks/useChatServices.ts

@@ -6,7 +6,8 @@ import * as Effect from 'effect/Effect';
 import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework/react';
+import { useCapability } from '@dxos/app-framework/ui';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { type Key } from '@dxos/echo';
 import { TracingService } from '@dxos/functions';
 import { TracingServiceExt } from '@dxos/functions-runtime';
@@ -14,11 +15,10 @@ import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { useClient } from '@dxos/react-client';
 
 import { type AiChatServices } from '../processor';
-import { type Assistant } from '../types';
 
 export type UseChatServicesProps = {
   id?: Key.SpaceId;
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
 };
 
 /**

package/src/hooks/useChatToolbarActions.ts

@@ -6,7 +6,8 @@ import { Atom } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
 import { useMemo } from 'react';
 
-import { useOperationInvoker } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { Chat } from '@dxos/assistant-toolkit';
 import { Filter, Obj, Query } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
@@ -15,10 +16,10 @@ import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
 
 import { useChatContext } from '../components';
 import { meta } from '../meta';
-import { Assistant, AssistantOperation } from '../types';
+import { AssistantOperation } from '../types';
 
 export type ChatToolbarActionsProps = {
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
   companionTo?: Obj.Unknown;
 };
 
@@ -26,7 +27,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
   const { invoke } = useOperationInvoker();
   const { db } = useChatContext('useChatToolbarActions');
   const query = companionTo
-    ? Query.select(Filter.id(companionTo.id)).targetOf(Assistant.CompanionTo).source()
+    ? Query.select(Filter.id(companionTo.id)).targetOf(Chat.CompanionTo).source()
     : Query.select(Filter.nothing());
 
   // TODO(wittjosiah): Query in react vs query in atom?
@@ -98,7 +99,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
                   builder.action(
                     chat.id,
                     {
-                      label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Assistant.Chat.typename }],
+                      label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Chat.Chat.typename }],
                     },
                     () =>
                       Effect.gen(function* () {

package/src/hooks/useFilteredTypes.ts

@@ -10,8 +10,8 @@ import { EntityKind, SystemTypeAnnotation, getTypeAnnotation } from '@dxos/echo/
 
 // TODO(burdon): Pass in filter.
 // TODO(wittjosiah): Factor out.
-export const useFilteredTypes = (db?: Database.Database): Type.Entity.Any[] => {
-  const [types, setTypes] = useState<Type.Entity.Any[]>([]);
+export const useFilteredTypes = (db?: Database.Database): Type.AnyEntity[] => {
+  const [types, setTypes] = useState<Type.AnyEntity[]>([]);
   useEffect(() => {
     if (!db) {
       return;

package/src/hooks/useReferencesProvider.ts

@@ -4,8 +4,6 @@
 
 import { useMemo } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useCapabilities } from '@dxos/app-framework/react';
 import { type Space } from '@dxos/client/echo';
 import { Filter, Obj } from '@dxos/echo';
 import { type ReferencesProvider } from '@dxos/react-ui-chat';
@@ -14,8 +12,6 @@ import { type ReferencesProvider } from '@dxos/react-ui-chat';
  * Resolve references to objects in the space.
  */
 export const useReferencesProvider = (space?: Space): ReferencesProvider | undefined => {
-  const blueprints = useCapabilities(Common.Capability.BlueprintDefinition);
-
   return useMemo<ReferencesProvider | undefined>((): ReferencesProvider | undefined => {
     if (!space) {
       return undefined;
@@ -52,7 +48,7 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
         return { uri, label: Obj.getLabel(object) ?? '' };
       },
     } satisfies ReferencesProvider;
-  }, [space, blueprints]);
+  }, [space]);
 };
 
 const stringMatch = (query: string, label: string) => label.toLowerCase().startsWith(query.toLowerCase());

package/src/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './blueprints';
 export * from './capabilities';
 export * from './components';
 export * from './hooks';

package/src/meta.ts

@@ -6,7 +6,7 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/assistant',
+  id: 'org.dxos.plugin.assistant',
   name: 'Assistant',
   description: trim`
     Intelligent AI assistant that can analyze and interact with objects across your spaces.
@@ -18,4 +18,4 @@ export const meta: Plugin.Meta = {
   tags: ['labs'],
 };
 
-export const ASSISTANT_DIALOG = `${meta.id}/assistant/dialog`;
+export const ASSISTANT_DIALOG = `${meta.id}.assistant.dialog`;

package/src/processor/processor.test.ts

@@ -10,8 +10,9 @@ import * as Layer from 'effect/Layer';
 import * as Schema from 'effect/Schema';
 
 import { AiService } from '@dxos/ai';
+import { GenericToolkit } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
-import { AiConversation, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { AiConversation, ToolExecutionServices } from '@dxos/assistant';
 import { acquireReleaseResource } from '@dxos/effect';
 import { TestHelpers } from '@dxos/effect/testing';
 import { CredentialsService, QueueService, TracingService } from '@dxos/functions';
@@ -28,9 +29,6 @@ const TestToolkit = Toolkit.make(
   }),
 );
 
-// TODO(burdon): Create minimal toolkit.
-const toolkit = Toolkit.merge(TestToolkit) as Toolkit.Toolkit<any>;
-
 // TODO(burdon): Explain structure.
 const TestServicesLayer = Layer.mergeAll(
   TracingService.layerNoop,
@@ -45,10 +43,13 @@ const TestServicesLayer = Layer.mergeAll(
 
 const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
   AiService.model('@anthropic/claude-opus-4-0'),
-  makeToolResolverFromFunctions([], toolkit),
-  makeToolExecutionServiceFromFunctions(toolkit, toolkit.toLayer({}) as any),
+  ToolExecutionServices,
   CredentialsService.layerFromDatabase(),
-).pipe(Layer.provideMerge(TestServicesLayer), Layer.orDie);
+).pipe(
+  Layer.provideMerge(GenericToolkit.providerLayer(GenericToolkit.make(TestToolkit, TestToolkit.toLayer({} as any)))),
+  Layer.provideMerge(TestServicesLayer),
+  Layer.orDie,
+);
 
 // TODO(burdon): Create actual test with mock LLM.
 describe('Chat processor', () => {

package/src/processor/processor.ts

@@ -2,6 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
+import type * as Tool from '@effect/ai/Tool';
 import { Atom, Registry } from '@effect-atom/atom-react';
 import * as Cause from 'effect/Cause';
 import * as Effect from 'effect/Effect';
@@ -19,16 +20,19 @@ import {
   type ToolResolverService,
 } from '@dxos/ai';
 import {
+  AiContextService,
   type AiConversation,
   type AiConversationRunProps,
   ArtifactDiffResolver,
   GenerationObserver,
   createSystemPrompt,
 } from '@dxos/assistant';
+import { formatSystemPrompt } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
 import { type Database } from '@dxos/echo';
-import { runAndForwardErrors, throwCause } from '@dxos/effect';
+import { runAndForwardErrors, throwCause, unwrapExit } from '@dxos/effect';
 import {
   type CredentialsService,
   type FunctionInvocationService,
@@ -38,8 +42,6 @@ import {
 import { log } from '@dxos/log';
 import { type ContentBlock, Message } from '@dxos/types';
 
-import { type Assistant } from '../types';
-
 import { updateName } from './update-name';
 
 export type AiChatServices =
@@ -86,7 +88,7 @@ export class AiChatProcessor {
   private readonly _pending = Atom.make<Message.Message[]>([]);
 
   /** Currently streaming message (from the AI service). */
-  private readonly _streaming = Atom.make<Option.Option<Message.Message>>(Option.none());
+  private readonly _streaming = Atom.make<Message.Message[]>([]);
 
   /** Currently active request fiber. */
   private _fiber: Fiber.Fiber<void, any> | undefined;
@@ -95,18 +97,13 @@ export class AiChatProcessor {
   private _lastRequest: AiRequest | undefined;
 
   /** Streaming state. */
-  public readonly streaming = Atom.make<boolean>((get) => Option.isSome(get(this._streaming)));
+  public readonly streaming = Atom.make<boolean>((get) => get(this._streaming).length > 0);
 
   /** Active state. */
   public readonly active = Atom.make(false);
 
   /** Array of Messages (incl. the current message being streamed). */
-  public readonly messages = Atom.make<Message.Message[]>((get) =>
-    Option.match(get(this._streaming), {
-      onNone: () => get(this._pending),
-      onSome: (streaming) => [...get(this._pending), streaming],
-    }),
-  );
+  public readonly messages = Atom.make<Message.Message[]>((get) => [...get(this._pending), ...get(this._streaming)]);
 
   /** Last error. */
   public readonly error = Atom.make<Option.Option<Error>>(Option.none());
@@ -141,6 +138,30 @@ export class AiChatProcessor {
     return this._options.blueprintRegistry;
   }
 
+  get system(): string {
+    return this._options.system ?? '';
+  }
+
+  async getTools(): Promise<Record<string, Tool.Any>> {
+    return unwrapExit(await this._conversation.getTools().pipe(await Runtime.runPromiseExit(await this._services())));
+  }
+
+  async getSystemPrompt(): Promise<string> {
+    return unwrapExit(
+      await Effect.gen(this, function* () {
+        const blueprints = this.context.getBlueprints();
+        const objects = this.context.getObjects();
+        const system = yield* formatSystemPrompt({ system: this._options.system, blueprints, objects });
+        return system;
+      }).pipe(
+        Effect.provideService(AiContextService, {
+          binder: this.context,
+        }),
+        await Runtime.runPromiseExit(await this._services()),
+      ),
+    );
+  }
+
   /**
    * Initiates a new request.
    */
@@ -218,7 +239,7 @@ export class AiChatProcessor {
   /**
    * Update the current chat's name.
    */
-  async updateName(chat: Assistant.Chat): Promise<void> {
+  async updateName(chat: Chat.Chat): Promise<void> {
     const runtime = await this._services();
     await updateName(runtime, this._conversation, chat, this._options.model);
   }
@@ -247,29 +268,29 @@ export class AiChatProcessor {
     },
   };
 
-  private _onMessage = Effect.fn(
-    function* (this: AiChatProcessor, message: Message.Message) {
-      this._registry.set(this._streaming, Option.none());
-      this._registry.update(this._pending, (pending) => [...pending, message]);
-    }.bind(this),
-  );
-
+  // TODO(dmaretskyi): Due to the way effect streams do buffering, we cannot rely on _onBlock and _onMessage to be called in order.
   private _onBlock = Effect.fn(
     function* (this: AiChatProcessor, block: ContentBlock.Any) {
       this._registry.update(this._streaming, (streaming) => {
-        const blocks = streaming.pipe(
-          Option.map((streaming) => streaming.blocks.filter((b: ContentBlock.Any) => !b.pending)),
-          Option.getOrElse(() => []),
-        );
+        const blocks = streaming.filter((message) => message.blocks.every((block) => !block.pending));
 
-        return Option.some(
+        // AiSession emits a message per each assistant content-block, so we do the same.
+        return [
+          ...blocks,
           Obj.make(Message.Message, {
             created: new Date().toISOString(),
             sender: { role: 'assistant' },
-            blocks: [...blocks, block],
+            blocks: [block],
           }),
-        );
+        ];
       });
     }.bind(this),
   );
+
+  private _onMessage = Effect.fn(
+    function* (this: AiChatProcessor, message: Message.Message) {
+      this._registry.set(this._streaming, []);
+      this._registry.update(this._pending, (pending) => [...pending, message]);
+    }.bind(this),
+  );
 }

package/src/processor/update-name.ts

@@ -9,12 +9,11 @@ import * as Runtime from 'effect/Runtime';
 
 import { AiService, DEFAULT_EDGE_MODEL, type ModelName } from '@dxos/ai';
 import { type AiConversation, AiSession } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { Obj } from '@dxos/echo';
 import { throwCause } from '@dxos/effect';
 import { trim } from '@dxos/util';
 
-import { type Assistant } from '../types';
-
 import { type AiChatServices } from './processor';
 
 /**
@@ -24,7 +23,7 @@ import { type AiChatServices } from './processor';
 export const updateName = async (
   runtime: Runtime.Runtime<AiChatServices>,
   conversation: AiConversation,
-  chat: Assistant.Chat,
+  chat: Chat.Chat,
   model: ModelName = DEFAULT_EDGE_MODEL,
 ): Promise<void> => {
   const history = await conversation.getHistory();

package/src/testing/test-sequence.ts

@@ -9,16 +9,16 @@ export const RESEARCH_SEQUENCE_DEFINITION: SequenceDefinition = {
   steps: [
     {
       instructions: 'Research information and entities related to the selected objects.',
-      tools: [ToolId.make('search/web_search')],
+      tools: [ToolId.make('search/web-search')],
     },
     {
       instructions:
         'Based on your research find matching entires that are already in the graph. Do exaustive research.',
-      tools: [ToolId.make('search/local_search')],
+      tools: [ToolId.make('search/local-search')],
     },
     {
       instructions: 'Add researched data to the graph. Make connections to existing objects.',
-      tools: [ToolId.make('search/local_search'), ToolId.make('graph/writer')],
+      tools: [ToolId.make('search/local-search'), ToolId.make('graph/writer')],
     },
   ],
 };

package/src/testing/test-services.ts

@@ -6,7 +6,7 @@ import { Obj, type Type } from '@dxos/echo';
 
 import { type ApiAuthorization, type BaseServiceRegistry, ServiceType, categoryIcons } from '../types';
 
-const ServiceTypeSchema = ServiceType as unknown as Type.Obj.Any;
+const ServiceTypeSchema = ServiceType as unknown as Type.AnyObj;
 
 export class MockServiceRegistry implements BaseServiceRegistry {
   async queryServices(): Promise<ServiceType[]> {

package/src/translations.ts

@@ -2,13 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Chat, Project } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
 
 import { meta } from './meta';
-import { Assistant } from './types';
 
 // TODO(burdon): Standardize translation names.
 export const translations = [
@@ -21,6 +21,7 @@ export const translations = [
         'typename label_one': 'Blueprint',
         'typename label_other': 'Blueprints',
         'object name placeholder': 'New blueprint',
+        'add object label': 'Add blueprint',
         'rename object label': 'Rename blueprint',
         'delete object label': 'Delete blueprint',
         'object deleted label': 'Blueprint deleted',
@@ -31,6 +32,7 @@ export const translations = [
         'typename label_one': 'Prompt',
         'typename label_other': 'Prompts',
         'object name placeholder': 'New prompt',
+        'add object label': 'Add prompt',
         'rename object label': 'Rename prompt',
         'delete object label': 'Delete prompt',
         'object deleted label': 'Prompt deleted',
@@ -42,17 +44,30 @@ export const translations = [
         'typename label_one': 'Sequence',
         'typename label_other': 'Sequences',
         'object name placeholder': 'New sequence',
+        'add object label': 'Add sequence',
         'rename object label': 'Rename sequence',
         'delete object label': 'Delete sequence',
         'object deleted label': 'Sequence deleted',
       },
-      [Assistant.Chat.typename]: {
+      [Chat.Chat.typename]: {
         'typename label': 'AI Chat',
         'object name placeholder': 'New AI Chat',
+        'add object label': 'Add AI chat',
         'rename object label': 'Rename AI Chat',
         'delete object label': 'Delete AI Chat',
         'object deleted label': 'AI Chat deleted',
       },
+      [Project.Project.typename]: {
+        'typename label': 'Project',
+        'typename label_zero': 'Projects',
+        'typename label_one': 'Project',
+        'typename label_other': 'Projects',
+        'object name placeholder': 'New project',
+        'add object label': 'Add project',
+        'rename object label': 'Rename project',
+        'delete object label': 'Delete project',
+        'object deleted label': 'Project deleted',
+      },
       // TODO(burdon): Reconcile with react-ui-chat.
       [meta.id]: {
         'templates label': 'Templates',
@@ -83,6 +98,7 @@ export const translations = [
 
         'assistant dialog title': 'Assistant',
         'open assistant label': 'Open assistant',
+        'reset blueprints label': 'Reset blueprints',
 
         'no tools': 'No tools are configured',
         'no results': 'No results',
@@ -95,7 +111,7 @@ export const translations = [
         'chat update name label': 'Update AI Chat name',
 
         'toolkit label': 'Toolkit',
-        'summary label': 'Summary',
+        'stats label': 'Stats',
 
         'search placeholder': 'Search...',
         'prompt placeholder': 'Enter question or command...',
@@ -113,6 +129,16 @@ export const translations = [
         'settings llm provider label': 'LLM provider',
         'settings edge llm model label': 'Remote language model',
         'settings ollama llm model label': 'Ollama language model',
+
+        // Trigger status
+        'trigger status disabled label': 'Triggers disabled',
+        'trigger status idle label': 'Triggers idle',
+        'trigger status running label': 'Trigger running',
+        'trigger status error label': 'Trigger error',
+        'trigger runtime label': 'Trigger Runtime',
+        'trigger runtime description': 'Enable automatic trigger execution',
+        'trigger last invocation label': 'Last run',
+        'trigger duration label': 'Duration',
       },
     },
   },

package/src/types/Assistant.ts

@@ -4,47 +4,13 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Obj, Type } from '@dxos/echo';
-import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
-import { Queue } from '@dxos/echo-db';
+import { Chat as ChatModule } from '@dxos/assistant-toolkit';
 
 import { LLM_PROVIDERS } from './defs';
 
-/**
- * AI chat.
- */
-export const Chat = Schema.Struct({
-  name: Schema.String.pipe(Schema.optional),
-  queue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false)),
-  // TODO(dmaretskyi): Eventually this and the message queue will be the same.
-  traceQueue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false), Schema.optional),
-}).pipe(
-  Type.object({
-    typename: 'dxos.org/type/assistant/Chat',
-    version: '0.2.0',
-  }),
-  LabelAnnotation.set(['name']),
-);
-
-export interface Chat extends Schema.Schema.Type<typeof Chat> {}
-
-export const make = (props: Obj.MakeProps<typeof Chat>) => Obj.make(Chat, props);
-
-/**
- * Relation between a Chat and companion objects (e.g., artifacts).
- */
-export const CompanionTo = Schema.Struct({
-  id: Obj.ID,
-}).pipe(
-  Type.relation({
-    typename: 'dxos.org/relation/assistant/CompanionTo',
-    version: '0.1.0',
-    source: Chat,
-    target: Type.Obj,
-  }),
-);
-
-export interface CompanionTo extends Schema.Schema.Type<typeof CompanionTo> {}
+// Re-export Chat schema for backward compatibility.
+export const Chat = ChatModule.Chat;
+export type Chat = ChatModule.Chat;
 
 /**
  * Plugin settings.

package/src/types/AssistantAction.ts

@@ -5,21 +5,20 @@
 import * as Schema from 'effect/Schema';
 
 import { Capability } from '@dxos/app-framework';
+import { Chat } from '@dxos/assistant-toolkit';
 import { SpaceSchema } from '@dxos/client/echo';
-import { Database, Type } from '@dxos/echo';
+import { Database, Obj } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
 import { Operation } from '@dxos/operation';
-import { Collection } from '@dxos/schema';
 
 import { meta } from '../meta';
 
-import { Chat } from './Assistant';
-
 // Operations
-const ASSISTANT_OPERATION = `${meta.id}/operation`;
+const ASSISTANT_OPERATION = `${meta.id}.operation`;
 
 export namespace AssistantOperation {
   export const OnCreateSpace = Operation.make({
-    meta: { key: `${ASSISTANT_OPERATION}/on-create-space`, name: 'On Create Space' },
+    meta: { key: `${ASSISTANT_OPERATION}.on-create-space`, name: 'On Create Space' },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
@@ -31,37 +30,39 @@ export namespace AssistantOperation {
   });
 
   export const CreateChat = Operation.make({
-    meta: { key: `${ASSISTANT_OPERATION}/create-chat`, name: 'Create Chat' },
+    meta: { key: `${ASSISTANT_OPERATION}.create-chat`, name: 'Create Chat' },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
         db: Database.Database,
         name: Schema.optional(Schema.String),
+        /** If false, chat is created in-memory only and not added to space. Defaults to true. */
+        addToSpace: Schema.optional(Schema.Boolean),
       }),
       output: Schema.Struct({
-        object: Chat,
+        object: Chat.Chat,
       }),
     },
   });
 
   export const UpdateChatName = Operation.make({
-    meta: { key: `${ASSISTANT_OPERATION}/update-chat-name`, name: 'Update Chat Name' },
+    meta: { key: `${ASSISTANT_OPERATION}.update-chat-name`, name: 'Update Chat Name' },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
-        chat: Chat,
+        chat: Chat.Chat,
       }),
       output: Schema.Void,
     },
   });
 
   export const SetCurrentChat = Operation.make({
-    meta: { key: `${ASSISTANT_OPERATION}/set-current-chat`, name: 'Set Current Chat' },
+    meta: { key: `${ASSISTANT_OPERATION}.set-current-chat`, name: 'Set Current Chat' },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
-        companionTo: Type.Obj,
-        chat: Chat.pipe(Schema.optional),
+        companionTo: Obj.Unknown,
+        chat: Chat.Chat.pipe(Schema.optional),
       }),
       output: Schema.Void,
     },