@dxos/assistant-toolkit 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

package/src/toolkits/AssistantToolkit.conversations.json

@@ -1 +0,0 @@
-{"conversations":[{"parameters":{"model":"@anthropic/claude-opus-4-0","stream":true,"tools":[]},"prompt":{"content":[{"role":"system","content":"## Blueprints Definitions\n\n<blueprint>\n  \n</blueprint>","options":{}},{"role":"user","content":"Add to context: {\"id\":\"01JGFJJZ00G0WKQSJGMAKCNT8D\",\"@type\":\"dxn:type:dxos.org/type/Organization:0.1.0\",\"@meta\":{\"keys\":[]},\"name\":\"Cyberdyne Systems\",\"website\":\"https://cyberdyne.com\"}","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01ESZ2RnTWWshCN6AuVjhxBW","modelId":"claude-opus-4-20250514","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The user is adding","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" an","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" Organization","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" object","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" to the context.","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" This","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" appears","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" to be a DXOS object","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" with:","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"\n- An","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" ID","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"\n- A type designation","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" (@","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"type)","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" indicating","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" it's an Organization type version","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" 0.1.0\n-","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" Metadata with","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" an","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" empty keys array\n- A name:","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" \"Cyberdyne Systems\"","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"\n- A website: \"https://cyb","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"erdyne.com\"\n\nI shoul","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"d acknowledge that","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" this","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" has","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" been added to the context and be","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" ready to reference","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" or work","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" with this organization data","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" as","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" needed.","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EswECkYICxgCKkAKoUuFWE5zJ6soltEFAuI6miLz75XAO+fhBFkck5nOV8Zgw+xtXu+lcLNKF9T+nYU005q7jufvyi6dUAL4VAbDEgxQiKz084T8/HxIiC0aDGHf4286rPMhEleyDyIwW+6ZQtEfTq8gYiaaOpyqPRwa3cPy26HMeKj/1BXdMW9MJDcjxj02kjji0a4BV8AzKrMD6vSRsoAjP6ql8CxTqD91VvFiLqs4rqhHOVwlmmKVygRMogk5RvvRG/T4QzEGZSd7Xcl8yB19i03q3kpErfJu6b8+mFhndVcgBbFeFoGAA9aAJleUTdyLKvx/hSexzF0Th7xEdP1VTM4//JVq3lXB2LqqJzih7wTbqTn92vq5leNtGDoKJwnFdNvoxixY+HgB1JKSfsSGkZolby5yOp6kG52/2okeJfokgYpIjAxny8KjVq7SHsD9o9fLrKuA3VtzwG9eBBtK5t11bJoGQF+vGEmIwha35riPZIvzpa+SAbY4bU9QtMOnqn21fwYyhur/5WPXMZl3AsvJSi8yDcUrCbjsYcIxcn8lbCdbKA4sLMtQimREj7NU8onkj9ymivbG5CgluFohwpTFKyX4SNKd9MYdtE31Acmop2Zi2iHJQ+d/jH7tn503qoCeHV6LkMEEd0oFN5qHqRA5N0SBdKWrHzmlbBT4IHM4TvEwMINkzqf3J4TkCCwj727G4g7qepboMHiqtVYt5+HsQIZ3g8vR6hMTBoJn7qVUCWb67PImJNNQDzXoumvVEpHi9ZUI/rzJf+a8GAE="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"text-start","id":"1","metadata":{}},{"type":"text-delta","id":"1","delta":"I've added the Cyb","metadata":{}},{"type":"text-delta","id":"1","delta":"erdyne Systems organization object","metadata":{}},{"type":"text-delta","id":"1","delta":" to the","metadata":{}},{"type":"text-delta","id":"1","delta":" context. This","metadata":{}},{"type":"text-delta","id":"1","delta":" organization","metadata":{}},{"type":"text-delta","id":"1","delta":" has","metadata":{}},{"type":"text-delta","id":"1","delta":":","metadata":{}},{"type":"text-delta","id":"1","delta":"\n- Name","metadata":{}},{"type":"text-delta","id":"1","delta":": Cyberdyne Systems\n-","metadata":{}},{"type":"text-delta","id":"1","delta":" Website: https://cyberdyne.","metadata":{}},{"type":"text-delta","id":"1","delta":"com\n- Type: dxos","metadata":{}},{"type":"text-delta","id":"1","delta":".org/type/Organization:0","metadata":{}},{"type":"text-delta","id":"1","delta":".1.0","metadata":{}},{"type":"text-delta","id":"1","delta":"\n- ID: 01JG","metadata":{}},{"type":"text-delta","id":"1","delta":"FJJZ00G0W","metadata":{}},{"type":"text-delta","id":"1","delta":"KQSJGMAKCNT8","metadata":{}},{"type":"text-delta","id":"1","delta":"D\n\nI","metadata":{}},{"type":"text-delta","id":"1","delta":" can now reference this organization data","metadata":{}},{"type":"text-delta","id":"1","delta":" in","metadata":{}},{"type":"text-delta","id":"1","delta":" any","metadata":{}},{"type":"text-delta","id":"1","delta":" subsequent","metadata":{}},{"type":"text-delta","id":"1","delta":" operations","metadata":{}},{"type":"text-delta","id":"1","delta":" or queries","metadata":{}},{"type":"text-delta","id":"1","delta":" you","metadata":{}},{"type":"text-delta","id":"1","delta":"'","metadata":{}},{"type":"text-delta","id":"1","delta":"d like to perform","metadata":{}},{"type":"text-delta","id":"1","delta":".","metadata":{}},{"type":"text-end","id":"1","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":135,"outputTokens":224,"totalTokens":359},"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":135,"output_tokens":4,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-0","stream":true,"tools":[{"name":"context-add","description":"Adds the object to the chat context.","inputSchema":{"type":"object","required":["id"],"properties":{"id":{"type":"string","description":"The ID of the document to add.","examples":["dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","@dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","BM3FSHFOMJCHCG5QW7JTVKGYABD2GAA7G:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","01KG7R1ZXWFMWQ4DA1Q6TN1DG4"]}},"additionalProperties":false}},{"name":"context-remove","description":"Removes the object from the chat context.","inputSchema":{"type":"object","required":["id"],"properties":{"id":{"type":"string","description":"The ID of the document to remove.","examples":["dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","@dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","BM3FSHFOMJCHCG5QW7JTVKGYABD2GAA7G:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","01KG7R1ZXWFMWQ4DA1Q6TN1DG4"]}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"## Blueprints Definitions\n\n<blueprint>\n  \n</blueprint>","options":{}},{"role":"user","content":"Add to context: {\"id\":\"01JGFJJZ00G0WKQSJGMAKCNT8D\",\"@type\":\"dxn:type:dxos.org/type/Organization:0.1.0\",\"@meta\":{\"keys\":[]},\"name\":\"Cyberdyne Systems\",\"website\":\"https://cyberdyne.com\"}","options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01PwdqJ4KYGWGo88Bpgkcb1b","modelId":"claude-opus-4-20250514","timestamp":"1970-01-01T00:00:00.000Z","metadata":{}},{"type":"reasoning-start","id":"0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"The user wants to add an object to","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" the context. The","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" object has:","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"\n- id: \"01J","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"GFJJZ00G0","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"WKQSJGMAKCNT","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"8D\"\n- It","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"'s an","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" Organization type object","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"\n- name","metadata":{}},{"type":"reasoning-delta","id":"0","delta":": \"Cyberdyne Systems\"","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"\n- website: \"https://cyb","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"erdyne.com\"\n\nI nee","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"d to use the context-add function with","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" the","metadata":{}},{"type":"reasoning-delta","id":"0","delta":" id parameter.","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{}},{"type":"reasoning-delta","id":"0","delta":"","metadata":{"anthropic":{"type":"thinking","signature":"EqkDCkYICxgCKkDRhGEp8nE9S2hhdiFom4JqAoWxdW/nKv7jjNB9Uybh5aeqVE13x2HhOoQJMWph3asUEzzt5B15yGTfoKc9lHSCEgytP588WsRipnT22dIaDFQPA72QE/XIbvEA+CIwxPckN1BzzMGgibUZmFKXxBdos3WMVBf2RpenWMQSppU+Ese4HQmltoQmp9zf7lj0KpAC1ZJP/lOSBxUTXS8BZWa7nOPclHVSohW2Ug8mul/NfMEDawimCvkkVYRRrdZQp1IeG/+kvJG7rQbgYsDU6SXN4zdPKcYtjv9wfIpRT6f200g1iBqRr1qKiMhLKpFNcAsOUaNQDXhKhr/A6ZhH4gaovEw65v10fyeUoHGzUHrDAEpy8cYDvzF/3TPEJhe3zIBw60cepyLaEZy+Z/1qmY2lsEqrkh95rv9WFASlB30nm762InotIIkAsMlxXY1xI0n+AZgh/ypPqyqaGiMVZ8aHKVLiCkBE1uTZszZBh7L2raEXK6znKVNSA4SiN33Mwzw7kEBBFrsuhrQnKqg8l5GaNqaE77knShQAXkzQYmgy8FMYAQ=="}}},{"type":"reasoning-end","id":"0","metadata":{}},{"type":"text-start","id":"1","metadata":{}},{"type":"text-delta","id":"1","delta":"I'll add this Organization","metadata":{}},{"type":"text-delta","id":"1","delta":" object to the context for you.","metadata":{}},{"type":"text-end","id":"1","metadata":{}},{"type":"tool-params-start","id":"toolu_01P7myKvWntosLM6RtWwKZGA","name":"context-add","providerExecuted":false,"metadata":{}},{"type":"tool-params-delta","id":"toolu_01P7myKvWntosLM6RtWwKZGA","delta":"","metadata":{}},{"type":"tool-params-delta","id":"toolu_01P7myKvWntosLM6RtWwKZGA","delta":"{\"id\": \"01JG","metadata":{}},{"type":"tool-params-delta","id":"toolu_01P7myKvWntosLM6RtWwKZGA","delta":"FJJZ00G0WKQ","metadata":{}},{"type":"tool-params-delta","id":"toolu_01P7myKvWntosLM6RtWwKZGA","delta":"SJGMAK","metadata":{}},{"type":"tool-params-delta","id":"toolu_01P7myKvWntosLM6RtWwKZGA","delta":"CNT8D\"}","metadata":{}},{"type":"tool-params-end","id":"toolu_01P7myKvWntosLM6RtWwKZGA","metadata":{}},{"type":"tool-call","id":"toolu_01P7myKvWntosLM6RtWwKZGA","name":"context-add","params":{"id":"01JGFJJZ00G0WKQSJGMAKCNT8D"},"providerExecuted":false,"metadata":{}},{"type":"finish","reason":"tool-calls","usage":{"inputTokens":911,"outputTokens":183,"totalTokens":1094},"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":911,"output_tokens":8,"server_tool_use":null,"service_tier":"standard"}}}}]},{"parameters":{"model":"@anthropic/claude-opus-4-0","stream":true,"tools":[{"name":"context-add","description":"Adds the object to the chat context.","inputSchema":{"type":"object","required":["id"],"properties":{"id":{"type":"string","description":"The ID of the document to add.","examples":["dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","@dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","BM3FSHFOMJCHCG5QW7JTVKGYABD2GAA7G:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","01KG7R1ZXWFMWQ4DA1Q6TN1DG4"]}},"additionalProperties":false}},{"name":"context-remove","description":"Removes the object from the chat context.","inputSchema":{"type":"object","required":["id"],"properties":{"id":{"type":"string","description":"The ID of the document to remove.","examples":["dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","@dxn:echo:@:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","BM3FSHFOMJCHCG5QW7JTVKGYABD2GAA7G:01KG7R1ZXWFMWQ4DA1Q6TN1DG4","01KG7R1ZXWFMWQ4DA1Q6TN1DG4"]}},"additionalProperties":false}}]},"prompt":{"content":[{"role":"system","content":"## Blueprints Definitions\n\n<blueprint>\n  \n</blueprint>","options":{}},{"role":"user","content":"Add to context: {\"id\":\"01JGFJJZ00G0WKQSJGMAKCNT8D\",\"@type\":\"dxn:type:dxos.org/type/Organization:0.1.0\",\"@meta\":{\"keys\":[]},\"name\":\"Cyberdyne Systems\",\"website\":\"https://cyberdyne.com\"}","options":{}},{"role":"assistant","content":[{"type":"reasoning","text":"The user wants to add an object to the context. The object has:\n- id: \"01JGFJJZ00G0WKQSJGMAKCNT8D\"\n- It's an Organization type object\n- name: \"Cyberdyne Systems\"\n- website: \"https://cyberdyne.com\"\n\nI need to use the context-add function with the id parameter.","options":{}},{"type":"text","text":"I'll add this Organization object to the context for you.","options":{}},{"type":"tool-call","id":"toolu_01P7myKvWntosLM6RtWwKZGA","name":"context-add","params":{"id":"01JGFJJZ00G0WKQSJGMAKCNT8D"},"providerExecuted":false,"options":{}}],"options":{}},{"role":"tool","content":[{"type":"tool-result","id":"toolu_01P7myKvWntosLM6RtWwKZGA","name":"context-add","isFailure":false,"result":{},"providerExecuted":false,"options":{}}],"options":{"anthropic":{"cacheControl":{"ttl":"5m","type":"ephemeral"}}}}]},"response":[{"type":"response-metadata","id":"msg_01Rq8MMkzbb7kQcbuSf2pFcN","modelId":"claude-opus-4-20250514","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 successfully added the","metadata":{}},{"type":"text-delta","id":"0","delta":" Cyberdyne Systems organization to the context","metadata":{}},{"type":"text-delta","id":"0","delta":". This","metadata":{}},{"type":"text-delta","id":"0","delta":" organization object includes:","metadata":{}},{"type":"text-delta","id":"0","delta":"\n- Name","metadata":{}},{"type":"text-delta","id":"0","delta":": Cyberdyne Systems\n-","metadata":{}},{"type":"text-delta","id":"0","delta":" Website: https://cyberdyne.","metadata":{}},{"type":"text-delta","id":"0","delta":"com\n- Type: Organization","metadata":{}},{"type":"text-delta","id":"0","delta":" (version","metadata":{}},{"type":"text-delta","id":"0","delta":" 0.1.0)","metadata":{}},{"type":"text-delta","id":"0","delta":"\n\nThe object is","metadata":{}},{"type":"text-delta","id":"0","delta":" now available","metadata":{}},{"type":"text-delta","id":"0","delta":" in the chat","metadata":{}},{"type":"text-delta","id":"0","delta":" context for","metadata":{}},{"type":"text-delta","id":"0","delta":" reference","metadata":{}},{"type":"text-delta","id":"0","delta":" and can","metadata":{}},{"type":"text-delta","id":"0","delta":" be used in our","metadata":{}},{"type":"text-delta","id":"0","delta":" conversation.","metadata":{}},{"type":"text-end","id":"0","metadata":{}},{"type":"finish","reason":"stop","usage":{"inputTokens":979,"outputTokens":77,"totalTokens":1056},"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":979,"output_tokens":1,"server_tool_use":null,"service_tier":"standard"}}}}]}]}

package/src/toolkits/AssistantToolkit.test.ts

@@ -1,72 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, expect, it } from '@effect/vitest';
-import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
-
-import { MemoizedAiService } from '@dxos/ai/testing';
-import { AiContextService, AiConversationService, GenericToolkit } from '@dxos/assistant';
-import { AssistantTestLayer } from '@dxos/assistant/testing';
-import { waitForCondition } from '@dxos/async';
-import { Blueprint, Template } from '@dxos/blueprints';
-import { Database, Obj, Ref } from '@dxos/echo';
-import { TestHelpers } from '@dxos/effect/testing';
-import { ObjectId } from '@dxos/keys';
-import { Message, Organization, Person } from '@dxos/types';
-
-import * as AssistantToolkit from './AssistantToolkit';
-
-ObjectId.dangerouslyDisableRandomness();
-
-const TestLayer = AssistantTestLayer({
-  types: [Blueprint.Blueprint, Message.Message, Person.Person, Organization.Organization],
-  toolkits: [GenericToolkit.make(AssistantToolkit.AssistantToolkit, AssistantToolkit.layer())],
-  tracing: 'pretty',
-});
-
-const blueprint = Blueprint.make({
-  key: 'dxos.org/blueprint/assistant',
-  name: 'Assistant',
-  tools: Blueprint.toolDefinitions({ tools: AssistantToolkit.tools }),
-  instructions: Template.make(),
-});
-
-describe('AssistantToolkit', () => {
-  it.scoped(
-    'can add to context',
-    Effect.fnUntraced(
-      function* (_) {
-        yield* AiContextService.bindContext({
-          blueprints: [Ref.make(yield* Database.add(blueprint))],
-        });
-
-        const organization = yield* Database.add(
-          Obj.make(Organization.Organization, {
-            name: 'Cyberdyne Systems',
-            website: 'https://cyberdyne.com',
-          }),
-        );
-
-        yield* AiConversationService.run({
-          prompt: `Add to context: ${JSON.stringify(organization)}`,
-        });
-
-        const { binder } = yield* AiContextService;
-        yield* Effect.promise(() =>
-          waitForCondition({
-            condition: () => binder.getBlueprints().length > 0 && binder.getObjects().length > 0,
-            timeout: 10_000,
-          }),
-        );
-
-        expect(binder.getBlueprints()).toEqual([blueprint]);
-        expect(binder.getObjects()).toEqual([organization]);
-      },
-      Effect.provide(AiConversationService.layerNewQueue().pipe(Layer.provideMerge(TestLayer))),
-      TestHelpers.provideTestContext,
-    ),
-    MemoizedAiService.isGenerationEnabled() ? 60_000 : undefined,
-  );
-});

package/src/toolkits/AssistantToolkit.ts

@@ -1,70 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Tool from '@effect/ai/Tool';
-import * as Toolkit from '@effect/ai/Toolkit';
-import * as Effect from 'effect/Effect';
-import * as Record from 'effect/Record';
-import * as Schema from 'effect/Schema';
-
-import { AiContextService, ArtifactId } from '@dxos/assistant';
-import { Database, type Ref } from '@dxos/echo';
-import { trim } from '@dxos/util';
-
-export const AssistantToolkit = Toolkit.make(
-  Tool.make('context-add', {
-    description: trim`
-      Adds the object to the chat context.
-    `,
-    parameters: {
-      id: ArtifactId.annotations({
-        description: 'The ID of the document to add.',
-      }),
-    },
-    success: Schema.Void,
-    failure: Schema.Never,
-    dependencies: [AiContextService, Database.Service],
-  }),
-  Tool.make('context-remove', {
-    description: trim`
-      Removes the object from the chat context.
-    `,
-    parameters: {
-      id: ArtifactId.annotations({
-        description: 'The ID of the document to remove.',
-      }),
-    },
-    success: Schema.Void,
-    failure: Schema.Never,
-    dependencies: [AiContextService, Database.Service],
-  }),
-);
-
-export const tools = Record.keys(AssistantToolkit.tools);
-
-export const layer = () =>
-  AssistantToolkit.toLayer({
-    ['context-add' as const]: Effect.fnUntraced(function* ({ id }) {
-      const { binder } = yield* AiContextService;
-      const { db } = yield* Database.Service;
-      const ref = db.makeRef(ArtifactId.toDXN(id, db.spaceId)) as Ref.Ref<any>;
-      yield* Effect.promise(() =>
-        binder.bind({
-          blueprints: [],
-          objects: [ref],
-        }),
-      );
-    }),
-    ['context-remove' as const]: Effect.fnUntraced(function* ({ id }) {
-      const { binder } = yield* AiContextService;
-      const { db } = yield* Database.Service;
-      const ref = db.makeRef(ArtifactId.toDXN(id, db.spaceId)) as Ref.Ref<any>;
-      yield* Effect.promise(() =>
-        binder.unbind({
-          blueprints: [],
-          objects: [ref],
-        }),
-      );
-    }),
-  });

package/src/toolkits/SystemToolkit.ts

@@ -1,299 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Tool from '@effect/ai/Tool';
-import * as Toolkit from '@effect/ai/Toolkit';
-import * as Effect from 'effect/Effect';
-import type * as Layer from 'effect/Layer';
-import * as Record from 'effect/Record';
-import * as Schema from 'effect/Schema';
-
-import { ArtifactId } from '@dxos/assistant';
-import { DXN, Database, Entity, Filter, Obj, Relation, Tag, Type } from '@dxos/echo';
-import { invariant } from '@dxos/invariant';
-import { trim } from '@dxos/util';
-
-export const SystemToolkit = Toolkit.make(
-  //
-  // Schema
-  //
-
-  Tool.make('schema-list', {
-    description: trim`
-      Lists schemas definitions.
-    `,
-    parameters: {
-      // TODO(wittjosiah): Remove this once parameter-less tools are fixed.
-      limit: Schema.Number,
-    },
-    // TODO(dmaretskyi): Effect returns ({ result, encodedResult })
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  Tool.make('schema-add', {
-    description: trim`
-      Adds a schema to the space.
-      The name will be used when displayed to the user.
-      The typename must be in the format of "example.com/type/Type".
-    `,
-    parameters: {
-      name: Schema.String,
-      typename: Schema.String,
-      jsonSchema: Schema.Any,
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  //
-  // Query
-  //
-
-  Tool.make('query', {
-    description: trim`
-      Queries objects in the space.
-      Get the typename from the schema-list tool.
-    `,
-    parameters: {
-      typename: Schema.String,
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  //
-  // Objects
-  //
-
-  Tool.make('object-create', {
-    description: trim`
-      Creates a new object and adds it to the current space.
-      Get the schema from the schema-list tool and ensure that the data matches the corresponding schema.
-    `,
-    parameters: {
-      typename: Schema.String,
-      data: Schema.Any,
-    },
-    success: Schema.Any,
-    failure: Schema.Never, // TODO(burdon): Error handing?
-    dependencies: [Database.Service],
-  }),
-
-  Tool.make('object-delete', {
-    description: trim`
-      Deletes the object.
-    `,
-    parameters: {
-      id: ArtifactId.annotations({
-        description: 'The ID of the object.',
-      }),
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  Tool.make('object-update', {
-    description: trim`
-      Updates the object properties.
-    `,
-    parameters: {
-      id: ArtifactId.annotations({
-        description: 'The ID of the object.',
-      }),
-      properties: Schema.Record({ key: Schema.String, value: Schema.Any }),
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  //
-  // Relations
-  //
-
-  Tool.make('relation-create', {
-    description: trim`
-      Creates a new relation and adds it to the current space.
-      Get the schema from the schema-list tool and ensure that the data matches the corresponding schema.
-    `,
-    parameters: {
-      typename: Schema.String,
-      source: ArtifactId.annotations({
-        description: 'The ID of the source object.',
-      }),
-      target: ArtifactId.annotations({
-        description: 'The ID of the target object.',
-      }),
-      data: Schema.Any.annotations({
-        description: 'The data to be stored in the relation.',
-      }),
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  Tool.make('relation-delete', {
-    description: trim`
-      Deletes the relation.
-    `,
-    parameters: {
-      id: ArtifactId.annotations({
-        description: 'The ID of the relation.',
-      }),
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  //
-  // Tags
-  //
-
-  Tool.make('tag-add', {
-    description: trim`
-      Adds a tag to an object.
-      Tags are objects of type ${Tag.Tag.typename}.
-    `,
-    parameters: {
-      tagId: ArtifactId.annotations({
-        description: 'The ID of the tag.',
-      }),
-      objectId: ArtifactId.annotations({
-        description: 'The ID of the object.',
-      }),
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-
-  Tool.make('tag-remove', {
-    description: trim`
-      Removes a tag from an object.
-      Tags are objects of type ${Tag.Tag.typename}.
-    `,
-    parameters: {
-      tagId: ArtifactId.annotations({
-        description: 'The ID of the tag.',
-      }),
-      objectId: ArtifactId.annotations({
-        description: 'The ID of the object.',
-      }),
-    },
-    success: Schema.Any,
-    failure: Schema.Never,
-    dependencies: [Database.Service],
-  }),
-);
-
-export const tools = Record.keys(SystemToolkit.tools);
-
-export const layer = (): Layer.Layer<Tool.Handler<any>, never, never> =>
-  SystemToolkit.toLayer({
-    ['schema-list' as const]: Effect.fnUntraced(function* () {
-      const { db } = yield* Database.Service;
-      const schema = yield* Effect.promise(() => db.schemaRegistry.query({ location: ['database', 'runtime'] }).run());
-      return schema.map((schema) => {
-        const meta = Type.getMeta(schema);
-        return {
-          typename: Type.getTypename(schema),
-          jsonSchema: Type.toJsonSchema(schema),
-          kind: meta?.sourceSchema ? 'relation' : 'record',
-        };
-      });
-    }),
-
-    ['schema-add' as const]: Effect.fnUntraced(function* ({ name, typename, jsonSchema }) {
-      const { db } = yield* Database.Service;
-      yield* Effect.promise(() =>
-        db.schemaRegistry.register([
-          {
-            typename,
-            version: '0.1.0',
-            jsonSchema,
-            name,
-          },
-        ]),
-      );
-    }),
-
-    ['query' as const]: Effect.fnUntraced(function* ({ typename }) {
-      const objects = yield* Database.runQuery(Filter.typename(typename));
-      return objects;
-    }),
-
-    ['object-create' as const]: Effect.fnUntraced(function* ({ typename, data }) {
-      const { db } = yield* Database.Service;
-      const schema = yield* Effect.promise(() =>
-        db.schemaRegistry.query({ typename, location: ['database', 'runtime'] }).first(),
-      );
-      invariant(Type.isObjectSchema(schema), 'Schema is not an object schema');
-
-      // TODO(dmaretskyi): How to add object to a collection?
-      const object = db.add(Obj.make(schema, data));
-      return object;
-    }),
-
-    ['object-delete' as const]: Effect.fnUntraced(function* ({ id }) {
-      const { db } = yield* Database.Service;
-      const object = yield* Database.resolve(DXN.parse(id));
-      db.remove(object);
-      return object;
-    }),
-
-    ['object-update' as const]: Effect.fnUntraced(function* ({ id, properties }) {
-      const object = yield* Database.resolve(DXN.parse(id));
-      Entity.change(object as Entity.Any, (obj) => {
-        for (const [key, value] of Object.entries(properties)) {
-          obj[key] = value;
-        }
-      });
-      return object;
-    }),
-
-    ['relation-create' as const]: Effect.fnUntraced(function* ({ typename, source, target, data }) {
-      const { db } = yield* Database.Service;
-      const schema = yield* Effect.promise(() =>
-        db.schemaRegistry.query({ typename, location: ['database', 'runtime'] }).first(),
-      );
-      invariant(Type.isRelationSchema(schema), 'Schema is not a relation schema');
-
-      const sourceObj = yield* Database.resolve(DXN.parse(source));
-      const targetObj = yield* Database.resolve(DXN.parse(target));
-      const relation = db.add(
-        Relation.make(schema, {
-          [Relation.Source]: sourceObj,
-          [Relation.Target]: targetObj,
-          ...data,
-        }),
-      );
-      return relation;
-    }),
-
-    ['relation-delete' as const]: Effect.fnUntraced(function* ({ id }) {
-      const { db } = yield* Database.Service;
-      const relation = yield* Database.resolve(DXN.parse(id));
-      db.remove(relation);
-      return relation;
-    }),
-
-    ['tag-add' as const]: Effect.fnUntraced(function* ({ tagId, objectId }) {
-      const object = yield* Database.resolve(DXN.parse(objectId));
-      Entity.change(object, (obj) => Entity.addTag(obj, DXN.parse(tagId).toString()));
-      return object;
-    }),
-
-    ['tag-remove' as const]: Effect.fnUntraced(function* ({ tagId, objectId }) {
-      const object = yield* Database.resolve(DXN.parse(objectId));
-      Entity.change(object, (obj) => Entity.removeTag(obj, DXN.parse(tagId).toString()));
-      return object;
-    }),
-  });