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

package/src/templates/gmail.ts

@@ -3,7 +3,7 @@
 //
 
 // @ts-ignore
-import { EchoObject, Filter, ObjectId, S, create, defineFunction } from 'dxos:functions';
+import { EchoObject, Filter, EntityId, S, create, defineFunction } from 'dxos:functions';
 // @ts-ignore
 import {
   FetchHttpClient,
@@ -27,7 +27,7 @@ import * as Schedule from 'https://esm.sh/effect@3.17.0/Schedule?bundle=false';
 import * as Stream from 'https://esm.sh/effect@3.17.0/Stream?bundle=false';
 
 export default defineFunction({
-  key: 'dxos.org/script/gmail',
+  key: 'org.dxos.script.gmail',
   name: 'Gmail',
   inputSchema: S.Struct({
     mailboxId: S.String,
@@ -47,7 +47,7 @@ export default defineFunction({
   handler: ({ context: { space }, data: { mailboxId, userId, after, pageSize } }: any) =>
     Effect.gen(function* () {
       const { token } = yield* Effect.tryPromise({
-        try: () => space.db.query(Filter.typename('dxos.org/type/AccessToken', { source: 'gmail.com' })).first(),
+        try: () => space.db.query(Filter.typename('org.dxos.type.accessToken', { source: 'gmail.com' })).first(),
         catch: (e: any) => e,
       });
 
@@ -74,7 +74,7 @@ export default defineFunction({
         catch: (e: any) => e,
       });
       const { objects } = yield* Effect.tryPromise({
-        try: () => space.queues.queryQueue(mailbox.queue.dxn),
+        try: () => space.queues.queryQueue(mailbox.queue.uri),
         catch: (e: any) => e,
       });
       const newMessages = yield* Ref.make([]);
@@ -105,7 +105,7 @@ export default defineFunction({
           }
           const subject = messageDetails.payload.headers.find((h: any) => h.name === 'Subject')?.value;
           const object = create(MessageType, {
-            id: ObjectId.random(),
+            id: EntityId.random(),
             created,
             sender,
             blocks: [
@@ -132,7 +132,7 @@ export default defineFunction({
           Stream.grouped(10),
           Stream.flatMap((batch: any) =>
             Effect.tryPromise({
-              try: () => space.queues.insertIntoQueue(mailbox.queue.dxn, Chunk.toReadonlyArray(batch)),
+              try: () => space.queues.insertIntoQueue(mailbox.queue.uri, Chunk.toReadonlyArray(batch)),
               catch: (e: any) => e,
             }),
           ),
@@ -197,7 +197,7 @@ const Text = S.TaggedStruct('text', {
 interface Text extends S.Schema.Type<typeof Text> {}
 
 const MessageType = S.Struct({
-  id: ObjectId,
+  id: EntityId,
   created: S.String.annotations({
     description: 'ISO date string when the message was sent.',
   }),
@@ -216,8 +216,8 @@ const MessageType = S.Struct({
   ),
 }).pipe(
   EchoObject({
-    typename: 'dxos.org/type/Message',
-    version: '0.2.0',
+    typename: 'org.dxos.type.message',
+    version: '0.1.0',
   }),
 );
 type MessageType = S.Schema.Type<typeof MessageType>;

package/src/templates/index.ts

@@ -3,7 +3,6 @@
 //
 
 import anthropic from './anthropic.ts?raw';
-import chat from './chat.ts?raw';
 import chessBot from './chess-bot.ts?raw';
 import commentary from './commentary.ts?raw';
 import dataGenerator from './data-generator.ts?raw';
@@ -27,65 +26,59 @@ export type Template = {
 
 export const templates = [
   {
-    id: 'dxos.org/script/ping',
+    id: 'org.dxos.script.ping',
     name: 'Ping',
     source: removeHeader(ping),
   },
   {
-    id: 'dxos.org/script/forex',
+    id: 'org.dxos.script.forex',
     name: 'Forex',
     source: removeHeader(forex),
   },
   {
-    id: 'dxos.org/script/forex-effect',
+    id: 'org.dxos.script.forex-effect',
     name: 'Forex (Effect)',
     source: removeHeader(forexEffect),
   },
   {
-    id: 'dxos.org/script/gpt',
-    name: 'Gpt',
-    source: removeHeader(chat),
-    presetId: 'dxos.org/function/gpt',
-  },
-  {
-    id: 'dxos.org/script/chess-bot',
+    id: 'org.dxos.script.chess-bot',
     name: 'Chess Bot',
     source: removeHeader(chessBot),
-    presetId: 'dxos.org/function/chess-bot',
+    presetId: 'org.dxos.function.chess-bot',
   },
   {
-    id: 'dxos.org/script/email',
+    id: 'org.dxos.script.email',
     name: 'Email',
     source: removeHeader(email),
-    presetId: 'dxos.org/function/email',
+    presetId: 'org.dxos.function.email',
   },
   {
-    id: 'dxos.org/script/discord',
+    id: 'org.dxos.script.discord',
     name: 'Discord',
     source: removeHeader(discord),
-    presetId: 'dxos.org/function/discord',
+    presetId: 'org.dxos.function.discord',
   },
   {
-    id: 'dxos.org/script/gmail',
+    id: 'org.dxos.script.gmail',
     name: 'Gmail',
     source: removeHeader(gmail),
-    presetId: 'dxos.org/function/gmail',
+    presetId: 'org.dxos.function.gmail',
   },
   {
-    id: 'dxos.org/script/data-generator',
+    id: 'org.dxos.script.data-generator',
     name: 'Data Generator',
     source: removeHeader(dataGenerator),
-    presetId: 'dxos.org/function/data-generator',
+    presetId: 'org.dxos.function.data-generator',
   },
   {
-    id: 'dxos.org/script/anthropic',
+    id: 'org.dxos.script.anthropic',
     name: 'Anthropic',
     source: removeHeader(anthropic),
   },
   {
-    id: 'dxos.org/script/commentary',
+    id: 'org.dxos.script.commentary',
     name: 'Commentary',
     source: removeHeader(commentary),
-    presetId: 'dxos.org/function/chess/commentary',
+    presetId: 'org.dxos.function.chess.commentary',
   },
 ] as const;

package/src/templates/ping.ts

@@ -2,16 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { defineFunction } from '@dxos/functions';
+import { Operation } from '@dxos/compute';
+import { DXN } from '@dxos/keys';
 
-export default defineFunction({
-  key: 'dxos.org/script/ping',
-  name: 'Ping',
-  inputSchema: Schema.Any,
-
-  handler: async ({ data }) => {
-    return data;
+const Ping = Operation.make({
+  meta: {
+    key: DXN.make('org.dxos.script.ping'),
+    name: 'Ping',
   },
+  input: Schema.Any,
+  output: Schema.Any,
 });
+
+export default Ping.pipe(
+  Operation.withHandler(
+    Effect.fn(function* (data) {
+      return data;
+    }),
+  ),
+);

package/src/testing/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './data';
+export * from './test-script';
+export * from './test-notebook';

package/src/testing/simulator.test.ts

@@ -2,17 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { readFile } from 'node:fs/promises';
-
 import * as Record from 'effect/Record';
+import { readFile } from 'node:fs/promises';
 import { describe, expect, test } from 'vitest';
 
 import { bundleFunction } from '@dxos/functions-runtime/bundler';
 import { FunctionWorker } from '@dxos/functions-simulator-cloudflare';
 import { ErrorCodec } from '@dxos/protocols';
 
-// Requires downloading assets from R2
-describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('Run script in sumulator', () => {
+// Requires downloading assets from R2.
+describe('Run script in sumulator', { tags: ['functions-e2e'] }, () => {
   test('forex-effect', { timeout: 120_000 }, async () => {
     const source = await readFile(new URL('../templates/forex-effect.ts', import.meta.url), 'utf-8');
 

package/src/testing/{data.ts → test-notebook.ts}

@@ -2,51 +2,50 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Prompt } from '@dxos/blueprints';
-import { Ref } from '@dxos/echo';
+import { Routine } from '@dxos/compute';
+import { Ref, Type } from '@dxos/echo';
 import { createObject } from '@dxos/echo-db';
 import { PublicKey } from '@dxos/keys';
-import { Markdown } from '@dxos/plugin-markdown/types';
+import { Markdown } from '@dxos/plugin-markdown';
 import { Text } from '@dxos/schema';
 
-import { Notebook } from '../types';
+import { Notebook } from '#types';
 
 // TODO(burdon): NOTE: createObject is required for tests.
-
 export const createNotebook = (): Notebook.Notebook =>
   Notebook.make({
     cells: [
       {
         id: PublicKey.random().toString(),
         type: 'script',
-        source: Ref.make(createObject(Text.make('c = a() + b'))),
+        source: Ref.make(createObject(Text.make({ content: 'c = a() + b' }))),
       },
       {
         id: PublicKey.random().toString(),
         type: 'script',
-        source: Ref.make(createObject(Text.make('a = () => 100'))),
+        source: Ref.make(createObject(Text.make({ content: 'a = () => 100' }))),
       },
       {
         id: PublicKey.random().toString(),
         type: 'script',
-        source: Ref.make(createObject(Text.make('b = 200'))),
+        source: Ref.make(createObject(Text.make({ content: 'b = 200' }))),
       },
       {
         id: PublicKey.random().toString(),
         type: 'script',
-        source: Ref.make(createObject(Text.make('d = a() * 2'))),
+        source: Ref.make(createObject(Text.make({ content: 'd = a() * 2' }))),
       },
       {
         id: PublicKey.random().toString(),
         type: 'script',
-        source: Ref.make(createObject(Text.make('c + d'))),
+        source: Ref.make(createObject(Text.make({ content: 'c + d' }))),
       },
       {
         id: PublicKey.random().toString(),
         type: 'prompt',
         prompt: Ref.make(
           createObject(
-            Prompt.make({
+            Routine.make({
               instructions: 'Very briefly, what colors are associated with the numbers {{a}} and {{b}}.',
             }),
           ),
@@ -55,14 +54,14 @@ export const createNotebook = (): Notebook.Notebook =>
       {
         id: PublicKey.random().toString(),
         type: 'query',
-        source: Ref.make(createObject(Text.make(`docs = (type: ${Markdown.Document.typename})`))),
+        source: Ref.make(createObject(Text.make({ content: `docs = (type: ${Type.getTypename(Markdown.Document)})` }))),
       },
       {
         id: PublicKey.random().toString(),
         type: 'prompt',
         prompt: Ref.make(
           createObject(
-            Prompt.make({
+            Routine.make({
               instructions: 'Very briefly, summarize the documents: {{docs}}',
             }),
           ),

package/src/testing/test-script.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { Script, Operation } from '@dxos/compute';
+import { Obj, Ref } from '@dxos/echo';
+import { type Space } from '@dxos/react-client/echo';
+
+/**
+ * Seeds a script and linked persistent operation for Storybook stories.
+ */
+export const createScript = (space: Space): Script.Script => {
+  const script = Script.make({
+    name: 'Test',
+    source: 'export default () => 42;',
+  });
+
+  space.db.add(script);
+  space.db.add(
+    Obj.make(Operation.PersistentOperation, {
+      [Obj.Meta]: { key: 'org.dxos.script.story-fn', version: '0.1.0' },
+      name: 'Test',
+      source: Ref.make(script),
+    }),
+  );
+
+  return script;
+};

package/src/translations.ts

@@ -2,107 +2,107 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Script } from '@dxos/functions';
+import { Script } from '@dxos/compute';
+import { Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
-import { Notebook } from './types';
+import { meta } from '#meta';
+import { Notebook } from '#types';
 
 export const translations = [
   {
     'en-US': {
-      [Script.Script.typename]: {
-        'typename label': 'Script',
-        'typename label_zero': 'Scripts',
-        'typename label_one': 'Script',
-        'typename label_other': 'Scripts',
-        'object name placeholder': 'New script',
-        'rename object label': 'Rename script',
-        'delete object label': 'Delete script',
-        'object deleted label': 'Script deleted',
+      [Type.getTypename(Script.Script)]: {
+        'typename.label': 'Script',
+        'typename.label_zero': 'Scripts',
+        'typename.label_one': 'Script',
+        'typename.label_other': 'Scripts',
+        'object-name.placeholder': 'New script',
+        'add-object.label': 'Add script',
+        'rename-object.label': 'Rename script',
+        'delete-object.label': 'Delete script',
+        'object-deleted.label': 'Script deleted',
       },
-      [Notebook.Notebook.typename]: {
-        'typename label': 'Notebook',
-        'typename label_zero': 'Notebooks',
-        'typename label_one': 'Notebook',
-        'typename label_other': 'Notebooks',
-        'object name placeholder': 'New notebook',
-        'rename object label': 'Rename notebook',
-        'delete object label': 'Delete notebook',
-        'object deleted label': 'Notebook deleted',
+      [Type.getTypename(Notebook.Notebook)]: {
+        'typename.label': 'Notebook',
+        'typename.label_zero': 'Notebooks',
+        'typename.label_one': 'Notebook',
+        'typename.label_other': 'Notebooks',
+        'object-name.placeholder': 'New notebook',
+        'add-object.label': 'Add notebook',
+        'rename-object.label': 'Rename notebook',
+        'delete-object.label': 'Delete notebook',
+        'object-deleted.label': 'Notebook deleted',
       },
       [meta.id]: {
-        'plugin name': 'Scripts',
-        'settings title': 'Scripts plugin settings',
-        'description label': 'Description',
-        'description placeholder': 'Enter description',
-        'binding placeholder': 'Function name',
-        'function request placeholder': 'Function request',
-        'deploy label': 'Deploy',
-        'deployed label': 'Current version of the script is deployed',
-        'upload failed label': 'Upload failed',
-        'copy link label': 'Copy function link',
-        'format label': 'Format',
-        'toggle details label': 'Toggle details panel',
-        'authenticate action label': 'Authenticate functions service',
-        'authenticate button label': 'Authenticate',
-        'name label': 'Name',
-        'remote function settings heading': 'Remote Function',
-        'function url label': 'Invocation URL',
-        'function binding label': 'Function binding',
-        'function binding placeholder': 'Enter binding name (e.g., NAME)',
-        'script publish settings label': 'Publishing',
-        'script publish settings description': 'Scripts can be shared publicly as Github gists.',
-        'no github token label': 'This space has no GitHub access token available.',
-        'open token manager label': 'Open Token Manager',
-        'publish label': 'Publish',
-        'publishing label': 'Publishing',
-        'blueprint editor label': 'Blueprint',
-        'blueprint editor description': 'Create a blueprint that exposes this script as a tool.',
-        'blueprint instructions label': 'Instructions',
-        'blueprint instructions placeholder': 'Describe how this tool should be used.',
-        'create blueprint label': 'Create blueprint',
-        'creating label': 'Creating…',
-        'editor input mode label': 'Editor input mode',
-        'select editor input mode placeholder': 'Select editor input mode…',
-        'settings editor input mode default label': 'Default',
-        'settings editor input mode vim label': 'Vim',
-        'settings editor input mode vscode label': 'VS Code',
-        'function panel label': 'Debug Function',
-        'script test label': 'Test',
-        'script logs label': 'Logs',
+        'plugin.name': 'Scripts',
+        'settings.title': 'Scripts settings',
+        'description.label': 'Description',
+        'description.placeholder': 'Enter description',
+        'binding.placeholder': 'Function name',
+        'function-request.placeholder': 'Function request',
+        'deploy.label': 'Deploy',
+        'deployed.label': 'Current version of the script is deployed',
+        'upload-failed.label': 'Upload failed',
+        'copy-link.label': 'Copy function link',
+        'format.label': 'Format',
+        'toggle-details.label': 'Toggle details panel',
+        'authenticate-action.label': 'Authenticate functions service',
+        'authenticate-action.description':
+          'Sign in to the remote functions service to enable script deployment and execution.',
+        'authenticate-button.label': 'Authenticate',
+        'name.label': 'Name',
+        'remote-function-settings.heading': 'Remote Function',
+        'function-url.label': 'Invocation URL',
+        'function-binding.label': 'Function binding',
+        'function-binding.placeholder': 'Enter binding name (e.g., NAME)',
+        'script-publish-settings.label': 'Publishing',
+        'script-publish-settings.description': 'Scripts can be shared publicly as Github gists.',
+        'no-github-token.label': 'This space has no GitHub access token available.',
+        'open-token-manager.label': 'Open Token Manager',
+        'publish.label': 'Publish',
+        'blueprint-editor.label': 'Blueprint',
+        'blueprint-editor.description': 'Create a blueprint that exposes this script as a tool.',
+        'blueprint-instructions.label': 'Instructions',
+        'blueprint-instructions.placeholder': 'Describe how this tool should be used.',
+        'create-blueprint.label': 'Create blueprint',
+        'update-blueprint.label': 'Update blueprint',
+        'function-panel.label': 'Debug Function',
+        'script-test.label': 'Test',
+        'script-logs.label': 'Logs',
+        'compute.label': 'Compute',
 
-        'deployment dialog title': 'Default Scripts',
-        'deployment dialog scripts found message': 'Script templates:',
-        'deployment dialog deploy functions button label_one': 'Create and deploy script',
-        'deployment dialog deploy functions button label_other': 'Create and deploy scripts',
-        'deployment dialog deploy functions pending button label_one': 'Deploying script',
-        'deployment dialog deploy functions pending button label_other': 'Deploying scripts',
-        'deployment dialog skip button label': 'Skip',
+        'deployment-dialog.title': 'Default Scripts',
+        'deployment-dialog-scripts-found.message': 'Script templates:',
+        'deployment-dialog-deploy-functions-button.label_one': 'Create and deploy script',
+        'deployment-dialog-deploy-functions-button.label_other': 'Create and deploy scripts',
+        'deployment-dialog-deploy-functions-pending-button.label_one': 'Deploying script',
+        'deployment-dialog-deploy-functions-pending-button.label_other': 'Deploying scripts',
+        'deployment-dialog-skip-button.label': 'Skip',
 
-        'script deployment toast label_one': 'Script deployed',
-        'script deployment toast label_other': 'Scripts deployed',
-        'script deployment toast description_one': 'Your script has been deployed successfully.',
-        'script deployment toast description_other': 'Your scripts have been deployed successfully.',
-        'script deployment toast close label_one': 'Close',
-        'script deployment toast close label_other': 'Close',
-        'script deployment error toast label_one': 'Script deployment failed',
-        'script deployment error toast label_other': 'Scripts deployment failed',
-        'script deployment error toast description_one': 'There was an error deploying your script.',
-        'script deployment error toast description_other': 'There was an error deploying your scripts.',
-        'script deployment error toast close label_one': 'Close',
-        'script deployment error toast close label_other': 'Close',
+        'script-deployment-toast.label_one': 'Script deployed',
+        'script-deployment-toast.label_other': 'Scripts deployed',
+        'script-deployment-toast.description_one': 'Your script has been deployed successfully.',
+        'script-deployment-toast.description_other': 'Your scripts have been deployed successfully.',
+        'script-deployment-toast-close.label_one': 'Close',
+        'script-deployment-toast-close.label_other': 'Close',
+        'script-deployment-error-toast.label_one': 'Script deployment failed',
+        'script-deployment-error-toast.label_other': 'Scripts deployment failed',
+        'script-deployment-error-toast.description_one': 'There was an error deploying your script.',
+        'script-deployment-error-toast.description_other': 'There was an error deploying your scripts.',
+        'script-deployment-error-toast-close.label_one': 'Close',
+        'script-deployment-error-toast-close.label_other': 'Close',
 
-        'notebook cell placeholder': 'Enter script',
-        'notebook cell delete label': 'Delete cell',
-        'notebook cell prompt run label': 'Run',
-        'notebook cell insert markdown label': 'Insert Markdown',
-        'notebook cell insert script label': 'Insert Script',
-        'notebook cell insert prompt label': 'Insert Prompt',
-        'notebook cell insert query label': 'Insert Query',
-        'notebook markdown placeholder': 'Enter Markdown',
-        'notebook prompt placeholder': 'Enter prompt',
-        'notebook cell insert label': 'Insert cell',
+        'notebook-cell.placeholder': 'Enter script',
+        'notebook-cell-delete.label': 'Delete cell',
+        'notebook-cell-prompt-run.label': 'Run',
+        'notebook-cell-insert-markdown.label': 'Insert Markdown',
+        'notebook-cell-insert-script.label': 'Insert Script',
+        'notebook-cell-insert-prompt.label': 'Insert Prompt',
+        'notebook-cell-insert-query.label': 'Insert Query',
+        'notebook-markdown.placeholder': 'Enter Markdown',
+        'notebook-prompt.placeholder': 'Enter prompt',
+        'notebook-cell-insert.label': 'Insert cell',
       },
     },
   },

package/src/types/Notebook.ts

@@ -4,11 +4,11 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Prompt } from '@dxos/blueprints';
-import { Obj, Ref, Type } from '@dxos/echo';
+import { Routine } from '@dxos/compute';
+import { DXN, Annotation, Obj, Ref, Type } from '@dxos/echo';
 import { FormInputAnnotation } from '@dxos/echo/internal';
 import { LabelAnnotation } from '@dxos/echo/internal';
-import { Graph } from '@dxos/plugin-explorer/types';
+import { Graph } from '@dxos/plugin-explorer';
 import { Text } from '@dxos/schema';
 
 export type CellType = 'markdown' | 'script' | 'query' | 'prompt' | 'view';
@@ -19,23 +19,21 @@ export const Cell = Schema.Struct({
   name: Schema.optional(Schema.String),
   // TODO(burdon): Union type.
   source: Schema.optional(Ref.Ref(Text.Text)),
-  prompt: Schema.optional(Ref.Ref(Prompt.Prompt)),
+  prompt: Schema.optional(Ref.Ref(Routine.Routine)),
   graph: Schema.optional(Ref.Ref(Graph.Graph)),
 });
 
-export interface Cell extends Schema.Schema.Type<typeof Cell> {}
+export type Cell = Schema.Schema.Type<typeof Cell>;
 
 export const Notebook = Schema.Struct({
   name: Schema.String.pipe(Schema.optional),
   cells: Cell.pipe(Schema.Array, FormInputAnnotation.set(false)),
 }).pipe(
-  Type.object({
-    typename: 'dxos.org/type/Notebook',
-    version: '0.1.0',
-  }),
   LabelAnnotation.set(['name']),
+  Annotation.IconAnnotation.set({ icon: 'ph--notebook--regular', hue: 'sky' }),
+  Type.makeObject(DXN.make('org.dxos.type.notebook', '0.1.0')),
 );
 
-export type Notebook = Schema.Schema.Type<typeof Notebook>;
+export type Notebook = Type.InstanceType<typeof Notebook>;
 
 export const make = (props: Obj.MakeProps<typeof Notebook> = { cells: [] }): Notebook => Obj.make(Notebook, props);

package/src/types/ScriptCapabilities.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// @import-as-namespace
+
+import { type Atom } from '@effect-atom/atom-react';
+
+import { Capability } from '@dxos/app-framework';
+
+import { meta } from '#meta';
+
+import { type Compiler as CompilerType } from '../compiler';
+
+// Inline import to avoid `Settings` namespace alias colliding with the
+// `Settings` capability export below.
+export const Settings = Capability.make<Atom.Writable<import('./Settings').Settings>>(`${meta.id}.capability.settings`);
+export const Compiler = Capability.make<CompilerType>(`${meta.id}.capability.compiler`);

package/src/types/ScriptEvents.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// @import-as-namespace
+
+import { ActivationEvent } from '@dxos/app-framework';
+
+import { meta } from '#meta';
+
+export const SetupCompiler = ActivationEvent.make(`${meta.id}.event.setup-compiler`);