@dxos/app-framework 0.7.4 → 0.7.5-main.9cb18ac

package/dist/types/src/plugins/plugin-surface/provides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provides.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/plugin-surface/provides.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAG7C,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE;QACP;;WAEG;QACH,SAAS,EAAE,gBAAgB,CAAC;KAC7B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,kBAAkB,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,sBAAsB,YAAa,MAAM,8CACkD,CAAC;AAEzG,eAAO,MAAM,kBAAkB,YAAa,MAAM,wCAC+C,CAAC"}
+{"version":3,"file":"provides.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/plugin-surface/provides.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,iBAAiB,EAAE,GAAG,kBAAkB,EAAE,CAAC;AAEhG,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE;QACP;;WAEG;QACH,WAAW,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,kBAAkB,CAAC;KAC3D,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,sBAAsB,YAAa,MAAM,8CACgD,CAAC;AAEvG,eAAO,MAAM,kBAAkB,YAAa,MAAM,wCACiD,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"version":"5.7.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.7.4",
+  "version": "0.7.5-main.9cb18ac",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,18 +22,20 @@
     "@effect/schema": "^0.75.5",
     "@phosphor-icons/react": "^2.1.5",
     "@preact/signals-core": "^1.6.0",
+    "effect": "^3.12.1",
     "zod": "^3.22.4",
-    "@dxos/app-graph": "0.7.4",
-    "@dxos/client-protocol": "0.7.4",
-    "@dxos/async": "0.7.4",
-    "@dxos/context": "0.7.4",
-    "@dxos/debug": "0.7.4",
-    "@dxos/echo-schema": "0.7.4",
-    "@dxos/invariant": "0.7.4",
-    "@dxos/live-object": "0.7.4",
-    "@dxos/local-storage": "0.7.4",
-    "@dxos/log": "0.7.4",
-    "@dxos/util": "0.7.4"
+    "@dxos/app-graph": "0.7.5-main.9cb18ac",
+    "@dxos/async": "0.7.5-main.9cb18ac",
+    "@dxos/client-protocol": "0.7.5-main.9cb18ac",
+    "@dxos/context": "0.7.5-main.9cb18ac",
+    "@dxos/debug": "0.7.5-main.9cb18ac",
+    "@dxos/invariant": "0.7.5-main.9cb18ac",
+    "@dxos/echo-schema": "0.7.5-main.9cb18ac",
+    "@dxos/live-object": "0.7.5-main.9cb18ac",
+    "@dxos/local-storage": "0.7.5-main.9cb18ac",
+    "@dxos/react-hooks": "0.7.5-main.9cb18ac",
+    "@dxos/log": "0.7.5-main.9cb18ac",
+    "@dxos/util": "0.7.5-main.9cb18ac"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",

package/src/plugins/common/layout.ts

@@ -2,29 +2,29 @@
 // Copyright 2023 DXOS.org
 //
 
-import { z } from 'zod';
+import { S } from '@dxos/echo-schema';
 
 import { type Plugin } from '../plugin-host';
-import { type IntentData } from '../plugin-intent';
+import { Label } from '../plugin-intent';
 
 //
 // Provides
 //
 
-export const Toast = z.object({
-  id: z.string(),
-  title: z.string().optional(),
-  description: z.string().optional(),
-  // TODO(wittjosiah): `icon` should be string to be parsed by an `Icon` component.
-  icon: z.any().optional(),
-  duration: z.number().optional(),
-  closeLabel: z.string().optional(),
-  actionLabel: z.string().optional(),
-  actionAlt: z.string().optional(),
-  onAction: z.function().optional(),
+export const Toast = S.Struct({
+  id: S.String,
+  title: S.optional(Label),
+  description: S.optional(Label),
+  icon: S.optional(S.String),
+  duration: S.optional(S.Number),
+  closeLabel: S.optional(Label),
+  actionLabel: S.optional(Label),
+  actionAlt: S.optional(Label),
+  // TODO(wittjosiah): Make class with customizable method?
+  onAction: S.optional(S.Any),
 });
 
-export type Toast = z.infer<typeof Toast>;
+export type Toast = S.Schema.Type<typeof Toast>;
 
 /**
  * Basic state provided by a layout plugin.
@@ -34,43 +34,47 @@ export type Toast = z.infer<typeof Toast>;
  * For other landmarks, such as toasts, rendering them in the layout prevents them from unmounting when navigating.
  */
 
-const LayoutMode = z.union([z.literal('deck'), z.literal('solo'), z.literal('fullscreen')]);
-export const isLayoutMode = (value: any): value is LayoutMode => LayoutMode.safeParse(value).success;
-export type LayoutMode = z.infer<typeof LayoutMode>;
-
-// TODO(wittjosiah): Replace Zod w/ Effect Schema to align with ECHO.
-export const Layout = z.object({
-  layoutMode: z.union([z.literal('deck'), z.literal('solo'), z.literal('fullscreen')]),
-
-  sidebarOpen: z.boolean(),
-  complementarySidebarOpen: z.boolean(),
-  /**
-   * @deprecated
-   */
-  complementarySidebarContent: z
-    .any()
-    .optional()
-    .describe('DEPRECATED. Data to be passed to the complementary sidebar Surface.'),
-
-  dialogOpen: z.boolean(),
-  dialogContent: z.any().optional().describe('Data to be passed to the dialog Surface.'),
-  // TODO(wittjosiah): Custom properties?
-  dialogBlockAlign: z.union([z.literal('start'), z.literal('center')]).optional(),
-  dialogType: z.union([z.literal('default'), z.literal('alert')]).optional(),
-
-  popoverOpen: z.boolean(),
-  popoverContent: z.any().optional().describe('Data to be passed to the popover Surface.'),
-  popoverAnchorId: z.string().optional(),
-
-  toasts: z.array(Toast),
-
-  scrollIntoView: z
-    .string()
-    .optional()
-    .describe('The identifier of a component to scroll into view when it is mounted.'),
-});
+const LayoutMode = S.Union(S.Literal('deck'), S.Literal('solo'), S.Literal('fullscreen'));
+export const isLayoutMode = (value: any): value is LayoutMode => S.is(LayoutMode)(value);
+export type LayoutMode = S.Schema.Type<typeof LayoutMode>;
+
+export const Layout = S.mutable(
+  S.Struct({
+    layoutMode: LayoutMode,
+
+    sidebarOpen: S.Boolean,
+    complementarySidebarOpen: S.Boolean,
+    /**
+     * @deprecated Data to be passed to the complementary sidebar Surface.
+     */
+    complementarySidebarContent: S.optional(S.Any),
 
-export type Layout = z.infer<typeof Layout>;
+    dialogOpen: S.Boolean,
+    /**
+     * Data to be passed to the dialog Surface.
+     */
+    dialogContent: S.optional(S.Any),
+    // TODO(wittjosiah): Custom properties?
+    dialogBlockAlign: S.optional(S.Literal('start', 'center')),
+    dialogType: S.optional(S.Literal('default', 'alert')),
+
+    popoverOpen: S.Boolean,
+    /**
+     * Data to be passed to the popover Surface.
+     */
+    popoverContent: S.optional(S.Any),
+    popoverAnchorId: S.optional(S.String),
+
+    toasts: S.mutable(S.Array(Toast)),
+
+    /**
+     * The identifier of a component to scroll into view when it is mounted.
+     */
+    scrollIntoView: S.optional(S.String),
+  }),
+);
+
+export type Layout = S.Schema.Type<typeof Layout>;
 
 /**
  * Provides for a plugin that can manage the app layout.
@@ -83,7 +87,7 @@ export type LayoutProvides = {
  * Type guard for layout plugins.
  */
 export const parseLayoutPlugin = (plugin: Plugin) => {
-  const { success } = Layout.safeParse((plugin.provides as any).layout);
+  const success = S.is(Layout)((plugin.provides as any).layout);
   return success ? (plugin as Plugin<LayoutProvides>) : undefined;
 };
 
@@ -91,65 +95,79 @@ export const parseLayoutPlugin = (plugin: Plugin) => {
 // Intents
 //
 
-const LAYOUT_PLUGIN = 'dxos.org/plugin/layout';
-
-const LAYOUT_ACTION = `${LAYOUT_PLUGIN}/action`;
-
-export enum LayoutAction {
-  SET_LAYOUT = `${LAYOUT_ACTION}/set-layout`,
-  SET_LAYOUT_MODE = `${LAYOUT_ACTION}/set-layout-mode`,
-  SCROLL_INTO_VIEW = `${LAYOUT_ACTION}/scroll-into-view`,
-  UPDATE_PLANK_SIZE = `${LAYOUT_ACTION}/update-plank-size`,
-}
+export const LAYOUT_PLUGIN = 'dxos.org/plugin/layout';
+export const LAYOUT_ACTION = `${LAYOUT_PLUGIN}/action`;
 
 /**
  * Expected payload for layout actions.
  */
 export namespace LayoutAction {
-  export type SetLayoutMode = IntentData<{
-    layoutMode?: LayoutMode;
-    revert?: boolean;
-  }>;
-
-  export type SetLayout = IntentData<{
-    /**
-     * Element to set the state of.
-     */
-    element: 'fullscreen' | 'sidebar' | 'complementary' | 'dialog' | 'popover' | 'toast';
-
-    /**
-     * Whether the element is on or off.
-     *
-     * If omitted, the element's state will be toggled or set based on other provided data.
-     * For example, if `component` is provided, the state will be set to `true`.
-     */
-    state?: boolean;
-
-    /**
-     * Component to render in the dialog or popover.
-     */
-    component?: string;
-
-    /**
-     * Data to be passed to the dialog or popover Surface.
-     */
-    subject?: any;
-
-    /**
-     * Anchor ID for the popover.
-     */
-    anchorId?: string;
-
-    // TODO(wittjosiah): Custom properties?
-
-    /**
-     * Block alignment for the dialog.
-     */
-    dialogBlockAlign?: 'start' | 'center';
-
-    /**
-     * Type of dialog.
-     */
-    dialogType?: 'default' | 'alert';
-  }>;
+  export class SetLayout extends S.TaggedClass<SetLayout>()(`${LAYOUT_ACTION}/set-layout`, {
+    input: S.Struct({
+      /**
+       * Element to set the state of.
+       */
+      element: S.Literal('fullscreen', 'sidebar', 'complementary', 'dialog', 'popover', 'toast'),
+
+      /**
+       * Whether the element is on or off.
+       *
+       * If omitted, the element's state will be toggled or set based on other provided data.
+       * For example, if `component` is provided, the state will be set to `true`.
+       */
+      state: S.optional(S.Boolean),
+
+      /**
+       * Component to render in the dialog or popover.
+       */
+      component: S.optional(S.String),
+
+      /**
+       * Data to be passed to the dialog or popover Surface.
+       */
+      subject: S.optional(S.Any),
+
+      /**
+       * Anchor ID for the popover.
+       */
+      anchorId: S.optional(S.String),
+
+      // TODO(wittjosiah): Custom properties?
+
+      /**
+       * Block alignment for the dialog.
+       */
+      dialogBlockAlign: S.optional(S.Literal('start', 'center')),
+
+      /**
+       * Type of dialog.
+       */
+      dialogType: S.optional(S.Literal('default', 'alert')),
+    }),
+    output: S.Void,
+  }) {}
+
+  // TODO(wittjosiah): Do all these need to be separate actions?
+
+  export class SetLayoutMode extends S.TaggedClass<SetLayoutMode>()(`${LAYOUT_ACTION}/set-layout-mode`, {
+    input: S.Union(
+      S.Struct({
+        layoutMode: LayoutMode,
+      }),
+      S.Struct({
+        revert: S.Literal(true),
+      }),
+    ),
+    output: S.Void,
+  }) {}
+
+  export class ScrollIntoView extends S.TaggedClass<ScrollIntoView>()(`${LAYOUT_ACTION}/scroll-into-view`, {
+    input: S.Struct({
+      id: S.optional(S.String),
+      // TODO(wittjosiah): Factor out to thread scroll into view action?
+      cursor: S.optional(S.String),
+      ref: S.optional(S.String),
+    }),
+    output: S.Void,
+  }) {}
 }

package/src/plugins/common/navigation.ts

@@ -3,12 +3,10 @@
 //
 
 import { Schema as S } from '@effect/schema';
-import { z } from 'zod';
 
 import { pick } from '@dxos/util';
 
 import { type Plugin } from '../plugin-host';
-import { type IntentData } from '../plugin-intent';
 
 // NOTE(thure): These are chosen from RFC 1738’s `safe` characters: http://www.faqs.org/rfcs/rfc1738.html
 export const SLUG_LIST_SEPARATOR = '+';
@@ -39,7 +37,14 @@ export type LayoutParts = S.Schema.Type<typeof LayoutPartsSchema>;
 const LayoutCoordinateSchema = S.mutable(S.Struct({ part: LayoutPartSchema, entryId: S.String }));
 export type LayoutCoordinate = S.Schema.Type<typeof LayoutCoordinateSchema>;
 
-const PartAdjustmentSchema = S.Union(S.Literal('increment-start'), S.Literal('increment-end'), S.Literal('solo'));
+const PartAdjustmentSchema = S.Union(
+  S.Literal('increment-start'),
+  S.Literal('increment-end'),
+  S.Literal('pin-start'),
+  S.Literal('pin-end'),
+  S.Literal('close'),
+  S.Literal('solo'),
+);
 export type PartAdjustment = S.Schema.Type<typeof PartAdjustmentSchema>;
 
 const LayoutAdjustmentSchema = S.mutable(
@@ -48,8 +53,8 @@ const LayoutAdjustmentSchema = S.mutable(
 export type LayoutAdjustment = S.Schema.Type<typeof LayoutAdjustmentSchema>;
 
 /** @deprecated */
-export const ActiveParts = z.record(z.string(), z.union([z.string(), z.array(z.string())]));
-export type ActiveParts = z.infer<typeof ActiveParts>;
+export const ActiveParts = S.Record({ key: S.String, value: S.Union(S.String, S.mutable(S.Array(S.String))) });
+export type ActiveParts = S.Schema.Type<typeof ActiveParts>;
 
 // TODO(burdon): Where should this go?
 export type LayoutContainerProps<T> = T & { role?: string; coordinate?: LayoutCoordinate };
@@ -135,51 +140,75 @@ export const partLength = (layout: LayoutParts | undefined, part: LayoutPart | u
 // Intents
 //
 
-const NAVIGATION_PLUGIN = 'dxos.org/plugin/navigation';
-
-const NAVIGATION_ACTION = `${NAVIGATION_PLUGIN}/action`;
-
-export enum NavigationAction {
-  OPEN = `${NAVIGATION_ACTION}/open`,
-  ADD_TO_ACTIVE = `${NAVIGATION_ACTION}/add-to-active`,
-  SET = `${NAVIGATION_ACTION}/set`,
-  ADJUST = `${NAVIGATION_ACTION}/adjust`,
-  CLOSE = `${NAVIGATION_ACTION}/close`,
-  EXPOSE = `${NAVIGATION_ACTION}/expose`,
-}
+export const NAVIGATION_PLUGIN = 'dxos.org/plugin/navigation';
+export const NAVIGATION_ACTION = `${NAVIGATION_PLUGIN}/action`;
 
 /**
  * Expected payload for navigation actions.
  */
+// TODO(wittjosiah): These seem to be too deck-specific.
 export namespace NavigationAction {
   /**
    * An additive overlay to apply to `location.active` (i.e. the result is a union of previous active and the argument)
    */
-  export type Open = IntentData<{ activeParts: ActiveParts }>;
+  export class Open extends S.TaggedClass<Open>()(`${NAVIGATION_ACTION}/open`, {
+    input: S.Struct({
+      activeParts: ActiveParts,
+      noToggle: S.optional(S.Boolean),
+    }),
+    output: S.Struct({
+      open: S.Array(S.String),
+    }),
+  }) {}
 
   /**
    * Payload for adding an item to the active items.
    */
-  export type AddToActive = IntentData<{
-    part: LayoutPart;
-    id: string;
-    scrollIntoView?: boolean;
-    pivotId?: string;
-    positioning?: 'start' | 'end';
-  }>;
+  export class AddToActive extends S.TaggedClass<AddToActive>()(`${NAVIGATION_ACTION}/add-to-active`, {
+    input: S.Struct({
+      id: S.String,
+      part: LayoutPartSchema,
+      scrollIntoView: S.optional(S.Boolean),
+      pivotId: S.optional(S.String),
+      positioning: S.optional(S.Literal('start', 'end')),
+    }),
+    output: S.Void,
+  }) {}
 
   /**
-   * A subtractive overlay to apply to `location.active` (i.e. the result is a subtraction from the previous active of the argument)
+   * The active parts to directly set, to be used when working with URLs or restoring a specific state.
    */
-  export type Close = IntentData<{ activeParts: ActiveParts; noToggle?: boolean }>;
+  export class Set extends S.TaggedClass<Set>()(`${NAVIGATION_ACTION}/set`, {
+    input: S.Struct({
+      activeParts: ActiveParts,
+    }),
+    output: S.Void,
+  }) {}
 
   /**
-   * The active parts to directly set, to be used when working with URLs or restoring a specific state.
+   * A subtractive overlay to apply to `location.active` (i.e. the result is a subtraction from the previous active of the argument)
    */
-  export type Set = IntentData<{ activeParts: ActiveParts }>;
+  export class Close extends S.TaggedClass<Close>()(`${NAVIGATION_ACTION}/close`, {
+    input: S.Struct({
+      activeParts: ActiveParts,
+      noToggle: S.optional(S.Boolean),
+    }),
+    output: S.Void,
+  }) {}
 
   /**
    * An atomic transaction to apply to `location.active`, describing which element to (attempt to) move to which location.
    */
-  export type Adjust = IntentData<LayoutAdjustment>;
+  export class Adjust extends S.TaggedClass<Adjust>()(`${NAVIGATION_ACTION}/adjust`, {
+    input: LayoutAdjustmentSchema,
+    output: S.Void,
+  }) {}
+
+  // TODO(wittjosiah): This action seems unrelated to the others.
+  export class Expose extends S.TaggedClass<Expose>()(`${NAVIGATION_ACTION}/expose`, {
+    input: S.Struct({
+      id: S.String,
+    }),
+    output: S.Void,
+  }) {}
 }

package/src/plugins/plugin-host/HostPlugin.tsx

@@ -8,7 +8,7 @@ import { LocalStorageStore } from '@dxos/local-storage';
 
 import { PluginContainer } from './PluginContainer';
 import { type PluginContext, PluginProvider } from './PluginContext';
-import { type Plugin, type PluginDefinition, type PluginMeta } from './plugin';
+import { type PluginDefinition, type PluginMeta } from './plugin';
 import { ErrorBoundary } from '../plugin-surface';
 
 export type HostPluginParams = {
@@ -21,13 +21,6 @@ export type HostPluginParams = {
   placeholder?: ReactNode;
 };
 
-export type HostPluginProvides = {
-  plugins: PluginContext;
-};
-
-export const parsePluginHost = (plugin: Plugin) =>
-  (plugin.provides as HostPluginProvides).plugins ? (plugin as Plugin<HostPluginProvides>) : undefined;
-
 const HOST_PLUGIN = 'dxos.org/plugin/host';
 
 /**
@@ -40,7 +33,7 @@ export const HostPlugin = ({
   defaults = [],
   fallback = DefaultFallback,
   placeholder = null,
-}: HostPluginParams): PluginDefinition<HostPluginProvides> => {
+}: HostPluginParams): PluginDefinition => {
   const state = new LocalStorageStore<PluginContext>(HOST_PLUGIN, {
     ready: false,
     core,
@@ -67,7 +60,6 @@ export const HostPlugin = ({
       name: 'Plugin host',
     },
     provides: {
-      plugins: state.values,
       context: ({ children }) => {
         return <PluginProvider value={state.values}>{children}</PluginProvider>;
       },

package/src/plugins/plugin-host/PluginContainer.tsx

@@ -49,7 +49,7 @@ export const PluginContainer = ({ plugins: definitions, core, state, placeholder
         const initialized = plugins.filter((plugin): plugin is Plugin => Boolean(plugin));
         log('plugins initialized', { plugins: initialized });
 
-        await Promise.all(enabled.map((plugin) => plugin.ready?.(initialized)));
+        await Promise.all(enabled.map((plugin) => plugin.ready?.({ plugins: initialized })));
         log('plugins ready', { plugins: initialized });
 
         state.plugins = initialized;

package/src/plugins/plugin-host/index.ts

@@ -2,7 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
+import { HostPlugin } from './HostPlugin';
+
 export * from './plugin';
 
 export * from './HostPlugin';
 export * from './PluginContext';
+
+export default HostPlugin;

package/src/plugins/plugin-host/plugin.ts

@@ -4,6 +4,13 @@
 
 import type { FC, PropsWithChildren } from 'react';
 
+/**
+ * Application context to be provided to plugin callbacks.
+ */
+export type HostContext = {
+  plugins: Plugin[];
+};
+
 /**
  * Capabilities provided by a plugin.
  * The base surface capabilities are always included.
@@ -105,7 +112,7 @@ export type PluginDefinition<TProvides = {}, TInitializeProvides = {}> = Omit<Pl
    * @param plugins All plugins which successfully initialized.
    */
   // TODO(wittjosiah): Rename `ready` to a verb?
-  ready?: (plugins: Plugin[]) => Promise<void>;
+  ready?: (context: HostContext) => Promise<void>;
 
   /**
    * Called when the plugin is unloaded.

package/src/plugins/plugin-intent/IntentContext.tsx

@@ -2,48 +2,25 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Context, createContext, useContext, type Provider } from 'react';
-import { useEffect } from 'react';
+import { type Context, createContext, useContext, type Provider, useEffect } from 'react';
 
-import type { UnsubscribeCallback } from '@dxos/async';
+import { raise } from '@dxos/debug';
+import { pick } from '@dxos/util';
 
-import type { Intent, IntentDispatcher, IntentResolver, IntentResult } from './intent';
+import { type AnyIntentResolver, type IntentContext } from './intent-dispatcher';
 
-export type IntentExecution = {
-  intent: Intent;
-  result: IntentResult;
-};
-
-export type IntentContext = {
-  dispatch: IntentDispatcher;
-  undo: () => Promise<IntentResult | void>;
-  history: IntentExecution[][];
-  registerResolver: (pluginId: string, resolver: IntentResolver) => UnsubscribeCallback;
-};
-
-const IntentContext: Context<IntentContext> = createContext<IntentContext>({
-  dispatch: async () => ({}),
-  undo: async () => ({}),
-  history: [],
-  registerResolver: () => () => {},
-});
-
-/**
- * @deprecated Prefer granular hooks.
- */
-// TODO(burdon): Remove. Use useIntentDispatcher.
-export const useIntent = () => useContext(IntentContext);
+const IntentContext: Context<IntentContext | undefined> = createContext<IntentContext | undefined>(undefined);
 
-export const useIntentDispatcher = (): IntentDispatcher => {
-  const { dispatch } = useIntent();
-  return dispatch;
+export const useIntentDispatcher = (): Pick<IntentContext, 'dispatch' | 'dispatchPromise'> => {
+  const context = useContext(IntentContext) ?? raise(new Error('IntentContext not found'));
+  return pick(context, ['dispatch', 'dispatchPromise']);
 };
 
-export const useIntentResolver = (plugin: string, resolver: IntentResolver) => {
-  const { registerResolver } = useIntent();
+export const useIntentResolver = (pluginId: string, resolver: AnyIntentResolver) => {
+  const { registerResolver } = useContext(IntentContext) ?? raise(new Error('IntentContext not found'));
   useEffect(() => {
-    return registerResolver(plugin, resolver);
-  }, [plugin, resolver]);
+    return registerResolver(pluginId, resolver);
+  }, [pluginId, resolver]);
 };
 
-export const IntentProvider: Provider<IntentContext> = IntentContext.Provider;
+export const IntentProvider: Provider<IntentContext | undefined> = IntentContext.Provider;