@dxos/plugin-assistant 0.8.4-main.937b3ca → 0.8.4-main.9735255

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.937b3ca",
+  "version": "0.8.4-main.9735255",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -73,68 +73,68 @@
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/assistant": "0.8.4-main.937b3ca",
-    "@dxos/app-framework": "0.8.4-main.937b3ca",
-    "@dxos/ai": "0.8.4-main.937b3ca",
-    "@dxos/assistant-toolkit": "0.8.4-main.937b3ca",
-    "@dxos/async": "0.8.4-main.937b3ca",
-    "@dxos/client": "0.8.4-main.937b3ca",
-    "@dxos/compute": "0.8.4-main.937b3ca",
-    "@dxos/config": "0.8.4-main.937b3ca",
-    "@dxos/conductor": "0.8.4-main.937b3ca",
-    "@dxos/context": "0.8.4-main.937b3ca",
-    "@dxos/blueprints": "0.8.4-main.937b3ca",
-    "@dxos/devtools": "0.8.4-main.937b3ca",
-    "@dxos/debug": "0.8.4-main.937b3ca",
-    "@dxos/echo": "0.8.4-main.937b3ca",
-    "@dxos/echo-atom": "0.8.4-main.937b3ca",
-    "@dxos/echo-protocol": "0.8.4-main.937b3ca",
-    "@dxos/echo-db": "0.8.4-main.937b3ca",
-    "@dxos/echo-query": "0.8.4-main.937b3ca",
-    "@dxos/edge-client": "0.8.4-main.937b3ca",
-    "@dxos/effect": "0.8.4-main.937b3ca",
-    "@dxos/functions": "0.8.4-main.937b3ca",
-    "@dxos/functions-runtime": "0.8.4-main.937b3ca",
-    "@dxos/invariant": "0.8.4-main.937b3ca",
-    "@dxos/lit-ui": "0.8.4-main.937b3ca",
-    "@dxos/graph": "0.8.4-main.937b3ca",
-    "@dxos/keys": "0.8.4-main.937b3ca",
-    "@dxos/log": "0.8.4-main.937b3ca",
-    "@dxos/operation": "0.8.4-main.937b3ca",
-    "@dxos/plugin-attention": "0.8.4-main.937b3ca",
-    "@dxos/plugin-automation": "0.8.4-main.937b3ca",
-    "@dxos/plugin-deck": "0.8.4-main.937b3ca",
-    "@dxos/plugin-graph": "0.8.4-main.937b3ca",
-    "@dxos/plugin-client": "0.8.4-main.937b3ca",
-    "@dxos/plugin-map": "0.8.4-main.937b3ca",
-    "@dxos/plugin-space": "0.8.4-main.937b3ca",
-    "@dxos/plugin-table": "0.8.4-main.937b3ca",
-    "@dxos/plugin-transcription": "0.8.4-main.937b3ca",
-    "@dxos/protocols": "0.8.4-main.937b3ca",
-    "@dxos/react-client": "0.8.4-main.937b3ca",
-    "@dxos/react-edge-client": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-attention": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-chat": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-editor": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-form": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-list": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-graph": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-markdown": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-menu": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-searchlist": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-mosaic": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-sfx": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-components": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-stack": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-tabs": "0.8.4-main.937b3ca",
-    "@dxos/schema": "0.8.4-main.937b3ca",
-    "@dxos/ui-editor": "0.8.4-main.937b3ca",
-    "@dxos/util": "0.8.4-main.937b3ca",
-    "@dxos/ui": "0.8.4-main.937b3ca",
-    "@dxos/types": "0.8.4-main.937b3ca"
+    "@dxos/ai": "0.8.4-main.9735255",
+    "@dxos/app-framework": "0.8.4-main.9735255",
+    "@dxos/assistant-toolkit": "0.8.4-main.9735255",
+    "@dxos/assistant": "0.8.4-main.9735255",
+    "@dxos/blueprints": "0.8.4-main.9735255",
+    "@dxos/client": "0.8.4-main.9735255",
+    "@dxos/async": "0.8.4-main.9735255",
+    "@dxos/conductor": "0.8.4-main.9735255",
+    "@dxos/compute": "0.8.4-main.9735255",
+    "@dxos/config": "0.8.4-main.9735255",
+    "@dxos/debug": "0.8.4-main.9735255",
+    "@dxos/context": "0.8.4-main.9735255",
+    "@dxos/devtools": "0.8.4-main.9735255",
+    "@dxos/echo": "0.8.4-main.9735255",
+    "@dxos/echo-atom": "0.8.4-main.9735255",
+    "@dxos/echo-protocol": "0.8.4-main.9735255",
+    "@dxos/echo-query": "0.8.4-main.9735255",
+    "@dxos/echo-db": "0.8.4-main.9735255",
+    "@dxos/edge-client": "0.8.4-main.9735255",
+    "@dxos/effect": "0.8.4-main.9735255",
+    "@dxos/functions": "0.8.4-main.9735255",
+    "@dxos/functions-runtime": "0.8.4-main.9735255",
+    "@dxos/graph": "0.8.4-main.9735255",
+    "@dxos/lit-ui": "0.8.4-main.9735255",
+    "@dxos/keys": "0.8.4-main.9735255",
+    "@dxos/invariant": "0.8.4-main.9735255",
+    "@dxos/log": "0.8.4-main.9735255",
+    "@dxos/plugin-automation": "0.8.4-main.9735255",
+    "@dxos/plugin-client": "0.8.4-main.9735255",
+    "@dxos/plugin-graph": "0.8.4-main.9735255",
+    "@dxos/plugin-attention": "0.8.4-main.9735255",
+    "@dxos/plugin-deck": "0.8.4-main.9735255",
+    "@dxos/plugin-map": "0.8.4-main.9735255",
+    "@dxos/plugin-table": "0.8.4-main.9735255",
+    "@dxos/plugin-space": "0.8.4-main.9735255",
+    "@dxos/operation": "0.8.4-main.9735255",
+    "@dxos/plugin-transcription": "0.8.4-main.9735255",
+    "@dxos/react-client": "0.8.4-main.9735255",
+    "@dxos/react-edge-client": "0.8.4-main.9735255",
+    "@dxos/protocols": "0.8.4-main.9735255",
+    "@dxos/react-ui-attention": "0.8.4-main.9735255",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.9735255",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.9735255",
+    "@dxos/react-ui-components": "0.8.4-main.9735255",
+    "@dxos/react-ui-chat": "0.8.4-main.9735255",
+    "@dxos/react-ui-form": "0.8.4-main.9735255",
+    "@dxos/react-ui-editor": "0.8.4-main.9735255",
+    "@dxos/react-ui-graph": "0.8.4-main.9735255",
+    "@dxos/react-ui-list": "0.8.4-main.9735255",
+    "@dxos/react-ui-markdown": "0.8.4-main.9735255",
+    "@dxos/react-ui-menu": "0.8.4-main.9735255",
+    "@dxos/react-ui-mosaic": "0.8.4-main.9735255",
+    "@dxos/react-ui-searchlist": "0.8.4-main.9735255",
+    "@dxos/react-ui-sfx": "0.8.4-main.9735255",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.9735255",
+    "@dxos/react-ui-tabs": "0.8.4-main.9735255",
+    "@dxos/react-ui-stack": "0.8.4-main.9735255",
+    "@dxos/schema": "0.8.4-main.9735255",
+    "@dxos/types": "0.8.4-main.9735255",
+    "@dxos/ui": "0.8.4-main.9735255",
+    "@dxos/util": "0.8.4-main.9735255",
+    "@dxos/ui-editor": "0.8.4-main.9735255"
   },
   "devDependencies": {
     "@effect/platform": "0.93.6",
@@ -146,19 +146,19 @@
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/assistant-toolkit": "0.8.4-main.937b3ca",
-    "@dxos/devtools": "0.8.4-main.937b3ca",
-    "@dxos/echo-db": "0.8.4-main.937b3ca",
-    "@dxos/plugin-map": "0.8.4-main.937b3ca",
-    "@dxos/plugin-chess": "0.8.4-main.937b3ca",
-    "@dxos/plugin-table": "0.8.4-main.937b3ca",
-    "@dxos/plugin-testing": "0.8.4-main.937b3ca",
-    "@dxos/random": "0.8.4-main.937b3ca",
-    "@dxos/react-ui": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-menu": "0.8.4-main.937b3ca",
-    "@dxos/storybook-utils": "0.8.4-main.937b3ca",
-    "@dxos/ui-theme": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-table": "0.8.4-main.937b3ca"
+    "@dxos/assistant-toolkit": "0.8.4-main.9735255",
+    "@dxos/devtools": "0.8.4-main.9735255",
+    "@dxos/plugin-chess": "0.8.4-main.9735255",
+    "@dxos/echo-db": "0.8.4-main.9735255",
+    "@dxos/plugin-map": "0.8.4-main.9735255",
+    "@dxos/plugin-table": "0.8.4-main.9735255",
+    "@dxos/plugin-testing": "0.8.4-main.9735255",
+    "@dxos/random": "0.8.4-main.9735255",
+    "@dxos/react-ui": "0.8.4-main.9735255",
+    "@dxos/react-ui-menu": "0.8.4-main.9735255",
+    "@dxos/react-ui-table": "0.8.4-main.9735255",
+    "@dxos/storybook-utils": "0.8.4-main.9735255",
+    "@dxos/ui-theme": "0.8.4-main.9735255"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.4.6",
@@ -166,8 +166,8 @@
     "effect": "3.19.11",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.937b3ca",
-    "@dxos/react-ui": "0.8.4-main.937b3ca"
+    "@dxos/react-ui": "0.8.4-main.9735255",
+    "@dxos/ui-theme": "0.8.4-main.9735255"
   },
   "publishConfig": {
     "access": "public"

package/src/components/ChatContainer.tsx

@@ -44,7 +44,7 @@ export const ChatContainer = forwardRef<HTMLDivElement, ChatContainerProps>((pro
   }
 
   return (
-    <Layout.Main role={role} ref={forwardedRef}>
+    <Layout.Main toolbar role={role} ref={forwardedRef}>
       <Chat.Root db={space?.db} chat={chat} processor={processor} onEvent={onEvent}>
         <Chat.Toolbar companionTo={companionTo} />
         <Chat.Viewport classNames='container-max-width'>

package/src/components/ChatThread/sync.test.ts

@@ -7,6 +7,7 @@ import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import { Obj } from '@dxos/echo';
+import { type Mutable } from '@dxos/echo/internal';
 import { type ContentBlock } from '@dxos/types';
 
 import { createMessage } from '../../testing';
@@ -78,7 +79,7 @@ describe('reducers', () => {
       expect(doc.content).toEqual(['<prompt>Hello</prompt>', 'Hi there!'].join('\n'));
 
       Obj.change(messages[1], (m) => {
-        const block = m.blocks[0] as ContentBlock.Text;
+        const block = m.blocks[0] as Mutable<ContentBlock.Text>;
         block.text = 'Hi there! How are you?';
         block.pending = false;
       });

package/dist/types/src/components/ChatThread/reducers.d.ts

@@ -1,40 +0,0 @@
-import { type Message } from '@dxos/types';
-type Reducer<R, I> = (acc: R, value: I, idx: number) => R;
-/**
- * Reducer that collapses related message blocks into single messages.
- * For example, combines tool request/response pairs into a single message.
- *
- * Typical order:
- * - message 0
- *  - text
- * - message 1
- *  - text
- *  - toolCall
- *  - summary
- * - message 2
- *  - toolResult
- * - message 3
- *  - text
- *  - summary
- *
- * Coverts to:
- * - message 0
- *  - text
- * - message 1
- *  - text
- * - message 2
- *  - toolCall
- *  - toolResult
- *  - summary
- * - message 3
- *  - text
- *  - summary
- */
-export declare const reduceMessages: Reducer<{
-    messages: Message.Message[];
-    current?: Message.Message;
-    toolBlock?: boolean;
-    assistantMessages?: Message.Message[];
-}, Message.Message>;
-export {};
-//# sourceMappingURL=reducers.d.ts.map

package/dist/types/src/components/ChatThread/reducers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"reducers.d.ts","sourceRoot":"","sources":["../../../../../src/components/ChatThread/reducers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE9D,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,cAAc,EAAE,OAAO,CAClC;IACE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;CACvC,EACD,OAAO,CAAC,OAAO,CA+DhB,CAAC"}

package/src/components/ChatThread/reducers.ts

@@ -1,151 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type ContentBlock, type Message } from '@dxos/types';
-
-type Reducer<R, I> = (acc: R, value: I, idx: number) => R;
-
-/**
- * Reducer that collapses related message blocks into single messages.
- * For example, combines tool request/response pairs into a single message.
- *
- * Typical order:
- * - message 0
- *  - text
- * - message 1
- *  - text
- *  - toolCall
- *  - summary
- * - message 2
- *  - toolResult
- * - message 3
- *  - text
- *  - summary
- *
- * Coverts to:
- * - message 0
- *  - text
- * - message 1
- *  - text
- * - message 2
- *  - toolCall
- *  - toolResult
- *  - summary
- * - message 3
- *  - text
- *  - summary
- */
-export const reduceMessages: Reducer<
-  {
-    messages: Message.Message[];
-    current?: Message.Message;
-    toolBlock?: boolean;
-    assistantMessages?: Message.Message[];
-  },
-  Message.Message
-> = ({ messages, current, toolBlock, assistantMessages = [] }, message) => {
-  // Treat tool calls as assistant messages.
-  let assistant = message?.sender.role === 'assistant';
-  let i = 0;
-  for (const block of message.blocks) {
-    switch (block._tag) {
-      // TODO(burdon): Preserve call tool title.
-      case 'toolCall': {
-        assistant = true;
-        if (!toolBlock) {
-          current = {
-            ...message,
-            id: [message.id, i++].join('_'),
-            blocks: [block],
-          };
-          messages.push(current);
-          toolBlock = true;
-        } else {
-          current!.blocks.push(block);
-        }
-        break;
-      }
-
-      case 'toolResult': {
-        assistant = true;
-        if (toolBlock) {
-          current!.blocks.push(block);
-        }
-        break;
-      }
-
-      case 'summary': {
-        assistant = true;
-        if (toolBlock) {
-          current!.blocks.push(block);
-        } else {
-          const summary = reduceSummary([...assistantMessages, message]);
-          current!.blocks.push(summary);
-        }
-        break;
-      }
-
-      default: {
-        assistant = message.sender.role === 'assistant';
-        current = {
-          ...message,
-          id: [message.id, i++].join('_'),
-          blocks: [block],
-        };
-        messages.push(current);
-        toolBlock = false;
-        break;
-      }
-    }
-  }
-
-  return {
-    messages,
-    current,
-    toolBlock,
-    assistantMessages: assistant ? [...assistantMessages, message] : undefined,
-  };
-};
-
-/**
- * Accumulate token counts from all summary blocks in pending messages.
- */
-const reduceSummary = (messages: Message.Message[]): ContentBlock.Summary => {
-  let start: number | undefined;
-  return messages.reduce<ContentBlock.Summary>(
-    (acc, msg) => {
-      const time = new Date(msg.created).getTime();
-      if (!start) {
-        start = time;
-      }
-      msg.blocks.forEach((block) => {
-        switch (block._tag) {
-          case 'toolCall': {
-            acc.toolCalls = (acc.toolCalls ?? 0) + 1;
-            break;
-          }
-          case 'summary': {
-            acc.model = block.model;
-            if (block.usage) {
-              acc.message = block.message;
-              acc.usage = {
-                inputTokens: (acc.usage?.inputTokens ?? 0) + (block.usage.inputTokens ?? 0),
-                outputTokens: (acc.usage?.outputTokens ?? 0) + (block.usage.outputTokens ?? 0),
-                totalTokens: (acc.usage?.totalTokens ?? 0) + (block.usage.totalTokens ?? 0),
-              };
-              acc.duration = time - (start ?? time);
-            }
-            break;
-          }
-        }
-      });
-
-      return acc;
-    },
-    {
-      _tag: 'summary',
-      duration: 0,
-    } satisfies ContentBlock.Summary,
-  );
-};