@dxos/plugin-debug 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/src/containers/DebugGraph/DebugGraph.tsx

@@ -2,12 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { type FC } from 'react';
+import React from 'react';
 
 import { Tree } from '@dxos/devtools';
 import { Graph } from '@dxos/plugin-graph';
 
 export type DebugGraphProps = { graph: Graph.Graph; root: string };
-export const DebugGraph: FC<DebugGraphProps> = ({ graph, root }) => {
+
+export const DebugGraph = ({ graph, root }: DebugGraphProps) => {
   return <Tree data={Graph.toJSON(graph, root)} />;
 };

package/src/containers/DebugGraph/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2023 DXOS.org
 //
 
-import { DebugGraph } from './DebugGraph';
-
-export default DebugGraph;
+export { DebugGraph as default } from './DebugGraph';

package/src/containers/DebugObjectPanel/DebugObjectPanel.tsx

@@ -2,42 +2,73 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { ObjectsTree } from '@dxos/devtools';
-import { Filter, Obj, Query } from '@dxos/echo';
-import type { ObjectId } from '@dxos/keys';
+import { Filter, Json, Obj, Query } from '@dxos/echo';
+import type { EntityId } from '@dxos/keys';
 import { useQuery } from '@dxos/react-client/echo';
-import { Clipboard, Grid, Panel, ScrollArea } from '@dxos/react-ui';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { Clipboard, Input, Panel, ScrollArea, Toolbar } from '@dxos/react-ui';
+import { Syntax } from '@dxos/react-ui-syntax-highlighter';
+import { mx } from '@dxos/ui-theme';
 
-export type DebugObjectPanelProps = {
-  object: Obj.Unknown;
-};
-
-export const DebugObjectPanel = ({ object }: DebugObjectPanelProps) => {
-  const db = Obj.getDatabase(object);
+export type DebugObjectPanelProps = Pick<
+  AppSurface.ObjectArticleProps<Obj.Unknown, {}, Obj.Unknown>,
+  'role' | 'companionTo'
+>;
 
-  const [selectedId, setSelectedId] = useState<ObjectId | null>(null);
+export const DebugObjectPanel = ({ role, companionTo }: DebugObjectPanelProps) => {
+  const db = Obj.getDatabase(companionTo);
+  const [selectedId, setSelectedId] = useState<EntityId | null>(null);
+  const [depth, setDepth] = useState(0);
   const [selectedObject] = useQuery(
     db,
-    Query.select(Filter.id(selectedId ?? object.id)).options({ deleted: 'include' }),
+    Query.select(Filter.id(selectedId ?? companionTo.id)).options({ deleted: 'include' }),
   );
+  const refReplacer = useMemo(() => (db ? Json.createRefReplacer({ db, depth }) : undefined), [db, depth]);
 
   return (
     <Clipboard.Provider>
-      <Panel.Root>
+      <Panel.Root role={role}>
+        <Panel.Toolbar asChild>
+          <Toolbar.Root />
+        </Panel.Toolbar>
         <Panel.Content asChild>
-          <Grid rows={db ? 2 : 1} classNames='divide-y divide-separator'>
+          <div className={mx('grid divide-y divide-separator', db && 'grid-rows-[1fr_2fr]')}>
             {db && (
               <ScrollArea.Root>
                 <ScrollArea.Viewport>
-                  <ObjectsTree db={db} root={object} onSelect={(entity) => setSelectedId(entity.id)} />
+                  <ObjectsTree db={db} root={companionTo} onSelect={(entity) => setSelectedId(entity.id)} />
                 </ScrollArea.Viewport>
               </ScrollArea.Root>
             )}
-            <Json data={selectedObject} />
-          </Grid>
+            <Syntax.Root data={selectedObject} replacer={refReplacer}>
+              <Panel.Root>
+                <Panel.Toolbar asChild>
+                  <Toolbar.Root classNames='grid grid-cols-[1fr_3rem]'>
+                    <Syntax.Filter />
+                    <Input.Root>
+                      <Input.TextInput
+                        variant='subdued'
+                        type='number'
+                        min={0}
+                        step={1}
+                        aria-label='Ref depth'
+                        value={depth}
+                        onChange={(event) => setDepth(Math.max(0, Number(event.target.value) || 0))}
+                      />
+                    </Input.Root>
+                  </Toolbar.Root>
+                </Panel.Toolbar>
+                <Panel.Content asChild>
+                  <Syntax.Viewport>
+                    <Syntax.Code />
+                  </Syntax.Viewport>
+                </Panel.Content>
+              </Panel.Root>
+            </Syntax.Root>
+          </div>
         </Panel.Content>
       </Panel.Root>
     </Clipboard.Provider>

package/src/containers/DebugObjectPanel/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-import { DebugObjectPanel } from './DebugObjectPanel';
-
-export default DebugObjectPanel;
+export { DebugObjectPanel as default } from './DebugObjectPanel';

package/src/containers/DebugSpaceObjectsPanel/DebugSpaceObjectsPanel.tsx

@@ -4,33 +4,20 @@
 
 import React, { useState } from 'react';
 
-import { useCapability } from '@dxos/app-framework/ui';
-import { useLayout } from '@dxos/app-toolkit/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { ObjectsTree } from '@dxos/devtools';
-import { type Database, Filter, Query } from '@dxos/echo';
-import type { ObjectId } from '@dxos/keys';
-import { ClientCapabilities } from '@dxos/plugin-client';
-import { parseId, useQuery } from '@dxos/react-client/echo';
+import { Filter, Query } from '@dxos/echo';
+import { type EntityId } from '@dxos/keys';
+import { useQuery } from '@dxos/react-client/echo';
 import { Clipboard, Grid, Input, Panel, ScrollArea, Toolbar } from '@dxos/react-ui';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
 
-export const DebugSpaceObjectsPanel = () => {
-  const layout = useLayout();
-  const client = useCapability(ClientCapabilities.Client);
-  const { spaceId } = parseId(layout.workspace);
-  const space = spaceId ? client.spaces.get(spaceId) : undefined;
-  if (!space) {
-    return null;
-  }
-
-  return <DebugSpaceObjectsPanelMain database={space.db} />;
-};
-
-const DebugSpaceObjectsPanelMain = ({ database }: { database: Database.Database }) => {
-  const [selectedId, setSelectedId] = useState<ObjectId | null>(null);
+export type DebugSpaceObjectsPanelProps = AppSurface.SpaceArticleProps;
 
+export const DebugSpaceObjectsPanel = ({ space }: DebugSpaceObjectsPanelProps) => {
+  const [selectedId, setSelectedId] = useState<EntityId | null>(null);
   const [selectedObject] = useQuery(
-    database,
+    space.db,
     selectedId ? Query.select(Filter.id(selectedId)) : Query.select(Filter.nothing()),
   );
 
@@ -48,10 +35,10 @@ const DebugSpaceObjectsPanelMain = ({ database }: { database: Database.Database
           <Grid rows={2} classNames='divide-y divide-separator'>
             <ScrollArea.Root>
               <ScrollArea.Viewport>
-                <ObjectsTree db={database} onSelect={(entity) => setSelectedId(entity.id)} />
+                <ObjectsTree db={space.db} onSelect={(entity) => setSelectedId(entity.id)} />
               </ScrollArea.Viewport>
             </ScrollArea.Root>
-            {selectedObject && <Json classNames='p-1' data={selectedObject} />}
+            {selectedObject && <JsonHighlighter classNames='p-1' data={selectedObject} />}
           </Grid>
         </Panel.Content>
       </Panel.Root>

package/src/containers/DebugSpaceObjectsPanel/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-import { DebugSpaceObjectsPanel } from './DebugSpaceObjectsPanel';
-
-export default DebugSpaceObjectsPanel;
+export { DebugSpaceObjectsPanel as default } from './DebugSpaceObjectsPanel';

package/src/containers/DebugStatus/DebugStatus.tsx

@@ -5,11 +5,10 @@
 import React, { useEffect, useRef, useState } from 'react';
 
 import { TimeoutError } from '@dxos/async';
-import { useActiveSpace } from '@dxos/plugin-space';
-import { StatusBar } from '@dxos/plugin-status-bar';
+import { StatusBar } from '@dxos/plugin-status-bar/components';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { useNetworkStatus } from '@dxos/react-client/mesh';
-import { Icon } from '@dxos/react-ui';
+import { IconButton } from '@dxos/react-ui';
 
 const styles = {
   success: 'text-sky-300 dark:text-green-700',
@@ -89,14 +88,21 @@ const ErrorIndicator = () => {
 
   if (errorRef.current) {
     return (
-      <StatusBar.Button title={errorRef.current.message} onClick={handleReset}>
-        <Icon icon='ph--warning-circle--duotone' size={4} classNames={styles.error} />
-      </StatusBar.Button>
+      <StatusBar.Item>
+        <IconButton
+          variant='ghost'
+          icon='ph--warning-circle--duotone'
+          iconOnly
+          label={errorRef.current.message}
+          classNames={styles.error}
+          onClick={handleReset}
+        />
+      </StatusBar.Item>
     );
   } else {
     return (
-      <StatusBar.Item title='No errors.'>
-        <Icon icon='ph--check--regular' size={4} />
+      <StatusBar.Item>
+        <IconButton variant='ghost' icon='ph--check--regular' iconOnly label='No errors.' />
       </StatusBar.Item>
     );
   }
@@ -114,14 +120,20 @@ const SwarmIndicator = () => {
 
   if (state === 0) {
     return (
-      <StatusBar.Item title='Connected to swarm.'>
-        <Icon icon='ph--lightning--regular' size={4} />
+      <StatusBar.Item>
+        <IconButton variant='ghost' icon='ph--lightning--regular' iconOnly label='Connected to swarm.' />
       </StatusBar.Item>
     );
   } else {
     return (
-      <StatusBar.Item title='Disconnected from swarm.'>
-        <Icon icon='ph--lightning-slash--regular' size={4} classNames={styles.warning} />
+      <StatusBar.Item>
+        <IconButton
+          variant='ghost'
+          icon='ph--lightning-slash--regular'
+          iconOnly
+          label='Disconnected from swarm.'
+          classNames={styles.warning}
+        />
       </StatusBar.Item>
     );
   }
@@ -133,7 +145,6 @@ const SwarmIndicator = () => {
 // TODO(burdon): Merge with SaveStatus.
 const SavingIndicator = () => {
   const [state, _setState] = useState(0);
-  const _space = useActiveSpace();
   // TODO(dmaretskyi): Fix this when we have save status for automerge.
   // useEffect(() => {
   //   if (!space) {
@@ -156,21 +167,33 @@ const SavingIndicator = () => {
   switch (state) {
     case 2:
       return (
-        <StatusBar.Item title='Edit not saved.'>
-          <Icon icon='ph--circle--duotone' size={4} classNames={styles.warning} />
+        <StatusBar.Item>
+          <IconButton
+            variant='ghost'
+            icon='ph--circle--duotone'
+            iconOnly
+            label='Edit not saved.'
+            classNames={styles.warning}
+          />
         </StatusBar.Item>
       );
     case 1:
       return (
-        <StatusBar.Item title='Saving...'>
-          <Icon icon='ph--circle--duotone' size={4} classNames={styles.success} />
+        <StatusBar.Item>
+          <IconButton
+            variant='ghost'
+            icon='ph--circle--duotone'
+            iconOnly
+            label='Saving...'
+            classNames={styles.success}
+          />
         </StatusBar.Item>
       );
     case 0:
     default:
       return (
-        <StatusBar.Item title='Modified indicator.'>
-          <Icon icon='ph--circle--duotone' size={4} />
+        <StatusBar.Item>
+          <IconButton variant='ghost' icon='ph--circle--duotone' iconOnly label='Modified indicator.' />
         </StatusBar.Item>
       );
   }

package/src/containers/DebugStatus/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2023 DXOS.org
 //
 
-import { DebugStatus } from './DebugStatus';
-
-export default DebugStatus;
+export { DebugStatus as default } from './DebugStatus';

package/src/containers/DevtoolsOverviewContainer/DevtoolsOverviewContainer.tsx

@@ -9,9 +9,16 @@ import { StatsPanel, useStats } from '@dxos/devtools';
 
 export const DevtoolsOverviewContainer = () => {
   const [stats, refreshStats] = useStats();
+  const surfaceProfilerStats = Surface.useProfilerStats();
+  const clearSurfaceProfiler = Surface.useProfilerClear();
 
   return (
-    <StatsPanel stats={stats} onRefresh={refreshStats}>
+    <StatsPanel
+      stats={stats}
+      surfaceProfilerStats={surfaceProfilerStats}
+      onRefresh={refreshStats}
+      onClearSurfaceProfiler={clearSurfaceProfiler}
+    >
       <Surface.Surface role='devtools-overview' />
     </StatsPanel>
   );

package/src/containers/DevtoolsOverviewContainer/index.ts

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

package/src/containers/GithubPanel/GithubComponent.stories.tsx

@@ -0,0 +1,38 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '#translations';
+
+import { GithubComponent } from './GithubComponent';
+
+const DefaultStory = () => (
+  <GithubComponent.Root>
+    <div className='grid grid-rows-[auto_minmax(0,1fr)_auto] overflow-hidden h-full is-full'>
+      <GithubComponent.Header />
+      <GithubComponent.Content />
+      <GithubComponent.StatusBar />
+    </div>
+  </GithubComponent.Root>
+);
+
+const meta = {
+  title: 'plugins/plugin-debug/containers/GithubComponent',
+  component: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'column', classNames: 'w-(--dx-r1-size)' })],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/containers/GithubPanel/GithubComponent.tsx

@@ -0,0 +1,192 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React, { type ReactNode, createContext, useContext, useEffect, useState } from 'react';
+
+import { IconButton, ScrollArea, useTranslation } from '@dxos/react-ui';
+
+import { meta } from '#meta';
+
+const DEFAULT_REPO = 'dxos/dxos';
+const DEFAULT_LIMIT = 20;
+
+type GithubUser = {
+  login: string;
+  avatar_url: string;
+  html_url: string;
+};
+
+type GithubPullRequest = {
+  number: number;
+  title: string;
+  html_url: string;
+  merged_at: string | null;
+  user: GithubUser;
+};
+
+type ComponentContextValue = {
+  repo: string;
+  pulls: GithubPullRequest[];
+  unavailable: boolean;
+};
+
+const ComponentContext = createContext<ComponentContextValue | null>(null);
+
+const useComponentContext = () => {
+  const ctx = useContext(ComponentContext);
+  if (!ctx) {
+    throw new Error('GithubComponent.* parts must be rendered inside GithubComponent.Root.');
+  }
+  return ctx;
+};
+
+export type GithubComponentRootProps = {
+  /** `<owner>/<name>`. Defaults to `dxos/dxos`. */
+  repo?: string;
+  /** Maximum number of merged PRs to fetch. */
+  limit?: number;
+  children?: ReactNode;
+};
+
+const Root = ({ repo = DEFAULT_REPO, limit = DEFAULT_LIMIT, children }: GithubComponentRootProps) => {
+  const [pulls, setPulls] = useState<GithubPullRequest[]>([]);
+  const [unavailable, setUnavailable] = useState(false);
+
+  useEffect(() => {
+    const controller = new AbortController();
+    setPulls([]);
+    setUnavailable(false);
+    void (async () => {
+      try {
+        const url = new URL(`https://api.github.com/repos/${repo}/pulls`);
+        url.searchParams.set('state', 'closed');
+        url.searchParams.set('sort', 'updated');
+        url.searchParams.set('direction', 'desc');
+        url.searchParams.set('per_page', String(limit * 2));
+        const response = await fetch(url.toString(), {
+          signal: controller.signal,
+          headers: { Accept: 'application/vnd.github+json' },
+        });
+        if (!response.ok) {
+          setUnavailable(true);
+          return;
+        }
+        const items = (await response.json()) as GithubPullRequest[];
+        setPulls(items.filter((pull) => pull.merged_at !== null).slice(0, limit));
+        setUnavailable(false);
+      } catch {
+        if (controller.signal.aborted) {
+          return;
+        }
+        setPulls([]);
+        setUnavailable(true);
+      }
+    })();
+    return () => controller.abort();
+  }, [repo, limit]);
+
+  return <ComponentContext.Provider value={{ repo, pulls, unavailable }}>{children}</ComponentContext.Provider>;
+};
+
+const Header = () => {
+  const { t } = useTranslation(meta.id);
+  const { repo, pulls, unavailable } = useComponentContext();
+  return (
+    <header className='flex items-center justify-between gap-1 px-4 py-3 bg-modal-surface border-b border-subdued-separator'>
+      <a
+        href={`https://github.com/${repo}`}
+        target='_blank'
+        rel='noopener noreferrer'
+        className='text-sm font-medium truncate'
+      >
+        @{repo}
+      </a>
+      <div className='text-xs text-description'>
+        {unavailable
+          ? t('github-unavailable.message')
+          : pulls.length > 0
+            ? t('recent-prs.label', { count: pulls.length })
+            : t('github-loading.message')}
+      </div>
+    </header>
+  );
+};
+
+const RELATIVE_UNITS: Array<[Intl.RelativeTimeFormatUnit, number]> = [
+  ['year', 60 * 60 * 24 * 365],
+  ['month', 60 * 60 * 24 * 30],
+  ['week', 60 * 60 * 24 * 7],
+  ['day', 60 * 60 * 24],
+  ['hour', 60 * 60],
+  ['minute', 60],
+];
+
+const formatRelative = (iso: string): string => {
+  const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' });
+  const diffSeconds = (Date.parse(iso) - Date.now()) / 1000;
+  const absDiff = Math.abs(diffSeconds);
+  for (const [unit, secondsInUnit] of RELATIVE_UNITS) {
+    if (absDiff >= secondsInUnit) {
+      return formatter.format(Math.round(diffSeconds / secondsInUnit), unit);
+    }
+  }
+  return formatter.format(Math.round(diffSeconds), 'second');
+};
+
+const PullRow = ({ pull }: { pull: GithubPullRequest }) => (
+  <li>
+    <a
+      href={pull.html_url}
+      target='_blank'
+      rel='noopener noreferrer'
+      className='flex items-start gap-2 px-2 py-1 rounded-sm hover:bg-hover-surface'
+    >
+      <img src={pull.user.avatar_url} alt='' className='w-6 h-6 rounded-full shrink-0 mt-0.5' />
+      <div className='flex flex-col min-w-0 flex-1'>
+        <span className='text-sm truncate'>{pull.title}</span>
+        <span className='text-xs text-description truncate'>
+          #{pull.number} · {pull.user.login} · {pull.merged_at ? formatRelative(pull.merged_at) : ''}
+        </span>
+      </div>
+    </a>
+  </li>
+);
+
+const Content = () => {
+  const { pulls } = useComponentContext();
+  return (
+    <ScrollArea.Root orientation='vertical'>
+      <ScrollArea.Viewport>
+        <ul className='flex flex-col p-1'>
+          {pulls.map((pull) => (
+            <PullRow key={pull.number} pull={pull} />
+          ))}
+        </ul>
+      </ScrollArea.Viewport>
+    </ScrollArea.Root>
+  );
+};
+
+const StatusBar = () => {
+  const { t } = useTranslation(meta.id);
+  const { repo } = useComponentContext();
+  return (
+    <IconButton
+      icon='ph--github-logo--regular'
+      label={t('view-on-github.button')}
+      variant='primary'
+      classNames='w-full'
+      onClick={() => {
+        window.open(`https://github.com/${repo}`, '_blank', 'noopener,noreferrer');
+      }}
+    />
+  );
+};
+
+export const GithubComponent = {
+  Root,
+  Header,
+  Content,
+  StatusBar,
+};

package/src/containers/GithubPanel/GithubPanel.tsx

@@ -0,0 +1,17 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React from 'react';
+
+import { GithubComponent } from './GithubComponent';
+
+export const GithubPanel = () => (
+  <GithubComponent.Root>
+    <div className='h-full grid grid-rows-[auto_minmax(0,1fr)_auto] overflow-hidden h-full is-full'>
+      <GithubComponent.Header />
+      <GithubComponent.Content />
+      <GithubComponent.StatusBar />
+    </div>
+  </GithubComponent.Root>
+);

package/src/containers/GithubPanel/index.ts

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