@dxos/plugin-assistant 0.8.4-main.9735255 → 0.8.4-main.9be5663bfe

package/src/containers/TriggerStatus/TriggerStatus.tsx

@@ -0,0 +1,144 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { useActiveSpace } from '@dxos/app-toolkit/ui';
+import { type InvocationsState } from '@dxos/functions-runtime';
+import { useTriggerRuntimeControls } from '@dxos/plugin-automation/hooks';
+import { StatusBar } from '@dxos/plugin-status-bar';
+import { type Database } from '@dxos/react-client/echo';
+import { IconButton, Input, Popover, useTranslation } from '@dxos/react-ui';
+
+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 { t } = useTranslation(meta.id);
+  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]);
+
+  return (
+    <Popover.Root>
+      <Popover.Trigger asChild>
+        <StatusBar.Item>
+          <IconButton
+            icon={getIcon(triggerState)}
+            iconOnly
+            label={t(`trigger-status-${triggerState}.label`)}
+            classNames={getIconClassNames(triggerState)}
+          />
+        </StatusBar.Item>
+      </Popover.Trigger>
+      <Popover.Portal>
+        <Popover.Content side='left'>
+          <TriggerStatusPopover
+            isRunning={isRunning}
+            state={triggerState}
+            currentFunctionName={
+              state?.invocations.at(-1)?.function?.meta.name ?? state?.invocations.at(-1)?.function?.meta.key
+            }
+            lastInvocation={state?.invocations.at(-1)}
+            onToggle={isRunning ? stop : start}
+          />
+          <Popover.Arrow />
+        </Popover.Content>
+      </Popover.Portal>
+    </Popover.Root>
+  );
+};
+
+type TriggerStatusPopoverProps = {
+  isRunning: boolean;
+  state: TriggerStatusState;
+  currentFunctionName?: string;
+  lastInvocation?: InvocationsState;
+  onToggle: () => void;
+};
+
+const TriggerStatusPopover = ({
+  isRunning,
+  state,
+  currentFunctionName,
+  lastInvocation, // TODO(burdon): Show.
+  onToggle,
+}: TriggerStatusPopoverProps) => {
+  const { t } = useTranslation(meta.id);
+
+  return (
+    <div className='flex flex-col gap-2 p-2 w-[240px]'>
+      <Input.Root>
+        <div className='flex items-center gap-2'>
+          <Input.Switch checked={isRunning} onCheckedChange={onToggle} />
+          <Input.Label>{t('trigger-runtime.label')}</Input.Label>
+        </div>
+      </Input.Root>
+
+      <div className='flex flex-col gap-1'>
+        <div className='text-sm'>{t(`trigger-status-${state}.label`)}</div>
+        {currentFunctionName && state === 'running' && (
+          <div className='text-xs text-description'>{currentFunctionName}</div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default TriggerStatus;

package/src/containers/TriggerStatus/index.ts

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

package/src/containers/index.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+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 AgentArticle: ComponentType<any> = lazy(() => import('./AgentArticle'));
+export const AgentProperties: ComponentType<any> = lazy(() => import('./AgentProperties'));
+export const PromptArticle: ComponentType<any> = lazy(() => import('./PromptArticle'));
+export const PromptList: ComponentType<any> = lazy(() => import('./PromptList'));
+export const TracePanel: ComponentType<any> = lazy(() => import('./TracePanel'));
+export const TriggerStatus: ComponentType<any> = lazy(() => import('./TriggerStatus'));

package/src/extensions/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { promptRunExtension, type PromptExtensionOptions } from './prompt-extension';

package/src/extensions/prompt-extension.ts

@@ -0,0 +1,111 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { syntaxTree } from '@codemirror/language';
+import { type Extension } from '@codemirror/state';
+import { Decoration, type DecorationSet, EditorView, ViewPlugin, type ViewUpdate, WidgetType } from '@codemirror/view';
+
+import { Domino } from '@dxos/ui';
+
+export type PromptExtensionOptions = {
+  /** Called when the user clicks the run button on a prompt code block. */
+  onRun: (promptText: string) => void;
+};
+
+/**
+ * CodeMirror extension that adds a green "run" button to ```prompt fenced code blocks.
+ */
+export const promptRunExtension = ({ onRun }: PromptExtensionOptions): Extension => {
+  return [
+    ViewPlugin.fromClass(
+      class {
+        decorations: DecorationSet;
+
+        constructor(view: EditorView) {
+          this.decorations = this.buildDecorations(view);
+        }
+
+        update(update: ViewUpdate) {
+          if (update.docChanged || update.viewportChanged || update.selectionSet || update.focusChanged) {
+            this.decorations = this.buildDecorations(update.view);
+          }
+        }
+
+        buildDecorations(view: EditorView): DecorationSet {
+          const decorations: Array<{ from: number; to: number; decoration: Decoration }> = [];
+
+          syntaxTree(view.state).iterate({
+            enter: (node) => {
+              if (node.name === 'FencedCode') {
+                const info = node.node.getChild('CodeInfo');
+                if (info) {
+                  const type = view.state.sliceDoc(info.from, info.to);
+                  const text = node.node.getChild('CodeText');
+                  if (type === 'prompt' && text) {
+                    const content = view.state.sliceDoc(text.from, text.to).trim();
+                    if (content.length > 0) {
+                      const widget = new PromptRunWidget(content, onRun);
+                      decorations.push({
+                        from: node.from,
+                        to: node.from,
+                        decoration: Decoration.widget({ widget, side: -1 }),
+                      });
+                    }
+                  }
+                }
+              }
+            },
+          });
+
+          return Decoration.set(
+            decorations.sort((a, b) => a.from - b.from || a.to - b.to).map((d) => d.decoration.range(d.from, d.to)),
+          );
+        }
+      },
+      {
+        decorations: (v) => v.decorations,
+      },
+    ),
+  ];
+};
+
+class PromptRunWidget extends WidgetType {
+  constructor(
+    private readonly prompt: string,
+    private readonly onClick: (promptText: string) => void,
+  ) {
+    super();
+  }
+
+  override eq(other: this) {
+    return this.prompt === other.prompt;
+  }
+
+  override ignoreEvent() {
+    return false;
+  }
+
+  override toDOM() {
+    return Domino.of('div')
+      .classNames('relative')
+      .append(
+        Domino.of('button')
+          .classNames('dx-button absolute right-0 top-4')
+          .on('mousedown', (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            this.onClick(this.prompt);
+          })
+          .append(
+            Domino.of('svg', Domino.SVG)
+              .classNames('w-4 h-4 cursor-pointer')
+              .append(
+                Domino.of('use', Domino.SVG).attributes({
+                  href: Domino.icon('ph--play--regular'),
+                }),
+              ),
+          ),
+      ).root;
+  }
+}

package/src/hooks/useBlueprintRegistry.ts

@@ -4,8 +4,8 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useCapabilities } from '@dxos/app-framework/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';
@@ -16,9 +16,13 @@ import { distinctBy } from '@dxos/util';
  * Provide a registry of blueprints from plugins.
  */
 // TODO(burdon): Reconcile with eventual public registry.
+// TODO(dmaretskyi): Reconcile with blueprint registry in compute runtime.
 export const useBlueprintRegistry = () => {
-  const blueprints = useCapabilities(Common.Capability.BlueprintDefinition);
-  return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
+  const blueprintDefinitions = useCapabilities(AppCapabilities.BlueprintDefinition);
+  return useMemo(
+    () => new Blueprint.Registry(blueprintDefinitions.map((blueprint) => blueprint.make())),
+    [blueprintDefinitions],
+  );
 };
 
 export const useBlueprints = ({

package/src/hooks/useChatProcessor.ts

@@ -3,23 +3,29 @@
 //
 
 import { type Registry, RegistryContext } from '@effect-atom/atom-react';
-import type * as Runtime from 'effect/Runtime';
+import * as Effect from 'effect/Effect';
 import { useContext, useMemo, useState } from 'react';
 
 import { AiConversation } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/blueprints';
+import { Feed, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
-import { type Queue, type Space } from '@dxos/react-client/echo';
+import { type AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { type Space } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
-import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
-import { type Assistant } from '../types';
+import { type Assistant } from '#types';
+
+import { AiChatProcessor, type AiServicePreset } from '../processor';
 
 export type UseChatProcessorProps = {
   space?: Space;
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
   preset?: AiServicePreset;
-  services?: () => Promise<Runtime.Runtime<AiChatServices>>;
+  runtime?: AutomationCapabilities.ComputeRuntime;
   blueprintRegistry?: Blueprint.Registry;
   settings?: Assistant.Settings;
 };
@@ -31,24 +37,29 @@ export const useChatProcessor = ({
   space,
   chat,
   preset,
-  services,
+  runtime,
   blueprintRegistry,
   settings,
 }: UseChatProcessorProps): AiChatProcessor | undefined => {
   const observableRegistry = useContext(RegistryContext);
 
-  // Create conversation from chat queue.
   const [conversation, setConversation] = useState<AiConversation>();
   useAsyncEffect(async () => {
     if (!space || !chat) {
       return;
     }
 
-    // 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 feedTarget = chat.feed.target;
+    if (!feedTarget) {
+      return;
+    }
+    const feedServiceLayer = createFeedServiceLayer(space.queues);
+    const runtime = await runAndForwardErrors(
+      Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer)),
+    );
     const conversation = new AiConversation({
-      queue: queue as Queue<any>,
+      feed: feedTarget,
+      runtime,
       registry: observableRegistry as Registry.Registry,
     });
     await conversation.open();
@@ -57,21 +68,23 @@ export const useChatProcessor = ({
       void conversation.close();
       setConversation(undefined);
     };
-  }, [space, chat?.queue.dxn.toString()]);
+  }, [space, chat?.feed.target]);
+
+  const feed = chat?.feed.target;
 
-  // Create processor.
   const processor = useMemo(() => {
-    if (!services || !conversation) {
+    if (!runtime || !conversation || !chat || !feed) {
       return undefined;
     }
 
     log('creating processor', { preset, model: preset?.model, settings });
-    return new AiChatProcessor(conversation, services, {
+    return new AiChatProcessor(conversation, runtime, feed, {
+      chat: chat ? Ref.make(chat) : undefined,
       observableRegistry,
       blueprintRegistry,
       model: preset?.model,
     });
-  }, [services, conversation, blueprintRegistry, preset]);
+  }, [runtime, conversation, blueprintRegistry, preset, feed]);
 
   return processor;
 };

package/src/hooks/useChatServices.ts

@@ -2,46 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework/react';
+import { useCapability } from '@dxos/app-framework/ui';
+import { getPersonalSpace } from '@dxos/app-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 { AutomationCapabilities } from '@dxos/plugin-automation/types';
 import { useClient } from '@dxos/react-client';
 
-import { type AiChatServices } from '../processor';
-import { type Assistant } from '../types';
-
 export type UseChatServicesProps = {
   id?: Key.SpaceId;
-  chat?: Assistant.Chat;
 };
 
 /**
- * Construct service layer.
+ * Resolves the compute runtime for a space.
  */
-// TODO(dmaretskyi): Better return type.
-export const useChatServices = ({
-  id,
-  chat,
-}: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
+export const useChatServices = ({ id }: UseChatServicesProps) => {
   const client = useClient();
-  id ??= client.spaces.default.id;
+  id ??= getPersonalSpace(client)?.id;
 
   const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
-  return useMemo(() => {
-    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]);
+  return useMemo(() => (!id ? undefined : runtimeResolver.getRuntime(id)), [id]);
 };

package/src/hooks/useChatToolbarActions.ts

@@ -6,19 +6,20 @@ import { Atom } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
 import { useMemo } from 'react';
 
-import { useOperationInvoker } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { Chat } from '@dxos/assistant-toolkit';
 import { Filter, Obj, Query } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
 import { useQuery } from '@dxos/react-client/echo';
 import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
 
-import { useChatContext } from '../components';
-import { meta } from '../meta';
-import { Assistant, AssistantOperation } from '../types';
+import { useChatContext } from '#components';
+import { meta } from '#meta';
+import { AssistantOperation } from '#operations';
 
 export type ChatToolbarActionsProps = {
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
   companionTo?: Obj.Unknown;
 };
 
@@ -26,7 +27,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
   const { invoke } = useOperationInvoker();
   const { db } = useChatContext('useChatToolbarActions');
   const query = companionTo
-    ? Query.select(Filter.id(companionTo.id)).targetOf(Assistant.CompanionTo).source()
+    ? Query.select(Filter.id(companionTo.id)).targetOf(Chat.CompanionTo).source()
     : Query.select(Filter.nothing());
 
   // TODO(wittjosiah): Query in react vs query in atom?
@@ -38,12 +39,12 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
       return Atom.make(() => {
         const builder = MenuBuilder.make()
           .root({
-            label: ['chat toolbar title', { ns: meta.id }],
+            label: ['chat-toolbar.title', { ns: meta.id }],
           })
           .action(
             'new',
             {
-              label: ['new thread button', { ns: meta.id }],
+              label: ['new-thread.button', { ns: meta.id }],
               icon: 'ph--plus--regular',
               type: 'new',
               disabled: !companionTo,
@@ -59,7 +60,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
           .action(
             'rename',
             {
-              label: ['rename thread button', { ns: meta.id }],
+              label: ['rename-thread.button', { ns: meta.id }],
               icon: 'ph--magic-wand--regular',
               type: 'rename',
               disabled: !chat,
@@ -73,7 +74,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
           .action(
             'branch',
             {
-              label: ['button branch thread', { ns: meta.id }],
+              label: ['branch-thread.menu', { ns: meta.id }],
               icon: 'ph--git-branch--regular',
               type: 'branch',
               disabled: true,
@@ -85,7 +86,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
           builder.group(
             'chats',
             {
-              label: ['chat history label', { ns: meta.id }],
+              label: ['chat-history.label', { ns: meta.id }],
               icon: 'ph--clock-counter-clockwise--regular',
               selectCardinality: 'single',
               variant: 'dropdownMenu',
@@ -98,7 +99,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
                   builder.action(
                     chat.id,
                     {
-                      label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Assistant.Chat.typename }],
+                      label: Obj.getLabel(chat) ?? ['object-name.placeholder', { ns: Chat.Chat.typename }],
                     },
                     () =>
                       Effect.gen(function* () {

package/src/hooks/useContextBinder.ts

@@ -3,30 +3,41 @@
 //
 
 import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
 import { useContext, useState } from 'react';
 
 import { AiContextBinder } from '@dxos/assistant';
-import { type Queue } from '@dxos/react-client/echo';
+import { Feed } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { runAndForwardErrors } from '@dxos/effect';
+import { type Space } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
-// NOTE: This takes a queue rather than a chat because the chat may not be in a space yet.
-export const useContextBinder = (queue: Queue | undefined): AiContextBinder | undefined => {
+export const useContextBinder = (
+  space: Space | undefined,
+  feed: Feed.Feed | undefined,
+): AiContextBinder | undefined => {
   const registry = useContext(RegistryContext) as Registry.Registry;
   const [binder, setBinder] = useState<AiContextBinder>();
 
   useAsyncEffect(async () => {
-    if (!queue) {
+    setBinder(undefined);
+    if (!space || !feed) {
       return;
     }
 
-    const binder = new AiContextBinder({ queue, registry });
+    const feedServiceLayer = createFeedServiceLayer(space.queues);
+    const runtime = await runAndForwardErrors(
+      Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer)),
+    );
+    const binder = new AiContextBinder({ feed, runtime, registry });
     await binder.open();
     setBinder(binder);
 
     return () => {
       void binder.close();
     };
-  }, [queue]);
+  }, [space, feed]);
 
   return binder;
 };

package/src/hooks/useContextObjects.ts

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Atom, useAtomValue } from '@effect-atom/atom-react';
 import { useCallback } from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
-import { type DXN, type Database, type Obj, Ref } from '@dxos/echo';
+import { type DXN, type Database, type Obj } from '@dxos/echo';
 
 export type UseContextObjectsProps = {
   db?: Database.Database;
@@ -17,18 +18,21 @@ export type UseContextObjects = {
   onUpdateObject: (dxn: DXN, checked: boolean) => Promise<void>;
 };
 
+const emptyObjectsAtom = Atom.make<Obj.Unknown[]>([]);
+
 /**
  * Create reactive map of active object references (by DXN string).
  */
 export const useContextObjects = ({ db, context }: UseContextObjectsProps): UseContextObjects => {
+  const objects = useAtomValue(context?.objects ?? emptyObjectsAtom);
+
   const handleUpdateObject = useCallback<UseContextObjects['onUpdateObject']>(
     async (dxn: DXN, checked: boolean) => {
       if (!db || !context) {
         return;
       }
 
-      // Load the object by DXN from the current space.
-      const ref = Ref.fromDXN(dxn);
+      const ref = db.makeRef<Obj.Unknown>(dxn);
       await ref.load();
       if (checked) {
         await context.bind({ objects: [ref] });
@@ -40,7 +44,7 @@ export const useContextObjects = ({ db, context }: UseContextObjectsProps): UseC
   );
 
   return {
-    objects: context?.getObjects() ?? [],
+    objects,
     onUpdateObject: handleUpdateObject,
   };
 };

package/src/hooks/useFilteredTypes.ts

@@ -10,8 +10,8 @@ import { EntityKind, SystemTypeAnnotation, getTypeAnnotation } from '@dxos/echo/
 
 // TODO(burdon): Pass in filter.
 // TODO(wittjosiah): Factor out.
-export const useFilteredTypes = (db?: Database.Database): Type.Entity.Any[] => {
-  const [types, setTypes] = useState<Type.Entity.Any[]>([]);
+export const useFilteredTypes = (db?: Database.Database): Type.AnyEntity[] => {
+  const [types, setTypes] = useState<Type.AnyEntity[]>([]);
   useEffect(() => {
     if (!db) {
       return;
@@ -23,7 +23,7 @@ export const useFilteredTypes = (db?: Database.Database): Type.Entity.Any[] => {
           new Set(
             query.results
               .filter((schema) => getTypeAnnotation(schema)?.kind !== EntityKind.Relation)
-              .filter((schema) => SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false))),
+              .filter((schema) => !SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false))),
           ),
         );