acrylblends 0.7.7 → 0.7.8

package/plugins/acryl-kv-json/src/open.ts

@@ -3,9 +3,12 @@
  * memory and resolves the `kv` port with the function that closes it. The Cordis plugin is a thin wrapper over this, so both run one code
  * path. This entry imports nothing from Cordis.
  *
- * Every write queues behind the writes before it and persists the whole map: serialize to a temporary file in the same folder, flush it,
- * rename it over the file, and flush the folder where the platform allows. The call resolves after the rename, so a crash leaves the old file
- * or the new one, never half of one. One process owns the file: two writers would overwrite each other.
+ * Every write persists the whole map: serialize to a temporary file in the same folder, flush it, rename it over the file, and flush the
+ * folder where the platform allows. The call resolves after the rename, so a crash leaves the old file or the new one, never half of one.
+ * Writes are grouped: the calls made in one turn of the event loop, and those that queue while a file write is in flight, are applied in
+ * call order and persisted together by one write, so a burst of calls costs one flush and one rename, not one each (on Windows each costs
+ * tens of milliseconds). One process owns the
+ * file: two writers would overwrite each other.
  */
 
 import { mkdir, open, readdir, readFile, rename, rm } from 'node:fs/promises'
@@ -95,6 +98,20 @@ async function flushFolder(folder: string): Promise<void> {
   }
 }
 
+/** What one call does to the map: the key's new JSON text (`undefined` deletes it), and what the call resolves with. */
+interface Change<T = unknown> {
+  readonly key: string
+  readonly text: string | undefined
+  readonly result: T
+}
+
+/** A call waiting for the file write that will contain it. Its change reads the state as the calls before it in the round left it. */
+interface Pending {
+  readonly change: (read: (key: string) => string | undefined) => Change
+  readonly resolve: (result: unknown) => void
+  readonly reject: (error: unknown) => void
+}
+
 /** Open (and create, when missing) a JSON-file store. @throws when the file exists and is not a readable kv file. */
 export async function openKv(options: OpenKvOptions): Promise<KvOpened> {
   const file = resolve(options.path)
@@ -103,7 +120,12 @@ export async function openKv(options: OpenKvOptions): Promise<KvOpened> {
   let state = await load(file)
   let closed = false
   let sequence = 0
-  let tail: Promise<unknown> = Promise.resolve()
+  /** Calls waiting for the next file write, in call order. */
+  let queue: Pending[] = []
+  /** Whether the loop that writes the queue runs; cleared by the loop itself, so a call queued after it ends starts a new one. */
+  let draining = false
+  /** The latest loop, for `close` to wait on. */
+  let drained: Promise<void> = Promise.resolve()
 
   const guard = (): void => {
     if (closed) throw new Error(`acryl-kv-json: ${file} is closed`)
@@ -129,18 +151,62 @@ export async function openKv(options: OpenKvOptions): Promise<KvOpened> {
     await flushFolder(dirname(file))
   }
 
-  /** Run a change after every earlier one; the map it works on becomes the state only once it is on disk. */
-  const write = <T>(change: (draft: Map<string, string>) => T): Promise<T> => {
-    guard()
-    const task = tail.then(async () => {
+  /**
+   * Write the queue until it is empty. Each round takes every call queued so far and applies them in order to one copy of the state. A call
+   * whose change throws rejects with its error and changes nothing, and the others in the round still apply. The copy becomes the state
+   * only once it is on disk. A failed file write rejects every call in its round and leaves the state as it was.
+   */
+  const drain = async (): Promise<void> => {
+    try {
+      // Let the calls made in this turn join the first round.
+      await Promise.resolve()
+      await rounds()
+    } finally {
+      draining = false
+    }
+  }
+
+  const rounds = async (): Promise<void> => {
+    while (queue.length > 0) {
+      const round = queue
+      queue = []
       const draft = new Map(state)
-      const result = change(draft)
-      await persist(draft)
+      const applied: { readonly call: Pending; readonly result: unknown }[] = []
+      for (const call of round) {
+        let change: Change
+        try {
+          change = call.change(key => draft.get(key))
+        } catch (error) {
+          call.reject(error)
+          continue
+        }
+        if (change.text === undefined) draft.delete(change.key)
+        else draft.set(change.key, change.text)
+        applied.push({ call, result: change.result })
+      }
+      if (applied.length === 0) continue
+      try {
+        await persist(draft)
+      } catch (error) {
+        for (const { call } of applied) call.reject(error)
+        continue
+      }
       state = draft
-      return result
+      for (const { call, result } of applied) call.resolve(result)
+    }
+  }
+
+  /** Queue one change behind every earlier call; it resolves once a file write that contains it is on disk. */
+  const write = <T>(change: (read: (key: string) => string | undefined) => Change<T>): Promise<T> => {
+    guard()
+    const done = new Promise<T>((resolveCall, rejectCall) => {
+      queue.push({ change, resolve: resolveCall as (result: unknown) => void, reject: rejectCall })
     })
-    tail = task.catch(() => undefined)
-    return task
+    if (!draining) {
+      draining = true
+      drained = drain()
+    }
+    return done
   }
 
   const kv: Kv = {
@@ -153,21 +219,19 @@ export async function openKv(options: OpenKvOptions): Promise<KvOpened> {
     async set(key, value) {
       checkKey(key)
       const text = encodeValue(value)
-      await write(draft => { draft.set(key, text) })
+      await write(() => ({ key, text, result: undefined }))
     },
     async update<T>(key: string, change: (current: T | undefined) => T) {
       checkKey(key)
-      return write(draft => {
-        const text = draft.get(key)
-        const next = runChange(change, text === undefined ? undefined : decodeValue<T>(text))
-        const encoded = encodeValue(next)
-        draft.set(key, encoded)
-        return decodeValue<T>(encoded)
+      return write(read => {
+        const text = read(key)
+        const encoded = encodeValue(runChange(change, text === undefined ? undefined : decodeValue<T>(text)))
+        return { key, text: encoded, result: decodeValue<T>(encoded) }
       })
     },
     async delete(key) {
       checkKey(key)
-      await write(draft => { draft.delete(key) })
+      await write(() => ({ key, text: undefined, result: undefined }))
     },
     async list(prefix = '') {
       guard()
@@ -179,7 +243,7 @@ export async function openKv(options: OpenKvOptions): Promise<KvOpened> {
     kv,
     close: async () => {
       closed = true
-      await tail
+      await drained
     },
   }
 }

package/plugins/acryl-kv-json/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-kv-json",
-    "commit": "f8e385e4389fe2fdc6fd2a4366a7f2a7389faacb"
+    "commit": "f132283c43337f5e1d58dfbbbc15786efb5e756c"
   },
   "vendored": [
     "src",
@@ -10,7 +10,7 @@
     "LICENSE"
   ],
   "rewrittenSpecifiers": 6,
-  "digest": "sha256:d8e3e7f9c98399d0f21f29f91323b4ce57646e59e312d4175978259d618a88cf",
+  "digest": "sha256:10613b53bdcf15cce86d6dce5e606d0cd93367cc2569b7603cbf157ebc557548",
   "testsNotRun": {
     "tests/loader.spec.ts": "loads the plugin through the real Loader (@deepseek-ai/cordis-plugin-loader), which generated apps do not install; the plain opener it wraps is tested here by open.spec.ts and conformance.spec.ts",
     "tests/crash.spec.ts": "kills a child process that imports the package build (lib/), which a copy vendored into an app does not have; it runs in ACRYL",

package/plugins/acryl-node-server/src/client-modules.ts

@@ -1,12 +1,12 @@
 /**
  * Client components without a bundler. `clientModules({ root: 'src/client' })` is an app that serves the TypeScript and JSX modules of a
  * folder to the browser as ES modules: a `.tsx`/`.ts`/`.jsx` file compiled with the app's own `typescript` (JSX for `acrylblends/jsx/dom`),
- * a `.js`/`.mjs` file as it is. The framework's own browser imports (`acrylblends/jsx/dom` with its runtimes and `client`, and
- * `acrylblends/client`) are rewritten to two self-contained files the same app serves, at a URL relative to each module, so a page needs
+ * a `.js`/`.mjs` file as it is. The framework's own browser imports (`acrylblends/jsx/dom` with its runtimes and `client`,
+ * `acrylblends/client` and `acrylblends/read-sse`) are rewritten to three self-contained files the same app serves, at a URL relative to each module, so a page needs
  * one `<script type="module" src="/client/counter.tsx">` and no import map, under whatever path the app is routed at.
  *
  * Production runs without `typescript` (a deploy that leaves out devDependencies): `buildClientModules` writes the same compiled modules
- * and the two browser files into a folder, and with `NODE_ENV=production` and `compiled` set, only that folder is served.
+ * and the three browser files into a folder, and with `NODE_ENV=production` and `compiled` set, only that folder is served.
  */
 
 import { copyFileSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from 'node:fs'
@@ -16,7 +16,7 @@ import { Acryl } from '../../acryl-router/src/index.ts'
 import { basePath } from '../../acryl-router/src/helpers/index.ts'
 import { MissingTypeScriptError, compileModule } from './transpile.ts'
 
-/** The folder the two browser files are served from, below the app's mount. A source folder of this name is not served. */
+/** The folder the three browser files are served from, below the app's mount. A source folder of this name is not served. */
 const RUNTIME_DIR = '@acrylblends'
 /** The framework's browser imports and the browser file that provides each. */
 const BROWSER_IMPORTS: Readonly<Record<string, string>> = {
@@ -25,8 +25,9 @@ const BROWSER_IMPORTS: Readonly<Record<string, string>> = {
   'acrylblends/jsx/dom/jsx-dev-runtime': 'jsx-dom.js',
   'acrylblends/jsx/dom/client': 'jsx-dom.js',
   'acrylblends/client': 'client.js',
+  'acrylblends/read-sse': 'read-sse.js',
 }
-const RUNTIME_FILES = ['jsx-dom.js', 'client.js'] as const
+const RUNTIME_FILES = ['jsx-dom.js', 'client.js', 'read-sse.js'] as const
 const COMPILED = new Set(['.ts', '.tsx', '.jsx', '.mts'])
 const SERVED = new Set([...COMPILED, '.js', '.mjs'])
 const JS_TYPE = 'text/javascript; charset=utf-8'
@@ -41,7 +42,7 @@ export interface ClientModulesOptions {
   readonly compiled?: string | undefined
   /** At most this many bytes of compiled modules are kept in memory (least recently served first out); 16 MiB when not given. */
   readonly cacheBytes?: number | undefined
-  /** The folder holding `jsx-dom.js` and `client.js`; the framework's own when not given. */
+  /** The folder holding `jsx-dom.js`, `client.js` and `read-sse.js`; the framework's own when not given. */
   readonly runtimeDir?: string | undefined
 }
 
@@ -51,11 +52,11 @@ export interface BuildClientModulesOptions {
   readonly root: string
   /** Where the compiled modules go, at the same relative paths and file names; it must not lie inside `root`. */
   readonly outDir: string
-  /** The folder holding `jsx-dom.js` and `client.js`; the framework's own when not given. */
+  /** The folder holding `jsx-dom.js`, `client.js` and `read-sse.js`; the framework's own when not given. */
   readonly runtimeDir?: string | undefined
 }
 
-/** The framework's two browser files, next to the built module that contains this code. */
+/** The framework's three browser files, next to the built module that contains this code. */
 const defaultRuntimeDir = (): string => fileURLToPath(new URL('./browser/', import.meta.url))
 
 /** A module path below the root (`widgets/counter.tsx`) with the URL prefix that reaches the browser files from it. */
@@ -264,7 +265,7 @@ function sourceFiles(root: string, dir = root): string[] {
 
 /**
  * Compile a folder of client modules once, for a production that has no `typescript`: each module is written to `outDir` at the same
- * relative path and file name (so the page's URLs stay the same), compiled exactly as {@link clientModules} compiles it, and the two
+ * relative path and file name (so the page's URLs stay the same), compiled exactly as {@link clientModules} compiles it, and the three
  * browser files are copied to `outDir/@acrylblends/`. Files already in `outDir` that no source produces are left there.
  * @param options - the source folder and the output folder.
  * @returns the paths written, relative to `outDir`.

package/plugins/acryl-node-server/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-node-server",
-    "commit": "f8e385e4389fe2fdc6fd2a4366a7f2a7389faacb"
+    "commit": "f132283c43337f5e1d58dfbbbc15786efb5e756c"
   },
   "vendored": [
     "src",
@@ -10,7 +10,7 @@
     "LICENSE"
   ],
   "rewrittenSpecifiers": 31,
-  "digest": "sha256:e4f98422082758912834a6e454505230a18ac543b4851f6eb697b628a1acec4e",
+  "digest": "sha256:e92c0621600e414cffd3e063c117a887410de53113ac4f5966231b419ed92da1",
   "testsNotRun": {
     "tests/client-modules.spec.ts": "links typescript from the plugin's own node_modules (ACRYL's workspace layout); clientModules and build-client are exercised here by the templates' tests and verify:scaffolder",
     "tests/register.spec.ts": "links typescript from the plugin's own node_modules (ACRYL's workspace layout); the hook is exercised here by the templates' own .tsx tests and verify:scaffolder"

package/plugins/acryl-router/src/browser/read-sse.ts

@@ -0,0 +1,3 @@
+/** `readSSE` (`acrylblends/read-sse`) as one browser module with no imports, served by `clientModules`. */
+
+export * from '../helpers/read-sse.ts'

package/plugins/acryl-router/src/helpers/read-sse.ts

@@ -0,0 +1,111 @@
+/**
+ * `readSSE(response)`: the events of a `text/event-stream` answer from `fetch`, for the browser. `EventSource` reads GET streams only; a chat
+ * or any stream that needs a POST body, a header or an `AbortSignal` is read with `fetch`, and this is the loop every such page otherwise writes by
+ * hand. It follows the parsing rules of the HTML standard (lines end in LF, CRLF or CR; the `data` lines of one event join with LF; a line that
+ * starts with a colon is a comment; an event ends at a blank line; an event with no `data` line is not dispatched; the last event is dispatched
+ * only if its blank line arrived), and it is one module with no imports, so it also runs in a service worker and on a fetch runtime.
+ *
+ * ACRYL's own addition, not part of the upstream port.
+ */
+
+/** One event of the stream. */
+export interface SSEEvent {
+  /** The `event:` name; `message` when the event has none. */
+  readonly event: string
+  /** The `data:` lines of the event, joined with a line feed. */
+  readonly data: string
+  /** The `id:` of the event, when it had one. */
+  readonly id?: string
+  /** The `retry:` of the event in milliseconds, when it had one. */
+  readonly retry?: number
+}
+
+export interface ReadSSEOptions {
+  /** Stops the loop and cancels the response body when it aborts. (Abort the `fetch` itself with the signal you pass to it.) */
+  readonly signal?: AbortSignal
+}
+
+/**
+ * Read the events of a `text/event-stream` response as they arrive. Leaving the loop early (`break`, a thrown error) cancels the body, so the
+ * request to the server ends.
+ * @throws when the response is not `ok` (the status is in the message; the body is cancelled, not parsed), has no body, or fails while it is read.
+ */
+export async function* readSSE(response: Response, options: ReadSSEOptions = {}): AsyncGenerator<SSEEvent, void, undefined> {
+  if (!response.ok) {
+    await response.body?.cancel().catch(() => undefined)
+    throw new Error(`readSSE: the request failed with ${String(response.status)}${response.statusText === '' ? '' : ` ${response.statusText}`}`)
+  }
+  if (response.body === null) throw new Error('readSSE: the response has no body to read')
+  const { signal } = options
+  if (signal?.aborted === true) {
+    await response.body.cancel().catch(() => undefined)
+    return
+  }
+
+  const reader = response.body.getReader()
+  const onAbort = (): void => {
+    void reader.cancel().catch(() => undefined)
+  }
+  signal?.addEventListener('abort', onAbort, { once: true })
+  const decoder = new TextDecoder('utf-8')
+
+  let buffer = ''
+  let skipLineFeed = false
+  let name = ''
+  let data: string[] = []
+  let id: string | undefined
+  let retry: number | undefined
+
+  /** Apply one line; returns the event when this line completes one. */
+  const apply = (line: string): SSEEvent | undefined => {
+    if (line === '') {
+      const event = data.length === 0 ? undefined : { event: name === '' ? 'message' : name, data: data.join('\n'), ...(id === undefined ? {} : { id }), ...(retry === undefined ? {} : { retry }) }
+      name = ''
+      data = []
+      id = undefined
+      retry = undefined
+      return event
+    }
+    if (line.startsWith(':')) return undefined
+    const colon = line.indexOf(':')
+    const field = colon === -1 ? line : line.slice(0, colon)
+    let value = colon === -1 ? '' : line.slice(colon + 1)
+    if (value.startsWith(' ')) value = value.slice(1)
+    if (field === 'event') name = value
+    else if (field === 'data') data.push(value)
+    else if (field === 'id') {
+      if (!value.includes('\u0000')) id = value
+    } else if (field === 'retry' && /^\d+$/u.test(value)) retry = Number(value)
+    return undefined
+  }
+
+  try {
+    for (;;) {
+      const { done, value } = await reader.read()
+      if (done) break
+      let text = decoder.decode(value, { stream: true })
+      // A CR at the end of the last chunk already ended its line; the LF that completes the CRLF may open this one.
+      if (skipLineFeed && text.startsWith('\n')) text = text.slice(1)
+      if (text !== '') skipLineFeed = false
+      buffer += text
+      let start = 0
+      for (let index = 0; index < buffer.length; index += 1) {
+        const code = buffer.charCodeAt(index)
+        if (code !== 10 && code !== 13) continue
+        const line = buffer.slice(start, index)
+        if (code === 13) {
+          if (index + 1 < buffer.length) {
+            if (buffer.charCodeAt(index + 1) === 10) index += 1
+          } else skipLineFeed = true
+        }
+        start = index + 1
+        const event = apply(line)
+        if (event !== undefined) yield event
+      }
+      buffer = buffer.slice(start)
+    }
+  } finally {
+    signal?.removeEventListener('abort', onAbort)
+    await reader.cancel().catch(() => undefined)
+  }
+}

package/plugins/acryl-router/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-router",
-    "commit": "f8e385e4389fe2fdc6fd2a4366a7f2a7389faacb"
+    "commit": "f132283c43337f5e1d58dfbbbc15786efb5e756c"
   },
   "vendored": [
     "src",
@@ -10,7 +10,7 @@
     "LICENSE"
   ],
   "rewrittenSpecifiers": 6,
-  "digest": "sha256:07772b7e7a2cfe416e4566bebdec7e85fb4abc30466bf104e80342b9fc4ab007",
+  "digest": "sha256:5f07e873992fa2f0a178e029a1fe3d8c99cb4ce3ae8c07445d75431f95125417",
   "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/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-router-http",
-    "commit": "f8e385e4389fe2fdc6fd2a4366a7f2a7389faacb"
+    "commit": "f132283c43337f5e1d58dfbbbc15786efb5e756c"
   },
   "vendored": [
     "src",

package/plugins/acryl-state/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-state",
-    "commit": "f8e385e4389fe2fdc6fd2a4366a7f2a7389faacb"
+    "commit": "f132283c43337f5e1d58dfbbbc15786efb5e756c"
   },
   "vendored": [
     "src",

package/plugins/builder/index.ts

@@ -14,7 +14,7 @@ import type {} from '../instance/index.ts'
 import { builderRules } from './script.ts'
 
 export interface BuilderConfig {
-  /** Where the agent writes extensions. Defaults to `<project>/extensions`. Must be one of the extensions sources. */
+  /** Where the agent writes extensions. Defaults to `<project>/plugins`. Must be one of the extensions sources. */
   dir?: string
   /** Where `package_plugin` writes standalone packages. Defaults to `<project>/plugin-packages`. */
   packagesDir?: string
@@ -64,7 +64,7 @@ export const builder = {
   name: 'builder',
   inject: ['extensions', 'tools', 'appInstance'],
   apply(ctx: Context, config: BuilderConfig) {
-    const dir = resolve(config?.dir ?? join(ctx.appInstance.root, 'extensions'))
+    const dir = resolve(config?.dir ?? join(ctx.appInstance.root, 'plugins'))
     if (!ctx.extensions.sources.some((source) => resolve(source.dir) === dir)) {
       throw new BuilderError(
         `the builder writes into ${dir}, which is not an extensions source; add it to the extensions plugin's sources`,

package/plugins/builder/plugin.json

@@ -7,5 +7,5 @@
   "dependencies": {
     "@deepseek-ai/cordis": "4.0.4"
   },
-  "mount": "mount it after agent and extensions: root.plugin(builder, { dir: join(root, 'extensions') }); dir must be an extensions source"
+  "mount": "mount it after agent and extensions: root.plugin(builder, { dir: join(root, 'plugins') }); dir must be an extensions source"
 }

package/plugins/desktop/main.ts

@@ -10,14 +10,14 @@ import { mkdirSync, readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { app, BrowserWindow, shell } from 'electron'
-import type { App } from '../../app.ts'
+import type { App } from '../../src/app.ts'
 import '../acryl-node-server/src/register.ts'
 import { selectInstance } from '../instance/index.ts'
 import { createDesktopShutdown, installShutdownRequests } from './shutdown.ts'
 import { resolveDesktopUserDataOverride } from './user-data.ts'
 import { windowOptions } from './window.ts'
 
-const projectRoot = fileURLToPath(new URL('../../..', import.meta.url))
+const projectRoot = fileURLToPath(new URL('../..', import.meta.url))
 const chosen = selectInstance({ projectRoot, env: process.env })
 
 /** Where the window opens: `acrylblends.desktopPath` in package.json (the todo template sets `/todo`), else the root. */
@@ -65,7 +65,7 @@ if (!app.requestSingleInstanceLock()) {
 
   void app.whenReady().then(async () => {
     // The hook above is registered before the app's modules are loaded, so the app may have .tsx pages: they are loaded here, not as a static import.
-    const { createApp } = await import('../../app.ts')
+    const { createApp } = await import('../../src/app.ts')
     running = await createApp(chosen)
     const origin = new URL(running.url).origin
     window = new BrowserWindow(windowOptions({ title: chosen.name }))

package/plugins/desktop/plugin.json

@@ -9,8 +9,8 @@
     "electron": "44.9.3"
   },
   "scripts": {
-    "desktop": "electron src/plugins/desktop/main.ts"
+    "desktop": "electron plugins/desktop/main.ts"
   },
   "omit": ["**/*.test.*"],
-  "mount": "nothing to mount: run `npm install`, then `npm run desktop` (the window opens on the app's own server; every electron call is in src/plugins/desktop)"
+  "mount": "nothing to mount: run `npm install`, then `npm run desktop` (the window opens on the app's own server; every electron call is in plugins/desktop)"
 }

package/plugins/desktop/upstream.json

@@ -5,7 +5,7 @@
       "apps/acryl-desktop/src/shell/desktop-user-data.ts": "user-data.ts",
       "apps/acryl-desktop/src/shell/shutdown.ts": "shutdown.ts"
     },
-    "commit": "f8e385e4389fe2fdc6fd2a4366a7f2a7389faacb"
+    "commit": "f132283c43337f5e1d58dfbbbc15786efb5e756c"
   },
   "rewrittenSpecifiers": 0,
   "digest": "sha256:7dfe960a8bbb476c35540d2202a7aaa62b33492c2ac3e34314e2ecfca45f32f2"

package/plugins/desktop-web/main.ts

@@ -17,7 +17,7 @@ import { createDesktopShutdown, installShutdownRequests } from './shutdown.ts'
 import { resolveDesktopUserDataOverride } from './user-data.ts'
 import { windowOptions } from './window.ts'
 
-const projectRoot = fileURLToPath(new URL('../../..', import.meta.url))
+const projectRoot = fileURLToPath(new URL('../..', import.meta.url))
 const manifest = JSON.parse(readFileSync(join(projectRoot, 'package.json'), 'utf8')) as {
   name?: string
   acrylblends?: { desktopPath?: string }
@@ -73,7 +73,7 @@ if (!app.requestSingleInstanceLock()) {
 
   void app.whenReady().then(async () => {
     // The hook above is registered before the app's modules are loaded, so the app may have .tsx pages: they are loaded here, not as a static import.
-    const { default: acrylApp, close } = (await import('../../app.ts')) as {
+    const { default: acrylApp, close } = (await import('../../src/app.ts')) as {
       default: { fetch: Parameters<typeof serve>[0]['fetch'] }
       close?: () => Promise<void>
     }

package/plugins/desktop-web/plugin.json

@@ -9,9 +9,9 @@
     "electron": "44.9.3"
   },
   "scripts": {
-    "desktop": "electron src/plugins/desktop-web/main.ts"
+    "desktop": "electron plugins/desktop-web/main.ts"
   },
   "gitignore": [".acrylblends/"],
   "omit": ["**/*.test.*"],
-  "mount": "nothing to mount: run `npm install`, then `npm run desktop` (the window opens on the app's own server; every electron call is in src/plugins/desktop-web)"
+  "mount": "nothing to mount: run `npm install`, then `npm run desktop` (the window opens on the app's own server; every electron call is in plugins/desktop-web)"
 }

package/plugins/desktop-web/upstream.json

@@ -5,7 +5,7 @@
       "apps/acryl-desktop/src/shell/desktop-user-data.ts": "user-data.ts",
       "apps/acryl-desktop/src/shell/shutdown.ts": "shutdown.ts"
     },
-    "commit": "f8e385e4389fe2fdc6fd2a4366a7f2a7389faacb"
+    "commit": "f132283c43337f5e1d58dfbbbc15786efb5e756c"
   },
   "rewrittenSpecifiers": 0,
   "digest": "sha256:7dfe960a8bbb476c35540d2202a7aaa62b33492c2ac3e34314e2ecfca45f32f2"

package/plugins/extensions/index.ts

@@ -55,8 +55,24 @@ export interface ExtensionSource {
   readonly trust: Trust
 }
 
+/** The library copies a plugins folder holds (`library.json`, written by `acrylblends add`): the app mounts them itself, so they are not extensions. */
+function libraryCopies(dir: string): ReadonlySet<string> {
+  try {
+    const listed = (
+      JSON.parse(readFileSync(join(dir, 'library.json'), 'utf8')) as { plugins?: unknown }
+    ).plugins
+    return new Set(
+      Array.isArray(listed)
+        ? listed.filter((name): name is string => typeof name === 'string')
+        : [],
+    )
+  } catch {
+    return new Set()
+  }
+}
+
 export interface ExtensionsConfig {
-  /** Where extension folders may come from. Defaults to `<app home>/extensions`, trusted to install. */
+  /** Where extension folders may come from. An app passes its `plugins/` folder (library copies listed in its `library.json` are skipped). Defaults to `<app home>/extensions`, trusted to install, for a service used without an app folder. */
   sources?: readonly ExtensionSource[]
   /** When true, every source that would install by itself asks for approval instead (`ask`). */
   approval?: boolean
@@ -373,11 +389,13 @@ export class Extensions extends Service {
     const found: Array<{ name: string; dir: string; trust: Trust }> = []
     for (const source of this.sources) {
       if (!existsSync(source.dir)) continue
+      const library = libraryCopies(source.dir)
       for (const entry of readdirSync(source.dir, { withFileTypes: true })) {
         const dir = join(source.dir, entry.name)
         if (
           entry.isDirectory() &&
           NAME.test(entry.name) &&
+          !library.has(entry.name) &&
           ENTRIES.some((file) => existsSync(join(dir, file)))
         ) {
           if (!found.some((other) => other.name === entry.name))

package/plugins/extensions/plugin.json

@@ -8,5 +8,5 @@
     "@deepseek-ai/cordis": "4.0.4",
     "@webboxes/blends-core": "0.4.0"
   },
-  "mount": "mount it after instance: root.plugin(extensions, { sources: [{ dir: join(root, 'extensions'), trust: 'install' }] })"
+  "mount": "mount it after instance: root.plugin(extensions, { sources: [{ dir: join(root, 'plugins'), trust: 'install' }] })"
 }

package/plugins/extensions/resolve.ts

@@ -4,7 +4,7 @@
  * module inside the staging folder, resolves the same name from the app's project folder. Uses Node's public `module.registerHooks`
  * (ACRYL needed the same fallback on Deno); the returned function removes the hook.
  *
- * The framework plugins are not packages in an app (they are source under `src/plugins/`), so `aliases` names the files a framework specifier such as
+ * The framework plugins are not packages in an app (they are source under `plugins/`), so `aliases` names the files a framework specifier such as
  * `acryl-router` stands for. A staged plugin then imports the same module the app itself runs, so `App` is the very class the router mounts.
  */
 import { existsSync, mkdirSync, realpathSync } from 'node:fs'

package/plugins/manifest/lock.ts

@@ -1,7 +1,7 @@
 /**
  * `npm run lock`: write `blend.lock.json` (formatVersion 3, the lock ACRYL writes too) next to the manifest, recording what the app is
  * built from: the manifest's identity and digest, the Blueprint it was resolved over, its resolved parameters and rows, and a content
- * digest of every plugin folder in `src/plugins/` and every extension in `extensions/`. Commit it; a diff of the lock is a review of
+ * digest of every plugin folder in `plugins/`. Commit it; a diff of the lock is a review of
  * what changed.
  */
 import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
@@ -69,7 +69,11 @@ export function writeLock(appRoot: string): LockV3 {
       version: document.metadata.version,
       digest: manifestDigest(text),
     },
-    modules: [...localModules(appRoot, 'src/plugins'), ...localModules(appRoot, 'extensions')],
+    modules: [
+      ...localModules(appRoot, 'plugins'),
+      ...localModules(appRoot, 'src/plugins'),
+      ...localModules(appRoot, 'extensions'),
+    ],
     ...(lineage
       ? {
           lineage: {
@@ -86,7 +90,7 @@ export function writeLock(appRoot: string): LockV3 {
 }
 
 if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
-  const appRoot = resolve(fileURLToPath(new URL('../../..', import.meta.url)))
+  const appRoot = resolve(fileURLToPath(new URL('../..', import.meta.url)))
   const locked = writeLock(appRoot)
   console.log(
     `wrote ${LOCK_FILE}: ${locked.rows.length} rows, ${locked.modules.length} local plugins`,

package/plugins/manifest/upgrade-cli.ts

@@ -65,6 +65,6 @@ const parse = (argv: readonly string[]) =>
 if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
   process.exitCode = runUpgrade(
     process.argv.slice(2),
-    resolve(fileURLToPath(new URL('../../..', import.meta.url))),
+    resolve(fileURLToPath(new URL('../..', import.meta.url))),
   )
 }