@dxos/plugin-assistant 0.8.4-main.1da679c → 0.8.4-main.21d9917

package/src/components/Typewriter/assistant-extension.tsx

@@ -0,0 +1,144 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Diagnostic, linter } from '@codemirror/lint';
+import { type Extension, StateField } from '@codemirror/state';
+import { EditorView, type Tooltip, showTooltip } from '@codemirror/view';
+import * as LanguageModel from '@effect/ai/LanguageModel';
+import * as Effect from 'effect/Effect';
+import * as Runtime from 'effect/Runtime';
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+
+import { unwrapExit } from '@dxos/effect';
+import { log } from '@dxos/log';
+
+import { AssistantToolbar } from './AssistantToolbar';
+
+export const assistant = (runtime: Runtime.Runtime<LanguageModel.LanguageModel>): Extension[] => {
+  return [
+    assistantState(runtime),
+    assistantLinter(runtime),
+    EditorView.baseTheme({
+      '.cm-tooltip-assistant': {
+        backgroundColor: 'transparent !important',
+        border: 'none !important',
+        padding: '0 !important',
+      },
+    }),
+  ];
+};
+
+//
+// Toolbar State & Tooltip
+//
+
+const assistantState = (runtime: Runtime.Runtime<LanguageModel.LanguageModel>) =>
+  StateField.define<Tooltip | null>({
+    create: () => null,
+    update: (tooltip, tr): Tooltip | null => {
+      if (tr.selection || tr.docChanged) {
+        const { from, to } = tr.state.selection.main;
+        if (from === to) {
+          return null;
+        } // No selection
+
+        // Check if we should show tooltip
+        // We return a tooltip object
+        return {
+          pos: from,
+          above: false,
+          strictSide: true,
+          create: (view) => {
+            const dom = document.createElement('div');
+            dom.classList.add('cm-tooltip-assistant');
+            const root = createRoot(dom);
+
+            root.render(React.createElement(AssistantToolbar, { view, runtime, from, to }));
+
+            return {
+              dom,
+              destroy: () => {
+                // Delay unmount to allow animations if needed, but for now just cleanup
+                setTimeout(() => root.unmount(), 0);
+              },
+            };
+          },
+        };
+      }
+      return tooltip;
+    },
+    provide: (f) => showTooltip.from(f),
+  });
+
+//
+// Linter
+//
+
+const assistantLinter = (runtime: Runtime.Runtime<LanguageModel.LanguageModel>) =>
+  linter(async (view) => {
+    const text = view.state.doc.toString();
+    if (text.length < 10) {
+      return [];
+    }
+
+    // Run proofreading effect
+    const prompt = `Proofread the following text. Identify typos and simple grammar mistakes. Return ONLY a valid JSON array of objects with fields: "original" (string), "replacement" (string), "context" (string, 3-5 words around match). Text: \n\n${text}`;
+
+    // We mocked the model behavior in the story, but here we assume the model returns a string.
+    // In a real implementation we would parse the JSON.
+    // For this refactor, we just wire it up.
+
+    // NOTE: This runs on every doc view update that triggers linter. Linter is debounced by default (750ms).
+
+    try {
+      const result = unwrapExit(
+        await Effect.gen(function* () {
+          const generated = yield* LanguageModel.generateText({ prompt });
+          return generated.text;
+        }).pipe(Runtime.runPromiseExit(runtime)),
+      );
+
+      // Parse result - assuming simpler mock response format for now or we build a robust parser
+      // For the purpose of this task (UX demo), we can assume the mock returns a specific format or we parse it.
+      // Let's assume the mock returns a JSON string.
+
+      let suggestions: any[] = [];
+      try {
+        // Find JSON in response
+        const match = result.match(/\[.*\]/s);
+        if (match) {
+          suggestions = JSON.parse(match[0]);
+        }
+      } catch (e) {
+        // failed to parse
+      }
+
+      const diagnostics: Diagnostic[] = [];
+      for (const s of suggestions) {
+        // Naive finding of position
+        const idx = text.indexOf(s.original);
+        if (idx !== -1) {
+          diagnostics.push({
+            from: idx,
+            to: idx + s.original.length,
+            severity: 'info',
+            message: `Suggestion: ${s.replacement}`,
+            actions: [
+              {
+                name: 'Apply',
+                apply: (view, from, to) => {
+                  view.dispatch({ changes: { from, to, insert: s.replacement } });
+                },
+              },
+            ],
+          });
+        }
+      }
+      return diagnostics;
+    } catch (e) {
+      log.error('Proofreading failed', { error: e });
+      return [];
+    }
+  });

package/src/components/Typewriter/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './Typewriter';

package/src/components/index.ts

@@ -6,14 +6,11 @@ import { lazy } from 'react';
 
 export * from './AssistantSettings';
 export * from './Chat';
-export * from './ChatProgress';
-export * from './PromptSettings';
 export * from './TemplateEditor';
-export * from './Toolbar';
 export * from './Toolbox';
 
-export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
+export const BlueprintArticle = lazy(() => import('./BlueprintArticle'));
 export const ChatCompanion = lazy(() => import('./ChatCompanion'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
 export const ChatDialog = lazy(() => import('./ChatDialog'));
-export const SequenceContainer = lazy(() => import('./SequenceContainer'));
+export const PromptArticle = lazy(() => import('./PromptArticle'));

package/src/functions/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-export { default as analysis } from './analysis';
-export { default as list } from './list';
-export { default as load } from './load';
+export { default as list } from './object-list';
+export { default as load } from './object-load';
+export { default as search } from './object-search';

package/src/functions/{list.ts → object-list.ts}

@@ -2,20 +2,23 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { Filter, Obj, Query } from '@dxos/echo';
-import { DatabaseService, defineFunction } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
 import { trim } from '@dxos/util';
 
-// TODO(burdon): Factor out to space plugin.
+// TODO(burdon): Move to toolkit (i.e., tool not function).
 export default defineFunction({
-  name: 'dxos.org/function/assistant/list',
+  key: 'dxos.org/function/assistant/object-list',
+  name: 'List objects',
   description:
     // TODO(wittjosiah): Find a better way to prompt for looking up typenames before querying with them.
     trim`
       Lists the objects of the given type.
-      Check the list-schemas tool for available types before calling this function.
+      Check the get-schemas tool for available types before calling this function.
     `,
   inputSchema: Schema.Struct({
     typename: Schema.String.annotations({
@@ -32,10 +35,10 @@ export default defineFunction({
   }),
   handler: Effect.fn(function* ({ data: { typename } }) {
     // TODO(wittjosiah): Typename query is not working for dynamic schemas.
-    const [schema] = yield* DatabaseService.runSchemaQuery({ typename });
+    const [schema] = yield* Database.Service.runSchemaQuery({ typename });
     const filter = schema ? Filter.type(schema) : Filter.typename(typename);
 
-    const { objects } = yield* DatabaseService.runQuery(Query.select(filter));
+    const objects = yield* Database.Service.runQuery(Query.select(filter));
     const results = objects.map((object) => ({
       dxn: Obj.getDXN(object).toString(),
       label: Obj.getLabel(object),

package/src/functions/{load.ts → object-load.ts}

@@ -2,18 +2,23 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, Option, Schema, pipe } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
 
 import { ArtifactId } from '@dxos/assistant';
-import { Obj } from '@dxos/echo';
-import { DatabaseService, defineFunction } from '@dxos/functions';
+import { Entity } from '@dxos/echo';
+import { Database } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
 
-// TODO(burdon): Common error handling.
-// TODO(burdon): Factor out to space plugin.
+// TODO(burdon): Move to toolkit (i.e., tool not function).
 export default defineFunction({
-  name: 'dxos.org/function/assistant/load',
+  key: 'dxos.org/function/assistant/object-load',
+  name: 'Load object',
   description: 'Loads the object.',
   inputSchema: Schema.Struct({
+    // TODO(dmaretskyi): Use Ref.
     id: ArtifactId.annotations({
       description: 'The ID of the object.',
     }),
@@ -22,14 +27,14 @@ export default defineFunction({
     }),
   }),
   outputSchema: Schema.Struct({
-    // TODO(wittjosiah): Type.Obj.Any | Type.Relation.Any
+    // TODO(wittjosiah): Type.Entity.Any
     object: Schema.Any,
   }),
   handler: Effect.fn(function* ({ data: { id, typename } }) {
-    const object = yield* DatabaseService.resolve(ArtifactId.toDXN(id));
-    return yield* pipe(
+    const object = yield* Database.Service.resolve(ArtifactId.toDXN(id));
+    return yield* Function.pipe(
       Option.fromNullable(object),
-      Option.flatMap((object) => (Obj.getTypename(object) === typename ? Option.some(object) : Option.none())),
+      Option.flatMap((object) => (Entity.getTypename(object) === typename ? Option.some(object) : Option.none())),
       Option.match({
         onNone: () => Effect.fail('Object not found.'),
         onSome: (object) => {

package/src/functions/object-search.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+
+import { Filter, Obj, Query } from '@dxos/echo';
+import { Database } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
+import { trim } from '@dxos/util';
+
+// TODO(burdon): Move to toolkit (i.e., tool not function).
+export default defineFunction({
+  key: 'dxos.org/function/assistant/object-search',
+  name: 'Search objects',
+  description:
+    // TODO(wittjosiah): Find a better way to prompt for looking up typenames before querying with them.
+    trim`
+      Searches the objects using full-text search.
+    `,
+  inputSchema: Schema.Struct({
+    query: Schema.String.annotations({
+      description: 'The query to search for.',
+    }),
+  }),
+  outputSchema: Schema.Struct({
+    results: Schema.Array(
+      Schema.Struct({
+        dxn: Schema.String.annotations({ description: 'The DXN of the object.' }),
+        label: Schema.optional(Schema.String.annotations({ description: 'The label of the object.' })),
+      }),
+    ),
+  }),
+  handler: Effect.fn(function* ({ data: { query } }) {
+    const objects = yield* Database.Service.runQuery(
+      Query.select(Filter.text(query, { type: 'full-text' })).options({ allQueuesFromSpaces: true }),
+    );
+    const results = objects.map((object) => ({
+      dxn: Obj.getDXN(object).toString(),
+      label: Obj.getLabel(object),
+    }));
+
+    return { results };
+  }),
+});

package/src/hooks/index.ts

@@ -5,11 +5,11 @@
 export * from './useBlueprintRegistry';
 export * from './useChatProcessor';
 export * from './useChatServices';
+export * from './useChatToolbarActions';
 export * from './useContextBinder';
 export * from './useContextObjects';
-export * from './useExecutionGraph';
+export * from './useFilteredTypes';
 export * from './useFlush';
-export * from './useItemTypes';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';

package/src/hooks/useBlueprintRegistry.ts

@@ -2,27 +2,40 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useSignalEffect } from '@preact/signals-react';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
+import { Common } from '@dxos/app-framework';
+import { useCapabilities } from '@dxos/app-framework/react';
 import { type AiContextBinder } from '@dxos/assistant';
 import { Blueprint } from '@dxos/blueprints';
-import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, Ref } from '@dxos/echo';
-import { isNonNullable } from '@dxos/util';
+import { type Database, Filter, Obj, Ref } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
+import { distinctBy } from '@dxos/util';
 
 /**
  * Provide a registry of blueprints from plugins.
  */
 // TODO(burdon): Reconcile with eventual public registry.
 export const useBlueprintRegistry = () => {
-  const blueprints = useCapabilities(Capabilities.BlueprintDefinition);
+  const blueprints = useCapabilities(Common.Capability.BlueprintDefinition);
   return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
 };
 
-export const useBlueprints = ({ blueprintRegistry }: { blueprintRegistry?: Blueprint.Registry }) =>
-  useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+export const useBlueprints = ({
+  blueprintRegistry,
+  db,
+}: {
+  blueprintRegistry?: Blueprint.Registry;
+  db?: Database.Database;
+}) => {
+  const staticBlueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+  const spaceBlueprints = useQuery(db, Filter.type(Blueprint.Blueprint));
+  return useMemo(() => {
+    const blueprints = distinctBy([...staticBlueprints, ...spaceBlueprints], (b) => b.key);
+    blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
+    return blueprints;
+  }, [staticBlueprints, spaceBlueprints]);
+};
 
 /**
  * Create reactive map of active blueprints (by key).
@@ -30,22 +43,34 @@ export const useBlueprints = ({ blueprintRegistry }: { blueprintRegistry?: Bluep
 export const useActiveBlueprints = ({ context }: { context?: AiContextBinder }) => {
   const [active, setActive] = useState<Map<string, Blueprint.Blueprint>>(new Map());
 
-  useSignalEffect(() => {
-    const refs = [...(context?.blueprints.value ?? [])];
-    const blueprints = refs.map((ref) => ref.target).filter(isNonNullable);
-    setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
-  });
+  useEffect(() => {
+    if (!context) {
+      setActive(new Map());
+      return;
+    }
+
+    const updateActive = () => {
+      const blueprints = context.getBlueprints();
+      setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
+    };
+
+    // Set initial value.
+    updateActive();
+
+    // Subscribe to changes.
+    return context.subscribeBlueprints(updateActive);
+  }, [context]);
 
   return active;
 };
 
 // TODO(burdon): Move logic into binder.
 export const useBlueprintHandlers = ({
-  space,
+  db,
   context,
   blueprintRegistry,
 }: {
-  space: Space;
+  db: Database.Database;
   context?: AiContextBinder;
   blueprintRegistry?: Blueprint.Registry;
 }) => {
@@ -56,7 +81,7 @@ export const useBlueprintHandlers = ({
       }
 
       // Find existing cloned blueprint.
-      const { objects } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+      const objects = await db.query(Filter.type(Blueprint.Blueprint)).run();
       let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
       if (checked) {
         if (!storedBlueprint) {
@@ -66,14 +91,14 @@ export const useBlueprintHandlers = ({
           }
 
           // NOTE: Possible race condition with other peers.
-          storedBlueprint = space.db.add(Obj.clone(blueprint));
+          storedBlueprint = db.add(Obj.clone(blueprint));
         }
         await context.bind({ blueprints: [Ref.make(storedBlueprint)] });
       } else if (storedBlueprint) {
         await context.unbind({ blueprints: [Ref.make(storedBlueprint)] });
       }
     },
-    [space, context, blueprintRegistry],
+    [db, context, blueprintRegistry],
   );
 
   return { onUpdateBlueprint };

package/src/hooks/useChatProcessor.ts

@@ -2,19 +2,21 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RegistryContext } from '@effect-rx/rx-react';
-import { type Runtime } from 'effect';
-import { useContext, useMemo } from 'react';
+import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import type * as Runtime from 'effect/Runtime';
+import { useContext, useMemo, useState } from 'react';
 
 import { AiConversation } from '@dxos/assistant';
 import { type Blueprint } from '@dxos/blueprints';
 import { log } from '@dxos/log';
-import { type Queue } from '@dxos/react-client/echo';
+import { type Queue, type Space } from '@dxos/react-client/echo';
+import { useAsyncEffect } from '@dxos/react-ui';
 
 import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
 import { type Assistant } from '../types';
 
 export type UseChatProcessorProps = {
+  space?: Space;
   chat?: Assistant.Chat;
   preset?: AiServicePreset;
   services?: () => Promise<Runtime.Runtime<AiChatServices>>;
@@ -26,6 +28,7 @@ export type UseChatProcessorProps = {
  * Configure and create AiChatProcessor.
  */
 export const useChatProcessor = ({
+  space,
   chat,
   preset,
   services,
@@ -35,13 +38,26 @@ export const useChatProcessor = ({
   const observableRegistry = useContext(RegistryContext);
 
   // Create conversation from chat queue.
-  const conversation = useMemo(() => {
-    if (!chat?.queue.target) {
+  const [conversation, setConversation] = useState<AiConversation>();
+  useAsyncEffect(async () => {
+    if (!space || !chat) {
       return;
     }
 
-    return new AiConversation({ queue: chat.queue.target as Queue<any> });
-  }, [chat?.queue.target]);
+    // NOTE: Passing in space and getting queue from space rather than resolving the reference.
+    //  This is because if the chat isn't in a space yet, the reference will not be resolvable.
+    const queue = space.queues.get(chat.queue.dxn);
+    const conversation = new AiConversation({
+      queue: queue as Queue<any>,
+      registry: observableRegistry as Registry.Registry,
+    });
+    await conversation.open();
+    setConversation(conversation);
+    return () => {
+      void conversation.close();
+      setConversation(undefined);
+    };
+  }, [space, chat?.queue.dxn.toString()]);
 
   // Create processor.
   const processor = useMemo(() => {
@@ -49,12 +65,7 @@ export const useChatProcessor = ({
       return undefined;
     }
 
-    log('creating processor', {
-      preset,
-      model: preset?.model,
-      settings,
-    });
-
+    log('creating processor', { preset, model: preset?.model, settings });
     return new AiChatProcessor(conversation, services, {
       observableRegistry,
       blueprintRegistry,

package/src/hooks/useChatServices.ts

@@ -2,12 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, type Runtime } from 'effect';
+import * as Effect from 'effect/Effect';
+import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework';
-import { type Space } from '@dxos/client/echo';
+import { useCapability } from '@dxos/app-framework/react';
+import { type Key } from '@dxos/echo';
 import { TracingService } from '@dxos/functions';
+import { TracingServiceExt } from '@dxos/functions-runtime';
 import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { useClient } from '@dxos/react-client';
 
@@ -15,7 +17,7 @@ import { type AiChatServices } from '../processor';
 import { type Assistant } from '../types';
 
 export type UseChatServicesProps = {
-  space?: Space;
+  id?: Key.SpaceId;
   chat?: Assistant.Chat;
 };
 
@@ -24,25 +26,22 @@ export type UseChatServicesProps = {
  */
 // TODO(dmaretskyi): Better return type.
 export const useChatServices = ({
-  space,
+  id,
   chat,
 }: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
   const client = useClient();
-  space ??= client.spaces.default;
-
-  const computeRuntimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
+  id ??= client.spaces.default.id;
 
+  const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
   return useMemo(() => {
-    const runtime = computeRuntimeResolver.getRuntime(space.id);
+    const runtime = runtimeResolver.getRuntime(id);
     return () =>
       runtime.runPromise(
-        Effect.gen(function* () {
-          return yield* Effect.runtime<AiChatServices>().pipe(
-            Effect.provide(
-              chat?.traceQueue?.target ? TracingService.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
-            ),
-          );
-        }),
+        Effect.runtime<AiChatServices>().pipe(
+          Effect.provide(
+            chat?.traceQueue?.target ? TracingServiceExt.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
+          ),
+        ),
       );
-  }, [space, chat?.traceQueue?.target]);
+  }, [id, chat?.traceQueue?.target]);
 };