@dxos/plugin-assistant 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/src/containers/TracePanel/dxn-extractor.ts

@@ -2,59 +2,51 @@
 // Copyright 2025 DXOS.org
 //
 
-import { DXN } from '@dxos/keys';
+import { URI } from '@dxos/keys';
 
 /**
- * Patterns for extracting DXN references from tool call params/results.
+ * Patterns for extracting references from tool call params/results.
  *
  * Supported formats:
- * - `{ "/": "dxn:..." }` - IPLD-style encoded references
- * - `{ "@dxn": "dxn:..." }` - Alternative format with @dxn key
- * - `@dxn:...` - In-text references (with @ prefix)
- * - `dxn:...` - Plain DXN strings
+ * - `{ "/": "echo:…" | "dxn:…" }` - IPLD-style encoded references
+ * - `{ "@uri": "echo:…" }` - Self URI key
+ * - `@echo:…` / `@dxn:…` - In-text references (with @ prefix)
+ * - `echo:…` / `dxn:…` - Plain URI strings
  */
 
 /**
- * Regex to match DXN strings in various formats.
- * Matches: dxn:kind:part1:part2:...
+ * Regex matching a canonical reference URI: an `echo:` EID or a `dxn:<nsid>[:<version>]` type DXN.
  */
-const DXN_PATTERN = /dxn:[a-zA-Z0-9]+(?::[a-zA-Z0-9@_-]+)+/g;
+const URI_PATTERN = /(?:echo:\/{1,3}[A-Za-z0-9/]+|dxn:[a-zA-Z][a-zA-Z0-9-]*(?:\.[a-zA-Z0-9-]+)+(?::\d+\.\d+\.\d+)?)/g;
 
 /**
- * Regex to match @dxn: prefixed references in text.
+ * Regex matching an `@`-prefixed reference URI in text.
  */
-const AT_DXN_PATTERN = /@(dxn:[a-zA-Z0-9]+(?::[a-zA-Z0-9@_-]+)+)/g;
+const AT_URI_PATTERN = new RegExp(`@(${URI_PATTERN.source})`, 'g');
 
 /**
- * Extracts all DXN references from a string.
+ * Extracts all reference URIs from a string.
  */
-export const extractDxnsFromString = (text: string): DXN[] => {
-  const dxns: DXN[] = [];
+export const extractDxnFromString = (text: string): URI.URI[] => {
+  const dxns: URI.URI[] = [];
   const seen = new Set<string>();
 
-  // Match @dxn: prefixed references.
-  let match;
-  while ((match = AT_DXN_PATTERN.exec(text)) !== null) {
-    const dxnStr = match[1];
-    if (!seen.has(dxnStr)) {
-      const dxn = DXN.tryParse(dxnStr);
-      if (dxn) {
-        dxns.push(dxn);
-        seen.add(dxnStr);
-      }
+  const add = (uri: string) => {
+    if (!seen.has(uri)) {
+      dxns.push(URI.make(uri));
+      seen.add(uri);
     }
+  };
+
+  // Match @-prefixed references.
+  let match;
+  while ((match = AT_URI_PATTERN.exec(text)) !== null) {
+    add(match[1]);
   }
 
-  // Match plain dxn: strings.
-  while ((match = DXN_PATTERN.exec(text)) !== null) {
-    const dxnStr = match[0];
-    if (!seen.has(dxnStr)) {
-      const dxn = DXN.tryParse(dxnStr);
-      if (dxn) {
-        dxns.push(dxn);
-        seen.add(dxnStr);
-      }
-    }
+  // Match plain URI strings.
+  while ((match = URI_PATTERN.exec(text)) !== null) {
+    add(match[0]);
   }
 
   return dxns;
@@ -64,17 +56,14 @@ export const extractDxnsFromString = (text: string): DXN[] => {
  * Extracts DXN references from a JSON object.
  * Handles IPLD-style references `{ "/": "dxn:..." }` and `{ "@dxn": "dxn:..." }`.
  */
-export const extractDxnsFromObject = (obj: unknown): DXN[] => {
-  const dxns: DXN[] = [];
+export const extractDxnsFromObject = (obj: unknown): URI.URI[] => {
+  const dxns: URI.URI[] = [];
   const seen = new Set<string>();
 
   const addDxn = (dxnStr: string) => {
     if (!seen.has(dxnStr)) {
-      const dxn = DXN.tryParse(dxnStr);
-      if (dxn) {
-        dxns.push(dxn);
-        seen.add(dxnStr);
-      }
+      dxns.push(URI.make(dxnStr));
+      seen.add(dxnStr);
     }
   };
 
@@ -84,16 +73,16 @@ export const extractDxnsFromObject = (obj: unknown): DXN[] => {
     }
 
     if (typeof value === 'string') {
-      // Check if the string itself is a DXN.
-      if (value.startsWith('dxn:')) {
+      // Check if the string itself is a reference URI.
+      if (value.startsWith('echo:') || value.startsWith('dxn:')) {
         addDxn(value);
-      } else if (value.startsWith('@dxn:')) {
+      } else if (value.startsWith('@echo:') || value.startsWith('@dxn:')) {
         addDxn(value.slice(1));
       }
-      // Also extract DXNs from within the string.
-      const extracted = extractDxnsFromString(value);
+      // Also extract references from within the string.
+      const extracted = extractDxnFromString(value);
       for (const dxn of extracted) {
-        addDxn(dxn.toString());
+        addDxn(dxn);
       }
       return;
     }
@@ -108,27 +97,26 @@ export const extractDxnsFromObject = (obj: unknown): DXN[] => {
     if (typeof value === 'object') {
       const record = value as Record<string, unknown>;
 
-      // Check for IPLD-style reference: { "/": "dxn:..." }
+      // Check for IPLD-style reference: { "/": "echo:…" | "dxn:…" }
       if ('/' in record && typeof record['/'] === 'string') {
-        const dxnStr = record['/'];
-        if (typeof dxnStr === 'string' && dxnStr.startsWith('dxn:')) {
-          addDxn(dxnStr);
+        const refStr = record['/'];
+        if (typeof refStr === 'string' && (refStr.startsWith('echo:') || refStr.startsWith('dxn:'))) {
+          addDxn(refStr);
         }
       }
 
-      // Check for @dxn key: { "@dxn": "dxn:..." }
-      if ('@dxn' in record && typeof record['@dxn'] === 'string') {
-        const dxnStr = record['@dxn'];
-        if (typeof dxnStr === 'string' && dxnStr.startsWith('dxn:')) {
-          addDxn(dxnStr);
-        }
+      // Check for self URI key: { "@uri": "echo:…" }
+      const selfUri = record['@uri'];
+      if (typeof selfUri === 'string' && (selfUri.startsWith('dxn:') || selfUri.startsWith('echo:'))) {
+        addDxn(selfUri);
       }
 
-      // Check for reference blocks: { _tag: 'reference', reference: { dxn: ... } }
+      // Check for reference blocks: { _tag: 'reference', reference: { uri: ... } }
       if (record._tag === 'reference' && record.reference && typeof record.reference === 'object') {
         const ref = record.reference as Record<string, unknown>;
-        if (ref.dxn && typeof ref.dxn === 'string') {
-          addDxn(ref.dxn);
+        const refUri = ref.uri;
+        if (typeof refUri === 'string' && (refUri.startsWith('echo:') || refUri.startsWith('dxn:'))) {
+          addDxn(refUri);
         }
       }
 
@@ -146,14 +134,14 @@ export const extractDxnsFromObject = (obj: unknown): DXN[] => {
 /**
  * Extracts the first DXN from a tool call input string (JSON).
  */
-export const extractFirstDxnFromToolInput = (input: string): DXN | undefined => {
+export const extractFirstDxnFromToolInput = (input: string): URI.URI | undefined => {
   try {
     const parsed = JSON.parse(input);
     const dxns = extractDxnsFromObject(parsed);
     return dxns[0];
   } catch {
     // If JSON parsing fails, try to extract from the raw string.
-    const dxns = extractDxnsFromString(input);
+    const dxns = extractDxnFromString(input);
     return dxns[0];
   }
 };
@@ -161,7 +149,7 @@ export const extractFirstDxnFromToolInput = (input: string): DXN | undefined =>
 /**
  * Extracts the first DXN from a tool result string (JSON).
  */
-export const extractFirstDxnFromToolResult = (result: string | undefined): DXN | undefined => {
+export const extractFirstDxnFromToolResult = (result: string | undefined): URI.URI | undefined => {
   if (!result) {
     return undefined;
   }
@@ -172,7 +160,7 @@ export const extractFirstDxnFromToolResult = (result: string | undefined): DXN |
     return dxns[0];
   } catch {
     // If JSON parsing fails, try to extract from the raw string.
-    const dxns = extractDxnsFromString(result);
+    const dxns = extractDxnFromString(result);
     return dxns[0];
   }
 };

package/src/containers/TracePanel/testing/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export * from './simulated-agent';
+export * from './snapshot-playback';

package/src/containers/TracePanel/testing/simulated-agent.ts

@@ -0,0 +1,114 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
+
+import { AgentRequestBegin, AgentRequestEnd, CompleteBlock } from '@dxos/assistant';
+import { Process, Trace } from '@dxos/compute';
+import { EntityId } from '@dxos/keys';
+
+export interface AgentScenario {
+  readonly prompt: string;
+  readonly tools: readonly string[];
+}
+
+/** Probability that any given run aborts with a simulated tool failure. */
+const FAILURE_PROBABILITY = 0.1;
+
+export const agentScenarios: readonly AgentScenario[] = [
+  {
+    prompt: 'Create an organization called "Cyberdyne Systems"',
+    tools: ['list-schemas', 'create-object'],
+  },
+  {
+    prompt: 'Search for all organizations and persons',
+    tools: ['list-schemas', 'query', 'query'],
+  },
+  {
+    prompt: 'Create a person named "John Connor"',
+    tools: ['create-object'],
+  },
+];
+
+const delay = (ms: number) => Effect.promise(() => new Promise<void>((resolve) => setTimeout(resolve, ms)));
+
+/**
+ * Write a trace event and yield to the event loop so FeedTraceSink flushes it to ECHO before continuing.
+ */
+const writeAndFlush = <T>(eventType: Trace.EventType<T>, payload: T) =>
+  Effect.gen(function* () {
+    yield* Trace.write(eventType, payload);
+    yield* Effect.promise(() => new Promise((resolve) => setTimeout(resolve, 100)));
+  });
+
+/**
+ * Storybook fixture: a {@link Process} that emits a deterministic stream of agent trace events
+ * (request begin/end, user message, sequential tool calls with simulated latency).
+ *
+ * Input is a scenario index into {@link agentScenarios} (modulo the array length).
+ */
+export const SimulatedAgent = Process.make(
+  {
+    key: 'org.dxos.testing.process.agent',
+    input: Schema.Number,
+    output: Schema.Void,
+    services: [Trace.TraceService],
+  },
+  (ctx) =>
+    Effect.succeed({
+      onInput: (index: number) =>
+        Effect.gen(function* () {
+          const messageId = EntityId.random();
+          const scenario = agentScenarios[index % agentScenarios.length];
+
+          // Decide upfront whether this run will fail (and at which tool) so the trace shows a partial sequence.
+          const failAtToolIndex =
+            Math.random() < FAILURE_PROBABILITY ? Math.floor(Math.random() * scenario.tools.length) : -1;
+
+          // Agent begins processing.
+          yield* writeAndFlush(AgentRequestBegin, {});
+
+          // User message.
+          yield* writeAndFlush(CompleteBlock, {
+            messageId,
+            role: 'user',
+            block: { _tag: 'text', text: scenario.prompt },
+          });
+
+          // Simulate tool calls sequentially with delays.
+          for (const [index, toolName] of scenario.tools.entries()) {
+            const toolCallId = EntityId.random();
+
+            // Tool call event.
+            yield* writeAndFlush(CompleteBlock, {
+              messageId,
+              role: 'assistant',
+              block: { _tag: 'toolCall', toolCallId, name: toolName, input: '{}', providerExecuted: false },
+            });
+
+            // Simulate tool execution time.
+            yield* delay(1_000 + Math.random() * 3_000);
+
+            if (index === failAtToolIndex) {
+              ctx.fail(new Error(`Simulated failure in tool '${toolName}'`));
+              return;
+            }
+
+            // Tool result event.
+            yield* writeAndFlush(CompleteBlock, {
+              messageId,
+              role: 'assistant',
+              block: { _tag: 'toolResult', toolCallId, name: toolName, providerExecuted: false },
+            });
+          }
+
+          // Agent completes.
+          yield* writeAndFlush(AgentRequestEnd, { status: 'success' });
+          ctx.succeed();
+        }).pipe(Effect.orDie),
+      onAlarm: () => Effect.void,
+      onChildEvent: () => Effect.void,
+    }),
+);

package/src/containers/TracePanel/testing/snapshot-playback.ts

@@ -0,0 +1,45 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Dispatch, type SetStateAction, useEffect, useRef, useState } from 'react';
+
+/**
+ * Interval (ms) between auto-played trace messages in the snapshot playback story.
+ */
+export const PLAYBACK_INTERVAL_MS = 250;
+
+export const STEP_STORAGE_KEY = 'plugin-assistant.trace-panel.snapshot.step';
+
+/**
+ * `useState<number>` that hydrates from and persists to `localStorage`.
+ * The third tuple member is `true` iff a valid value was loaded on first render.
+ */
+export const useLocalStorageNumber = (
+  key: string,
+  initial: number,
+): [number, Dispatch<SetStateAction<number>>, boolean] => {
+  const initRef = useRef<{ value: number; hydrated: boolean } | null>(null);
+  if (initRef.current === null) {
+    let value = initial;
+    let hydrated = false;
+    if (typeof window !== 'undefined') {
+      const stored = window.localStorage.getItem(key);
+      const parsed = stored === null ? Number.NaN : Number(stored);
+      if (Number.isInteger(parsed) && parsed >= 0) {
+        value = parsed;
+        hydrated = true;
+      }
+    }
+    initRef.current = { value, hydrated };
+  }
+
+  const [value, setValue] = useState(initRef.current.value);
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      window.localStorage.setItem(key, String(value));
+    }
+  }, [key, value]);
+
+  return [value, setValue, initRef.current.hydrated];
+};

package/src/containers/TriggerStatus/TriggerStatus.tsx

@@ -4,16 +4,16 @@
 
 import React, { useMemo } from 'react';
 
-import { useActiveSpace } from '@dxos/app-toolkit/ui';
+import { AppSurface } 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 { StatusBar } from '@dxos/plugin-status-bar/components';
+import { useObject } from '@dxos/react-client/echo';
+import { IconButton, Popover, useTranslation } from '@dxos/react-ui';
 
 import { meta } from '#meta';
 
-type TriggerStatusState = 'disabled' | 'idle' | 'running' | 'error';
+type TriggerStatusState = 'disabled' | 'idle' | 'running' | 'edge' | 'error';
 
 const getIcon = (state: TriggerStatusState): string => {
   switch (state) {
@@ -21,6 +21,8 @@ const getIcon = (state: TriggerStatusState): string => {
       return 'ph--lightning-slash--regular';
     case 'idle':
       return 'ph--lightning--regular';
+    case 'edge':
+      return 'ph--lightning--regular';
     case 'running':
       return 'ph--lightning--fill';
     case 'error':
@@ -39,24 +41,22 @@ const getIconClassNames = (state: TriggerStatusState): string | undefined => {
   }
 };
 
-export const TriggerStatus = () => {
-  const space = useActiveSpace();
-  const db = space?.db;
-  if (!db) {
-    return null;
-  }
-
-  return <SpaceStatusMain db={db} />;
-};
+export type SpaceStatusProps = AppSurface.SpaceArticleProps;
 
-const SpaceStatusMain = ({ db }: { db: Database.Database }) => {
+export const SpaceStatus = ({ space }: SpaceStatusProps) => {
   const { t } = useTranslation(meta.id);
-  const { state, start, stop } = useTriggerRuntimeControls(db);
-  const isRunning = state?.enabled ?? false;
+  const { state } = useTriggerRuntimeControls(space.db);
+  const isEnabled = state?.enabled ?? false;
+  const [properties] = useObject(space.properties);
+  const computeEnvironment = properties.computeEnvironment ?? 'local';
 
   // Determine the current trigger status state.
   const triggerState: TriggerStatusState = useMemo(() => {
-    if (!isRunning) {
+    if (computeEnvironment === 'edge') {
+      return 'edge';
+    }
+
+    if (!isEnabled) {
       return 'disabled';
     }
 
@@ -73,13 +73,14 @@ const SpaceStatusMain = ({ db }: { db: Database.Database }) => {
     }
 
     return 'idle';
-  }, [isRunning, state?.invocations]);
+  }, [computeEnvironment, isEnabled, state?.invocations]);
 
   return (
     <Popover.Root>
       <Popover.Trigger asChild>
         <StatusBar.Item>
           <IconButton
+            variant='ghost'
             icon={getIcon(triggerState)}
             iconOnly
             label={t(`trigger-status-${triggerState}.label`)}
@@ -90,13 +91,11 @@ const SpaceStatusMain = ({ db }: { db: Database.Database }) => {
       <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>
@@ -106,31 +105,20 @@ const SpaceStatusMain = ({ db }: { db: Database.Database }) => {
 };
 
 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' && (
@@ -140,5 +128,3 @@ const TriggerStatusPopover = ({
     </div>
   );
 };
-
-export default TriggerStatus;

package/src/containers/TriggerStatus/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export { TriggerStatus as default } from './TriggerStatus';
+export { SpaceStatus, SpaceStatus as default } from './TriggerStatus';

package/src/containers/index.ts

@@ -4,13 +4,14 @@
 
 import { type ComponentType, lazy } from 'react';
 
+export const AgentArticle: ComponentType<any> = lazy(() => import('./AgentArticle'));
+export const AgentProperties: ComponentType<any> = lazy(() => import('./AgentProperties'));
 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 ChatArticle: ComponentType<any> = lazy(() => import('./ChatArticle'));
 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 PlanArticle: ComponentType<any> = lazy(() => import('./PlanArticle'));
+export const RoutineArticle: ComponentType<any> = lazy(() => import('./RoutineArticle'));
+export const RoutineList: ComponentType<any> = lazy(() => import('./RoutineList'));
 export const TracePanel: ComponentType<any> = lazy(() => import('./TracePanel'));
 export const TriggerStatus: ComponentType<any> = lazy(() => import('./TriggerStatus'));