@dxos/plugin-transcription 0.8.2-main.2f9c567 → 0.8.2-main.36232bc

package/src/components/Transcript/deprecated/OldTranscript.tsx

@@ -3,12 +3,11 @@
 //
 
 import { intervalToDuration } from 'date-fns/intervalToDuration';
-import { Schema } from 'effect';
 import { yieldOrContinue } from 'main-thread-scheduling';
 import React, { type FC, useCallback, useEffect, useMemo, useRef, useState, type WheelEvent } from 'react';
 import { type OnResizeCallback, useResizeDetector } from 'react-resize-detector';
 
-import { Type } from '@dxos/echo';
+import { EchoObject, S } from '@dxos/echo-schema';
 import { IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
 import {
@@ -26,30 +25,25 @@ import { TRANSCRIPTION_PLUGIN } from '../../../meta';
 /**
  * Transcription fragment.
  */
-const TranscriptSegment = Schema.Struct({
+const TranscriptSegment = S.Struct({
   // TODO(burdon): TS from service is not Unix TS (x1000).
-  started: Schema.String,
-  text: Schema.String,
+  started: S.String,
+  text: S.String,
 });
 
-type TranscriptSegment = Schema.Schema.Type<typeof TranscriptSegment>;
+type TranscriptSegment = S.Schema.Type<typeof TranscriptSegment>;
 
 /**
  * Transcription block (from single speaker).
  */
-const TranscriptBlock = Schema.Struct({
-  id: Schema.String,
-  authorName: Schema.optional(Schema.String), // TODO(burdon): Replace with identityDid.
-  authorHue: Schema.optional(Schema.String), // TOOD(burdon): Remove.
-  segments: Schema.Array(TranscriptSegment),
-}).pipe(
-  Type.def({
-    typename: 'dxos.org/type/TranscriptBlock',
-    version: '0.1.0',
-  }),
-);
-
-type TranscriptBlock = Schema.Schema.Type<typeof TranscriptBlock>;
+const TranscriptBlock = S.Struct({
+  id: S.String,
+  authorName: S.optional(S.String), // TODO(burdon): Replace with identityDid.
+  authorHue: S.optional(S.String), // TOOD(burdon): Remove.
+  segments: S.Array(TranscriptSegment),
+}).pipe(EchoObject({ typename: 'dxos.org/type/TranscriptBlock', version: '0.1.0' }));
+
+type TranscriptBlock = S.Schema.Type<typeof TranscriptBlock>;
 
 // TODO(burdon): Actions (e.g., mark, summarize, translate, label, delete).
 

package/src/components/Transcript/transcript-extension.ts

@@ -9,7 +9,7 @@ import { intervalToDuration } from 'date-fns/intervalToDuration';
 
 import { type CleanupFn, addEventListener, combine } from '@dxos/async';
 import { type RenderCallback } from '@dxos/react-ui-editor';
-import { type DataType } from '@dxos/schema';
+import { type MessageType } from '@dxos/schema';
 
 import { DocumentAdapter, type SerializationModel } from '../../model';
 
@@ -17,7 +17,7 @@ import { DocumentAdapter, type SerializationModel } from '../../model';
  * Data structure that maps Chunks queue to lines with transcript state.
  */
 export type TranscriptOptions = {
-  model: SerializationModel<DataType.Message>;
+  model: SerializationModel<MessageType>;
   started?: Date;
   renderButton?: RenderCallback<{ onClick: () => void }>;
 };
@@ -213,7 +213,7 @@ class TimestampMarker extends GutterMarker {
   }
 }
 
-const getStartTime = (started?: Date, message?: DataType.Message): Date | undefined => {
+const getStartTime = (started?: Date, message?: MessageType): Date | undefined => {
   if (started) {
     return started;
   }

package/src/components/TranscriptContainer.tsx

@@ -7,7 +7,7 @@ import React, { type FC } from 'react';
 import { fullyQualifiedId, getSpace } from '@dxos/client/echo';
 import { useMembers, useQueue } from '@dxos/react-client/echo';
 import { StackItem } from '@dxos/react-ui-stack';
-import { type DataType } from '@dxos/schema';
+import { type MessageType } from '@dxos/schema';
 
 import { Transcript, renderMarkdown } from './Transcript';
 import { useQueueModelAdapter } from '../hooks';
@@ -17,7 +17,7 @@ export const TranscriptionContainer: FC<{ role: string; transcript: TranscriptTy
   const attendableId = fullyQualifiedId(transcript);
   const space = getSpace(transcript);
   const members = useMembers(space?.key).map((member) => member.identity);
-  const queue = useQueue<DataType.Message>(transcript.queue.dxn, { pollInterval: 1_000 });
+  const queue = useQueue<MessageType>(transcript.queue.dxn, { pollInterval: 1_000 });
   const model = useQueueModelAdapter(renderMarkdown(members), queue);
 
   return (

package/src/components/transcription.stories.tsx

@@ -33,7 +33,7 @@ import { createQueueDxn, useQueue, useSpace } from '@dxos/react-client/echo';
 import { IconButton, Toolbar } from '@dxos/react-ui';
 import { ScrollContainer } from '@dxos/react-ui-components';
 import { defaultTx } from '@dxos/react-ui-theme';
-import { DataType } from '@dxos/schema';
+import { Contact, MessageType, Organization } from '@dxos/schema';
 import { seedTestData, Testing } from '@dxos/schema/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
@@ -46,7 +46,7 @@ import { TestItem } from '../testing';
 import { type TranscriberParams } from '../transcriber';
 
 const TranscriptionStory: FC<{
-  model: SerializationModel<DataType.Message>;
+  model: SerializationModel<MessageType>;
   running: boolean;
   onRunningChange: Dispatch<SetStateAction<boolean>>;
 }> = ({ model, running, onRunningChange }) => {
@@ -81,14 +81,14 @@ const Microphone = ({ entityExtraction }: { entityExtraction?: boolean }) => {
 
   // Queue.
   const queueDxn = useMemo(() => createQueueDxn(), []);
-  const queue = useMemo(() => new MemoryQueue<DataType.Message>(queueDxn), [queueDxn]);
+  const queue = useMemo(() => new MemoryQueue<MessageType>(queueDxn), [queueDxn]);
   const model = useQueueModelAdapter(renderMarkdown([]), queue);
   const space = useSpace();
 
   // Transcriber.
   const handleSegments = useCallback<TranscriberParams['onSegments']>(
     async (blocks) => {
-      const message = create(DataType.Message, { sender: { name: 'You' }, created: new Date().toISOString(), blocks });
+      const message = create(MessageType, { sender: { name: 'You' }, created: new Date().toISOString(), blocks });
 
       if (entityExtraction) {
         if (!space) {
@@ -97,13 +97,7 @@ const Microphone = ({ entityExtraction }: { entityExtraction?: boolean }) => {
         }
         // TODO(dmaretskyi): Move to vector search index.
         const { objects } = await space.db
-          .query(
-            Filter.or(
-              Filter.schema(DataType.Person),
-              Filter.schema(DataType.Organization),
-              Filter.schema(Testing.DocumentType),
-            ),
-          )
+          .query(Filter.or(Filter.schema(Contact), Filter.schema(Organization), Filter.schema(Testing.DocumentType)))
           .run();
 
         log.info('context', { objects });
@@ -182,11 +176,11 @@ const AudioFile = ({ queueDxn, audioUrl }: { queueDxn: DXN; audioUrl: string; tr
   }, [audio, running]);
 
   // Transcriber.
-  const queue = useQueue<DataType.Message>(queueDxn, { pollInterval: 500 });
+  const queue = useQueue<MessageType>(queueDxn, { pollInterval: 500 });
   const model = useQueueModelAdapter(renderMarkdown([]), queue);
   const handleSegments = useCallback<TranscriberParams['onSegments']>(
     async (blocks) => {
-      const message = create(DataType.Message, { sender: { name: 'You' }, created: new Date().toISOString(), blocks });
+      const message = create(MessageType, { sender: { name: 'You' }, created: new Date().toISOString(), blocks });
       void queue?.append([message]);
     },
     [queue],
@@ -230,7 +224,7 @@ const meta: Meta<typeof AudioFile> = {
         ThemePlugin({ tx: defaultTx }),
         StorybookLayoutPlugin(),
         ClientPlugin({
-          types: [TestItem, DataType.Person, DataType.Organization, Testing.DocumentType],
+          types: [TestItem, Contact, Organization, Testing.DocumentType],
           onClientInitialized: async (_, client) => {
             await client.halo.createIdentity();
             await client.spaces.waitUntilReady();

package/src/entity-extraction/entity-extraction.test.ts

@@ -17,7 +17,7 @@ const aiService = new AIServiceEdgeClient({
 });
 
 describe.skip('EntityExtraction', { timeout: 180_000 }, () => {
-  test.skip('should process a transcript block', async () => {
+  test('should process a transcript block', async () => {
     const { transcriptMessages, documents, contacts } = await createTestData();
 
     log.info('context', { documents, contacts });
@@ -35,11 +35,11 @@ describe.skip('EntityExtraction', { timeout: 180_000 }, () => {
     }
   });
 
-  test.only('computational irreducibility', async () => {
-    const { transcriptWoflram, documents, contacts } = await createTestData();
+  test.skip('computational irreducibility', async () => {
+    const { transcriptMessages, documents, contacts } = await createTestData();
 
     log.info('context', { documents, contacts });
-    const message = transcriptWoflram[0];
+    const message = transcriptMessages[0];
     log.info('input', message);
 
     await Promise.all(
@@ -55,25 +55,6 @@ describe.skip('EntityExtraction', { timeout: 180_000 }, () => {
       }),
     );
   });
-
-  test('org and document linking', async () => {
-    const { transcriptJosiah, documents, contacts, organizations } = await createTestData();
-
-    log.info('context', { contacts, organizations, documents });
-
-    for (const message of transcriptJosiah) {
-      log.info('input', message);
-
-      const { message: enhancedMessage } = await processTranscriptMessage({
-        message,
-        aiService,
-        context: {
-          objects: [...documents, ...Object.values(contacts), ...Object.values(organizations)],
-        },
-      });
-      log.info('output', enhancedMessage);
-    }
-  });
 });
 
 describe('postprocessText', () => {

package/src/entity-extraction/entity-extraction.ts

@@ -8,15 +8,14 @@ import { createTemplate, Message, structuredOutputParser } from '@dxos/artifact'
 import type { AIServiceClient } from '@dxos/assistant';
 import { MixedStreamParser } from '@dxos/assistant';
 import { asyncTimeout } from '@dxos/async';
-import { type BaseEchoObject, create, ObjectId } from '@dxos/echo-schema';
-import { DXN } from '@dxos/keys';
+import { type BaseEchoObject, create } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
-import { DataType } from '@dxos/schema';
+import { MessageType } from '@dxos/schema';
 
 import SYSTEM_PROMPT from './system-prompt.tpl?raw';
 
 type ProcessTranscriptMessageParams = {
-  message: DataType.Message;
+  message: MessageType;
   aiService: AIServiceClient;
   context: {
     objects?: BaseEchoObject[];
@@ -38,7 +37,7 @@ type ProcessTranscriptMessageParams = {
 };
 
 type ProcessTranscriptMessageResult = {
-  message: DataType.Message;
+  message: MessageType;
   timeElapsed: number;
 };
 
@@ -98,7 +97,7 @@ export const processTranscriptMessage = async (
       log.info('entity extraction result', { refs: result.references });
 
       return {
-        message: create(DataType.Message, {
+        message: create(MessageType, {
           ...params.message,
           blocks: params.message.blocks.map((block, i) =>
             block.type !== 'transcription'
@@ -137,13 +136,9 @@ export const processTranscriptMessage = async (
 // TODO(dmaretskyi): Lookup and verifiy ids from provided context.
 export const postprocessText = (text: string, quotes: ReferencedQuotes) => {
   for (const quote of quotes.references) {
-    if (!ObjectId.isValid(quote.id)) {
-      continue;
-    }
-
     // Use a case-insensitive regular expression to replace the quote
     const regex = new RegExp(quote.quote.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'gi');
-    text = text.replace(regex, `[${quote.quote}][${DXN.fromLocalObjectId(quote.id).toString()}]`);
+    text = text.replace(regex, `[${quote.quote}][dxn:echo:@:${quote.id}]`);
   }
   return text;
 };

package/src/model/model.test.ts

@@ -5,15 +5,11 @@
 import { EditorView } from '@codemirror/view';
 import { describe, test } from 'vitest';
 
-import { type DataType } from '@dxos/schema';
+import { type MessageType } from '@dxos/schema';
 
 import { SerializationModel, DocumentAdapter, type ChunkRenderer } from './model';
 
-const blockToMarkdown: ChunkRenderer<DataType.Message> = (
-  message: DataType.Message,
-  index: number,
-  debug = true,
-): string[] => {
+const blockToMarkdown: ChunkRenderer<MessageType> = (message: MessageType, index: number, debug = true): string[] => {
   return [
     `###### ${message.sender.name}`,
     ...message.blocks.filter((block) => block.type === 'transcription').map((block) => block.text),
@@ -25,12 +21,12 @@ const createDate = () => new Date().toISOString();
 
 describe('SerializationModel', () => {
   test('basic', ({ expect }) => {
-    const model = new SerializationModel<DataType.Message>(blockToMarkdown);
+    const model = new SerializationModel<MessageType>(blockToMarkdown);
     expect(model.chunks.length).to.eq(0);
     expect(model.doc.toString()).to.eq('');
 
     // Create message.
-    const message: DataType.Message = {
+    const message: MessageType = {
       id: '1',
       created: createDate(),
       sender: { name: 'Alice' },
@@ -61,14 +57,14 @@ describe('SerializationModel', () => {
 
   test('sync - append', ({ expect }) => {
     const view = new EditorView({ extensions: [], doc: '' });
-    const model = new SerializationModel<DataType.Message>(blockToMarkdown);
+    const model = new SerializationModel<MessageType>(blockToMarkdown);
     const adapter = new DocumentAdapter(view);
     expect(adapter.lineCount()).to.eq(0);
     expect(view.state.doc.toString()).to.eq('');
 
     // Append message.
     {
-      const message: DataType.Message = {
+      const message: MessageType = {
         id: '1',
         created: createDate(),
         sender: { name: 'Alice' },
@@ -87,7 +83,7 @@ describe('SerializationModel', () => {
 
     // Append message.
     {
-      const message: DataType.Message = {
+      const message: MessageType = {
         id: '2',
         created: createDate(),
         sender: { name: 'Bob' },
@@ -107,13 +103,13 @@ describe('SerializationModel', () => {
 
   test('sync - append, update, delete', ({ expect }) => {
     const view = new EditorView({ extensions: [], doc: '' });
-    const model = new SerializationModel<DataType.Message>(blockToMarkdown);
+    const model = new SerializationModel<MessageType>(blockToMarkdown);
     const adapter = new DocumentAdapter(view);
     expect(adapter.lineCount()).to.eq(0);
 
     // Append message.
     {
-      const message: DataType.Message = {
+      const message: MessageType = {
         id: '1',
         created: createDate(),
         sender: { name: 'Alice' },
@@ -146,7 +142,7 @@ describe('SerializationModel', () => {
 
     // Append message.
     {
-      const message: DataType.Message = {
+      const message: MessageType = {
         id: '2',
         created: createDate(),
         sender: { name: 'Bob' },

package/src/testing/testing.ts

@@ -2,7 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema, SchemaAST } from 'effect';
 import { useEffect, useMemo, useState } from 'react';
 
 import { AIServiceEdgeClient } from '@dxos/assistant';
@@ -10,38 +9,32 @@ import { AI_SERVICE_ENDPOINT } from '@dxos/assistant/testing';
 import { scheduleTaskInterval } from '@dxos/async';
 import { createQueueDxn, Filter, type Queue } from '@dxos/client/echo';
 import { Context } from '@dxos/context';
-import { Type } from '@dxos/echo';
-import { create, ObjectId } from '@dxos/echo-schema';
+import { AST, create, EchoObject, ObjectId, S } from '@dxos/echo-schema';
 import { IdentityDid } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { faker } from '@dxos/random';
 import { live, makeRef, useQueue, type Space } from '@dxos/react-client/echo';
-import { DataType } from '@dxos/schema';
+import { Contact, MessageType, Organization, type TranscriptionContentBlock } from '@dxos/schema';
 import { Testing, seedTestData } from '@dxos/schema/testing';
 
 import { processTranscriptMessage } from '../entity-extraction';
 
 // TODO(burdon): Reconcile with plugin-markdown. Move to @dxos/schema/testing.
 
-export const TestItem = Schema.Struct({
-  title: Schema.String.annotations({
-    [SchemaAST.TitleAnnotationId]: 'Title',
-    [SchemaAST.DescriptionAnnotationId]: 'Product title',
+export const TestItem = S.Struct({
+  title: S.String.annotations({
+    [AST.TitleAnnotationId]: 'Title',
+    [AST.DescriptionAnnotationId]: 'Product title',
   }),
-  description: Schema.String.annotations({
-    [SchemaAST.TitleAnnotationId]: 'Description',
-    [SchemaAST.DescriptionAnnotationId]: 'Product description',
+  description: S.String.annotations({
+    [AST.TitleAnnotationId]: 'Description',
+    [AST.DescriptionAnnotationId]: 'Product description',
   }),
-}).pipe(
-  Type.def({
-    typename: 'dxos.org/type/Test',
-    version: '0.1.0',
-  }),
-);
+}).pipe(EchoObject({ typename: 'dxos.org/type/Test', version: '0.1.0' }));
 
 // TODO(wittjosiah): Make builder generic and reuse for all message types.
 abstract class AbstractMessageBuilder {
-  abstract createMessage(numSegments?: number): Promise<DataType.Message>;
+  abstract createMessage(numSegments?: number): Promise<MessageType>;
 }
 
 /**
@@ -62,7 +55,7 @@ export class MessageBuilder extends AbstractMessageBuilder {
     super();
   }
 
-  override async createMessage(numSegments = 1): Promise<DataType.Message> {
+  override async createMessage(numSegments = 1): Promise<MessageType> {
     return {
       id: ObjectId.random().toString(),
       created: this.next().toISOString(),
@@ -71,7 +64,7 @@ export class MessageBuilder extends AbstractMessageBuilder {
     };
   }
 
-  createBlock(): DataType.MessageBlock.Transcription {
+  createBlock(): TranscriptionContentBlock {
     let text = faker.lorem.paragraph();
     if (this._space) {
       const label = faker.commerce.productName();
@@ -103,7 +96,7 @@ class EntityExtractionMessageBuilder extends AbstractMessageBuilder {
 
   space: Space | undefined;
   currentMessage: number = 0;
-  transcriptMessages: DataType.Message[] = [];
+  transcriptMessages: MessageType[] = [];
 
   async connect(space: Space) {
     this.space = space;
@@ -111,19 +104,13 @@ class EntityExtractionMessageBuilder extends AbstractMessageBuilder {
     this.transcriptMessages = transcriptMessages;
   }
 
-  override async createMessage(): Promise<DataType.Message> {
+  override async createMessage(): Promise<MessageType> {
     if (!this.space) {
       throw new Error('Space not connected');
     }
 
     const { objects } = await this.space.db
-      .query(
-        Filter.or(
-          Filter.schema(DataType.Person),
-          Filter.schema(DataType.Organization),
-          Filter.schema(Testing.DocumentType),
-        ),
-      )
+      .query(Filter.or(Filter.schema(Contact), Filter.schema(Organization), Filter.schema(Testing.DocumentType)))
       .run();
 
     log.info('context', { objects });
@@ -148,7 +135,7 @@ type UseTestTranscriptionQueue = (
   queueId?: ObjectId,
   running?: boolean,
   interval?: number,
-) => Queue<DataType.Message> | undefined;
+) => Queue<MessageType> | undefined;
 
 /**
  * Test transcriptionqueue.
@@ -160,7 +147,7 @@ export const useTestTranscriptionQueue: UseTestTranscriptionQueue = (
   interval = 1_000,
 ) => {
   const queueDxn = useMemo(() => (space ? createQueueDxn(space.id, queueId) : undefined), [space, queueId]);
-  const queue = useQueue<DataType.Message>(queueDxn);
+  const queue = useQueue<MessageType>(queueDxn);
   const builder = useMemo(() => new MessageBuilder(space), [space]);
 
   useEffect(() => {
@@ -170,7 +157,7 @@ export const useTestTranscriptionQueue: UseTestTranscriptionQueue = (
 
     const i = setInterval(() => {
       void builder.createMessage(Math.ceil(Math.random() * 3)).then((message) => {
-        queue.append([create(DataType.Message, message)]);
+        queue.append([create(MessageType, message)]);
       });
     }, interval);
     return () => clearInterval(i);
@@ -190,7 +177,7 @@ export const useTestTranscriptionQueueWithEntityExtraction: UseTestTranscription
   interval = 1_000,
 ) => {
   const queueDxn = useMemo(() => (space ? createQueueDxn(space.id, queueId) : undefined), [space, queueId]);
-  const queue = useQueue<DataType.Message>(queueDxn);
+  const queue = useQueue<MessageType>(queueDxn);
   const [builder] = useState(() => new EntityExtractionMessageBuilder());
 
   useEffect(() => {
@@ -207,7 +194,7 @@ export const useTestTranscriptionQueueWithEntityExtraction: UseTestTranscription
       ctx,
       async () => {
         const message = await builder.createMessage();
-        queue.append([create(DataType.Message, message)]);
+        queue.append([create(MessageType, message)]);
       },
       interval,
     );

package/src/transcriber/transcriber.browser.test.ts

@@ -9,7 +9,7 @@ import { WaveFile } from 'wavefile';
 
 import { Trigger } from '@dxos/async';
 import { log } from '@dxos/log';
-import { type DataType } from '@dxos/schema';
+import { type TranscriptionContentBlock } from '@dxos/schema';
 import { openAndClose } from '@dxos/test-utils';
 import { trace, TRACE_PROCESSOR } from '@dxos/tracing';
 
@@ -93,7 +93,7 @@ describe.skip('Transcriber', () => {
   });
 
   test.skip('transcription of audio recording', { timeout: 10_000 }, async () => {
-    const trigger = new Trigger<DataType.MessageBlock.Transcription[]>({ autoReset: true });
+    const trigger = new Trigger<TranscriptionContentBlock[]>({ autoReset: true });
     const recorder = new MockAudioRecorder({
       buffer: await readFile('test.wav'),
       chunkDuration: 3_000,
@@ -127,7 +127,7 @@ describe.skip('Transcriber', () => {
   });
 
   test.skip('transcription of audio recording with overlapping chunks', { timeout: 20_000 }, async () => {
-    const trigger = new Trigger<DataType.MessageBlock.Transcription[]>({ autoReset: true });
+    const trigger = new Trigger<TranscriptionContentBlock[]>({ autoReset: true });
     const recorder = new MockAudioRecorder({
       buffer: await readFile('test.wav'),
       chunkDuration: 3_000,

package/src/transcriber/transcriber.ts

@@ -7,7 +7,7 @@ import { WaveFile } from 'wavefile';
 import { DeferredTask, Trigger } from '@dxos/async';
 import { type Context, LifecycleState, Resource } from '@dxos/context';
 import { log } from '@dxos/log';
-import { type DataType } from '@dxos/schema';
+import { type TranscriptionContentBlock } from '@dxos/schema';
 import { trace } from '@dxos/tracing';
 
 import { type AudioRecorder, type AudioChunk } from './audio-recorder';
@@ -65,7 +65,7 @@ export type TranscribeConfig = {
 export type TranscriberParams = {
   config: TranscribeConfig;
   recorder: AudioRecorder;
-  onSegments: (segments: DataType.MessageBlock.Transcription[]) => Promise<void>;
+  onSegments: (segments: TranscriptionContentBlock[]) => Promise<void>;
 };
 
 /**
@@ -216,10 +216,7 @@ export class Transcriber extends Resource {
     return segments;
   }
 
-  private _alignSegments(
-    segments: WhisperSegment[],
-    originalChunks: AudioChunk[],
-  ): DataType.MessageBlock.Transcription[] {
+  private _alignSegments(segments: WhisperSegment[], originalChunks: AudioChunk[]): TranscriptionContentBlock[] {
     // Absolute zero for all relative timestamps in the segments.
     const zeroTimestamp = originalChunks.at(0)!.timestamp;
 

package/src/transcriber/transcription-manager.ts

@@ -9,7 +9,7 @@ import { create } from '@dxos/echo-schema';
 import { type DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type EdgeHttpClient } from '@dxos/react-edge-client';
-import { DataType } from '@dxos/schema';
+import { MessageType, type TranscriptionContentBlock } from '@dxos/schema';
 
 import { MediaStreamRecorder } from './media-stream-recorder';
 import { Transcriber } from './transcriber';
@@ -30,7 +30,7 @@ const PREFIXED_CHUNKS_AMOUNT = 10;
  */
 const TRANSCRIBE_AFTER_CHUNKS_AMOUNT = 50;
 
-export type TranscriptMessageEnricher = (message: DataType.Message) => Promise<DataType.Message>;
+export type TranscriptMessageEnricher = (message: MessageType) => Promise<MessageType>;
 
 export type TranscriptionManagerOptions = {
   edgeClient: EdgeHttpClient;
@@ -51,7 +51,7 @@ export class TranscriptionManager extends Resource {
   private _identityDid?: string = undefined;
   private _mediaRecorder?: MediaStreamRecorder = undefined;
   private _transcriber?: Transcriber = undefined;
-  private _queue?: Queue<DataType.Message> = undefined;
+  private _queue?: Queue<MessageType> = undefined;
   private _enabled = false;
 
   constructor(options: TranscriptionManagerOptions) {
@@ -71,7 +71,7 @@ export class TranscriptionManager extends Resource {
   setQueue(queueDxn: DXN): TranscriptionManager {
     if (this._queue?.dxn.toString() !== queueDxn.toString()) {
       log.info('setQueue', { queueDxn: queueDxn.toString() });
-      this._queue = new QueueImpl<DataType.Message>(this._edgeClient, queueDxn);
+      this._queue = new QueueImpl<MessageType>(this._edgeClient, queueDxn);
     }
     return this;
   }
@@ -129,7 +129,7 @@ export class TranscriptionManager extends Resource {
     if (this._enabled) {
       await this._transcriber?.open();
       // TODO(burdon): Started and stopped blocks appear twice.
-      const block = create(DataType.Message, {
+      const block = create(MessageType, {
         created: new Date().toISOString(),
         blocks: [{ type: 'transcription', text: 'Started', started: new Date().toISOString() }],
         sender: { role: 'assistant' },
@@ -137,7 +137,7 @@ export class TranscriptionManager extends Resource {
       this._queue?.append([block]);
     } else {
       await this._transcriber?.close();
-      const block = create(DataType.Message, {
+      const block = create(MessageType, {
         created: new Date().toISOString(),
         blocks: [{ type: 'transcription', text: 'Stopped', started: new Date().toISOString() }],
         sender: { role: 'assistant' },
@@ -173,12 +173,12 @@ export class TranscriptionManager extends Resource {
     }
   }
 
-  private async _onSegments(segments: DataType.MessageBlock.Transcription[]) {
+  private async _onSegments(segments: TranscriptionContentBlock[]) {
     if (!this.isOpen || !this._queue) {
       return;
     }
 
-    let block = create(DataType.Message, {
+    let block = create(MessageType, {
       created: new Date().toISOString(),
       blocks: segments,
       sender: { identityDid: this._identityDid },