@dxos/plugin-debug 0.7.5-labs.a279d8c → 0.7.5-labs.a8b535d

package/src/capabilities/react-context.tsx

@@ -2,37 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 
 import { Capabilities, contributes } from '@dxos/app-framework';
-import { Timer } from '@dxos/async';
+import { DevtoolsContextProvider } from '@dxos/devtools';
 
 import { DEBUG_PLUGIN } from '../meta';
-import { DebugContext } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactContext, {
     id: DEBUG_PLUGIN,
-    context: ({ children }) => {
-      const [timer, setTimer] = useState<Timer>();
-      useEffect(() => timer?.state.on((value) => !value && setTimer(undefined)), [timer]);
-      useEffect(() => {
-        timer?.stop();
-      }, []);
-
-      return (
-        <DebugContext.Provider
-          value={{
-            running: !!timer,
-            start: (cb, options) => {
-              timer?.stop();
-              setTimer(new Timer(cb).start(options));
-            },
-            stop: () => timer?.stop(),
-          }}
-        >
-          {children}
-        </DebugContext.Provider>
-      );
-    },
+    context: ({ children }) => <DevtoolsContextProvider>{children}</DevtoolsContextProvider>,
   });

package/src/capabilities/react-surface.tsx

@@ -9,10 +9,35 @@ import {
   contributes,
   createIntent,
   createSurface,
-  useCapability,
+  LayoutAction,
   type PluginsContext,
 } from '@dxos/app-framework';
-import { Devtools } from '@dxos/devtools';
+import {
+  ConfigPanel,
+  CredentialsPanel,
+  DeviceListPanel,
+  DiagnosticsPanel,
+  FeedsPanel,
+  IdentityPanel,
+  KeyringPanel,
+  LoggingPanel,
+  MembersPanel,
+  MetadataPanel,
+  NetworkPanel,
+  ObjectsPanel,
+  SignalPanel,
+  SpaceInfoPanel,
+  SpaceListPanel,
+  StoragePanel,
+  SwarmPanel,
+  TracingPanel,
+  DashboardPanel,
+  EdgeDashboardPanel,
+  SearchPanel,
+  AutomergePanel,
+  WorkflowPanel,
+} from '@dxos/devtools';
+import { SettingsStore } from '@dxos/local-storage';
 import { Graph } from '@dxos/plugin-graph';
 import { SpaceAction, CollectionType } from '@dxos/plugin-space/types';
 import {
@@ -34,7 +59,7 @@ import {
   Wireframe,
 } from '../components';
 import { DEBUG_PLUGIN } from '../meta';
-import { type DebugSettingsProps } from '../types';
+import { type DebugSettingsProps, Devtools } from '../types';
 
 type SpaceDebug = {
   type: string;
@@ -45,41 +70,17 @@ type GraphDebug = {
   graph: Graph;
 };
 
-const isSpaceDebug = (data: any): data is SpaceDebug => data.type === `${DEBUG_PLUGIN}/space` && isSpace(data.space);
-const isGraphDebug = (data: any): data is GraphDebug => data.graph instanceof Graph;
+const isSpaceDebug = (data: any): data is SpaceDebug => data?.type === `${DEBUG_PLUGIN}/space` && isSpace(data.space);
+const isGraphDebug = (data: any): data is GraphDebug => data?.graph instanceof Graph;
 
 export default (context: PluginsContext) =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
       id: `${DEBUG_PLUGIN}/settings`,
-      role: 'settings',
-      filter: (data): data is any => data.subject === DEBUG_PLUGIN,
-      component: () => {
-        const settings = useCapability(Capabilities.SettingsStore).getStore<DebugSettingsProps>(DEBUG_PLUGIN)!.value;
-        return <DebugSettings settings={settings} />;
-      },
-    }),
-    createSurface({
-      id: `${DEBUG_PLUGIN}/status`,
-      role: 'status',
-      component: () => <DebugStatus />,
-    }),
-    createSurface({
-      id: `${DEBUG_PLUGIN}/complementary`,
-      role: 'complementary--debug',
-      filter: (data): data is { subject: ReactiveEchoObject<any> } => isEchoObject(data.subject),
-      component: ({ data }) => <DebugObjectPanel object={data.subject} />,
-    }),
-    createSurface({
-      id: `${DEBUG_PLUGIN}/devtools`,
       role: 'article',
-      filter: (data): data is any => {
-        const settings = context
-          .requestCapability(Capabilities.SettingsStore)
-          .getStore<DebugSettingsProps>(DEBUG_PLUGIN)!.value;
-        return data.subject === 'devtools' && !!settings.devtools;
-      },
-      component: () => <Devtools />,
+      filter: (data): data is { subject: SettingsStore<DebugSettingsProps> } =>
+        data.subject instanceof SettingsStore && data.subject.prefix === DEBUG_PLUGIN,
+      component: ({ data: { subject } }) => <DebugSettings settings={subject.value} />,
     }),
     createSurface({
       id: `${DEBUG_PLUGIN}/space`,
@@ -124,7 +125,7 @@ export default (context: PluginsContext) =>
     createSurface({
       id: `${DEBUG_PLUGIN}/wireframe`,
       role: ['article', 'section'],
-      disposition: 'hoist',
+      position: 'hoist',
       filter: (data): data is { subject: ReactiveEchoObject<any> } => {
         const settings = context
           .requestCapability(Capabilities.SettingsStore)
@@ -135,4 +136,172 @@ export default (context: PluginsContext) =>
         <Wireframe label={`${role}:${name}`} object={data.subject} classNames='row-span-2 overflow-hidden' />
       ),
     }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/complementary`,
+      role: 'complementary--debug',
+      filter: (data): data is { subject: ReactiveEchoObject<any> } => isEchoObject(data.subject),
+      component: ({ data }) => <DebugObjectPanel object={data.subject} />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/status`,
+      role: 'status',
+      component: () => <DebugStatus />,
+    }),
+
+    //
+    // Devtools
+    //
+
+    createSurface({
+      id: `${DEBUG_PLUGIN}/client/config`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Client.Config,
+      component: () => <ConfigPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/client/storage`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Client.Storage,
+      component: () => <StoragePanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/client/logs`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Client.Logs,
+      component: () => <LoggingPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/client/diagnostics`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Client.Diagnostics,
+      component: () => <DiagnosticsPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/client/tracing`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Client.Tracing,
+      component: () => <TracingPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/halo/identity`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Halo.Identity,
+      component: () => <IdentityPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/halo/devices`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Halo.Devices,
+      component: () => <DeviceListPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/halo/keyring`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Halo.Keyring,
+      component: () => <KeyringPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/halo/credentials`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Halo.Credentials,
+      component: () => <CredentialsPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/spaces`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Spaces,
+      component: () => {
+        const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+        const handleSelect = useCallback(
+          () => dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [Devtools.Echo.Space] })),
+          [dispatch],
+        );
+        return <SpaceListPanel onSelect={handleSelect} />;
+      },
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/space`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Space,
+      component: () => {
+        const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+        const handleSelect = useCallback(
+          () => dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [Devtools.Echo.Feeds] })),
+          [dispatch],
+        );
+        return <SpaceInfoPanel onSelectFeed={handleSelect} onSelectPipeline={handleSelect} />;
+      },
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/feeds`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Feeds,
+      component: () => <FeedsPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/objects`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Objects,
+      component: () => <ObjectsPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/automerge`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Automerge,
+      component: () => <AutomergePanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/members`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Members,
+      component: () => <MembersPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/metadata`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Metadata,
+      component: () => <MetadataPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/mesh/signal`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Mesh.Signal,
+      component: () => <SignalPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/mesh/swarm`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Mesh.Swarm,
+      component: () => <SwarmPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/mesh/network`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Mesh.Network,
+      component: () => <NetworkPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/agent/dashboard`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Agent.Dashboard,
+      component: () => <DashboardPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/agent/search`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Agent.Search,
+      component: () => <SearchPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/edge/dashboard`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Edge.Dashboard,
+      component: () => <EdgeDashboardPanel />,
+    }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/edge/workflows`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Edge.Workflows,
+      component: () => <WorkflowPanel />,
+    }),
   ]);

package/src/capabilities/settings.ts

@@ -11,7 +11,6 @@ import { type DebugSettingsProps, DebugSettingsSchema } from '../types';
 export default () => {
   const settings = create<DebugSettingsProps>({
     debug: true,
-    devtools: true,
   });
 
   return contributes(Capabilities.Settings, { schema: DebugSettingsSchema, prefix: DEBUG_PLUGIN, value: settings });

package/src/components/DebugSettings.tsx

@@ -2,16 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Gift, DownloadSimple, FirstAidKit } from '@phosphor-icons/react';
 import React, { useEffect, useState } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { type ConfigProto, defs, SaveConfig, Storage } from '@dxos/config';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
-import { useTranslation, Button, Toast, Input, useFileDownload, Select } from '@dxos/react-ui';
-import { DeprecatedFormInput } from '@dxos/react-ui-form';
-import { getSize, mx } from '@dxos/react-ui-theme';
+import { useTranslation, Button, Toast, Input, useFileDownload, Select, Icon } from '@dxos/react-ui';
+import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
 import { setDeep } from '@dxos/util';
 
 import { DEBUG_PLUGIN } from '../meta';
@@ -79,24 +77,21 @@ export const DebugSettings = ({ settings }: { settings: DebugSettingsProps }) =>
   };
 
   return (
-    <>
+    <DeprecatedFormContainer>
       <DeprecatedFormInput label={t('settings show debug panel')}>
         <Input.Switch checked={settings.debug} onCheckedChange={(checked) => (settings.debug = !!checked)} />
       </DeprecatedFormInput>
-      <DeprecatedFormInput label={t('settings show devtools panel')}>
-        <Input.Switch checked={settings.devtools} onCheckedChange={(checked) => (settings.devtools = !!checked)} />
-      </DeprecatedFormInput>
       <DeprecatedFormInput label={t('settings wireframe')}>
         <Input.Switch checked={settings.wireframe} onCheckedChange={(checked) => (settings.wireframe = !!checked)} />
       </DeprecatedFormInput>
       <DeprecatedFormInput label={t('settings download diagnostics')}>
         <Button onClick={handleDownload}>
-          <DownloadSimple className={getSize(5)} />
+          <Icon icon='ph--download-simple--regular' size={5} />
         </Button>
       </DeprecatedFormInput>
       <DeprecatedFormInput label={t('settings repair')}>
         <Button onClick={handleRepair}>
-          <FirstAidKit className={getSize(5)} />
+          <Icon icon='ph--first-aid-kit--regular' size={5} />
         </Button>
       </DeprecatedFormInput>
 
@@ -105,7 +100,7 @@ export const DebugSettings = ({ settings }: { settings: DebugSettingsProps }) =>
         <Toast.Root>
           <Toast.Body>
             <Toast.Title>
-              <Gift className={mx(getSize(5), 'inline mr-1')} weight='duotone' />
+              <Icon icon='ph--gift--duotone' size={5} classNames='inline mr-1' />
               <span>{toast.title}</span>
             </Toast.Title>
             {toast.description && <Toast.Description>{toast.description}</Toast.Description>}
@@ -145,7 +140,7 @@ export const DebugSettings = ({ settings }: { settings: DebugSettingsProps }) =>
           </Select.Portal>
         </Select.Root>
       </DeprecatedFormInput>
-    </>
+    </DeprecatedFormContainer>
   );
 };
 

package/src/components/DebugStatus.tsx

@@ -4,15 +4,14 @@
 
 import React, { useEffect, useRef, useState } from 'react';
 
-import { Capabilities, firstIdInPart, useCapability } from '@dxos/app-framework';
+import { useAppGraph, useLayout } from '@dxos/app-framework';
 import { TimeoutError } from '@dxos/async';
 import { StatsPanel, useStats } from '@dxos/devtools';
 import { getActiveSpace } from '@dxos/plugin-space';
 import { StatusBar } from '@dxos/plugin-status-bar';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { useNetworkStatus } from '@dxos/react-client/mesh';
-import { Icon } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { Icon, Popover } from '@dxos/react-ui';
 
 const styles = {
   success: 'text-sky-300 dark:text-green-700',
@@ -136,9 +135,9 @@ const SwarmIndicator = () => {
 // TODO(burdon): Merge with SaveStatus.
 const SavingIndicator = () => {
   const [state, _setState] = useState(0);
-  const location = useCapability(Capabilities.Location);
-  const { graph } = useCapability(Capabilities.AppGraph);
-  const _space = location && graph ? getActiveSpace(graph, firstIdInPart(location.active, 'main')) : undefined;
+  const layout = useLayout();
+  const { graph } = useAppGraph();
+  const _space = graph ? getActiveSpace(graph, layout.active[0]) : undefined;
   // TODO(dmaretskyi): Fix this when we have save status for automerge.
   // useEffect(() => {
   //   if (!space) {
@@ -186,22 +185,19 @@ const PerformanceIndicator = () => {
   const [stats, refreshStats] = useStats();
 
   return (
-    <>
-      <StatusBar.Button onClick={() => setVisible((visible) => !visible)} title='Performance panels'>
-        <Icon icon='ph--chart-bar--regular' size={4} />
-      </StatusBar.Button>
-      {visible && (
-        <div
-          className={mx(
-            'z-20 absolute bottom-[--statusbar-size] right-4 w-[450px]',
-            'overflow-x-hidden overflow-y-auto scrollbar-thin',
-            'border-x border-y border-separator',
-          )}
-        >
+    <Popover.Root open={visible} onOpenChange={setVisible}>
+      <Popover.Trigger asChild>
+        <StatusBar.Button onClick={() => setVisible((visible) => !visible)} title='Performance panels'>
+          <Icon icon='ph--chart-bar--regular' size={4} />
+        </StatusBar.Button>
+      </Popover.Trigger>
+      <Popover.Portal>
+        <Popover.Content classNames='max-is-[min(var(--radix-popover-content-available-width),300px)] max-bs-[--radix-popover-content-available-height]'>
           <StatsPanel stats={stats} onRefresh={refreshStats} />
-        </div>
-      )}
-    </>
+          <Popover.Arrow />
+        </Popover.Content>
+      </Popover.Portal>
+    </Popover.Root>
   );
 };
 

package/src/components/SpaceGenerator/ObjectGenerator.tsx

@@ -5,9 +5,7 @@
 import { addressToA1Notation } from '@dxos/compute';
 import { ComputeGraph, ComputeGraphModel, DEFAULT_OUTPUT, NODE_INPUT, NODE_OUTPUT } from '@dxos/conductor';
 import { ObjectId, type BaseObject, type TypedObject } from '@dxos/echo-schema';
-import { type FunctionTrigger, TriggerKind } from '@dxos/functions/types';
-import { invariant } from '@dxos/invariant';
-import { DXN, SpaceId } from '@dxos/keys';
+import { DXN } from '@dxos/keys';
 import { create, makeRef, type ReactiveObject } from '@dxos/live-object';
 import { DocumentType } from '@dxos/plugin-markdown/types';
 import { createSheet } from '@dxos/plugin-sheet/types';
@@ -15,23 +13,6 @@ import { SheetType, type CellValue } from '@dxos/plugin-sheet/types';
 import { CanvasType, DiagramType } from '@dxos/plugin-sketch/types';
 import { faker } from '@dxos/random';
 import { Filter, type Space } from '@dxos/react-client/echo';
-import {
-  type ComputeShape,
-  createAppend,
-  createComputeGraph,
-  createConstant,
-  createGpt,
-  createQueue,
-  createText,
-  createTrigger,
-} from '@dxos/react-ui-canvas-compute';
-import {
-  pointMultiply,
-  pointsToRect,
-  rectToPoints,
-  CanvasBoardType,
-  CanvasGraphModel,
-} from '@dxos/react-ui-canvas-editor';
 import { TableType } from '@dxos/react-ui-table';
 import { createView, TextType } from '@dxos/schema';
 import { createAsyncGenerator, type ValueGenerator } from '@dxos/schema/testing';
@@ -139,7 +120,7 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
           .createNode({
             id: 'gpt-QUEUE_ID',
             type: 'constant',
-            value: new DXN(DXN.kind.QUEUE, ['data', SpaceId.random(), ObjectId.random()]).toString(),
+            value: new DXN(DXN.kind.QUEUE, ['data', space.id, ObjectId.random()]).toString(),
           })
           .createNode({ id: 'gpt-APPEND', type: 'append' })
           .createNode({ id: 'gpt-OUTPUT', type: NODE_OUTPUT })
@@ -155,70 +136,8 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
       return objects;
     },
   ],
-  [
-    CanvasBoardType.typename,
-    async (space, n, cb) => {
-      const objects = range(n, () => {
-        const canvasModel = CanvasGraphModel.create<ComputeShape>();
-
-        let functionTrigger: FunctionTrigger | undefined;
-        canvasModel.builder.call((builder) => {
-          const gpt = canvasModel.createNode(createGpt(position({ x: 0, y: -14 })));
-          const triggerShape = createTrigger({ triggerKind: TriggerKind.Webhook, ...position({ x: -18, y: -2 }) });
-          const trigger = canvasModel.createNode(triggerShape);
-          const text = canvasModel.createNode(createText(position({ x: 19, y: 3, width: 10, height: 10 })));
-          const queueId = canvasModel.createNode(
-            createConstant({
-              value: new DXN(DXN.kind.QUEUE, ['data', SpaceId.random(), ObjectId.random()]).toString(),
-              ...position({ x: -18, y: 5, width: 8, height: 6 }),
-            }),
-          );
-          const queue = canvasModel.createNode(createQueue(position({ x: -3, y: 3, width: 14, height: 10 })));
-          const append = canvasModel.createNode(createAppend(position({ x: 10, y: 6 })));
-
-          builder
-            .createEdge({ source: trigger.id, target: gpt.id, input: 'prompt', output: 'bodyText' })
-            .createEdge({ source: gpt.id, target: text.id, output: 'text' })
-            .createEdge({ source: queueId.id, target: queue.id })
-            .createEdge({ source: queueId.id, target: append.id, input: 'id' })
-            .createEdge({ source: gpt.id, target: append.id, output: 'messages', input: 'items' });
-
-          functionTrigger = triggerShape.functionTrigger!.target!;
-        });
-
-        const computeModel = createComputeGraph(canvasModel);
-        const computeGraph = computeModel.root;
-
-        invariant(functionTrigger);
-        functionTrigger.function = DXN.fromLocalObjectId(computeGraph.id).toString();
-        functionTrigger.meta ??= {};
-        const inputNode = computeModel.nodes.find((node) => node.type === NODE_INPUT)!;
-        functionTrigger.meta.computeNodeId = inputNode.id;
-
-        return space.db.add(
-          create(CanvasBoardType, {
-            computeGraph: makeRef(computeGraph),
-            layout: canvasModel.graph,
-          }),
-        );
-      });
-      cb?.(objects);
-      return objects;
-    },
-  ],
 ]);
 
-const position = (rect: { x: number; y: number; width?: number; height?: number }) => {
-  const snap = 32;
-  const [center, size] = rectToPoints({ width: 0, height: 0, ...rect });
-  const { x, y, width, height } = pointsToRect([pointMultiply(center, snap), pointMultiply(size, snap)]);
-  if (width && height) {
-    return { center: { x, y }, size: width && height ? { width, height } : undefined };
-  } else {
-    return { center: { x, y } };
-  }
-};
-
 export const createGenerator = <T extends BaseObject>(type: TypedObject<T>): ObjectGenerator<T> => {
   return async (
     space: Space,