@dxos/plugin-script 0.8.4-main.28f8d3d → 0.8.4-main.406dc2a

package/src/templates/index.ts

@@ -6,11 +6,11 @@ import chat from './chat.ts?raw';
 import chess from './chess.ts?raw';
 import dataGenerator from './data-generator.ts?raw';
 import discord from './discord.ts?raw';
-import echo from './echo.ts?raw';
 import email from './email.ts?raw';
 import forexEffect from './forex-effect.ts?raw';
 import forex from './forex.ts?raw';
 import gmail from './gmail.ts?raw';
+import ping from './ping.ts?raw';
 
 const removeHeader = (str: string) => str.split('\n').slice(4).join('\n');
 
@@ -23,11 +23,11 @@ export type Template = {
   presetId?: string;
 };
 
-export const templates: Template[] = [
+export const templates = [
   {
-    id: 'dxos.org/script/echo',
-    name: 'Echo',
-    source: removeHeader(echo),
+    id: 'dxos.org/script/ping',
+    name: 'Ping',
+    source: removeHeader(ping),
   },
   {
     id: 'dxos.org/script/forex',
@@ -75,4 +75,4 @@ export const templates: Template[] = [
     source: removeHeader(dataGenerator),
     presetId: 'dxos.org/function/data-generator',
   },
-];
+] as const;

package/src/testing/data.ts

@@ -0,0 +1,47 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Ref } from '@dxos/echo';
+import { createObject } from '@dxos/echo-db';
+import { PublicKey } from '@dxos/keys';
+import { DataType } from '@dxos/schema';
+
+import { Notebook } from '../types';
+
+// NOTE: createObject(DataType.makeText is required to make codemirror work.
+export const createNotebook = () =>
+  Notebook.make({
+    cells: [
+      {
+        id: PublicKey.random().toString(),
+        type: 'script',
+        script: Ref.make(createObject(DataType.makeText(['c = a() + b', '', ''].join('\n')))),
+      },
+      {
+        id: PublicKey.random().toString(),
+        type: 'script',
+        script: Ref.make(createObject(DataType.makeText(['a = () => 100', ''].join('\n')))),
+      },
+      {
+        id: PublicKey.random().toString(),
+        type: 'script',
+        script: Ref.make(createObject(DataType.makeText(['b = 200'].join('\n')))),
+      },
+      {
+        id: PublicKey.random().toString(),
+        type: 'script',
+        script: Ref.make(createObject(DataType.makeText(['d = a() * 2'].join('\n')))),
+      },
+      {
+        id: PublicKey.random().toString(),
+        type: 'script',
+        script: Ref.make(createObject(DataType.makeText(['c + d', '', '', ''].join('\n')))),
+      },
+      {
+        id: PublicKey.random().toString(),
+        type: 'query',
+        script: Ref.make(createObject(DataType.makeText('#test'))),
+      },
+    ],
+  });

package/src/testing/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './data';

package/src/translations.ts

@@ -6,6 +6,7 @@ import { ScriptType } from '@dxos/functions';
 import { type Resource } from '@dxos/react-ui';
 
 import { meta } from './meta';
+import { Notebook } from './types';
 
 export const translations = [
   {
@@ -19,8 +20,18 @@ export const translations = [
         'rename object label': 'Rename script',
         'delete object label': 'Delete script',
       },
+      [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',
+      },
       [meta.id]: {
         'plugin name': 'Scripts',
+        'settings title': 'Scripts plugin settings',
         'description label': 'Description',
         'description placeholder': 'Enter description',
         'binding placeholder': 'Function name',
@@ -44,6 +55,12 @@ export const translations = [
         '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',
@@ -53,16 +70,15 @@ export const translations = [
         'function panel label': 'Debug Function',
         'script test label': 'Test',
         'script logs label': 'Logs',
+
         'deployment dialog title': 'Default Scripts',
-        'deployment dialog scripts found message_one':
-          'We found the following script template for your new integration:',
-        'deployment dialog scripts found message_other':
-          'We found the following script templates for your new integration:',
+        '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.',
@@ -75,6 +91,17 @@ export const translations = [
         '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',
       },
     },
   },

package/src/types/actions.ts

@@ -0,0 +1,53 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+
+import { SpaceSchema } from '@dxos/client/echo';
+import { ScriptType } from '@dxos/functions';
+
+import { meta } from '../meta';
+import { templates } from '../templates';
+
+import { Notebook } from './schema';
+
+export namespace ScriptAction {
+  export const ScriptProps = Schema.Struct({
+    name: Schema.optional(Schema.String),
+    // TODO(wittjosiah): Placeholder annotation?
+    gistUrl: Schema.optional(Schema.String.annotations({ title: 'Import from Gist (url)' })),
+    initialTemplateId: Schema.Literal(...templates.map(({ id }) => id)).pipe(
+      Schema.annotations({ title: 'Template' }),
+      Schema.optional,
+    ),
+  });
+
+  export class CreateScript extends Schema.TaggedClass<CreateScript>()(`${meta.id}/action/create-script`, {
+    input: Schema.extend(
+      ScriptProps,
+      Schema.Struct({
+        space: SpaceSchema,
+      }),
+    ),
+    output: Schema.Struct({
+      object: ScriptType,
+    }),
+  }) {}
+
+  export const NotebookProps = Schema.Struct({
+    name: Schema.optional(Schema.String),
+  });
+
+  export class CreateNotebook extends Schema.TaggedClass<CreateNotebook>()(`${meta.id}/action/create-notebook`, {
+    input: Schema.extend(
+      NotebookProps,
+      Schema.Struct({
+        space: SpaceSchema,
+      }),
+    ),
+    output: Schema.Struct({
+      object: Notebook.Notebook,
+    }),
+  }) {}
+}

package/src/types/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
+export * from './actions';
 export * from './schema';

package/src/types/schema.ts

@@ -2,36 +2,47 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { SpaceSchema } from '@dxos/client/echo';
-import { ScriptType } from '@dxos/functions';
+import { Obj, Type } from '@dxos/echo';
+import { LabelAnnotation } from '@dxos/echo/internal';
+import { Assistant } from '@dxos/plugin-assistant/types';
 import { EditorInputMode } from '@dxos/react-ui-editor';
+import { DataType } from '@dxos/schema';
 
-import { meta } from '../meta';
+export namespace Notebook {
+  export type CellType = 'markdown' | 'script' | 'query' | 'prompt' | 'view';
 
-export namespace ScriptAction {
-  export const CreateScriptSchema = Schema.Struct({
-    name: Schema.optional(Schema.String),
-    // TODO(wittjosiah): Placeholder annotation?
-    gistUrl: Schema.optional(Schema.String.annotations({ title: 'Import from Gist (url)' })),
-    initialTemplateId: Schema.optional(Schema.String),
-  });
+  export const Cell = Schema.Struct({
+    id: Schema.String,
+    type: Schema.String,
+    script: Schema.optional(Type.Ref(DataType.Text)),
+    view: Schema.optional(Type.Ref(DataType.View)),
+    chat: Schema.optional(Type.Ref(Assistant.Chat)),
+  }).pipe(Schema.mutable);
 
-  export type CreateScriptProps = Schema.Schema.Type<typeof CreateScriptSchema>;
+  export type Cell = Schema.Schema.Type<typeof Cell>;
 
-  export class Create extends Schema.TaggedClass<Create>()(`${meta.id}/action/create`, {
-    input: Schema.extend(CreateScriptSchema, Schema.Struct({ space: SpaceSchema })),
-    output: Schema.Struct({
-      object: ScriptType,
+  export const Notebook = Schema.Struct({
+    name: Schema.optional(Schema.String),
+    cells: Schema.mutable(Schema.Array(Cell)),
+  }).pipe(
+    Type.Obj({
+      typename: 'dxos.org/type/Notebook',
+      version: '0.1.0',
     }),
-  }) {}
+    LabelAnnotation.set(['name']),
+  );
+
+  export type Notebook = Schema.Schema.Type<typeof Notebook>;
+
+  export const make = (props: Obj.MakeProps<typeof Notebook> = { cells: [] }) => Obj.make(Notebook, props);
 }
 
-export const ScriptSettingsSchema = Schema.mutable(
+export const ScriptSettings = Schema.mutable(
   Schema.Struct({
     editorInputMode: EditorInputMode,
   }),
 );
 
-export type ScriptSettingsProps = Schema.Schema.Type<typeof ScriptSettingsSchema>;
+export type ScriptSettings = Schema.Schema.Type<typeof ScriptSettings>;

package/src/util/deploy.ts

@@ -7,9 +7,8 @@ import { Obj, Ref } from '@dxos/echo';
 import {
   FunctionType,
   type ScriptType,
-  getUserFunctionUrlInMetadata,
-  makeFunctionUrl,
-  setUserFunctionUrlInMetadata,
+  getUserFunctionIdInMetadata,
+  setUserFunctionIdInMetadata,
 } from '@dxos/functions';
 import { Bundler } from '@dxos/functions/bundler';
 import { incrementSemverPatch, uploadWorkerFunction } from '@dxos/functions/edge';
@@ -19,8 +18,8 @@ import { type Space } from '@dxos/react-client/echo';
 import { updateFunctionMetadata } from './functions';
 
 export const isScriptDeployed = ({ script, fn }: { script: ScriptType; fn: any }): boolean => {
-  const existingFunctionUrl = fn && getUserFunctionUrlInMetadata(Obj.getMeta(fn));
-  return Boolean(existingFunctionUrl) && !script.changed;
+  const existingFunctionId = fn && getUserFunctionIdInMetadata(Obj.getMeta(fn));
+  return Boolean(existingFunctionId) && !script.changed;
 };
 
 type DeployScriptProps = {
@@ -28,10 +27,10 @@ type DeployScriptProps = {
   client: Client;
   space: Space;
   fn?: FunctionType;
-  existingFunctionUrl?: string;
+  existingFunctionId?: string;
 };
 
-type DeployScriptResult = { success: boolean; error?: Error; functionUrl?: string };
+type DeployScriptResult = { success: boolean; error?: Error; functionId?: string };
 
 /**
  * Deploy a script to a space, handling bundling and uploading to the FaaS infrastructure.
@@ -41,7 +40,7 @@ export const deployScript = async ({
   client,
   space,
   fn,
-  existingFunctionUrl,
+  existingFunctionId,
 }: DeployScriptProps): Promise<DeployScriptResult> => {
   const validationError = validateDeployInputs(script, space);
   if (validationError) {
@@ -49,11 +48,10 @@ export const deployScript = async ({
   }
 
   try {
-    const existingFunctionId = extractFunctionId(existingFunctionUrl);
-
-    const { bundle, error } = await bundleScript(script.source!.target!.content);
-    if (error || !bundle) {
-      throw error || new Error('Bundle creation failed');
+    const bundler = new Bundler({ platform: 'browser', sandboxedModules: [], remoteModules: {} });
+    const buildResult = await bundler.bundle({ source: script.source!.target!.content });
+    if ('error' in buildResult) {
+      throw buildResult.error || new Error('Bundle creation failed');
     }
 
     const { functionId, version, meta } = await uploadWorkerFunction({
@@ -61,7 +59,8 @@ export const deployScript = async ({
       ownerPublicKey: space.key,
       version: fn ? incrementSemverPatch(fn.version) : '0.0.1',
       functionId: existingFunctionId,
-      source: bundle,
+      entryPoint: buildResult.entryPoint,
+      assets: { [buildResult.entryPoint]: buildResult.asset },
     });
 
     if (functionId === undefined || version === undefined) {
@@ -72,10 +71,9 @@ export const deployScript = async ({
     script.changed = false;
     updateFunctionMetadata(script, storedFunction, meta, functionId);
 
-    const functionUrl = makeFunctionUrl({ functionId });
-    setUserFunctionUrlInMetadata(Obj.getMeta(storedFunction), functionUrl);
+    setUserFunctionIdInMetadata(Obj.getMeta(storedFunction), functionId);
 
-    return { success: true, functionUrl };
+    return { success: true, functionId };
   } catch (err: any) {
     log.catch(err);
     return { success: false, error: err };
@@ -92,21 +90,6 @@ const validateDeployInputs = (script: ScriptType, space: Space): Error | null =>
   return null;
 };
 
-const extractFunctionId = (functionUrl?: string): string | undefined => {
-  return functionUrl?.split('/').at(-1);
-};
-
-const bundleScript = async (source: string): Promise<{ bundle?: string; error?: Error }> => {
-  const bundler = new Bundler({ platform: 'browser', sandboxedModules: [], remoteModules: {} });
-  const buildResult = await bundler.bundle({ source });
-
-  if (buildResult.error || !buildResult.bundle) {
-    return { error: buildResult.error || new Error('Bundle creation failed') };
-  }
-
-  return { bundle: buildResult.bundle };
-};
-
 const createOrUpdateFunctionInSpace = (
   space: Space,
   fn: FunctionType | undefined,
@@ -115,9 +98,13 @@ const createOrUpdateFunctionInSpace = (
   version: string,
 ): FunctionType => {
   if (fn) {
+    fn.name = script.name ?? 'New Function';
     fn.version = version;
     return fn;
   } else {
-    return space.db.add(Obj.make(FunctionType, { name: functionId, version, source: Ref.make(script) }));
+    const fn = Obj.make(FunctionType, { name: script.name ?? 'New Function', version, source: Ref.make(script) });
+    space.db.add(fn);
+    setUserFunctionIdInMetadata(Obj.getMeta(fn), functionId);
+    return fn;
   }
 };

package/src/util/functions.ts

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type ScriptType, getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
+import { type FunctionType, type ScriptType, getInvocationUrl, getUserFunctionIdInMetadata } from '@dxos/functions';
+import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { getMeta, getSpace } from '@dxos/react-client/echo';
-
 /**
  * Get the function URL for a given script and client configuration
  */
@@ -19,18 +20,23 @@ export const getFunctionUrl = ({
   edgeUrl: string;
 }): string | undefined => {
   const space = getSpace(script);
-  const existingFunctionUrl = fn && getUserFunctionUrlInMetadata(getMeta(fn));
+  const existingFunctionId = fn && getUserFunctionIdInMetadata(getMeta(fn));
 
-  if (!existingFunctionUrl) {
+  if (!existingFunctionId) {
     return undefined;
   }
 
-  return getInvocationUrl(existingFunctionUrl, edgeUrl, {
+  return getInvocationUrl(existingFunctionId, edgeUrl, {
     spaceId: space?.id,
   });
 };
 
-export const updateFunctionMetadata = (script: ScriptType, storedFunction: any, meta: any, functionId: string) => {
+export const updateFunctionMetadata = (
+  script: ScriptType,
+  storedFunction: FunctionType,
+  meta: any,
+  functionId: string,
+) => {
   if (script.description !== undefined && script.description.trim() !== '') {
     storedFunction.description = script.description;
   } else if (meta.description) {
@@ -50,4 +56,27 @@ export const updateFunctionMetadata = (script: ScriptType, storedFunction: any,
   } else {
     log.verbose('no output schema in function metadata', { functionId });
   }
+
+  if (meta.key) {
+    storedFunction.key = meta.key;
+  } else {
+    log.verbose('no key in function metadata', { functionId });
+  }
+};
+
+export const getAccessCredential = (identityKey: PublicKey): Credential => {
+  return {
+    issuer: identityKey,
+    issuanceDate: new Date(),
+    subject: {
+      id: identityKey,
+      assertion: {
+        '@type': 'dxos.halo.credentials.ServiceAccess',
+        serverName: 'hub.dxos.network',
+        serverKey: identityKey,
+        identityKey,
+        capabilities: ['composer:beta'],
+      },
+    },
+  };
 };

package/dist/lib/browser/DeploymentDialog-C3XH2Z56.mjs

@@ -1,12 +0,0 @@
-import {
-  DEPLOYMENT_DIALOG,
-  DeploymentDialog_default
-} from "./chunk-OAVS36Q3.mjs";
-import "./chunk-SUOLJH55.mjs";
-import "./chunk-IS4OG2UW.mjs";
-import "./chunk-QYAREHGH.mjs";
-export {
-  DEPLOYMENT_DIALOG,
-  DeploymentDialog_default as default
-};
-//# sourceMappingURL=DeploymentDialog-C3XH2Z56.mjs.map