@dxos/plugin-assistant 0.7.5-staging.e6154f3 → 0.8.1-main.ae460ac

package/dist/types/src/components/TemplateEditor/TemplateForm.d.ts

@@ -1,4 +1,4 @@
-import { type Schema as S } from '@effect/schema';
+import { type Schema as S } from 'effect';
 import { type TemplateType } from '../../types';
 export type TemplateFormProps = {
     template: TemplateType;

package/dist/types/src/components/TemplateEditor/TemplateForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateForm.d.ts","sourceRoot":"","sources":["../../../../../src/components/TemplateEditor/TemplateForm.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,IAAI,CAAC,EAAE,MAAM,gBAAgB,CAAC;AASlD,OAAO,EAAyC,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,YAAY,kCAA0C,iBAAiB,4CAiFnF,CAAC;AAqCF,eAAO,MAAM,SAAS,QAAqB,CAAC"}
+{"version":3,"file":"TemplateForm.d.ts","sourceRoot":"","sources":["../../../../../src/components/TemplateEditor/TemplateForm.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAS1C,OAAO,EAAyC,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,YAAY,kCAA0C,iBAAiB,4CAiFnF,CAAC;AAqCF,eAAO,MAAM,SAAS,QAAqB,CAAC"}

package/dist/types/src/hooks/processor.d.ts

@@ -1,7 +1,7 @@
 import { type Signal } from '@preact/signals-core';
 import { type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { type Tool, Message } from '@dxos/artifact';
-import { type GenerateRequest, type AIService } from '@dxos/assistant';
+import { type GenerateRequest, type AIServiceClient } from '@dxos/assistant';
 import { type Space } from '@dxos/react-client/echo';
 declare global {
     interface ToolContextExtensions {
@@ -21,7 +21,7 @@ export type ChatProcessorOptions = Pick<GenerateRequest, 'model' | 'systemPrompt
  * Supports cancellation of in-progress requests.
  */
 export declare class ChatProcessor {
-    private readonly _service;
+    private readonly _ai;
     private _tools?;
     private readonly _extensions?;
     private readonly _options;
@@ -50,7 +50,7 @@ export declare class ChatProcessor {
      * @reactive
      */
     readonly messages: Signal<Message[]>;
-    constructor(_service: AIService, _tools?: Tool[] | undefined, _extensions?: ToolContextExtensions | undefined, _options?: ChatProcessorOptions);
+    constructor(_ai: AIServiceClient, _tools?: Tool[] | undefined, _extensions?: ToolContextExtensions | undefined, _options?: ChatProcessorOptions);
     get tools(): Tool[] | undefined;
     /**
      * Update tools.

package/dist/types/src/hooks/processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../../../src/hooks/processor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,KAAK,IAAI,EAAE,OAAO,EAA4B,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAGL,KAAK,eAAe,EAIpB,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,uBAAuB,CAAC;KACpC;CACF;AAED,KAAK,cAAc,GAAG;IACpB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,cAAc,CAAC,CAAC;AAOnF;;;;;GAKG;AACH,qBAAa,aAAa;IA8CtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhD3B,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAE1D,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8D;IAErF,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;;OAGG;IACH,SAAgB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAmD;IAE7F;;;OAGG;IACH,SAAgB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,CAAqB;IAErE;;;OAGG;IACH,SAAgB,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAWxC;gBAGgB,QAAQ,EAAE,SAAS,EAC5B,MAAM,CAAC,EAAE,IAAI,EAAE,YAAA,EACN,WAAW,CAAC,EAAE,qBAAqB,YAAA,EACnC,QAAQ,GAAE,oBAAqC;IAkBlE,IAAI,KAAK,uBAER;IAED;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE;IAItB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAiBhF;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAMpB,MAAM;IAWpB;;;OAGG;YACW,QAAQ;CAwDvB"}
+{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../../../src/hooks/processor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,KAAK,IAAI,EAAE,OAAO,EAA4B,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAGL,KAAK,eAAe,EAIpB,KAAK,eAAe,EACrB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,uBAAuB,CAAC;KACpC;CACF;AAED,KAAK,cAAc,GAAG;IACpB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,cAAc,CAAC,CAAC;AAOnF;;;;;GAKG;AACH,qBAAa,aAAa;IA8CtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhD3B,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAE1D,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8D;IAErF,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;;OAGG;IACH,SAAgB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAmD;IAE7F;;;OAGG;IACH,SAAgB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,CAAqB;IAErE;;;OAGG;IACH,SAAgB,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAWxC;gBAGgB,GAAG,EAAE,eAAe,EAC7B,MAAM,CAAC,EAAE,IAAI,EAAE,YAAA,EACN,WAAW,CAAC,EAAE,qBAAqB,YAAA,EACnC,QAAQ,GAAE,oBAAqC;IAkBlE,IAAI,KAAK,uBAER;IAED;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE;IAItB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAiBhF;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAMpB,MAAM;IAWpB;;;OAGG;YACW,QAAQ;CAwDvB"}

package/dist/types/src/hooks/useMessageQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMessageQueue.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useMessageQueue.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,eAAe,UAAW,UAAU;;;;eAUs0H,CAAC;;;mBAAsF,CAAC;;eAA+C,CAAC;;mBAAgE,CAAC;;;eAAqE,CAAC;UAAiC,CAAC;;cAA2D,CAAC;;;;;;eAAyI,CAAC;;;;;;eAA4I,CAAC;;;;eAAuH,CAAC;;;;;cADlnJ,CAAC"}
+{"version":3,"file":"useMessageQueue.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useMessageQueue.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,eAAe,UAAW,UAAU;;;;eAU8zH,CAAC;;;mBAAsF,CAAC;;eAA+C,CAAC;;mBAAgE,CAAC;;;eAAqE,CAAC;UAAiC,CAAC;;cAA2D,CAAC;;;;;;eAAyI,CAAC;;;;;;eAA4I,CAAC;;;;eAAuH,CAAC;;;;;cAD1mJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.7.5-staging.e6154f3",
+  "version": "0.8.1-main.ae460ac",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,55 +39,54 @@
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.1",
-    "@effect/schema": "^0.75.5",
     "@lezer/highlight": "^1.2.1",
     "@preact/signals-core": "^1.6.0",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
     "jsonpointer": "^5.0.1",
     "lodash.get": "^4.4.2",
     "unified": "^11.0.0",
-    "@dxos/app-framework": "0.7.5-staging.e6154f3",
-    "@dxos/artifact": "0.7.5-staging.e6154f3",
-    "@dxos/assistant": "0.7.5-staging.e6154f3",
-    "@dxos/async": "0.7.5-staging.e6154f3",
-    "@dxos/compute": "0.7.5-staging.e6154f3",
-    "@dxos/client": "0.7.5-staging.e6154f3",
-    "@dxos/context": "0.7.5-staging.e6154f3",
-    "@dxos/conductor": "0.7.5-staging.e6154f3",
-    "@dxos/echo-db": "0.7.5-staging.e6154f3",
-    "@dxos/echo-schema": "0.7.5-staging.e6154f3",
-    "@dxos/edge-client": "0.7.5-staging.e6154f3",
-    "@dxos/invariant": "0.7.5-staging.e6154f3",
-    "@dxos/functions": "0.7.5-staging.e6154f3",
-    "@dxos/keys": "0.7.5-staging.e6154f3",
-    "@dxos/live-object": "0.7.5-staging.e6154f3",
-    "@dxos/local-storage": "0.7.5-staging.e6154f3",
-    "@dxos/log": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-deck": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-graph": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-client": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-inbox": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-markdown": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-space": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-script": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-sketch": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-stack": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-transcription": "0.7.5-staging.e6154f3",
-    "@dxos/react-client": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-wnfs": "0.7.5-staging.e6154f3",
-    "@dxos/react-edge-client": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-canvas-compute": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-canvas-editor": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-components": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-editor": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-dnd": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-list": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-sfx": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-stack": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-form": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-syntax-highlighter": "0.7.5-staging.e6154f3",
-    "@dxos/util": "0.7.5-staging.e6154f3",
-    "@dxos/schema": "0.7.5-staging.e6154f3"
+    "@dxos/artifact": "0.8.1-main.ae460ac",
+    "@dxos/app-framework": "0.8.1-main.ae460ac",
+    "@dxos/assistant": "0.8.1-main.ae460ac",
+    "@dxos/async": "0.8.1-main.ae460ac",
+    "@dxos/client": "0.8.1-main.ae460ac",
+    "@dxos/conductor": "0.8.1-main.ae460ac",
+    "@dxos/compute": "0.8.1-main.ae460ac",
+    "@dxos/context": "0.8.1-main.ae460ac",
+    "@dxos/echo-db": "0.8.1-main.ae460ac",
+    "@dxos/echo-schema": "0.8.1-main.ae460ac",
+    "@dxos/edge-client": "0.8.1-main.ae460ac",
+    "@dxos/keys": "0.8.1-main.ae460ac",
+    "@dxos/invariant": "0.8.1-main.ae460ac",
+    "@dxos/functions": "0.8.1-main.ae460ac",
+    "@dxos/live-object": "0.8.1-main.ae460ac",
+    "@dxos/log": "0.8.1-main.ae460ac",
+    "@dxos/plugin-client": "0.8.1-main.ae460ac",
+    "@dxos/local-storage": "0.8.1-main.ae460ac",
+    "@dxos/plugin-deck": "0.8.1-main.ae460ac",
+    "@dxos/plugin-graph": "0.8.1-main.ae460ac",
+    "@dxos/plugin-inbox": "0.8.1-main.ae460ac",
+    "@dxos/plugin-markdown": "0.8.1-main.ae460ac",
+    "@dxos/plugin-sketch": "0.8.1-main.ae460ac",
+    "@dxos/plugin-space": "0.8.1-main.ae460ac",
+    "@dxos/plugin-stack": "0.8.1-main.ae460ac",
+    "@dxos/plugin-wnfs": "0.8.1-main.ae460ac",
+    "@dxos/plugin-transcription": "0.8.1-main.ae460ac",
+    "@dxos/react-edge-client": "0.8.1-main.ae460ac",
+    "@dxos/plugin-script": "0.8.1-main.ae460ac",
+    "@dxos/react-client": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-canvas-compute": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-canvas-editor": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-dnd": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-list": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-form": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-components": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-sfx": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-stack": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-editor": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-syntax-highlighter": "0.8.1-main.ae460ac",
+    "@dxos/util": "0.8.1-main.ae460ac",
+    "@dxos/schema": "0.8.1-main.ae460ac"
   },
   "devDependencies": {
     "@types/lodash.get": "^4.4.7",
@@ -97,22 +96,22 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.7.5-staging.e6154f3",
-    "@dxos/echo-db": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-chess": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-inbox": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-map": "0.7.5-staging.e6154f3",
-    "@dxos/plugin-table": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui": "0.7.5-staging.e6154f3",
-    "@dxos/random": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-theme": "0.7.5-staging.e6154f3",
-    "@dxos/storybook-utils": "0.7.5-staging.e6154f3"
+    "@dxos/echo-db": "0.8.1-main.ae460ac",
+    "@dxos/artifact-testing": "0.8.1-main.ae460ac",
+    "@dxos/plugin-inbox": "0.8.1-main.ae460ac",
+    "@dxos/plugin-chess": "0.8.1-main.ae460ac",
+    "@dxos/plugin-map": "0.8.1-main.ae460ac",
+    "@dxos/plugin-table": "0.8.1-main.ae460ac",
+    "@dxos/random": "0.8.1-main.ae460ac",
+    "@dxos/react-ui": "0.8.1-main.ae460ac",
+    "@dxos/storybook-utils": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-theme": "0.8.1-main.ae460ac"
   },
   "peerDependencies": {
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.5-staging.e6154f3",
-    "@dxos/react-ui-theme": "0.7.5-staging.e6154f3"
+    "@dxos/react-ui": "0.8.1-main.ae460ac",
+    "@dxos/react-ui-theme": "0.8.1-main.ae460ac"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/ai-client.ts

@@ -3,7 +3,8 @@
 //
 
 import { contributes, type PluginsContext } from '@dxos/app-framework';
-import { AIServiceClientImpl } from '@dxos/assistant';
+import { AIServiceEdgeClient } from '@dxos/assistant';
+import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { AssistantCapabilities } from './capabilities';
@@ -14,6 +15,8 @@ const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
 export default (context: PluginsContext) => {
   const client = context.requestCapability(ClientCapabilities.Client);
   const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;
-  const aiClient = new AIServiceClientImpl({ endpoint });
-  return contributes(AssistantCapabilities.AiClient, aiClient);
+  // TODO(burdon): Use prefs.
+  const ai = new AIServiceEdgeClient({ endpoint });
+  log.info('ai', { endpoint, context });
+  return contributes(AssistantCapabilities.AiClient, ai);
 };

package/src/capabilities/capabilities.ts

@@ -3,10 +3,10 @@
 //
 
 import { defineCapability } from '@dxos/app-framework';
-import { type AIServiceClientImpl } from '@dxos/assistant';
+import { type AIServiceClient } from '@dxos/assistant';
 
 import { ASSISTANT_PLUGIN } from '../meta';
 
 export namespace AssistantCapabilities {
-  export const AiClient = defineCapability<AIServiceClientImpl>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
+  export const AiClient = defineCapability<AIServiceClient>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
 }

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Schema as S } from '@effect/schema';
+import { type Schema as S } from 'effect';
 import React, { Fragment, useEffect } from 'react';
 
 import { Input, Select, useTranslation } from '@dxos/react-ui';

package/src/components/Thread/ThreadContainer.stories.tsx

@@ -19,7 +19,7 @@ import {
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Message, type Tool } from '@dxos/artifact';
 import { genericTools, localServiceEndpoints, type IsObject } from '@dxos/artifact-testing';
-import { AIServiceClientImpl } from '@dxos/assistant';
+import { AIServiceEdgeClient } from '@dxos/assistant';
 import { createStatic, ObjectId } from '@dxos/echo-schema';
 import { EdgeHttpClient } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
@@ -59,7 +59,7 @@ const Render = ({ items: _items, prompts = [], ...props }: RenderProps) => {
     [genericTools, artifactDefinitions],
   );
 
-  const [aiClient] = useState(() => new AIServiceClientImpl({ endpoint: endpoints.ai }));
+  const [aiClient] = useState(() => new AIServiceEdgeClient({ endpoint: endpoints.ai }));
   const [edgeClient] = useState(() => new EdgeHttpClient(endpoints.edge));
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 

package/src/hooks/processor.ts

@@ -13,7 +13,7 @@ import {
   type GenerationStream,
   MixedStreamParser,
   DEFAULT_LLM_MODEL,
-  type AIService,
+  type AIServiceClient,
 } from '@dxos/assistant';
 import { createStatic } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
@@ -92,7 +92,7 @@ export class ChatProcessor {
   });
 
   constructor(
-    private readonly _service: AIService,
+    private readonly _ai: AIServiceClient,
     private _tools?: Tool[],
     private readonly _extensions?: ToolContextExtensions,
     private readonly _options: ChatProcessorOptions = defaultOptions,
@@ -180,7 +180,7 @@ export class ChatProcessor {
         });
 
         // Open request stream.
-        this._stream = await this._service.exec({
+        this._stream = await this._ai.exec({
           ...this._options,
           // TODO(burdon): Rename messages or separate history/message.
           history: [...this._history, ...this._pending.value],

package/src/tools/openapi.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { AIServiceClientImpl } from '@dxos/assistant';
+import { AIServiceEdgeClient } from '@dxos/assistant';
 import { AI_SERVICE_ENDPOINT } from '@dxos/assistant/testing';
 import { log } from '@dxos/log';
 
@@ -72,7 +72,7 @@ describe.skip('openapi', () => {
         authorization: AMADEUS_AUTH,
       });
 
-      const client = new AIServiceClientImpl({
+      const client = new AIServiceEdgeClient({
         endpoint: AI_SERVICE_ENDPOINT.LOCAL,
       });
       const processor = new ChatProcessor(client, tools);
@@ -87,7 +87,7 @@ describe.skip('openapi', () => {
     test('amadeus hotel name autocomplete', { timeout: 60_000 }, async () => {
       const tools = await createToolsFromApi(HOTEL_NAME_AUTOCOMPLETE_API, { authorization: AMADEUS_AUTH });
 
-      const client = new AIServiceClientImpl({
+      const client = new AIServiceEdgeClient({
         endpoint: AI_SERVICE_ENDPOINT.LOCAL,
       });
       const processor = new ChatProcessor(client, tools);
@@ -102,7 +102,7 @@ describe.skip('openapi', () => {
         instructions: WEATHER_INSTRUCTIONS,
       });
 
-      const client = new AIServiceClientImpl({
+      const client = new AIServiceEdgeClient({
         endpoint: AI_SERVICE_ENDPOINT.LOCAL,
       });
       const processor = new ChatProcessor(client, tools);

package/dist/lib/browser/ai-client-RTCGRKZE.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/ai-client.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { contributes, type PluginsContext } from '@dxos/app-framework';\nimport { AIServiceClientImpl } from '@dxos/assistant';\nimport { ClientCapabilities } from '@dxos/plugin-client';\n\nimport { AssistantCapabilities } from './capabilities';\n\n// TODO(wittjosiah): Factor out.\nconst DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';\n\nexport default (context: PluginsContext) => {\n  const client = context.requestCapability(ClientCapabilities.Client);\n  const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;\n  const aiClient = new AIServiceClientImpl({ endpoint });\n  return contributes(AssistantCapabilities.AiClient, aiClient);\n};\n"],
-  "mappings": ";;;;;;AAIA,SAASA,mBAAwC;AACjD,SAASC,2BAA2B;AACpC,SAASC,0BAA0B;AAKnC,IAAMC,yBAAyB;AAE/B,IAAA,oBAAe,CAACC,YAAAA;AACd,QAAMC,SAASD,QAAQE,kBAAkBC,mBAAmBC,MAAM;AAClE,QAAMC,WAAWJ,OAAOK,OAAOC,OAAOC,SAASC,UAAUC,IAAIC,UAAUZ;AACvE,QAAMa,WAAW,IAAIC,oBAAoB;IAAER;EAAS,CAAA;AACpD,SAAOS,YAAYC,sBAAsBC,UAAUJ,QAAAA;AACrD;",
-  "names": ["contributes", "AIServiceClientImpl", "ClientCapabilities", "DEFAULT_AI_SERVICE_URL", "context", "client", "requestCapability", "ClientCapabilities", "Client", "endpoint", "config", "values", "runtime", "services", "ai", "server", "aiClient", "AIServiceClientImpl", "contributes", "AssistantCapabilities", "AiClient"]
-}

package/dist/lib/node/ai-client-YANJEPO3.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/ai-client.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { contributes, type PluginsContext } from '@dxos/app-framework';\nimport { AIServiceClientImpl } from '@dxos/assistant';\nimport { ClientCapabilities } from '@dxos/plugin-client';\n\nimport { AssistantCapabilities } from './capabilities';\n\n// TODO(wittjosiah): Factor out.\nconst DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';\n\nexport default (context: PluginsContext) => {\n  const client = context.requestCapability(ClientCapabilities.Client);\n  const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;\n  const aiClient = new AIServiceClientImpl({ endpoint });\n  return contributes(AssistantCapabilities.AiClient, aiClient);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,2BAAiD;AACjD,uBAAoC;AACpC,2BAAmC;AAKnC,IAAMA,yBAAyB;AAE/B,IAAA,oBAAe,CAACC,YAAAA;AACd,QAAMC,SAASD,QAAQE,kBAAkBC,wCAAmBC,MAAM;AAClE,QAAMC,WAAWJ,OAAOK,OAAOC,OAAOC,SAASC,UAAUC,IAAIC,UAAUZ;AACvE,QAAMa,WAAW,IAAIC,qCAAoB;IAAER;EAAS,CAAA;AACpD,aAAOS,kCAAYC,4CAAsBC,UAAUJ,QAAAA;AACrD;",
-  "names": ["DEFAULT_AI_SERVICE_URL", "context", "client", "requestCapability", "ClientCapabilities", "Client", "endpoint", "config", "values", "runtime", "services", "ai", "server", "aiClient", "AIServiceClientImpl", "contributes", "AssistantCapabilities", "AiClient"]
-}

package/dist/lib/node-esm/ai-client-66IBZVCX.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/capabilities/ai-client.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { contributes, type PluginsContext } from '@dxos/app-framework';\nimport { AIServiceClientImpl } from '@dxos/assistant';\nimport { ClientCapabilities } from '@dxos/plugin-client';\n\nimport { AssistantCapabilities } from './capabilities';\n\n// TODO(wittjosiah): Factor out.\nconst DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';\n\nexport default (context: PluginsContext) => {\n  const client = context.requestCapability(ClientCapabilities.Client);\n  const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;\n  const aiClient = new AIServiceClientImpl({ endpoint });\n  return contributes(AssistantCapabilities.AiClient, aiClient);\n};\n"],
-  "mappings": ";;;;;;;AAIA,SAASA,mBAAwC;AACjD,SAASC,2BAA2B;AACpC,SAASC,0BAA0B;AAKnC,IAAMC,yBAAyB;AAE/B,IAAA,oBAAe,CAACC,YAAAA;AACd,QAAMC,SAASD,QAAQE,kBAAkBC,mBAAmBC,MAAM;AAClE,QAAMC,WAAWJ,OAAOK,OAAOC,OAAOC,SAASC,UAAUC,IAAIC,UAAUZ;AACvE,QAAMa,WAAW,IAAIC,oBAAoB;IAAER;EAAS,CAAA;AACpD,SAAOS,YAAYC,sBAAsBC,UAAUJ,QAAAA;AACrD;",
-  "names": ["contributes", "AIServiceClientImpl", "ClientCapabilities", "DEFAULT_AI_SERVICE_URL", "context", "client", "requestCapability", "ClientCapabilities", "Client", "endpoint", "config", "values", "runtime", "services", "ai", "server", "aiClient", "AIServiceClientImpl", "contributes", "AssistantCapabilities", "AiClient"]
-}