@dxos/plugin-script 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/src/{components → containers}/DeploymentDialog/DeploymentDialog.tsx

@@ -4,18 +4,16 @@
 
 import React, { useEffect, useMemo } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useOperationInvoker } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import { getSpace } from '@dxos/react-client/echo';
-import { Button, Dialog, IconButton, useTranslation } from '@dxos/react-ui';
+import { Button, Dialog, useTranslation } from '@dxos/react-ui';
 import { type AccessToken } from '@dxos/types';
 
-import { useCreateAndDeployScriptTemplates } from '../../hooks';
-import { meta } from '../../meta';
+import { useCreateAndDeployScriptTemplates } from '#hooks';
+import { meta } from '#meta';
 import { type Template } from '../../templates';
 
-export const DEPLOYMENT_DIALOG = `${meta.id}/deployment/dialog`;
-
 // TODO(ZaymonFC):
 //  - Show activity and feedback to the user.
 //  - Only take an array of templateIds and get the name from the data.
@@ -38,66 +36,63 @@ export const DeploymentDialog = ({ accessToken, scriptTemplates }: DeploymentDia
   useEffect(() => {
     if (status === 'success') {
       // TODO(ZaymonFC): We can probably re-use this toast for normal script deployment.
-      void invokePromise(Common.LayoutOperation.AddToast, {
-        id: `${meta.id}/deployment-success`,
+      void invokePromise(LayoutOperation.AddToast, {
+        id: `${meta.id}.deployment-success`,
         icon: 'ph--check--regular',
         duration: Infinity,
-        title: ['script deployment toast label', { ns: meta.id, count: scriptTemplates.length }],
-        description: ['script deployment toast description', { ns: meta.id, count: scriptTemplates.length }],
-        closeLabel: ['script deployment toast close label', { ns: meta.id, count: scriptTemplates.length }],
+        title: ['script-deployment-toast.label', { ns: meta.id, count: scriptTemplates.length }],
+        description: ['script-deployment-toast.description', { ns: meta.id, count: scriptTemplates.length }],
+        closeLabel: ['script-deployment-toast-close.label', { ns: meta.id, count: scriptTemplates.length }],
       });
-      void invokePromise(Common.LayoutOperation.UpdateDialog, { state: false });
+      void invokePromise(LayoutOperation.UpdateDialog, { state: false });
     }
     if (status === 'error') {
-      void invokePromise(Common.LayoutOperation.UpdateDialog, { state: false });
-      void invokePromise(Common.LayoutOperation.AddToast, {
-        id: `${meta.id}/deployment-error`,
+      void invokePromise(LayoutOperation.UpdateDialog, { state: false });
+      void invokePromise(LayoutOperation.AddToast, {
+        id: `${meta.id}.deployment-error`,
         icon: 'ph--warning--regular',
         duration: Infinity,
-        title: ['script deployment error toast label', { ns: meta.id, count: scriptTemplates.length }],
-        description: ['script deployment error toast description', { ns: meta.id, count: scriptTemplates.length }],
-        closeLabel: ['script deployment error toast close label', { ns: meta.id, count: scriptTemplates.length }],
+        title: ['script-deployment-error-toast.label', { ns: meta.id, count: scriptTemplates.length }],
+        description: ['script-deployment-error-toast.description', { ns: meta.id, count: scriptTemplates.length }],
+        closeLabel: ['script-deployment-error-toast-close.label', { ns: meta.id, count: scriptTemplates.length }],
       });
     }
   }, [status, invokePromise]);
 
   return (
     <Dialog.Content>
-      <div className='flex justify-between items-center'>
-        <Dialog.Title>{t('deployment dialog title')}</Dialog.Title>
+      <Dialog.Header>
+        <Dialog.Title>{t('deployment-dialog.title')}</Dialog.Title>
         <Dialog.Close asChild>
-          <IconButton icon='ph--x--regular' size={4} label='Close' iconOnly density='fine' variant='ghost' />
+          <Dialog.CloseIconButton />
         </Dialog.Close>
-      </div>
-      <div role='none' className='plb-4'>
-        {/* TODO: Implement deployment logic and UI. */}
+      </Dialog.Header>
+      <Dialog.Body>
         <p>
-          {t('deployment dialog scripts found message', {
+          {t('deployment-dialog-scripts-found.message', {
             count: scriptTemplates.length,
           })}
         </p>
-        <ul className='pbs-2'>
+        <ul className='pt-2'>
           {scriptTemplates.map((template) => {
             return <li key={template.id}>{template.name}</li>;
           })}
         </ul>
-      </div>
-      <div role='none' className='flex flex-row-reverse gap-1'>
+      </Dialog.Body>
+      <Dialog.ActionBar>
+        <Dialog.Close asChild>
+          <Button disabled={status === 'pending'}>{t('deployment-dialog-skip-button.label')}</Button>
+        </Dialog.Close>
         <Button variant='primary' onClick={handleCreateAndDeployScripts} disabled={status === 'pending'}>
           {status === 'pending'
-            ? t('deployment dialog deploy functions pending button label', {
+            ? t('deployment-dialog-deploy-functions-pending-button.label', {
                 count: scriptTemplates.length,
               })
-            : t('deployment dialog deploy functions button label', {
+            : t('deployment-dialog-deploy-functions-button.label', {
                 count: scriptTemplates.length,
               })}
         </Button>
-        <Dialog.Close asChild disabled={status === 'pending'}>
-          <Button disabled={status === 'pending'}>{t('deployment dialog skip button label')}</Button>
-        </Dialog.Close>
-      </div>
+      </Dialog.ActionBar>
     </Dialog.Content>
   );
 };
-
-export default DeploymentDialog;

package/src/containers/DeploymentDialog/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { DeploymentDialog } from './DeploymentDialog';
+
+export default DeploymentDialog;

package/src/{components → containers/NotebookContainer}/NotebookContainer.stories.tsx

@@ -8,38 +8,38 @@ import React from 'react';
 
 import { SERVICES_CONFIG } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Agent } from '@dxos/assistant-toolkit';
+import { AgentPrompt } from '@dxos/assistant-toolkit';
 import { Filter } from '@dxos/echo';
-import { Function, serializeFunction } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
 import { AssistantPlugin } from '@dxos/plugin-assistant';
 import { AutomationPlugin } from '@dxos/plugin-automation';
 import { ClientPlugin } from '@dxos/plugin-client';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { ExplorerPlugin } from '@dxos/plugin-explorer';
 import { Markdown, MarkdownPlugin } from '@dxos/plugin-markdown';
 import { corePlugins } from '@dxos/plugin-testing';
 import { Config, useClient } from '@dxos/react-client';
 import { useQuery } from '@dxos/react-client/echo';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { withLayout } from '@dxos/react-ui/testing';
 import { DataTypes } from '@dxos/schema';
 
-import { createNotebook } from '../testing';
-import { translations } from '../translations';
-import { Notebook } from '../types';
+import { createNotebook } from '#testing';
+import { translations } from '../../translations';
+import { Notebook } from '#types';
 
 import { NotebookContainer } from './NotebookContainer';
 
 const meta: Meta<typeof NotebookContainer> = {
-  title: 'plugins/plugin-script/NotebookContainer',
+  title: 'plugins/plugin-script/containers/NotebookContainer',
   component: NotebookContainer,
   render: (args) => {
     const client = useClient();
-    const space = client.spaces.default;
+    const space = client.spaces.get()[0];
     const notebooks = useQuery(space?.db, Filter.type(Notebook.Notebook));
-    return <NotebookContainer {...args} subject={notebooks[0]} />;
+    return <NotebookContainer {...args} subject={notebooks[0]} attendableId='test' />;
   },
   decorators: [
-    withTheme,
-    withLayout({ layout: 'column', classNames: 'is-proseMaxWidth' }),
+    withLayout({ layout: 'column', classNames: 'w-document-max-width' }),
     withPluginManager({
       plugins: [
         ...corePlugins(),
@@ -50,17 +50,14 @@ const meta: Meta<typeof NotebookContainer> = {
               services: SERVICES_CONFIG.REMOTE,
             },
           }),
-          types: [...DataTypes, Notebook.Notebook, Function.Function, Markdown.Document],
+          types: [...DataTypes, Notebook.Notebook, Operation.PersistentOperation, Markdown.Document],
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
-              yield* Effect.promise(() => client.halo.createIdentity());
-              yield* Effect.promise(() => client.spaces.waitUntilReady());
-              const space = client.spaces.default;
-              yield* Effect.promise(() => space.waitUntilReady());
+              const { personalSpace } = yield* initializeIdentity(client);
 
-              space.db.add(createNotebook());
-              space.db.add(Markdown.make({ content: '# Hello World' }));
-              space.db.add(serializeFunction(Agent.prompt));
+              personalSpace.db.add(createNotebook());
+              personalSpace.db.add(Markdown.make({ content: '# Hello World' }));
+              personalSpace.db.add(Operation.serialize(AgentPrompt));
             }),
         }),
         AssistantPlugin(),

package/src/{components → containers/NotebookContainer}/NotebookContainer.tsx

@@ -9,40 +9,41 @@ import * as Exit from 'effect/Exit';
 import type * as Types from 'effect/Types';
 import React, { useCallback, useContext, useMemo, useState } from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-framework/react';
-import { Agent } from '@dxos/assistant-toolkit';
+import { type ObjectSurfaceProps } from '@dxos/app-toolkit/ui';
+import { AgentPrompt } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Filter, Obj, Query, Ref } from '@dxos/echo';
 import { QueryBuilder } from '@dxos/echo-query';
-import { type FunctionDefinition, FunctionInvocationService, TracingService } from '@dxos/functions';
+import { FunctionInvocationService, TracingService } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { useComputeRuntimeCallback } from '@dxos/plugin-automation';
+import { useComputeRuntimeCallback } from '@dxos/plugin-automation/hooks';
 import { Graph } from '@dxos/plugin-explorer/types';
-import { DropdownMenu, IconButton, Toolbar, useTranslation } from '@dxos/react-ui';
+import { DropdownMenu, IconButton, Panel, Toolbar, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
-import { Layout } from '@dxos/react-ui-mosaic';
-import { Text, View } from '@dxos/schema';
+import { Text, ViewModel } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { meta } from '../meta';
-import { ComputeGraph } from '../notebook';
-import { type Notebook } from '../types';
+import { NotebookMenu, NotebookStack, type NotebookStackProps, type TypescriptEditorProps } from '#components';
+import { meta } from '#meta';
+import { ComputeGraph } from '../../notebook';
+import { type Notebook } from '#types';
 
-import { NotebookMenu, NotebookStack, type NotebookStackProps } from './NotebookStack';
-import { type TypescriptEditorProps } from './TypescriptEditor';
-
-const INCLUDE_BLUEPRINTS = ['dxos.org/blueprint/assistant', 'dxos.org/blueprint/markdown'];
+const INCLUDE_BLUEPRINTS = [
+  'org.dxos.blueprint.assistant',
+  'org.dxos.blueprint.database',
+  'org.dxos.blueprint.markdown',
+];
 
 // TODO(burdon): Support calling named deployed functions (as with sheet).
 
-export type NotebookContainerProps = SurfaceComponentProps<Notebook.Notebook, Pick<TypescriptEditorProps, 'env'>>;
+export type NotebookContainerProps = ObjectSurfaceProps<Notebook.Notebook, Pick<TypescriptEditorProps, 'env'>>;
 
-export const NotebookContainer = ({ role, subject: notebook, env }: NotebookContainerProps) => {
+export const NotebookContainer = ({ role, subject: notebook, attendableId, env }: NotebookContainerProps) => {
   const { t } = useTranslation(meta.id);
   const registry = useContext(RegistryContext);
-  const db = notebook && Obj.getDatabase(notebook);
-  const attendableId = notebook ? Obj.getDXN(notebook).toString() : '';
+  const db = Obj.getDatabase(notebook);
   const { hasAttention } = useAttention(attendableId);
 
   // TODO(burdon): Consolidate execution and state (with graph).
@@ -63,18 +64,18 @@ export const NotebookContainer = ({ role, subject: notebook, env }: NotebookCont
             const ast = Query.select(filter).ast;
             const graph = cell.graph?.target;
             if (!graph) {
-              const { view } = await View.makeFromDatabase({ db });
+              const { view } = await ViewModel.makeFromDatabase({ db });
               const newGraph = Graph.make({ query: { ast }, view });
-              Obj.change(notebook!, (n) => {
-                const c = n.cells.find((c) => c.id === cell.id);
+              Obj.change(notebook!, (obj) => {
+                const c = obj.cells.find((c) => c.id === cell.id);
                 if (c) {
                   c.graph = Ref.make(newGraph);
                   c.name = name;
                 }
               });
             } else {
-              Obj.change(graph, (g) => {
-                g.query.ast = ast as Obj.Mutable<typeof ast>;
+              Obj.change(graph, (obj) => {
+                obj.query.ast = ast as Obj.Mutable<typeof ast>;
               });
             }
           }
@@ -132,10 +133,10 @@ export const NotebookContainer = ({ role, subject: notebook, env }: NotebookCont
       const from = notebook.cells.findIndex((cell) => cell.id === source.id);
       const to = notebook.cells.findIndex((cell) => cell.id === target.id);
       if (from != null && to != null) {
-        Obj.change(notebook, (n) => {
-          const cell = n.cells.splice(from, 1)[0];
+        Obj.change(notebook, (obj) => {
+          const cell = obj.cells.splice(from, 1)[0];
           if (cell) {
-            n.cells.splice(to, 0, cell);
+            obj.cells.splice(to, 0, cell);
           }
         });
       }
@@ -168,8 +169,8 @@ export const NotebookContainer = ({ role, subject: notebook, env }: NotebookCont
       }
 
       const idx = after ? notebook.cells.findIndex((cell) => cell.id === after) : notebook.cells.length;
-      Obj.change(notebook, (n) => {
-        n.cells.splice(idx, 0, cell);
+      Obj.change(notebook, (obj) => {
+        obj.cells.splice(idx, 0, cell);
       });
     },
     [db, notebook],
@@ -180,8 +181,8 @@ export const NotebookContainer = ({ role, subject: notebook, env }: NotebookCont
       invariant(notebook);
       const idx = notebook.cells.findIndex((cell) => cell.id === id);
       if (idx !== -1) {
-        Obj.change(notebook, (n) => {
-          n.cells.splice(idx, 1);
+        Obj.change(notebook, (obj) => {
+          obj.cells.splice(idx, 1);
         });
       }
     },
@@ -189,25 +190,26 @@ export const NotebookContainer = ({ role, subject: notebook, env }: NotebookCont
   );
 
   return (
-    <Layout.Main role={role} toolbar>
-      <Toolbar.Root disabled={!hasAttention} textBlockWidth>
-        <DropdownMenu.Root>
-          <DropdownMenu.Trigger asChild>
-            <IconButton icon='ph--plus--regular' iconOnly label={t('notebook cell insert label')} />
-          </DropdownMenu.Trigger>
-          <NotebookMenu onCellInsert={handleCellInsert} />
-        </DropdownMenu.Root>
-        <Toolbar.IconButton
-          icon='ph--play--fill'
-          iconOnly
-          label={t('compute label')}
-          classNames='text-green-500'
-          onClick={handleCompute}
-        />
-      </Toolbar.Root>
-      <div role='none' className='flex bs-full overflow-hidden -mis-[1px] -mie-[1px]'>
+    <Panel.Root role={role} className='dx-document'>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root disabled={!hasAttention}>
+          <DropdownMenu.Root>
+            <DropdownMenu.Trigger asChild>
+              <IconButton icon='ph--plus--regular' iconOnly label={t('notebook-cell-insert.label')} />
+            </DropdownMenu.Trigger>
+            <NotebookMenu onCellInsert={handleCellInsert} />
+          </DropdownMenu.Root>
+          <Toolbar.IconButton
+            icon='ph--play--fill'
+            iconOnly
+            label={t('compute.label')}
+            classNames='text-success-text'
+            onClick={handleCompute}
+          />
+        </Toolbar.Root>
+      </Panel.Toolbar>
+      <Panel.Content asChild>
         <NotebookStack
-          classNames='container-max-width border-l border-r border-subduedSeparator'
           db={db}
           notebook={notebook}
           graph={graph}
@@ -217,13 +219,11 @@ export const NotebookContainer = ({ role, subject: notebook, env }: NotebookCont
           onCellInsert={handleCellInsert}
           onCellDelete={handleCellDelete}
         />
-      </div>
-    </Layout.Main>
+      </Panel.Content>
+    </Panel.Root>
   );
 };
 
-export default NotebookContainer;
-
 // TODO(wittjosiah): Factor out. Copied from PromptArticle in plugin-assistant.
 const runPrompt = Effect.fn(function* ({
   prompt,
@@ -234,10 +234,7 @@ const runPrompt = Effect.fn(function* ({
   input: Record<string, any>;
   onResult: (result: string) => void;
 }) {
-  const inputData: FunctionDefinition.Input<typeof Agent.prompt> = {
-    prompt,
-    input,
-  };
+  const inputData: Operation.Definition.Input<typeof AgentPrompt> = { prompt, input };
   const tracer = yield* TracingService;
   const trace = yield* tracer.traceInvocationStart({
     target: undefined,
@@ -247,7 +244,7 @@ const runPrompt = Effect.fn(function* ({
   });
 
   // Invoke the function.
-  const result = yield* FunctionInvocationService.invokeFunction(Agent.prompt, inputData).pipe(
+  const result = yield* FunctionInvocationService.invokeFunction(AgentPrompt, inputData).pipe(
     Effect.provide(trace.invocationTraceQueue ? TracingService.layerInvocation(trace) : TracingService.layerNoop),
     Effect.exit,
   );

package/src/containers/NotebookContainer/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { NotebookContainer } from './NotebookContainer';
+
+export default NotebookContainer;

package/src/{components → containers/ScriptContainer}/ScriptContainer.tsx

@@ -4,30 +4,29 @@
 
 import React, { useMemo } from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-framework/react';
+import { type ObjectSurfaceProps } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { createDocAccessor } from '@dxos/echo-db';
 import { type Script } from '@dxos/functions';
 import { getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { Layout } from '@dxos/react-ui-mosaic';
-import { createDataExtensions, listener, stackItemContentEditorClassNames } from '@dxos/ui-editor';
+import { Panel } from '@dxos/react-ui';
+import { createDataExtensions, listener, editorClassNames } from '@dxos/ui-editor';
 
-import { useDeployState, useToolbarState } from '../hooks';
-import { type ScriptSettings } from '../types';
+import { ScriptToolbar, TypescriptEditor, type TypescriptEditorProps } from '#components';
+import { useDeployState, useToolbarState } from '#hooks';
+import { type Settings } from '#types';
 
-import { ScriptToolbar } from './ScriptToolbar';
-import { TypescriptEditor, type TypescriptEditorProps } from './TypescriptEditor';
-
-export type ScriptEditorProps = SurfaceComponentProps<
+export type ScriptEditorProps = ObjectSurfaceProps<
   Script.Script,
   {
-    settings?: ScriptSettings;
+    settings?: Settings.Settings;
   } & Pick<TypescriptEditorProps, 'env'>
 >;
 
 export const ScriptContainer = ({
   role,
+  attendableId,
   subject: script,
   settings = { editorInputMode: 'vscode' },
   env,
@@ -52,8 +51,8 @@ export const ScriptContainer = ({
       listener({
         onChange: ({ text }) => {
           if (script.source.target?.content !== text) {
-            Obj.change(script, (s) => {
-              s.changed = true;
+            Obj.change(script, (obj) => {
+              obj.changed = true;
             });
           }
         },
@@ -66,19 +65,21 @@ export const ScriptContainer = ({
   }
 
   return (
-    <Layout.Main role={role} toolbar>
-      <ScriptToolbar state={state} role={role} script={script} />
-      <TypescriptEditor
-        id={script.id}
-        env={env}
-        initialValue={script.source?.target?.content}
-        extensions={extensions}
-        classNames={stackItemContentEditorClassNames(role)}
-        inputMode={settings.editorInputMode}
-        toolbar
-      />
-    </Layout.Main>
+    <Panel.Root role={role}>
+      <Panel.Toolbar asChild>
+        <ScriptToolbar script={script} attendableId={attendableId} state={state} role={role} />
+      </Panel.Toolbar>
+      <Panel.Content asChild>
+        <TypescriptEditor
+          classNames={editorClassNames(role)}
+          id={script.id}
+          env={env}
+          initialValue={script.source?.target?.content}
+          extensions={extensions}
+          inputMode={settings.editorInputMode}
+          toolbar
+        />
+      </Panel.Content>
+    </Panel.Root>
   );
 };
-
-export default ScriptContainer;

package/src/containers/ScriptContainer/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { ScriptContainer } from './ScriptContainer';
+
+export default ScriptContainer;