@dxos/app-framework 0.8.4-main.5acf9ea → 0.8.4-main.5ea62a8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.8.4-main.5acf9ea",
+  "version": "0.8.4-main.5ea62a8",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,22 +10,22 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts"
+      "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs",
-      "source": "./src/testing/index.ts"
+      "node": "./dist/lib/node-esm/testing/index.mjs"
     },
     "./worker": {
+      "source": "./src/worker.ts",
       "types": "./dist/types/src/worker.d.ts",
       "browser": "./dist/lib/browser/worker.mjs",
-      "node": "./dist/lib/node-esm/worker.mjs",
-      "source": "./src/worker.ts"
+      "node": "./dist/lib/node-esm/worker.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -40,37 +40,38 @@
     }
   },
   "dependencies": {
+    "@effect/ai": "0.25.2",
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.9.0",
-    "@dxos/ai": "0.8.4-main.5acf9ea",
-    "@dxos/app-graph": "0.8.4-main.5acf9ea",
-    "@dxos/blueprints": "0.8.4-main.5acf9ea",
-    "@dxos/async": "0.8.4-main.5acf9ea",
-    "@dxos/client-protocol": "0.8.4-main.5acf9ea",
-    "@dxos/echo-schema": "0.8.4-main.5acf9ea",
-    "@dxos/debug": "0.8.4-main.5acf9ea",
-    "@dxos/functions": "0.8.4-main.5acf9ea",
-    "@dxos/invariant": "0.8.4-main.5acf9ea",
-    "@dxos/live-object": "0.8.4-main.5acf9ea",
-    "@dxos/keys": "0.8.4-main.5acf9ea",
-    "@dxos/local-storage": "0.8.4-main.5acf9ea",
-    "@dxos/schema": "0.8.4-main.5acf9ea",
-    "@dxos/util": "0.8.4-main.5acf9ea",
-    "@dxos/react-hooks": "0.8.4-main.5acf9ea",
-    "@dxos/log": "0.8.4-main.5acf9ea"
+    "@dxos/ai": "0.8.4-main.5ea62a8",
+    "@dxos/app-graph": "0.8.4-main.5ea62a8",
+    "@dxos/blueprints": "0.8.4-main.5ea62a8",
+    "@dxos/client-protocol": "0.8.4-main.5ea62a8",
+    "@dxos/async": "0.8.4-main.5ea62a8",
+    "@dxos/debug": "0.8.4-main.5ea62a8",
+    "@dxos/echo-schema": "0.8.4-main.5ea62a8",
+    "@dxos/functions": "0.8.4-main.5ea62a8",
+    "@dxos/invariant": "0.8.4-main.5ea62a8",
+    "@dxos/keys": "0.8.4-main.5ea62a8",
+    "@dxos/live-object": "0.8.4-main.5ea62a8",
+    "@dxos/log": "0.8.4-main.5ea62a8",
+    "@dxos/local-storage": "0.8.4-main.5ea62a8",
+    "@dxos/react-hooks": "0.8.4-main.5ea62a8",
+    "@dxos/schema": "0.8.4-main.5ea62a8",
+    "@dxos/util": "0.8.4-main.5ea62a8"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
+    "@effect/platform": "0.90.2",
     "@types/react": "~18.2.0",
-    "effect": "3.17.0",
+    "effect": "3.17.7",
     "react": "~18.2.0",
     "typedoc": "0.28.1",
-    "@dxos/echo-signals": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui": "0.8.4-main.5acf9ea",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5acf9ea",
-    "@dxos/random": "0.8.4-main.5acf9ea",
-    "@dxos/storybook-utils": "0.8.4-main.5acf9ea"
+    "@dxos/echo-signals": "0.8.4-main.5ea62a8",
+    "@dxos/random": "0.8.4-main.5ea62a8",
+    "@dxos/react-ui": "0.8.4-main.5ea62a8",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5ea62a8",
+    "@dxos/storybook-utils": "0.8.4-main.5ea62a8"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",

package/src/App.tsx

@@ -4,14 +4,14 @@
 
 import { RegistryContext } from '@effect-rx/rx-react';
 import { effect } from '@preact/signals-core';
-import React, { useCallback, useEffect, useMemo, useState, type FC, type PropsWithChildren } from 'react';
+import React, { type FC, type PropsWithChildren, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { invariant } from '@dxos/invariant';
 import { live } from '@dxos/live-object';
-import { useDefaultValue } from '@dxos/react-hooks';
+import { useAsyncEffect, useDefaultValue } from '@dxos/react-hooks';
 
 import { Capabilities, Events } from './common';
-import { PluginManager, type PluginManagerOptions, type Plugin } from './core';
+import { type Plugin, PluginManager, type PluginManagerOptions } from './core';
 import { topologicalSort } from './helpers';
 import { ErrorBoundary, PluginManagerProvider, useCapabilities } from './react';
 
@@ -134,16 +134,12 @@ export const useApp = ({
     setupDevtools(manager);
   }, [manager]);
 
-  useEffect(() => {
-    const timeout = setTimeout(async () => {
-      await Promise.all([
-        // TODO(wittjosiah): Factor out such that this could be called per surface role when attempting to render.
-        manager.activate(Events.SetupReactSurface),
-        manager.activate(Events.Startup),
-      ]);
-    });
-
-    return () => clearTimeout(timeout);
+  useAsyncEffect(async () => {
+    await Promise.all([
+      // TODO(wittjosiah): Factor out such that this could be called per surface role when attempting to render.
+      manager.activate(Events.SetupReactSurface),
+      manager.activate(Events.Startup),
+    ]);
   }, [manager]);
 
   return useCallback(
@@ -248,7 +244,15 @@ const App = ({ placeholder: Placeholder, state }: AppProps) => {
 // Default fallback does not use tailwind or theme.
 const DefaultFallback = ({ error }: { error: Error }) => {
   return (
-    <div style={{ margin: '0.5rem', padding: '1rem', overflow: 'hidden', border: '1px solid red' }}>
+    <div
+      style={{
+        margin: '1rem',
+        padding: '1rem',
+        overflow: 'hidden',
+        border: '4px solid teal',
+        borderRadius: '1rem',
+      }}
+    >
       {/* TODO(wittjosiah): Link to docs for replacing default. */}
       <h1 style={{ margin: '0.5rem 0', fontSize: '1.2rem' }}>[ERROR]: {error.message}</h1>
       <pre style={{ overflow: 'auto', fontSize: '1rem', whiteSpace: 'pre-wrap', color: '#888888' }}>{error.stack}</pre>

package/src/common/capabilities.ts

@@ -2,44 +2,74 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type AiTool, type AiToolkit } from '@effect/ai';
 import { type Registry } from '@effect-rx/rx-react';
-import { type Schema } from 'effect';
+import { type Layer, type Schema } from 'effect';
 import { type FC, type PropsWithChildren } from 'react';
 
-import { type ExecutableTool } from '@dxos/ai';
-import { type GraphBuilder, type BuilderExtensions } from '@dxos/app-graph';
-import { type ArtifactDefinition } from '@dxos/blueprints';
+import { type BuilderExtensions, type GraphBuilder } from '@dxos/app-graph';
+import { type Blueprint } from '@dxos/blueprints';
 import { type Space } from '@dxos/client-protocol';
 import { type FunctionDefinition } from '@dxos/functions';
 import { type RootSettingsStore } from '@dxos/local-storage';
 import { type AnchoredTo } from '@dxos/schema';
 
+import { type PluginManager, defineCapability } from '../core';
+import { type AnyIntentResolver, type IntentContext } from '../plugin-intent';
+
 import { type FileInfo } from './file';
 import { type NodeSerializer } from './graph';
 import { type SurfaceDefinition } from './surface';
 import { type Resource } from './translations';
-import { type PluginManager, defineCapability } from '../core';
-import { type AnyIntentResolver, type IntentContext } from '../plugin-intent';
 
+// TODO(burdon): Sort.
 export namespace Capabilities {
+  /**
+   * @category Capability
+   */
   export const Null = defineCapability<null>('dxos.org/app-framework/capability/null');
 
+  /**
+   * @category Capability
+   */
   export const PluginManager = defineCapability<PluginManager>('dxos.org/app-framework/capability/plugin-manager');
 
+  /**
+   * @category Capability
+   */
   export const RxRegistry = defineCapability<Registry.Registry>('dxos.org/app-framework/capability/rx-registry');
 
   export type ReactContext = Readonly<{ id: string; dependsOn?: string[]; context: FC<PropsWithChildren> }>;
+
+  /**
+   * @category Capability
+   */
   export const ReactContext = defineCapability<ReactContext>('dxos.org/app-framework/capability/react-context');
 
   export type ReactRoot = Readonly<{ id: string; root: FC<PropsWithChildren> }>;
+
+  /**
+   * @category Capability
+   */
   export const ReactRoot = defineCapability<ReactRoot>('dxos.org/app-framework/capability/react-root');
 
   export type ReactSurface = SurfaceDefinition | readonly SurfaceDefinition[];
+
+  /**
+   * @category Capability
+   */
   export const ReactSurface = defineCapability<ReactSurface>('dxos.org/app-framework/common/react-surface');
 
   export type IntentResolver = AnyIntentResolver | readonly AnyIntentResolver[];
+
+  /**
+   * @category Capability
+   */
   export const IntentResolver = defineCapability<IntentResolver>('dxos.org/app-framework/capability/intent-resolver');
 
+  /**
+   * @category Capability
+   */
   export const IntentDispatcher = defineCapability<IntentContext>(
     'dxos.org/app-framework/capability/intent-dispatcher',
   );
@@ -66,23 +96,41 @@ export namespace Capabilities {
      */
     scrollIntoView: string | undefined;
   }>;
+
+  /**
+   * @category Capability
+   */
   export const Layout = defineCapability<Layout>('dxos.org/app-framework/capability/layout');
 
-  // TODO(burdon): Why array?
+  /**
+   * @category Capability
+   */
   export const Translations = defineCapability<Readonly<Resource[]>>('dxos.org/app-framework/capability/translations');
 
+  /**
+   * @category Capability
+   */
   export const AppGraph = defineCapability<Readonly<Pick<GraphBuilder, 'graph' | 'explore'>>>(
     'dxos.org/app-framework/capability/app-graph',
   );
 
+  /**
+   * @category Capability
+   */
   export const AppGraphBuilder = defineCapability<BuilderExtensions>(
     'dxos.org/app-framework/capability/app-graph-builder',
   );
 
+  /**
+   * @category Capability
+   */
   export const AppGraphSerializer = defineCapability<NodeSerializer[]>(
     'dxos.org/app-framework/capability/app-graph-serializer',
   );
 
+  /**
+   * @category Capability
+   */
   export const SettingsStore = defineCapability<RootSettingsStore>('dxos.org/app-framework/capability/settings-store');
 
   // TODO(wittjosiah): The generics caused type inference issues for schemas when contributing settings.
@@ -93,26 +141,59 @@ export namespace Capabilities {
     schema: Schema.Schema.All;
     value?: Record<string, any>;
   };
+
+  /**
+   * @category Capability
+   */
   export const Settings = defineCapability<Settings>('dxos.org/app-framework/capability/settings');
 
   export type Metadata = Readonly<{ id: string; metadata: Record<string, any> }>;
+
+  /**
+   * @category Capability
+   */
   export const Metadata = defineCapability<Metadata>('dxos.org/app-framework/capability/metadata');
 
-  export const Tools = defineCapability<ExecutableTool[]>('dxos.org/app-framework/capability/tools');
-  export const ArtifactDefinition = defineCapability<ArtifactDefinition>(
-    'dxos.org/app-framework/capability/artifact-definition',
+  /**
+   * @category Capability
+   */
+  export const Toolkit = defineCapability<AiToolkit.Any>('dxos.org/app-framework/capability/ai-toolkit');
+
+  /**
+   * @category Capability
+   */
+  export const ToolkitHandler = defineCapability<Layer.Layer<AiTool.ToHandler<AiTool.AiTool<any>>, never, never>>(
+    'dxos.org/app-framework/capability/ai-toolkit-handler',
   );
 
+  /**
+   * @category Capability
+   */
+  export const BlueprintDefinition = defineCapability<Blueprint.Blueprint>(
+    'dxos.org/app-framework/capability/blueprint-definition',
+  );
+
+  /**
+   * @category Capability
+   */
   export const Functions = defineCapability<FunctionDefinition<any, any>[]>(
     'dxos.org/app-framework/capability/functions',
   );
 
   export type FileUploader = (file: File, space: Space) => Promise<FileInfo | undefined>;
+
+  /**
+   * @category Capability
+   */
   export const FileUploader = defineCapability<FileUploader>('dxos.org/app-framework/capability/file-uploader');
 
   type AnchorSort = {
     key: string;
     sort: (anchorA: AnchoredTo, anchorB: AnchoredTo) => number;
   };
+
+  /**
+   * @category Capability
+   */
   export const AnchorSort = defineCapability<AnchorSort>('dxos.org/app-framework/capability/anchor-sort');
 }

package/src/common/collaboration.ts

@@ -4,17 +4,14 @@
 
 import { Schema } from 'effect';
 
-import { Expando, Ref } from '@dxos/echo-schema';
+import { DataType } from '@dxos/schema';
 
 export namespace CollaborationActions {
-  export class InsertContent extends Schema.TaggedClass<InsertContent>()('assistant/intent-content', {
+  export class AcceptProposal extends Schema.TaggedClass<AcceptProposal>()('collaboration/accept-proposal', {
     input: Schema.Struct({
-      target: Expando,
-      object: Ref(Expando),
-      at: Schema.optional(Schema.String),
-      label: Schema.String.pipe(Schema.optional),
-    }).annotations({
-      description: 'Enables plugins to inject content blocks or references into a related entity.',
+      subject: Schema.Any,
+      anchor: Schema.String,
+      proposal: DataType.MessageBlock.Proposal,
     }),
     output: Schema.Void,
   }) {}

package/src/common/events.ts

@@ -2,9 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities } from './capabilities';
 import { defineEvent } from '../core';
 
+import { Capabilities } from './capabilities';
+
 export namespace Events {
   /**
    * Fired when the app is started.
@@ -48,6 +49,7 @@ export namespace Events {
   /**
    * Fired to load any newly available artifacts definitions.
    */
+  // TODO(burdon): Rename.
   export const SetupArtifactDefinition = defineEvent('dxos.org/app-framework/event/setup-artifact-definition');
 
   //

package/src/common/index.ts

@@ -6,7 +6,7 @@ export * from './capabilities';
 export * from './collaboration';
 export * from './events';
 export * from './file';
-export type * from './graph';
+export * from './graph';
 export * from './layout';
 export * from './surface';
 export * from './translations';

package/src/common/surface.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type JSX, type ForwardedRef, type PropsWithChildren, type ReactNode } from 'react';
+import { type ForwardedRef, type JSX, type PropsWithChildren, type ReactNode } from 'react';
 
 import { type GuardedType, type MakeOptional, type Position } from '@dxos/util';
 

package/src/core/capabilities.test.ts

@@ -6,7 +6,7 @@ import { Registry } from '@effect-rx/rx-react';
 import { Effect } from 'effect';
 import { describe, expect, it, onTestFinished } from 'vitest';
 
-import { defineCapability, PluginContext } from './capabilities';
+import { PluginContext, defineCapability } from './capabilities';
 
 const defaultOptions = {
   activate: () => Effect.succeed(false),

package/src/core/capabilities.ts

@@ -22,6 +22,10 @@ export type InterfaceDef<T> = {
   identifier: string;
 };
 
+export namespace InterfaceDef {
+  export type Implementation<I extends InterfaceDef<any>> = I extends InterfaceDef<infer T> ? T : never;
+}
+
 /**
  * Helper to define the interface of a capability.
  */
@@ -69,16 +73,17 @@ class CapabilityImpl<T> {
 /**
  * Helper to define the implementation of a capability.
  */
-export const contributes = <T>(
-  interfaceDef: Capability<T>['interface'],
-  implementation: Capability<T>['implementation'],
-  deactivate?: Capability<T>['deactivate'],
-): Capability<T> => {
-  return { interface: interfaceDef, implementation, deactivate } satisfies Capability<T>;
+export const contributes = <I extends InterfaceDef<any>>(
+  interfaceDef: I,
+  implementation: Capability<InterfaceDef.Implementation<I>>['implementation'],
+  deactivate?: Capability<InterfaceDef.Implementation<I>>['deactivate'],
+): Capability<I> => {
+  return { interface: interfaceDef, implementation, deactivate } satisfies Capability<I>;
 };
 
 type LoadCapability<T, U> = () => Promise<{ default: (props: T) => MaybePromise<Capability<U>> }>;
 type LoadCapabilities<T> = () => Promise<{ default: (props: T) => MaybePromise<AnyCapability[]> }>;
+
 // TODO(wittjosiah): Not having the array be `any` causes type errors when using the lazy capability.
 type LazyCapability<T, U> = (props?: T) => Promise<() => Promise<Capability<U> | AnyCapability[]>>;
 

package/src/core/manager.test.ts

@@ -12,11 +12,12 @@ import { registerSignalsRuntime } from '@dxos/echo-signals';
 import { invariant } from '@dxos/invariant';
 import { live } from '@dxos/live-object';
 
-import { contributes, defineCapability, type PluginContext } from './capabilities';
+import { Events } from '../common';
+
+import { type PluginContext, contributes, defineCapability } from './capabilities';
 import { allOf, defineEvent, oneOf } from './events';
 import { PluginManager } from './manager';
-import { definePlugin, defineModule, type Plugin } from './plugin';
-import { Events } from '../common';
+import { type Plugin, defineModule, definePlugin } from './plugin';
 
 registerSignalsRuntime();