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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.c351d160a8",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,27 +14,27 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts"
     },
     "./blueprints": {
+      "source": "./src/blueprints/index.ts",
       "browser": "./dist/lib/browser/blueprints/index.mjs",
       "node": "./dist/lib/node-esm/blueprints/index.mjs",
-      "source": "./src/blueprints/index.ts",
       "types": "./dist/types/src/blueprints/index.d.ts"
     },
     "./templates": {
+      "source": "./src/templates/index.ts",
       "browser": "./dist/lib/browser/templates/index.mjs",
       "node": "./dist/lib/node-esm/templates/index.mjs",
-      "source": "./src/templates/index.ts",
       "types": "./dist/types/src/templates/index.d.ts"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts"
     }
   },
@@ -64,11 +64,11 @@
     "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.3",
     "@codemirror/view": "^6.38.4",
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
     "@lezer/common": "^1.2.2",
     "@lezer/highlight": "^1.2.1",
-    "@octokit/core": "^4.0.4",
+    "@octokit/core": "^7.0.6",
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-continue": "^2.3.1",
     "@valtown/codemirror-ts": "^2.3.1",
@@ -78,93 +78,94 @@
     "prettier": "^3.6.2",
     "react-syntax-highlighter": "^15.6.1",
     "typescript": "^5.9.3",
-    "@dxos/ai": "0.8.4-main.bc674ce",
-    "@dxos/assistant": "0.8.4-main.bc674ce",
-    "@dxos/app-framework": "0.8.4-main.bc674ce",
-    "@dxos/assistant-toolkit": "0.8.4-main.bc674ce",
-    "@dxos/blueprints": "0.8.4-main.bc674ce",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/client": "0.8.4-main.bc674ce",
-    "@dxos/client-protocol": "0.8.4-main.bc674ce",
-    "@dxos/compute": "0.8.4-main.bc674ce",
-    "@dxos/config": "0.8.4-main.bc674ce",
-    "@dxos/debug": "0.8.4-main.bc674ce",
-    "@dxos/devtools": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/echo-protocol": "0.8.4-main.bc674ce",
-    "@dxos/echo-query": "0.8.4-main.bc674ce",
-    "@dxos/effect": "0.8.4-main.bc674ce",
-    "@dxos/functions": "0.8.4-main.bc674ce",
-    "@dxos/functions-runtime": "0.8.4-main.bc674ce",
-    "@dxos/functions-simulator-cloudflare": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/operation": "0.8.4-main.bc674ce",
-    "@dxos/plugin-automation": "0.8.4-main.bc674ce",
-    "@dxos/keys": "0.8.4-main.bc674ce",
-    "@dxos/plugin-assistant": "0.8.4-main.bc674ce",
-    "@dxos/plugin-client": "0.8.4-main.bc674ce",
-    "@dxos/plugin-deck": "0.8.4-main.bc674ce",
-    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
-    "@dxos/plugin-explorer": "0.8.4-main.bc674ce",
-    "@dxos/plugin-markdown": "0.8.4-main.bc674ce",
-    "@dxos/plugin-space": "0.8.4-main.bc674ce",
-    "@dxos/plugin-theme": "0.8.4-main.bc674ce",
-    "@dxos/plugin-stack": "0.8.4-main.bc674ce",
-    "@dxos/plugin-token-manager": "0.8.4-main.bc674ce",
-    "@dxos/protocols": "0.8.4-main.bc674ce",
-    "@dxos/react-client": "0.8.4-main.bc674ce",
-    "@dxos/react-edge-client": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-attention": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-components": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-editor": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-form": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-list": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-menu": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-mosaic": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bc674ce",
-    "@dxos/rpc-tunnel": "0.8.4-main.bc674ce",
-    "@dxos/rpc": "0.8.4-main.bc674ce",
-    "@dxos/schema": "0.8.4-main.bc674ce",
-    "@dxos/types": "0.8.4-main.bc674ce",
-    "@dxos/ui": "0.8.4-main.bc674ce",
-    "@dxos/ui-editor": "0.8.4-main.bc674ce",
-    "@dxos/vendor-quickjs": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce"
+    "@dxos/ai": "0.8.4-main.c351d160a8",
+    "@dxos/app-framework": "0.8.4-main.c351d160a8",
+    "@dxos/app-toolkit": "0.8.4-main.c351d160a8",
+    "@dxos/assistant": "0.8.4-main.c351d160a8",
+    "@dxos/blueprints": "0.8.4-main.c351d160a8",
+    "@dxos/async": "0.8.4-main.c351d160a8",
+    "@dxos/assistant-toolkit": "0.8.4-main.c351d160a8",
+    "@dxos/client-protocol": "0.8.4-main.c351d160a8",
+    "@dxos/compute": "0.8.4-main.c351d160a8",
+    "@dxos/client": "0.8.4-main.c351d160a8",
+    "@dxos/debug": "0.8.4-main.c351d160a8",
+    "@dxos/config": "0.8.4-main.c351d160a8",
+    "@dxos/echo": "0.8.4-main.c351d160a8",
+    "@dxos/devtools": "0.8.4-main.c351d160a8",
+    "@dxos/echo-db": "0.8.4-main.c351d160a8",
+    "@dxos/echo-query": "0.8.4-main.c351d160a8",
+    "@dxos/echo-protocol": "0.8.4-main.c351d160a8",
+    "@dxos/effect": "0.8.4-main.c351d160a8",
+    "@dxos/functions": "0.8.4-main.c351d160a8",
+    "@dxos/functions-runtime": "0.8.4-main.c351d160a8",
+    "@dxos/invariant": "0.8.4-main.c351d160a8",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.c351d160a8",
+    "@dxos/keys": "0.8.4-main.c351d160a8",
+    "@dxos/operation": "0.8.4-main.c351d160a8",
+    "@dxos/log": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-automation": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-assistant": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-client": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-deck": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-explorer": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-graph": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-markdown": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-space": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-theme": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-stack": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-token-manager": "0.8.4-main.c351d160a8",
+    "@dxos/react-edge-client": "0.8.4-main.c351d160a8",
+    "@dxos/react-client": "0.8.4-main.c351d160a8",
+    "@dxos/protocols": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-attention": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-editor": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-form": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-list": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-menu": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-components": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-mosaic": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-stack": "0.8.4-main.c351d160a8",
+    "@dxos/rpc": "0.8.4-main.c351d160a8",
+    "@dxos/rpc-tunnel": "0.8.4-main.c351d160a8",
+    "@dxos/schema": "0.8.4-main.c351d160a8",
+    "@dxos/types": "0.8.4-main.c351d160a8",
+    "@dxos/ui": "0.8.4-main.c351d160a8",
+    "@dxos/ui-editor": "0.8.4-main.c351d160a8",
+    "@dxos/util": "0.8.4-main.c351d160a8",
+    "@dxos/vendor-quickjs": "0.8.4-main.c351d160a8"
   },
   "devDependencies": {
     "@automerge/automerge": "3.2.3",
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/ai": "0.32.1",
-    "@effect/ai-anthropic": "0.22.0",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/ai-anthropic": "0.23.0",
+    "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "chess.js": "^1.0.0",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/config": "0.8.4-main.bc674ce",
-    "@dxos/plugin-chess": "0.8.4-main.bc674ce",
-    "@dxos/plugin-automation": "0.8.4-main.bc674ce",
-    "@dxos/random": "0.8.4-main.bc674ce",
-    "@dxos/plugin-testing": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/storybook-utils": "0.8.4-main.bc674ce"
+    "vite": "^7.1.11",
+    "@dxos/echo-db": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-chess": "0.8.4-main.c351d160a8",
+    "@dxos/config": "0.8.4-main.c351d160a8",
+    "@dxos/random": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-testing": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8",
+    "@dxos/storybook-utils": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-automation": "0.8.4-main.c351d160a8"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce"
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -3,9 +3,11 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { Common, Plugin } from '@dxos/app-framework';
-import { Ref } from '@dxos/echo';
+import { Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Annotation, Ref } from '@dxos/echo';
 import { Script } from '@dxos/functions';
 import { Operation } from '@dxos/operation';
 import { type CreateObject } from '@dxos/plugin-space/types';
@@ -24,22 +26,15 @@ import { ScriptEvents } from './types';
 import { Notebook, ScriptOperation } from './types';
 
 export const ScriptPlugin = Plugin.define(meta).pipe(
-  Plugin.addModule({
-    activatesOn: Common.ActivationEvent.SetupSettings,
-    activate: ScriptSettings,
-  }),
-  Plugin.addModule({
-    activatesOn: ScriptEvents.SetupCompiler,
-    activate: Compiler,
-  }),
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
     metadata: [
       {
         id: Script.Script.typename,
         metadata: {
-          icon: 'ph--code--regular',
-          iconHue: 'sky',
+          icon: Annotation.IconAnnotation.get(Script.Script).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Script.Script).pipe(Option.getOrThrow).hue ?? 'white',
           // TODO(wittjosiah): Move out of metadata.
           loadReferences: async (script: Script.Script) => await Ref.Array.loadAll([script.source]),
           inputSchema: ScriptOperation.ScriptProps,
@@ -48,25 +43,30 @@ export const ScriptPlugin = Plugin.define(meta).pipe(
               const { object } = yield* Operation.invoke(ScriptOperation.CreateScript, props);
               return object;
             })) satisfies CreateObject,
-          addToCollectionOnCreate: true,
         },
       },
       {
         id: Notebook.Notebook.typename,
         metadata: {
-          icon: 'ph--notebook--regular',
-          iconHue: 'sky',
+          icon: Annotation.IconAnnotation.get(Notebook.Notebook).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Notebook.Notebook).pipe(Option.getOrThrow).hue ?? 'white',
           inputSchema: ScriptOperation.NotebookProps,
           createObject: ((props) => Effect.sync(() => Notebook.make(props))) satisfies CreateObject,
-          addToCollectionOnCreate: true,
         },
       },
     ],
   }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  Common.Plugin.addSchemaModule({ schema: [Script.Script] }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
-  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addSchemaModule({ schema: [Script.Script] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    activatesOn: AppActivationEvents.SetupSettings,
+    activate: ScriptSettings,
+  }),
+  Plugin.addModule({
+    activatesOn: ScriptEvents.SetupCompiler,
+    activate: Compiler,
+  }),
   Plugin.make,
 );

package/src/blueprints/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as ScriptBlueprint from './script-blueprint';
+export { default as ScriptBlueprint } from './script-blueprint';

package/src/blueprints/script-blueprint.ts

@@ -2,23 +2,30 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type AppCapabilities } from '@dxos/app-toolkit';
 import { Blueprint, Template } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
 import { trim } from '@dxos/util';
 
-export const functions: FunctionDefinition[] = [];
-export const tools: string[] = [];
+const BLUEPRINT_KEY = 'org.dxos.blueprint.script';
 
-export const Key = 'dxos.org/blueprint/script';
+const functions: AppCapabilities.BlueprintDefinition['functions'] = [];
 
-export const make = () =>
+const make = () =>
   Blueprint.make({
-    key: Key,
+    key: BLUEPRINT_KEY,
     name: 'Script',
-    tools: Blueprint.toolDefinitions({ functions, tools }),
+    tools: Blueprint.toolDefinitions({ functions, tools: [] }),
     instructions: Template.make({
       source: trim`
         You can create and update scripts which contain Typescript code.
       `,
     }),
   });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions,
+  make,
+};
+
+export default blueprint;

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -4,9 +4,10 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { Script } from '@dxos/functions';
-import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { GraphBuilder } from '@dxos/plugin-graph';
 
 import { meta } from '../../meta';
@@ -15,12 +16,12 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* Effect.all([
       GraphBuilder.createTypeExtension({
-        id: `${meta.id}/execute`,
+        id: `${meta.id}.execute`,
         type: Script.Script,
-        connector: (script) =>
+        connector: () =>
           Effect.succeed([
             {
-              id: [script.id, 'execute'].join(ATTENDABLE_PATH_SEPARATOR),
+              id: 'execute',
               type: PLANK_COMPANION_TYPE,
               data: 'execute',
               properties: {
@@ -32,12 +33,12 @@ export default Capability.makeModule(
           ]),
       }),
       GraphBuilder.createTypeExtension({
-        id: `${meta.id}/logs`,
+        id: `${meta.id}.logs`,
         type: Script.Script,
-        connector: (script) =>
+        connector: () =>
           Effect.succeed([
             {
-              id: [script.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),
+              id: 'logs',
               type: PLANK_COMPANION_TYPE,
               data: 'logs',
               properties: {
@@ -50,6 +51,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/blueprint-definition/blueprint-definition.ts

@@ -4,20 +4,14 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
 import { ScriptBlueprint } from '../../blueprints';
 
-export type BlueprintCapabilities = [
-  Capability.Capability<typeof Common.Capability.Functions>,
-  Capability.Capability<typeof Common.Capability.BlueprintDefinition>,
-];
-
-const blueprintDefinition = Capability.makeModule<[], BlueprintCapabilities>(() =>
-  Effect.succeed([
-    Capability.contributes(Common.Capability.Functions, ScriptBlueprint.functions),
-    Capability.contributes(Common.Capability.BlueprintDefinition, ScriptBlueprint.make()),
-  ]),
-);
+const blueprintDefinition = Capability.makeModule<
+  [],
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+>(() => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, ScriptBlueprint)]));
 
 export default blueprintDefinition;

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -6,19 +6,20 @@ import { Octokit } from '@octokit/core';
 import * as Effect from 'effect/Effect';
 import * as Predicate from 'effect/Predicate';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import { Script } from '@dxos/functions';
 import { Operation, OperationResolver } from '@dxos/operation';
 import { TokenManagerOperation } from '@dxos/plugin-token-manager/types';
 
-import { DEPLOYMENT_DIALOG } from '../../components';
+import { DEPLOYMENT_DIALOG } from '../../constants';
 import { defaultScriptsForIntegration } from '../../meta';
 import { templates } from '../../templates';
 import { ScriptOperation } from '../../types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    return Capability.contributes(Common.Capability.OperationResolver, [
+    return Capability.contributes(Capabilities.OperationResolver, [
       OperationResolver.make({
         operation: ScriptOperation.CreateScript,
         handler: Effect.fnUntraced(function* ({ name, gistUrl, initialTemplateId }) {
@@ -60,7 +61,7 @@ export default Capability.makeModule(
             .filter(Predicate.isNotNullable);
 
           if (scriptTemplates.length > 0) {
-            yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+            yield* Operation.invoke(LayoutOperation.UpdateDialog, {
               subject: DEPLOYMENT_DIALOG,
               blockAlign: 'start',
               state: true,

package/src/capabilities/react-surface/react-surface.tsx

@@ -5,17 +5,18 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { useAtomCapability, useSettingsState } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useAtomCapability, useSettingsState } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { InvocationTraceContainer } from '@dxos/devtools';
 import { Obj } from '@dxos/echo';
 import { Script } from '@dxos/functions';
 import { getSpace } from '@dxos/react-client/echo';
-import { Layout } from '@dxos/react-ui-mosaic';
+import { Panel } from '@dxos/react-ui';
 import { type AccessToken } from '@dxos/types';
 
+import { DEPLOYMENT_DIALOG } from '../../constants';
 import {
-  DEPLOYMENT_DIALOG,
   DeploymentDialog,
   NotebookContainer,
   ScriptContainer,
@@ -23,26 +24,26 @@ import {
   ScriptPluginSettings,
   ScriptProperties,
   TestContainer,
-} from '../../components';
+} from '../../containers';
 import { useCompiler } from '../../hooks';
 import { meta } from '../../meta';
 import { Notebook, ScriptCapabilities, type ScriptSettings } from '../../types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
-        id: `${meta.id}/plugin-settings`,
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: `${meta.id}.plugin-settings`,
         role: 'article',
-        filter: (data): data is { subject: Common.Capability.Settings } =>
-          Common.Capability.isSettings(data.subject) && data.subject.prefix === meta.id,
+        filter: (data): data is { subject: AppCapabilities.Settings } =>
+          AppCapabilities.isSettings(data.subject) && data.subject.prefix === meta.id,
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<ScriptSettings>(subject.atom);
           return <ScriptPluginSettings settings={settings} onSettingsChange={updateSettings} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/script/article`,
+      Surface.create({
+        id: `${meta.id}.script.article`,
         role: ['article', 'section'],
         filter: (data): data is { subject: Script.Script } => Obj.instanceOf(Script.Script, data.subject),
         component: ({ data, role }) => {
@@ -56,38 +57,46 @@ export default Capability.makeModule(() =>
           return <ScriptContainer role={role} subject={data.subject} settings={settings} env={compiler?.environment} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/notebook/article`,
+      Surface.create({
+        id: `${meta.id}.notebook.article`,
         role: 'article',
-        filter: (data): data is { subject: Notebook.Notebook } => Obj.instanceOf(Notebook.Notebook, data.subject),
+        filter: (data): data is { attendableId: string; subject: Notebook.Notebook } =>
+          typeof data.attendableId === 'string' && Obj.instanceOf(Notebook.Notebook, data.subject),
         component: ({ data, role }) => {
           const compiler = useCompiler();
-          return <NotebookContainer role={role} subject={data.subject} env={compiler?.environment} />;
+          return (
+            <NotebookContainer
+              role={role}
+              subject={data.subject}
+              attendableId={data.attendableId}
+              env={compiler?.environment}
+            />
+          );
         },
       }),
       // TODO(burdon): Standardize PluginSettings vs ObjectSettings.
       // TODO(burdon): Why is ScriptProperties different from ScriptObjectSettings?
-      Common.createSurface({
-        id: `${meta.id}/companion/base-settings`,
+      Surface.create({
+        id: `${meta.id}.companion.base-settings`,
         role: 'base-object-settings',
         filter: (data): data is { subject: Script.Script } => Obj.instanceOf(Script.Script, data.subject),
         component: ({ data }) => <ScriptProperties object={data.subject} />,
       }),
-      Common.createSurface({
-        id: `${meta.id}/companion/settings`,
+      Surface.create({
+        id: `${meta.id}.companion.settings`,
         role: 'object-settings',
         filter: (data): data is { subject: Script.Script } => Obj.instanceOf(Script.Script, data.subject),
         component: ({ data }) => <ScriptObjectSettings object={data.subject} />,
       }),
-      Common.createSurface({
-        id: `${meta.id}/companion/execute`,
+      Surface.create({
+        id: `${meta.id}.companion.execute`,
         role: 'article',
         filter: (data): data is { companionTo: Script.Script } =>
           Obj.instanceOf(Script.Script, data.companionTo) && data.subject === 'execute',
         component: ({ data, role }) => <TestContainer script={data.companionTo} role={role} />,
       }),
-      Common.createSurface({
-        id: `${meta.id}/companion/logs`,
+      Surface.create({
+        id: `${meta.id}.companion.logs`,
         role: 'article',
         filter: (data): data is { companionTo: Script.Script } =>
           Obj.instanceOf(Script.Script, data.companionTo) && data.subject === 'logs',
@@ -95,18 +104,20 @@ export default Capability.makeModule(() =>
           const space = getSpace(data.companionTo);
           const queueDxn = space?.properties.invocationTraceQueue?.dxn;
           return (
-            <Layout.Main role={role}>
-              <InvocationTraceContainer
-                db={space?.db}
-                queueDxn={queueDxn}
-                target={data.companionTo}
-                detailAxis='block'
-              />
-            </Layout.Main>
+            <Panel.Root role={role}>
+              <Panel.Content asChild>
+                <InvocationTraceContainer
+                  db={space?.db}
+                  queueDxn={queueDxn}
+                  target={data.companionTo}
+                  detailAxis='block'
+                />
+              </Panel.Content>
+            </Panel.Root>
           );
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: DEPLOYMENT_DIALOG,
         role: 'dialog',
         filter: (data): data is { props: { accessToken: AccessToken.AccessToken; scriptTemplates: any } } =>

package/src/capabilities/settings/settings.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
 import { meta } from '../../meta';
@@ -22,7 +23,7 @@ export default Capability.makeModule(() =>
 
     return [
       Capability.contributes(ScriptCapabilities.Settings, settingsAtom),
-      Capability.contributes(Common.Capability.Settings, {
+      Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
         schema: ScriptSettings,
         atom: settingsAtom,