@dxos/assistant 0.8.3-main.672df60 → 0.8.3-staging.0fa589b

package/dist/lib/browser/index.mjs

@@ -46,6 +46,7 @@ var processTranscriptMessage = async (params) => {
 
 // packages/core/assistant/src/extraction/extraction-llm-function/extraction-llm-function.ts
 import { Message as Message2 } from "@dxos/ai";
+import { Obj as Obj2 } from "@dxos/echo";
 import { create as create2 } from "@dxos/echo-schema";
 import { AiService, defineFunction } from "@dxos/functions";
 import { DataType as DataType2 } from "@dxos/schema";
@@ -57,6 +58,7 @@ var instructions_default = 'You are an AI assistant specialized in processing an
 import { Option, Schema as Schema3 } from "effect";
 import { AgentStatusReport, isToolUse, runTools, structuredOutputParser, Message, MixedStreamParser, ToolResult, createTool } from "@dxos/ai";
 import { Event, synchronized } from "@dxos/async";
+import { Obj } from "@dxos/echo";
 import { ObjectVersion } from "@dxos/echo-db";
 import { create } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
@@ -166,7 +168,7 @@ var AISession = class _AISession {
           tools: tools.map((tool) => tool.name)
         }, {
           F: __dxlog_file2,
-          L: 200,
+          L: 201,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -189,7 +191,7 @@ var AISession = class _AISession {
           pending: this._pending
         }, {
           F: __dxlog_file2,
-          L: 225,
+          L: 226,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -197,7 +199,7 @@ var AISession = class _AISession {
         const message = this._pending.at(-1);
         invariant(message, void 0, {
           F: __dxlog_file2,
-          L: 230,
+          L: 231,
           S: this,
           A: [
             "message",
@@ -207,7 +209,7 @@ var AISession = class _AISession {
         if (isToolUse(message)) {
           log2("tool request...", void 0, {
             F: __dxlog_file2,
-            L: 232,
+            L: 233,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -221,7 +223,7 @@ var AISession = class _AISession {
             response
           }, {
             F: __dxlog_file2,
-            L: 240,
+            L: 241,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -241,7 +243,7 @@ var AISession = class _AISession {
     } catch (err) {
       log2.catch(err, void 0, {
         F: __dxlog_file2,
-        L: 252,
+        L: 253,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -286,7 +288,7 @@ var AISession = class _AISession {
         versions
       }, {
         F: __dxlog_file2,
-        L: 295,
+        L: 296,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -306,7 +308,7 @@ var AISession = class _AISession {
         prelude.push(createArtifactUpdateBlock(artifactDiff));
       }
     }
-    return create(Message, {
+    return Obj.make(Message, {
       role: "user",
       content: [
         ...prelude,
@@ -398,7 +400,7 @@ var AISession = class _AISession {
             action: step.action
           }, {
             F: __dxlog_file2,
-            L: 402,
+            L: 403,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -524,7 +526,8 @@ ${diff}` : ""}</changed-artifact>`).join("\n")}
 
 // packages/core/assistant/src/extraction/quotes.ts
 import { Schema as Schema4 } from "effect";
-import { Filter, ObjectId as ObjectId2, Query } from "@dxos/echo-schema";
+import { Query, Filter } from "@dxos/echo";
+import { ObjectId as ObjectId2 } from "@dxos/echo-schema";
 import { DXN } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/extraction/quotes.ts";
@@ -550,7 +553,7 @@ var findQuotes = async (quotes, db) => {
       quote
     }, {
       F: __dxlog_file3,
-      L: 34,
+      L: 35,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -594,7 +597,7 @@ var extractionAnthropicFn = defineFunction({
       client: ai.client,
       systemPrompt: instructions_default,
       history: [
-        create2(Message2, {
+        Obj2.make(Message2, {
           role: "user",
           content: [
             {
@@ -1393,8 +1396,9 @@ import { DataTypes } from "@dxos/schema";
 // packages/core/assistant/src/research/graph.ts
 import { Schema as Schema6, identity, Option as Option2, SchemaAST } from "effect";
 import { createTool as createTool3, ToolResult as ToolResult3 } from "@dxos/ai";
+import { Query as Query2, Filter as Filter2 } from "@dxos/echo";
 import { isEncodedReference } from "@dxos/echo-protocol";
-import { EntityKind, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation, create as create4, Filter as Filter2, getEntityKind, getSchemaDXN, ObjectId as ObjectId3, Query as Query2, ReferenceAnnotationId, RelationSourceDXNId, RelationTargetDXNId, RelationSourceId, RelationTargetId } from "@dxos/echo-schema";
+import { EntityKind, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation, create as create4, getEntityKind, getSchemaDXN, ObjectId as ObjectId3, ReferenceAnnotationId, RelationSourceDXNId, RelationTargetDXNId, RelationSourceId, RelationTargetId } from "@dxos/echo-schema";
 import { mapAst } from "@dxos/effect";
 import { DXN as DXN2 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
@@ -1519,7 +1523,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           source: data2.source
         }, {
           F: __dxlog_file7,
-          L: 216,
+          L: 214,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1530,7 +1534,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           target: data2.target
         }, {
           F: __dxlog_file7,
-          L: 220,
+          L: 218,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1559,7 +1563,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
     existingIds
   }, {
     F: __dxlog_file7,
-    L: 241,
+    L: 239,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1625,13 +1629,13 @@ var preprocessSchema = (schema) => {
     })
   })) : identity);
 };
-var createGraphWriterTool = ({ db, queue, schemaTypes, onDone = async (x) => x }) => {
+var createGraphWriterTool = ({ db, queue, schema, onDone = async (x) => x }) => {
   return createTool3("graph", {
     name: "writer",
     description: "Write to the local graph database",
-    schema: createExtractionSchema(schemaTypes),
+    schema: createExtractionSchema(schema),
     execute: async (input) => {
-      const data = await sanitizeObjects(schemaTypes, input, db, queue);
+      const data = await sanitizeObjects(schema, input, db, queue);
       return ToolResult3.Success(await onDone(data));
     }
   });
@@ -1700,7 +1704,7 @@ var researchFn = defineFunction3({
     }));
     const graphWriteTool = createGraphWriterTool({
       db,
-      schemaTypes: DataTypes
+      schema: DataTypes
     });
     log8.info("graphWriteTool", {
       schema: graphWriteTool.parameters
@@ -1732,19 +1736,18 @@ var createArtifactElement = (id) => `<artifact id=${id} />`;
 
 // packages/core/assistant/src/blueprint/blueprint.ts
 import { Schema as Schema8 } from "effect";
-import { Obj, Type } from "@dxos/echo";
-import { ObjectId as ObjectId4 } from "@dxos/keys";
-var BlueprintStepSchema = Schema8.Struct({
-  id: ObjectId4,
+import { Key, Obj as Obj3, Type } from "@dxos/echo";
+var BlueprintStep = Schema8.Struct({
+  id: Key.ObjectId,
   instructions: Schema8.String,
-  tools: Schema8.Array(Schema8.String)
+  tools: Schema8.optional(Schema8.Array(Schema8.String))
 });
-var BlueprintSchema = Schema8.Struct({
-  steps: Schema8.Array(BlueprintStepSchema.pipe(Schema8.omit("id")))
+var BlueprintDefinition = Schema8.Struct({
+  steps: Schema8.Array(BlueprintStep.pipe(Schema8.omit("id")))
 });
 var Blueprint = Schema8.Struct({
   name: Schema8.optional(Schema8.String),
-  steps: Schema8.Array(BlueprintStepSchema)
+  steps: Schema8.Array(BlueprintStep)
 }).pipe(Type.Obj({
   typename: "dxos.org/type/Blueprint",
   version: "0.1.0"
@@ -1757,14 +1760,14 @@ var Blueprint = Schema8.Struct({
     }
     step(instructions, options) {
       this._steps.push({
-        id: ObjectId4.random(),
+        id: Key.ObjectId.random(),
         instructions,
         tools: options?.tools ?? []
       });
       return this;
     }
     build() {
-      return Obj.make(Blueprint, {
+      return Obj3.make(Blueprint, {
         steps: this._steps
       });
     }
@@ -1791,10 +1794,20 @@ var BlueprintParser;
 import { Match, Schema as Schema9 } from "effect";
 import { createTool as createTool4, Message as Message3, ToolResult as ToolResult4 } from "@dxos/ai";
 import { Event as Event2 } from "@dxos/async";
-import { create as create6 } from "@dxos/echo-schema";
+import { Key as Key2, Obj as Obj4 } from "@dxos/echo";
 import { log as log9 } from "@dxos/log";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/blueprint/machine.ts";
+var SYSTEM_PROMPT = `
+You are a smart Rule-Following Agent.
+Rule-Following Agent executes the command that the user sent in the last message.
+After doing the work, the Rule-Following Agent calls report tool.
+If the Rule-Following agent believes that no action is needed, it calls the report tool with "skipped" status.
+If the Rule-Following Agent is unable to perform the task, it calls the report tool with "bail" status.
+Rule-Following Agent explains the reason it is unable to perform the task before bailing.
+The Rule-Following Agent can express creativity and imagination in the way it performs the task.
+The Rule-Following Agent precisely follows the instructions.
+`;
 var INITIAL_STATE = {
   state: "working",
   history: [],
@@ -1810,39 +1823,69 @@ var BlueprintMachine = class {
     this.stepComplete = new Event2();
     this.message = new Event2();
     this.block = new Event2();
-    this.state = structuredClone(INITIAL_STATE);
+    this._state = structuredClone(INITIAL_STATE);
+  }
+  get state() {
+    return this._state;
+  }
+  setLogger(logger) {
+    this.logger = logger;
+    return this;
   }
   async runToCompletion(options) {
-    log9.info("runToCompletion", options, {
+    const invocationId = Key2.ObjectId.random();
+    log9.info("runToCompletion", {
+      invocationId,
+      options
+    }, {
       F: __dxlog_file9,
-      L: 71,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
     this.begin.emit();
+    this.logger?.log({
+      type: "begin",
+      invocationId
+    });
     let firstStep = true;
-    while (this.state.state !== "done") {
+    while (this._state.state !== "done") {
       const input = firstStep ? options.input : void 0;
       firstStep = false;
-      this.state = await this._execStep(this.state, {
+      this._state = await this._execStep(invocationId, this._state, {
         input,
-        aiService: options.aiService
+        aiClient: options.aiClient
+      });
+      const step = this.blueprint.steps.find((step2) => step2.id === this._state.trace.at(-1)?.stepId);
+      this.stepComplete.emit(step);
+      this.logger?.log({
+        type: "step-complete",
+        invocationId,
+        step
       });
-      this.stepComplete.emit(this.blueprint.steps.find((step) => step.id === this.state.trace.at(-1)?.stepId));
-      if (this.state.state === "bail") {
+      if (this._state.state === "bail") {
         throw new Error("Agent unable to follow the blueprint");
       }
     }
     this.end.emit();
+    this.logger?.log({
+      type: "end",
+      invocationId
+    });
   }
-  async _execStep(state, options) {
-    const prevStep = this.blueprint.steps.findIndex((step) => step.id === this.state.trace.at(-1)?.stepId);
+  async _execStep(invocationId, state, options) {
+    const prevStep = this.blueprint.steps.findIndex((step) => step.id === this._state.trace.at(-1)?.stepId);
     if (prevStep === this.blueprint.steps.length - 1) {
       throw new Error("Done execution blueprint");
     }
     const nextStep = this.blueprint.steps[prevStep + 1];
     const onLastStep = prevStep === this.blueprint.steps.length - 2;
     this.stepStart.emit(nextStep);
+    this.logger?.log({
+      type: "step-start",
+      invocationId,
+      step: nextStep
+    });
     const ReportSchema = Schema9.Struct({
       status: Schema9.Literal("done", "bailed", "skipped").annotations({
         description: "The status of the task completion"
@@ -1853,7 +1896,7 @@ var BlueprintMachine = class {
     });
     const report = createTool4("system", {
       name: "report",
-      description: "This tool reports that the agent has completed the task or is unable to do so",
+      description: "This tool reports that the agent has completed the task or is unable to do so.",
       schema: ReportSchema,
       execute: async (input) => ToolResult4.Break(input)
     });
@@ -1864,26 +1907,24 @@ var BlueprintMachine = class {
     session.message.pipeInto(this.message);
     session.block.pipeInto(this.block);
     const inputMessages = options.input ? [
-      create6(Message3, {
+      Obj4.make(Message3, {
         role: "user",
         content: [
           taggedDataBlock("input", options.input)
         ]
       })
     ] : [];
-    inputMessages.forEach((message) => this.message.emit(message));
-    const tools = nextStep.tools.map((tool) => this.registry.get(tool)).filter(isNonNullable2);
+    inputMessages.forEach((message) => {
+      this.message.emit(message);
+      this.logger?.log({
+        type: "message",
+        invocationId,
+        message
+      });
+    });
+    const tools = nextStep.tools?.map((tool) => this.registry.get(tool)).filter(isNonNullable2) ?? [];
     const messages = await session.run({
-      systemPrompt: `
-        You are a smart Rule-Following Agent.
-        Rule-Following Agent executes the command that the user sent in the last message.
-        After doing the work, the Rule-Following Agent calls report tool.
-        If the Rule-Following agent believes that no action is needed, it calls the report tool with "skipped" status.
-        If the Rule-Following Agent is unable to perform the task, it calls the report tool with "bail" status.
-        Rule-Following Agent explains the reason it is unable to perform the task before bailing.
-        The Rule-Following Agent can express creativity and imagination in the way it performs the task.
-        The Rule-Following Agent precisely follows the instructions.
-      `,
+      systemPrompt: SYSTEM_PROMPT,
       history: [
         ...state.history,
         ...inputMessages
@@ -1893,7 +1934,7 @@ var BlueprintMachine = class {
         report
       ],
       artifacts: [],
-      client: options.aiService,
+      client: options.aiClient,
       prompt: nextStep.instructions
     });
     const { messages: trimmedHistory, call: lastBlock } = popLastToolCall(messages);
@@ -1954,8 +1995,12 @@ import { signal } from "@preact/signals-core";
 import chalk from "chalk";
 import { ConsolePrinter as ConsolePrinter2 } from "@dxos/ai";
 import { combine } from "@dxos/async";
+import { log as log10 } from "@dxos/log";
 chalk.level = 2;
-var Logger = class {
+var DEFAULT_LOGGER = {
+  log: log10.info
+};
+var BufferedLogger = class {
   constructor() {
     this._messages = signal([]);
   }
@@ -1972,6 +2017,49 @@ var Logger = class {
     ];
   }
 };
+var BlueprintLoggerAdapter = class {
+  constructor(logger = DEFAULT_LOGGER) {
+    this.logger = logger;
+  }
+  log(event) {
+    switch (event.type) {
+      case "begin":
+        this.logger.log("begin", {
+          invocationId: event.invocationId
+        });
+        break;
+      case "end":
+        this.logger.log("end", {
+          invocationId: event.invocationId
+        });
+        break;
+      case "step-start":
+        this.logger.log("step-start", {
+          invocationId: event.invocationId,
+          step: event.step
+        });
+        break;
+      case "step-complete":
+        this.logger.log("step-complete", {
+          invocationId: event.invocationId,
+          step: event.step
+        });
+        break;
+      case "message":
+        this.logger.log("message", {
+          invocationId: event.invocationId,
+          message: event.message
+        });
+        break;
+      case "block":
+        this.logger.log("block", {
+          invocationId: event.invocationId,
+          block: event.block
+        });
+        break;
+    }
+  }
+};
 var setLogger = (machine, logger) => {
   return combine(machine.begin.on(() => {
     logger.log("Starting...");
@@ -2034,13 +2122,14 @@ export {
   AISession,
   Blueprint,
   BlueprintBuilder,
+  BlueprintDefinition,
+  BlueprintLoggerAdapter,
   BlueprintMachine,
   BlueprintParser,
-  BlueprintSchema,
-  BlueprintStepSchema,
+  BlueprintStep,
+  BufferedLogger,
   ExtractionInput,
   ExtractionOutput,
-  Logger,
   ReferencedQuotes,
   Subgraph,
   VersionPin,