@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.6fa680abb7

package/src/containers/TriggerStatus/TriggerStatus.tsx

@@ -0,0 +1,140 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { type InvocationsState } from '@dxos/functions-runtime';
+import { useTriggerRuntimeControls } from '@dxos/plugin-automation';
+import { useActiveSpace } from '@dxos/plugin-space';
+import { StatusBar } from '@dxos/plugin-status-bar';
+import { type Database } from '@dxos/react-client/echo';
+import { Icon, Input, Popover, useTranslation } from '@dxos/react-ui';
+import { Settings } from '@dxos/react-ui-form';
+import { mx } from '@dxos/ui-theme';
+
+import { meta } from '../../meta';
+
+type TriggerStatusState = 'disabled' | 'idle' | 'running' | 'error';
+
+const getIcon = (state: TriggerStatusState): string => {
+  switch (state) {
+    case 'disabled':
+      return 'ph--lightning-slash--regular';
+    case 'idle':
+      return 'ph--lightning--regular';
+    case 'running':
+      return 'ph--lightning--fill';
+    case 'error':
+      return 'ph--warning--regular';
+  }
+};
+
+const getIconClassNames = (state: TriggerStatusState): string | undefined => {
+  switch (state) {
+    case 'running':
+      return 'animate-pulse text-accent-text';
+    case 'error':
+      return 'text-error-text';
+    default:
+      return undefined;
+  }
+};
+
+export const TriggerStatus = () => {
+  const space = useActiveSpace();
+  const db = space?.db;
+  if (!db) {
+    return null;
+  }
+
+  return <SpaceStatusMain db={db} />;
+};
+
+const SpaceStatusMain = ({ db }: { db: Database.Database }) => {
+  const { state, start, stop } = useTriggerRuntimeControls(db);
+  const isRunning = state?.enabled ?? false;
+
+  // Determine the current trigger status state.
+  const triggerState: TriggerStatusState = useMemo(() => {
+    if (!isRunning) {
+      return 'disabled';
+    }
+
+    // Check if there's any pending invocation.
+    const hasPending = state?.invocations.some((invocation) => invocation.result === null);
+    if (hasPending) {
+      return 'running';
+    }
+
+    // Check if the last invocation failed.
+    const lastInvocation = state?.invocations.at(-1);
+    if (lastInvocation?.result?._tag === 'Failure') {
+      return 'error';
+    }
+
+    return 'idle';
+  }, [isRunning, state?.invocations]);
+
+  const { t } = useTranslation(meta.id);
+  const title = t(`trigger status ${triggerState} label`);
+  const icon = <Icon icon={getIcon(triggerState)} classNames={getIconClassNames(triggerState)} />;
+
+  return (
+    <Popover.Root>
+      <Popover.Trigger asChild>
+        <StatusBar.Item title={title}>{icon}</StatusBar.Item>
+      </Popover.Trigger>
+      <Popover.Portal>
+        <Popover.Content>
+          <TriggerStatusPopover
+            isRunning={isRunning}
+            state={triggerState}
+            currentFunctionName={state?.invocations.at(-1)?.function?.name ?? state?.invocations.at(-1)?.function?.key}
+            lastInvocation={state?.invocations.at(-1)}
+            onToggle={isRunning ? stop : start}
+          />
+          <Popover.Arrow />
+        </Popover.Content>
+      </Popover.Portal>
+    </Popover.Root>
+  );
+};
+
+interface TriggerStatusPopoverProps {
+  isRunning: boolean;
+  state: TriggerStatusState;
+  currentFunctionName?: string;
+  lastInvocation?: InvocationsState;
+  onToggle: () => void;
+}
+
+const TriggerStatusPopover = ({
+  isRunning,
+  state,
+  currentFunctionName,
+  lastInvocation,
+  onToggle,
+}: TriggerStatusPopoverProps) => {
+  const { t } = useTranslation(meta.id);
+
+  return (
+    <div className='min-w-[240px] p-2 space-y-3'>
+      {/* Runtime Toggle */}
+      <Settings.ItemInput title={t('trigger runtime label')} description={t('trigger runtime description')}>
+        <Input.Switch classNames='justify-self-end' checked={isRunning} onCheckedChange={onToggle} />
+      </Settings.ItemInput>
+
+      {/* Status Indicator */}
+      <div className='flex items-center gap-2 pt-2 border-t border-separator'>
+        <Icon icon={getIcon(state)} classNames={mx(getIconClassNames(state), 'shrink-0')} />
+        <span className='text-sm'>{t(`trigger status ${state} label`)}</span>
+        {currentFunctionName && state === 'running' && (
+          <span className='text-xs text-description'>{currentFunctionName}</span>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default TriggerStatus;

package/src/containers/TriggerStatus/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { TriggerStatus } from './TriggerStatus';
+
+export default TriggerStatus;

package/src/containers/index.ts

@@ -0,0 +1,15 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export * from './Project';
+
+export const AssistantSettings: ComponentType<any> = lazy(() => import('./AssistantSettings'));
+export const BlueprintArticle: ComponentType<any> = lazy(() => import('./BlueprintArticle'));
+export const ChatCompanion: ComponentType<any> = lazy(() => import('./ChatCompanion'));
+export const ChatContainer: ComponentType<any> = lazy(() => import('./ChatContainer'));
+export const ChatDialog: ComponentType<any> = lazy(() => import('./ChatDialog'));
+export const PromptArticle: ComponentType<any> = lazy(() => import('./PromptArticle'));
+export const TriggerStatus: ComponentType<any> = lazy(() => import('./TriggerStatus'));

package/src/hooks/index.ts

@@ -2,10 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './chat-processor';
-export * from './presets';
-
-export * from './useBlueprints';
+export * from './useBlueprintRegistry';
 export * from './useChatProcessor';
 export * from './useChatServices';
+export * from './useChatToolbarActions';
+export * from './useContextBinder';
+export * from './useContextObjects';
+export * from './useFilteredTypes';
+export * from './useFlush';
+export * from './useOnline';
+export * from './usePresets';
 export * from './useReferencesProvider';

package/src/hooks/useBlueprintRegistry.ts

@@ -0,0 +1,108 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { useCapabilities } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { type AiContextBinder } from '@dxos/assistant';
+import { Blueprint } from '@dxos/blueprints';
+import { type Database, Filter, Obj, Ref } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
+import { distinctBy } from '@dxos/util';
+
+/**
+ * Provide a registry of blueprints from plugins.
+ */
+// TODO(burdon): Reconcile with eventual public registry.
+export const useBlueprintRegistry = () => {
+  const blueprintDefinitions = useCapabilities(AppCapabilities.BlueprintDefinition);
+  return useMemo(
+    () => new Blueprint.Registry(blueprintDefinitions.map((blueprint) => blueprint.make())),
+    [blueprintDefinitions],
+  );
+};
+
+export const useBlueprints = ({
+  blueprintRegistry,
+  db,
+}: {
+  blueprintRegistry?: Blueprint.Registry;
+  db?: Database.Database;
+}) => {
+  const staticBlueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+  const spaceBlueprints = useQuery(db, Filter.type(Blueprint.Blueprint));
+  return useMemo(() => {
+    const blueprints = distinctBy([...staticBlueprints, ...spaceBlueprints], (b) => b.key);
+    blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
+    return blueprints;
+  }, [staticBlueprints, spaceBlueprints]);
+};
+
+/**
+ * Create reactive map of active blueprints (by key).
+ */
+export const useActiveBlueprints = ({ context }: { context?: AiContextBinder }) => {
+  const [active, setActive] = useState<Map<string, Blueprint.Blueprint>>(new Map());
+
+  useEffect(() => {
+    if (!context) {
+      setActive(new Map());
+      return;
+    }
+
+    const updateActive = () => {
+      const blueprints = context.getBlueprints();
+      setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
+    };
+
+    // Set initial value.
+    updateActive();
+
+    // Subscribe to changes.
+    return context.subscribeBlueprints(updateActive);
+  }, [context]);
+
+  return active;
+};
+
+// TODO(burdon): Move logic into binder.
+export const useBlueprintHandlers = ({
+  db,
+  context,
+  blueprintRegistry,
+}: {
+  db: Database.Database;
+  context?: AiContextBinder;
+  blueprintRegistry?: Blueprint.Registry;
+}) => {
+  const onUpdateBlueprint = useCallback(
+    async (key: string, checked: boolean) => {
+      if (!context || !blueprintRegistry) {
+        return;
+      }
+
+      // Find existing cloned blueprint.
+      const objects = await db.query(Filter.type(Blueprint.Blueprint)).run();
+      let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
+      if (checked) {
+        if (!storedBlueprint) {
+          const blueprint = blueprintRegistry.getByKey(key);
+          if (!blueprint) {
+            return;
+          }
+
+          // NOTE: Possible race condition with other peers.
+          storedBlueprint = db.add(Obj.clone(blueprint));
+        }
+        await context.bind({ blueprints: [Ref.make(storedBlueprint)] });
+      } else if (storedBlueprint) {
+        await context.unbind({ blueprints: [Ref.make(storedBlueprint)] });
+      }
+    },
+    [db, context, blueprintRegistry],
+  );
+
+  return { onUpdateBlueprint };
+};

package/src/hooks/useChatProcessor.ts

@@ -2,142 +2,77 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Layer } from 'effect';
-import { useEffect, useMemo, useState } from 'react';
+import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import type * as Runtime from 'effect/Runtime';
+import { useContext, useMemo, useState } from 'react';
 
-import { type ExecutableTool } from '@dxos/ai';
-import { Capabilities, useCapabilities, useIntentDispatcher } from '@dxos/app-framework';
-import { Conversation, createSystemPrompt } from '@dxos/assistant';
-import { type ArtifactDefinition, type AssociatedArtifact, type Blueprint } from '@dxos/blueprints';
-import { FunctionType } from '@dxos/functions';
+import { AiConversation } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
+import { type Blueprint } from '@dxos/blueprints';
 import { log } from '@dxos/log';
-import { useConfig } from '@dxos/react-client';
-import { Filter, fullyQualifiedId, type Queue, type Space, useQuery } from '@dxos/react-client/echo';
-import { isNonNullable } from '@dxos/util';
+import { type Queue, type Space } from '@dxos/react-client/echo';
+import { useAsyncEffect } from '@dxos/react-ui';
 
-import { type AiServicePreset, ChatProcessor, type ChatServices } from '../hooks';
-import { convertFunctionToTool, createToolsFromService } from '../tools';
-import { type Assistant, ServiceType } from '../types';
+import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
+import { type Assistant } from '../types';
 
-type UseChatProcessorProps = {
-  preset?: AiServicePreset;
+export type UseChatProcessorProps = {
   space?: Space;
-  chat?: Assistant.Chat;
-
-  // TODO(burdon): Move into layer?
-  services?: Layer.Layer<ChatServices>;
+  chat?: Chat.Chat;
+  preset?: AiServicePreset;
+  services?: () => Promise<Runtime.Runtime<AiChatServices>>;
   blueprintRegistry?: Blueprint.Registry;
-  // TODO(burdon): Not currently used.
   settings?: Assistant.Settings;
-
-  /** @deprecated */
-  instructions?: string;
-  /** @deprecated */
-  artifact?: AssociatedArtifact;
-  /** @deprecated */
-  noPluginArtifacts?: boolean;
 };
 
 /**
- * Configure and create ChatProcessor.
+ * Configure and create AiChatProcessor.
  */
 export const useChatProcessor = ({
-  preset,
   space,
   chat,
+  preset,
   services,
   blueprintRegistry,
   settings,
-  instructions,
-  artifact,
-  noPluginArtifacts,
-}: UseChatProcessorProps): ChatProcessor | undefined => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const globalTools = useCapabilities(Capabilities.Tools);
-
-  // TODO(burdon): Spec artifacts.
-  let artifacts: readonly ArtifactDefinition[] = useCapabilities(Capabilities.ArtifactDefinition);
-  if (noPluginArtifacts) {
-    artifacts = Stable.array;
-  }
-
-  // Services.
-  const remoteServices = useQuery(space, Filter.type(ServiceType));
-  const [serviceTools, setServiceTools] = useState<ExecutableTool[]>([]);
-  useEffect(() => {
-    log('creating service tools...');
-    queueMicrotask(async () => {
-      const tools = await Promise.all(remoteServices.map((service) => createToolsFromService(service)));
-      setServiceTools(tools.flat());
-    });
-  }, [remoteServices]);
-
-  // Tools and context.
-  const config = useConfig();
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const chatId = useMemo(() => (chat ? fullyQualifiedId(chat) : undefined), [chat]);
-  const [tools, extensions] = useMemo(() => {
-    log('creating tools...');
-    const tools: ExecutableTool[] = [
-      ...globalTools.flat(),
-      ...serviceTools,
-      ...functions
-        .map((fn) => convertFunctionToTool(fn, config.values.runtime?.services?.edge?.url ?? '', space?.id))
-        .filter(isNonNullable),
-    ];
-    const extensions = { space, dispatch, pivotId: chatId };
-    return [tools, extensions];
-  }, [dispatch, globalTools, space, chatId, serviceTools, functions]);
+}: UseChatProcessorProps): AiChatProcessor | undefined => {
+  const observableRegistry = useContext(RegistryContext);
 
-  // TODO(burdon): Create from template.
-  const systemPrompt = useMemo(
-    () =>
-      createSystemPrompt({
-        artifacts: artifacts.map((definition) => `${definition.name}\n${definition.instructions}`),
-        artifact,
-        instructions,
-      }),
-    [artifacts, artifact, instructions],
-  );
-
-  const conversation = useMemo(() => {
-    if (!chat?.queue.target) {
+  // Create conversation from chat queue.
+  const [conversation, setConversation] = useState<AiConversation>();
+  useAsyncEffect(async () => {
+    if (!space || !chat) {
       return;
     }
 
-    return new Conversation({ queue: chat.queue.target as Queue<any> });
-  }, [chat?.queue.target]);
+    // NOTE: Passing in space and getting queue from space rather than resolving the reference.
+    //  This is because if the chat isn't in a space yet, the reference will not be resolvable.
+    const queue = space.queues.get(chat.queue.dxn);
+    const conversation = new AiConversation({
+      queue: queue as Queue<any>,
+      registry: observableRegistry as Registry.Registry,
+    });
+    await conversation.open();
+    setConversation(conversation);
+    return () => {
+      void conversation.close();
+      setConversation(undefined);
+    };
+  }, [space, chat?.queue.dxn.toString()]);
 
   // Create processor.
-  // TODO(burdon): Updated on each query update above; should just update current processor?
   const processor = useMemo(() => {
     if (!services || !conversation) {
       return undefined;
     }
 
-    log.info('creating processor', {
-      preset,
-      artifacts: artifacts.length,
-      systemPrompt: systemPrompt.length,
-      model: preset?.model,
-      settings,
-    });
-
-    return new ChatProcessor(services, conversation, {
-      tools,
-      extensions,
+    log('creating processor', { preset, model: preset?.model, settings });
+    return new AiChatProcessor(conversation, services, {
+      observableRegistry,
       blueprintRegistry,
-      artifacts,
-      systemPrompt,
       model: preset?.model,
     });
-  }, [services, conversation, tools, blueprintRegistry, artifacts, extensions, systemPrompt, preset]);
+  }, [services, conversation, blueprintRegistry, preset]);
 
   return processor;
 };
-
-// TODO(dmaretskyi): Extract.
-export const Stable = Object.freeze({
-  array: [] as readonly never[],
-  object: {} as {},
-});

package/src/hooks/useChatServices.ts

@@ -2,66 +2,46 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Layer } from 'effect';
+import * as Effect from 'effect/Effect';
+import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
-import { useDeepCompareMemoize } from 'use-deep-compare-effect';
 
-import { type AiService, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { type Space } from '@dxos/client/echo';
-import {
-  ComputeEventLogger,
-  CredentialsService,
-  DatabaseService,
-  LocalFunctionExecutionService,
-  QueueService,
-  RemoteFunctionExecutionService,
-  TracingService,
-} from '@dxos/functions';
+import { useCapability } from '@dxos/app-framework/ui';
+import { type Chat } from '@dxos/assistant-toolkit';
+import { type Key } from '@dxos/echo';
+import { TracingService } from '@dxos/functions';
+import { TracingServiceExt } from '@dxos/functions-runtime';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { useClient } from '@dxos/react-client';
 
-import { AssistantCapabilities } from '../capability-definitions';
-
-export * from '@dxos/assistant';
-
-// TODO(burdon): Deconstruct into separate layers?
-export type ChatServices =
-  | AiService
-  | CredentialsService
-  | DatabaseService
-  | QueueService
-  | RemoteFunctionExecutionService
-  | ToolResolverService
-  | ToolExecutionService
-  | TracingService;
+import { type AiChatServices } from '../processor';
 
 export type UseChatServicesProps = {
-  space?: Space;
+  id?: Key.SpaceId;
+  chat?: Chat.Chat;
 };
 
 /**
  * Construct service layer.
  */
-export const useChatServices = ({ space }: UseChatServicesProps): Layer.Layer<ChatServices> | undefined => {
-  const aiServiceLayer =
-    useCapabilities(AssistantCapabilities.AiServiceLayer).at(0) ?? Layer.die('AiService not found');
-  const functions = useCapabilities(Capabilities.Functions).flat();
-
+// TODO(dmaretskyi): Better return type.
+export const useChatServices = ({
+  id,
+  chat,
+}: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
+  const client = useClient();
+  id ??= client.spaces.default.id;
+
+  const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
   return useMemo(() => {
-    return Layer.mergeAll(
-      aiServiceLayer,
-      makeToolResolverFromFunctions(functions),
-      makeToolExecutionServiceFromFunctions(functions),
-
-      CredentialsService.configuredLayer([]),
-      space ? DatabaseService.makeLayer(space.db) : DatabaseService.notAvailable,
-      space ? QueueService.makeLayer(space.queues) : QueueService.notAvailable,
-
-      ComputeEventLogger.layerFromTracing,
-    ).pipe(
-      Layer.provideMerge(TracingService.layerNoop),
-      Layer.provideMerge(LocalFunctionExecutionService.layer),
-      Layer.provideMerge(RemoteFunctionExecutionService.mockLayer),
-    );
-  }, [space, useDeepCompareMemoize(functions.map((f) => f.name))]);
+    const runtime = runtimeResolver.getRuntime(id);
+    return () =>
+      runtime.runPromise(
+        Effect.runtime<AiChatServices>().pipe(
+          Effect.provide(
+            chat?.traceQueue?.target ? TracingServiceExt.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
+          ),
+        ),
+      );
+  }, [id, chat?.traceQueue?.target]);
 };