@dxos/plugin-assistant 0.8.4-main.1f223c7 → 0.8.4-main.2244d791bb

package/src/blueprints/assistant/functions/index.ts

@@ -0,0 +1,13 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import List from './object-list';
+import Load from './object-load';
+import Search from './object-search';
+
+export const AssistantFunctions = {
+  List,
+  Load,
+  Search,
+};

package/src/{functions/list.ts → blueprints/assistant/functions/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.runSchemaQuery({ typename });
     const filter = schema ? Filter.type(schema) : Filter.typename(typename);
 
-    const { objects } = yield* DatabaseService.runQuery(Query.select(filter));
+    const objects = yield* Database.runQuery(Query.select(filter));
     const results = objects.map((object) => ({
       dxn: Obj.getDXN(object).toString(),
       label: Obj.getLabel(object),

package/src/blueprints/assistant/functions/object-load.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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 { Database, Entity, Type } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
+
+// TODO(burdon): Move to toolkit (i.e., tool not function).
+export default defineFunction({
+  key: 'dxos.org/function/assistant/object-load',
+  name: 'Load object',
+  description: 'Loads the object.',
+  inputSchema: Schema.Struct({
+    object: Type.Ref(Type.Obj).annotations({
+      description: 'The ID of the object.',
+    }),
+    typename: Schema.String.annotations({
+      description: 'The typename of the object.',
+    }),
+  }),
+  outputSchema: Schema.Struct({
+    // TODO(wittjosiah): Type.Entity.Any
+    object: Schema.Any,
+  }),
+  handler: Effect.fn(function* ({ data: { object, typename } }) {
+    const loadedObject = yield* Database.load(object);
+    return yield* Function.pipe(
+      Option.fromNullable(loadedObject),
+      Option.flatMap((obj) => (Entity.getTypename(obj) === typename ? Option.some(obj) : Option.none())),
+      Option.match({
+        onNone: () => Effect.fail('Object not found.'),
+        onSome: (obj) => {
+          // log.info('object', { object: obj });
+          return Effect.succeed({ object: obj });
+        },
+      }),
+    );
+  }),
+});

package/src/blueprints/assistant/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.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/blueprints/assistant/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as AssistantBlueprint } from './blueprint';

package/src/{components/Toolbar → blueprints}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './Toolbar';
+export * from './assistant';

package/src/capabilities/ai-service/ai-service.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { AiModelResolver } from '@dxos/ai';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const resolvers = yield* Capability.getAll(AppCapabilities.AiModelResolver);
+
+    // TODO(dmaretskyi): Extract function to reduce them.
+    const combinedLayer = resolvers.reduce(
+      (acc, resolver) => resolver.pipe(Layer.provide(acc)),
+      AiModelResolver.AiModelResolver.fromModelMap({ name: 'Fallback' }, Effect.succeed({})), // Empty resolver as fallback.
+    );
+
+    return [
+      // TODO(dmaretskyi): Read config from settings.
+      Capability.contributes(
+        AppCapabilities.AiServiceLayer,
+        AiModelResolver.AiModelResolver.buildAiService.pipe(Layer.provide(combinedLayer)),
+      ),
+    ];
+  }),
+);

package/src/capabilities/ai-service/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const AiService = Capability.lazy('AiService', () => import('./ai-service'));

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

@@ -0,0 +1,200 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import { Chat } from '@dxos/assistant-toolkit';
+import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Sequence } from '@dxos/conductor';
+import { DXN, Database, Obj, type Ref } from '@dxos/echo';
+import { AtomObj } from '@dxos/echo-atom';
+import { invariant } from '@dxos/invariant';
+import { Operation, type OperationInvoker } from '@dxos/operation';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { getActiveSpace } from '@dxos/plugin-space';
+import { SpaceOperation } from '@dxos/plugin-space/types';
+import { Query } from '@dxos/react-client/echo';
+
+import { ASSISTANT_DIALOG, meta } from '../../meta';
+import { AssistantCapabilities, AssistantOperation } from '../../types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+
+    const extensions = yield* Effect.all([
+      GraphBuilder.createTypeExtension({
+        id: `${meta.id}/root`,
+        type: Chat.Chat,
+        actions: (chat) => {
+          const id = Obj.getDXN(chat).toString();
+          return Effect.succeed([
+            {
+              id: `${AssistantOperation.UpdateChatName.meta.key}/${id}`,
+              data: () => Operation.invoke(AssistantOperation.UpdateChatName, { chat }),
+              properties: {
+                label: ['chat update name label', { ns: meta.id }],
+                icon: 'ph--magic-wand--regular',
+                disposition: 'list-item',
+              },
+            },
+          ]);
+        },
+      }),
+
+      GraphBuilder.createExtension({
+        id: `${meta.id}/assistant`,
+        match: NodeMatcher.whenRoot,
+        actions: () =>
+          Effect.succeed([
+            {
+              id: `${LayoutOperation.UpdateDialog.meta.key}/assistant/open`,
+              data: Effect.fnUntraced(function* () {
+                const capabilities = yield* Capability.Service;
+                const client = yield* Capability.get(ClientCapabilities.Client);
+                const operationInvoker = yield* Capability.get(Capabilities.OperationInvoker);
+                const space = getActiveSpace(capabilities) ?? client.spaces.default;
+                const chat = yield* Effect.tryPromise(() => getOrCreateChat(operationInvoker.invokePromise, space.db));
+                if (!chat) {
+                  return;
+                }
+
+                yield* Operation.invoke(LayoutOperation.UpdateDialog, {
+                  subject: ASSISTANT_DIALOG,
+                  state: true,
+                  blockAlign: 'end',
+                  props: {
+                    chat,
+                  },
+                });
+              }),
+              properties: {
+                label: ['open assistant label', { ns: meta.id }],
+                icon: 'ph--sparkle--regular',
+                disposition: 'pin-end',
+                position: 'hoist',
+                keyBinding: {
+                  macos: 'shift+meta+k',
+                  windows: 'shift+ctrl+k',
+                },
+              },
+            },
+            {
+              id: `${meta.id}/reset-blueprints`,
+              data: Effect.fnUntraced(function* () {
+                const capabilities = yield* Capability.Service;
+                const client = yield* Capability.get(ClientCapabilities.Client);
+                const space = getActiveSpace(capabilities) ?? client.spaces.default;
+                const blueprints = yield* Effect.tryPromise(() =>
+                  space.db.query(Query.type(Blueprint.Blueprint)).run(),
+                );
+                for (const blueprint of blueprints) {
+                  space.db.remove(blueprint);
+                }
+                yield* Database.flush({ indexes: true });
+              }),
+              properties: {
+                label: ['reset blueprints label', { ns: meta.id }],
+                icon: 'ph--arrow-clockwise--regular',
+              },
+            },
+          ]),
+      }),
+
+      GraphBuilder.createExtension({
+        id: `${meta.id}/companion-chat`,
+        match: NodeMatcher.whenEchoObject,
+        connector: (object, get) =>
+          Effect.gen(function* () {
+            const state = get(yield* Capability.get(AssistantCapabilities.State));
+            const currentChatState = state.currentChat[Obj.getDXN(object).toString()];
+            // If no state, continue to allow chat initialization.
+            if (!currentChatState) {
+              return [
+                {
+                  id: [Obj.getDXN(object).toString(), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                  type: PLANK_COMPANION_TYPE,
+                  data: 'assistant-chat',
+                  properties: {
+                    label: ['assistant chat label', { ns: meta.id }],
+                    icon: 'ph--sparkle--regular',
+                    position: 'hoist',
+                    disposition: 'hidden',
+                  },
+                },
+              ];
+            }
+
+            const db = Obj.getDatabase(object);
+            const currentChatDxn = DXN.tryParse(currentChatState);
+            const currentChatRef = currentChatDxn ? db?.makeRef(currentChatDxn) : undefined;
+            const currentChat = currentChatRef ? get(AtomObj.make(currentChatRef as Ref.Ref<Obj.Unknown>)) : undefined;
+
+            // Return the resolved chat object, or fall back to 'assistant-chat' string if it can't be resolved.
+            // This ensures the companion remains visible even during transient states.
+            return [
+              {
+                id: [Obj.getDXN(object).toString(), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                type: PLANK_COMPANION_TYPE,
+                data: Obj.isObject(currentChat) ? currentChat : 'assistant-chat',
+                properties: {
+                  label: ['assistant chat label', { ns: meta.id }],
+                  icon: 'ph--sparkle--regular',
+                  position: 'hoist',
+                  disposition: 'hidden',
+                },
+              },
+            ];
+          }),
+      }),
+
+      GraphBuilder.createExtension({
+        id: `${meta.id}/invocations`,
+        match: NodeMatcher.whenAny(
+          NodeMatcher.whenEchoTypeMatches(Sequence),
+          NodeMatcher.whenEchoTypeMatches(Prompt.Prompt),
+        ),
+        connector: (node) =>
+          Effect.succeed([
+            {
+              id: [node.id, 'invocations'].join(ATTENDABLE_PATH_SEPARATOR),
+              type: PLANK_COMPANION_TYPE,
+              data: 'invocations',
+              properties: {
+                label: ['invocations label', { ns: meta.id }],
+                icon: 'ph--clock-countdown--regular',
+                disposition: 'hidden',
+              },
+            },
+          ]),
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);
+
+// TODO(burdon): Factor out.
+const getOrCreateChat = async (
+  invokePromise: OperationInvoker.OperationInvoker['invokePromise'],
+  db: Database.Database,
+): Promise<Chat.Chat | undefined> => {
+  // TODO(wittjosiah): This should be possible with a single query.
+  const allChats = await db.query(Query.type(Chat.Chat)).run();
+  const relatedChats = await db.query(Query.type(Chat.Chat).sourceOf(Chat.CompanionTo).source()).run();
+
+  const chats = allChats.filter((chat) => !relatedChats.includes(chat));
+  if (chats.length > 0) {
+    return chats.at(-1);
+  }
+
+  const { data } = await invokePromise(AssistantOperation.CreateChat, { db });
+  invariant(Obj.instanceOf(Chat.Chat, data?.object));
+  await invokePromise(SpaceOperation.AddObject, { target: db, object: data.object });
+  return data.object;
+};

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

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));

package/src/capabilities/blueprint-definition/blueprint-definition.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Record from 'effect/Record';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import {
+  AgentFunctions,
+  DiscordBlueprint,
+  EntityExtractionFunctions,
+  InitiativeBlueprint,
+  LinearBlueprint,
+  PlanningBlueprint,
+  ResearchBlueprint,
+  WebSearchBlueprint,
+} from '@dxos/assistant-toolkit';
+
+import { AssistantBlueprint } from '../../blueprints';
+
+const blueprintDefinition = Capability.makeModule<
+  [],
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+>(() =>
+  Effect.succeed([
+    Capability.contributes(AppCapabilities.BlueprintDefinition, {
+      ...AssistantBlueprint,
+      functions: [
+        // TODO(burdon): Co-locate all of these functions?
+        ...AssistantBlueprint.functions,
+        ...Record.values(AgentFunctions),
+        ...Record.values(EntityExtractionFunctions),
+      ],
+    }),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, ResearchBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, WebSearchBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, DiscordBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, LinearBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, InitiativeBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, PlanningBlueprint),
+  ]),
+);
+
+export default blueprintDefinition;

package/src/capabilities/blueprint-definition/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));

package/src/capabilities/edge-model-resolver/edge-model-resolver.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as AnthropicClient from '@effect/ai-anthropic/AnthropicClient';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { AnthropicResolver } from '@dxos/ai/resolvers';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+
+export type EdgeModelResolverCapabilities = [Capability.Capability<typeof AppCapabilities.AiModelResolver>];
+
+const edgeModelResolver = Capability.makeModule<[], EdgeModelResolverCapabilities>(() =>
+  Effect.succeed([
+    Capability.contributes(
+      AppCapabilities.AiModelResolver,
+      AnthropicResolver.make().pipe(
+        Layer.provide(
+          AnthropicClient.layer({
+            // TODO(dmaretskyi): Read endpoint from config/settings.
+            apiUrl: 'https://ai-service.dxos.workers.dev/provider/anthropic',
+          }),
+        ),
+        Layer.provide(FetchHttpClient.layer),
+      ),
+    ),
+  ]),
+);
+
+export default edgeModelResolver;

package/src/capabilities/edge-model-resolver/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const EdgeModelResolver = Capability.lazy('EdgeModelResolver', () => import('./edge-model-resolver'));

package/src/capabilities/index.ts

@@ -2,19 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
-
-export const AiService = lazy(() => import('./ai-service'));
-export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
-export const AssistantState = lazy(() => import('./state'));
-export const BlueprintDefinition = lazy(() => import('./blueprint-definition'));
-export const EdgeModelResolver = lazy(() => import('./edge-model-resolver'));
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const LocalModelResolver = lazy(() => import('./local-model-resolver'));
-export const ReactSurface = lazy(() => import('./react-surface'));
-export const Settings = lazy(() => import('./settings'));
-export const Toolkit = lazy(() => import('./toolkit'));
-export const ComputeRuntime = lazy(() => import('./compute-runtime'));
-
+export * from './ai-service';
+export * from './app-graph-builder';
 export * from './blueprint-definition';
-export * from './capabilities';
+export * from './edge-model-resolver';
+export * from './local-model-resolver';
+export * from './operation-resolver';
+export * from './react-surface';
+export * from './repair';
+export * from './settings';
+export * from './state';
+export * from './toolkit';

package/src/capabilities/local-model-resolver/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const LocalModelResolver = Capability.lazy('LocalModelResolver', () => import('./local-model-resolver'));

package/src/capabilities/local-model-resolver/local-model-resolver.ts

@@ -0,0 +1,38 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as OpenAiClient from '@effect/ai-openai/OpenAiClient';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { LMStudioResolver } from '@dxos/ai/resolvers';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+
+export type LocalModelResolverCapabilities = [Capability.Capability<typeof AppCapabilities.AiModelResolver>];
+
+/**
+ * To start LM Studio server:
+ * ```bash
+ * ~/.lmstudio/bin/lms server start --cors
+ * ```
+ */
+const localModelResolver = Capability.makeModule<[], LocalModelResolverCapabilities>(() =>
+  Effect.succeed([
+    Capability.contributes(
+      AppCapabilities.AiModelResolver,
+      LMStudioResolver.make().pipe(
+        Layer.provide(
+          OpenAiClient.layer({
+            apiUrl: LMStudioResolver.DEFAULT_LMSTUDIO_ENDPOINT,
+          }),
+        ),
+        Layer.provide(FetchHttpClient.layer),
+      ),
+    ),
+  ]),
+);
+
+export default localModelResolver;

package/src/capabilities/operation-resolver/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const OperationResolver = Capability.lazy('OperationResolver', () => import('./operation-resolver'));