@dxos/plugin-assistant 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.21d9917",
+  "version": "0.8.4-main.2244d791bb",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -58,116 +58,119 @@
     "@codemirror/lint": "6.8.5",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/ai": "0.32.1",
-    "@effect/ai-anthropic": "0.22.0",
-    "@effect/ai-openai": "0.36.0",
-    "@effect/experimental": "0.57.11",
-    "@effect/platform-browser": "0.73.0",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/ai-anthropic": "0.23.0",
+    "@effect/ai-openai": "0.37.2",
+    "@effect/experimental": "0.58.0",
+    "@effect/platform-browser": "0.74.0",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "exa-js": "^1.5.12",
     "json5": "^2.2.3",
     "jsonpointer": "^5.0.1",
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.21d9917",
-    "@dxos/app-framework": "0.8.4-main.21d9917",
-    "@dxos/assistant": "0.8.4-main.21d9917",
-    "@dxos/async": "0.8.4-main.21d9917",
-    "@dxos/assistant-toolkit": "0.8.4-main.21d9917",
-    "@dxos/blueprints": "0.8.4-main.21d9917",
-    "@dxos/client": "0.8.4-main.21d9917",
-    "@dxos/compute": "0.8.4-main.21d9917",
-    "@dxos/conductor": "0.8.4-main.21d9917",
-    "@dxos/config": "0.8.4-main.21d9917",
-    "@dxos/context": "0.8.4-main.21d9917",
-    "@dxos/debug": "0.8.4-main.21d9917",
-    "@dxos/devtools": "0.8.4-main.21d9917",
-    "@dxos/echo": "0.8.4-main.21d9917",
-    "@dxos/echo-atom": "0.8.4-main.21d9917",
-    "@dxos/echo-db": "0.8.4-main.21d9917",
-    "@dxos/echo-query": "0.8.4-main.21d9917",
-    "@dxos/echo-protocol": "0.8.4-main.21d9917",
-    "@dxos/effect": "0.8.4-main.21d9917",
-    "@dxos/functions": "0.8.4-main.21d9917",
-    "@dxos/edge-client": "0.8.4-main.21d9917",
-    "@dxos/functions-runtime": "0.8.4-main.21d9917",
-    "@dxos/graph": "0.8.4-main.21d9917",
-    "@dxos/invariant": "0.8.4-main.21d9917",
-    "@dxos/keys": "0.8.4-main.21d9917",
-    "@dxos/lit-ui": "0.8.4-main.21d9917",
-    "@dxos/log": "0.8.4-main.21d9917",
-    "@dxos/operation": "0.8.4-main.21d9917",
-    "@dxos/plugin-automation": "0.8.4-main.21d9917",
-    "@dxos/plugin-attention": "0.8.4-main.21d9917",
-    "@dxos/plugin-client": "0.8.4-main.21d9917",
-    "@dxos/plugin-deck": "0.8.4-main.21d9917",
-    "@dxos/plugin-graph": "0.8.4-main.21d9917",
-    "@dxos/plugin-map": "0.8.4-main.21d9917",
-    "@dxos/plugin-space": "0.8.4-main.21d9917",
-    "@dxos/react-client": "0.8.4-main.21d9917",
-    "@dxos/protocols": "0.8.4-main.21d9917",
-    "@dxos/react-edge-client": "0.8.4-main.21d9917",
-    "@dxos/plugin-table": "0.8.4-main.21d9917",
-    "@dxos/react-ui-attention": "0.8.4-main.21d9917",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.21d9917",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.21d9917",
-    "@dxos/react-ui-chat": "0.8.4-main.21d9917",
-    "@dxos/react-ui-editor": "0.8.4-main.21d9917",
-    "@dxos/react-ui-components": "0.8.4-main.21d9917",
-    "@dxos/react-ui-form": "0.8.4-main.21d9917",
-    "@dxos/react-ui-graph": "0.8.4-main.21d9917",
-    "@dxos/react-ui-markdown": "0.8.4-main.21d9917",
-    "@dxos/react-ui-list": "0.8.4-main.21d9917",
-    "@dxos/react-ui-mosaic": "0.8.4-main.21d9917",
-    "@dxos/react-ui-searchlist": "0.8.4-main.21d9917",
-    "@dxos/react-ui-menu": "0.8.4-main.21d9917",
-    "@dxos/react-ui-sfx": "0.8.4-main.21d9917",
-    "@dxos/react-ui-stack": "0.8.4-main.21d9917",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.21d9917",
-    "@dxos/react-ui-tabs": "0.8.4-main.21d9917",
-    "@dxos/schema": "0.8.4-main.21d9917",
-    "@dxos/types": "0.8.4-main.21d9917",
-    "@dxos/ui": "0.8.4-main.21d9917",
-    "@dxos/plugin-transcription": "0.8.4-main.21d9917",
-    "@dxos/ui-editor": "0.8.4-main.21d9917",
-    "@dxos/util": "0.8.4-main.21d9917"
+    "@dxos/ai": "0.8.4-main.2244d791bb",
+    "@dxos/assistant-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/app-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/assistant": "0.8.4-main.2244d791bb",
+    "@dxos/app-framework": "0.8.4-main.2244d791bb",
+    "@dxos/blueprints": "0.8.4-main.2244d791bb",
+    "@dxos/async": "0.8.4-main.2244d791bb",
+    "@dxos/compute": "0.8.4-main.2244d791bb",
+    "@dxos/client": "0.8.4-main.2244d791bb",
+    "@dxos/conductor": "0.8.4-main.2244d791bb",
+    "@dxos/config": "0.8.4-main.2244d791bb",
+    "@dxos/context": "0.8.4-main.2244d791bb",
+    "@dxos/debug": "0.8.4-main.2244d791bb",
+    "@dxos/devtools": "0.8.4-main.2244d791bb",
+    "@dxos/echo-atom": "0.8.4-main.2244d791bb",
+    "@dxos/echo-db": "0.8.4-main.2244d791bb",
+    "@dxos/echo": "0.8.4-main.2244d791bb",
+    "@dxos/echo-query": "0.8.4-main.2244d791bb",
+    "@dxos/echo-protocol": "0.8.4-main.2244d791bb",
+    "@dxos/edge-client": "0.8.4-main.2244d791bb",
+    "@dxos/effect": "0.8.4-main.2244d791bb",
+    "@dxos/functions": "0.8.4-main.2244d791bb",
+    "@dxos/functions-runtime": "0.8.4-main.2244d791bb",
+    "@dxos/invariant": "0.8.4-main.2244d791bb",
+    "@dxos/graph": "0.8.4-main.2244d791bb",
+    "@dxos/keys": "0.8.4-main.2244d791bb",
+    "@dxos/lit-ui": "0.8.4-main.2244d791bb",
+    "@dxos/log": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-attention": "0.8.4-main.2244d791bb",
+    "@dxos/operation": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-automation": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-client": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-deck": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-graph": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-map": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-space": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-markdown": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-status-bar": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-table": "0.8.4-main.2244d791bb",
+    "@dxos/react-client": "0.8.4-main.2244d791bb",
+    "@dxos/protocols": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-attention": "0.8.4-main.2244d791bb",
+    "@dxos/react-edge-client": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-chat": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-transcription": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-components": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-form": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-graph": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-markdown": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-menu": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-editor": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-mosaic": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-searchlist": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-sfx": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2244d791bb",
+    "@dxos/schema": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-stack": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-list": "0.8.4-main.2244d791bb",
+    "@dxos/types": "0.8.4-main.2244d791bb",
+    "@dxos/ui": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-tabs": "0.8.4-main.2244d791bb",
+    "@dxos/util": "0.8.4-main.2244d791bb",
+    "@dxos/ui-editor": "0.8.4-main.2244d791bb"
   },
   "devDependencies": {
-    "@effect/platform": "0.93.6",
+    "@effect/platform": "0.94.4",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "openapi-types": "^12.1.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/assistant-toolkit": "0.8.4-main.21d9917",
-    "@dxos/devtools": "0.8.4-main.21d9917",
-    "@dxos/echo-db": "0.8.4-main.21d9917",
-    "@dxos/plugin-chess": "0.8.4-main.21d9917",
-    "@dxos/plugin-map": "0.8.4-main.21d9917",
-    "@dxos/plugin-table": "0.8.4-main.21d9917",
-    "@dxos/plugin-testing": "0.8.4-main.21d9917",
-    "@dxos/random": "0.8.4-main.21d9917",
-    "@dxos/react-ui-menu": "0.8.4-main.21d9917",
-    "@dxos/react-ui-table": "0.8.4-main.21d9917",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/storybook-utils": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/assistant-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/devtools": "0.8.4-main.2244d791bb",
+    "@dxos/echo-db": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-chess": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-map": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-testing": "0.8.4-main.2244d791bb",
+    "@dxos/random": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-table": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-menu": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/storybook-utils": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-table": "0.8.4-main.2244d791bb"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -4,12 +4,15 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
-import { ResearchGraph } from '@dxos/assistant-toolkit';
+import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Chat, Initiative, InitiativeBlueprint, Plan, ResearchGraph } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Obj, Type } from '@dxos/echo';
+import { type SpaceId } from '@dxos/keys';
 import { Operation } from '@dxos/operation';
+import { AutomationCapabilities } from '@dxos/plugin-automation/types';
 import { ClientEvents } from '@dxos/plugin-client/types';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space/types';
 import { type CreateObject } from '@dxos/plugin-space/types';
@@ -30,27 +33,19 @@ import {
 } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
-import { AssistantEvents } from './types';
-import { Assistant, AssistantOperation } from './types';
+import { AssistantEvents, AssistantOperation } from './types';
 
 export const AssistantPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addSettingsModule({ activate: Settings }),
-  Plugin.addModule({
-    // TODO(wittjosiah): Does not integrate with settings store.
-    //   Should this be a different event?
-    //   Should settings store be renamed to be more generic?
-    activatesOn: Common.ActivationEvent.SetupSettings,
-    activate: AssistantState,
-  }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
     metadata: [
       {
-        id: Type.getTypename(Assistant.Chat),
+        id: Type.getTypename(Chat.Chat),
         metadata: {
           icon: 'ph--atom--regular',
           iconHue: 'sky',
-          createObject: ((props) => Effect.sync(() => Assistant.make(props))) satisfies CreateObject,
+          createObject: ((props) => Effect.sync(() => Chat.make(props))) satisfies CreateObject,
         },
       },
       {
@@ -79,19 +74,51 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
           addToCollectionOnCreate: true,
         },
       },
+      {
+        id: Type.getTypename(Initiative.Initiative),
+        metadata: {
+          icon: 'ph--circuitry--regular',
+          iconHue: 'sky',
+          createObject: ((_, { db }) =>
+            Initiative.makeInitialized(
+              {
+                name: 'New Initiative',
+                spec: 'Not specified yet',
+              },
+              InitiativeBlueprint.make(),
+            ).pipe(withComputeRuntime(db.spaceId))) satisfies CreateObject,
+          addToCollectionOnCreate: true,
+        },
+      },
     ],
   }),
-  Common.Plugin.addSchemaModule({
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addSchemaModule({
     schema: [
-      Assistant.Chat,
-      Assistant.CompanionTo,
+      Chat.Chat,
+      Chat.CompanionTo,
       Blueprint.Blueprint,
       HasSubject.HasSubject,
       Prompt.Prompt,
-      ResearchGraph,
+      ResearchGraph.ResearchGraph,
+      Initiative.Initiative,
+      Plan.Plan,
       Sequence,
     ],
   }),
+  AppPlugin.addSettingsModule({ activate: Settings }),
+  AppPlugin.addSurfaceModule({
+    activate: ReactSurface,
+    activatesBefore: [AppActivationEvents.SetupArtifactDefinition],
+  }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: AppActivationEvents.SetupSettings,
+    activate: AssistantState,
+  }),
   Plugin.addModule({
     id: 'on-space-created',
     activatesOn: SpaceEvents.SpaceCreated,
@@ -106,12 +133,6 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
     activatesOn: ClientEvents.SpacesReady,
     activate: Repair,
   }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
-  Common.Plugin.addSurfaceModule({
-    activate: ReactSurface,
-    activatesBefore: [Common.ActivationEvent.SetupArtifactDefinition],
-  }),
   Plugin.addModule({
     activatesOn: AssistantEvents.SetupAiServiceProviders,
     activate: EdgeModelResolver,
@@ -123,14 +144,26 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
   Plugin.addModule({
     activatesBefore: [AssistantEvents.SetupAiServiceProviders],
     // TODO(dmaretskyi): This should activate lazily when the AI chat is used.
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: AiService,
   }),
-  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
   Plugin.addModule({
     // TODO(wittjosiah): Use a different event.
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: Toolkit,
   }),
   Plugin.make,
 );
+
+// TODO(dmaretskyi): Extract to a helper module.
+const withComputeRuntime =
+  (spaceId: SpaceId) =>
+  <A, E, R>(
+    effect: Effect.Effect<A, E, R>,
+  ): Effect.Effect<A, E, Exclude<R, AutomationCapabilities.ComputeServices> | Capability.Service> =>
+    Effect.gen(function* () {
+      // TODO(dmaretskyi): Capability.get has `Error` in the error channel. We should throw those as defects instead.
+      const provider = yield* Capability.get(AutomationCapabilities.ComputeRuntime).pipe(Effect.orDie);
+      const runtime = yield* provider.getRuntime(spaceId).runtimeEffect;
+      return yield* effect.pipe(Effect.provide(runtime));
+    });

package/src/blueprints/assistant/blueprint.ts

@@ -0,0 +1,34 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type AppCapabilities } from '@dxos/app-toolkit';
+import { templates } from '@dxos/assistant';
+import { AssistantToolkit, SystemToolkit } from '@dxos/assistant-toolkit';
+import { Blueprint } from '@dxos/blueprints';
+
+import { AssistantFunctions } from './functions';
+
+const BLUEPRINT_KEY = 'dxos.org/blueprint/assistant';
+
+const functions = Object.values(AssistantFunctions);
+
+const deckTools = ['open-item'];
+
+const tools = [...AssistantToolkit.tools, ...SystemToolkit.tools, ...deckTools];
+
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Assistant',
+    tools: Blueprint.toolDefinitions({ functions, tools }),
+    instructions: templates.system,
+  });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions,
+  make,
+};
+
+export default blueprint;

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 → blueprints/assistant/functions}/object-list.ts

@@ -35,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* Database.Service.runSchemaQuery({ typename });
+    const [schema] = yield* Database.runSchemaQuery({ typename });
     const filter = schema ? Filter.type(schema) : Filter.typename(typename);
 
-    const objects = yield* Database.Service.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/{functions → blueprints/assistant/functions}/object-load.ts

@@ -7,9 +7,7 @@ import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId } from '@dxos/assistant';
-import { Entity } from '@dxos/echo';
-import { Database } from '@dxos/echo';
+import { Database, Entity, Type } from '@dxos/echo';
 import { defineFunction } from '@dxos/functions';
 
 // TODO(burdon): Move to toolkit (i.e., tool not function).
@@ -18,8 +16,7 @@ export default defineFunction({
   name: 'Load object',
   description: 'Loads the object.',
   inputSchema: Schema.Struct({
-    // TODO(dmaretskyi): Use Ref.
-    id: ArtifactId.annotations({
+    object: Type.Ref(Type.Obj).annotations({
       description: 'The ID of the object.',
     }),
     typename: Schema.String.annotations({
@@ -30,16 +27,16 @@ export default defineFunction({
     // TODO(wittjosiah): Type.Entity.Any
     object: Schema.Any,
   }),
-  handler: Effect.fn(function* ({ data: { id, typename } }) {
-    const object = yield* Database.Service.resolve(ArtifactId.toDXN(id));
+  handler: Effect.fn(function* ({ data: { object, typename } }) {
+    const loadedObject = yield* Database.load(object);
     return yield* Function.pipe(
-      Option.fromNullable(object),
-      Option.flatMap((object) => (Entity.getTypename(object) === typename ? Option.some(object) : Option.none())),
+      Option.fromNullable(loadedObject),
+      Option.flatMap((obj) => (Entity.getTypename(obj) === typename ? Option.some(obj) : Option.none())),
       Option.match({
         onNone: () => Effect.fail('Object not found.'),
-        onSome: (object) => {
-          // log.info('object', { object });
-          return Effect.succeed({ object });
+        onSome: (obj) => {
+          // log.info('object', { object: obj });
+          return Effect.succeed({ object: obj });
         },
       }),
     );

package/src/{functions → blueprints/assistant/functions}/object-search.ts

@@ -33,7 +33,7 @@ export default defineFunction({
     ),
   }),
   handler: Effect.fn(function* ({ data: { query } }) {
-    const objects = yield* Database.Service.runQuery(
+    const objects = yield* Database.runQuery(
       Query.select(Filter.text(query, { type: 'full-text' })).options({ allQueuesFromSpaces: true }),
     );
     const results = objects.map((object) => ({

package/src/blueprints/assistant/index.ts

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

package/src/blueprints/index.ts

@@ -2,11 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Blueprint } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
-
-import * as AssistantBlueprint from './assistant-blueprint';
-
-export { AssistantBlueprint };
-export const blueprints: Blueprint.Blueprint[] = AssistantBlueprint.blueprints;
-export const functions: FunctionDefinition[] = AssistantBlueprint.functions;
+export * from './assistant';

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

@@ -6,11 +6,12 @@ import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
 import { AiModelResolver } from '@dxos/ai';
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    const resolvers = yield* Capability.getAll(Common.Capability.AiModelResolver);
+    const resolvers = yield* Capability.getAll(AppCapabilities.AiModelResolver);
 
     // TODO(dmaretskyi): Extract function to reduce them.
     const combinedLayer = resolvers.reduce(
@@ -21,7 +22,7 @@ export default Capability.makeModule(
     return [
       // TODO(dmaretskyi): Read config from settings.
       Capability.contributes(
-        Common.Capability.AiServiceLayer,
+        AppCapabilities.AiServiceLayer,
         AiModelResolver.AiModelResolver.buildAiService.pipe(Layer.provide(combinedLayer)),
       ),
     ];