@dxos/assistant 0.8.4-main.a4bbb77 → 0.8.4-main.abd8ff62ef

package/src/execution-graph.test.ts

@@ -6,15 +6,17 @@ import { describe, expect, it } from '@effect/vitest';
 
 import { AgentStatus } from '@dxos/ai';
 import { Obj } from '@dxos/echo';
-import { ObjectId } from '@dxos/echo-schema';
+import { ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { DataType } from '@dxos/schema';
+import { type ContentBlock, Message } from '@dxos/types';
 
 import { ExecutionGraph } from './execution-graph';
 
-// Helper function to create valid object IDs for testing
+// Helper function to create valid object IDs for testing.
 const createTestId = () => ObjectId.random();
 
+const SKIP_BLOCKS: ContentBlock.Any['_tag'][] = [];
+
 describe('ExecutionGraph', () => {
   describe('basic functionality', () => {
     it('should create an empty graph initially', () => {
@@ -26,9 +28,9 @@ describe('ExecutionGraph', () => {
     });
 
     it('should add a simple user message', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
       const messageId = createTestId();
-      const message = Obj.make(DataType.Message, {
+      const message = Obj.make(Message.Message, {
         id: messageId,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'user' },
@@ -56,12 +58,12 @@ describe('ExecutionGraph', () => {
     });
 
     it('should handle basic status & message processing', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
       const status = Obj.make(AgentStatus, {
         created: '2025-01-01T00:00:00Z',
         message: 'Running Research',
       });
-      const message = Obj.make(DataType.Message, {
+      const message = Obj.make(Message.Message, {
         created: '2025-09-29T14:29:37.860Z',
         sender: {
           role: 'user',
@@ -69,7 +71,7 @@ describe('ExecutionGraph', () => {
         blocks: [
           {
             _tag: 'text',
-            text: '{"id":"01K6AXZKK79H4E54RKP1YZDARK","@type":"dxn:type:dxos.org/type/Organization:0.1.0","@meta":{"keys":[]},"name":"Blue Yard","website":"https://blueyard.com"}',
+            text: '{"id":"01K6AXZKK79H4E54RKP1YZDARK","@type":"dxn:type:org.dxos.type.organization:0.1.0","@meta":{"keys":[]},"name":"Blue Yard","website":"https://blueyard.com"}',
           },
         ],
         properties: {},
@@ -90,9 +92,9 @@ describe('ExecutionGraph', () => {
     });
 
     it('should add an assistant message with text', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
       const messageId = createTestId();
-      const message = Obj.make(DataType.Message, {
+      const message = Obj.make(Message.Message, {
         id: messageId,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -120,9 +122,9 @@ describe('ExecutionGraph', () => {
 
   describe('sequential chaining within messages', () => {
     it('should chain blocks within a message', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
       const messageId = createTestId();
-      const message = Obj.make(DataType.Message, {
+      const message = Obj.make(Message.Message, {
         id: messageId,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -168,11 +170,11 @@ describe('ExecutionGraph', () => {
     });
 
     it('should chain across multiple messages', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       // First message
       const message1Id = createTestId();
-      const message1 = Obj.make(DataType.Message, {
+      const message1 = Obj.make(Message.Message, {
         id: message1Id,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'user' },
@@ -182,7 +184,7 @@ describe('ExecutionGraph', () => {
 
       // Second message
       const message2Id = createTestId();
-      const message2 = Obj.make(DataType.Message, {
+      const message2 = Obj.make(Message.Message, {
         id: message2Id,
         created: '2025-01-01T00:01:00Z',
         sender: { role: 'assistant' },
@@ -211,7 +213,7 @@ describe('ExecutionGraph', () => {
 
   describe('tool calls and results', () => {
     it('should handle tool calls and results with proper parent relationships', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const message1Id = createTestId();
       const message2Id = createTestId();
@@ -219,7 +221,7 @@ describe('ExecutionGraph', () => {
       const toolCallId = 'tool1';
 
       // Assistant message with tool call
-      const toolCallMessage = Obj.make(DataType.Message, {
+      const toolCallMessage = Obj.make(Message.Message, {
         id: message1Id,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -240,7 +242,7 @@ describe('ExecutionGraph', () => {
       });
 
       // User message with tool result
-      const toolResultMessage = Obj.make(DataType.Message, {
+      const toolResultMessage = Obj.make(Message.Message, {
         id: message2Id,
         created: '2025-01-01T00:01:00Z',
         sender: { role: 'user' },
@@ -296,7 +298,7 @@ describe('ExecutionGraph', () => {
     });
 
     it('should handle tool errors with proper parent relationships', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const message1Id = createTestId();
       const message2Id = createTestId();
@@ -304,7 +306,7 @@ describe('ExecutionGraph', () => {
       const toolCallId = 'tool1';
 
       // Assistant message with tool call
-      const toolCallMessage = Obj.make(DataType.Message, {
+      const toolCallMessage = Obj.make(Message.Message, {
         id: message1Id,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -321,7 +323,7 @@ describe('ExecutionGraph', () => {
       });
 
       // User message with tool error
-      const toolErrorMessage = Obj.make(DataType.Message, {
+      const toolErrorMessage = Obj.make(Message.Message, {
         id: message2Id,
         created: '2025-01-01T00:01:00Z',
         sender: { role: 'user' },
@@ -373,7 +375,7 @@ describe('ExecutionGraph', () => {
 
   describe('different processing orders', () => {
     it('should handle AgentStatus processed after tool result', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const message1Id = createTestId();
       const message2Id = createTestId();
@@ -381,7 +383,7 @@ describe('ExecutionGraph', () => {
       const toolCallId = 'tool1';
 
       // Tool call message
-      const toolCallMessage = Obj.make(DataType.Message, {
+      const toolCallMessage = Obj.make(Message.Message, {
         id: message1Id,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -398,7 +400,7 @@ describe('ExecutionGraph', () => {
       });
 
       // Tool result message
-      const toolResultMessage = Obj.make(DataType.Message, {
+      const toolResultMessage = Obj.make(Message.Message, {
         id: message2Id,
         created: '2025-01-01T00:01:00Z',
         sender: { role: 'user' },
@@ -432,7 +434,7 @@ describe('ExecutionGraph', () => {
     });
 
     it('should handle AgentStatus processed before tool result', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const message1Id = createTestId();
       const message2Id = createTestId();
@@ -440,7 +442,7 @@ describe('ExecutionGraph', () => {
       const toolCallId = 'tool1';
 
       // Tool call message
-      const toolCallMessage = Obj.make(DataType.Message, {
+      const toolCallMessage = Obj.make(Message.Message, {
         id: message1Id,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -466,7 +468,7 @@ describe('ExecutionGraph', () => {
       });
 
       // Tool result message
-      const toolResultMessage = Obj.make(DataType.Message, {
+      const toolResultMessage = Obj.make(Message.Message, {
         id: message2Id,
         created: '2025-01-01T00:01:00Z',
         sender: { role: 'user' },
@@ -493,7 +495,7 @@ describe('ExecutionGraph', () => {
 
   describe('complex scenarios', () => {
     it('should handle multiple tool calls in sequence', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const msg1Id = createTestId();
       const msg2Id = createTestId();
@@ -505,7 +507,7 @@ describe('ExecutionGraph', () => {
 
       const events = [
         // User message
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg1Id,
           created: '2025-01-01T00:00:00Z',
           sender: { role: 'user' },
@@ -514,7 +516,7 @@ describe('ExecutionGraph', () => {
         }),
 
         // Assistant with first tool call
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg2Id,
           created: '2025-01-01T00:01:00Z',
           sender: { role: 'assistant' },
@@ -526,7 +528,7 @@ describe('ExecutionGraph', () => {
         }),
 
         // First tool result
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg3Id,
           created: '2025-01-01T00:02:00Z',
           sender: { role: 'user' },
@@ -543,7 +545,7 @@ describe('ExecutionGraph', () => {
         }),
 
         // Assistant with second tool call
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg4Id,
           created: '2025-01-01T00:03:00Z',
           sender: { role: 'assistant' },
@@ -555,7 +557,7 @@ describe('ExecutionGraph', () => {
         }),
 
         // Second tool result
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg5Id,
           created: '2025-01-01T00:04:00Z',
           sender: { role: 'user' },
@@ -605,10 +607,10 @@ describe('ExecutionGraph', () => {
     });
 
     it('should handle mixed block types in a message', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const messageId = createTestId();
-      const message = Obj.make(DataType.Message, {
+      const message = Obj.make(Message.Message, {
         id: messageId,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -617,7 +619,7 @@ describe('ExecutionGraph', () => {
           { _tag: 'reasoning', reasoningText: 'I need to think about this' },
           { _tag: 'toolCall', toolCallId: 'tool1', name: 'analyze', input: '{}', providerExecuted: false },
           {
-            _tag: 'summary',
+            _tag: 'stats',
             message: 'OK',
             duration: 1000,
             toolCalls: 1,
@@ -642,10 +644,10 @@ describe('ExecutionGraph', () => {
 
   describe('edge cases', () => {
     it('should handle empty text blocks', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const messageId = createTestId();
-      const message = Obj.make(DataType.Message, {
+      const message = Obj.make(Message.Message, {
         id: messageId,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -666,10 +668,10 @@ describe('ExecutionGraph', () => {
     });
 
     it('should handle messages with no blocks', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const messageId = createTestId();
-      const message = Obj.make(DataType.Message, {
+      const message = Obj.make(Message.Message, {
         id: messageId,
         created: '2025-01-01T00:00:00Z',
         sender: { role: 'assistant' },
@@ -684,7 +686,7 @@ describe('ExecutionGraph', () => {
     });
 
     it('should handle getGraph with lastRequest filter', () => {
-      const graph = new ExecutionGraph();
+      const graph = new ExecutionGraph(SKIP_BLOCKS);
 
       const msg1Id = createTestId();
       const msg2Id = createTestId();
@@ -692,28 +694,28 @@ describe('ExecutionGraph', () => {
       const msg4Id = createTestId();
 
       const events = [
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg1Id,
           created: '2025-01-01T00:00:00Z',
           sender: { role: 'user' },
           blocks: [{ _tag: 'text', text: 'First request' }],
           properties: {},
         }),
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg2Id,
           created: '2025-01-01T00:01:00Z',
           sender: { role: 'assistant' },
           blocks: [{ _tag: 'text', text: 'Response 1' }],
           properties: {},
         }),
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg3Id,
           created: '2025-01-01T00:02:00Z',
           sender: { role: 'user' },
           blocks: [{ _tag: 'text', text: 'Second request' }],
           properties: {},
         }),
-        Obj.make(DataType.Message, {
+        Obj.make(Message.Message, {
           id: msg4Id,
           created: '2025-01-01T00:03:00Z',
           sender: { role: 'assistant' },

package/src/execution-graph.ts

@@ -3,13 +3,15 @@
 //
 
 import { AgentStatus } from '@dxos/ai';
-import { Obj, type Ref } from '@dxos/echo';
+import { type Entity, Obj, type Ref } from '@dxos/echo';
 import { MESSAGE_PROPERTY_TOOL_CALL_ID } from '@dxos/functions';
 import { type ObjectId } from '@dxos/keys';
 import { LogLevel } from '@dxos/log';
-import { ContentBlock, DataType } from '@dxos/schema';
+import { ContentBlock, Message } from '@dxos/types';
 import { isNonNullable } from '@dxos/util';
 
+const SKIP_BLOCKS: ContentBlock.Any['_tag'][] = ['text'];
+
 /**
  * Mercurial-style Commit.
  */
@@ -38,7 +40,7 @@ enum IconType {
   // Interactions.
   USER = 'ph--user--regular',
   USER_INTERACTION = 'ph--user-sound--regular',
-  AGENT = 'ph--robot--regular',
+  AGENT = 'ph--drone--regular',
   THINKING = 'ph--brain--regular',
   LINK = 'ph--link--regular',
   TOOL = 'ph--wrench--regular',
@@ -58,13 +60,15 @@ export class ExecutionGraph {
   private _lastCommitByBranch = new Map<string, string>(); // branch -> last commitId
   private _pendingToolResults = new Map<string, string>(); // toolCallId -> toolResultCommitId
 
+  constructor(private readonly _skipBlocks: ContentBlock.Any['_tag'][] = SKIP_BLOCKS) {}
+
   /**
    * Adds events to the graph.
    */
-  addEvents(events: Obj.Any[]) {
+  addEvents(events: Entity.Unknown[]) {
     const sortedEvents = this.sortObjectsByCreated(events);
     for (const event of sortedEvents) {
-      if (Obj.instanceOf(DataType.Message, event)) {
+      if (Obj.instanceOf(Message.Message, event)) {
         this._processMessage(event);
       } else if (Obj.instanceOf(AgentStatus, event)) {
         this._processAgentStatus(event);
@@ -75,12 +79,13 @@ export class ExecutionGraph {
   /**
    * Processes a message event and creates commits for its blocks.
    */
-  private _processMessage(message: DataType.Message) {
+  private _processMessage(message: Message.Message) {
     const messageCommits = messageToCommits(
       message,
       this._lastBlockId,
       this._toolCallCommitIds,
       this._lastCommitByBranch,
+      this._skipBlocks,
     );
     this._commits.push(...messageCommits);
 
@@ -194,13 +199,19 @@ export class ExecutionGraph {
    */
   private _updatePendingToolResults(toolCallId: string, agentStatusId: string) {
     const toolResultId = this._pendingToolResults.get(toolCallId);
-    if (!toolResultId) return;
+    if (!toolResultId) {
+      return;
+    }
 
     const toolResultCommit = this._commits.find((c) => c.id === toolResultId);
-    if (!toolResultCommit) return;
+    if (!toolResultCommit) {
+      return;
+    }
 
     const toolCallCommitId = this._toolCallCommitIds.get(toolCallId);
-    if (!toolCallCommitId) return;
+    if (!toolCallCommitId) {
+      return;
+    }
 
     // Replace tool call commit with AgentStatus commit.
     const toolCallIndex = toolResultCommit.parents.indexOf(toolCallCommitId);
@@ -216,7 +227,9 @@ export class ExecutionGraph {
    */
   private _handleLateToolResultUpdate(toolCallId: string, toolResultId: string) {
     const toolCallCommitId = this._toolCallCommitIds.get(toolCallId);
-    if (!toolCallCommitId) return;
+    if (!toolCallCommitId) {
+      return;
+    }
 
     const messageId = toolCallCommitId.split('_toolCall_')[0];
     const toolCallBranch = `${messageId}_${toolCallId}`;
@@ -278,15 +291,16 @@ export class ExecutionGraph {
   }
 }
 
-// TODO(burdon): Pass in AiToolProvider.
 /**
  * Creates commits for all blocks in a message.
  */
+// TODO(burdon): Pass in AiToolProvider.
 const messageToCommits = (
-  message: DataType.Message,
+  message: Message.Message,
   lastBlockId?: string,
   toolCallIds?: Map<string, string>,
   lastCommitByBranch?: Map<string, string>,
+  skipBlocks?: ContentBlock.Any['_tag'][],
 ): Commit[] => {
   let previousBlockId: string | undefined = lastBlockId;
 
@@ -294,6 +308,9 @@ const messageToCommits = (
     .map((block, idx) => {
       const branch = getMessageBranch(message);
       const parents = getBlockParents(block, previousBlockId, message, toolCallIds, lastCommitByBranch);
+      if (skipBlocks?.includes(block._tag)) {
+        return null;
+      }
 
       const commit = createBlockCommit(block, message, branch, parents, idx);
       if (commit) {
@@ -311,14 +328,14 @@ const messageToCommits = (
 const getBlockParents = (
   block: ContentBlock.Any,
   previousBlockId: string | undefined,
-  message: DataType.Message,
+  message: Message.Message,
   toolCallIds?: Map<string, string>,
   lastCommitByBranch?: Map<string, string>,
 ): string[] => {
   const parents: string[] = [];
 
   if (block._tag === 'toolResult') {
-    // Tool results have two parents: previous block and last block from tool call branch
+    // Tool results have two parents: previous block and last block from tool call branch.
     if (previousBlockId) {
       parents.push(previousBlockId);
     }
@@ -355,7 +372,7 @@ const getBlockParents = (
  */
 const createBlockCommit = (
   block: ContentBlock.Any,
-  message: DataType.Message,
+  message: Message.Message,
   branch: string,
   parents: string[],
   idx: number,
@@ -363,7 +380,9 @@ const createBlockCommit = (
   const timestamp = new Date(message.created);
   switch (block._tag) {
     case 'text':
-      if (!block.text.trim().length) return null;
+      if (!block.text.trim().length) {
+        return null;
+      }
       return {
         id: getGenericBlockId(message.id, idx),
         branch,
@@ -403,7 +422,7 @@ const createBlockCommit = (
         message: block.error ? 'Tool error: ' + block.error : 'Tool call succeeded',
       } satisfies Commit;
 
-    case 'summary':
+    case 'stats':
       return {
         id: getGenericBlockId(message.id, idx),
         branch,
@@ -411,7 +430,7 @@ const createBlockCommit = (
         timestamp,
         icon: IconType.ROCKET,
         level: LogLevel.INFO,
-        message: ContentBlock.createSummaryMessage(block),
+        message: ContentBlock.createStatsMessage(block),
       } satisfies Commit;
 
     case 'status':
@@ -472,14 +491,14 @@ const getBranchName = (options: { parentMessage?: ObjectId; toolCallId?: string
   }
 };
 
-const getMessageBranch = (message: DataType.Message) => {
+const getMessageBranch = (message: Message.Message) => {
   return getBranchName({
     parentMessage: message.parentMessage,
     toolCallId: message.properties?.[MESSAGE_PROPERTY_TOOL_CALL_ID],
   });
 };
 
-const getParentId = (message: DataType.Message) => {
+const getParentId = (message: Message.Message) => {
   if (message.parentMessage && message.properties?.[MESSAGE_PROPERTY_TOOL_CALL_ID]) {
     return getToolCallId(message.parentMessage, message.properties[MESSAGE_PROPERTY_TOOL_CALL_ID]);
   } else {
@@ -487,7 +506,7 @@ const getParentId = (message: DataType.Message) => {
   }
 };
 
-const stringifyRef = (ref: Ref.Any) => {
+const stringifyRef = (ref: Ref.Unknown) => {
   if (ref.target) {
     return stringifyObject(ref.target);
   }
@@ -495,6 +514,6 @@ const stringifyRef = (ref: Ref.Any) => {
   return ref.dxn.asEchoDXN()?.echoId ?? ref.dxn.asQueueDXN()?.objectId ?? '';
 };
 
-const stringifyObject = (obj: Obj.Any) => {
+const stringifyObject = (obj: Obj.Unknown) => {
   return Obj.getLabel(obj) ?? Obj.getTypename(obj) ?? obj.id;
 };

package/src/extraction/extraction-ner-function/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './extraction-ner-function';
 export * from './named-entity-recognition';

package/src/extraction/extraction-ner-function/named-entity-recognition.test.ts

@@ -6,7 +6,8 @@ import { type TokenClassificationOutput, type TokenClassificationPipelineType }
 import { beforeAll, describe, expect, test } from 'vitest';
 
 import { log } from '@dxos/log';
-import { createTestData } from '@dxos/schema/testing';
+import { type ContentBlock, type Message } from '@dxos/types';
+import { createTestData } from '@dxos/types/testing';
 
 import { combineNerTokens, createTokenGroups, extractFullEntities, getNer } from './named-entity-recognition';
 
@@ -57,8 +58,10 @@ describe.skip('NamedEntityRecognition', () => {
   test('own data', async () => {
     const { transcriptWoflram, transcriptJosiah } = await createTestData();
 
-    const blocks = [...transcriptWoflram, ...transcriptJosiah].flatMap((message) =>
-      message.blocks.flatMap((block) => (block._tag === 'transcript' ? [block.text] : [])),
+    const blocks = [...transcriptWoflram, ...transcriptJosiah].flatMap((message: Message.Message) =>
+      message.blocks.flatMap((block: ContentBlock.Any) =>
+        block._tag === 'transcript' ? [(block as ContentBlock.Transcript).text] : [],
+      ),
     );
 
     for (const block of blocks) {
@@ -70,8 +73,10 @@ describe.skip('NamedEntityRecognition', () => {
   test('more own data', async () => {
     const { transcriptMessages } = await createTestData();
 
-    const blocks = transcriptMessages.flatMap((message) =>
-      message.blocks.flatMap((block) => (block._tag === 'transcript' ? [block.text] : [])),
+    const blocks = transcriptMessages.flatMap((message: Message.Message) =>
+      message.blocks.flatMap((block: ContentBlock.Any) =>
+        block._tag === 'transcript' ? [(block as ContentBlock.Transcript).text] : [],
+      ),
     );
 
     for (const block of blocks) {