@dxos/plugin-script 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.9.1-staging.ee54ba693a",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -13,10 +13,10 @@
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#blueprints": {
-      "source": "./src/blueprints/index.ts",
-      "types": "./dist/types/src/blueprints/index.d.ts",
-      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    "#skills": {
+      "source": "./src/skills/index.ts",
+      "types": "./dist/types/src/skills/index.d.ts",
+      "default": "./dist/lib/neutral/skills/index.mjs"
     },
     "#capabilities": {
       "source": {
@@ -82,10 +82,10 @@
       "default": "./dist/lib/neutral/index.mjs"
     },
     "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
-    "./blueprints": {
-      "source": "./src/blueprints/index.ts",
-      "types": "./dist/types/src/blueprints/index.d.ts",
-      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    "./skills": {
+      "source": "./src/skills/index.ts",
+      "types": "./dist/types/src/skills/index.d.ts",
+      "default": "./dist/lib/neutral/skills/index.mjs"
     },
     "./containers": {
       "source": "./src/containers/index.ts",
@@ -121,7 +121,7 @@
     "PLUGIN.mdl"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.3.0-fragments.1",
+    "@automerge/automerge": "3.3.0-fragments.2",
     "@codemirror/autocomplete": "^6.20.2",
     "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/language": "^6.12.3",
@@ -141,81 +141,82 @@
     "esbuild-wasm": "^0.28.0",
     "prettier": "^3.6.2",
     "typescript": "^6.0.3",
-    "@dxos/ai": "0.9.1-main.c7dcc2e112",
-    "@dxos/app-framework": "0.9.1-main.c7dcc2e112",
-    "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
-    "@dxos/assistant": "0.9.1-main.c7dcc2e112",
-    "@dxos/assistant-toolkit": "0.9.1-main.c7dcc2e112",
-    "@dxos/client-protocol": "0.9.1-main.c7dcc2e112",
-    "@dxos/compute": "0.9.1-main.c7dcc2e112",
-    "@dxos/client": "0.9.1-main.c7dcc2e112",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/config": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/devtools": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/effect": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions-runtime": "0.9.1-main.c7dcc2e112",
-    "@dxos/functions-simulator-cloudflare": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/echo-query": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-assistant": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-game": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-explorer": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-markdown": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-space": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-graph": "0.9.1-main.c7dcc2e112",
-    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-attention": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-client": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-components": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-editor": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-form": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-menu": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-stack": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui-syntax-highlighter": "0.9.1-main.c7dcc2e112",
-    "@dxos/rpc": "0.9.1-main.c7dcc2e112",
-    "@dxos/rpc-tunnel": "0.9.1-main.c7dcc2e112",
-    "@dxos/schema": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-automation": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/types": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-editor": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112"
+    "@dxos/ai": "0.9.1-staging.ee54ba693a",
+    "@dxos/app-framework": "0.9.1-staging.ee54ba693a",
+    "@dxos/assistant-toolkit": "0.9.1-staging.ee54ba693a",
+    "@dxos/assistant": "0.9.1-staging.ee54ba693a",
+    "@dxos/client": "0.9.1-staging.ee54ba693a",
+    "@dxos/client-protocol": "0.9.1-staging.ee54ba693a",
+    "@dxos/compute": "0.9.1-staging.ee54ba693a",
+    "@dxos/config": "0.9.1-staging.ee54ba693a",
+    "@dxos/app-toolkit": "0.9.1-staging.ee54ba693a",
+    "@dxos/context": "0.9.1-staging.ee54ba693a",
+    "@dxos/devtools": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-doc": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-query": "0.9.1-staging.ee54ba693a",
+    "@dxos/effect": "0.9.1-staging.ee54ba693a",
+    "@dxos/echo-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/functions": "0.9.1-staging.ee54ba693a",
+    "@dxos/functions-runtime": "0.9.1-staging.ee54ba693a",
+    "@dxos/invariant": "0.9.1-staging.ee54ba693a",
+    "@dxos/functions-simulator-cloudflare": "0.9.1-staging.ee54ba693a",
+    "@dxos/keys": "0.9.1-staging.ee54ba693a",
+    "@dxos/log": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-explorer": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-game": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-assistant": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-graph": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-markdown": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-space": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-client": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-attention": "0.9.1-staging.ee54ba693a",
+    "@dxos/protocols": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-components": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-routine": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-form": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-menu": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-mosaic": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-editor": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui-syntax-highlighter": "0.9.1-staging.ee54ba693a",
+    "@dxos/rpc": "0.9.1-staging.ee54ba693a",
+    "@dxos/rpc-tunnel": "0.9.1-staging.ee54ba693a",
+    "@dxos/types": "0.9.1-staging.ee54ba693a",
+    "@dxos/schema": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-editor": "0.9.1-staging.ee54ba693a",
+    "@dxos/util": "0.9.1-staging.ee54ba693a"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/ai": "0.36.0",
     "@effect/ai-anthropic": "0.26.0",
-    "@effect/platform": "0.96.1",
-    "@types/react": "~19.2.7",
+    "@effect/platform": "0.96.2",
+    "@types/react": "~19.2.17",
     "@types/react-dom": "~19.2.3",
     "chess.js": "^1.0.0",
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
     "vite": "^8.0.16",
-    "@dxos/plugin-automation": "0.9.1-main.c7dcc2e112",
-    "@dxos/config": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-chess": "0.9.1-main.c7dcc2e112",
-    "@dxos/plugin-testing": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/storybook-utils": "0.9.1-main.c7dcc2e112",
-    "@dxos/random": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "@dxos/plugin-routine": "0.9.1-staging.ee54ba693a",
+    "@dxos/config": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-chess": "0.9.1-staging.ee54ba693a",
+    "@dxos/plugin-testing": "0.9.1-staging.ee54ba693a",
+    "@dxos/random": "0.9.1-staging.ee54ba693a",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/storybook-utils": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.96.1",
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "@effect/platform": "0.96.2",
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
+    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
+    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.node.ts

@@ -6,12 +6,12 @@ import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { Script } from '@dxos/compute';
 
-import { AppGraphBuilder, BlueprintDefinition, CreateObject, OperationHandler } from '#capabilities';
+import { AppGraphBuilder, CreateObject, OperationHandler, SkillDefinition } from '#capabilities';
 import { meta } from '#meta';
 
 export const ScriptPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),
   AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({ schema: [Script.Script] }),

package/src/ScriptPlugin.test.ts

@@ -26,6 +26,6 @@ describe('ScriptPlugin', () => {
     );
 
     await harness.fire(AppActivationEvents.SetupArtifactDefinition);
-    expect(harness.manager.getActive()).toContain(moduleId('BlueprintDefinition'));
+    expect(harness.manager.getActive()).toContain(moduleId('SkillDefinition'));
   });
 });

package/src/ScriptPlugin.tsx

@@ -8,12 +8,12 @@ import { Script } from '@dxos/compute';
 
 import {
   AppGraphBuilder,
-  BlueprintDefinition,
   Compiler,
   CreateObject,
   OperationHandler,
   ReactSurface,
   ScriptSettings,
+  SkillDefinition,
 } from '#capabilities';
 import { meta } from '#meta';
 import { translations } from '#translations';
@@ -24,7 +24,7 @@ import pluginSpec from '../PLUGIN.mdl?raw';
 
 export const ScriptPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),
   AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({ schema: [Script.Script] }),

package/src/capabilities/create-object.ts

@@ -25,7 +25,6 @@ export default Capability.makeModule(
             return yield* Operation.invoke(SpaceOperation.AddObject, {
               object,
               target: options.target,
-              hidden: true,
               targetNodeId: options.targetNodeId,
             });
           }),
@@ -39,7 +38,6 @@ export default Capability.makeModule(
             return yield* Operation.invoke(SpaceOperation.AddObject, {
               object,
               target: options.target,
-              hidden: true,
               targetNodeId: options.targetNodeId,
             });
           }),

package/src/capabilities/index.ts

@@ -6,7 +6,7 @@ import { Capability } from '@dxos/app-framework';
 import type { OperationHandlerSet } from '@dxos/compute';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
-export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
+export const SkillDefinition = Capability.lazy('SkillDefinition', () => import('./skill-definition'));
 export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const Compiler = Capability.lazy('Compiler', () => import('./compiler'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(

package/src/capabilities/node.ts

@@ -6,7 +6,7 @@ import { Capability } from '@dxos/app-framework';
 import type { OperationHandlerSet } from '@dxos/compute';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
-export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
+export const SkillDefinition = Capability.lazy('SkillDefinition', () => import('./skill-definition'));
 export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const Compiler = Capability.lazy('Compiler', () => import('./compiler'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(

package/src/capabilities/operation-handler.ts

@@ -9,7 +9,7 @@ import { OperationHandlerSet } from '@dxos/compute';
 
 import { ScriptOperationHandlerSet } from '#operations';
 
-import { ScriptHandlers } from '../blueprints/functions';
+import { ScriptHandlers } from '../skills/functions';
 
 export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
   Effect.fnUntraced(function* () {

package/src/capabilities/react-surface.tsx

@@ -15,8 +15,14 @@ import { useClient } from '@dxos/react-client';
 import { getSpace } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
 
-import { ScriptPluginSettings } from '#components';
-import { DeploymentDialog, NotebookArticle, ScriptArticle, ScriptProperties, TestContainer } from '#containers';
+import {
+  DeploymentDialog,
+  NotebookArticle,
+  ScriptArticle,
+  ScriptProperties,
+  ScriptSettings,
+  TestContainer,
+} from '#containers';
 import { useCompiler } from '#hooks';
 import { meta } from '#meta';
 import { Notebook, ScriptCapabilities, type Settings } from '#types';
@@ -39,11 +45,7 @@ export default Capability.makeModule(() =>
             await client.halo.writeCredentials([getAccessCredential(identityKey)]);
           };
           return (
-            <ScriptPluginSettings
-              settings={settings}
-              onSettingsChange={updateSettings}
-              onAuthenticate={handleAuthenticate}
-            />
+            <ScriptSettings settings={settings} onSettingsChange={updateSettings} onAuthenticate={handleAuthenticate} />
           );
         },
       }),

package/src/capabilities/skill-definition.ts

@@ -0,0 +1,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+
+import { ScriptSkill } from '#skills';
+
+const skillDefinition = () => Effect.succeed([Capability.contributes(AppCapabilities.SkillDefinition, ScriptSkill)]);
+
+export default skillDefinition;

package/src/components/NotebookStack/NotebookCell.tsx

@@ -7,9 +7,9 @@ import React, { useCallback, useMemo } from 'react';
 import { Surface } from '@dxos/app-framework/ui';
 import { AppSurface } from '@dxos/app-toolkit/ui';
 import { type Database, Obj } from '@dxos/echo';
-import { createDocAccessor } from '@dxos/echo-client';
+import { Doc } from '@dxos/echo-doc';
 import { invariant } from '@dxos/invariant';
-import { TemplateEditor } from '@dxos/plugin-assistant/components';
+import { TemplateEditor } from '@dxos/plugin-routine/components';
 import { useThemeContext, useTranslation } from '@dxos/react-ui';
 import { QueryEditor, type QueryEditorProps } from '@dxos/react-ui-components';
 import { Editor, type EditorViewProps } from '@dxos/react-ui-editor';
@@ -48,12 +48,7 @@ export const NotebookCell = ({ db, graph, dragging, cell, promptResults, env }:
 
   const extensions = useMemo(() => {
     return cell.source?.target
-      ? [
-          createDataExtensions({
-            id: cell.id,
-            text: createDocAccessor(cell.source.target, ['content']),
-          }),
-        ].filter(isNonNullable)
+      ? [createDataExtensions({ id: cell.id, text: Doc.createAccessor(cell.source.target, ['content']) })]
       : [];
   }, [cell.source?.target]);
 
@@ -90,7 +85,7 @@ export const NotebookCell = ({ db, graph, dragging, cell, promptResults, env }:
       }
 
       return (
-        <>
+        <div className='flex flex-col divide-y divide-subdued-separator'>
           <TypescriptEditor
             id={cell.id}
             role='section'
@@ -105,7 +100,7 @@ export const NotebookCell = ({ db, graph, dragging, cell, promptResults, env }:
             }}
           />
           <NotebookCellValue cell={cell} graph={graph} />
-        </>
+        </div>
       );
 
     case 'query':
@@ -118,7 +113,7 @@ export const NotebookCell = ({ db, graph, dragging, cell, promptResults, env }:
         <div className={mx('h-full overflow-hidden grid', explorerGraph && !dragging && 'grid-rows-[min-content_1fr]')}>
           <QueryEditor
             id={cell.id}
-            classNames={[editorStyles, 'border-b border-subdued-separator']}
+            classNames={editorStyles}
             db={db}
             value={cell.source.target.content}
             onChange={handleQueryChange}
@@ -141,12 +136,7 @@ export const NotebookCell = ({ db, graph, dragging, cell, promptResults, env }:
 
       return (
         <>
-          <TemplateEditor
-            id={cell.id}
-            source={cell.prompt.target.instructions}
-            lineNumbers={false}
-            classNames={editorStyles}
-          />
+          <TemplateEditor id={cell.id} source={cell.prompt.target.text} lineNumbers={false} classNames={editorStyles} />
           <NotebookPromptResult cell={cell} promptResults={promptResults} />
         </>
       );
@@ -164,12 +154,7 @@ const NotebookCellValue = ({ cell, graph }: NotebookCellProps) => {
   }
 
   return (
-    <div
-      className={mx(
-        'flex w-full bg-group-surface border-y border-subdued-separator text-description font-mono',
-        valueStyles,
-      )}
-    >
+    <div className={mx('flex w-full bg-group-surface text-description font-mono', valueStyles)}>
       {name && (
         <>
           <span className='text-success-text'>{name}</span>
@@ -207,20 +192,17 @@ const NotebookTextEditor = ({
   const { themeMode } = useThemeContext();
   const extensions = useMemo(() => {
     return [
-      createBasicExtensions({
-        placeholder: t('notebook-markdown.placeholder'),
-        readOnly,
-      }),
       createThemeExtensions({ themeMode, syntaxHighlighting: true }),
+      createBasicExtensions({ placeholder: t('notebook-markdown.placeholder'), readOnly }),
       createMarkdownExtensions(),
       decorateMarkdown(),
       extensionsProp,
     ].filter(isNonNullable);
-  }, [extensionsProp]);
+  }, [extensionsProp, readOnly, themeMode, t]);
 
   return (
     <Editor.Root>
-      <Editor.View {...props} extensions={extensions} selectionEnd />
+      <Editor.View classNames='border' {...props} extensions={extensions} selectionEnd />
     </Editor.Root>
   );
 };

package/src/components/NotebookStack/NotebookStack.stories.tsx

@@ -7,9 +7,9 @@ import * as Effect from 'effect/Effect';
 import React, { useMemo } from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { AutomationPlugin } from '@dxos/plugin-automation/testing';
 import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { RoutinePlugin } from '@dxos/plugin-routine/testing';
 import { corePlugins } from '@dxos/plugin-testing';
 import { withLayout } from '@dxos/react-ui/testing';
 
@@ -27,7 +27,7 @@ const meta = {
   title: 'plugins/plugin-script/components/NotebookStack',
   component: NotebookStackStory,
   decorators: [
-    withLayout({ layout: 'column', classNames: 'w-document-max-width' }),
+    withLayout({ layout: 'column', classNames: 'dx-document' }),
     withPluginManager({
       plugins: [
         ...corePlugins(),
@@ -37,7 +37,7 @@ const meta = {
               yield* initializeIdentity(client);
             }),
         }),
-        AutomationPlugin(),
+        RoutinePlugin(),
       ],
     }),
   ],