@dxos/assistant-toolkit 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/src/functions/agent/prompt.conversations.json

@@ -1 +1 @@
-{"conversations":[{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"complete_job","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [complete_job] with the output.\nIf you are unable to complete the task, call [complete_job] with the failure reason.\nIf no output is required, call [complete_job] with { \"success\": \"undefined\" }\nDo not stop until you call [complete_job].","options":{}},{"role":"user","content":"Reply with a single word: ack.","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_014G3bk87y7g2fNyaujvQheS","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The user wants","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" me to reply with a single word: \"ack.\"","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EvABClkIDBgCKkCxzNnjQUj3DQa9gtQiD30evyfzcsyUhLdAoDb2a/dAiNjKaWlH1vpX29INRDACdAdhUnywLNGy6UdJhDSVKdlUMg9jbGF1ZGUtb3B1cy00LTY4ABIM43km5bTnPr0GAV65GgyMUTayJlomMHB92d8iMNFhdhyYL53meBFi8d5yOdTPcdRIr0XaXzPccyf1zC3OUO1UdmUfukZDRLijHLAkuCpFSdbuum5+7QiCkc9RzYY0W0A3LwRqeChW9EKez2Eb182TWTXz8JhITZMBz3sjkk36Dbta0RfZ51O4D4f3vgBGO6To4QtYGAE="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","name":"complete_job","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","delta":"{\"suc","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","delta":"cess\": \"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","delta":"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":782,"outputTokens":77,"totalTokens":859},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":782,"output_tokens":3,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"complete_job","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [complete_job] with the output.\nIf you are unable to complete the task, call [complete_job] with the failure reason.\nIf no output is required, call [complete_job] with { \"success\": \"undefined\" }\nDo not stop until you call [complete_job].","options":{}},{"role":"user","content":"Reply with a single word: ack.","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"The user wants me to reply with a single word: \"ack.\"","options":{}},{"type":"tool-call","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","name":"complete_job","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01JhVz7FLyLNhNaaSf58f2jm","name":"complete_job","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01JdVKgMCzWis4ZgNFCPo6qr","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":820,"outputTokens":2,"totalTokens":822},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":820,"output_tokens":2,"server_tool_use":null,"service_tier":"standard"}}}}]}]}
+{"conversations":[{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [completeJob] with the output.\nIf you are unable to complete the task, call [completeJob] with the failure reason.\nIf no output is required, call [completeJob] with an empty object: {}\nDo not stop until you call [completeJob].","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01BJnJPY3oMFLFRKBzfm18k4","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The user wants me to reply with a single word: \"ack\".","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EvABClkIDRgCKkDoETBa+lesagv7ixB9LGrYHpBYfS/DCnRnegAetRGGWDl0kkFyqVQI7oDc+ZWbyk9tB+4ePqoqNXQXwE3240/HMg9jbGF1ZGUtb3B1cy00LTY4ABIMZ4jEaKNKFseHE6SGGgxDCMKKPXa0JrDQ52ciMG+cUvHgNQwSWMWlYEBfsVvvwZnDif1WmjybXm26QJIGtpnF/4kQQkk8Re1W0OPoYCpFYVSQgk56gj+oWRLRn8FgcWrdoxhpuw6BVArd0/EEeXi78h9AJPLa7BN30HyfNmAOQ5LiuW8fznNPRzCv1yHLrjw4IE+GGAE="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","delta":"{\"success\": ","metadata":{}},{"type":"tool-params-delta","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","delta":"\"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":757,"outputTokens":85,"totalTokens":842},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":757,"output_tokens":60,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-6","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"$id":"/schemas/any","title":"any"},"failure":{"type":"object","required":["message"],"properties":{"message":{"type":"string","description":"Short message describing the error."},"description":{"type":"string","description":"Optional longer message describing in detail what went wrong"}},"additionalProperties":false}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"You are an agent running in the non-interactive mode.\nThe user is unable to see what you are doing, and cannot answer any questions.\nDo not ask questions.\nComplete the task before you, and at the end call [completeJob] with the output.\nIf you are unable to complete the task, call [completeJob] with the failure reason.\nIf no output is required, call [completeJob] with an empty object: {}\nDo not stop until you call [completeJob].","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"The user wants me to reply with a single word: \"ack\".","options":{}},{"type":"tool-call","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01N1FCMswXa62WFdsMrbu4Kv","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01XmKNsc4F8Re8N5UEDdxcjp","modelId":"claude-opus-4-6","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":824,"outputTokens":2,"totalTokens":826},"metadata":{"anthropic":{"usage":{"cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":824,"output_tokens":2,"server_tool_use":null,"service_tier":"standard"}}}}]}]}

package/src/functions/agent/prompt.test.ts

@@ -6,13 +6,12 @@ import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import { ContextBinding } from '@dxos/assistant';
-import { AssistantTestLayer } from '@dxos/assistant/testing';
-import { Prompt } from '@dxos/blueprints';
+import { Routine, Operation, OperationHandlerSet } from '@dxos/compute';
 import { Database, Feed, Obj, Ref } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
-import { FunctionInvocationService, QueueService } from '@dxos/functions';
+import { QueueService } from '@dxos/functions';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 import { ObjectId } from '@dxos/keys';
-import { OperationHandlerSet } from '@dxos/operation';
 import { Text } from '@dxos/schema';
 import { Message } from '@dxos/types';
 
@@ -53,7 +52,7 @@ describe('Agent prompt', () => {
         );
 
         const prompt = yield* Database.add(
-          Prompt.make({
+          Routine.make({
             name: 'chat-mode-test',
             instructions: 'Reply with a single word: ack.',
             blueprints: [],
@@ -63,7 +62,7 @@ describe('Agent prompt', () => {
 
         yield* Database.flush();
 
-        const result = yield* FunctionInvocationService.invokeFunction(AgentPrompt, {
+        const result = yield* Operation.invoke(AgentPrompt, {
           prompt: Ref.make(prompt),
           input: {},
           chat: Ref.make(chat),

package/src/functions/agent/prompt.ts

@@ -12,22 +12,18 @@ import * as Layer from 'effect/Layer';
 import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
-import { AiService, ConsolePrinter, GenericToolkit, ModelName } from '@dxos/ai';
+import { AiService, OpaqueToolkit, ModelName } from '@dxos/ai';
 import {
-  AiConversation,
-  GenerationObserver,
-  functionInvocationServiceFromOperations,
+  AiSession,
   getOperationFromTool,
   makeToolExecutionService,
   makeToolResolverFromOperations,
 } from '@dxos/assistant';
-import { Template } from '@dxos/blueprints';
+import { Template, Trace, Operation } from '@dxos/compute';
 import { Database, Feed, Obj, Ref } from '@dxos/echo';
 import { acquireReleaseResource } from '@dxos/effect';
-import { TracingService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
 import { trim } from '@dxos/util';
 
 import { PromptError } from '../../errors';
@@ -36,8 +32,6 @@ import { AgentPrompt } from './definitions';
 
 const DEFAULT_MODEL: ModelName = '@anthropic/claude-opus-4-6';
 
-const observer = GenerationObserver.fromPrinter(new ConsolePrinter({ tag: 'agent' }));
-
 export default AgentPrompt.pipe(
   Operation.withHandler(
     Effect.fnUntraced(
@@ -50,7 +44,7 @@ export default AgentPrompt.pipe(
 
         yield* Database.flush();
         const prompt = yield* Database.load(data.prompt);
-        yield* TracingService.emitStatus({ message: `Running ${prompt.id}` });
+        yield* Trace.emitStatus(`Running ${prompt.id}`);
 
         log.info('starting agent', { prompt: prompt.id, input });
 
@@ -69,16 +63,20 @@ export default AgentPrompt.pipe(
         );
 
         const promptInstructions = yield* Database.load(prompt.instructions.source);
-        const promptText = Template.process(promptInstructions.content, input);
+        let promptText = Template.process(promptInstructions.content, input);
+
+        if (input !== undefined) {
+          promptText += `\n<input>${JSON.stringify(input)}</input>`;
+        }
 
         let systemText = trim`
           You are an agent running in the non-interactive mode.
           The user is unable to see what you are doing, and cannot answer any questions.
           Do not ask questions.
-          Complete the task before you, and at the end call [complete_job] with the output.
-          If you are unable to complete the task, call [complete_job] with the failure reason.
-          If no output is required, call [complete_job] with { "success": "undefined" }
-          Do not stop until you call [complete_job].
+          Complete the task before you, and at the end call [completeJob] with the output.
+          If you are unable to complete the task, call [completeJob] with the failure reason.
+          If no output is required, call [completeJob] with an empty object: {}
+          Do not stop until you call [completeJob].
         `;
         if (data.systemInstructions) {
           systemText += `\n\n${data.systemInstructions}`;
@@ -102,53 +100,57 @@ export default AgentPrompt.pipe(
         });
 
         const runtime = yield* Effect.runtime<Feed.FeedService>();
-        const conversation = yield* acquireReleaseResource(() => new AiConversation({ feed, runtime }));
+        const session = yield* acquireReleaseResource(() => new AiSession({ feed, runtime }));
 
         yield* Effect.promise(() =>
-          conversation.context.bind({
+          session.context.bind({
             blueprints: blueprints.map((blueprint) => Ref.make(blueprint)),
             objects: objects.map((object) => Ref.make(object as Obj.Unknown)),
           }),
         );
 
-        yield* conversation
+        yield* session
           .createRequest({
             prompt: promptText,
             system: systemText,
-            observer,
-            toolkit: promptToolkit.toolkit,
+            toolkit: promptToolkit,
           })
           .pipe(
             Effect.provide(
-              Layer.mergeAll(
-                modelLayer,
-                promptToolkit.layer,
-                ToolExecutionService({ feed }),
-                makeToolResolverFromOperations(),
-              ),
+              Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations()),
             ),
           );
 
         return yield* Deferred.poll(resultSink).pipe(
           Effect.flatten,
-          Effect.catchTag('NoSuchElementException', () => Effect.die('Agent did not signal task completion.')),
           Effect.flatten,
-          Effect.mapError(
-            (err) =>
-              new PromptError(err.message ?? 'Agent failed with an unknown error.', {
-                description: err.context.description as string | undefined,
-                prompt: data.prompt.dxn.toString(),
-              }),
+          Effect.catchTag('NoSuchElementException', () =>
+            Effect.gen(function* () {
+              yield* session
+                .createRequest({
+                  prompt: 'You must signal task completion by calling [completeJob] with the output or failure reason.',
+                  system: systemText,
+                  toolkit: promptToolkit,
+                })
+                .pipe(
+                  Effect.provide(
+                    Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations()),
+                  ),
+                );
+
+              return yield* Deferred.poll(resultSink).pipe(
+                Effect.flatten,
+                Effect.flatten,
+                Effect.catchTag('NoSuchElementException', () =>
+                  Effect.fail(new PromptError('Agent did not signal task completion.', {})),
+                ),
+              );
+            }),
           ),
         );
       },
       Effect.scoped,
-      Effect.provide(
-        Layer.empty.pipe(
-          Layer.provideMerge(functionInvocationServiceFromOperations),
-          Layer.provideMerge(TracingService.layerNoop),
-        ),
-      ),
+      Effect.provide(Trace.writerLayerNoop),
     ),
   ),
   Operation.opaqueHandler,
@@ -159,7 +161,7 @@ const makePromptAgentToolkit = (options: {
   resultSink: Deferred.Deferred<unknown, PromptError>;
 }) => {
   class PromptAgentToolkit extends Toolkit.make(
-    Tool.make('complete_job', {
+    Tool.make('completeJob', {
       parameters: {
         success: Schema.optional(Schema.Any), // TODO(dmaretskyi): Pipe output schema here.
         failure: Schema.optional(
@@ -176,7 +178,7 @@ const makePromptAgentToolkit = (options: {
     }),
   ) {}
   const layer = PromptAgentToolkit.toLayer({
-    complete_job: Effect.fnUntraced(function* (result) {
+    completeJob: Effect.fnUntraced(function* (result) {
       if (result.failure) {
         yield* Deferred.fail(
           options.resultSink,
@@ -190,7 +192,7 @@ const makePromptAgentToolkit = (options: {
     }),
   });
 
-  return GenericToolkit.make(PromptAgentToolkit, layer);
+  return OpaqueToolkit.make(PromptAgentToolkit, layer);
 };
 
 interface ToolExecutionServiceOptions {

package/src/functions/index.ts

@@ -3,5 +3,3 @@
 //
 
 export * from './agent';
-export * from './entity-extraction';
-export * from './exa';

package/src/sync/sync.ts

@@ -29,10 +29,16 @@ export const syncObjects: (
     Effect.fnUntraced(function* (obj) {
       // Sync referenced objects.
       for (const key of Object.keys(obj)) {
-        if (typeof key !== 'string' || key === 'id') continue;
-        if (!Ref.isRef((obj as any)[key])) continue;
+        if (typeof key !== 'string' || key === 'id') {
+          continue;
+        }
+        if (!Ref.isRef((obj as any)[key])) {
+          continue;
+        }
         const ref: Ref.Unknown = (obj as any)[key];
-        if (!ref.target) continue;
+        if (!ref.target) {
+          continue;
+        }
         if (Obj.getDXN(ref.target).isLocalObjectId()) {
           // obj not persisted to db.
           const [target] = yield* syncObjects([ref.target], { foreignKeyId });
@@ -63,23 +69,28 @@ export const syncObjects: (
 });
 
 const copyObjectData = (existing: Obj.Unknown, newObj: Obj.Unknown) => {
-  Obj.change(existing, (existing) => {
+  Obj.update(existing, (existing) => {
     // Copy properties from newObj to existing.
     for (const key of Object.keys(newObj)) {
-      if (typeof key !== 'string' || key === 'id') continue;
+      if (typeof key !== 'string' || key === 'id') {
+        continue;
+      }
       if (
         typeof (newObj as any)[key] !== 'string' &&
         typeof (newObj as any)[key] !== 'number' &&
         typeof (newObj as any)[key] !== 'boolean' &&
         !Ref.isRef((newObj as any)[key])
-      )
+      ) {
         continue;
+      }
       (existing as any)[key] = (newObj as any)[key];
     }
 
     // Delete properties that don't exist in newObj.
     for (const key of Object.keys(existing)) {
-      if (typeof key !== 'string' || key === 'id') continue;
+      if (typeof key !== 'string' || key === 'id') {
+        continue;
+      }
       if (!(key in newObj)) {
         delete (existing as any)[key];
       }

package/src/testing/plugins.tsx

@@ -9,7 +9,7 @@ import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface } from '@dxos/app-framework/ui';
 import { Format, type Obj, Type } from '@dxos/echo';
 import { Card } from '@dxos/react-ui';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { Syntax } from '@dxos/react-ui-syntax-highlighter';
 
 export const MapSchema = Schema.Struct({
   coordinates: Format.GeoPoint,
@@ -64,12 +64,14 @@ export const capabilities: Capability.Any[] = [
       position: 'fallback',
       component: ({ data }) => (
         <Card.Content>
-          <Json.Root data={data}>
-            <Json.Content>
-              <Json.Filter />
-              <Json.Data />
-            </Json.Content>
-          </Json.Root>
+          <Syntax.Root data={data}>
+            <Syntax.Content>
+              <Syntax.Filter />
+              <Syntax.Viewport>
+                <Syntax.Code />
+              </Syntax.Viewport>
+            </Syntax.Content>
+          </Syntax.Root>
         </Card.Content>
       ),
     }),

package/src/types/Agent.ts

@@ -9,8 +9,8 @@ import * as Function from 'effect/Function';
 import * as Schema from 'effect/Schema';
 
 import { AiContextBinder, AiContextService } from '@dxos/assistant';
-import { type Blueprint } from '@dxos/blueprints';
-import { Annotation, Database, Feed, Obj, Ref, Relation, Type } from '@dxos/echo';
+import { type Blueprint } from '@dxos/compute';
+import { Annotation, Database, Feed, Format, Obj, Ref, Relation, Type } from '@dxos/echo';
 import { Queue } from '@dxos/echo-db';
 import { type ObjectNotFoundError } from '@dxos/echo/Err';
 import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
@@ -28,31 +28,49 @@ import * as Plan from './Plan';
 export const Agent = Schema.Struct({
   name: Schema.optional(Schema.String),
 
+  /**
+   * When false, agent triggers are disabled after sync-triggers runs.
+   */
+  enabled: Schema.optional(Schema.Boolean).annotations({
+    title: 'Enabled',
+    description: 'Master switch for agent automation; propagated to all triggers on sync.',
+  }),
+
   /**
    * Instructions for the agent.
    */
-  // TODO(burdon): Rename instructions.
-  spec: Ref.Ref(Text.Text).pipe(FormInputAnnotation.set(false)),
+  instructions: Ref.Ref(Text.Text).pipe(
+    Format.FormatAnnotation.set(Format.TypeFormat.Markdown),
+    Schema.annotations({ title: 'Instructions' }),
+  ),
 
+  /**
+   * Primary chat for the agent.
+   */
+  // TODO(dmaretskyi): Multiple chats; RB: branching hierarchy.
+  chat: Schema.optional(Ref.Ref(Chat.Chat).pipe(FormInputAnnotation.set(false))),
+
+  // TODO(burdon): Is this used? Should it be an artifact?
+  // Format.FormatAnnotation.set(Format.TypeFormat.Markdown)
   plan: Ref.Ref(Plan.Plan).pipe(FormInputAnnotation.set(false)),
 
+  // TODO(burdon): Currently Memory.Memory objects are global to the space; make them artifacts?
   artifacts: Schema.Array(
     Schema.Struct({
       // TODO(dmaretskyi): Consider gettings names from the artifact itself using Obj.getLabel.
       name: Schema.String,
+      // TODO(burdon): Rename object.
       data: Ref.Ref(Obj.Unknown),
     }),
   ).pipe(FormInputAnnotation.set(false)),
 
   /**
-   * Incoming queue that the agent processes.
+   * Input feed for subscriptions.
    */
+  // TODO(burdon): Rename to Feed?
   // NOTE: Named `queue` to conform to subscribable schema (see QueueAnnotation).
   queue: Schema.optional(Ref.Ref(Queue).pipe(FormInputAnnotation.set(false))),
 
-  // TODO(dmaretskyi): Multiple chats.
-  chat: Schema.optional(Ref.Ref(Chat.Chat).pipe(FormInputAnnotation.set(false))),
-
   /**
    * References to objects with a canonical queue property.
    * Schema must have the QueueAnnotation.
@@ -60,11 +78,23 @@ export const Agent = Schema.Struct({
   // TODO(dmaretskyi): Turn into an array of objects when form-data
   subscriptions: Schema.Array(Ref.Ref(Obj.Unknown)).pipe(FormInputAnnotation.set(false)),
 
-  // TODO(burdon): Rename. Explain what a "qualifying agent" is.
-  useQualifyingAgent: Schema.optional(Schema.Boolean).annotations({
-    title: 'Use qualifying agent',
-    description:
-      'The qualifying agent determines if the event is relevant to the agent. Related events will be added to the input queue of the agent. It is recommended to enable this.',
+  /**
+   * Allow the agent to filter events.
+   * Related events will be added to the input queue of the agent.
+   * It is recommended to enable this.
+   */
+  filterEvents: Schema.optional(Schema.Boolean).annotations({
+    title: 'Filter events',
+    description: 'Allow the agent to filter events.',
+  }),
+
+  /**
+   * Cron expression for a timer trigger that invokes the agent worker on a schedule.
+   * The timer trigger bypasses the qualifier and goes straight to the agent worker.
+   */
+  cron: Schema.optional(Schema.String).annotations({
+    title: 'Cron',
+    description: 'Cron expression for a timer trigger that invokes the agent on a schedule.',
   }),
 }).pipe(
   Type.object({
@@ -72,11 +102,11 @@ export const Agent = Schema.Struct({
     version: '0.1.0',
   }),
   LabelAnnotation.set(['name']),
+  QueueAnnotation.set(true),
   Annotation.IconAnnotation.set({
     icon: 'ph--drone--regular',
     hue: 'sky',
   }),
-  QueueAnnotation.set(true),
 );
 
 export interface Agent extends Schema.Schema.Type<typeof Agent> {}
@@ -89,9 +119,9 @@ export interface Agent extends Schema.Schema.Type<typeof Agent> {}
  * @returns An Effect that yields the initialized Agent.
  */
 export const makeInitialized = (
-  props: Omit<Obj.MakeProps<typeof Agent>, 'spec' | 'plan' | 'artifacts' | 'subscriptions' | 'chat'> &
+  props: Omit<Obj.MakeProps<typeof Agent>, 'instructions' | 'plan' | 'artifacts' | 'subscriptions' | 'chat'> &
     Partial<Pick<Obj.MakeProps<typeof Agent>, 'artifacts' | 'subscriptions'>> & {
-      spec: string;
+      instructions: string;
       blueprints?: Ref.Ref<Blueprint.Blueprint>[];
       contextObjects?: Ref.Ref<Obj.Any>[];
     },
@@ -100,11 +130,12 @@ export const makeInitialized = (
   Effect.gen(function* () {
     const agent = Obj.make(Agent, {
       ...props,
-      spec: Ref.make(Text.make(props.spec)),
+      instructions: Ref.make(Text.make(props.instructions)),
       plan: Ref.make(Plan.makePlan({ tasks: [] })),
       artifacts: props.artifacts ?? [],
       subscriptions: props.subscriptions ?? [],
-      useQualifyingAgent: props.useQualifyingAgent ?? true,
+      filterEvents: props.filterEvents ?? true,
+      enabled: props.enabled ?? true,
     });
     yield* Database.add(agent);
     const feed = yield* Database.add(Feed.make());
@@ -134,7 +165,7 @@ export const makeInitialized = (
 
     const inputQueue = yield* QueueService.createQueue();
 
-    Obj.change(agent, (agent) => {
+    Obj.update(agent, (agent) => {
       agent.chat = Ref.make(chat);
       agent.queue = Ref.fromDXN(inputQueue.dxn);
     });
@@ -185,7 +216,7 @@ export const resetChatHistory = (
       }),
     );
     Obj.setParent(feed, chat);
-    Obj.change(agent, (agent) => {
+    Obj.update(agent, (agent) => {
       agent.chat = Ref.make(chat);
     });
 

package/src/types/Chat.ts

@@ -15,6 +15,7 @@ import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
 export const Chat = Schema.Struct({
   name: Schema.String.pipe(Schema.optional),
   feed: Ref.Ref(Feed.Feed).pipe(FormInputAnnotation.set(false)),
+  view: Schema.String.pipe(Schema.optional),
 }).pipe(
   Type.object({
     typename: 'org.dxos.type.assistant.chat',

package/src/types/McpServer.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+// @import-as-namespace
+
+import * as Schema from 'effect/Schema';
+
+import { Annotation, Type } from '@dxos/echo';
+import { LabelAnnotation } from '@dxos/echo/internal';
+
+/**
+ * MCP server configuration stored as a space-level ECHO object.
+ *
+ * NOTE: `apiKey` is stored in plaintext and replicated to all peers with access to the space.
+ * A future iteration should move secrets to per-device credential storage or use envelope encryption.
+ */
+export const McpServer = Schema.Struct({
+  name: Schema.String,
+  url: Schema.String,
+  protocol: Schema.Union(Schema.Literal('sse'), Schema.Literal('http')),
+  /** Stored in plaintext; replicated to all peers in the space. */
+  apiKey: Schema.optional(Schema.String),
+  enabled: Schema.optional(Schema.Boolean),
+}).pipe(
+  Type.object({
+    typename: 'org.dxos.type.assistant.mcpServer',
+    version: '0.1.0',
+  }),
+  LabelAnnotation.set(['name']),
+  Annotation.IconAnnotation.set({
+    icon: 'ph--plugs-connected--regular',
+    hue: 'sky',
+  }),
+);
+
+export interface McpServer extends Schema.Schema.Type<typeof McpServer> {}

package/src/types/Memory.ts

@@ -13,11 +13,12 @@ export const Memory = Schema.Struct({
   title: Schema.String,
   content: Schema.String,
 }).pipe(
-  Type.object({ typename: 'dxos.org/type/Memory', version: '0.1.0' }),
+  Type.object({ typename: 'org.dxos.type.memory', version: '0.1.0' }),
   Annotation.LabelAnnotation.set(['title']),
   Annotation.IconAnnotation.set({
     icon: 'ph--brain--regular',
     hue: 'pink',
   }),
 );
+
 export interface Memory extends Schema.Schema.Type<typeof Memory> {}

package/src/types/Plan.ts

@@ -72,7 +72,7 @@ export const generateTaskId = (plan: Plan): TaskId => {
 
 /**
  * Add new tasks to a plan, generating IDs for new tasks.
- * Use inside an `Obj.change` callback.
+ * Use inside an `Obj.update` callback.
  */
 export const addTasks = (
   plan: Obj.Mutable<Plan>,
@@ -94,7 +94,7 @@ interface MakePlanProps {
 
 export const makePlan = (props: MakePlanProps): Plan => {
   const plan = Obj.make(Plan, { tasks: [] });
-  Obj.change(plan, (plan) => {
+  Obj.update(plan, (plan) => {
     addTasks(plan, props.tasks);
   });
   return plan;

package/src/types/index.ts

@@ -4,5 +4,6 @@
 
 export * as Chat from './Chat';
 export * as Agent from './Agent';
+export * as McpServer from './McpServer';
 export * as Plan from './Plan';
 export * as Memory from './Memory';

package/dist/lib/neutral/add-artifact-5TOKSVLY.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/blueprints/project/functions/add-artifact.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Database, Obj } from '@dxos/echo';\nimport { Operation } from '@dxos/operation';\n\nimport { Agent } from '../../../types';\nimport { AddArtifact } from './definitions';\n\nexport default AddArtifact.pipe(\n  Operation.withHandler(\n    Effect.fnUntraced(function* ({ name, artifact }) {\n      if (!(yield* Database.load(artifact))) {\n        throw new Error('Artifact not found.');\n      }\n\n      const agent = yield* Agent.getFromChatContext;\n\n      Obj.change(agent, (agent) => {\n        agent.artifacts.push({\n          name,\n          data: artifact,\n        });\n      });\n    }) as any,\n  ),\n);\n"],
-  "mappings": ";;;;;;;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,UAAUC,WAAW;AAC9B,SAASC,iBAAiB;AAK1B,IAAA,uBAAeC,YAAYC,KACzBC,UAAUC,YACDC,kBAAW,WAAW,EAAEC,MAAMC,SAAQ,GAAE;AAC7C,MAAI,EAAE,OAAOC,SAASC,KAAKF,QAAAA,IAAY;AACrC,UAAM,IAAIG,MAAM,qBAAA;EAClB;AAEA,QAAMC,QAAQ,OAAOC,cAAMC;AAE3BC,MAAIC,OAAOJ,OAAO,CAACA,WAAAA;AACjBA,IAAAA,OAAMK,UAAUC,KAAK;MACnBX;MACAY,MAAMX;IACR,CAAA;EACF,CAAA;AACF,CAAA,CAAA,CAAA;",
-  "names": ["Effect", "Database", "Obj", "Operation", "AddArtifact", "pipe", "Operation", "withHandler", "fnUntraced", "name", "artifact", "Database", "load", "Error", "agent", "Agent", "getFromChatContext", "Obj", "change", "artifacts", "push", "data"]
-}