acrylblends 1.3.1 → 1.3.2

package/legacy/layouts.json

@@ -5,7 +5,7 @@
       "version": "0.3.0",
       "layouts": {
         "agent": "c2f30958043b",
-        "blank": "9c650cf52bf3",
+        "blank": "bdb9735e013b",
         "todo": "45694a8d9e15"
       }
     },
@@ -13,7 +13,7 @@
       "version": "0.4.0",
       "layouts": {
         "agent": "2e790da977b2",
-        "blank": "aea589283445",
+        "blank": "e04303a7f8dd",
         "todo": "02e613b3625c"
       }
     },
@@ -21,7 +21,7 @@
       "version": "0.4.1",
       "layouts": {
         "agent": "2e790da977b2",
-        "blank": "aea589283445",
+        "blank": "e04303a7f8dd",
         "todo": "5923d3a6099f"
       }
     },
@@ -29,7 +29,7 @@
       "version": "0.5.0",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "b2cbb759c889",
+        "blank": "5b9f10e1ba5e",
         "todo": "8e64211312f3"
       }
     },
@@ -37,7 +37,7 @@
       "version": "0.5.1",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "b2cbb759c889",
+        "blank": "5b9f10e1ba5e",
         "todo": "8e64211312f3"
       }
     },
@@ -45,7 +45,7 @@
       "version": "0.6.0",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "b2cbb759c889",
+        "blank": "5b9f10e1ba5e",
         "todo": "8e64211312f3"
       }
     },
@@ -53,7 +53,7 @@
       "version": "0.6.1",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "b2cbb759c889",
+        "blank": "5b9f10e1ba5e",
         "todo": "8e64211312f3"
       }
     },
@@ -61,7 +61,7 @@
       "version": "0.6.2",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "b2cbb759c889",
+        "blank": "5b9f10e1ba5e",
         "todo": "8e64211312f3"
       }
     },
@@ -69,7 +69,7 @@
       "version": "0.6.3",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "b2cbb759c889",
+        "blank": "5b9f10e1ba5e",
         "todo": "8e64211312f3"
       }
     },
@@ -77,7 +77,7 @@
       "version": "0.6.4",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "b2cbb759c889",
+        "blank": "5b9f10e1ba5e",
         "todo": "8e64211312f3"
       }
     },
@@ -85,7 +85,7 @@
       "version": "0.7.0",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -93,7 +93,7 @@
       "version": "0.7.1",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -101,7 +101,7 @@
       "version": "0.7.2",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -109,7 +109,7 @@
       "version": "0.7.3",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -117,7 +117,7 @@
       "version": "0.7.4",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -125,7 +125,7 @@
       "version": "0.7.5",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -133,7 +133,7 @@
       "version": "0.7.6",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -141,7 +141,7 @@
       "version": "0.7.7",
       "layouts": {
         "agent": "157ce3db1112",
-        "blank": "d6d371c9a65e",
+        "blank": "2447ac6d5d24",
         "todo": "8e64211312f3"
       }
     },
@@ -149,7 +149,7 @@
       "version": "0.7.8",
       "layouts": {
         "agent": "71fb54a5a942",
-        "blank": "5a91c558af22",
+        "blank": "c3be1d735b1a",
         "chat": "7076cc821e2c",
         "nodejs": "b1bd9462496c",
         "notes": "6cab2d09747c",
@@ -160,7 +160,7 @@
       "version": "0.8.0",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "f20ad9a51b06",
         "nodejs": "1d477f37aaf4",
         "notes": "7ca2dfed623a",
@@ -171,7 +171,7 @@
       "version": "0.8.1",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -182,7 +182,7 @@
       "version": "0.9.0",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -193,7 +193,7 @@
       "version": "0.9.0-next.1",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -204,7 +204,7 @@
       "version": "0.9.1",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -215,7 +215,7 @@
       "version": "0.9.2",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -226,7 +226,7 @@
       "version": "0.10.0",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -237,7 +237,7 @@
       "version": "0.11.0",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -248,7 +248,7 @@
       "version": "1.0.0",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -259,7 +259,7 @@
       "version": "1.0.0-rc.1",
       "layouts": {
         "agent": "b5ef3c786ae4",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -270,7 +270,7 @@
       "version": "1.0.1",
       "layouts": {
         "agent": "6a5fb9c15c53",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "a9a9ab44c58e",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -281,7 +281,7 @@
       "version": "1.0.2",
       "layouts": {
         "agent": "6a5fb9c15c53",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -292,7 +292,7 @@
       "version": "1.0.3",
       "layouts": {
         "agent": "6a5fb9c15c53",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -303,7 +303,7 @@
       "version": "1.0.4",
       "layouts": {
         "agent": "6a5fb9c15c53",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -314,7 +314,7 @@
       "version": "1.0.5",
       "layouts": {
         "agent": "24c681a00fca",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -325,7 +325,7 @@
       "version": "1.0.6",
       "layouts": {
         "agent": "24c681a00fca",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -336,7 +336,7 @@
       "version": "1.0.7",
       "layouts": {
         "agent": "6307045545dc",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -347,7 +347,7 @@
       "version": "1.0.8",
       "layouts": {
         "agent": "74ece148269c",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -358,7 +358,7 @@
       "version": "1.0.9",
       "layouts": {
         "agent": "74ece148269c",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -369,7 +369,7 @@
       "version": "1.0.10",
       "layouts": {
         "agent": "74ece148269c",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
@@ -380,12 +380,45 @@
       "version": "1.1.0",
       "layouts": {
         "agent": "855359304707",
-        "blank": "5a91c558af22",
+        "blank": "387f7e25aaeb",
         "chat": "7dbe6d5170df",
         "nodejs": "d5bab75076ef",
         "notes": "4edc36949c15",
         "todo": "849a18d66dc1"
       }
+    },
+    {
+      "version": "1.2.0",
+      "layouts": {
+        "agent": "b96ba6e3598a",
+        "blank": "5f6dd8910c50",
+        "chat": "5120c4a9fa61",
+        "nodejs": "9d59115118c7",
+        "notes": "fc3fe7c749d2",
+        "todo": "164274ffcf7f"
+      }
+    },
+    {
+      "version": "1.3.0",
+      "layouts": {
+        "agent": "858de7a1ad0b",
+        "blank": "5f6dd8910c50",
+        "chat": "5120c4a9fa61",
+        "nodejs": "9d59115118c7",
+        "notes": "fc3fe7c749d2",
+        "todo": "164274ffcf7f"
+      }
+    },
+    {
+      "version": "1.3.1",
+      "layouts": {
+        "agent": "ecbc84f1c1e5",
+        "blank": "a7e8f539ffee",
+        "chat": "d4464dfb3b04",
+        "nodejs": "a6a340b4d3a6",
+        "notes": "fb43a1c5f3b4",
+        "todo": "164274ffcf7f"
+      }
     }
   ],
   "templates": {
@@ -429,22 +462,51 @@
       "855359304707": [
         "src/app.ts",
         "src/routes.ts"
+      ],
+      "b96ba6e3598a": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "858de7a1ad0b": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "ecbc84f1c1e5": [
+        "src/app.ts",
+        "src/routes.ts"
       ]
     },
     "blank": {
-      "9c650cf52bf3": [
+      "bdb9735e013b": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "e04303a7f8dd": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "5b9f10e1ba5e": [
+        "src/app.ts",
         "src/routes.ts"
       ],
-      "aea589283445": [
+      "2447ac6d5d24": [
+        "src/app.ts",
         "src/routes.ts"
       ],
-      "b2cbb759c889": [
+      "c3be1d735b1a": [
+        "src/app.ts",
         "src/routes.ts"
       ],
-      "d6d371c9a65e": [
+      "387f7e25aaeb": [
+        "src/app.ts",
         "src/routes.ts"
       ],
-      "5a91c558af22": [
+      "5f6dd8910c50": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "a7e8f539ffee": [
+        "src/app.ts",
         "src/routes.ts"
       ]
     },
@@ -464,6 +526,14 @@
       "7dbe6d5170df": [
         "src/app.ts",
         "src/routes.ts"
+      ],
+      "5120c4a9fa61": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "d4464dfb3b04": [
+        "src/app.ts",
+        "src/routes.ts"
       ]
     },
     "nodejs": {
@@ -478,6 +548,14 @@
       "d5bab75076ef": [
         "src/app.ts",
         "src/routes.ts"
+      ],
+      "9d59115118c7": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "a6a340b4d3a6": [
+        "src/app.ts",
+        "src/routes.ts"
       ]
     },
     "notes": {
@@ -492,6 +570,14 @@
       "4edc36949c15": [
         "src/app.ts",
         "src/routes.ts"
+      ],
+      "fc3fe7c749d2": [
+        "src/app.ts",
+        "src/routes.ts"
+      ],
+      "fb43a1c5f3b4": [
+        "src/app.ts",
+        "src/routes.ts"
       ]
     },
     "todo": {
@@ -518,6 +604,10 @@
       "849a18d66dc1": [
         "src/app.ts",
         "src/todo.ts"
+      ],
+      "164274ffcf7f": [
+        "src/app.ts",
+        "src/todo.ts"
       ]
     }
   }

package/legacy/nodejs/9d59115118c7/src/app.ts

@@ -0,0 +1,150 @@
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { Context, type Fiber } from '@deepseek-ai/cordis'
+import * as door from '../plugins/acryl-door/src/index.ts'
+import * as nodeServer from '../plugins/acryl-node-server/src/index.ts'
+import * as router from '../plugins/acryl-router/src/index.ts'
+import { extensions } from '../plugins/extensions/index.ts'
+import { type AppInstance, instance } from '../plugins/instance/index.ts'
+import {
+  appPluginNames,
+  blueprintsIn,
+  compose,
+  loadAppPlugins,
+  loadManifest,
+  type ParameterValue,
+} from '../plugins/manifest/index.ts'
+import { doorEnabled } from './door.ts'
+import { FRAME_MOUNT_PREFIX, routes } from './routes.ts'
+
+/** The plugins this app's code provides. `blend.yaml` chooses, orders and configures them, and adds the app's own plugins from `plugins/` by name. */
+export const registry = {
+  'acryl-router': router,
+  'acryl-node-server': nodeServer,
+  'acryl-door': door,
+  extensions,
+  routes,
+}
+
+const projectRoot = fileURLToPath(new URL('..', import.meta.url))
+
+/** The manifest next to this app's source. */
+export const MANIFEST = join(projectRoot, 'blend.yaml')
+/** The app's plugins: the library copies `registry` imports, and the app's own plugins (a feature each), which `blend.yaml` mounts by their folder name. */
+const PLUGINS_DIR = join(projectRoot, 'plugins')
+
+/**
+ * The app's manifest, resolved. A Blend finds its Blueprint in `blueprints/<id>.yaml`; an app that is itself a Blueprint never looks.
+ * `createApp` and the tests read it the same way.
+ */
+export function readManifest(values?: Readonly<Record<string, ParameterValue>>) {
+  return loadManifest(MANIFEST, {
+    known: [...Object.keys(registry), ...appPluginNames(PLUGINS_DIR)],
+    getBlueprint: blueprintsIn(join(projectRoot, 'blueprints')),
+    ...(values ? { values } : {}),
+  })
+}
+
+/** The manifest without some rows: without its server (and so its door) the app is reached in process, through `root.router.request`; the door is also left out in production. */
+function without<M extends { plugins: readonly { use: string }[] }>(
+  manifest: M,
+  ...uses: string[]
+): M {
+  return {
+    ...manifest,
+    plugins: manifest.plugins.map((row) =>
+      uses.includes(row.use) ? { ...row, disabled: true } : row,
+    ),
+  }
+}
+
+export interface App {
+  readonly root: Context
+  /** The address the server listens on; empty when the app was made with `listen: false`. */
+  readonly url: string
+  stop(): Promise<void>
+}
+
+export interface AppOptions {
+  readonly values?: Readonly<Record<string, ParameterValue>>
+  /** The path the app is mounted at; absent on its own server, where it keeps the root, and {@link FRAME_MOUNT_PREFIX} in the frame. */
+  readonly prefix?: string
+  /** Start the HTTP server (default). Tests pass `false` and call `app.root.router.request(path)`: it needs no port, so it also runs where a sandbox forbids listening. */
+  readonly listen?: boolean
+}
+
+/** The rows the frame host provides: the app contributes only the plugins that are its own. */
+const HOST_ROWS = [
+  'instance',
+  'acryl-router',
+  'acryl-node-server',
+  'acryl-web-server',
+  'acryl-page',
+  'manifest',
+  'save',
+  'acryl-door',
+]
+
+/**
+ * The app's rows, composed into `ctx`: the app's own server calls this from `createApp`, and the generated frame layer mounts it as one row, so the frame
+ * runs the app exactly as the app's own server does (same rows, same order, same config). `host: true` leaves the infrastructure rows to the frame host,
+ * which is where the door lives too, and mounts the app at {@link FRAME_MOUNT_PREFIX}.
+ */
+export async function composeInto(
+  ctx: Context,
+  chosen: AppInstance,
+  options: AppOptions & { readonly host?: boolean } = {},
+): Promise<Fiber[]> {
+  const read = readManifest(options.values)
+  const own = options.host !== true && options.listen !== false
+  // The frame host mounts the app under its own prefix; the app's own server keeps the root.
+  const prefix = options.prefix ?? (options.host === true ? FRAME_MOUNT_PREFIX : undefined)
+  // Rows left out: the server (and the door, which needs it) when the app is reached in process or inside the frame host; the door when it is switched
+  // off.
+  const leaveOut = new Set<string>(options.host === true ? HOST_ROWS : [])
+  if (!own) leaveOut.add('acryl-node-server').add('acryl-door')
+  if (!doorEnabled()) leaveOut.add('acryl-door')
+  const manifest = without(read, ...leaveOut)
+  // The rows that name one of the app's own plugin folders (a feature: plugins/<name>/ and its row) rather than a registry import. Each one that runs
+  // is imported here; all of them, off or on, belong to their row, so the extensions row never starts them a second time.
+  const ownRows = [
+    ...new Set(read.plugins.map((row) => row.use).filter((use) => !Object.hasOwn(registry, use))),
+  ]
+  const ownPlugins = await loadAppPlugins(
+    PLUGINS_DIR,
+    ownRows.filter((use) => manifest.plugins.some((row) => row.use === use && !row.disabled)),
+  )
+  return compose(
+    ctx,
+    manifest,
+    { ...registry, ...ownPlugins },
+    {
+      // The routes row mounts the pages (and the client modules) at the prefix the frame host chose.
+      routes: { ...(prefix === undefined ? {} : { prefix }) },
+      // The app's own plugins live in plugins/, next to the plugins copied from the library (plugins/library.json lists those, so they are not installed twice).
+      // In production they start read-only from where they are deployed: the app keeps its features, and nothing can be installed while it runs.
+      extensions: {
+        ...(process.env.NODE_ENV === 'production' ? { readOnly: true } : {}),
+        sources: [{ dir: PLUGINS_DIR, trust: 'install' }],
+        rows: ownRows,
+      },
+      // Only the app's own server listens; the frame host owns the server and its port.
+      ...(own ? { server: { port: chosen.port.start, scan: chosen.port.scan ? 20 : 0 } } : {}),
+    },
+  )
+}
+
+/** The app: `instance` first (where it lives, chosen at run time), then the manifest's rows in order. */
+export async function createApp(chosen: AppInstance, options: AppOptions = {}): Promise<App> {
+  const root = new Context()
+  const first = root.plugin(instance, chosen)
+  await first.await()
+  const fibers: Fiber[] = [first, ...(await composeInto(root, chosen, options))]
+  return {
+    root,
+    url: options.listen === false ? '' : root.nodeServer.url,
+    async stop() {
+      for (const fiber of [...fibers].reverse()) await fiber.dispose()
+    },
+  }
+}