@dxos/plugin-script 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/dist/lib/browser/{settings-ERFKVNUK.mjs → settings-LNLSTZM4.mjs}

@@ -1,10 +1,11 @@
 import {
   ScriptSettings
-} from "./chunk-5CYLWXRH.mjs";
-import "./chunk-ST3ACVUC.mjs";
+} from "./chunk-LNNCD2H4.mjs";
+import "./chunk-2G2NA6DQ.mjs";
 import {
   meta
-} from "./chunk-EZVXV6DA.mjs";
+} from "./chunk-EB6AXFXO.mjs";
+import "./chunk-J5LGTIGS.mjs";
 
 // src/capabilities/settings.ts
 import { Capabilities, contributes } from "@dxos/app-framework";
@@ -22,4 +23,4 @@ var settings_default = (() => {
 export {
   settings_default as default
 };
-//# sourceMappingURL=settings-ERFKVNUK.mjs.map
+//# sourceMappingURL=settings-LNLSTZM4.mjs.map

package/dist/lib/browser/templates/index.mjs

@@ -1,7 +1,8 @@
 import {
   data_generator_default,
   templates
-} from "../chunk-ST3ACVUC.mjs";
+} from "../chunk-2G2NA6DQ.mjs";
+import "../chunk-J5LGTIGS.mjs";
 export {
   data_generator_default as dataGenerator,
   templates

package/dist/lib/browser/types/index.mjs

@@ -1,12 +1,13 @@
 import {
-  Notebook,
+  Notebook_exports,
   ScriptAction,
   ScriptSettings
-} from "../chunk-5CYLWXRH.mjs";
-import "../chunk-ST3ACVUC.mjs";
-import "../chunk-EZVXV6DA.mjs";
+} from "../chunk-LNNCD2H4.mjs";
+import "../chunk-2G2NA6DQ.mjs";
+import "../chunk-EB6AXFXO.mjs";
+import "../chunk-J5LGTIGS.mjs";
 export {
-  Notebook,
+  Notebook_exports as Notebook,
   ScriptAction,
   ScriptSettings
 };

package/dist/lib/node-esm/DeploymentDialog-GL5AUWMR.mjs

@@ -0,0 +1,15 @@
+import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+import {
+  DEPLOYMENT_DIALOG,
+  DeploymentDialog_default
+} from "./chunk-RIE676OW.mjs";
+import "./chunk-IQTBVH4L.mjs";
+import "./chunk-NNHWLRHT.mjs";
+import "./chunk-57JA6XL5.mjs";
+import "./chunk-IBV2DR36.mjs";
+import "./chunk-HSLMI22Q.mjs";
+export {
+  DEPLOYMENT_DIALOG,
+  DeploymentDialog_default as default
+};
+//# sourceMappingURL=DeploymentDialog-GL5AUWMR.mjs.map

package/dist/lib/node-esm/DeploymentDialog-GL5AUWMR.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}

package/dist/lib/node-esm/{NotebookContainer-QY5NJGJI.mjs → NotebookContainer-RTUHQN25.mjs}

@@ -2,30 +2,44 @@ import { createRequire } from 'node:module';const require = createRequire(import
 import {
   NotebookMenu,
   NotebookStack
-} from "./chunk-67OVZHI3.mjs";
-import "./chunk-VRSDE4CI.mjs";
+} from "./chunk-Q5XB7DD4.mjs";
+import "./chunk-HDKR5WCD.mjs";
 import {
   meta
-} from "./chunk-OG2SIKHE.mjs";
+} from "./chunk-IBV2DR36.mjs";
+import "./chunk-HSLMI22Q.mjs";
 
 // src/components/NotebookContainer.tsx
 import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
-import React, { useCallback, useMemo } from "react";
-import { Ref } from "@dxos/echo";
+import * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import React, { useCallback, useMemo, useState } from "react";
+import { Agent } from "@dxos/assistant-toolkit";
+import { Blueprint, Prompt } from "@dxos/blueprints";
+import { Filter, Obj, Query, Ref } from "@dxos/echo";
+import { QueryBuilder } from "@dxos/echo-query";
+import { FunctionInvocationService } from "@dxos/functions";
+import { InvocationTracer } from "@dxos/functions-runtime";
+import { TracingServiceExt } from "@dxos/functions-runtime";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { Assistant } from "@dxos/plugin-assistant";
+import { log as log2 } from "@dxos/log";
+import { useComputeRuntimeCallback } from "@dxos/plugin-automation";
+import { Graph } from "@dxos/plugin-explorer/types";
 import { getSpace } from "@dxos/react-client/echo";
 import { DropdownMenu, IconButton, Toolbar, useTranslation } from "@dxos/react-ui";
+import { useAttention } from "@dxos/react-ui-attention";
 import { StackItem } from "@dxos/react-ui-stack";
-import { DataType } from "@dxos/schema";
+import { Text } from "@dxos/schema";
+import { isNonNullable } from "@dxos/util";
 
-// src/notebook/notebook.ts
+// src/notebook/compute-graph.ts
 import { signal } from "@preact/signals-core";
 import { log } from "@dxos/log";
 
 // src/notebook/eval.ts
 import { trim } from "@dxos/util";
-var evalScript = (code, deps = {}) => {
+var evalScript = async (code, deps = {}) => {
   const sandbox = {
     ...deps,
     // Block access to global objects.
@@ -57,11 +71,11 @@ var evalScript = (code, deps = {}) => {
   };
   const sandboxKeys = Object.keys(sandbox);
   const sandboxValues = Object.values(sandbox);
-  const fn = new Function(...sandboxKeys, trim`
+  const fn2 = new Function(...sandboxKeys, trim`
       'use strict';
       return ${code};
     `);
-  return fn(...sandboxValues);
+  return fn2(...sandboxValues);
 };
 var builtIns = /* @__PURE__ */ new Set([
   // Types.
@@ -103,19 +117,6 @@ var systemDefinitions = trim`
 import { createSystem, createVirtualTypeScriptEnvironment } from "@typescript/vfs";
 import ts from "typescript";
 import { invariant } from "@dxos/invariant";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-script/src/notebook/vfs-parser.ts";
 var systemFiles = [
   {
@@ -124,6 +125,16 @@ var systemFiles = [
   }
 ];
 var VirtualTypeScriptParser = class {
+  compilerOptions = {
+    target: ts.ScriptTarget.ES2020,
+    module: ts.ModuleKind.ESNext,
+    strict: true,
+    esModuleInterop: true,
+    skipLibCheck: true,
+    forceConsistentCasingInfilenames: true,
+    jsx: ts.JsxEmit.React,
+    noLib: true
+  };
   /**
   * Parse a single expression or statement.
   */
@@ -372,36 +383,19 @@ var VirtualTypeScriptParser = class {
     const system = createSystem(fileMap);
     return createVirtualTypeScriptEnvironment(system, allFiles.map(({ filename }) => filename), ts, this.compilerOptions);
   }
-  constructor() {
-    _define_property(this, "compilerOptions", {
-      target: ts.ScriptTarget.ES2020,
-      module: ts.ModuleKind.ESNext,
-      strict: true,
-      esModuleInterop: true,
-      skipLibCheck: true,
-      forceConsistentCasingInfilenames: true,
-      jsx: ts.JsxEmit.React,
-      noLib: true
-    });
-  }
 };
 
-// src/notebook/notebook.ts
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-script/src/notebook/notebook.ts";
+// src/notebook/compute-graph.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-script/src/notebook/compute-graph.ts";
 var ComputeGraph = class {
+  _notebook;
+  _parser = new VirtualTypeScriptParser();
+  _expressions = signal({});
+  _valuesByCellId = signal({});
+  _valuesByName = signal({});
+  constructor(_notebook) {
+    this._notebook = _notebook;
+  }
   /**
   * Parsed expressions by cell ID.
   */
@@ -412,14 +406,27 @@ var ComputeGraph = class {
   * Computed values by cell ID.
   */
   get values() {
-    return this._values;
+    return this._valuesByCellId;
+  }
+  /**
+  * Computed values by name.
+  */
+  get valuesByName() {
+    return this._valuesByName;
+  }
+  /**
+  * Get computed value by cell ID.
+  */
+  getValue(cellId) {
+    return this._valuesByCellId.value[cellId];
   }
   /**
   * Compute values.
   */
-  evaluate() {
+  async evaluate() {
     const { expressions, dependencyGraph } = this.parse();
-    this._values.value = {};
+    this._valuesByCellId.value = {};
+    this._valuesByName.value = {};
     const cellExpressions = /* @__PURE__ */ new Map();
     Object.entries(expressions).forEach(([id, expr]) => {
       cellExpressions.set(id, expr);
@@ -434,19 +441,19 @@ var ComputeGraph = class {
           cellId
         }, {
           F: __dxlog_file2,
-          L: 64,
+          L: 81,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
-      const cellSource = this._notebook.cells.find((cell) => cell.id === cellId)?.script?.target?.content;
+      const cellSource = this._notebook.cells.find((cell) => cell.id === cellId)?.source?.target?.content;
       if (!cellSource) {
         log.error("no source for cell", {
           cellId
         }, {
           F: __dxlog_file2,
-          L: 70,
+          L: 87,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -463,14 +470,14 @@ var ComputeGraph = class {
             if (rhs.endsWith(";")) {
               rhs = rhs.slice(0, -1).trim();
             }
-            const result = evalScript(rhs, valuesByName);
+            const result = await this.eval(rhs, valuesByName);
             valuesByName[expr.name] = result;
             if (typeof result !== "function") {
               valuesByCellId[cellId] = result;
             }
           }
         } else {
-          const result = evalScript(cellSource, valuesByName);
+          const result = await this.eval(cellSource, valuesByName);
           valuesByCellId[cellId] = result;
         }
       } catch (error) {
@@ -479,21 +486,25 @@ var ComputeGraph = class {
           error
         }, {
           F: __dxlog_file2,
-          L: 105,
+          L: 123,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     }
-    this._values.value = valuesByCellId;
+    this._valuesByCellId.value = valuesByCellId;
+    this._valuesByName.value = valuesByName;
     return valuesByCellId;
   }
+  async eval(source, values) {
+    return evalScript(source, values);
+  }
   /**
   * Parse expressions.
   */
   parse() {
     const expressions = this._notebook.cells.filter((cell) => cell.type === "script").reduce((acc, cell) => {
-      const text = cell.script?.target?.content.trim();
+      const text = cell.source?.target?.content.trim();
       if (text) {
         const parsed = this._parser.parseExpression(text);
         acc[cell.id] = parsed;
@@ -540,37 +551,121 @@ var ComputeGraph = class {
     });
     return graph;
   }
-  constructor(_notebook) {
-    _define_property2(this, "_notebook", void 0);
-    _define_property2(this, "_parser", void 0);
-    _define_property2(this, "_expressions", void 0);
-    _define_property2(this, "_values", void 0);
-    this._notebook = _notebook;
-    this._parser = new VirtualTypeScriptParser();
-    this._expressions = signal({});
-    this._values = signal({});
-  }
 };
 
 // src/components/NotebookContainer.tsx
 var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-script/src/components/NotebookContainer.tsx";
+var INCLUDE_BLUEPRINTS = [
+  "dxos.org/blueprint/assistant",
+  "dxos.org/blueprint/markdown"
+];
 var NotebookContainer = ({ notebook, env }) => {
   var _effect = _useSignals();
   try {
     const { t } = useTranslation(meta.id);
     const space = getSpace(notebook);
+    const attendableId = notebook ? Obj.getDXN(notebook).toString() : "";
+    const { hasAttention } = useAttention(attendableId);
     const graph = useMemo(() => notebook && new ComputeGraph(notebook), [
       notebook
     ]);
-    const handleCompute = useCallback(() => {
-      graph?.evaluate();
+    const [queryValues, setQueryValues] = useState({});
+    const handleExecQueries = useCallback(async () => {
+      invariant2(space, void 0, {
+        F: __dxlog_file3,
+        L: 56,
+        S: void 0,
+        A: [
+          "space",
+          ""
+        ]
+      });
+      const builder = new QueryBuilder();
+      for (const cell of notebook?.cells ?? []) {
+        if (cell.type === "query") {
+          if (cell.source?.target) {
+            const source = cell.source.target.content;
+            const { name, filter } = builder.build(source);
+            if (filter) {
+              const ast = Query.select(filter).ast;
+              const view = cell.view?.target;
+              if (!view) {
+                const graph2 = Graph.make({
+                  query: {
+                    ast
+                  }
+                });
+                const { view: view2 } = await Graph.makeView({
+                  space,
+                  presentation: graph2
+                });
+                cell.view = Ref.make(view2);
+                cell.name = name;
+              } else {
+                view.query.ast = ast;
+              }
+            }
+          }
+          if (cell.name && cell.view?.target) {
+            const view = Obj.getSnapshot(cell.view?.target);
+            const query = Query.fromAst(view.query.ast);
+            const result = await space?.db.query(query).run();
+            const objectIds = result?.objects?.map((obj) => obj.id);
+            setQueryValues((prev) => ({
+              ...prev,
+              [cell.name]: objectIds
+            }));
+          }
+        }
+      }
     }, [
+      space,
+      notebook,
       graph
     ]);
+    const [promptResults, setPromptResults] = useState({});
+    const handleExecPrompts = useComputeRuntimeCallback(space, Effect.fnUntraced(function* () {
+      invariant2(graph, void 0, {
+        F: __dxlog_file3,
+        L: 96,
+        S: this,
+        A: [
+          "graph",
+          ""
+        ]
+      });
+      const prompts = notebook?.cells.filter((cell) => cell.type === "prompt").map((cell) => cell.prompt).filter(isNonNullable) ?? [];
+      for (const prompt of prompts) {
+        yield* runPrompt({
+          prompt,
+          input: {
+            ...queryValues,
+            ...graph.valuesByName.value
+          },
+          onResult: (result) => setPromptResults((prev) => ({
+            ...prev,
+            [prompt.dxn.toString()]: result
+          }))
+        });
+      }
+    }), [
+      notebook,
+      graph,
+      queryValues
+    ]);
+    const handleCompute = useCallback(async () => {
+      await graph?.evaluate();
+      await handleExecQueries();
+      await handleExecPrompts();
+    }, [
+      graph,
+      handleExecQueries,
+      handleExecPrompts
+    ]);
     const handleRearrange = useCallback((source, target) => {
       invariant2(notebook, void 0, {
         F: __dxlog_file3,
-        L: 41,
+        L: 129,
         S: void 0,
         A: [
           "notebook",
@@ -588,10 +683,10 @@ var NotebookContainer = ({ notebook, env }) => {
     }, [
       notebook
     ]);
-    const handleCellInsert = useCallback((type, after) => {
+    const handleCellInsert = useCallback(async (type, after) => {
       invariant2(notebook, void 0, {
         F: __dxlog_file3,
-        L: 56,
+        L: 144,
         S: void 0,
         A: [
           "notebook",
@@ -606,13 +701,16 @@ var NotebookContainer = ({ notebook, env }) => {
         case "markdown":
         case "script":
         case "query": {
-          cell.script = Ref.make(DataType.makeText());
+          cell.source = Ref.make(Text.make());
           break;
         }
         case "prompt": {
           if (space) {
-            cell.chat = Ref.make(Assistant.makeChat({
-              queue: space.queues.create()
+            const result = await space.db.query(Query.select(Filter.type(Blueprint.Blueprint))).run();
+            const blueprints = result.objects.filter((blueprint) => INCLUDE_BLUEPRINTS.includes(blueprint.key)).map((blueprint) => Ref.make(blueprint));
+            cell.prompt = Ref.make(Prompt.make({
+              instructions: "",
+              blueprints
             }));
           }
           break;
@@ -627,7 +725,7 @@ var NotebookContainer = ({ notebook, env }) => {
     const handleCellDelete = useCallback((id) => {
       invariant2(notebook, void 0, {
         F: __dxlog_file3,
-        L: 82,
+        L: 174,
         S: void 0,
         A: [
           "notebook",
@@ -644,6 +742,7 @@ var NotebookContainer = ({ notebook, env }) => {
     return /* @__PURE__ */ React.createElement(StackItem.Content, {
       toolbar: true
     }, /* @__PURE__ */ React.createElement(Toolbar.Root, {
+      disabled: !hasAttention,
       textBlockWidth: true
     }, /* @__PURE__ */ React.createElement(DropdownMenu.Root, null, /* @__PURE__ */ React.createElement(DropdownMenu.Trigger, {
       asChild: true
@@ -668,6 +767,7 @@ var NotebookContainer = ({ notebook, env }) => {
       notebook,
       graph,
       env,
+      promptResults,
       onRearrange: handleRearrange,
       onCellInsert: handleCellInsert,
       onCellDelete: handleCellDelete
@@ -677,8 +777,42 @@ var NotebookContainer = ({ notebook, env }) => {
   }
 };
 var NotebookContainer_default = NotebookContainer;
+var runPrompt = Effect.fn(function* ({ prompt, input, onResult }) {
+  const inputData = {
+    prompt,
+    input
+  };
+  const tracer = yield* InvocationTracer;
+  const trace = yield* tracer.traceInvocationStart({
+    target: void 0,
+    payload: {
+      data: {}
+    }
+  });
+  const result = yield* FunctionInvocationService.invokeFunction(Agent.prompt, inputData).pipe(Effect.provide(TracingServiceExt.layerQueue(trace.invocationTraceQueue)), Effect.exit);
+  Exit.match(result, {
+    onFailure: (cause) => {
+      const error = Cause.prettyErrors(cause)[0];
+      log2.error(error.message, error.cause ?? error.stack, {
+        F: __dxlog_file3,
+        L: 250,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      onResult(error.message);
+    },
+    onSuccess: (result2) => {
+      onResult(result2.note);
+    }
+  });
+  yield* tracer.traceInvocationEnd({
+    trace,
+    // TODO(dmaretskyi): Might miss errors.
+    exception: Exit.isFailure(result) ? Cause.prettyErrors(result.cause)[0] : void 0
+  });
+});
 export {
   NotebookContainer,
   NotebookContainer_default as default
 };
-//# sourceMappingURL=NotebookContainer-QY5NJGJI.mjs.map
+//# sourceMappingURL=NotebookContainer-RTUHQN25.mjs.map