acrylblends 0.4.1 → 0.5.0

package/plugins/acryl-router/tests/no-dom/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2024",
+    "lib": ["ES2024"],
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "strict": true,
+    "exactOptionalPropertyTypes": true,
+    "noEmit": true,
+    "types": ["node"]
+  },
+  "files": ["consumer.ts"]
+}

package/plugins/acryl-router/tests/service.spec.ts

@@ -7,7 +7,7 @@
 import { Context, type FiberState } from '@deepseek-ai/cordis'
 import { afterEach, describe, expect, it } from 'vitest'
 import { streamSSE } from '../src/helpers/index.ts'
-import { apply, App, Config, connectionOf, HTTPException, name, type Router } from '../src/index.ts'
+import { apply, Acryl, Config, connectionOf, HTTPException, name, type Router } from '../src/index.ts'
 
 const PENDING = 0 as FiberState.PENDING
 const ACTIVE = 2 as FiberState.ACTIVE
@@ -42,7 +42,7 @@ function consumer(path: string, label: string) {
     name: `consumer${label}`,
     inject: ['router'],
     apply(ctx: Context): void {
-      ctx.router.route('/', new App().get(path, c => c.text(label)))
+      ctx.router.route('/', new Acryl().get(path, c => c.text(label)))
     },
   }
 }
@@ -52,7 +52,7 @@ const get = (router: Router, path: string): Promise<Response> => router.fetch(ne
 describe('acryl-router mounts', () => {
   it('serves a mounted app under its path, with the app\'s own routes, middleware and error handler', async () => {
     const { router } = await mountRouter()
-    const api = new App()
+    const api = new Acryl()
       .use(async (c, next) => { await next(); c.header('x-api', 'yes') })
       .get('/items/:id', c => c.json({ id: c.req.param('id') }))
       .get('/boom', () => { throw new Error('boom') })
@@ -70,28 +70,28 @@ describe('acryl-router mounts', () => {
 
   it('removes a mount with its remover, idempotently, and keeps the others', async () => {
     const { router } = await mountRouter()
-    const removeA = router.route('/', new App().get('/a', c => c.text('a')))
-    router.route('/', new App().get('/b', c => c.text('b')))
+    const removeA = router.route('/', new Acryl().get('/a', c => c.text('a')))
+    router.route('/', new Acryl().get('/b', c => c.text('b')))
     expect((await get(router, '/a')).status).toBe(200)
     removeA()
     removeA()
     expect((await get(router, '/a')).status).toBe(404)
     expect(await (await get(router, '/b')).text()).toBe('b')
-    router.route('/', new App().get('/a', c => c.text('a2')))
+    router.route('/', new Acryl().get('/a', c => c.text('a2')))
     expect(await (await get(router, '/a')).text()).toBe('a2')
   })
 
   it('runs mounts in the order they were made, so an earlier mount\'s middleware wraps a later mount\'s routes', async () => {
     const { router } = await mountRouter()
-    router.route('/', new App().use('/guarded/*', async c => c.text('denied', 401)))
-    router.route('/', new App().get('/guarded/x', c => c.text('secret')).get('/open', c => c.text('open')))
+    router.route('/', new Acryl().use('/guarded/*', async c => c.text('denied', 401)))
+    router.route('/', new Acryl().get('/guarded/x', c => c.text('secret')).get('/open', c => c.text('open')))
     expect((await get(router, '/guarded/x')).status).toBe(401)
     expect(await (await get(router, '/open')).text()).toBe('open')
   })
 
   it('takes one router-wide error handler and one not-found handler, owned by the caller', async () => {
     const { router } = await mountRouter()
-    router.route('/', new App().get('/boom', () => { throw new Error('boom') }).get('/teapot', () => { throw new HTTPException(418, { message: 'short' }) }))
+    router.route('/', new Acryl().get('/boom', () => { throw new Error('boom') }).get('/teapot', () => { throw new HTTPException(418, { message: 'short' }) }))
     expect((await get(router, '/boom')).status).toBe(500)
     expect((await get(router, '/teapot')).status).toBe(418)
 
@@ -109,13 +109,13 @@ describe('acryl-router mounts', () => {
     const ctx = root()
     ctx.plugin(provider, { trailingSlash: 'ignore', disposeGraceMs: 2000 })
     await settle()
-    ctx.router.route('/', new App().get('/a', c => c.text('a')))
+    ctx.router.route('/', new Acryl().get('/a', c => c.text('a')))
     expect((await get(ctx.router, '/a/')).status).toBe(200)
   })
 
   it('hands the transport\'s connection info to the handler and gives an in-process call an empty one', async () => {
     const { router } = await mountRouter()
-    router.route('/', new App().get('/who', c => c.json({ remote: connectionOf(c).remoteAddress ?? null, port: connectionOf(c).localPort ?? null })))
+    router.route('/', new Acryl().get('/who', c => c.json({ remote: connectionOf(c).remoteAddress ?? null, port: connectionOf(c).localPort ?? null })))
     const over = await router.fetch(new Request('http://acryl.test/who'), { remoteAddress: '127.0.0.1', localPort: 4000 })
     expect(await over.json()).toEqual({ remote: '127.0.0.1', port: 4000 })
     const inProcess = await router.request('/who')
@@ -154,7 +154,7 @@ describe('acryl-router lifecycle through Cordis', () => {
 
   it('labels a mount by its path with one child per route, so no label grows with the app (an inspector caps label length)', async () => {
     const { ctx, router } = await mountRouter()
-    const big = new App().use('/api/*', async (_c, next) => { await next() })
+    const big = new Acryl().use('/api/*', async (_c, next) => { await next() })
     for (let i = 0; i < 60; i += 1) big.get(`/api/a-fairly-long-resource-name-${String(i)}`, c => c.text('ok'))
     const fiber = ctx.plugin({ name: 'big', inject: ['router'], apply: (inner: Context) => { inner.router.route('/', big) } })
     await settle()
@@ -192,7 +192,7 @@ describe('acryl-router lifecycle through Cordis', () => {
 
   it('serves the routes an app had when it was mounted, whatever else changes later', async () => {
     const { ctx, router } = await mountRouter()
-    const app = new App().get('/early', c => c.text('early'))
+    const app = new Acryl().get('/early', c => c.text('early'))
     router.route('/', app)
     app.get('/late', c => c.text('late'))
     expect((await get(router, '/early')).status).toBe(200)
@@ -223,7 +223,7 @@ describe('acryl-router lifecycle through Cordis', () => {
       name: 'counting',
       inject: ['router'],
       apply(inner: Context): void {
-        inner.router.route('/', new App().use(async (_c, next) => { calls += 1; await next() }).get('/count', c => c.text(String(calls))))
+        inner.router.route('/', new Acryl().use(async (_c, next) => { calls += 1; await next() }).get('/count', c => c.text(String(calls))))
       },
     }
     for (let round = 0; round < 10; round += 1) {
@@ -261,7 +261,7 @@ describe('acryl-router lifecycle through Cordis', () => {
     await settle()
     const router = ctx.router
     let aborted = false
-    router.route('/', new App().get('/slow', async c => {
+    router.route('/', new Acryl().get('/slow', async c => {
       await new Promise<void>((_resolve, reject) => { c.req.raw.signal.addEventListener('abort', () => { aborted = true; reject(new Error('aborted')) }, { once: true }) })
       return c.text('late')
     }))
@@ -278,7 +278,7 @@ describe('acryl-router lifecycle through Cordis', () => {
   it('forwards the caller\'s own abort to the handler signal', async () => {
     const { router } = await mountRouter()
     let seen = false
-    router.route('/', new App().get('/slow', async c => {
+    router.route('/', new Acryl().get('/slow', async c => {
       await new Promise<void>((_resolve, reject) => { c.req.raw.signal.addEventListener('abort', () => { seen = true; reject(new Error('aborted')) }, { once: true }) })
       return c.text('x')
     }))
@@ -295,7 +295,7 @@ describe('acryl-router lifecycle through Cordis', () => {
     const fiber = ctx.plugin(provider, config)
     await settle()
     let cleaned = false
-    ctx.router.route('/', new App().get('/events', c => streamSSE(c, async stream => {
+    ctx.router.route('/', new Acryl().get('/events', c => streamSSE(c, async stream => {
       stream.onAbort(() => { cleaned = true })
       await stream.writeSSE({ data: 'first' })
       while (!stream.aborted) await stream.sleep(10)
@@ -319,7 +319,7 @@ describe('acryl-router lifecycle through Cordis', () => {
       name: 'streaming',
       inject: ['router'],
       apply(inner: Context): void {
-        inner.router.route('/', new App().get('/events', c => streamSSE(c, async stream => {
+        inner.router.route('/', new Acryl().get('/events', c => streamSSE(c, async stream => {
           stream.onAbort(() => { cleaned = true })
           await stream.writeSSE({ data: 'first' })
           while (!stream.aborted) await stream.sleep(10)
@@ -330,7 +330,7 @@ describe('acryl-router lifecycle through Cordis', () => {
       name: 'other',
       inject: ['router'],
       apply(inner: Context): void {
-        inner.router.route('/', new App().get('/slow', async c => {
+        inner.router.route('/', new Acryl().get('/slow', async c => {
           c.req.raw.signal.addEventListener('abort', () => { otherAborted = true }, { once: true })
           await new Promise<void>(resolve => { release = resolve })
           return c.text('done')
@@ -361,7 +361,7 @@ describe('acryl-router lifecycle through Cordis', () => {
       name: 'guard',
       inject: ['router'],
       apply(inner: Context): void {
-        inner.router.route('/', new App()
+        inner.router.route('/', new Acryl()
           .use('/held/*', async (c, next) => {
             c.req.raw.signal.addEventListener('abort', () => { guardAborted = true }, { once: true })
             await new Promise<void>((_resolve, reject) => { c.req.raw.signal.addEventListener('abort', () => { reject(new Error('aborted')) }, { once: true }) })
@@ -374,7 +374,7 @@ describe('acryl-router lifecycle through Cordis', () => {
       name: 'handler',
       inject: ['router'],
       apply(inner: Context): void {
-        inner.router.route('/', new App()
+        inner.router.route('/', new Acryl()
           .get('/held/x', c => c.text('held'))
           .get('/passed/x', c => streamSSE(c, async stream => {
             stream.onAbort(() => { handlerAborted = true })
@@ -402,7 +402,7 @@ describe('acryl-router lifecycle through Cordis', () => {
     const fiber = ctx.plugin(provider, config)
     await settle()
     let finished = false
-    ctx.router.route('/', new App().get('/later', c => {
+    ctx.router.route('/', new Acryl().get('/later', c => {
       c.executionCtx.waitUntil(new Promise<void>(resolve => { setTimeout(() => { finished = true; resolve() }, 30) }))
       return c.text('now')
     }))
@@ -416,7 +416,7 @@ describe('acryl-router lifecycle through Cordis', () => {
     const ctx = root()
     const fiber = ctx.plugin(provider, { trailingSlash: 'strict', disposeGraceMs: 30 })
     await settle()
-    ctx.router.route('/', new App().get('/stuck', c => { c.executionCtx.waitUntil(new Promise(() => undefined)); return c.text('x') }))
+    ctx.router.route('/', new Acryl().get('/stuck', c => { c.executionCtx.waitUntil(new Promise(() => undefined)); return c.text('x') }))
     await get(ctx.router, '/stuck')
     const started = Date.now()
     await fiber.dispose()

package/plugins/acryl-router/upstream.json

@@ -2,15 +2,15 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-router",
-    "commit": "64e7c9d2e787f74b2da82492644fbbb46a601074"
+    "commit": "f5151e7f0c4de3b81bddb5cc686b5ef329e48e1c"
   },
   "vendored": [
     "src",
     "tests",
     "LICENSE"
   ],
-  "rewrittenSpecifiers": 0,
-  "digest": "sha256:9ad75d259a74b2a07fe1d8a269e7c83c30061acc90f8a1630e6049b68ba10aa3",
+  "rewrittenSpecifiers": 4,
+  "digest": "sha256:543a5ca99518eea1fe2e319b7708d62af34a6c24ab3daeb17dde48d67d319d6a",
   "testsNotRun": {
     "tests/loader.spec.ts": "loads the built lib/ entry through the real Loader; the library ships source and has no build"
   },

package/plugins/acryl-router-http/tests/adapter.spec.ts

@@ -8,7 +8,7 @@ import { Context, type FiberState } from '@deepseek-ai/cordis'
 import WebServer from '@deepseek-ai/dsh-host-webserver'
 import { apply as routerApply, name as routerName } from '../../acryl-router/src/index.ts'
 import { afterEach, describe, expect, it } from 'vitest'
-import { App, connectionOf, type RouterHttpService } from '../../acryl-router/src/index.ts'
+import { Acryl, connectionOf, type RouterHttpService } from '../../acryl-router/src/index.ts'
 import { methodNotAllowed } from '../../acryl-router/src/middleware/index.ts'
 import { apply, inject, name } from '../src/index.ts'
 
@@ -40,13 +40,13 @@ async function stack(): Promise<{ ctx: Context, base: () => string }> {
   return { ctx, base: () => `http://127.0.0.1:${String((ctx as unknown as { webServer: { port: number } }).webServer.port)}` }
 }
 
-function demo(prefix: string, extra?: (app: App) => void) {
+function demo(prefix: string, extra?: (app: Acryl) => void) {
   return {
     name: `demo${prefix.replaceAll('/', '-')}`,
     inject: ['router', 'routerHttp'],
     apply(ctx: Context): void {
       ctx.routerHttp.mount(prefix)
-      const app = new App()
+      const app = new Acryl()
       app.use(methodNotAllowed({ app }))
       app.get('/hello/:who', c => c.json({ hello: c.req.param('who'), q: c.req.query('q') ?? null, host: c.req.header('host') !== undefined }))
       app.post('/echo', async c => c.json({ got: await c.req.text(), type: c.req.header('content-type') ?? null }, 201))

package/plugins/acryl-router-http/tests/surfaces.spec.ts

@@ -7,7 +7,7 @@
 
 import { Context } from '@deepseek-ai/cordis'
 import WebServer from '@deepseek-ai/dsh-host-webserver'
-import { App, apply as routerApply, name as routerName } from '../../acryl-router/src/index.ts'
+import { Acryl, apply as routerApply, name as routerName } from '../../acryl-router/src/index.ts'
 import { afterEach, describe, expect, it } from 'vitest'
 import { apply as httpApply, inject as httpInject, name as httpName } from '../src/index.ts'
 
@@ -28,7 +28,7 @@ const notes = {
   inject: ['router'],
   apply(ctx: Context): void {
     const store = new Map<string, string>()
-    const app = new App()
+    const app = new Acryl()
       .post('/:id', async c => {
         const text = await c.req.text()
         store.set(c.req.param('id'), text)

package/plugins/acryl-router-http/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-router-http",
-    "commit": "64e7c9d2e787f74b2da82492644fbbb46a601074"
+    "commit": "f5151e7f0c4de3b81bddb5cc686b5ef329e48e1c"
   },
   "vendored": [
     "src",
@@ -10,7 +10,7 @@
     "LICENSE"
   ],
   "rewrittenSpecifiers": 7,
-  "digest": "sha256:29ba7834cf9d29e9af2f4fac265c7e5e220e06da3346e65c29bcbae41fdfaf9e",
+  "digest": "sha256:394994528a104c8f788e2d911f8f940ff9f74e9c5a72835ea3ea751651aa9fbd",
   "testsNotRun": {
     "tests/adapter.spec.ts": "needs @deepseek-ai/dsh-host-webserver (the DSH web server); acryl-node-server has its own tests",
     "tests/stream.spec.ts": "needs @deepseek-ai/dsh-host-webserver (the DSH web server)",

package/plugins/acryl-state/src/service.ts

@@ -6,7 +6,7 @@
  */
 
 import { Context, Service } from '@deepseek-ai/cordis'
-import { App, type Context as RequestContext } from '../../acryl-router/src/index.ts'
+import { Acryl, type Context as RequestContext } from '../../acryl-router/src/index.ts'
 import { streamSSE } from '../../acryl-router/src/helpers/index.ts'
 import { loopbackOnly, methodNotAllowed } from '../../acryl-router/src/middleware/index.ts'
 import { createCell, createDerived, type Cell, type ReadonlyCell } from './cell.ts'
@@ -104,7 +104,7 @@ export function apply(ctx: Context): void {
   // The same cells on the router, read-only, for any surface; present only where a router is. A request over a socket must come from this machine to this
   // app; the terminal calls the router in process and is the host's own code.
   ctx.inject(['router'], inner => {
-    const api = new App()
+    const api = new Acryl()
     api.use(loopbackOnly({ inProcess: 'allow' }), methodNotAllowed({ app: api }))
       .get('/', c => c.json({ keys: state.keys() }))
       .get('/:key', c => {

package/plugins/acryl-state/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-state",
-    "commit": "64e7c9d2e787f74b2da82492644fbbb46a601074"
+    "commit": "f5151e7f0c4de3b81bddb5cc686b5ef329e48e1c"
   },
   "vendored": [
     "src",
@@ -11,7 +11,7 @@
     "NOTICE"
   ],
   "rewrittenSpecifiers": 4,
-  "digest": "sha256:8feb067a67ea2628ff31a9fd2201361be4be5a8c217be3b7169277c0ce472b69",
+  "digest": "sha256:18df69d338a1928fc0f7497c14c245afb98f0c39d4fe6a24bda62bb845d96030",
   "testsNotRun": {
     "tests/react.spec.ts": "needs react and @testing-library/react, which generated apps do not install"
   },

package/plugins/builder/script.ts

@@ -18,7 +18,7 @@ const PATH = /^\/[a-z0-9/-]*$/
 
 export function routeSource(name: string, path: string, text: string): string {
   return `import type { Context } from '@deepseek-ai/cordis'
-import { App } from 'acryl-router'
+import { Acryl } from 'acrylblends'
 
 /** Written by the builder: answers GET ${path}, and checks that it does before the install counts. */
 export const name = '${name}'
@@ -26,7 +26,7 @@ export const inject = ['router']
 
 export function apply(ctx: Context) {
   // The app is mounted through this plugin's context, so the route is removed when the plugin is unloaded.
-  ctx.router.route('/', new App().get(${JSON.stringify(path)}, (c) => c.json({ text: ${JSON.stringify(text)} })))
+  ctx.router.route('/', new Acryl().get(${JSON.stringify(path)}, (c) => c.json({ text: ${JSON.stringify(text)} })))
 }
 
 export async function check(ctx: Context) {

package/plugins/extensions/resolve.ts

@@ -12,21 +12,81 @@ import { registerHooks } from 'node:module'
 import { join } from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 
+const PACKAGE = 'acrylblends'
+
 const isBare = (specifier: string) => !/^[./]/.test(specifier) && !specifier.includes(':')
 
-/** The router's specifiers, as files of the vendored plugin that sits beside this one; empty when the app has no router. */
+/**
+ * The framework's specifiers, as files of the vendored router plugin that sits beside this one. A plugin written while the app runs (by the agent, from the docs in the app)
+ * imports `acrylblends` and `acrylblends/<subpath>` as the docs write them; the old `acryl-router` names keep working. Empty when the app has no router.
+ */
+const MIDDLEWARE = [
+  'basic-auth',
+  'bearer-auth',
+  'body-limit',
+  'combine',
+  'compress',
+  'context-storage',
+  'cors',
+  'csrf',
+  'etag',
+  'ip-restriction',
+  'jwk',
+  'jwt',
+  'language',
+  'logger',
+  'loopback-only',
+  'method-not-allowed',
+  'method-override',
+  'powered-by',
+  'pretty-json',
+  'request-id',
+  'secure-headers',
+  'serve-static',
+  'timeout',
+  'timing',
+  'trailing-slash',
+]
+const HELPERS = [
+  'accepts',
+  'cookie',
+  'factory',
+  'html',
+  'route',
+  'schema-validator',
+  'streaming',
+  'testing',
+  'validator',
+  'ws',
+]
+
+/** The `acrylblends/...` names a plugin installed live may import, with the file each resolves to under `acryl-router/src`. */
+export function frameworkSpecifiers(): Record<string, string> {
+  const map: Record<string, string> = {
+    '': 'index.ts',
+    conninfo: 'index.ts',
+    'http-exception': 'index.ts',
+    types: 'index.ts',
+    client: 'client.ts',
+  }
+  for (const name of MIDDLEWARE) map[name] = 'middleware/index.ts'
+  for (const name of HELPERS) map[name] = 'helpers/index.ts'
+  return map
+}
+
 export function routerAliases(): Record<string, string> {
   const src = new URL('../acryl-router/src/', import.meta.url)
-  const files = {
-    'acryl-router': 'index.ts',
-    'acryl-router/middleware': 'middleware/index.ts',
-    'acryl-router/helpers': 'helpers/index.ts',
+  const aliases: Record<string, string> = {}
+  const add = (specifier: string, file: string) => {
+    const path = fileURLToPath(new URL(file, src))
+    if (existsSync(path)) aliases[specifier] = path
   }
-  return Object.fromEntries(
-    Object.entries(files)
-      .map(([specifier, file]) => [specifier, fileURLToPath(new URL(file, src))] as const)
-      .filter(([, path]) => existsSync(path)),
-  )
+  for (const [sub, file] of Object.entries(frameworkSpecifiers()))
+    add(sub === '' ? PACKAGE : `${PACKAGE}/${sub}`, file)
+  add('acryl-router', 'index.ts')
+  add('acryl-router/middleware', 'middleware/index.ts')
+  add('acryl-router/helpers', 'helpers/index.ts')
+  return aliases
 }
 
 export function resolveFromApp(

package/plugins/openai/prompt.ts

@@ -10,20 +10,20 @@ To add a capability:
 A plugin's index.ts is TypeScript that Node runs directly (erasable syntax only: no enums, no parameter properties):
 
   import type { Context } from '@deepseek-ai/cordis'
-  import { App } from 'acryl-router'
+  import { Acryl } from 'acrylblends'
   export const name = 'hello'            // must equal the folder name
   export const inject = ['router']        // services it needs; it waits (pending) until they exist
   export function apply(ctx: Context) {
-    ctx.router.route('/', new App().get('/hello', (c) => c.json({ text: 'Hello' })))   // removed when the plugin is unloaded
+    ctx.router.route('/', new Acryl().get('/hello', (c) => c.json({ text: 'Hello' })))   // removed when the plugin is unloaded
   }
   export async function check(ctx: Context) {   // optional: must pass, or the install is rolled back
     const reply = await ctx.router.request('/hello')
     if (!reply.ok) throw new Error('GET /hello failed')
   }
 
-The router: build an App (import { App } from 'acryl-router'), register routes on it with app.get/post/put/patch/delete(path, handler) and mount it with
+The router: build an Acryl app (import { Acryl } from 'acrylblends'), register routes on it with app.get/post/put/patch/delete(path, handler) and mount it with
 ctx.router.route(prefix, app). A path parameter is :id and is read with c.req.param('id'); c.json(body, status) answers JSON, c.text(...) answers text,
-await c.req.json() reads a JSON body, throw new HTTPException(404, { message }) (also from 'acryl-router') answers an error. Routes added to an app
+await c.req.json() reads a JSON body, throw new HTTPException(404, { message }) (also from 'acrylblends') answers an error. Routes added to an app
 after route() are not served: build the whole app first. ctx.router.request('/path', { method: 'POST', body: ... }) calls a route in process (use it in
 check). The mount goes away when the plugin is unloaded.
 
@@ -32,6 +32,6 @@ host: it runs in a separate process that can read only its own folder. Files: in
   { "description": "what it does and its input", "examples": [ { "input": {...}, "output": {...} } ] }
 The examples are run in the sandbox at install and must match exactly, or the install is refused. Use write_plugin and install_plugin for tools too.
 
-Rules: import only relative files, node: built-ins, @deepseek-ai/cordis and acryl-router. Provide services with ctx.provide(name, value) and
+Rules: import only relative files, node: built-ins, @deepseek-ai/cordis and acrylblends (and its subpaths such as acrylblends/cors, whose docs are in docs/framework). Provide services with ctx.provide(name, value) and
 use others with ctx.get(name). Put timers, listeners and routes inside ctx.effect(() => cleanup). Use list_plugins and
 read_plugin to see what exists. When you are done, answer in one or two plain sentences saying what you built.`

package/shared/AGENTS.core.md

@@ -5,26 +5,33 @@ parameter properties). Every part of it is a Cordis plugin.
 
 ## The framework's API is in `docs/framework/`
 
-Start at `docs/framework/README.md`; `api-summary.md` is the one-page summary. Read before you write routes: `routing.md` (the `App`), `request.md` (`c.req`), `context.md` (`c`),
-`validation.md`, `helpers.md` (`streamSSE`), `middleware.md`, `plugin-lifecycle.md` (what a plugin owns and when it is unloaded) and
-`node-server.md`. The framework's source is vendored in `src/plugins/acryl-*/src`: read it, do not edit it (a change belongs in ACRYL, upstream).
-The docs write `from 'acryl-router'`; in this app that is `./plugins/acryl-router/src/index.ts` (relative to `src/`), `acryl-router/middleware`
-is `./plugins/acryl-router/src/middleware/index.ts` and `acryl-router/helpers` is `./plugins/acryl-router/src/helpers/index.ts`.
-A plugin written into `extensions/` while the app runs can import `acryl-router`, `acryl-router/middleware` and `acryl-router/helpers` by those names.
+Start at `docs/framework/README.md`; `api/summary.md` is the one-page summary. Read before you write routes: `api/routing.md` (the `Acryl` app), `api/request.md` (`c.req`),
+`api/context.md` (`c`), `cordis/validation.md` and `guides/validation.md`, `guides/helpers.md` (`streamSSE`), `concepts/middleware.md`, `cordis/plugin-lifecycle.md` (what a plugin
+owns and when it is unloaded), `cordis/mounting.md` and `cordis/node-server.md`. Pages marked "not yet available" describe parts that are not in this app.
+
+The docs write `import { Acryl } from 'acrylblends'` and `from 'acrylblends/<subpath>'`. In this app the framework is the vendored plugin source in `src/plugins/acryl-router/src`
+(read it, do not edit it: a change belongs in ACRYL, upstream), so from a file in `src/` import:
+
+- `./plugins/acryl-router/src/index.ts` for `Acryl`, `Context`, `HTTPException`, `connectionOf`, `getConnInfo` and the types;
+- `./plugins/acryl-router/src/middleware/index.ts` for every middleware (`cors`, `bodyLimit`, `trimTrailingSlash`, `loopbackOnly`, ...);
+- `./plugins/acryl-router/src/helpers/index.ts` for the helpers and validators (`streamSSE`, `schemaValidator`, `validator`, cookies, `testClient`, ...).
+
+A plugin written into `extensions/` while the app runs may use the docs' own names instead: `acrylblends` and `acrylblends/<subpath>` resolve to the same files. `App` is the
+deprecated name of `Acryl`.
 
 ## How a feature is built
 
-Routes are an ordinary `App` that a plugin mounts once with `ctx.router.route(prefix, app)`. The mount belongs to the plugin and goes away when it unloads.
+Routes are an ordinary `Acryl` app that a plugin mounts once with `ctx.router.route(prefix, app)`. The mount belongs to the plugin and goes away when it unloads.
 
 ```ts
 import type { Context } from '@deepseek-ai/cordis'
-import { App, HTTPException } from './plugins/acryl-router/src/index.ts'
+import { Acryl, HTTPException } from './plugins/acryl-router/src/index.ts'
 import { schemaValidator, type StandardSchema } from './plugins/acryl-router/src/helpers/index.ts'
 
 export const name = 'notes'               // a plugin's name; blend.yaml refers to it
 export const inject = ['router']          // services it needs
 export function apply(ctx: Context) {
-  const app = new App()
+  const app = new Acryl()
     .get('/', (c) => c.json({ ok: true }))
     .get('/:id', (c) => c.json({ id: c.req.param('id') }))
     .post('/', schemaValidator('json', NewNote), (c) => c.json(c.req.valid('json'), 201))   // NewNote is a Standard Schema

package/templates/agent/src/routes.ts

@@ -1,5 +1,5 @@
 import type { Context } from '@deepseek-ai/cordis'
-import { App } from './plugins/acryl-router/src/index.ts'
+import { Acryl } from './plugins/acryl-router/src/index.ts'
 import { bodyLimit } from './plugins/acryl-router/src/middleware/index.ts'
 import type {} from './plugins/agent/index.ts'
 import type {} from './plugins/extensions/index.ts'
@@ -23,7 +23,7 @@ export const routes = {
       const body = await c.req.json().catch(() => undefined)
       return typeof body === 'object' && body !== null ? (body as Record<string, unknown>) : {}
     }
-    const app = new App()
+    const app = new Acryl()
       .use(bodyLimit({ maxSize: 64 * 1024 }))
       .get('/', (c) => c.json({ app: APP_NAME, ok: true }))
       .get('/health', (c) => c.json({ ok: true }))

package/templates/agent/test/model.test.ts

@@ -10,12 +10,12 @@ import { pinnedInstance, withPort } from '../src/plugins/instance/index.ts'
 
 /** A plugin no scripted command knows: the model writes it from scratch. */
 const COUNTER = `import type { Context } from '@deepseek-ai/cordis'
-import { App } from 'acryl-router'
+import { Acryl } from 'acrylblends'
 export const name = 'counter'
 export const inject = ['router']
 export function apply(ctx: Context) {
   let count = 0
-  ctx.router.route('/', new App().get('/count', (c) => c.json({ count: ++count })))
+  ctx.router.route('/', new Acryl().get('/count', (c) => c.json({ count: ++count })))
 }
 `
 

package/templates/agent/tsconfig.json

@@ -13,6 +13,46 @@
     "skipLibCheck": true,
     "types": ["node"],
     "paths": {
+      "acrylblends": ["./src/plugins/acryl-router/src/index.ts"],
+      "acrylblends/conninfo": ["./src/plugins/acryl-router/src/index.ts"],
+      "acrylblends/http-exception": ["./src/plugins/acryl-router/src/index.ts"],
+      "acrylblends/types": ["./src/plugins/acryl-router/src/index.ts"],
+      "acrylblends/client": ["./src/plugins/acryl-router/src/client.ts"],
+      "acrylblends/basic-auth": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/bearer-auth": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/body-limit": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/combine": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/compress": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/context-storage": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/cors": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/csrf": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/etag": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/ip-restriction": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/jwk": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/jwt": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/language": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/logger": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/loopback-only": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/method-not-allowed": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/method-override": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/powered-by": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/pretty-json": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/request-id": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/secure-headers": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/serve-static": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/timeout": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/timing": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/trailing-slash": ["./src/plugins/acryl-router/src/middleware/index.ts"],
+      "acrylblends/accepts": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/cookie": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/factory": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/html": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/route": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/schema-validator": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/streaming": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/testing": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/validator": ["./src/plugins/acryl-router/src/helpers/index.ts"],
+      "acrylblends/ws": ["./src/plugins/acryl-router/src/helpers/index.ts"],
       "acryl-router": ["./src/plugins/acryl-router/src/index.ts"],
       "acryl-router/middleware": ["./src/plugins/acryl-router/src/middleware/index.ts"],
       "acryl-router/helpers": ["./src/plugins/acryl-router/src/helpers/index.ts"]

package/templates/blank/src/routes.ts

@@ -1,5 +1,5 @@
 import type { Context } from '@deepseek-ai/cordis'
-import { App } from './plugins/acryl-router/src/index.ts'
+import { Acryl } from './plugins/acryl-router/src/index.ts'
 
 export const APP_NAME = '__APP_NAME__'
 
@@ -8,7 +8,7 @@ export const routes = {
   name: 'routes',
   inject: ['router'],
   apply(ctx: Context) {
-    const app = new App()
+    const app = new Acryl()
       .get('/', (c) => c.json({ app: APP_NAME, ok: true }))
       .get('/health', (c) => c.json({ ok: true }))
     ctx.router.route('/', app)

package/templates/todo/src/todo.ts

@@ -6,7 +6,7 @@
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
 import { dirname } from 'node:path'
 import type { Context } from '@deepseek-ai/cordis'
-import { App, HTTPException } from './plugins/acryl-router/src/index.ts'
+import { Acryl, HTTPException } from './plugins/acryl-router/src/index.ts'
 import { bodyLimit, loopbackOnly, trimTrailingSlash } from './plugins/acryl-router/src/middleware/index.ts'
 import { schemaValidator, streamSSE, type StandardSchema } from './plugins/acryl-router/src/helpers/index.ts'
 import type {} from './plugins/acryl-state/src/index.ts'
@@ -86,7 +86,7 @@ export function apply(ctx: Context, config: Config = {}): void {
 
   // `/todo/` is what people type: trimTrailingSlash answers a GET for an unknown path ending in `/` with a 301 to the path without it,
   // so the page is found either way while each route keeps one canonical path (the router itself treats `/a` and `/a/` as different).
-  const api = new App()
+  const api = new Acryl()
     .use(loopbackOnly({ inProcess: 'allow' }), bodyLimit({ maxSize: MAX_BODY_BYTES }), trimTrailingSlash())
     .get('/', c => c.html(PAGE))
     .get('/api', c => c.json(todos.get()))