acrylblends 0.8.0 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acrylblends",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "The Acryl web framework (import { Acryl } from \"acrylblends\") and the acrylblends command that scaffolds Cordis apps.",
   "license": "MIT",
   "type": "module",

package/shared/DEFAULTS.md

@@ -42,4 +42,4 @@ The door is a command in this folder, `.acryl/bin/acryl`, that lets you look at
 - `look` and `act` need the app's page open in a browser (`brief` says `Page: not open` when it is not). Look again before each `act`: refs belong to the latest `look`.
 - A password field is not shown and cannot be typed into through the door; sign in by hand, or test the sign-in with a test.
 - Every verb takes `--json`. The exit code is 0 for done, 1 when the verb failed, 2 for a usage error and 3 when no app is running in this folder.
-- `plugin add plugins/<name>` checks the plugin, installs it and makes it live without a restart (when the app has the `extensions` plugin; `acrylblends init --template agent` does). `tool call` reaches only the tools on the door's allowlist (empty by default). On Windows the command is `.acryl\bin\acryl.cmd`.
+- `plugin add plugins/<name>` checks the plugin, installs it and makes it live without a restart (the `extensions` plugin does this; every template that has the door has it, in development only: it is left out with `NODE_ENV=production`). `tool call` reaches only the tools on the door's allowlist (empty by default). On Windows the command is `.acryl\bin\acryl.cmd`.

package/templates/chat/blend.yaml

@@ -20,6 +20,9 @@ spec:
       name: acryl-db-sqlite
     - id: routes
       name: routes
+    # Plugins installed while the app runs (the door's `plugin add`): development only, src/app.ts leaves it out when NODE_ENV=production.
+    - id: extensions
+      name: extensions
     - id: server
       name: acryl-node-server
       config:

package/templates/chat/src/app.ts

@@ -5,6 +5,7 @@ import * as db from '../plugins/acryl-db-sqlite/src/index.ts'
 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 {
   blueprintsIn,
@@ -21,6 +22,7 @@ export const registry = {
   'acryl-db-sqlite': db,
   'acryl-node-server': nodeServer,
   'acryl-door': door,
+  extensions,
   routes,
 }
 
@@ -71,30 +73,29 @@ export interface AppOptions {
  * `migrations/`; the one place that names the SQLite provider is this file (`acrylblends check-deps`), so a different provider is a change here.
  */
 export async function createApp(chosen: AppInstance, options: AppOptions = {}): Promise<App> {
-  const manifest = readManifest(options.values)
+  const read = readManifest(options.values)
   const listen = options.listen
+  // Rows left out: the server (and the door, which needs it) when the app is reached in process; the door when it is switched off; live plugin installs in production.
+  const leaveOut = new Set<string>()
+  if (listen === false) leaveOut.add('acryl-node-server').add('acryl-door')
+  if (!doorEnabled()) leaveOut.add('acryl-door')
+  if (process.env.NODE_ENV === 'production') leaveOut.add('extensions')
+  const manifest = without(read, ...leaveOut)
   const file = options.database ?? 'data/chat.sqlite'
   const root = new Context()
   const first = root.plugin(instance, chosen)
   await first.await()
   const fibers: Fiber[] = [
     first,
-    ...(await compose(
-      root,
-      listen === false
-        ? without(manifest, 'acryl-node-server', 'acryl-door')
-        : doorEnabled()
-          ? manifest
-          : without(manifest, 'acryl-door'),
-      registry,
-      {
-        db: {
-          path: isAbsolute(file) ? file : resolve(projectRoot, file),
-          migrations: join(projectRoot, 'migrations'),
-        },
-        server: { port: chosen.port.start, scan: chosen.port.scan ? 20 : 0 },
+    ...(await compose(root, manifest, registry, {
+      db: {
+        path: isAbsolute(file) ? file : resolve(projectRoot, file),
+        migrations: join(projectRoot, 'migrations'),
       },
-    )),
+      // What is installed while the app runs lives in plugins/, next to the plugins copied from the library (plugins/library.json lists those, so they are not installed twice).
+      extensions: { sources: [{ dir: join(projectRoot, 'plugins'), trust: 'install' }] },
+      server: { port: chosen.port.start, scan: chosen.port.scan ? 20 : 0 },
+    })),
   ]
   return {
     root,

package/templates/chat/template.json

@@ -6,6 +6,7 @@
     "acryl-db-sqlite",
     "manifest",
     "save",
+    "extensions",
     "acryl-door"
   ]
 }

package/templates/nodejs/blend.yaml

@@ -17,6 +17,9 @@ spec:
       name: acryl-router
     - id: routes
       name: routes
+    # Plugins installed while the app runs (the door's `plugin add`): development only, src/app.ts leaves it out when NODE_ENV=production.
+    - id: extensions
+      name: extensions
     - id: server
       name: acryl-node-server
       config:

package/templates/nodejs/src/app.ts

@@ -4,6 +4,7 @@ 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 {
   blueprintsIn,
@@ -19,11 +20,14 @@ 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(fileURLToPath(new URL('..', import.meta.url)), 'blend.yaml')
+export const MANIFEST = join(projectRoot, 'blend.yaml')
 
 /**
  * The app's manifest, resolved. A Blend finds its Blueprint in `blueprints/<id>.yaml`; an app that is itself a Blueprint never looks.
@@ -32,7 +36,7 @@ export const MANIFEST = join(fileURLToPath(new URL('..', import.meta.url)), 'ble
 export function readManifest(values?: Readonly<Record<string, ParameterValue>>) {
   return loadManifest(MANIFEST, {
     known: Object.keys(registry),
-    getBlueprint: blueprintsIn(join(fileURLToPath(new URL('..', import.meta.url)), 'blueprints')),
+    getBlueprint: blueprintsIn(join(projectRoot, 'blueprints')),
     ...(values ? { values } : {}),
   })
 }
@@ -62,25 +66,24 @@ export async function createApp(
   chosen: AppInstance,
   options: { values?: Readonly<Record<string, ParameterValue>>; listen?: boolean } = {},
 ): Promise<App> {
-  const manifest = readManifest(options.values)
+  const read = readManifest(options.values)
   const listen = options.listen
+  // Rows left out: the server (and the door, which needs it) when the app is reached in process; the door when it is switched off; live plugin installs in production.
+  const leaveOut = new Set<string>()
+  if (listen === false) leaveOut.add('acryl-node-server').add('acryl-door')
+  if (!doorEnabled()) leaveOut.add('acryl-door')
+  if (process.env.NODE_ENV === 'production') leaveOut.add('extensions')
+  const manifest = without(read, ...leaveOut)
   const root = new Context()
   const first = root.plugin(instance, chosen)
   await first.await()
   const fibers: Fiber[] = [
     first,
-    ...(await compose(
-      root,
-      listen === false
-        ? without(manifest, 'acryl-node-server', 'acryl-door')
-        : doorEnabled()
-          ? manifest
-          : without(manifest, 'acryl-door'),
-      registry,
-      {
-        server: { port: chosen.port.start, scan: chosen.port.scan ? 20 : 0 },
-      },
-    )),
+    ...(await compose(root, manifest, registry, {
+      // What is installed while the app runs lives in plugins/, next to the plugins copied from the library (plugins/library.json lists those, so they are not installed twice).
+      extensions: { sources: [{ dir: join(projectRoot, 'plugins'), trust: 'install' }] },
+      server: { port: chosen.port.start, scan: chosen.port.scan ? 20 : 0 },
+    })),
   ]
   return {
     root,

package/templates/nodejs/template.json

@@ -1,3 +1,11 @@
 {
-  "plugins": ["instance", "acryl-router", "acryl-node-server", "manifest", "save", "acryl-door"]
+  "plugins": [
+    "instance",
+    "acryl-router",
+    "acryl-node-server",
+    "manifest",
+    "save",
+    "extensions",
+    "acryl-door"
+  ]
 }

package/templates/notes/blend.yaml

@@ -20,6 +20,9 @@ spec:
       name: acryl-db-sqlite
     - id: routes
       name: routes
+    # Plugins installed while the app runs (the door's `plugin add`): development only, src/app.ts leaves it out when NODE_ENV=production.
+    - id: extensions
+      name: extensions
     - id: server
       name: acryl-node-server
       config:

package/templates/notes/src/app.ts

@@ -5,6 +5,7 @@ import * as db from '../plugins/acryl-db-sqlite/src/index.ts'
 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 {
   blueprintsIn,
@@ -21,6 +22,7 @@ export const registry = {
   'acryl-db-sqlite': db,
   'acryl-node-server': nodeServer,
   'acryl-door': door,
+  extensions,
   routes,
 }
 
@@ -71,30 +73,29 @@ export interface AppOptions {
  * `migrations/`; the one place that names the SQLite provider is this file (`acrylblends check-deps`), so a different provider is a change here.
  */
 export async function createApp(chosen: AppInstance, options: AppOptions = {}): Promise<App> {
-  const manifest = readManifest(options.values)
+  const read = readManifest(options.values)
   const listen = options.listen
+  // Rows left out: the server (and the door, which needs it) when the app is reached in process; the door when it is switched off; live plugin installs in production.
+  const leaveOut = new Set<string>()
+  if (listen === false) leaveOut.add('acryl-node-server').add('acryl-door')
+  if (!doorEnabled()) leaveOut.add('acryl-door')
+  if (process.env.NODE_ENV === 'production') leaveOut.add('extensions')
+  const manifest = without(read, ...leaveOut)
   const file = options.database ?? 'data/notes.sqlite'
   const root = new Context()
   const first = root.plugin(instance, chosen)
   await first.await()
   const fibers: Fiber[] = [
     first,
-    ...(await compose(
-      root,
-      listen === false
-        ? without(manifest, 'acryl-node-server', 'acryl-door')
-        : doorEnabled()
-          ? manifest
-          : without(manifest, 'acryl-door'),
-      registry,
-      {
-        db: {
-          path: isAbsolute(file) ? file : resolve(projectRoot, file),
-          migrations: join(projectRoot, 'migrations'),
-        },
-        server: { port: chosen.port.start, scan: chosen.port.scan ? 20 : 0 },
+    ...(await compose(root, manifest, registry, {
+      db: {
+        path: isAbsolute(file) ? file : resolve(projectRoot, file),
+        migrations: join(projectRoot, 'migrations'),
       },
-    )),
+      // What is installed while the app runs lives in plugins/, next to the plugins copied from the library (plugins/library.json lists those, so they are not installed twice).
+      extensions: { sources: [{ dir: join(projectRoot, 'plugins'), trust: 'install' }] },
+      server: { port: chosen.port.start, scan: chosen.port.scan ? 20 : 0 },
+    })),
   ]
   return {
     root,

package/templates/notes/template.json

@@ -6,6 +6,7 @@
     "acryl-db-sqlite",
     "manifest",
     "save",
+    "extensions",
     "acryl-door"
   ]
 }