@dxos/assistant-toolkit 0.8.4-main.ae835ea → 0.8.4-main.c351d160a8

package/src/blueprints/{planning/planning-blueprint.ts → planning-old/blueprint.ts}

@@ -3,12 +3,17 @@
 //
 
 import { ToolId } from '@dxos/ai';
+import { type AppCapabilities } from '@dxos/app-toolkit';
 import { Blueprint } from '@dxos/blueprints';
-import { Obj, Ref } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Ref } from '@dxos/echo';
+import { Text } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
-import { Tasks } from '../../functions';
+import { TaskFunctions } from './functions';
+
+const BLUEPRINT_KEY = 'org.dxos.blueprint.planning';
+
+const functions = Object.values(TaskFunctions);
 
 /**
  * Agent prompt instructions for managing hierarchical task lists.
@@ -85,14 +90,21 @@ const instructions = trim`
   - Be precise with task descriptions and hierarchy levels
 `;
 
-export const blueprint: Blueprint.Blueprint = Obj.make(Blueprint.Blueprint, {
-  key: 'dxos.org/blueprint/planning',
-  name: 'Planning',
-  description: 'Plans and tracks complex tasks with artifact management.',
-  instructions: {
-    source: Ref.make(DataType.makeText(instructions)),
-  },
-  tools: [Tasks.read, Tasks.update].map((fn) => ToolId.make(fn.key)),
-});
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Planning',
+    description: 'Plans and tracks complex tasks with artifact management.',
+    instructions: {
+      source: Ref.make(Text.make(instructions)),
+    },
+    tools: functions.map((fn) => ToolId.make(fn.key)),
+  });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions,
+  make,
+};
 
 export default blueprint;

package/src/blueprints/planning-old/functions/index.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import Read from './read';
+import Update from './update';
+
+export const TaskFunctions = {
+  Read,
+  Update,
+};

package/src/{functions/tasks → blueprints/planning-old/functions}/read.ts

@@ -5,27 +5,27 @@
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId } from '@dxos/assistant';
-import { DatabaseService, defineFunction } from '@dxos/functions';
+import { Database, Ref } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
 import { Markdown } from '@dxos/plugin-markdown/types';
 
 export default defineFunction({
-  key: 'dxos.org/function/markdown/read-tasks',
+  key: 'org.dxos.function.markdown.read-tasks',
   name: 'Read',
   description: 'Read markdown tasks.',
   inputSchema: Schema.Struct({
-    id: ArtifactId.annotations({
+    doc: Ref.Ref(Markdown.Document).annotations({
       description: 'The ID of the document to read.',
     }),
   }),
   outputSchema: Schema.Struct({
     content: Schema.String,
   }),
-  handler: Effect.fn(function* ({ data: { id } }) {
-    const doc = yield* DatabaseService.resolve(ArtifactId.toDXN(id), Markdown.Document);
+  handler: Effect.fn(function* ({ data: { doc } }) {
+    const document = yield* Database.load(doc);
 
     // Return content with line numbers prefixed.
-    const { content } = yield* DatabaseService.load(doc.content);
+    const { content } = yield* Database.load(document.content);
     const lines = content.split('\n');
     const len = String(lines.length).length;
     const numbered = lines.map((line, i) => `${String(i + 1).padStart(len, ' ')}. ${line}`).join('\n');

package/src/{functions/tasks → blueprints/planning-old/functions}/update.ts

@@ -5,18 +5,18 @@
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId } from '@dxos/assistant';
-import { DatabaseService, defineFunction } from '@dxos/functions';
+import { Database, Ref } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
 import { Markdown } from '@dxos/plugin-markdown/types';
 
 import { MarkdownTasks, type TaskOperation } from './task-list';
 
 export default defineFunction({
-  key: 'dxos.org/function/markdown/update-tasks',
+  key: 'org.dxos.function.markdown.update-tasks',
   name: 'Update markdown',
   description: 'Creates and updates tasks in markdown documents.',
   inputSchema: Schema.Struct({
-    id: ArtifactId.annotations({
+    doc: Ref.Ref(Markdown.Document).annotations({
       description: 'The ID of the document to update.',
     }),
     operations: Schema.optional(
@@ -33,11 +33,11 @@ export default defineFunction({
       description: 'Content with line numbers for agent reference.',
     }),
   }),
-  handler: Effect.fn(function* ({ data: { id, operations = [] } }) {
-    const doc = yield* DatabaseService.resolve(ArtifactId.toDXN(id), Markdown.Document);
+  handler: Effect.fn(function* ({ data: { doc, operations = [] } }) {
+    const document = yield* Database.load(doc);
 
     // Create task manager and apply operations if provided.
-    const { content } = yield* DatabaseService.load(doc.content);
+    const { content } = yield* Database.load(document.content);
     const taskManager = new MarkdownTasks(content);
     if (operations.length > 0) {
       taskManager.applyOperations(operations as TaskOperation[]);

package/src/blueprints/planning-old/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as PlanningOldBlueprint } from './blueprint';