@dxos/assistant-toolkit 0.9.1-main.c7dcc2e112 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant-toolkit",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.10.0",
   "description": "Assistant toolkit, definitions, and utilities.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,45 +30,45 @@
   "dependencies": {
     "@effect/ai": "0.36.0",
     "@effect/ai-anthropic": "0.26.0",
-    "@effect/platform": "0.96.1",
+    "@effect/platform": "0.96.2",
     "dfx": "^0.127.0",
     "exa-js": "^1.5.12",
-    "@dxos/ai": "0.9.1-main.c7dcc2e112",
-    "@dxos/app-framework": "0.9.1-main.c7dcc2e112",
-    "@dxos/assistant": "0.9.1-main.c7dcc2e112",
-    "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
-    "@dxos/client-protocol": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute-runtime": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-protocol": "0.9.1-main.c7dcc2e112",
-    "@dxos/edge-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/effect": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions": "0.9.1-main.c7dcc2e112",
-    "@dxos/errors": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions-runtime": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-syntax-highlighter": "0.9.1-main.c7dcc2e112",
-    "@dxos/schema": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112",
-    "@dxos/types": "0.9.1-main.c7dcc2e112"
+    "@dxos/ai": "0.10.0",
+    "@dxos/app-framework": "0.10.0",
+    "@dxos/assistant": "0.10.0",
+    "@dxos/client-protocol": "0.10.0",
+    "@dxos/echo": "0.10.0",
+    "@dxos/app-toolkit": "0.10.0",
+    "@dxos/compute": "0.10.0",
+    "@dxos/compute-runtime": "0.10.0",
+    "@dxos/edge-client": "0.10.0",
+    "@dxos/errors": "0.10.0",
+    "@dxos/echo-protocol": "0.10.0",
+    "@dxos/functions": "0.10.0",
+    "@dxos/effect": "0.10.0",
+    "@dxos/invariant": "0.10.0",
+    "@dxos/functions-runtime": "0.10.0",
+    "@dxos/react-ui": "0.10.0",
+    "@dxos/keys": "0.10.0",
+    "@dxos/react-ui-syntax-highlighter": "0.10.0",
+    "@dxos/schema": "0.10.0",
+    "@dxos/types": "0.10.0",
+    "@dxos/util": "0.10.0",
+    "@dxos/log": "0.10.0"
   },
   "devDependencies": {
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
-    "@dxos/client-protocol": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-markdown": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
+    "@dxos/client-protocol": "0.10.0",
+    "@dxos/plugin-markdown": "0.10.0",
+    "@dxos/ui-theme": "0.10.0"
   },
   "peerDependencies": {
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
+    "@dxos/ui-theme": "0.10.0"
   },
   "publishConfig": {
     "access": "public"

package/src/errors.ts

@@ -23,3 +23,15 @@ export class PromptError extends BaseError.extend('PromptError') {
     });
   }
 }
+
+/**
+ * Exactly-one invariant violated for an object bound to the harness conversation context.
+ */
+export class HarnessContextError extends BaseError.extend('HarnessContextError', 'Harness context invariant violated') {
+  constructor(context: { type: string; count: number }) {
+    super({
+      message: `There should be exactly one ${context.type} in context. Got: ${context.count}.`,
+      context,
+    });
+  }
+}

package/src/index.ts

@@ -2,10 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './blueprints';
-export * from './crud';
-export * from './functions';
+export * from './skills';
+export * from './operations';
 export * from './supervisor';
 export * from './sync';
-export * from './toolkits';
 export * from './types';

package/src/{functions/agent → operations}/definitions.ts

@@ -4,40 +4,39 @@
 
 import * as Schema from 'effect/Schema';
 
-import { AiService, OpaqueToolkit, ModelName } from '@dxos/ai';
-import { Routine, Trace, Operation } from '@dxos/compute';
+import { AiService, OpaqueToolkit } from '@dxos/ai';
+import { Instructions, Operation, Trace } from '@dxos/compute';
 import { Database, Feed, Ref, Registry } from '@dxos/echo';
 import { DXN } from '@dxos/keys';
 import { Text } from '@dxos/schema';
 
-import * as Chat from '../../types/Chat';
+import * as Chat from '../types/Chat';
 
-// TODO(dmaretskyi): Rename to RunRoutine.
-export const AgentPrompt = Operation.make({
+export const RunInstructions = Operation.make({
   meta: {
-    key: DXN.make('org.dxos.function.prompt'),
-    name: 'Run Routine',
-    description: 'Agentic worker that executes a provided prompt using blueprints and tools.',
+    key: DXN.make('org.dxos.function.runInstructions'),
+    name: 'Run Instructions',
+    description: 'Agentic worker that executes a provided prompt using skills and tools.',
     icon: 'ph--brain--regular',
   },
   input: Schema.Struct({
-    prompt: Ref.Ref(Routine.Routine),
+    instructions: Ref.Ref(Instructions.Instructions),
 
     /**
-     * When set, runs in this chat (history, queue, and bound context). Routine blueprints and context objects are merged into the conversation for this request.
+     * Input object or data.
+     * References get auto-resolved.
      */
-    chat: Schema.optional(Ref.Ref(Chat.Chat)),
+    input: Schema.Any.pipe(Schema.annotations({ title: 'Input' })),
 
     /**
-     * @default ai.claude.model.claude-opus-4-8
+     * When set, runs in this chat (history, queue, and bound context). Routine skills and context objects are merged into the conversation for this request.
      */
-    model: Schema.optional(ModelName),
+    chat: Schema.optional(Ref.Ref(Chat.Chat)),
 
     /**
-     * Input object or data.
-     * References get auto-resolved.
+     * @default dxn:com.anthropic.model.claude-opus-4-8.default
      */
-    input: Schema.Any.pipe(Schema.annotations({ title: 'Input' })),
+    model: Schema.optional(DXN.Schema),
 
     systemInstructions: Schema.optional(Schema.String).annotations({
       description: 'Additional system instructions to add to the system prompt.',
@@ -46,11 +45,10 @@ export const AgentPrompt = Operation.make({
   output: Schema.Any,
   // ECHO types that the handler loads via Database.load(). Declaring them here ensures the
   // runtime registers their schema before remote invocation (e.g. via the EDGE function service).
-  types: [Routine.Routine, Text.Text, Feed.Feed, Chat.Chat],
+  types: [Instructions.Instructions, Text.Text, Feed.Feed, Chat.Chat],
   services: [
     AiService.AiService,
     Database.Service,
-    Feed.FeedService,
     OpaqueToolkit.OpaqueToolkitProvider,
     Registry.Service,
     Trace.TraceService,

package/src/{functions/agent → operations}/index.ts

@@ -6,4 +6,4 @@ import { OperationHandlerSet } from '@dxos/compute';
 
 export * from './definitions';
 
-export const AgentHandlers = OperationHandlerSet.lazy(() => import('./prompt'));
+export const AgentHandlers = OperationHandlerSet.lazy(() => import('./run-instructions'));

package/src/operations/run-instructions.conversations.json

@@ -0,0 +1 @@
+{"conversations":[{"parameters":{"model":"dxn:com.anthropic.model.claudeOpus48","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"string"},"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_0153cr8reaEp7UUPQ6mDsw33","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"ack","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","delta":"{\"success\"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","delta":": \"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","delta":"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":612,"outputTokens":52,"totalTokens":664},"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":612,"output_tokens":4,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claudeOpus48","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"string"},"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":"text","text":"ack","options":{}},{"type":"tool-call","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01G8D91FCK1Ufxt927zs8Pke","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01JwZWDHP9f91j9mtuBcweEi","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"ack","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":671,"outputTokens":4,"totalTokens":675},"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":671,"output_tokens":4,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claudeOpus48","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"object","required":["name","age"],"properties":{"name":{"type":"string"},"age":{"type":"number"}},"additionalProperties":false},"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":"Invent a fictional person and call completeJob with the success object describing them (name and age).\n<input>{}</input>","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_019BDNVW5UBKUGq1fPmQQg5x","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EtEBCmMIDxgCKkBVw1KTUvy7ptjvU5KhOrJzn6FiU+sGl7uyv3E5tQNCLoTMrYyNrZ9cIwIzQisu+ee9oMZ6wWLLF2btcTWRVWCAMg9jbGF1ZGUtb3B1cy00LTg4AEIIdGhpbmtpbmcSDPHq6lstKXSz5+gs3BoMLWs6Npza0CHs3w3+IjAYs9sYyXBEVkXu1uxuY34gp1OEbqzEhTc++dBNqDAa8BiDdAudN6Hh+bsTaFaobq8qHGgvSqiOqVGXMGe0HdDr8nRlh4FgmWYHsvGNLX0YAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01CfLMgATBzNGar8mig31jpu","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":"{\"succes","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":"s\": {\"name\"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":":\"Elean","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":"or","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":" Vance","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":"\",\"age","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":"\":3","metadata":{}},{"type":"tool-params-delta","id":"toolu_01CfLMgATBzNGar8mig31jpu","delta":"4}}","metadata":{}},{"type":"tool-params-end","id":"toolu_01CfLMgATBzNGar8mig31jpu","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":678,"outputTokens":75,"totalTokens":753},"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":678,"output_tokens":57,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claudeOpus48","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"object","required":["name","age"],"properties":{"name":{"type":"string"},"age":{"type":"number"}},"additionalProperties":false},"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":"Invent a fictional person and call completeJob with the success object describing them (name and age).\n<input>{}</input>","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"","options":{}},{"type":"tool-call","id":"toolu_01CfLMgATBzNGar8mig31jpu","name":"completeJob","params":{"success":{"name":"Eleanor Vance","age":34}},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01CfLMgATBzNGar8mig31jpu","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01NU5aMLn4XFj5QY5mrVHJuZ","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"I","metadata":{}},{"type":"text-delta","id":"0","delta":"'ve created a fictional person named Eleanor Vance, age 34, and submitted them via completeJob.","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":752,"outputTokens":35,"totalTokens":787},"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":752,"output_tokens":1,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claudeOpus48","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"string"},"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].\n\n## Context Objects\n\n<object>\n  <dxn>echo://BDJXMULPW5FB55UZ7KP5HLDHVTXUTHE2U/01JGFJJZ00G0WKQSJGMAKCNT8A</dxn>\n  <typename>org.dxos.type.assistant.chat</typename>\n</object>","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_01CVS6itosiKTLqoqYECoGWg","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"ack","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","delta":"{\"s","metadata":{}},{"type":"tool-params-delta","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","delta":"ucce","metadata":{}},{"type":"tool-params-delta","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","delta":"ss\": \"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","delta":"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":724,"outputTokens":52,"totalTokens":776},"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":724,"output_tokens":4,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claudeOpus48","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"string"},"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].\n\n## Context Objects\n\n<object>\n  <dxn>echo://BDJXMULPW5FB55UZ7KP5HLDHVTXUTHE2U/01JGFJJZ00G0WKQSJGMAKCNT8A</dxn>\n  <typename>org.dxos.type.assistant.chat</typename>\n</object>","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{}},{"role":"assistant","content":[{"type":"text","text":"ack","options":{}},{"type":"tool-call","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01XzJ1hGLDmTa8BaqDexfDbZ","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01V4JNNLgtHrbJxKxQDVyXzb","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"ack","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":783,"outputTokens":4,"totalTokens":787},"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":783,"output_tokens":4,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claude-opus-4-8.default","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"string"},"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].\n\n## Context Objects\n\n<object>\n  <dxn>echo://BDJXMULPW5FB55UZ7KP5HLDHVTXUTHE2U/01JGFJJZ00G0WKQSJGMAKCNT8A</dxn>\n  <typename>org.dxos.type.assistant.chat</typename>\n</object>","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_018VHmVQ6iNHU4FHiXgJMUwY","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"ack","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","delta":"{\"s","metadata":{}},{"type":"tool-params-delta","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","delta":"ucce","metadata":{}},{"type":"tool-params-delta","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","delta":"ss\": \"ack\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":724,"outputTokens":52,"totalTokens":776},"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":724,"output_tokens":4,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claude-opus-4-8.default","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"string"},"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].\n\n## Context Objects\n\n<object>\n  <dxn>echo://BDJXMULPW5FB55UZ7KP5HLDHVTXUTHE2U/01JGFJJZ00G0WKQSJGMAKCNT8A</dxn>\n  <typename>org.dxos.type.assistant.chat</typename>\n</object>","options":{}},{"role":"user","content":"Reply with a single word: ack.\n<input>{}</input>","options":{}},{"role":"assistant","content":[{"type":"text","text":"ack","options":{}},{"type":"tool-call","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","name":"completeJob","params":{"success":"ack"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01SRavvLjWk6zhv1TyrFsdp5","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01QSoFHABffojvPky1tdoXxM","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"ack","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":783,"outputTokens":4,"totalTokens":787},"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":783,"output_tokens":4,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claude-opus-4-8.default","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"object","required":["name","age"],"properties":{"name":{"type":"string"},"age":{"type":"number"}},"additionalProperties":false},"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":"Invent a fictional person and call completeJob with the success object describing them (name and age).\n<input>{}</input>","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01KLYHj1mTcocgfP8YsUF5KB","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EogCCmMIDxgCKkByv/2cBEVkb9zPO7UA+QRheh+uTjBIakYniEgOcHYZcu9kDrZBMw6El578ODBYiqybw/5r8oBoOTtmz1W9xkKYMg9jbGF1ZGUtb3B1cy00LTg4AEIIdGhpbmtpbmcSDJVApLPVOiKe74P3ARoM4SiyyjXCAFNVbbmlIjCtRTgJtgB8dANbeZZ72gxXuFudL3oSAoYqzh+AmJC3lbExS9Tv3rVQfG/azsYA/2IqUyreggU847XEMSBvY367PwMJcuv5uPMxW5H9UVHAMKa8MjQKN/+BIAXn1NmcUXuOxJebuwrXI8FqH2ItXT5JHIVz9NxDJnbPDoA3DMHgwYFlW3hnGAE="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"tool-params-start","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","name":"completeJob","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","delta":"{\"success\": ","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","delta":"{\"name\":\"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","delta":"Eleanor Vanc","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","delta":"e\",\"ag","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","delta":"e\":34","metadata":{}},{"type":"tool-params-delta","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","delta":"}}","metadata":{}},{"type":"tool-params-end","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":678,"outputTokens":88,"totalTokens":766},"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":678,"output_tokens":6,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"dxn:com.anthropic.model.claude-opus-4-8.default","stream":true,"tools":[{"name":"completeJob","inputSchema":{"type":"object","required":[],"properties":{"success":{"type":"object","required":["name","age"],"properties":{"name":{"type":"string"},"age":{"type":"number"}},"additionalProperties":false},"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":"Invent a fictional person and call completeJob with the success object describing them (name and age).\n<input>{}</input>","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"","options":{}},{"type":"tool-call","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","name":"completeJob","params":{"success":{"name":"Eleanor Vance","age":34}},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01JaaTR43JU1qqDCcx3iSL12","name":"completeJob","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_0163UXRftCZBAUuB7RiRMm6e","modelId":"claude-opus-4-8","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"text-start","id":"0","metadata":{}},{"type":"text-delta","id":"0","delta":"I","metadata":{}},{"type":"text-delta","id":"0","delta":"'ve invented a fictional person named Eleanor Vance, age 34, and submitted the success object via completeJob.","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":752,"outputTokens":38,"totalTokens":790},"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":752,"output_tokens":1,"server_tool_use":null,"service_tier":"standard"}}}}]}]}

package/src/operations/run-instructions.test.ts

@@ -0,0 +1,118 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, expect, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+
+import { AiContext } from '@dxos/assistant';
+import { Instructions, Operation, OperationHandlerSet } from '@dxos/compute';
+import { Database, Feed, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
+import { TestHelpers } from '@dxos/effect/testing';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
+import { EntityId } from '@dxos/keys';
+import { Text } from '@dxos/schema';
+import { Message } from '@dxos/types';
+
+import * as Chat from '../types/Chat';
+import * as Plan from '../types/Plan';
+import { RunInstructions } from './definitions';
+import defaultAgentPrompt from './run-instructions';
+
+EntityId.dangerouslyDisableRandomness();
+
+const operationHandlerSet = OperationHandlerSet.make(defaultAgentPrompt);
+
+const TestLayer = AssistantTestLayer({
+  operationHandlers: operationHandlerSet,
+  types: [Chat.Chat, Message.Message, AiContext.Binding, Text.Text, Plan.Plan],
+  aiServicePreset: 'edge-remote',
+});
+
+describe('Agent prompt', () => {
+  it.effect(
+    'chat mode appends assistant messages to the chat queue',
+    Effect.fnUntraced(
+      function* (_) {
+        const feed = yield* Database.add(Feed.make());
+        const messageCountBefore = yield* countFeedMessages(feed);
+
+        const chat = yield* Database.add(
+          Chat.make({
+            feed: Ref.make(feed),
+          }),
+        );
+
+        const instructions = yield* Database.add(
+          Instructions.make({
+            name: 'chat-mode-test',
+            text: 'Reply with a single word: ack.',
+            skills: [],
+            output: Schema.String,
+          }),
+        );
+
+        yield* Database.flush();
+
+        const result = yield* Operation.invoke(RunInstructions, {
+          instructions: Ref.make(instructions),
+          input: {},
+          chat: Ref.make(chat),
+        });
+
+        const messageCountAfter = yield* countFeedMessages(feed);
+
+        expect(messageCountAfter).toBeGreaterThan(messageCountBefore);
+        expect(result).toBe('ack');
+      },
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    { timeout: 60_000 },
+  );
+
+  it.effect(
+    'generates an object conforming to the instructions output schema',
+    Effect.fnUntraced(
+      function* (_) {
+        const Person = Schema.Struct({
+          name: Schema.String,
+          age: Schema.Number,
+        });
+
+        const instructions = yield* Database.add(
+          Instructions.make({
+            name: 'output-schema-test',
+            text: 'Invent a fictional person and call completeJob with the success object describing them (name and age).',
+            output: Person,
+            skills: [],
+          }),
+        );
+
+        yield* Database.flush();
+
+        const result = yield* Operation.invoke(RunInstructions, {
+          instructions: Ref.make(instructions),
+          input: {},
+        });
+
+        // The instructions persists its declared output as a JSON schema; decode it back and assert the
+        // agent-produced object satisfies that schema.
+        const outputSchema = JsonSchema.toEffectSchema(instructions.output);
+        const decoded = Schema.decodeUnknownSync(outputSchema)(result);
+        expect(typeof decoded.name).toBe('string');
+        expect(typeof decoded.age).toBe('number');
+      },
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    { timeout: 60_000 },
+  );
+});
+
+const countFeedMessages = (feed: Feed.Feed) =>
+  Effect.gen(function* () {
+    const items = yield* Feed.query(feed, Filter.everything()).run;
+    return items.filter(Obj.instanceOf(Message.Message)).length;
+  });

package/src/{functions/agent/prompt.ts → operations/run-instructions.ts}

@@ -10,27 +10,36 @@ import * as Layer from 'effect/Layer';
 import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
-import { AiService, OpaqueToolkit, ModelName } from '@dxos/ai';
+import { AiService, OpaqueToolkit } from '@dxos/ai';
 import {
   AiSession,
   getOperationFromTool,
   makeToolExecutionService,
   makeToolResolverFromOperations,
 } from '@dxos/assistant';
-import { Template, Trace, Operation } from '@dxos/compute';
-import { Database, Feed, Obj, Ref } from '@dxos/echo';
+import { Operation, Template, Trace } from '@dxos/compute';
+import { Database, Feed, JsonSchema, Obj, Ref } from '@dxos/echo';
 import { EffectEx } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
+import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { trim } from '@dxos/util';
 
-import { PromptError } from '../../errors';
-import * as Chat from '../../types/Chat';
-import { AgentPrompt } from './definitions';
+import { PromptError } from '../errors';
+import * as Chat from '../types/Chat';
+import { RunInstructions } from './definitions';
 
-const DEFAULT_MODEL: ModelName = 'ai.claude.model.claude-opus-4-8';
+const DEFAULT_MODEL: DXN.DXN = DXN.make('com.anthropic.model.claude-opus-4-8.default');
 
-export default AgentPrompt.pipe(
+const routineOutputSchema = (output: JsonSchema.JsonSchema): Schema.Schema.All => {
+  // Routines default to Void output; completeJob still needs to accept arbitrary success payloads.
+  if ('$id' in output && output.$id === '/schemas/unknown') {
+    return Schema.Any;
+  }
+  return JsonSchema.toEffectSchema(output);
+};
+
+export default RunInstructions.pipe(
   Operation.withHandler(
     Effect.fnUntraced(
       function* (data) {
@@ -41,31 +50,32 @@ export default AgentPrompt.pipe(
           : Effect.succeed(data.input);
 
         yield* Database.flush();
-        const prompt = yield* Database.load(data.prompt);
-        yield* Trace.emitStatus(`Running ${prompt.id}`);
+        const instructions = yield* Database.load(data.instructions);
+        yield* Trace.emitStatus(`Running ${instructions.id}`);
 
-        log.info('starting agent', { prompt: prompt.id, input });
+        log.info('starting agent', { instructions: instructions.id, input });
 
-        // Bind the routine's own refs, dropping any that no longer resolve. The refs must be
+        // Bind the instructions' own refs, dropping any that no longer resolve. The refs must be
         // bound as-is (not re-wrapped via `Ref.make`) to preserve their registry DXN: bindings
-        // are persisted to the conversation feed, and registry-only blueprints have no space-DB
+        // are persisted to the conversation feed, and registry-only skills have no space-DB
         // identity, so an EID ref would not resolve when the binding is re-read.
-        const blueprintRefs = yield* Effect.filter(prompt.blueprints, (ref) =>
+        const skillRefs = yield* Effect.filter(instructions.skills, (ref) =>
           Database.load(ref).pipe(
             Effect.as(true),
             Effect.catchTag('EntityNotFoundError', () => Effect.succeed(false)),
           ),
         );
 
-        const objectRefs = yield* Effect.filter(prompt.context, (ref) =>
+        // Bind the instructions' context objects (sibling of skills), dropping any that no longer resolve.
+        const objectRefs = yield* Effect.filter(instructions.objects ?? [], (ref) =>
           Database.load(ref).pipe(
             Effect.as(true),
             Effect.catchTag('EntityNotFoundError', () => Effect.succeed(false)),
           ),
         );
 
-        const promptInstructions = yield* Database.load(prompt.instructions);
-        let promptText = Template.process(promptInstructions.content, input);
+        const textDoc = yield* Database.load(instructions.text);
+        let promptText = Template.process(textDoc.content, input);
 
         if (input !== undefined) {
           promptText += `\n<input>${JSON.stringify(input)}</input>`;
@@ -84,7 +94,7 @@ export default AgentPrompt.pipe(
           systemText += `\n${data.systemInstructions}`;
         }
 
-        const modelLayer = AiService.model(data.model ?? DEFAULT_MODEL);
+        const modelLayer = AiService.model(DXN.getName(data.model ?? DEFAULT_MODEL));
 
         let feed: Feed.Feed;
         if (data.chat) {
@@ -97,17 +107,17 @@ export default AgentPrompt.pipe(
 
         const resultSink = yield* Deferred.make<unknown, PromptError>();
         const promptToolkit = makePromptAgentToolkit({
-          output: Schema.Any, // TODO(dmaretskyi): Use prompt's output schema.
+          output: routineOutputSchema(instructions.output),
           resultSink,
         });
 
-        const runtime = yield* Effect.runtime<Feed.FeedService>();
+        const runtime = yield* Effect.runtime<Database.Service>();
         const session = yield* EffectEx.acquireReleaseResource(() => new AiSession.Session({ feed, runtime }));
 
         yield* Effect.promise(() =>
           session.context.bind({
-            blueprints: blueprintRefs,
-            objects: objectRefs,
+            skills: skillRefs,
+            objects: data.chat ? [...objectRefs, data.chat] : objectRefs,
           }),
         );
 
@@ -162,13 +172,13 @@ export default AgentPrompt.pipe(
 );
 
 const makePromptAgentToolkit = (options: {
-  output: Schema.Schema.Any;
+  output: Schema.Schema.All;
   resultSink: Deferred.Deferred<unknown, PromptError>;
 }) => {
   class PromptAgentToolkit extends Toolkit.make(
     Tool.make('completeJob', {
       parameters: {
-        success: Schema.optional(Schema.Any), // TODO(dmaretskyi): Pipe output schema here.
+        success: Schema.optional(options.output),
         failure: Schema.optional(
           Schema.Struct({
             message: Schema.String.annotations({