@dxos/plugin-assistant 0.8.4-main.9735255 → 0.8.4-main.9be5663bfe

package/src/blueprints/assistant/blueprint.test.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+
+import { AgentService } from '@dxos/assistant';
+import { DatabaseBlueprint, DatabaseHandlers } from '@dxos/assistant-toolkit';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
+import { Blueprint } from '@dxos/blueprints';
+import { Feed } from '@dxos/echo';
+import { TestHelpers } from '@dxos/effect/testing';
+import { ObjectId } from '@dxos/keys';
+import { Organization } from '@dxos/types';
+
+import AssistantBlueprint from './blueprint';
+
+ObjectId.dangerouslyDisableRandomness();
+
+const TestLayer = AssistantTestLayer({
+  aiServicePreset: 'edge-remote',
+  operationHandlers: DatabaseHandlers,
+  types: [Organization.Organization, Blueprint.Blueprint, Feed.Feed],
+  blueprints: [AssistantBlueprint.make(), DatabaseBlueprint.make()],
+  tracing: 'pretty',
+});
+
+describe('Assistant Blueprint', () => {
+  // TODO(dmaretskyi): Regenerate memoized conversation with ALLOW_LLM_GENERATION=1.
+  it.effect.skip(
+    'works with Database blueprint to create objects',
+    Effect.fnUntraced(
+      function* (_) {
+        const agent = yield* AgentService.createSession({
+          blueprints: [AssistantBlueprint.make(), DatabaseBlueprint.make()],
+        });
+        yield* agent.submitPrompt('Create a new organization called "Test Corp".');
+        yield* agent.waitForCompletion();
+      },
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    { timeout: 60_000 },
+  );
+});

package/src/blueprints/assistant/blueprint.ts

@@ -0,0 +1,31 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { LayoutOperation, type AppCapabilities } from '@dxos/app-toolkit';
+import { templates } from '@dxos/assistant';
+import { Blueprint } from '@dxos/blueprints';
+
+import { AssistantOperation } from '#operations';
+
+const BLUEPRINT_KEY = 'org.dxos.blueprint.assistant';
+
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Assistant',
+    tools: Blueprint.toolDefinitions({
+      // TODO(wittjosiah): LayoutOperation.Open requires Capability.Service which is only available
+      //   via the compute-runtime layer (plugin-automation). Once Capability.Service is propagated
+      //   through LocalFunctionExecutionService, this will work without the compute-runtime dependency.
+      operations: [LayoutOperation.Open, AssistantOperation.ResolveNavigationTargets],
+    }),
+    instructions: templates.system,
+  });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  make,
+};
+
+export default blueprint;

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 → 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)),
       ),
     ];

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

@@ -0,0 +1,217 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import { pipe } from 'effect/Function';
+import * as Option from 'effect/Option';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode, getActiveSpace, getPersonalSpace, 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, Filter, 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 { AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { Query } from '@dxos/react-client/echo';
+import { linkedSegment } from '@dxos/react-ui-attention';
+
+import { ASSISTANT_COMPANION_VARIANT, ASSISTANT_DIALOG, meta } from '#meta';
+import { AssistantOperation } from '#operations';
+import { AssistantCapabilities } from '#types';
+
+/** Match ECHO objects that are NOT chats. */
+const whenNonChatObject = NodeMatcher.whenAll(
+  NodeMatcher.whenEchoObject,
+  NodeMatcher.whenNot(NodeMatcher.whenEchoTypeMatches(Chat.Chat)),
+);
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+
+    const extensions = yield* Effect.all([
+      GraphBuilder.createTypeExtension({
+        id: 'root',
+        type: Chat.Chat,
+        actions: (chat) => {
+          return Effect.succeed([
+            Node.makeAction({
+              id: AssistantOperation.UpdateChatName.meta.key,
+              data: () =>
+                Effect.gen(function* () {
+                  // TODO(dmaretskyi): This goes away when composer will have unified operation invocations.
+                  const computeRuntime = yield* Capability.get(AutomationCapabilities.ComputeRuntime);
+                  const db = Obj.getDatabase(chat);
+                  invariant(db);
+                  const runtime = yield* computeRuntime.getRuntime(db.spaceId).runtimeEffect;
+                  yield* Operation.invoke(AssistantOperation.UpdateChatName, { chat }).pipe(Effect.provide(runtime));
+                }),
+              properties: {
+                label: ['chat-update-name.label', { ns: meta.id }],
+                icon: 'ph--magic-wand--regular',
+                disposition: 'list-item',
+              },
+            }),
+          ]);
+        },
+      }),
+
+      GraphBuilder.createExtension({
+        id: 'assistant',
+        match: NodeMatcher.whenRoot,
+        actions: () =>
+          Effect.succeed([
+            Node.makeAction({
+              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(client, capabilities) ?? getPersonalSpace(client);
+                if (!space) {
+                  return;
+                }
+                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',
+                },
+              },
+            }),
+            Node.makeAction({
+              id: 'reset-blueprints',
+              data: Effect.fnUntraced(function* () {
+                const capabilities = yield* Capability.Service;
+                const client = yield* Capability.get(ClientCapabilities.Client);
+                const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+                if (!space) {
+                  return;
+                }
+                const blueprints = yield* Effect.promise(
+                  (): Promise<Blueprint.Blueprint[]> => space.db.query(Filter.type(Blueprint.Blueprint)).run(),
+                );
+                for (const blueprint of blueprints) {
+                  space.db.remove(blueprint);
+                }
+                yield* Database.flush();
+              }),
+              properties: {
+                label: ['reset-blueprints.label', { ns: meta.id }],
+                icon: 'ph--arrow-clockwise--regular',
+              },
+            }),
+          ]),
+      }),
+
+      // Don't show assistant companion when a chat is already the primary object.
+      GraphBuilder.createExtension({
+        id: 'companion-chat',
+        match: whenNonChatObject,
+        connector: (object, get) =>
+          Effect.gen(function* () {
+            const state = get(yield* Capability.get(AssistantCapabilities.State));
+            const cache = get(yield* Capability.get(AssistantCapabilities.CompanionChatCache));
+            const objectDxn = Obj.getDXN(object).toString();
+
+            // Resolve chat from persisted state or transient cache.
+            const chat = pipe(
+              Option.fromNullable(state.currentChat[objectDxn]),
+              Option.flatMap((dxnStr) => Option.fromNullable(DXN.tryParse(dxnStr))),
+              Option.flatMap((dxn) => Option.fromNullable(Obj.getDatabase(object)?.makeRef(dxn))),
+              Option.map((ref) => get(AtomObj.make(ref as Ref.Ref<Obj.Unknown>))),
+              Option.filter(Obj.isObject),
+              Option.orElse(() => pipe(Option.fromNullable(cache[objectDxn]), Option.filter(Obj.isObject))),
+              Option.getOrNull,
+            );
+
+            return [
+              AppNode.makeCompanion({
+                id: linkedSegment(ASSISTANT_COMPANION_VARIANT),
+                label: ['assistant-chat.label', { ns: meta.id }],
+                icon: 'ph--sparkle--regular',
+                data: chat,
+                position: 'hoist',
+              }),
+            ];
+          }),
+      }),
+
+      GraphBuilder.createExtension({
+        id: 'invocations',
+        match: NodeMatcher.whenAny(
+          NodeMatcher.whenEchoTypeMatches(Sequence),
+          NodeMatcher.whenEchoTypeMatches(Prompt.Prompt),
+        ),
+        connector: () =>
+          Effect.succeed([
+            AppNode.makeCompanion({
+              id: 'invocations',
+              label: ['invocations.label', { ns: meta.id }],
+              icon: 'ph--clock-countdown--regular',
+              data: 'invocations',
+            }),
+          ]),
+      }),
+
+      GraphBuilder.createExtension({
+        id: 'trace',
+        match: NodeMatcher.whenRoot,
+        connector: () =>
+          Effect.succeed([
+            AppNode.makeDeckCompanion({
+              id: linkedSegment('trace'),
+              label: ['trace.label', { ns: meta.id }],
+              icon: 'ph--line-segments--regular',
+              data: 'trace' as const,
+              position: 'fallback',
+            }),
+          ]),
+      }),
+    ]);
+
+    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/blueprint-definition.ts

@@ -0,0 +1,58 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import {
+  AgentBlueprint,
+  AgentBlueprintHandlers,
+  AgentHandlers,
+  AgentWizardBlueprint,
+  AgentWizardHandlers,
+  BlueprintManagerBlueprint,
+  BlueprintManagerHandlers,
+  BrowserBlueprint,
+  DatabaseBlueprint,
+  DatabaseHandlers,
+  DiscordBlueprint,
+  EntityExtractionHandlers,
+  LinearBlueprint,
+  PlanningBlueprint,
+  ResearchBlueprint,
+  WebSearchBlueprint,
+  MemoryBlueprint,
+  AutomationBlueprint,
+} from '@dxos/assistant-toolkit';
+
+import { AssistantBlueprint } from '#blueprints';
+
+// TODO(dmaretskyi): Force this type for all Capability.makeModule calls.
+const blueprintDefinition: () => Effect.Effect<Capability.Capability<unknown>[]> = Capability.makeModule(() =>
+  Effect.succeed([
+    Capability.contributes(AppCapabilities.BlueprintDefinition, AssistantBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, BrowserBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, DatabaseBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, ResearchBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, WebSearchBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, DiscordBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, LinearBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, AgentBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, PlanningBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, MemoryBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, AutomationBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, BlueprintManagerBlueprint),
+    Capability.contributes(AppCapabilities.BlueprintDefinition, AgentWizardBlueprint),
+
+    Capability.contributes(Capabilities.OperationHandler, AgentHandlers),
+    Capability.contributes(Capabilities.OperationHandler, AgentBlueprintHandlers),
+    Capability.contributes(Capabilities.OperationHandler, BlueprintManagerHandlers),
+    Capability.contributes(Capabilities.OperationHandler, DatabaseHandlers),
+    Capability.contributes(Capabilities.OperationHandler, EntityExtractionHandlers),
+    Capability.contributes(Capabilities.OperationHandler, AgentWizardHandlers),
+  ]),
+);
+
+export default blueprintDefinition;

package/src/capabilities/companion-chat-provisioner.ts

@@ -0,0 +1,164 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Registry } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Graph, type Node } from '@dxos/app-graph';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Chat } from '@dxos/assistant-toolkit';
+import { Obj } from '@dxos/echo';
+import { log } from '@dxos/log';
+import { DeckCapabilities, PLANK_COMPANION_TYPE, type StoredDeckState } from '@dxos/plugin-deck/types';
+import { getLinkedVariant } from '@dxos/react-ui-attention';
+import { byPosition } from '@dxos/util';
+
+import { ASSISTANT_COMPANION_VARIANT } from '#meta';
+import { AssistantOperation } from '#operations';
+import { AssistantCapabilities } from '#types';
+
+/**
+ * Non-React capability that watches deck companion state and provisions transient chats
+ * for active planks when the assistant companion is selected.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const operationInvoker = yield* Capability.get(Capabilities.OperationInvoker);
+    const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
+    const registry: Registry.Registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const deckStateAtom = yield* Capability.get(DeckCapabilities.State);
+    const cacheAtom = yield* Capability.get(AssistantCapabilities.CompanionChatCache);
+    const stateAtom = yield* Capability.get(AssistantCapabilities.State);
+
+    const plankSubs = new Map<string, () => void>();
+
+    /** Unsubscribe a single plank and remove it from the map. */
+    const unsubPlank = (plankId: string) => {
+      plankSubs.get(plankId)?.();
+      plankSubs.delete(plankId);
+    };
+
+    /** Unsubscribe all per-plank subscriptions. */
+    const unsubAllPlanks = () => {
+      for (const unsub of plankSubs.values()) {
+        unsub();
+      }
+      plankSubs.clear();
+    };
+
+    /**
+     * Attempt to provision for a single plank.
+     * Returns true when the plank is resolved (provisioned or already cached)
+     * so the caller can tear down the connection subscription.
+     */
+    const provisionForPlank = (plankId: string, companionVariant: string | undefined): boolean => {
+      const node: Node.Node | null = Graph.getNode(graph, plankId).pipe(Option.getOrNull);
+      if (!node || !Obj.isObject(node.data) || Obj.instanceOf(Chat.Chat, node.data)) {
+        return false;
+      }
+
+      if (resolveEffectiveVariant(graph, plankId, companionVariant) !== ASSISTANT_COMPANION_VARIANT) {
+        return false;
+      }
+
+      const object = node.data;
+      const companionDxn = Obj.getDXN(object).toString();
+      const cache = registry.get(cacheAtom);
+      if (cache[companionDxn]) {
+        return true;
+      }
+
+      const db = Obj.getDatabase(object);
+      if (!db) {
+        return false;
+      }
+
+      void operationInvoker
+        .invokePromise(AssistantOperation.EnsureCompanionChat, { db, companionTo: object })
+        .catch((error) => log.warn('Failed to provision companion chat', { plankId, error }));
+
+      return false;
+    };
+
+    const provision = () => {
+      const deckState: StoredDeckState = registry.get(deckStateAtom);
+      const deck = deckState.decks[deckState.activeDeck];
+      if (!deck?.companionOpen) {
+        unsubAllPlanks();
+        return;
+      }
+
+      const plankIds = new Set(deck.solo ? [deck.solo] : deck.active);
+
+      // Remove subscriptions for planks that are no longer active.
+      for (const trackedId of plankSubs.keys()) {
+        if (!plankIds.has(trackedId)) {
+          unsubPlank(trackedId);
+        }
+      }
+
+      for (const plankId of plankIds) {
+        const resolved = provisionForPlank(plankId, deck.companionVariant);
+
+        if (resolved) {
+          // Already provisioned — no need to watch connections.
+          unsubPlank(plankId);
+        } else if (!plankSubs.has(plankId)) {
+          // Not yet resolved — subscribe to child connections so we re-try
+          // when graph builder extensions add companion nodes (after expand).
+          plankSubs.set(
+            plankId,
+            registry.subscribe(graph.connections(plankId, 'child'), () => {
+              if (provisionForPlank(plankId, deck.companionVariant)) {
+                unsubPlank(plankId);
+              }
+            }),
+          );
+        }
+      }
+    };
+
+    provision();
+
+    const unsub1 = registry.subscribe(deckStateAtom, provision);
+    const unsub2 = registry.subscribe(stateAtom, provision);
+
+    return Capability.contributes(Capabilities.Null, null, () =>
+      Effect.sync(() => {
+        unsub1();
+        unsub2();
+        unsubAllPlanks();
+      }),
+    );
+  }),
+);
+
+/**
+ * Mirrors useSelectedCompanion fallback logic outside of React.
+ * Returns the variant that would actually be rendered for a given plank.
+ */
+const resolveEffectiveVariant = (
+  graph: Graph.BaseGraph,
+  plankId: string,
+  preferredVariant: string | undefined,
+): string | undefined => {
+  const companions = Graph.getConnections(graph, plankId, 'child')
+    .filter((node) => node.type === PLANK_COMPANION_TYPE)
+    .toSorted((a, b) => byPosition(a.properties, b.properties));
+
+  if (companions.length === 0) {
+    return undefined;
+  }
+
+  if (preferredVariant) {
+    const preferred = companions.find((companion) => getLinkedVariant(companion.id) === preferredVariant);
+    if (preferred) {
+      return getLinkedVariant(preferred.id);
+    }
+  }
+
+  return getLinkedVariant(companions[0].id);
+};

package/src/capabilities/{edge-model-resolver/edge-model-resolver.ts → edge-model-resolver.ts}

@@ -8,14 +8,15 @@ import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
 import { AnthropicResolver } from '@dxos/ai/resolvers';
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
-export type EdgeModelResolverCapabilities = [Capability.Capability<typeof Common.Capability.AiModelResolver>];
+export type EdgeModelResolverCapabilities = [Capability.Capability<typeof AppCapabilities.AiModelResolver>];
 
 const edgeModelResolver = Capability.makeModule<[], EdgeModelResolverCapabilities>(() =>
   Effect.succeed([
     Capability.contributes(
-      Common.Capability.AiModelResolver,
+      AppCapabilities.AiModelResolver,
       AnthropicResolver.make().pipe(
         Layer.provide(
           AnthropicClient.layer({

package/src/capabilities/index.ts

@@ -2,14 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './ai-service';
-export * from './app-graph-builder';
-export * from './blueprint-definition';
-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';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const AiService = Capability.lazy('AiService', () => import('./ai-service'));
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
+export const CompanionChatProvisioner = Capability.lazy(
+  'CompanionChatProvisioner',
+  () => import('./companion-chat-provisioner'),
+);
+export const EdgeModelResolver = Capability.lazy('EdgeModelResolver', () => import('./edge-model-resolver'));
+export const LocalModelResolver = Capability.lazy('LocalModelResolver', () => import('./local-model-resolver'));
+export const MarkdownExtension = Capability.lazy('MarkdownExtension', () => import('./markdown'));
+export const Migrations = Capability.lazy('AssistantMigrations', () => import('./migrations'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const Settings = Capability.lazy('Settings', () => import('./settings'));
+export const AssistantState = Capability.lazy('AssistantState', () => import('./state'));
+export const Toolkit = Capability.lazy('Toolkit', () => import('./toolkit'));

package/src/capabilities/{local-model-resolver/local-model-resolver.ts → local-model-resolver.ts}

@@ -8,9 +8,10 @@ import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
 import { LMStudioResolver } from '@dxos/ai/resolvers';
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
-export type LocalModelResolverCapabilities = [Capability.Capability<typeof Common.Capability.AiModelResolver>];
+export type LocalModelResolverCapabilities = [Capability.Capability<typeof AppCapabilities.AiModelResolver>];
 
 /**
  * To start LM Studio server:
@@ -21,7 +22,7 @@ export type LocalModelResolverCapabilities = [Capability.Capability<typeof Commo
 const localModelResolver = Capability.makeModule<[], LocalModelResolverCapabilities>(() =>
   Effect.succeed([
     Capability.contributes(
-      Common.Capability.AiModelResolver,
+      AppCapabilities.AiModelResolver,
       LMStudioResolver.make().pipe(
         Layer.provide(
           OpenAiClient.layer({