@dxos/plugin-assistant 0.8.4-main.f5c0578 → 0.8.4-main.fcc0d83b33

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -2,54 +2,56 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import * as Option from 'effect/Option';
+import React from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
-import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, Ref } from '@dxos/echo';
-import { type ThemedClassName, useAsyncState, useTranslation } from '@dxos/react-ui';
-import { TagPicker, type TagPickerItemData, type TagPickerOptions } from '@dxos/react-ui-tag-picker';
-import { mx } from '@dxos/react-ui-theme';
-import { isNonNullable } from '@dxos/util';
+import { Annotation, type Database, Obj } from '@dxos/echo';
+import { Icon, IconButton, type Label, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { getStyles, mx } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+import { useContextObjects } from '#hooks';
+import { meta } from '#meta';
 
 export type ChatReferencesProps = ThemedClassName<{
-  space: Space;
   context: AiContextBinder;
-  onUpdate?: (dxns: string[]) => void;
+  db: Database.Database;
 }>;
 
-export const ChatReferences = ({ classNames, space, context, onUpdate }: ChatReferencesProps) => {
+export const ChatReferences = ({ classNames, context, db }: ChatReferencesProps) => {
   const { t } = useTranslation(meta.id);
-
-  const [items] = useAsyncState<TagPickerItemData[]>(async () => {
-    const objects = await Ref.Array.loadAll(context.objects.value ?? []);
-    return objects
-      .filter(isNonNullable)
-      .map((obj) => ({ id: Obj.getDXN(obj).toString(), label: Obj.getLabel(obj) ?? Obj.getTypename(obj) ?? obj.id }));
-  }, [context]);
-
-  const handleSearch = useCallback<NonNullable<TagPickerOptions['onSearch']>>(
-    (text, dxns) => {
-      // TODO(burdon): Filter by Item tag (e.g., exclude "contacts") and Query by object label.
-      // TODO(burdon): Change to Filter.text().
-      const objects = space.db.query(Filter.everything()).runSync();
-      return objects
-        .map(({ object }) => ({ id: Obj.getDXN(object).toString(), label: Obj.getLabel(object) ?? '' }))
-        .filter(({ id, label }) => !dxns.includes(id) && label.toLocaleLowerCase().includes(text.toLocaleLowerCase()));
-    },
-    [space],
-  );
+  const { objects, onUpdateObject } = useContextObjects({ db, context });
 
   return (
-    <TagPicker
-      classNames={mx('h-[1.75rem] text-sm', classNames)}
-      mode='multi-select'
-      placeholder={t('context objects placeholder')}
-      items={items}
-      onSearch={handleSearch}
-      onUpdate={onUpdate}
-    />
+    <ul className={mx('flex', classNames)}>
+      {objects.map((obj) => {
+        const dxn = Obj.getDXN(obj);
+        const typename = Obj.getTypename(obj);
+        const label: Label = Obj.getLabel(obj) ?? (typename ? ['object-name.placeholder', { ns: typename }] : obj.id);
+        const { icon, hue } = Option.fromNullable(Obj.getSchema(obj)).pipe(
+          Option.flatMap(Annotation.IconAnnotation.get),
+          Option.getOrElse(() => ({ icon: DEFAULT_OBJECT_ICON, hue: undefined as string | undefined })),
+        );
+        const styles = hue ? getStyles(hue) : undefined;
+        return (
+          <li key={dxn.toString()} className='dx-tag py-0 ps-2 flex items-center gap-1' data-hue='neutral'>
+            <Icon icon={icon} size={4} classNames={styles?.surfaceText} />
+            {toLocalizedString(label, t)}
+            <IconButton
+              icon='ph--x--bold'
+              iconOnly
+              variant='ghost'
+              label={t('remove-object.label')}
+              classNames='p-0 hover:bg-transparent'
+              size={3}
+              onClick={() => onUpdateObject?.(dxn, false)}
+            />
+          </li>
+        );
+      })}
+    </ul>
   );
 };
+
+// TODO(dmaretskyi): Extract those somewhere else.
+const DEFAULT_OBJECT_ICON = 'ph--cube--regular';

package/src/components/ChatPrompt/ChatStatus.tsx

@@ -0,0 +1,123 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { type ThemedClassName } from '@dxos/react-ui';
+import { ChatStatus as NaturalChatStatus, formatElapsed } from '@dxos/react-ui-chat';
+import { Matrix } from '@dxos/react-ui-sfx';
+import { type ContentBlock } from '@dxos/types';
+import { Unit } from '@dxos/util';
+
+import { type ChatRequestTiming, useChatContext } from '../Chat/context';
+
+const CHAT_STREAM_STATUS_NAME = 'Chat.StreamStatus';
+const TICK_MS = 1_000;
+
+export type ChatStreamStatusProps = ThemedClassName<{
+  icon?: boolean;
+}>;
+
+/**
+ * Live status pill rendered at the bottom of the chat thread.
+ *
+ * The block-widget host re-mounts this component each time wire's drip queue toggles
+ * (`wireDrainingEffect`) — so all visible state is derived from chat-context values that
+ * survive the unmount: the latest `stats` block on the chat context's `messages` for token counts,
+ * and `requestTiming` (start/end wall-clock timestamps) for the elapsed value.
+ *
+ * Shows:
+ * - elapsed seconds since the most recent request started (frozen at end-of-request)
+ * - last completed turn's output token count (from the most recent `stats` content block)
+ * - cumulative session total tokens across all `stats` content blocks
+ */
+export const ChatStatus = ({ classNames, icon }: ChatStreamStatusProps) => {
+  // Read `messages` from the chat context (combines `useQuery(queue)` + the processor's
+  // pending atom) rather than `processor.messages` directly — the latter only contains
+  // blocks streamed via the ephemeral `PartialBlock` channel, while finalized blocks
+  // (including the per-turn `stats` block we read for token counts) are submitted to the
+  // feed via `_submitMessage` and only show up through `useQuery`.
+  const { messages, requestTiming } = useChatContext(CHAT_STREAM_STATUS_NAME);
+
+  const { lastOutputTokens, sessionTotalTokens } = useMemo(() => {
+    let last: number | undefined;
+    let total = 0;
+    for (const message of messages) {
+      for (const block of message.blocks) {
+        if (isStats(block) && block.usage) {
+          last = block.usage.outputTokens;
+          total += block.usage.totalTokens ?? 0;
+        }
+      }
+    }
+    return { lastOutputTokens: last, sessionTotalTokens: total };
+  }, [messages]);
+
+  const isRunning = requestTiming != null && requestTiming.endedAt == null;
+  const show = requestTiming || lastOutputTokens || sessionTotalTokens > 0;
+  if (!show) {
+    return null;
+  }
+
+  return (
+    <NaturalChatStatus.Root defaultRunning={false} classNames={['py-2 gap-2 text-sm', classNames]}>
+      {icon && (
+        <NaturalChatStatus.Icon>
+          <Matrix
+            classNames='w-5 h-5'
+            dotClassNames='bg-primary-500'
+            dim={4}
+            dotSize={3}
+            count={10}
+            interval={500}
+            active={isRunning}
+          />
+        </NaturalChatStatus.Icon>
+      )}
+      {show && (
+        <div role='none' className='flex items-center'>
+          {requestTiming && (
+            <NaturalChatStatus.Text>
+              <Elapsed timing={requestTiming} />
+            </NaturalChatStatus.Text>
+          )}
+          {lastOutputTokens != null && (
+            <>
+              {requestTiming && <NaturalChatStatus.Separator />}
+              <NaturalChatStatus.Text>↓ {Unit.Thousand(lastOutputTokens).toString()}</NaturalChatStatus.Text>
+            </>
+          )}
+          {sessionTotalTokens > 0 && (
+            <>
+              {(requestTiming || lastOutputTokens != null) && <NaturalChatStatus.Separator />}
+              <NaturalChatStatus.Text>Σ {Unit.Thousand(sessionTotalTokens).toString()}</NaturalChatStatus.Text>
+            </>
+          )}
+        </div>
+      )}
+    </NaturalChatStatus.Root>
+  );
+};
+
+/**
+ * Wall-clock-derived elapsed display. Tick interval forces a re-render every second while
+ * the request is active so the displayed value advances; once `endedAt` is set, the value
+ * is frozen and the interval is no longer scheduled.
+ */
+const Elapsed = ({ timing }: { timing: ChatRequestTiming }) => {
+  const isRunning = timing.endedAt == null;
+  const [now, setNow] = useState(Date.now());
+  useEffect(() => {
+    if (!isRunning) {
+      return;
+    }
+
+    const id = setInterval(() => setNow(Date.now()), TICK_MS);
+    return () => clearInterval(id);
+  }, [isRunning]);
+
+  return <>{formatElapsed((timing.endedAt ?? now) - timing.startedAt)}</>;
+};
+
+const isStats = (block: ContentBlock.Any): block is ContentBlock.Stats => block._tag === 'stats';

package/src/components/ChatPrompt/ChatStatusIndicator.tsx

@@ -4,36 +4,39 @@
 
 import React, { useEffect, useState } from 'react';
 
-import { Icon, Tooltip, useTimeout } from '@dxos/react-ui';
-import { Spinner } from '@dxos/react-ui-sfx';
-import { errorText } from '@dxos/react-ui-theme';
+import { type ThemedClassName, Tooltip, useTimeout } from '@dxos/react-ui';
+import { Spinner, type SpinnerProps } from '@dxos/react-ui-sfx';
+import { mx } from '@dxos/ui-theme';
 
-export type ChatStatusIndicatorProps = {
-  preset?: string;
-  error?: Error;
-  processing?: boolean;
-};
+const period = 3_000;
+
+export type ChatStatusIndicatorProps = ThemedClassName<
+  {
+    preset?: string;
+    processing?: boolean;
+    error?: Error;
+  } & Pick<SpinnerProps, 'size' | 'onClick'>
+>;
 
-export const ChatStatusIndicator = ({ preset, error, processing }: ChatStatusIndicatorProps) => {
+export const ChatStatusIndicator = ({ classNames, preset, processing, error, ...props }: ChatStatusIndicatorProps) => {
   const [init, setInit] = useState(false);
-  useEffect(() => {
-    setInit(false);
-  }, [preset]);
+  useEffect(() => setInit(false), [preset]);
   useTimeout(
     async () => {
       setInit(true);
     },
-    1_500,
+    period / 2,
     [preset],
   );
 
-  if (error) {
-    return (
-      <Tooltip.Trigger content={error.message} delayDuration={0}>
-        <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />
-      </Tooltip.Trigger>
-    );
-  }
-
-  return <Spinner state={!init ? 'flash' : processing ? 'spin' : 'pulse'} />;
+  return (
+    <div role='none' className={mx('relative flex', classNames)}>
+      <Spinner duration={period} state={!init ? 'flash' : error ? 'error' : processing ? 'spin' : 'pulse'} {...props} />
+      {error && (
+        <Tooltip.Trigger asChild content={error.message}>
+          <div className='absolute inset-0' />
+        </Tooltip.Trigger>
+      )}
+    </div>
+  );
 };

package/src/components/ChatPrompt/index.ts

@@ -5,5 +5,7 @@
 export * from './ChatActions';
 export * from './ChatOptions';
 export * from './ChatPresets';
+export * from './ChatPrompt';
 export * from './ChatReferences';
 export * from './ChatStatusIndicator';
+export * from './ChatStatus';

package/src/components/ChatThread/Anchor.stories.tsx

@@ -0,0 +1,95 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { Database, Filter, Obj } from '@dxos/echo';
+import { DxAnchor } from '@dxos/lit-ui/react';
+import { ClientPlugin } from '@dxos/plugin-client';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { PreviewPlugin } from '@dxos/plugin-preview';
+import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
+import { Loading, withLayout } from '@dxos/react-ui/testing';
+import { Organization } from '@dxos/types';
+
+/**
+ * Production-style click → popover demo.
+ *
+ * Wires up the same chain Composer uses:
+ * - `<DxAnchor dxn=…>label</DxAnchor>` fires `DxAnchorActivate` on click.
+ * - `PreviewPlugin`'s `preview-popover` capability listens for the event, resolves the DXN
+ *   to a real ECHO object via `space.db.makeRef(dxn).load()`, then invokes
+ *   `LayoutOperation.UpdatePopover`.
+ * - `StorybookPlugin` provides both the `LayoutOperation.UpdatePopover` handler (mutating
+ *   the layout-state atom) and the `<Layout>` shell that renders the popover via
+ *   `<Surface.Surface type={AppSurface.Card} data={popoverContent}>`.
+ * - `PreviewPlugin` also registers Card-role surfaces (Organization, Person, Task, …); the
+ *   Surface system picks the matching one based on the resolved object's type.
+ *
+ * Click the anchor — the matching Card surface (from plugin-preview) renders inside the
+ * popover, anchored to the trigger.
+ */
+const DefaultStory = () => {
+  const [space] = useSpaces();
+  const [organization] = useQuery(space?.db, Filter.type(Organization.Organization));
+  if (!organization) {
+    return <Loading />;
+  }
+
+  const dxn = Obj.getDXN(organization).toString();
+  return (
+    <div role='none' className='flex flex-col gap-2 p-4'>
+      <p>
+        Click{' '}
+        <DxAnchor className='dx-tag--anchor' dxn={dxn}>
+          {organization.name}
+        </DxAnchor>{' '}
+        to open the popover.
+      </p>
+    </div>
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-assistant/components/ChatThread/Anchor',
+  render: DefaultStory,
+  decorators: [
+    withLayout({ layout: 'centered' }),
+    withPluginManager({
+      plugins: [
+        ...corePlugins(),
+        StorybookPlugin({}),
+        PreviewPlugin(),
+        ClientPlugin({
+          types: [Organization.Organization],
+          onClientInitialized: Effect.fnUntraced(function* ({ client }) {
+            const { personalSpace } = yield* initializeIdentity(client);
+            yield* Effect.gen(function* () {
+              yield* Database.add(
+                Obj.make(Organization.Organization, {
+                  name: 'DXOS',
+                  website: 'https://dxos.org',
+                  description: 'A decentralized network for collaborative applications.',
+                }),
+              );
+            }).pipe(Effect.provide(Database.layer(personalSpace.db)));
+          }),
+        }),
+      ],
+    }),
+  ],
+  parameters: {
+    layout: 'centered',
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};