@dxos/plugin-assistant 0.9.0 → 0.9.1-staging.ee54ba693a

package/src/AssistantPlugin.node.ts

@@ -6,7 +6,7 @@ import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { AiContext } from '@dxos/assistant';
 import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
-import { Blueprint, Routine } from '@dxos/compute';
+import { Instructions, Skill } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
 import { Text } from '@dxos/schema';
@@ -18,11 +18,11 @@ import {
   AiContext as AiContextCapability,
   AiService,
   AppGraphBuilder,
-  BlueprintDefinition,
   CreateObject,
   EdgeModelResolver,
   LocalModelResolver,
   OperationHandler,
+  SkillDefinition,
   Toolkit,
 } from '#capabilities';
 import { meta } from '#meta';
@@ -31,19 +31,19 @@ import { AssistantEvents, type AssistantPluginOptions } from '#types';
 export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta)
   .pipe(
     AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-    AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+    AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),
     AppPlugin.addCreateObjectModule({ activate: CreateObject }),
     AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
     AppPlugin.addSchemaModule({
       schema: [
         Chat.Chat,
         Chat.CompanionTo,
-        Blueprint.Blueprint,
+        Skill.Skill,
         AiContext.Binding,
         Feed.Feed,
         HasSubject.HasSubject,
         Message.Message,
-        Routine.Routine,
+        Instructions.Instructions,
         Agent.Agent,
         McpServer.McpServer,
         Plan.Plan,

package/src/AssistantPlugin.test.ts

@@ -6,38 +6,32 @@ import * as LanguageModel from '@effect/ai/LanguageModel';
 import { type TestContext } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
-import * as Schema from 'effect/Schema';
 import { describe, test } from 'vitest';
 
 import { AiService } from '@dxos/ai';
 import { TestAiService } from '@dxos/ai/testing';
 import { AppActivationEvents } from '@dxos/app-toolkit';
-import {
-  AgentPrompt,
-  AgentWizardBlueprint,
-  BlueprintManagerBlueprint,
-  DatabaseBlueprint,
-} from '@dxos/assistant-toolkit';
-import { Blueprint, Operation, Routine, ServiceResolver } from '@dxos/compute';
-import { Database, Feed, Ref, Registry } from '@dxos/echo';
+import { AgentWizardSkill, DatabaseSkill, RunInstructions, SkillManagerSkill } from '@dxos/assistant-toolkit';
+import { AgentService, Instructions, Operation, ServiceResolver, Skill } from '@dxos/compute';
+import { Database, Ref, Registry } from '@dxos/echo';
 import { EffectEx } from '@dxos/effect';
 import { TestContextService } from '@dxos/effect/testing';
-import { AgentService } from '@dxos/functions-runtime';
-import { EntityId } from '@dxos/keys';
-import { AutomationPlugin } from '@dxos/plugin-automation/plugin';
+import { AgentService as AgentServiceRuntime } from '@dxos/functions-runtime';
+import { DXN, EntityId } from '@dxos/keys';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { RoutinePlugin } from '@dxos/plugin-routine/plugin';
 import { createComposerTestApp } from '@dxos/plugin-testing/harness';
 
 import { AssistantPlugin } from '#plugin';
 
-import { AssistantBlueprint } from './blueprints/assistant';
 import { meta } from './meta';
+import { AssistantSkill } from './skills/assistant';
 
 EntityId.dangerouslyDisableRandomness();
 
-const moduleId = (name: string) => `${meta.id}.module.${name}`;
+const moduleId = (name: string) => `${meta.profile.key}.module.${name}`;
 
 describe('AssistantPlugin', () => {
   test('modules activate on the expected events', async ({ expect }) => {
@@ -50,9 +44,9 @@ describe('AssistantPlugin', () => {
       expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
     );
 
-    // AssistantPlugin fires SetupArtifactDefinition itself, so it can test its own blueprint.
+    // AssistantPlugin fires SetupArtifactDefinition itself, so it can test its own skill.
     await harness.fire(AppActivationEvents.SetupArtifactDefinition);
-    expect(harness.manager.getActive()).toContain(moduleId('BlueprintDefinition'));
+    expect(harness.manager.getActive()).toContain(moduleId('SkillDefinition'));
 
     // OperationHandler auto-cascades from ProcessManagerPlugin.
     expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
@@ -96,7 +90,7 @@ describe('AssistantPlugin', () => {
         expect(text.toLocaleLowerCase()).toContain('paris');
       }).pipe(
         Effect.provide(
-          AiService.model('ai.claude.model.claude-haiku-4-5').pipe(
+          AiService.model('com.anthropic.model.claude-haiku-4-5.default').pipe(
             Layer.provideMerge(ServiceResolver.provide({ space: personalSpace.id }, AiService.AiService)),
           ),
         ),
@@ -104,7 +98,7 @@ describe('AssistantPlugin', () => {
     );
   });
 
-  test('can run memoized routine', { timeout: 120_000 }, async (ctx) => {
+  test('can run memoized instructions', { timeout: 120_000 }, async (ctx) => {
     const { expect } = ctx;
     await using harness = await createComposerTestApp({
       plugins: [
@@ -112,7 +106,7 @@ describe('AssistantPlugin', () => {
         AssistantPlugin({
           aiServiceMiddleware: await makeMemoizedAiServiceMiddleware(ctx),
         }),
-        AutomationPlugin(),
+        RoutinePlugin(),
       ],
     });
 
@@ -124,38 +118,31 @@ describe('AssistantPlugin', () => {
 
     await harness.runPromise(
       Effect.gen(function* () {
-        const routine = yield* Database.add(
-          Routine.make({
+        const instructions = yield* Database.add(
+          Instructions.make({
             name: 'capital-test',
-            instructions:
-              'Call completeJob with success set to a JSON object { "capital": "<lowercase country capital>" } for the country in input.',
-            input: Schema.Struct({
-              country: Schema.String,
-            }),
-            output: Schema.Struct({
-              capital: Schema.String,
-            }),
+            text: 'Call completeJob with success set to a JSON object { "capital": "<lowercase country capital>" } for the country in input.',
           }),
         );
         yield* Database.flush();
 
         const result = yield* Operation.invoke(
-          AgentPrompt,
+          RunInstructions,
           {
-            prompt: Ref.make(routine),
+            instructions: Ref.make(instructions),
             input: {
               country: 'France',
             },
-            model: 'ai.claude.model.claude-haiku-4-5',
+            model: DXN.make('com.anthropic.model.claude-haiku-4-5.default'),
           },
           { spaceId: personalSpace.id },
         );
         expect(result).toEqual({ capital: 'paris' });
-      }).pipe(Effect.provide(ServiceResolver.provide({ space: personalSpace.id }, Database.Service, Feed.FeedService))),
+      }).pipe(Effect.provide(ServiceResolver.provide({ space: personalSpace.id }, Database.Service))),
     );
   });
 
-  test('smoke test for agent service with standard blueprints', { timeout: 120_000 }, async (ctx) => {
+  test('smoke test for agent service with standard skills', { timeout: 120_000 }, async (ctx) => {
     const { expect } = ctx;
     await using harness = await createComposerTestApp({
       plugins: [
@@ -163,7 +150,7 @@ describe('AssistantPlugin', () => {
         AssistantPlugin({
           aiServiceMiddleware: await makeMemoizedAiServiceMiddleware(ctx),
         }),
-        AutomationPlugin(),
+        RoutinePlugin(),
       ],
     });
 
@@ -175,13 +162,13 @@ describe('AssistantPlugin', () => {
 
     await harness.runPromise(
       Effect.gen(function* () {
-        const blueprints = yield* Effect.forEach(
-          [DatabaseBlueprint, AssistantBlueprint, BlueprintManagerBlueprint, AgentWizardBlueprint],
-          (_) => Blueprint.resolve(_.key),
+        const skills = yield* Effect.forEach(
+          [DatabaseSkill, AssistantSkill, SkillManagerSkill, AgentWizardSkill],
+          (_) => Skill.resolve(_.key),
         );
 
-        const agent = yield* AgentService.createSession({
-          blueprints,
+        const agent = yield* AgentServiceRuntime.createSession({
+          skills,
         });
         yield* agent.submitPrompt('Hello');
         yield* agent.waitForCompletion();
@@ -190,7 +177,6 @@ describe('AssistantPlugin', () => {
           ServiceResolver.provide(
             { space: personalSpace.id },
             Database.Service,
-            Feed.FeedService,
             AgentService.AgentService,
             Registry.Service,
           ),

package/src/AssistantPlugin.ts

@@ -6,7 +6,7 @@ import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { AiContext } from '@dxos/assistant';
 import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
-import { Blueprint, Routine } from '@dxos/compute';
+import { Instructions, Skill } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
 import { ClientEvents } from '@dxos/plugin-client';
@@ -20,20 +20,21 @@ import {
   AgentRuntime,
   AiContext as AiContextCapability,
   AiService,
-  IntegrationProvider,
   AppGraphBuilder,
-  AutomationTemplates,
   AssistantState,
-  BlueprintDefinition,
+  AutomationTemplates,
   CompanionChatProvisioner,
+  Connector,
   CreateObject,
   EdgeModelResolver,
   LocalModelResolver,
   MarkdownExtension,
   Migrations,
+  NavigationResolver,
   OperationHandler,
   ReactSurface,
   Settings,
+  SkillDefinition,
   Toolkit,
 } from '#capabilities';
 import { meta } from '#meta';
@@ -43,24 +44,25 @@ import { AssistantEvents, type AssistantPluginOptions } from '#types';
 // eslint-disable-next-line import/no-relative-packages
 import pluginSpec from '../PLUGIN.mdl?raw';
 
-const StateReady = AppActivationEvents.createStateEvent(meta.id);
+const StateReady = AppActivationEvents.createStateEvent(meta.profile.key);
 
 export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta)
   .pipe(
     AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-    AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+    AppPlugin.addNavigationResolverModule({ activatesOn: ClientEvents.ClientReady, activate: NavigationResolver }),
+    AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),
     AppPlugin.addCreateObjectModule({ activate: CreateObject }),
     AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
     AppPlugin.addSchemaModule({
       schema: [
         Chat.Chat,
         Chat.CompanionTo,
-        Blueprint.Blueprint,
+        Skill.Skill,
         AiContext.Binding,
         Feed.Feed,
         HasSubject.HasSubject,
         Message.Message,
-        Routine.Routine,
+        Instructions.Instructions,
         Agent.Agent,
         McpServer.McpServer,
         Plan.Plan,
@@ -109,7 +111,7 @@ export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta
       activate: () => AiService(options),
     })),
     Plugin.addModule({
-      // Process-affinity `AiContext.Service` LayerSpec — needed so operations
+      // Process-affinity `Harness.HarnessService` LayerSpec — needed so operations
       // dispatched as their own processes (e.g. via `Operation.invoke` from
       // `AiSession.createRequest` or `TriggerDispatcher`) can resolve
       // conversation-scoped services without an inline `Effect.provideService`
@@ -146,11 +148,11 @@ export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta
       activate: Migrations,
     }),
     Plugin.addModule({
-      activatesOn: AppActivationEvents.SetupIntegrationProviders,
-      activate: IntegrationProvider,
+      activatesOn: AppActivationEvents.SetupConnectors,
+      activate: Connector,
     }),
     AppPlugin.addPluginAssetModule({
-      asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+      asset: { pluginId: meta.profile.key, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
     }),
     Plugin.make,
   );

package/src/AssistantPlugin.workerd.ts

@@ -2,31 +2,40 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
+import { ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { AiContext } from '@dxos/assistant';
 import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
-import { Blueprint, Routine } from '@dxos/compute';
+import { Instructions, Skill } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
 import { Text } from '@dxos/schema';
 import { HasSubject, Message } from '@dxos/types';
 
-import { OperationHandler } from '#capabilities';
 import { meta } from '#meta';
 
+import OperationHandler from './capabilities/operation-handler';
+import SkillDefinition from './capabilities/skill-definition';
+import Toolkit from './capabilities/toolkit';
+
 export const AssistantPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSkillDefinitionModule({ id: 'skill-definition', activate: SkillDefinition }),
+  AppPlugin.addOperationHandlerModule({ id: 'operation-handler', activate: OperationHandler }),
+  Plugin.addModule({
+    id: 'toolkit',
+    activatesOn: ActivationEvents.Startup,
+    activate: Toolkit,
+  }),
   AppPlugin.addSchemaModule({
     schema: [
       Chat.Chat,
       Chat.CompanionTo,
-      Blueprint.Blueprint,
+      Skill.Skill,
       AiContext.Binding,
       Feed.Feed,
       HasSubject.HasSubject,
       Message.Message,
-      Routine.Routine,
+      Instructions.Instructions,
       Agent.Agent,
       McpServer.McpServer,
       Plan.Plan,

package/src/capabilities/agent-hydrator.ts

@@ -6,8 +6,7 @@ import * as Cause from 'effect/Cause';
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { ServiceResolver } from '@dxos/compute';
-import { AgentService } from '@dxos/functions-runtime';
+import { AgentService, ServiceResolver } from '@dxos/compute';
 import { log } from '@dxos/log';
 
 //

package/src/capabilities/agent-service.ts

@@ -6,10 +6,10 @@ import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { LayerSpec } from '@dxos/compute';
+import { AgentService, LayerSpec } from '@dxos/compute';
 import { ProcessManager } from '@dxos/compute-runtime';
-import { AgentService } from '@dxos/functions-runtime';
-import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { AgentService as AgentServiceRuntime } from '@dxos/functions-runtime';
+import { RoutineCapabilities } from '@dxos/plugin-routine';
 
 //
 // Capability Module
@@ -27,8 +27,10 @@ const AgentServiceSpec = LayerSpec.make(
     Layer.unwrapEffect(
       Effect.gen(function* () {
         // Optional supervisor behaviour, contributed by a plugin that knows the agent/plan model.
-        const strategies = yield* Capability.getAll(AutomationCapabilities.AgentDelegationStrategy);
-        return AgentService.layer({ delegationStrategy: strategies[0] });
+        const strategies = yield* Capability.getAll(RoutineCapabilities.AgentDelegationStrategy);
+        return AgentServiceRuntime.layer({
+          delegationStrategy: strategies[0],
+        });
       }),
     ),
 );

package/src/capabilities/ai-context.ts

@@ -3,46 +3,21 @@
 //
 
 import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AiContext } from '@dxos/assistant';
-import { LayerSpec, ServiceNotAvailableError } from '@dxos/compute';
-import { Database, EID, Feed } from '@dxos/echo';
-import { EffectEx } from '@dxos/effect';
+import { Harness } from '@dxos/assistant';
+import { type LayerSpec } from '@dxos/compute';
 
 //
 // Capability Module
 //
-// Contributes a process-affinity `LayerSpec` that materialises
-// {@link AiContext.Service} from the resolution context's `conversation` DXN.
+// Contributes the process-affinity `LayerSpec` that materialises
+// {@link Harness.HarnessService} from the resolution context's `conversation` DXN.
 //
 
-const AiContextSpec = LayerSpec.make(
-  {
-    affinity: 'process',
-    requires: [Database.Service, Feed.FeedService],
-    provides: [AiContext.Service],
-  },
-  (context) =>
-    Layer.scoped(
-      AiContext.Service,
-      Effect.gen(function* () {
-        if (!context.conversation) {
-          return yield* Effect.die(
-            new ServiceNotAvailableError(AiContext.Service.key, {
-              message: `Service not available: ${AiContext.Service.key} — process spawn is missing 'conversation' in environment (set via Operation.withInvocationOptions or ProcessManager.spawn environment)`,
-            }),
-          );
-        }
-        const feed = yield* Database.resolve(EID.parse(context.conversation), Feed.Feed).pipe(Effect.orDie);
-        const runtime = yield* Effect.runtime<Feed.FeedService>();
-        const binder = yield* EffectEx.acquireReleaseResource(() => new AiContext.Binder({ feed, runtime }));
-        return { binder };
-      }),
-    ),
-);
+// Annotated so the contributed `LayerSpec` type is nameable in the emitted declaration.
+const harnessSpec: LayerSpec.LayerSpec = Harness.layerSpec;
 
 export default Capability.makeModule(() =>
-  Effect.succeed([Capability.contributes(Capabilities.LayerSpec, AiContextSpec)]),
+  Effect.succeed([Capability.contributes(Capabilities.LayerSpec, harnessSpec)]),
 );

package/src/capabilities/ai-service.ts

@@ -6,7 +6,7 @@ import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 
-import { AiModelResolver, AiService } from '@dxos/ai';
+import { AiModelResolver, AiService, Provider } from '@dxos/ai';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { Credential, LayerSpec } from '@dxos/compute';
@@ -20,7 +20,8 @@ export default Capability.makeModule<AssistantPluginOptions | void, Capability.A
     // 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.
+      // Empty resolver as the terminal fallback (provider is irrelevant — the map is empty).
+      AiModelResolver.AiModelResolver.fromModelMap({ name: 'Fallback' }, Provider.edge.id, Effect.succeed({})),
     );
 
     let aiServiceLayer: Layer.Layer<AiService.AiService, never, Credential.CredentialsService> =

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

@@ -10,22 +10,23 @@ import { Capability } from '@dxos/app-framework';
 import {
   AppCapabilities,
   AppNode,
+  AppNodeMatcher,
+  AppSpace,
   LayoutOperation,
-  createTypeSectionExtension,
-  createTypeSectionPathResolver,
-  getActiveSpace,
-  getPersonalSpace,
+  Paths,
+  TypeSection,
 } from '@dxos/app-toolkit';
-import { AgentPrompt, Chat } from '@dxos/assistant-toolkit';
+import { Chat, RunInstructions } from '@dxos/assistant-toolkit';
 import { isSpace } from '@dxos/client/echo';
-import { Operation, Routine } from '@dxos/compute';
+import { Instructions, Operation } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
-import { DXN, Database, Filter, Obj, Query, Type, type Ref } from '@dxos/echo';
+import { Database, DXN, Filter, Obj, Query, type Ref, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 import { SpaceOperation } from '@dxos/plugin-space';
 import { linkedSegment } from '@dxos/react-ui-attention';
+import { Position } from '@dxos/util';
 
 import { ASSISTANT_COMPANION_VARIANT, meta } from '#meta';
 import { AssistantCapabilities, AssistantOperation } from '#types';
@@ -33,7 +34,7 @@ import { AssistantCapabilities, AssistantOperation } from '#types';
 import { getChatsPath } from '../paths';
 
 /** Operation definitions to seed as `PersistentOperation` records for automation / triggers. */
-const computeOperationsToImport = [AgentPrompt] as const;
+const computeOperationsToImport = [RunInstructions] as const;
 
 /** Match ECHO objects that are NOT chats. */
 const whenNonChatObject = NodeMatcher.whenAll(
@@ -46,6 +47,22 @@ export default Capability.makeModule(
     const capabilities = yield* Capability.Service;
 
     const extensions = yield* Effect.all([
+      // AI section group — created here so it shows only when the assistant plugin is active.
+      GraphBuilder.createExtension({
+        id: Paths.GroupSegments.ai,
+        match: AppNodeMatcher.whenSpace,
+        connector: (space) =>
+          Effect.succeed([
+            AppNode.makeGroup({
+              id: Paths.GroupSegments.ai,
+              type: Paths.GroupTypes.ai,
+              label: ['nav-tree-group-ai.label', { ns: meta.profile.key }],
+              space,
+              position: 300,
+            }),
+          ]),
+      }),
+
       GraphBuilder.createTypeExtension({
         id: 'root',
         type: Chat.Chat,
@@ -61,7 +78,7 @@ export default Capability.makeModule(
                   yield* Operation.invoke(AssistantOperation.UpdateChatName, { chat }, { spaceId: db.spaceId });
                 }),
               properties: {
-                label: ['chat-update-name.label', { ns: meta.id }],
+                label: ['chat-update-name.label', { ns: meta.profile.key }],
                 icon: 'ph--magic-wand--regular',
                 disposition: 'list-item',
               },
@@ -80,7 +97,7 @@ export default Capability.makeModule(
               data: Effect.fnUntraced(function* () {
                 const capabilities = yield* Capability.Service;
                 const client = yield* Capability.get(ClientCapabilities.Client);
-                const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+                const space = AppSpace.getActiveSpace(client, capabilities) ?? AppSpace.getPersonalSpace(client);
                 if (!space) {
                   return;
                 }
@@ -100,7 +117,7 @@ export default Capability.makeModule(
                 yield* Database.flush();
               }),
               properties: {
-                label: ['import-compute-operations.label', { ns: meta.id }],
+                label: ['import-compute-operations.label', { ns: meta.profile.key }],
                 icon: 'ph--download-simple--regular',
               },
             }),
@@ -108,7 +125,7 @@ export default Capability.makeModule(
               id: AssistantOperation.ToggleTracePanelDebug.meta.key,
               data: () => Operation.invoke(AssistantOperation.ToggleTracePanelDebug, {}),
               properties: {
-                label: ['toggle-trace-panel-debug.label', { ns: meta.id }],
+                label: ['toggle-trace-panel-debug.label', { ns: meta.profile.key }],
                 icon: 'ph--brackets-curly--regular',
               },
             }),
@@ -139,26 +156,26 @@ export default Capability.makeModule(
             return [
               AppNode.makeCompanion({
                 id: linkedSegment(ASSISTANT_COMPANION_VARIANT),
-                label: ['assistant-chat.label', { ns: meta.id }],
+                label: ['assistant-chat.label', { ns: meta.profile.key }],
                 icon: 'ph--sparkle--regular',
                 data: chat,
-                position: 'first',
+                position: Position.first,
               }),
             ];
-          }),
+          }).pipe(Effect.orDie),
       }),
 
       GraphBuilder.createExtension({
         id: 'invocations',
         match: NodeMatcher.whenAny(
           NodeMatcher.whenEchoTypeMatches(Sequence.Sequence),
-          NodeMatcher.whenEchoTypeMatches(Routine.Routine),
+          NodeMatcher.whenEchoTypeMatches(Instructions.Instructions),
         ),
         connector: () =>
           Effect.succeed([
             AppNode.makeCompanion({
               id: 'invocations',
-              label: ['invocations.label', { ns: meta.id }],
+              label: ['invocations.label', { ns: meta.profile.key }],
               icon: 'ph--clock-countdown--regular',
               data: 'invocations',
             }),
@@ -172,22 +189,23 @@ export default Capability.makeModule(
           Effect.succeed([
             AppNode.makeDeckCompanion({
               id: linkedSegment('trace'),
-              label: ['trace.label', { ns: meta.id }],
+              label: ['trace.label', { ns: meta.profile.key }],
               icon: 'ph--line-segments--regular',
-              data: 'trace' as const,
-              position: 'last',
+              data: 'trace',
+              position: Position.last,
             }),
           ]),
       }),
 
-      // Section node: standalone Chat.Chat objects per space (companions are excluded).
-      createTypeSectionExtension(Chat.Chat, {
+      // Section node: standalone Chat.Chat objects per AI group (companions are excluded).
+      TypeSection.createTypeSectionExtension(Chat.Chat, {
         // Exclude chats that are the source of a CompanionTo relation; those belong to
         // their primary object's companion panel and should not appear in the top-level list.
         query: Query.without(
           Query.select(Filter.type(Chat.Chat)),
           Query.select(Filter.type(Chat.Chat)).sourceOf(Chat.CompanionTo).source(),
         ),
+        match: AppNodeMatcher.whenNavTreeGroup(Paths.GroupTypes.ai),
       }),
 
       // Create-chat action on the Chats section header.
@@ -210,7 +228,7 @@ export default Capability.makeModule(
                   );
                   const { subject } = yield* Operation.invoke(
                     SpaceOperation.AddObject,
-                    { object: chat, target: space.db, hidden: true, targetNodeId: getChatsPath(space.db.spaceId) },
+                    { object: chat, target: space.db, targetNodeId: getChatsPath(space.db.spaceId) },
                     { spaceId: space.db.spaceId },
                   );
                   yield* Operation.invoke(
@@ -220,7 +238,7 @@ export default Capability.makeModule(
                   );
                 }),
               properties: {
-                label: ['create-chat.label', { ns: meta.id }],
+                label: ['create-chat.label', { ns: meta.profile.key }],
                 icon: 'ph--plus--regular',
                 disposition: 'list-item-primary',
               },
@@ -229,9 +247,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return [
-      Capability.contributes(AppCapabilities.AppGraphBuilder, extensions),
-      Capability.contributes(AppCapabilities.NavigationPathResolver, createTypeSectionPathResolver(Chat.Chat)),
-    ];
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/automation-templates.ts

@@ -5,12 +5,12 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { RoutineCapabilities } from '@dxos/plugin-routine';
 
-import { automationTemplates } from '../templates';
+import { routineTemplates } from '../templates';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    return automationTemplates.map((template) => Capability.contributes(AutomationCapabilities.Template, template));
+    return routineTemplates.map((template) => Capability.contributes(RoutineCapabilities.Template, template));
   }),
 );