@dxos/plugin-script 0.12.0-next-73daef452f1464b62efdbca75fb0067c1066f264 → 0.13.0

package/src/meta.ts

@@ -5,7 +5,7 @@
 import * as Plugin from '@dxos/app-framework/Plugin';
 import { DXN } from '@dxos/keys';
 
-import config from '../dx.config';
+import config from '../dx.config.ts';
 
 export const meta = Plugin.getMetaFromConfig(config);
 

package/src/notebook/compute-graph.test.ts

@@ -2,14 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Registry from 'effect/unstable/reactivity/AtomRegistry';
+import * as Registry from 'effect/reactivity/AtomRegistry';
 import { describe, expect, test } from 'vitest';
 
 import { Obj } from '@dxos/echo';
 
 import { createNotebook } from '#testing';
 
-import { ComputeGraph } from './compute-graph';
+import { ComputeGraph } from './compute-graph.ts';
 
 describe('notebook', () => {
   test('parse dependency graph', async () => {

package/src/notebook/compute-graph.ts

@@ -2,15 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Atom from 'effect/unstable/reactivity/Atom';
-import type * as Registry from 'effect/unstable/reactivity/AtomRegistry';
+import * as Atom from 'effect/reactivity/Atom';
+import type * as Registry from 'effect/reactivity/AtomRegistry';
 
 import { log } from '@dxos/log';
 
 import { Notebook } from '#types';
 
-import { evalScript } from './eval';
-import { type ParsedExpression, VirtualTypeScriptParser } from './vfs-parser';
+import { evalScript } from './eval.ts';
+import { type ParsedExpression, VirtualTypeScriptParser } from './vfs-parser.ts';
 
 /**
  * Compute graph that evaluates the notebook cells.

package/src/notebook/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './compute-graph';
+export * from './compute-graph.ts';

package/src/notebook/vfs-parser.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { NotebookVirtualParser, VirtualTypeScriptParser } from './vfs-parser';
+import { NotebookVirtualParser, VirtualTypeScriptParser } from './vfs-parser.ts';
 
 describe('vfs-parser', () => {
   test('parse simple assignments', () => {

package/src/notebook/vfs-parser.ts

@@ -7,7 +7,7 @@ import { createSystem, createVirtualTypeScriptEnvironment } from '@typescript/vf
 
 import { invariant } from '@dxos/invariant';
 
-import { builtIns, systemDefinitions } from './eval';
+import { builtIns, systemDefinitions } from './eval.ts';
 
 /**
  * Default system definitions.

package/src/operations/ScriptOperationHandlerSet.ts

@@ -2,11 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Operation from '@dxos/compute/Operation';
 import * as OperationHandlerSet from '@dxos/compute/OperationHandlerSet';
 
 import { ScriptOperation } from '#types';
 
 export const handlers = OperationHandlerSet.lazy([
-  ScriptOperation.CreateScript.pipe(Operation.lazyHandler(() => import('./create-script'))),
+  ScriptOperation.CreateScript.pipe(Operation.lazyHandler(() => import('./create-script.ts'))),
 ]);

package/src/operations/create-script.ts

@@ -10,7 +10,7 @@ import * as Script from '@dxos/compute/Script';
 
 import { ScriptOperation } from '#types';
 
-import { templates } from '../templates';
+import { templates } from '../templates/index.ts';
 
 const handler: Operation.WithHandler<typeof ScriptOperation.CreateScript> = ScriptOperation.CreateScript.pipe(
   Operation.withHandler(

package/src/operations/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as ScriptOperationHandlerSet from './ScriptOperationHandlerSet';
+export * as ScriptOperationHandlerSet from './ScriptOperationHandlerSet.ts';

package/src/plugin.test.ts

@@ -5,7 +5,7 @@
 import { describe, test } from 'vitest';
 
 import * as ClientPlugin from '@dxos/plugin-client/ClientPlugin';
-import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+import * as Harness from '@dxos/plugin-testing/Harness';
 
 import { meta } from '#meta';
 import { ScriptPlugin } from '#plugin';
@@ -14,7 +14,7 @@ const moduleId = (name: string) => `${meta.profile.key}.module.${name}`;
 
 describe('ScriptPlugin', () => {
   test('modules activate on the expected events', async ({ expect }) => {
-    await using harness = await createComposerTestApp({
+    await using harness = await Harness.createComposerTestApp({
       plugins: [ClientPlugin.make({}), ScriptPlugin()],
     });
 

package/src/skills/ScriptSkill.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Skill from '@dxos/compute/Skill';
 import * as Template from '@dxos/compute/Template';
 import { trim } from '@dxos/util';
@@ -16,7 +18,7 @@ import {
   QueryDeployedFunctions,
   Read,
   Update,
-} from './functions';
+} from './functions/index.ts';
 
 const SKILL_KEY = 'org.dxos.skill.script';
 

package/src/skills/functions/create.ts

@@ -4,12 +4,12 @@
 
 import * as Effect from 'effect/Effect';
 
-import * as CollectionModel from '@dxos/app-toolkit/CollectionModel';
+import * as DefaultParent from '@dxos/app-toolkit/DefaultParent';
 import * as Operation from '@dxos/compute/Operation';
 import * as Script from '@dxos/compute/Script';
 import { Database, Obj, Ref } from '@dxos/echo';
 
-import { Create } from './definitions';
+import { Create } from './definitions.ts';
 
 export default Create.pipe(
   Operation.withHandler(
@@ -32,7 +32,7 @@ export default Create.pipe(
         name,
         source: Ref.make(script),
       });
-      yield* CollectionModel.add({ object: fn });
+      yield* DefaultParent.add({ object: fn });
 
       return {
         function: Obj.getURI(fn),
@@ -43,6 +43,6 @@ export default Create.pipe(
 
 const findTemplate = (templateId: string) =>
   Effect.promise(async () => {
-    const { templates } = await import('../../templates');
+    const { templates } = await import('../../templates/index.ts');
     return templates.find((template) => template.id === templateId);
   });

package/src/skills/functions/definitions.ts

@@ -4,9 +4,11 @@
 
 import * as Schema from 'effect/Schema';
 
-import { ClientService } from '@dxos/client';
 import * as Operation from '@dxos/compute/Operation';
-import { Database, DXN, Ref } from '@dxos/echo';
+import { ConfigService } from '@dxos/config';
+import { Database, DXN, Hypergraph, Ref } from '@dxos/echo';
+import { EdgeHttpClientService } from '@dxos/edge-client';
+import { Identity } from '@dxos/halo';
 import { trim } from '@dxos/util';
 
 const FunctionRef = Ref.Ref(Operation.PersistentOperation).annotate({
@@ -205,7 +207,7 @@ export const Deploy = Operation.make({
       description: 'The URL of the deployed function.',
     }),
   }),
-  services: [Database.Service, ClientService],
+  services: [Database.Service, EdgeHttpClientService, Identity.Service, ConfigService],
 });
 
 export const Invoke = Operation.make({
@@ -226,7 +228,7 @@ export const Invoke = Operation.make({
       description: 'The response from the function.',
     }),
   }),
-  services: [Database.Service, ClientService],
+  services: [Database.Service, EdgeHttpClientService],
 });
 
 const InvocationSpanSchema = Schema.Struct({
@@ -305,7 +307,7 @@ export const QueryDeployedFunctions = Operation.make({
       description: 'List of deployed functions.',
     }),
   }),
-  services: [ClientService],
+  services: [EdgeHttpClientService],
 });
 
 export const InstallFunction = Operation.make({
@@ -330,5 +332,5 @@ export const InstallFunction = Operation.make({
       description: 'Version of the installed function.',
     }),
   }),
-  services: [ClientService],
+  services: [Database.Service, Hypergraph.Service, EdgeHttpClientService],
 });

package/src/skills/functions/delete.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import * as Operation from '@dxos/compute/Operation';
 import { Database } from '@dxos/echo';
 
-import { Delete } from './definitions';
+import { Delete } from './definitions.ts';
 
 export default Delete.pipe(
   Operation.withHandler(

package/src/skills/functions/deploy.ts

@@ -3,33 +3,36 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 
-import { ClientService } from '@dxos/client';
 import { getUserFunctionIdInMetadata } from '@dxos/compute-runtime';
 import * as Operation from '@dxos/compute/Operation';
 import * as Script from '@dxos/compute/Script';
+import { ConfigService } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { Database, Obj } from '@dxos/echo';
+import { EdgeHttpClientService } from '@dxos/edge-client';
 import { FunctionsServiceClient, incrementSemverPatch } from '@dxos/edge-compute';
 import { bundleFunction, initializeBundler } from '@dxos/edge-compute/bundler';
+import { Identity } from '@dxos/halo';
 import { FunctionRuntimeKind } from '@dxos/protocols';
 
-import { Deploy } from './definitions';
+import { Deploy } from './definitions.ts';
+import { FunctionError } from './errors.ts';
 
 export default Deploy.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ function: fn }) {
       const loaded = yield* Database.load(fn);
-      const client = yield* ClientService;
       if (!loaded.source) {
-        return yield* Effect.fail(new Error('Function has no source script.'));
+        return yield* Effect.fail(new FunctionError({ message: 'Function has no source script.' }));
       }
       const script = (yield* Database.load(loaded.source)) as Script.Script;
 
       const db = Obj.getDatabase(loaded);
       if (!db || !script.source?.target?.content) {
-        return yield* Effect.fail(new Error('Script source or space not available'));
+        return yield* Effect.fail(new FunctionError({ message: 'Script source or space not available' }));
       }
 
       yield* Effect.promise(() => initializeBundler({ wasmUrl }));
@@ -41,12 +44,12 @@ export default Deploy.pipe(
       const existingFunctionId = getUserFunctionIdInMetadata(Obj.getMeta(loaded));
       const currentVersion = Obj.getMeta(loaded).version;
 
-      const identity = client.halo.identity.get();
+      const identity = Option.getOrUndefined(yield* Identity.getSnapshot);
       if (!identity) {
-        return yield* Effect.fail(new Error('Identity not available.'));
+        return yield* Effect.fail(new FunctionError({ message: 'Identity not available.' }));
       }
 
-      const functionsService = FunctionsServiceClient.fromClient(client);
+      const functionsService = new FunctionsServiceClient(yield* EdgeHttpClientService);
       const newFunction = yield* Effect.promise(() =>
         functionsService.deploy(Context.default(), {
           ownerUri: identity.did,
@@ -65,10 +68,11 @@ export default Deploy.pipe(
       });
 
       const edgeFunctionId = getUserFunctionIdInMetadata(Obj.getMeta(loaded));
+      const config = yield* ConfigService;
       return {
         function: Obj.getURI(loaded),
         functionUrl: edgeFunctionId
-          ? `${client.config.values.runtime?.services?.edge?.url ?? ''}/functions/${edgeFunctionId}`
+          ? `${config.values.runtime?.services?.edge?.url ?? ''}/functions/${edgeFunctionId}`
           : undefined,
       };
     }),

package/src/skills/functions/errors.ts

@@ -0,0 +1,8 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { BaseError } from '@dxos/errors';
+
+/** Function operation failed. The underlying failure, where there is one, is the `cause`. */
+export class FunctionError extends BaseError.extend('FunctionError', 'Function operation failed.') {}

package/src/skills/functions/index.ts

@@ -15,18 +15,18 @@ import {
   QueryDeployedFunctions,
   Read,
   Update,
-} from './definitions';
+} from './definitions.ts';
 
-export * from './definitions';
+export * from './definitions.ts';
 
 export const ScriptHandlers = OperationHandlerSet.lazy([
-  Create.pipe(Operation.lazyHandler(() => import('./create'))),
-  Read.pipe(Operation.lazyHandler(() => import('./read'))),
-  Update.pipe(Operation.lazyHandler(() => import('./update'))),
-  Delete.pipe(Operation.lazyHandler(() => import('./delete'))),
-  Deploy.pipe(Operation.lazyHandler(() => import('./deploy'))),
-  Invoke.pipe(Operation.lazyHandler(() => import('./invoke'))),
-  InspectInvocations.pipe(Operation.lazyHandler(() => import('./inspect-invocations'))),
-  QueryDeployedFunctions.pipe(Operation.lazyHandler(() => import('./query-deployed-functions'))),
-  InstallFunction.pipe(Operation.lazyHandler(() => import('./install-function'))),
+  Create.pipe(Operation.lazyHandler(() => import('./create.ts'))),
+  Read.pipe(Operation.lazyHandler(() => import('./read.ts'))),
+  Update.pipe(Operation.lazyHandler(() => import('./update.ts'))),
+  Delete.pipe(Operation.lazyHandler(() => import('./delete.ts'))),
+  Deploy.pipe(Operation.lazyHandler(() => import('./deploy.ts'))),
+  Invoke.pipe(Operation.lazyHandler(() => import('./invoke.ts'))),
+  InspectInvocations.pipe(Operation.lazyHandler(() => import('./inspect-invocations.ts'))),
+  QueryDeployedFunctions.pipe(Operation.lazyHandler(() => import('./query-deployed-functions.ts'))),
+  InstallFunction.pipe(Operation.lazyHandler(() => import('./install-function.ts'))),
 ]);

package/src/skills/functions/inspect-invocations.ts

@@ -10,7 +10,7 @@ import { InvocationTraceEndEvent, InvocationTraceStartEvent, createInvocationSpa
 import * as Operation from '@dxos/compute/Operation';
 import { Database, Feed, Filter, Obj, Query } from '@dxos/echo';
 
-import { InspectInvocations } from './definitions';
+import { InspectInvocations } from './definitions.ts';
 
 export default InspectInvocations.pipe(
   Operation.withHandler(

package/src/skills/functions/install-function.ts

@@ -4,35 +4,32 @@
 
 import * as Effect from 'effect/Effect';
 
-import { ClientService } from '@dxos/client';
 import * as Operation from '@dxos/compute/Operation';
 import { Context } from '@dxos/context';
-import { Filter, Obj } from '@dxos/echo';
+import { Database, Filter, Hypergraph, Obj } from '@dxos/echo';
+import { EdgeHttpClientService } from '@dxos/edge-client';
 import { FunctionsServiceClient } from '@dxos/edge-compute';
 
-import { InstallFunction } from './definitions';
+import { InstallFunction } from './definitions.ts';
+import { FunctionError } from './errors.ts';
 
 export default InstallFunction.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ key }) {
-      const client = yield* ClientService;
-      const functionsService = FunctionsServiceClient.fromClient(client);
+      const functionsService = new FunctionsServiceClient(yield* EdgeHttpClientService);
       const deployed = yield* Effect.promise(() => functionsService.query(Context.default()));
 
       const fn = deployed.findLast((entry) => Obj.getMeta(entry).key === key);
       if (!fn) {
-        return yield* Effect.fail(new Error(`No deployed function found with key: ${key}`));
+        return yield* Effect.fail(new FunctionError({ message: `No deployed function found with key: ${key}` }));
       }
 
-      const space = client.spaces.get()[0];
-      if (!space) {
-        return yield* Effect.fail(new Error('No space available'));
-      }
-
-      yield* Effect.promise(() => client.addTypes([Operation.PersistentOperation]));
+      const { db } = yield* Database.Service;
+      const { graph } = yield* Hypergraph.Service;
+      graph.registry.add([Operation.PersistentOperation]);
 
       const existingFunctions = yield* Effect.promise(() =>
-        space.db.query(Filter.and(Filter.type(Operation.PersistentOperation), Filter.key(key))).run(),
+        db.query(Filter.and(Filter.type(Operation.PersistentOperation), Filter.key(key))).run(),
       );
 
       let installed: Operation.PersistentOperation;
@@ -43,7 +40,7 @@ export default InstallFunction.pipe(
         }
       } else {
         installed = Obj.clone(fn);
-        space.db.add(installed);
+        db.add(installed);
       }
 
       return {

package/src/skills/functions/invoke.ts

@@ -4,26 +4,26 @@
 
 import * as Effect from 'effect/Effect';
 
-import { ClientService } from '@dxos/client';
 import * as Operation from '@dxos/compute/Operation';
 import { Context } from '@dxos/context';
 import { Database, Obj } from '@dxos/echo';
+import { EdgeHttpClientService } from '@dxos/edge-client';
 import { FunctionsServiceClient } from '@dxos/edge-compute';
 
-import { Invoke } from './definitions';
+import { Invoke } from './definitions.ts';
+import { FunctionError } from './errors.ts';
 
 export default Invoke.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ function: fn, payload }) {
       const loaded = yield* Database.load(fn);
-      const client = yield* ClientService;
 
       const spaceId = Obj.getDatabase(loaded)?.spaceId;
       if (!spaceId) {
-        return yield* Effect.fail(new Error('Function is not in a space.'));
+        return yield* Effect.fail(new FunctionError({ message: 'Function is not in a space.' }));
       }
 
-      const functionsService = FunctionsServiceClient.fromClient(client);
+      const functionsService = new FunctionsServiceClient(yield* EdgeHttpClientService);
       const result = yield* Effect.promise(() =>
         functionsService.invoke(Context.default(), loaded, payload ?? {}, { spaceId }),
       );

package/src/skills/functions/query-deployed-functions.ts

@@ -4,19 +4,18 @@
 
 import * as Effect from 'effect/Effect';
 
-import { ClientService } from '@dxos/client';
 import * as Operation from '@dxos/compute/Operation';
 import { Context } from '@dxos/context';
 import { Obj } from '@dxos/echo';
+import { EdgeHttpClientService } from '@dxos/edge-client';
 import { FunctionsServiceClient } from '@dxos/edge-compute';
 
-import { QueryDeployedFunctions } from './definitions';
+import { QueryDeployedFunctions } from './definitions.ts';
 
 export default QueryDeployedFunctions.pipe(
   Operation.withHandler(
     Effect.fn(function* () {
-      const client = yield* ClientService;
-      const functionsService = FunctionsServiceClient.fromClient(client);
+      const functionsService = new FunctionsServiceClient(yield* EdgeHttpClientService);
       const deployed = yield* Effect.promise(() => functionsService.query(Context.default()));
       return {
         functions: deployed.map((fn) => {

package/src/skills/functions/read.ts

@@ -8,14 +8,15 @@ import * as Operation from '@dxos/compute/Operation';
 import type * as Script from '@dxos/compute/Script';
 import { Database } from '@dxos/echo';
 
-import { Read } from './definitions';
+import { Read } from './definitions.ts';
+import { FunctionError } from './errors.ts';
 
 export default Read.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ function: fn }) {
       const loaded = yield* Database.load(fn);
       if (!loaded.source) {
-        return yield* Effect.fail(new Error('Function has no source script.'));
+        return yield* Effect.fail(new FunctionError({ message: 'Function has no source script.' }));
       }
       const script = (yield* Database.load(loaded.source)) as Script.Script;
       const text = yield* Database.load(script.source);

package/src/skills/functions/update.ts

@@ -9,14 +9,15 @@ import type * as Script from '@dxos/compute/Script';
 import { Database, Obj } from '@dxos/echo';
 import { Doc, applyEdits } from '@dxos/echo-doc';
 
-import { Update } from './definitions';
+import { Update } from './definitions.ts';
+import { FunctionError } from './errors.ts';
 
 export default Update.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ function: fn, name, description, edits }) {
       const loaded = yield* Database.load(fn);
       if (!loaded.source) {
-        return yield* Effect.fail(new Error('Function has no source script.'));
+        return yield* Effect.fail(new FunctionError({ message: 'Function has no source script.' }));
       }
 
       const script = (yield* Database.load(loaded.source)) as Script.Script;

package/src/skills/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as ScriptSkill from './ScriptSkill';
+export * as ScriptSkill from './ScriptSkill.ts';

package/src/templates/anthropic.ts

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as LanguageModel from 'effect/ai/LanguageModel';
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 import * as Stream from 'effect/Stream';
-import * as LanguageModel from 'effect/unstable/ai/LanguageModel';
 
 import { AiService } from '@dxos/ai';
 import * as Operation from '@dxos/compute/Operation';
@@ -27,7 +27,7 @@ const Anthropic = Operation.make({
 export default Anthropic.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ message }) {
-      const model = AiService.model('com.anthropic.model.claude-sonnet-4-6.default');
+      const model = AiService.languageModel('com.anthropic.model.claude-sonnet-5.default');
 
       //
       // Basic example.

package/src/templates/commentary.ts

@@ -215,7 +215,7 @@ export default Commentary.pipe(
       },
       Effect.provide(
         Layer.mergeAll(
-          AiService.model('com.anthropic.model.claude-haiku-4-5.default'),
+          AiService.languageModel('com.anthropic.model.claude-haiku-4-5.default'),
           ToolResolverService.layerEmpty,
           ToolExecutionService.layerEmpty,
           Trace.writerLayerNoop,

package/src/templates/forex-effect.ts

@@ -2,16 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Data from 'effect/Data';
 import * as Effect from 'effect/Effect';
+import * as FetchHttpClient from 'effect/http/FetchHttpClient';
+import * as HttpClient from 'effect/http/HttpClient';
+import * as HttpClientRequest from 'effect/http/HttpClientRequest';
 import * as Schedule from 'effect/Schedule';
 import * as Schema from 'effect/Schema';
-import * as FetchHttpClient from 'effect/unstable/http/FetchHttpClient';
-import * as HttpClient from 'effect/unstable/http/HttpClient';
-import * as HttpClientRequest from 'effect/unstable/http/HttpClientRequest';
 
 import * as Operation from '@dxos/compute/Operation';
 import { DXN } from '@dxos/keys';
 
+class NoRateError extends Data.TaggedError('NoRateError')<{ from: string; to: string }> {}
+
 const ForexEffect = Operation.make({
   meta: {
     key: DXN.make('com.example.operation.script.forexEffect'),
@@ -40,7 +43,7 @@ export default ForexEffect.pipe(
 
       const rate = json?.data?.rates?.[to];
       if (rate == null) {
-        return yield* Effect.fail(new Error(`No rate found for ${from} -> ${to}`));
+        return yield* Effect.fail(new NoRateError({ from, to }));
       }
 
       return rate.toString();

package/src/testing/index.ts

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

package/src/translations.ts

@@ -4,12 +4,14 @@
 
 import * as Script from '@dxos/compute/Script';
 import { Type } from '@dxos/echo';
-import { type Resource } from '@dxos/react-ui';
+import { translations as queryTranslations } from '@dxos/react-ui-query/translations';
+import type * as Theme from '@dxos/react-ui/Theme';
 
 import { meta } from '#meta';
 import { Notebook } from '#types';
 
 export const translations = [
+  ...queryTranslations,
   {
     'en-US': {
       [Type.getTypename(Script.Script)]: {
@@ -105,4 +107,4 @@ export const translations = [
       },
     },
   },
-] as const satisfies Resource[];
+] as const satisfies Theme.Resource[];

package/src/types/Notebook.ts

@@ -6,8 +6,6 @@ import * as Schema from 'effect/Schema';
 
 import * as Instructions from '@dxos/compute/Instructions';
 import { Annotation, DXN, Obj, Ref, Type } from '@dxos/echo';
-import { FormInputAnnotation } from '@dxos/echo/Annotation';
-import { LabelAnnotation } from '@dxos/echo/Annotation';
 import * as Graph from '@dxos/plugin-explorer/Graph';
 import { Text } from '@dxos/schema';
 
@@ -28,8 +26,12 @@ export type Cell = Schema.Schema.Type<typeof Cell>;
 export class Notebook extends Type.makeObject<Notebook>(DXN.make('org.dxos.type.notebook', '0.1.0'))(
   Schema.Struct({
     name: Schema.String.pipe(Schema.optional),
-    cells: Cell.pipe(Schema.Array, FormInputAnnotation.set(false)),
-  }).pipe(LabelAnnotation.set(['name']), Annotation.IconAnnotation.set({ icon: 'ph--notebook--regular', hue: 'sky' })),
+    cells: Cell.pipe(Schema.Array, Annotation.FormInputAnnotation.set(false)),
+  }).pipe(
+    Annotation.LabelAnnotation.set(['name']),
+    Annotation.IconAnnotation.set({ icon: 'ph--notebook--regular', hue: 'sky' }),
+    Annotation.UserType.set(),
+  ),
 ) {}
 
 export const make = (props: Obj.MakeProps<typeof Notebook> = { cells: [] }): Notebook => Obj.make(Notebook, props);