Skip to content

armgit / hypit

Public Imported from GitHub
0

Clone any viral video with AI agents. Not just a script, the whole workflow: swap the face, the words, the B-roll, ship 100 variants in one command, and get your 100M views.

refactor: simplify package loading and runtime execution

kashorin3a7c60f8cbcd
diff --git a/.agents/skills/narratage/SKILL.md b/.agents/skills/narratage/SKILL.md
index c866b79e..50dd6ad6 100644
--- a/.agents/skills/narratage/SKILL.md
+++ b/.agents/skills/narratage/SKILL.md
@@ -6,7 +6,7 @@ description: Author, check, plan, build, inspect, and retrieve Narratage/SVML vi
# Narratage
Use this entrypoint for work in the `narratage` repository. Keep `.svml` Author Source, `.svrun` Run
-Source, and the declarative `svml.runtime.json` Runtime Profile separate.
+Source, and the declarative `narratage.runtime.json` Runtime Profile separate.
## Route the task
@@ -30,21 +30,24 @@ Source, and the declarative `svml.runtime.json` Runtime Profile separate.
```bash
cd path/to/project
-node --run narratage -- runtime use svml.runtime.json
-node --run narratage -- plan build.svrun
-node --run narratage -- build build.svrun --follow
-node --run narratage -- inspect <build-id>
-node --run narratage -- get <build-id> \
+narratage runtime use narratage.runtime.json
+narratage plan build.svrun
+narratage build build.svrun --follow
+narratage inspect <build-id>
+narratage get <build-id> \
--name final.video --to output/final.mp4
```
-Run `packages sync` after import or Runtime package selections change. Use `check` while editing and
+Install dependencies after import or Runtime package selections change. Use `check` while editing and
`doctor` for deployment setup or diagnosis; do not impose either as ceremony before every Build.
Treat `--follow` as an observer: stopping it does not stop the durable Build. Use `runtime down`
to stop only the Worker; use `programs down` separately when external programs should also stop.
Neither command cancels Builds or remote Provider work.
+After submitting without `--follow`, or after leaving an observer, reattach with
+`narratage status <build-id> --watch`. A plain `status` remains a one-time snapshot.
+
Every `build` invocation receives a fresh automatic Build id. Never try to reclaim a prior Build by
restoring Source bytes or choosing an id. Cross-Build reuse exists only through explicit
`build-record` Candidates in a new Run Source.
@@ -64,7 +67,7 @@ in as the picture it names, held for the length it declares.
pkill -f svml-playground || true # never leave the old one holding the port
pnpm svml:playground -- --source path/to/main.svml \
--run path/to/build.svrun \
- --runtime path/to/svml.runtime.json &
+ --runtime path/to/narratage.runtime.json &
# then send the author: http://localhost:5179/
```
diff --git a/.agents/skills/narratage/references/credentials.md b/.agents/skills/narratage/references/credentials.md
index 2b704f6f..16a06f56 100644
--- a/.agents/skills/narratage/references/credentials.md
+++ b/.agents/skills/narratage/references/credentials.md
@@ -33,7 +33,7 @@ $env:GOOGLE_APPLICATION_CREDENTIALS_JSON = Get-Content -Raw "$HOME\.config\narra
Keep keys outside Author/Run/Runtime source and committed files. Verify presence without printing
values with, for example,
`node .agents/skills/narratage/scripts/check-credentials.mjs KIE_API_KEY MIMO_API_KEY`, then run
-`node --run narratage -- doctor <profile>`.
+`narratage doctor <profile>`.
An Endpoint whose Runtime Profile points at the read-only `env` CredentialStore must be configured
by setting its exact environment variable. `narratage auth login` deliberately refuses to prompt in
diff --git a/.agents/skills/narratage/references/environment.md b/.agents/skills/narratage/references/environment.md
index 6b51405f..46f0dc11 100644
--- a/.agents/skills/narratage/references/environment.md
+++ b/.agents/skills/narratage/references/environment.md
@@ -22,6 +22,7 @@ Then install and validate the workspace:
corepack enable
corepack prepare [email protected] --activate
pnpm install --frozen-lockfile
+npm link
pnpm check
pnpm test
```
@@ -32,11 +33,11 @@ For managed local programs:
uv python install 3.13
uv sync --project services/whisperx --frozen
uv sync --project services/image-opencv --frozen
-uv run --project services/whisperx --frozen svml-whisperx-prepare
-node --run narratage -- runtime use svml.runtime.json
-node --run narratage -- doctor
-node --run narratage -- runtime up
-node --run narratage -- runtime status
+uv run --project services/whisperx --frozen narratage-whisperx-prepare
+narratage runtime use narratage.runtime.json
+narratage doctor
+narratage runtime up
+narratage runtime status
```
Use `runtime up` for normal Build preparation: it owns the detached durable Worker and prepares the external
@@ -47,8 +48,7 @@ After intentionally installing, removing or changing selected packages, refresh
project locks in one reviewed action:
```text
-node --run narratage -- runtime use svml.runtime.json
-node --run narratage -- packages sync build.svrun
+narratage runtime use narratage.runtime.json
```
This command derives Author roots from that Run/Author Source closure and Runtime roots from the
diff --git a/.agents/skills/narratage/references/playbooks/craft/captions.md b/.agents/skills/narratage/references/playbooks/craft/captions.md
index 72cbd02e..9b2b6a51 100644
--- a/.agents/skills/narratage/references/playbooks/craft/captions.md
+++ b/.agents/skills/narratage/references/playbooks/craft/captions.md
@@ -102,7 +102,6 @@ source, and starting a server nobody asked for interrupts the user for nothing.
```bash
pnpm caption:playground -- \
--source main.svml \
- --package-lock svml.packages.lock \
--style base-caption \
--display story.caption \
--recipe studio.svs#caption.base \
diff --git a/.agents/skills/narratage/references/playbooks/craft/production-gates.md b/.agents/skills/narratage/references/playbooks/craft/production-gates.md
index 0a057e6e..f9f56bf6 100644
--- a/.agents/skills/narratage/references/playbooks/craft/production-gates.md
+++ b/.agents/skills/narratage/references/playbooks/craft/production-gates.md
@@ -8,7 +8,7 @@ Use staged Run Sources so unreviewed expensive outputs cannot silently feed late
and factual claims before writing prompts.
- Give every planned shot one job: hook, context, evidence, mechanism, reaction, payoff, transition,
or CTA. Delete shots with no distinct job.
-- Confirm credentials, Runtime Profile, package locks, model limits, resolution, and Endpoint prerequisites.
+- Confirm credentials, Runtime Profile, installed packages, model limits, resolution, and Endpoint prerequisites.
Run `doctor`, `check`, and `plan` before the first paid Build.
## Gate 1: build and review reference images
diff --git a/.agents/skills/narratage/references/quickstart.md b/.agents/skills/narratage/references/quickstart.md
index c17047a1..7897a7ab 100644
--- a/.agents/skills/narratage/references/quickstart.md
+++ b/.agents/skills/narratage/references/quickstart.md
@@ -17,7 +17,7 @@ Canonical path:
`Script → estimate:Speech/text → Seedance or supplied media → Speech Spine → WhisperX SemanticMap → peer Caption/Media/Typography/Audio Tracks → Film → render:Video`.
-Use explicit imports, exact fonts, Canvas/Frames, ProgramSpace, package locks, Targets, and Runtime
+Use explicit imports, exact fonts, Canvas/Frames, ProgramSpace, Targets, and Runtime
authority. There is no implicit cache; reuse is explicit with `build-record` + `satisfy`.
Use `speech:Take video={...}` for a speech-bearing A/V take and `speech:Take audio={...}` for
diff --git a/.agents/skills/narratage/references/runtime.md b/.agents/skills/narratage/references/runtime.md
index 590e7f8b..b825b489 100644
--- a/.agents/skills/narratage/references/runtime.md
+++ b/.agents/skills/narratage/references/runtime.md
@@ -7,18 +7,18 @@ Build, retrieval, and reuse syntax. Use this file as the operational checklist.
```bash
cd path/to/project
-node --run narratage -- runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
-node --run narratage -- plan build.svrun
+narratage plan build.svrun
-node --run narratage -- build build.svrun --follow
+narratage build build.svrun --follow
-node --run narratage -- inspect <build-id>
-node --run narratage -- get <build-id> \
+narratage inspect <build-id>
+narratage get <build-id> \
--name final.video --to output/final.mp4
```
-Use `packages sync` only after package selection changes. Use `check` during authoring and `doctor`
+Install dependencies after package selection changes. Use `check` during authoring and `doctor`
or `runtime status` when diagnosing the deployment. `build` already ensures the detached Worker
and demanded Managed Programs are available.
@@ -29,11 +29,13 @@ Builds remain archived and neither command cancels remote Provider work.
## Preserve durable semantics
- `runtime up` starts or reuses the detached Worker plus declared external programs. A direct
- `build` also ensures the execution domain is running before submission.
+ `build` also ensures the selected Runtime is running before submission.
- `programs up/status/down` manages external programs only. Do not use it as the normal Build
bootstrap because it does not own the Worker lifecycle.
- A Build continues after durable submission. `--follow` only observes progress; interrupting the
terminal does not stop the Build.
+- `status <build-id>` reads one snapshot; `status <build-id> --watch` reattaches an observer until
+ terminal state without resubmitting or taking execution ownership.
- Every `build` invocation creates a fresh automatic Build id. Source identity never reclaims an
earlier Build; reuse across Builds exists only through explicit Run Source Candidates.
- `inspect` reads durable Build state and accepted Records. `get` copies an archived Artifact to the
@@ -48,7 +50,7 @@ Prefer production projects outside the Narratage checkout. Relative Author Sourc
inside the independently resolved Source Workspace.
- `--workspace` explicitly selects the Source Workspace boundary.
-- `--package-root` only changes where the Host locates installed packages whose bytes are verified
- by the package lock. It does not widen Source access.
+- `--package-root` only changes where the Host locates installed packages. It does not widen Source
+ access.
- Do not symlink an external project into the repository to bypass containment; canonical-path
checks reject that escape.
diff --git a/README.md b/README.md
index 1d3e5187..f6469fce 100644
--- a/README.md
+++ b/README.md
@@ -113,17 +113,25 @@ Node.js 22+ and pnpm 10.33.x:
```bash
corepack enable
pnpm install --frozen-lockfile
+npm link
+```
-node --run narratage -- check examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+Then, from a video project:
-node --run narratage -- plan examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+```bash
+cd my-video
+narratage runtime use narratage.runtime.json
+narratage plan build.svrun
+narratage build build.svrun
+narratage status <build-id> --watch
+narratage get <build-id> --name final.video --to output/final.mp4
```
-`check` verifies the source and prints its typed outputs. `plan` shows the exact execution subgraph and every external capability a real Build would need — without starting any of it.
+`build` prints a fresh Build ID and returns after durable submission. `status --watch` can attach to
+that Build from any later terminal. Use `check` while editing; package selection follows Source
+imports and the selected Runtime Profile.
-A real Build additionally needs `ffmpeg` and `ffprobe` on your `PATH`, and depending on the Runtime Profile, Python with `uv` or API credentials. Run `narratage doctor` to see what's missing; see [Quickstart](https://narratage.hypit.ai/quickstart) for the full walkthrough.
+A real Build additionally needs `ffmpeg` and `ffprobe` on your `PATH`, and depending on the Runtime Profile, Python with `uv` or API credentials. Run `narratage doctor` to see what's missing; see [Quickstart](https://narratage.hypit.ai/quickstart) for the complete setup and a provider-free first plan.
### Project files
@@ -160,10 +168,10 @@ The Core is small and domain-neutral: it knows nothing about video. Installing a
|---|---|---|
| **Narratage Core** | Plan compilation and the Build state machine | `core`, `protocol` |
| **Compiler** | Source parsing, imports and graph elaboration | `host`, `markup`, `svs`, `elaborator` |
-| **Infrastructure** | Media processing, spatial layout, fonts and text | `media-pipeline`, `spatial`, `fonts-open` |
+| **Foundations** | Reusable media, time, layout, text and transport building blocks | `media-pipeline`, `temporal`, `spatial` |
| **Video authoring** | Script, generation, speech, tracks, film and rendering | `script`, `seedance`, `caption`, `film` |
| **Providers** | Adapters for external models, APIs and Managed Programs | `provider-kie`, `provider-whisperx-local` |
-| **Runtime** | Scheduling, storage, credentials and execution | `runtime`, `store-sqlite`, `local` |
+| **Runtime** | Scheduling, storage, credentials and execution | `runtime`, `store-sqlite`, `runtime-local` |
| **Applications** | User-facing ways to author and operate Narratage | `cli`, `svml-playground` |
## Where to go next
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 3e9e85f6..09bd62b0 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -105,17 +105,25 @@ cd narratage
```bash
corepack enable
pnpm install --frozen-lockfile
+npm link
+```
-node --run narratage -- check examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+然后在视频项目中运行:
-node --run narratage -- plan examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+```bash
+cd my-video
+narratage runtime use narratage.runtime.json
+narratage plan build.svrun
+narratage build build.svrun
+narratage status <build-id> --watch
+narratage get <build-id> --name final.video --to output/final.mp4
```
-`check` 校验源码并打印类型化输出。`plan` 展示被真正需要的执行子图,以及一次真实 Build 会用到的每一项外部能力——但不会启动其中任何一项。
+`build` 会打印一个新的 Build ID,并在耐久提交后立即返回。之后可以从任何终端用
+`status --watch` 重新接上这个 Build。编辑时使用 `check`;包选择直接来自 Source import
+与当前 Runtime Profile。
-真实的 Build 还需要 `PATH` 上有 `ffmpeg` 与 `ffprobe`,以及视 Runtime Profile 而定的 Python 与 `uv` 或 API 凭据。运行 `narratage doctor` 查看缺什么;完整指南见[快速开始](https://narratage.hypit.ai/zh/quickstart)。
+真实的 Build 还需要 `PATH` 上有 `ffmpeg` 与 `ffprobe`,以及视 Runtime Profile 而定的 Python 与 `uv` 或 API 凭据。运行 `narratage doctor` 查看缺什么;完整环境配置与第一次无 Provider 计划见[快速开始](https://narratage.hypit.ai/zh/quickstart)。
### 项目文件
@@ -152,10 +160,10 @@ Core 极小且领域无关:它不认识视频。安装一个包即可增加能
|---|---|---|
| **Narratage Core** | 计划编译与 Build 状态机 | `core`、`protocol` |
| **Compiler** | Source 解析、导入与图展开 | `host`、`markup`、`svs`、`elaborator` |
-| **Infrastructure** | 媒体处理、空间布局、字体与文本 | `media-pipeline`、`spatial`、`fonts-open` |
+| **Foundations** | 可复用的媒体、时间、布局、文本与调用基础能力 | `media-pipeline`、`temporal`、`spatial` |
| **Video authoring** | 稿件、生成、语音、Track、Film 与渲染 | `script`、`seedance`、`caption`、`film` |
| **Providers** | 外部模型、程序与服务的适配器 | `provider-kie`、`provider-whisperx-local` |
-| **Runtime** | 调度、存储、凭据与执行 | `runtime`、`store-sqlite`、`local` |
+| **Runtime** | 调度、存储、凭据与执行 | `runtime`、`store-sqlite`、`runtime-local` |
| **Applications** | 创作和操作 Narratage 的用户界面 | `cli`、`svml-playground` |
## 接下来去哪
diff --git a/bin/build-cli.mjs b/bin/build-cli.mjs
new file mode 100644
index 00000000..012d10a4
--- /dev/null
+++ b/bin/build-cli.mjs
@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+import { existsSync } from "node:fs";
+import { cp, mkdir, readdir, rm, writeFile } from "node:fs/promises";
+import { createRequire } from "node:module";
+import { dirname, resolve } from "node:path";
+import { spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+
+const repository = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+const staging = resolve(repository, "dist/cli/packages");
+const compiler = createRequire(import.meta.url).resolve("typescript/bin/tsc");
+const result = spawnSync(process.execPath, [compiler, "-p", resolve(repository, "tsconfig.cli.json"), "--pretty", "false"], {
+ cwd: repository,
+ stdio: "inherit",
+});
+if (result.status !== 0) process.exit(result.status ?? 1);
+
+for (const entry of await readdir(staging, { withFileTypes: true })) {
+ if (!entry.isDirectory()) continue;
+ const source = resolve(staging, entry.name, "src");
+ if (!existsSync(source)) continue;
+ const target = resolve(repository, "packages", entry.name, "dist");
+ await rm(target, { recursive: true, force: true });
+ await mkdir(target, { recursive: true });
+ await cp(source, target, { recursive: true });
+}
+
+await writeFile(resolve(repository, "dist/cli-ready"), `${Date.now()}\n`, "utf8");
diff --git a/bin/compiled-loader.mjs b/bin/compiled-loader.mjs
new file mode 100644
index 00000000..e350b477
--- /dev/null
+++ b/bin/compiled-loader.mjs
@@ -0,0 +1,43 @@
+import { existsSync } from "node:fs";
+import { createRequire, registerHooks } from "node:module";
+import { dirname, relative, resolve, sep } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const repository = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+const output = resolve(repository, "dist/cli");
+
+function sourceUrl(url) {
+ if (!url.startsWith("file:")) return undefined;
+ const built = fileURLToPath(url);
+ const path = relative(output, built);
+ if (path === ".." || path.startsWith(`..${sep}`)) return undefined;
+ return pathToFileURL(resolve(repository, path.replace(/\.js$/u, ".ts"))).href;
+}
+
+function builtUrl(url) {
+ if (!url.startsWith("file:") || !url.endsWith(".ts")) return undefined;
+ const source = fileURLToPath(url);
+ const path = relative(repository, source);
+ if (path === ".." || path.startsWith(`..${sep}`)) return undefined;
+ const match = /^packages\/([^/]+)\/src\/(.+)\.ts$/u.exec(path.split(sep).join("/"));
+ if (match === null) return undefined;
+ const built = resolve(repository, "packages", match[1], "dist", `${match[2]}.js`);
+ return existsSync(built) ? pathToFileURL(built).href : undefined;
+}
+
+registerHooks({
+ resolve(specifier, context, nextResolve) {
+ let resolved;
+ try {
+ resolved = nextResolve(specifier, context);
+ } catch (error) {
+ const parent = context.parentURL === undefined ? undefined : sourceUrl(context.parentURL);
+ if (parent === undefined || specifier.startsWith("node:") || specifier.startsWith(".") || specifier.startsWith("/")) {
+ throw error;
+ }
+ resolved = { url: pathToFileURL(createRequire(parent).resolve(specifier)).href };
+ }
+ const built = builtUrl(resolved.url);
+ return built === undefined ? resolved : { ...resolved, url: built };
+ },
+});
diff --git a/bin/narratage.mjs b/bin/narratage.mjs
new file mode 100755
index 00000000..4aa841e2
--- /dev/null
+++ b/bin/narratage.mjs
@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+
+import { existsSync, realpathSync, statSync } from "node:fs";
+import { readdir } from "node:fs/promises";
+import { spawnSync } from "node:child_process";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const root = realpathSync(resolve(dirname(fileURLToPath(import.meta.url)), ".."));
+const builtCli = resolve(root, "packages/video-cli/dist/cli.js");
+const ready = resolve(root, "dist/cli-ready");
+
+if (!existsSync(resolve(root, "node_modules/typescript/bin/tsc"))) {
+ process.stderr.write(`Narratage dependencies are not installed in ${root}; run: pnpm install --frozen-lockfile\n`);
+ process.exitCode = 1;
+ process.exit();
+}
+
+async function sourceChanged(directory, builtAt) {
+ for (const entry of await readdir(directory, { withFileTypes: true })) {
+ const path = resolve(directory, entry.name);
+ if (entry.isDirectory()) {
+ if (entry.name === "dist" || entry.name === "node_modules" || entry.name === "test") continue;
+ if (await sourceChanged(path, builtAt)) return true;
+ } else if ((entry.name.endsWith(".ts") || entry.name === "package.json") && statSync(path).mtimeMs > builtAt) {
+ return true;
+ }
+ }
+ return false;
+}
+
+const builtAt = existsSync(ready) && existsSync(builtCli) ? statSync(ready).mtimeMs : 0;
+const configurationChanged = ["package.json", "pnpm-lock.yaml", "tsconfig.json", "tsconfig.cli.json", "bin/build-cli.mjs"]
+ .some((path) => statSync(resolve(root, path)).mtimeMs > builtAt);
+if (builtAt === 0 || configurationChanged || await sourceChanged(resolve(root, "packages"), builtAt)) {
+ process.stderr.write("Preparing Narratage CLI...\n");
+ const result = spawnSync(process.execPath, [resolve(root, "bin/build-cli.mjs")], {
+ cwd: root,
+ stdio: "inherit",
+ });
+ if (result.status !== 0) process.exit(result.status ?? 1);
+}
+
+process.env.NARRATAGE_CLI_LAUNCHER ??= fileURLToPath(import.meta.url);
+await import("./compiled-loader.mjs");
+await import(pathToFileURL(builtCli).href);
diff --git a/docs/guide/author-packages.md b/docs/guide/author-packages.md
index aa071104..addf8bee 100644
--- a/docs/guide/author-packages.md
+++ b/docs/guide/author-packages.md
@@ -26,7 +26,7 @@ mkdir -p packages/my-component/src packages/my-component/test
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -53,7 +53,7 @@ export const myComponentModuleRef: ModuleRef = {
};
export const myComponentManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: myComponentModuleRef.name,
version: myComponentModuleRef.version,
dependencies: [],
@@ -107,8 +107,8 @@ import {
decodeMyComponentSurface,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: myComponentManifest,
}],
@@ -121,7 +121,7 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
```
The Module automatically offers its exact `[email protected]`, so authors import
@@ -140,32 +140,15 @@ not part of the semantic Module Manifest or Core.
pnpm workspace links resolve the package. No root path registry is involved.
-## 7. Install and lock
+## 7. Install
```bash
pnpm install --frozen-lockfile
-
-node --run narratage -- lock-packages <lock-file> \
- --package @narratage/my-component \
- [--package @narratage/other-direct-package ...] \
- --package-root .
-```
-
-Only name direct packages you chose. Exact logical Module dependencies declared by their Manifests
-are added from the installed physical dependency closure automatically; missing or ambiguous
-providers make lock creation fail.
-
-For an existing lock, add only this direct package without repeating the other selections:
-
-```bash
-node --run narratage -- lock-packages <lock-file> \
- --add @narratage/my-component \
- --package-root .
```
-Use `--remove` for an explicit revocation, `--refresh` to accept changed bytes for the unchanged
-selection, and `--verify` for a read-only closure check. Repeated `--package` always means the exact
-complete direct selection.
+The package manager owns installation, versions and integrity. Narratage loads the package when an
+Author or Run Source imports one of its logical offers. Exact Module dependencies declared by its
+Manifest are loaded from its installed dependencies.
## 8. Use in Author Source
diff --git a/docs/guide/caption-playground.md b/docs/guide/caption-playground.md
index 5a5a1308..04f4008a 100644
--- a/docs/guide/caption-playground.md
+++ b/docs/guide/caption-playground.md
@@ -12,7 +12,6 @@ and `.svs` files that an ordinary Build compiles.
```bash
pnpm caption:playground -- \
--source examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock \
--style base-caption \
--display story.caption \
--recipe examples/talking-film-graph-check/studio.svs#caption.base \
@@ -28,7 +27,6 @@ All selections are explicit:
| Argument | Selected fact |
|---|---|
| `--source` | self-described author source |
-| `--package-lock` | trusted author compiler closure |
| `--style` | authored Fine Caption Style export |
| `--display` | authored Caption Display export |
| `--recipe` | real SVS file and Recipe path to edit |
diff --git a/docs/guide/conventions.md b/docs/guide/conventions.md
index 49947f41..da2f9c01 100644
--- a/docs/guide/conventions.md
+++ b/docs/guide/conventions.md
@@ -46,8 +46,8 @@ Adding a package does not require changing the root TypeScript configuration.
- Project-owned Module and Frontend identities use the literal logical version `1`.
- Workspace `package.json` versions remain `0.0.0-dev` until publication. They are physical package
metadata, not logical protocol identities.
-- Exact executable identity comes from locked package bytes and closure digests, not either version
- string.
+- npm or pnpm owns installed package versions and bytes. Narratage identities describe semantic
+ Modules, Frontends, Fragments and implementations rather than pretending to hash an installed package.
- Wire types are defined in `@narratage/protocol` and are immutable.
- Nominal Types are owned by Modules, not registered in a central union.
- Type schemas use JSON-compatible structures, not TypeScript interfaces.
diff --git a/docs/guide/packages.md b/docs/guide/packages.md
index 0ba4ee67..0ecb4028 100644
--- a/docs/guide/packages.md
+++ b/docs/guide/packages.md
@@ -1,27 +1,33 @@
---
title: Package Architecture
-description: The five layers, dependency boundaries, package anatomy and facets.
+description: The seven layers, dependency boundaries, package anatomy and facets.
---
# Package Architecture
-Workspace packages under `packages/` are organized into five architectural layers. Dependencies are
+Workspace packages under `packages/` are organized into seven architectural layers. Dependencies are
declared by each package itself. The root installs the complete source checkout so the Package
-Loader can resolve any explicitly locked package, but TypeScript has no central path alias that can
+Loader can resolve any explicitly selected package, but TypeScript has no central path alias that can
hide a package's undeclared import.
-## The five layers
+## The seven layers
-### Layer 1: Domain-neutral foundation
+### Layer 1: Narratage Core
-These packages implement the graph language, Build state machine, compiler infrastructure and
-Runtime ports. They are reusable by any domain — not just video — and have no dependency on Text,
-Script, Seedance, Film or any video concept.
+The immutable graph protocol, demand compiler and Build state machine. This closure is domain
+neutral and knows nothing about source syntax, files, networks, models or video.
```text
@narratage/protocol immutable wire contracts
-@narratage/artifact domain-neutral content-addressed byte type
@narratage/core Demand compiler and Build state machine
+```
+
+### Layer 2: Compiler
+
+Source discovery, Frontends, imports, graph elaboration and the reference Node Host. A source
+selects its own Frontend in its mandatory header; no central parser knows every language feature.
+
+```text
@narratage/source mandatory Source Header
@narratage/elaborator author declarations and Fragment expansion
@narratage/run syntax-neutral Run Graph
@@ -30,49 +36,42 @@ Script, Seedance, Film or any video concept.
@narratage/workspace replaceable Source/Asset session
@narratage/compiler-node reference Node compiler Host
@narratage/workspace-fs-node workspace filesystem abstraction
-@narratage/component-kit Producer/validator registration
-@narratage/runtime Scheduler and Store ports
-@narratage/runtime-adapter deployment-adapter ABI
-@narratage/runtime-adapter-node project-root resolution
-@narratage/endpoint-kit Endpoint registration
-@narratage/driver-node trusted Node command executor
-@narratage/package-loader-node byte-locked package loading
-@narratage/store-sqlite SQLite Build/Operation stores
-@narratage/artifact-store-fs filesystem Artifact store
-@narratage/artifact-store-s3 S3 Artifact store
-@narratage/credential-store-env environment credentials
-@narratage/credential-store-keychain macOS Keychain credentials
-@narratage/transport invocation seams
-@narratage/transport-aws-lambda Lambda transport
-@narratage/local SQLite/filesystem developer assembly
-```
-
-### Layer 2: Author language
-
-Author-facing vocabulary: the Markup Frontend, Script Surface, SVS Recipes, Run Markup Frontend and
-reusable deterministic text compilation.
-
-```text
+@narratage/package-loader-node installed package selection
@narratage/markup official .svml Markup Frontend
-@narratage/script Script Surface
@narratage/svs SVS Recipe Frontend
@narratage/run-markup official .svrun Markup Frontend
-@narratage/text graph-native text values, templates and deterministic rendering
@narratage/compiler-markup-node Markup Frontend + Surface Host assembly
```
-`@narratage/text` is domain-neutral in meaning even though it is author-language vocabulary. Its
-ordinary `Text` outputs may feed model ports or visible video consumers. Those consumers depend on
-the Text waist; Text never depends back on Typography, Ranking, Sticker, Deck or any model family.
+### Layer 3: Foundations
-### Layer 3: Video domain
+Reusable values and deterministic building blocks. They support video authoring but do not decide a
+film's creative structure or call an external service.
-Video-specific types, generation model families, speech/caption/track contracts and composition.
-Depends on Layer 1 and 2 but not on any Provider.
+```text
+@narratage/artifact content-addressed bytes
+@narratage/component-kit Producer and validator registration
+@narratage/text graph-native text templates
+@narratage/media media values
+@narratage/temporal Selection and Moment projection
+@narratage/spatial layout geometry
+@narratage/visual-ir renderer-neutral visual vocabulary
+@narratage/fonts-open redistributable font assets
+@narratage/media-pipeline media inspection and normalization
+@narratage/media-execution shared ffmpeg execution body
+@narratage/transport invocation seams
+@narratage/transport-aws-lambda Lambda transport
+```
+
+### Layer 4: Video authoring
+
+The packages that give SVML its video vocabulary: narrative, exact model requests, speech,
+captions, peer Tracks, Film and render declarations. They depend on shared contracts, never on a
+specific Provider deployment.
```text
-@narratage/media media types
@narratage/narrative authored narrative products
+@narratage/script Script Surface
@narratage/program-space exact frame/sample domain
@narratage/generation image/video/audio generation contracts
@narratage/model-kit model family abstractions
@@ -93,12 +92,9 @@ Depends on Layer 1 and 2 but not on any Provider.
@narratage/speech-alignment speech alignment
@narratage/speech-spine ordered speech-take compilation
@narratage/whisperx WhisperX component
-@narratage/temporal Selection/Moment projection and schedules
-@narratage/spatial Canvas/Frame/Point/Path geometry
@narratage/caption caption planning and timing
@narratage/caption-gemini Gemini caption planner
@narratage/caption-fine field-free fine caption Track family
-@narratage/fonts-open exact redistributable font catalog
@narratage/media-track unified Media Item/Sequence Track
@narratage/typography-track typography overlay Track
@narratage/audio-track arbitrary sample-domain Audio Track
@@ -107,18 +103,15 @@ Depends on Layer 1 and 2 but not on any Provider.
@narratage/screen-overlay self-contained full-canvas overlays
@narratage/film Film composition
@narratage/composition peer Track composition
-@narratage/visual-ir renderer-neutral visual vocabulary
@narratage/hyperframes HyperFrames document compiler
@narratage/render-hyperframes explicit HyperFrames rendering component
@narratage/image-transform image processing component
@narratage/image-compose ordered still-image composition
@narratage/raster shared deterministic raster execution contract
@narratage/background-removal external image cutout capability
-@narratage/media-pipeline media inspection/normalization
-@narratage/media-execution shared ffmpeg execution body for Providers
```
-### Layer 4: Provider (Endpoint) packages
+### Layer 5: Providers
Privileged external capabilities. Depend on Runtime ports and shared capability vocabularies,
never on exact-model packages or the CLI.
@@ -135,7 +128,26 @@ never on exact-model packages or the CLI.
@narratage/provider-xiaomi-mimo official Xiaomi MiMo TTS API
```
-### Layer 5: Application
+### Layer 6: Runtime
+
+Domain-neutral execution ports plus replaceable deployment implementations. Runtime packages own
+queues, leases, stores, credentials and process lifecycle; they never define author syntax.
+
+```text
+@narratage/runtime Scheduler, Worker and Store ports
+@narratage/endpoint-kit Endpoint declarations
+@narratage/driver-node trusted Node command executor
+@narratage/runtime-kit deployment package ABI
+@narratage/runtime-host-node Node Runtime Host ABI
+@narratage/runtime-local local Worker and assembly
+@narratage/store-sqlite SQLite state
+@narratage/artifact-store-fs filesystem Artifacts
+@narratage/artifact-store-s3 S3 Artifacts
+@narratage/credential-store-env environment credentials
+@narratage/credential-store-keychain macOS Keychain credentials
+```
+
+### Layer 7: Applications
```text
@narratage/cli generic command engine (requires explicit Distribution)
@@ -148,13 +160,13 @@ The package layout follows three dependency rules:
1. **Acyclic production graph.** No dependency cycle among any `@narratage/*` packages.
-2. **Domain-neutral closure.** Every Layer 1 package's transitive closure contains only Layer 1
- packages. `@narratage/core` depends only on `@narratage/protocol`.
+2. **Domain-neutral Core closure.** Layer 1 contains only `protocol` and `core`; `core` depends only
+ on `protocol`. Compiler and Runtime may also be domain neutral, but they remain outside Core.
3. **CLI independence.** Neither `@narratage/cli` nor `@narratage/video-cli` transitively depends on any
Provider package. The video CLI also does not depend on any author-level video package
(`@narratage/script`, `@narratage/seedance`, `@narratage/media-track`, `@narratage/typography-track`, `@narratage/film`).
- Author packages are activated through the explicit package lock, not compile-time CLI
+ Author packages are activated through Source imports, not compile-time CLI
dependencies. These rules are kept visible in package manifests and reviewed as architecture,
rather than approximated by source-text regex tests.
@@ -183,7 +195,7 @@ packages/example/
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -194,11 +206,10 @@ packages/example/
- `"exports"` points to TypeScript source directly during development. pnpm's workspace links resolve
`@narratage/*` imports through the dependency declared by the importing package.
-- `"svml.activation"` is the entry point that the Package Loader reads when this package is
- byte-locked. It must default-export a `NodePackageContribution`.
+- `"narratage.activation"` is the entry point that the Package Loader reads when this package is
+ selected. It must default-export a `NodePackageContribution`.
- The physical package version remains `0.0.0-dev` until publication. Module and Frontend manifests
- use the independent logical protocol version `1`; exact implementation identity is the lock
- digest.
+ use the independent logical protocol version `1`.
### activation.ts
@@ -216,66 +227,47 @@ A physical package may expose independently activated facets:
| `author` | Frontend, Surface, Graph Fragment | author vocabulary only | source `<import>` through the compiler Host |
| `compute` | deterministic Producer, Type Validator | pure computation | compiler Host |
| `endpoint` | privileged external capability | network, filesystem, process, credentials | Runtime Profile |
-| `runtime` | Scheduler, Store implementation | persistence, scheduling | Runtime Profile |
+| `infrastructure` | Scheduler, Worker and Store implementation | persistence, scheduling | Runtime Profile |
A source `<import>` activates only author facets. It never grants network, filesystem, process,
credential or queue authority.
-## Package locking
-
-SVML uses byte-locked trusted code execution. The loader records each package's name, version and
-SHA-256 digest:
-
-```json
-{
- "format": "svml.node-package-lock@1",
- "artifacts": [
- {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev",
- "digest": "sha256:abc123..."
- }
- ]
-}
-```
+## Package selection
-Two independent package inventories serve different authority scopes:
+Narratage does not maintain a package registry or a second package-resolution layer. npm or pnpm
+installs packages and owns their versions and integrity. Narratage has two explicit selection paths:
-| Lock file | Contains | Identity scope |
-|---|---|---|
-| `svml.packages.lock` | Frontends, Surfaces, Producers, Validators | Author Graph + Run Graph + execution Program Closure |
-| `svml.runtime-packages.lock` | Providers, Stores, transports | Runtime Closure |
+| Selection | Packages activated |
+|---|---|
+| Source imports | Frontends, Surfaces, Producers and Validators |
+| Runtime Profile `use` | Runtime Hosts, infrastructure and Provider Endpoints |
-`packages sync` grows or refreshes an inventory without deleting another Run's roots. One
-compilation activates only the exact subset its Source requests and binds that subset digest into
-the Build; Runtime adapter selection is likewise the exact subset declared by the Profile.
-Changing package bytes requires explicitly refreshing the inventory.
+A Source import never grants network, filesystem, process, credential or queue authority. Those
+remain available only to packages explicitly selected by the Runtime Profile.
### Logical package addresses and Source discovery
-Source code names logical language capabilities, not npm locations. The inventory binds each
-logical address to one byte-locked physical package as the pair `(Host ABI, logical name)`. Thus a
-Module and a Run Fragment may intentionally share a spelling without becoming the same capability,
-and one physical package may offer several logical names.
+Source code names logical language capabilities. By convention the logical name maps directly to
+the installed npm package name. A Module and a Run Fragment may share a spelling because their Host
+ABIs remain different, and one physical package may offer several logical names.
-Compilation reads only the mandatory Source Header first. It resolves that Frontend from the
-trusted inventory, calls the Frontend's own `discover()` method, resolves the reported Modules,
+Compilation reads only the mandatory Source Header first. It resolves that Frontend from installed
+packages, calls the Frontend's own `discover()` method, resolves the reported Modules,
Run Fragments and child Sources, and repeats until the exact package subset stops growing. Only
then does semantic decoding begin. Markup is the video Distribution's bootstrap Frontend; Script,
SVS, Run Markup and third-party Frontends otherwise follow the same discovery protocol. The package
selector contains no parser-specific branch.
Frontend implementations are not privileged fields in the physical package format. They advertise
-the ordinary `svml.source-frontend@1` Host facet, exactly as Run Fragments, Markup Surfaces and
+the ordinary `narratage.source-frontend@1` Host facet, exactly as Run Fragments, Markup Surfaces and
Runtime Adapters advertise their own Host ABIs. Only the Source Host interprets that facet.
Runtime Profiles follow the same rule. Each `use` selects a Runtime Host, Endpoint Adapter or
-Runtime Component Adapter ABI plus a logical name. A physical npm package advertises that logical
-offer; its package name is only an enrollment hint and lockfile fact. The generic CLI therefore
+Runtime Infrastructure ABI plus a logical name. A physical npm package advertises that logical
+offer. The generic CLI therefore
does not contain a Provider registry, and different Adapter kinds may share
a logical spelling without colliding.
-When a logical name and physical npm package have the conventional same root, `packages sync` can
-enrol it directly. A differently named bundle must first be explicitly added to the project
-inventory; afterward Source remains bound only to its logical name. Unknown code is never downloaded
-or executed merely because a Source Header names it.
+The loader never downloads packages and never scans unrelated installed dependencies for plugins.
+It loads only packages selected by Source discovery or the Runtime Profile, plus exact Module
+dependencies declared by those packages.
diff --git a/docs/guide/providers.md b/docs/guide/providers.md
index 56d88712..4e4a3875 100644
--- a/docs/guide/providers.md
+++ b/docs/guide/providers.md
@@ -31,13 +31,13 @@ packages or the CLI:
"exports": {
".": "./src/index.ts"
},
- "svml": { "activation": "./src/activation.ts" },
+ "narratage": { "activation": "./src/activation.ts" },
"dependencies": {
"@narratage/endpoint-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"@narratage/generation": "workspace:*"
}
}
@@ -50,18 +50,29 @@ ArtifactStore persistence.
```typescript
// src/provider.ts
-import type { EndpointManifest } from "@narratage/endpoint-kit";
+import { defineEndpointPackage } from "@narratage/endpoint-kit";
export function createMyServiceProvider(options: {
instance: string;
- authority?: string;
+ pool: string;
apiKey: CredentialRef;
defaultConcurrency?: number;
}) {
- // Return an object with:
- // - manifest: declares Capabilities this Endpoint implements
- // - handle: processes Commands from the Scheduler
- // - close: cleanup
+ return defineEndpointPackage({
+ module: { name: "@narratage/provider-my-service", version: "1" },
+ facet: "service",
+ instance: options.instance,
+ pool: options.pool,
+ credentials: { apiKey: options.apiKey },
+ defaultConcurrency: options.defaultConcurrency ?? 2,
+ capabilities: [{
+ capability: myCapability,
+ returns: myResultType,
+ lane: "generate",
+ lifecycle: "recoverable",
+ endpoint: myRecoverableEndpoint,
+ }],
+ });
}
```
@@ -84,13 +95,14 @@ import {
runtimeConfigExact,
runtimeConfigObject,
runtimeConfigPositiveInteger,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createMyServiceProvider } from "./provider.js";
const adapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-my-service",
activate(context) {
+ if (context.pool === undefined) throw new Error("MyService pool is required");
const config = runtimeConfigObject(context.config, "MyService");
runtimeConfigExact(config, ["apiKey", "defaultConcurrency"], "MyService");
const apiKey = runtimeConfigCredentialRef(config.apiKey, "MyService apiKey");
@@ -99,7 +111,7 @@ const adapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createMyServiceProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
apiKey,
...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),
}),
@@ -107,12 +119,12 @@ const adapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [adapter],
};
-export default svmlPackage;
+export default narratagePackage;
```
`activate` is the one pure deployment declaration. The Endpoint it returns owns the credential
@@ -129,13 +141,13 @@ There is no second manifest flag or central program registry:
```typescript
// src/program.ts
-import type { ManagedProgram } from "@narratage/runtime-adapter";
+import type { ManagedProgram } from "@narratage/runtime-kit";
export function createMyProgram(): ManagedProgram {
return {
id: "my-service",
prepare: { command: "uv", args: ["sync", "--project", "services/my-service", "--frozen"] },
- start: { command: "uv", args: ["run", "--project", "services/my-service", "--frozen", "svml-my-service"] },
+ start: { command: "uv", args: ["run", "--project", "services/my-service", "--frozen", "narratage-my-service"] },
probe: async () => {
// Return { state: "ready" } or { state: "down", detail: "..." }
},
@@ -161,50 +173,40 @@ const adapter = createRuntimeEndpointAdapterFacet({
durable Worker. `build` starts only Programs backing capabilities demanded by its plan. Providers
that call only remote APIs omit `program` entirely.
-## 6. Register and lock
+## 6. Install
Declare every imported package in the Provider's own `package.json`:
```json
"dependencies": {
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
}
```
-Lock into a Runtime package lock:
+Install the package with the project's package manager. It remains inert until the Runtime Profile
+explicitly selects its `use` id.
-```bash
-node --run narratage -- lock-packages <runtime-lock> \
- --package @narratage/provider-my-service \
- --package-root .
-```
-
-If the Runtime lock already exists, use `--add @narratage/provider-my-service` instead. This changes
-only the local trust selection; the package remains inert until the Runtime Profile explicitly
-instantiates its `use` id.
-
-## 7. Reference from svml.runtime.json
+## 7. Reference from narratage.runtime.json
```json
{
- "endpoints": [
- {
+ "endpoints": {
+ "my-service": {
"use": "@narratage/provider-my-service",
- "instance": "my-service.project",
- "authority": "my-service.project",
+ "pool": "my-service.account",
"config": {
"apiKey": { "store": "keychain", "key": "my-service.api-key" },
"defaultConcurrency": 2
}
}
- ]
+ }
}
```
Verify the configuration:
```bash
-node --run narratage -- doctor svml.runtime.json
+narratage doctor narratage.runtime.json
```
## Existing Providers to study
diff --git a/docs/guide/runtime.md b/docs/guide/runtime.md
index 877179c7..f78bd7dd 100644
--- a/docs/guide/runtime.md
+++ b/docs/guide/runtime.md
@@ -42,13 +42,12 @@ A Profile selects one Runtime adapter and gives that adapter closed configuratio
```json
{
"format": "narratage.runtime-profile@1",
- "runtimePackageLock": "./svml.runtime-packages.lock",
"runtime": {
- "use": "@narratage/local",
+ "use": "@narratage/runtime-local",
"config": {
"dataRoot": ".narratage/runtimes/local",
- "components": {
- "execution": { "use": "@narratage/local" },
+ "infrastructure": {
+ "execution": { "use": "@narratage/runtime-local" },
"state": {
"use": "@narratage/store-sqlite",
"config": { "path": "state.sqlite" }
@@ -58,32 +57,30 @@ A Profile selects one Runtime adapter and gives that adapter closed configuratio
"config": { "path": "artifacts" }
}
},
- "bindings": {
- "scheduler": "execution.scheduler",
- "worker": "execution.worker",
- "stores": {
- "build": "state.builds",
- "operations": "state.operations",
- "dispatch": "state.dispatch",
- "artifacts": "artifacts",
- "credentials": []
- }
+ "roles": {
+ "scheduler": { "from": "execution", "part": "scheduler" },
+ "worker": { "from": "execution", "part": "worker" },
+ "buildStore": { "from": "state", "part": "builds" },
+ "operationStore": { "from": "state", "part": "operations" },
+ "dispatchStore": { "from": "state", "part": "dispatch" },
+ "artifactStore": { "from": "artifacts", "part": "store" },
+ "credentialStores": []
},
"endpoints": {
"media": { "use": "@narratage/provider-media-local" }
},
- "limits": { "maxOperations": 4 }
+ "capacity": { "maxActiveOperations": 4 }
}
}
}
```
-`components` configures replaceable Runtime pieces. One Component may expose several related role
-facets. `bindings` selects the exact instance for each singleton role. `endpoints` configures
-capability implementers. `limits` bounds this Runtime as a whole. Presence never implies selection.
+`infrastructure` creates named package instances. Each instance may expose several named parts.
+`roles` selects those parts explicitly; installed or configured packages never select themselves.
+`endpoints` configures external capability implementations. `capacity` bounds this Runtime as a whole.
-The Profile contains no source package lock, source root or author package selection. Those belong
-to the project and the compilation command. Relative Profile paths resolve from the Profile file;
+The Profile contains no source root or author package selection. Those belong to the project and
+its Source imports. Relative Profile paths resolve from the Profile file;
relative local Runtime data paths resolve beneath `dataRoot`.
## Project state
@@ -128,24 +125,33 @@ The default location follows the operating system:
prints the location before its first write. A program that is externally owned and only probed does
not create Narratage host state.
-## Components, bindings and endpoints
+## Packages, instances, parts and roles
+
+A Runtime package is installed code. An entry under `infrastructure` creates one configured
+**instance** of that package. The package may expose several cohesive **parts**. For example,
+`@narratage/store-sqlite` exposes `builds`, `operations` and `dispatch` from one `state` instance and
+one database. A **role** selects one exact `{ from, part }` pair:
+
+```json
+"buildStore": { "from": "state", "part": "builds" }
+```
-A Runtime Component is a configured package instance that supplies one or more infrastructure
-facets such as Scheduler, Worker or Store. A Runtime Binding chooses an exact facet instance. This
-keeps a package free to bundle cohesive implementation parts without giving package presence any
-routing authority.
+`from` always names a configured instance; `part` is declared by that instance's package. The Host
+validates that the selected part implements the requested role. No central registry knows SQLite,
+and no dotted string is parsed to guess ownership.
An Endpoint supplies one or more declared capabilities. An author package may explicitly request a
particular model capability; the Profile binds that request to configured Endpoint instances.
Provider selection is deployment configuration, never a hidden creative decision by Core.
-Both Components and Endpoints are loaded only from the separately verified runtime package lock.
-Installing a package adds an available implementation; it does not alter Core or activate itself.
+Infrastructure and Endpoints are loaded only when the Runtime Profile selects their logical `use`
+names. Installing a package adds an available implementation; it does not alter Core or activate
+itself.
## Managed Programs
A Managed Program is a long lived external process declared by an Endpoint, such as a warm local
-WhisperX server. It is not a Runtime Component and not a queue. The Endpoint declares how to probe
+WhisperX server. It is not a Runtime infrastructure and not a queue. The Endpoint declares how to probe
it and may declare how to prepare or start it. If lifecycle ownership remains external, it declares
only a probe.
@@ -161,7 +167,7 @@ acts on the complete selected Profile. Runtime shutdown does not automatically s
## Lifecycle
```bash
-narratage runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
narratage runtime up
narratage runtime status
narratage runtime logs
@@ -182,18 +188,17 @@ The compiler resolves its Workspace independently of Runtime content, in this or
1. explicit `--workspace`;
2. the project containing the selected `.narratage/runtime` pointer;
-3. the nearest source package lock;
-4. the entry source directory.
+3. the entry source directory.
The Runtime Profile may not widen that boundary. Runtime package installation paths are Host
implementation details and may not become source roots.
## Trust
-Source packages and Runtime packages have separate locks because they run with different authority.
-Compilation activates the exact source selected subset. Runtime activation is limited to the exact
-adapter closure selected by the Profile. The frozen source implementation closure accompanies the
-Build so the Runtime can verify what it is asked to execute.
+Source imports and Runtime Profile entries are separate selections because they grant different
+authority. Compilation activates the source-selected subset. Runtime activation is limited to the
+adapter closure selected by the Profile. Unfinished Builds retain only the installed package names
+their Worker must load; npm or pnpm owns installed versions and bytes.
Node Runtime packages are trusted deployment code until Narratage has a real process or Wasm
isolation boundary. A manifest or claimed digest is not a sandbox.
diff --git a/docs/guide/testing.md b/docs/guide/testing.md
index 8db9a3f0..229267b1 100644
--- a/docs/guide/testing.md
+++ b/docs/guide/testing.md
@@ -40,8 +40,8 @@ unsafe. Test that fact once at its owning layer; use one checked-in graph fixtur
assembly instead of rebuilding the same partial video in every higher layer.
Do not add tests merely to make every package appear covered, mirror a Manifest array, preserve a
-removed pre-release flag or database shape, or exercise documentation-only UI helpers. Package
-locks and component registration already reject Manifest/implementation drift. Obsolete tests are
+removed pre-release flag or database shape, or exercise documentation-only UI helpers. Component
+registration already rejects Manifest/implementation drift. Obsolete tests are
deleted with obsolete behavior rather than retained as project history.
## Test patterns
@@ -90,8 +90,8 @@ explicitly opt-in, use no committed secret and fail before spending money unless
| Command | What it tests | Prerequisites |
|---|---|---|
| `pnpm test:whisperx-service` | Python WhisperX service | Python 3.13, uv, frozen sync |
-| `pnpm test:image-opencv` | the shared OpenCV Raster interpreter across both request variants | `SVML_OPENCV_TESTS=1`, `SVML_OPENCV_PYTHON` |
-| `pnpm test:browser-visual` | rendered geometry, stacking and clipping in a real browser | a Chrome the HyperFrames CLI can start, `ffmpeg`, and `SVML_TEST_FONT_PATH` off macOS |
+| `pnpm test:image-opencv` | the shared OpenCV Raster interpreter across both request variants | `NARRATAGE_OPENCV_TESTS=1`, `NARRATAGE_OPENCV_PYTHON` |
+| `pnpm test:browser-visual` | rendered geometry, stacking and clipping in a real browser | a Chrome the HyperFrames CLI can start, `ffmpeg`, and `NARRATAGE_TEST_FONT_PATH` off macOS |
| `pnpm smoke:kie` | Live paid KIE generation | `KIE_API_KEY` |
## Test fixtures
diff --git a/docs/quickstart.md b/docs/quickstart.md
index b3b0ed0b..d7c8ad19 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -43,6 +43,7 @@ You need Node.js 22+ and pnpm 10.33.x through Corepack.
```bash
corepack enable
pnpm install --frozen-lockfile
+npm link
```
If `corepack` is unavailable:
@@ -52,6 +53,7 @@ npm install --global [email protected]
corepack enable
corepack prepare [email protected] --activate
pnpm install --frozen-lockfile
+npm link
```
`pnpm check` and `pnpm test` are repository-development commands. You do not need to run the full
@@ -63,18 +65,17 @@ The checked-in example includes a Script, two generated-video requests, speech a
alignment, captions, a media Track, text, Film and final rendering.
```bash
-node --run narratage -- check examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+cd examples/talking-film-graph-check
+narratage check main.svml
```
-`check` reads the self-described source, loads only its locked packages and prints the public typed
+`check` reads the self-described source, loads only its imported packages and prints the public typed
outputs it declares.
Now compile the Run Source:
```bash
-node --run narratage -- plan examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+narratage plan build.svrun
```
`plan` binds the Author Graph and Run Graph, walks backward from `final.video`, and freezes the
@@ -88,16 +89,14 @@ Open the three source files next:
## 3. Understand the project files
-A working video project normally has four authored/configured inputs and two generated locks:
+A working video project normally has four authored or configured inputs:
| File | Answers |
|---|---|
| `main.svml` | What video are you making? |
| `studio.svs` | Which reusable Recipe values does it use? |
| `build.svrun` | Which outputs and Candidates does this Run select? |
-| `svml.runtime.json` | Which machine, stores and Provider endpoints execute it? |
-| `svml.packages.lock` | Which author/compute package bytes are allowed? |
-| `svml.runtime-packages.lock` | Which privileged Runtime package bytes are allowed? |
+| `narratage.runtime.json` | Which machine, stores and Provider endpoints execute it? |
The short form is:
@@ -112,23 +111,22 @@ shots without changing the authored video.
## 4. Start your own project
-Keep project files and generated media outside the Narratage repository. Call the checkout's
-lightweight `narratage` launcher from your project directory:
+Keep project files and generated media outside the Narratage repository. The linked `narratage`
+command works from that independent project directory:
```bash
cd /path/to/my-video
-/path/to/narratage/narratage runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
-/path/to/narratage/narratage packages sync build.svrun
-/path/to/narratage/narratage plan build.svrun
+narratage plan build.svrun
```
-The launcher uses dependencies installed in the Narratage checkout while Source and exported files
-remain in your project. Runtime state and Artifacts live under the selected Profile's `dataRoot`.
-`runtime use` stores only a local pointer at `.narratage/runtime`. The Source lock belongs to the
-project; the Profile independently selects its Runtime lock. `packages sync` updates both
-inventories without removing packages needed by another Run.
+A project with `package.json` owns its installed capability packages. A plain creative folder needs
+no Node project and uses packages from the linked checkout. Source and exported files remain in the
+project. Runtime state and Artifacts live under the selected Profile's `dataRoot`.
+`runtime use` stores only a local pointer at `.narratage/runtime`. Source imports select author
+packages; the Profile independently selects Runtime packages through `use`.
Start from [`examples/talking-film-live`](https://github.com/hypit-ai/narratage/tree/main/examples/talking-film-live) when you need a
complete Runtime Profile. Copy the source structure, then replace its assets, Script, model choices
@@ -139,7 +137,7 @@ and credentials with your own.
After reviewing the plan:
```bash
-/path/to/narratage/narratage build build.svrun --follow
+narratage build build.svrun --follow
```
`build` assigns and prints a fresh Build id, stores the Build, ensures its Worker is available, and
@@ -150,11 +148,11 @@ Use `check` while editing a source. Use `doctor` to diagnose a new or broken dep
safe, but neither is required as a repetitive pre-Build ceremony.
```bash
-/path/to/narratage/narratage status <build-id>
+narratage status <build-id> --watch
-/path/to/narratage/narratage queue --watch
+narratage queue
-/path/to/narratage/narratage get <build-id> \
+narratage get <build-id> \
--name final.video \
--to output/final.mp4
```
@@ -179,10 +177,10 @@ For local Python programs:
uv python install 3.13
uv sync --project services/whisperx --frozen
uv sync --project services/image-opencv --frozen
-uv run --project services/whisperx --frozen svml-whisperx-prepare
+uv run --project services/whisperx --frozen narratage-whisperx-prepare
```
-Run `narratage doctor svml.runtime.json` after changing a Runtime Profile. It reports missing tools,
+Run `narratage doctor narratage.runtime.json` after changing a Runtime Profile. It reports missing tools,
credentials and endpoint configuration without executing the graph.
## Read next
diff --git a/docs/quickstart/composition.md b/docs/quickstart/composition.md
index 57e1ace7..07507e63 100644
--- a/docs/quickstart/composition.md
+++ b/docs/quickstart/composition.md
@@ -248,11 +248,9 @@ width and is rejected.
### Compile and verify
```bash
-node --run narratage -- check examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --workspace .
+narratage check examples/talking-film-graph-check/main.svml
-node --run narratage -- plan examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --workspace .
+narratage plan examples/talking-film-graph-check/build.svrun
```
`check` compiles the Author Graph — validates all imports, types, and graph edges without calling
diff --git a/docs/quickstart/preview.md b/docs/quickstart/preview.md
index 02dfbe43..a5669fe5 100644
--- a/docs/quickstart/preview.md
+++ b/docs/quickstart/preview.md
@@ -20,11 +20,11 @@ pnpm svml:playground -- --source examples/all-components-preview/main.svml
| --- | --- |
| `--source <main.svml>` | The Author Source to read. Required. |
| `--run <build.svrun>` | A Run Source, read for material and timings it already names. |
-| `--runtime <svml.runtime.json>` | Where material earlier Builds produced is kept. Only a Source that reuses an accepted shot through `<build-record>` needs one. |
+| `--runtime <narratage.runtime.json>` | Where material earlier Builds produced is kept. Only a Source that reuses an accepted shot through `<build-record>` needs one. |
| `--port <number>` | Defaults to `5179`. |
Both optional arguments are additive. With neither, the Playground still runs on a directory holding
-nothing but `main.svml` and its `.svs` style sheet — no package lock, no Runtime Profile, no build.
+nothing but `main.svml` and its `.svs` style sheet — no Runtime Profile and no Build.
::: tip Stop the previous server before starting another
A second Playground silently takes another port, and you end up reading a stale preview while
diff --git a/docs/quickstart/run.md b/docs/quickstart/run.md
index e4666277..8fe817b0 100644
--- a/docs/quickstart/run.md
+++ b/docs/quickstart/run.md
@@ -9,11 +9,10 @@ The Author Source defines the video. A Run Source chooses which of its public ou
which explicit Candidates, if any, should satisfy them. The Runtime Profile chooses the machine,
stores and Provider endpoints that execute the resulting plan.
-Select the project Runtime once, then synchronize package trust after package selections change:
+Select the project Runtime once:
```bash
-narratage runtime use svml.runtime.json
-narratage packages sync build.svrun
+narratage runtime use narratage.runtime.json
```
Ordinary work then follows the short path:
@@ -24,8 +23,8 @@ narratage build build.svrun --follow
narratage get <build-id> --name final.video --to output/final.mp4
```
-The checked-in source launcher is `/path/to/narratage/narratage`; commands written as `narratage`
-on this page mean that launcher or the future installed CLI.
+The Quickstart links the checkout's command once. Every command on this page then works as
+`narratage`, including from a separate video project.
Only `build` submits work. `plan` is the normal preview. `check` is an editing aid; `doctor` is a
deployment diagnostic. They are safe to run, but not mandatory ceremony before every Build.
@@ -33,7 +32,7 @@ deployment diagnostic. They are safe to run, but not mandatory ceremony before e
```text
main.svml author meaning
build.svrun this Run's Targets and Candidate choices
-svml.runtime.json execution environment
+narratage.runtime.json execution environment
```
Run Source and Runtime Profile do not silently rewrite the video. Creative model choices remain in
@@ -190,17 +189,18 @@ human-supplied result uses the same mechanism.
## Runtime Profile
-The Runtime Profile chooses where Builds execute. It selects one locked Runtime package; that package
-owns its Components, Bindings, Endpoints, limits, lifecycle and private `dataRoot`. The Profile never
-defines the Source Workspace or Source package lock.
+The Runtime Profile chooses where Builds execute. It creates named infrastructure instances from
+packages selected by logical `use` names, assigns their exported parts to Runtime roles, and
+configures Provider endpoints and capacity. It never defines the Source Workspace or Author package
+selection.
```bash
-narratage runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
narratage paths
```
`runtime use` writes only `.narratage/runtime`. It does not start a Worker, create Runtime data or
-change either package lock. See [Runtime](../guide/runtime.md) for the Profile schema and boundaries.
+change installed packages. See [Runtime](../guide/runtime.md) for the Profile schema and boundaries.
## Configure selected credentials
@@ -244,10 +244,10 @@ Keep credentials, generated media, Runtime data and logs out of commits. A proje
```bash
cd /work/my-film
-/opt/narratage/narratage runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
```
-The Workspace is the selected project, nearest Source lock or entry Source directory. Override it
+The Workspace is the selected project or entry Source directory. Override it
only with `--workspace`. `--package-root` locates installed packages and never widens Source access.
`--asset-root` grants read access to additional asset bytes without permitting Source imports there.
@@ -256,21 +256,15 @@ only with `--workspace`. `--package-root` locates installed packages and never w
output/
```
-### 1. Synchronize installed packages
-
-After installing or updating packages, synchronize the project inventories:
+### 1. Select a Runtime
```bash
cd examples/talking-head-aroll
-narratage runtime use svml.runtime.json
-narratage packages sync build.svrun
+narratage runtime use narratage.runtime.json
```
-The current Author and Run sources choose author packages. The Runtime Profile chooses environment
-packages. `packages sync` adds or refreshes those requirements in the two inventories; it never
-removes packages required by another Run. Use `lock-packages --remove` for an intentional removal.
-Compilation activates only the exact subset demanded by the current Source. The command never
-scans the project, starts a Provider or generates media.
+Author and Run Sources select their packages through imports. The Runtime Profile selects its Host,
+infrastructure and Provider packages through `use`. The installed package manager owns their versions.
### 2. Diagnose the environment
@@ -278,7 +272,7 @@ scans the project, starts a Provider or generates media.
narratage doctor
```
-Doctor validates the Runtime lock, every selected Runtime role, Endpoint configuration, credential
+Doctor validates every selected Runtime role, Endpoint configuration, credential
presence and bounded environment probes. It never starts the Worker or performs a paid request.
Doctor is intentionally a **full profile audit**. For the environment required by one Run, use
@@ -314,11 +308,19 @@ Without `--follow`, `build` returns after durable submission. The detached Worke
`--follow`, the terminal is only an observer; it reports durable phase/Operation-count changes and
interrupting it leaves the Build running.
+Attach or reattach an observer at any time:
+
+```bash
+narratage status <build-id> --watch
+```
+
+A plain `status <build-id>` prints one snapshot. `status --watch` exits at terminal state; use
+`--max-wait-ms` when a script needs a bounded wait.
+
| Flag | Description |
|---|---|
| `--runtime` | One-command Runtime Profile override; normally select it once with `runtime use` |
-| `--package-lock` | Explicit Source package lock override |
-| `--package-root` | Host directory containing the installed packages named by the lock |
+| `--package-root` | Host directory containing the installed packages |
| `--workspace` | Explicit Source Workspace override |
| `--follow` | Wait for terminal state as an observer; durable execution remains with the Worker |
diff --git a/docs/zh/guide/author-packages.md b/docs/zh/guide/author-packages.md
index 5273cf4f..b88d0e18 100644
--- a/docs/zh/guide/author-packages.md
+++ b/docs/zh/guide/author-packages.md
@@ -24,7 +24,7 @@ mkdir -p packages/my-component/src packages/my-component/test
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -50,7 +50,7 @@ export const myComponentModuleRef: ModuleRef = {
};
export const myComponentManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: myComponentModuleRef.name,
version: myComponentModuleRef.version,
dependencies: [],
@@ -103,8 +103,8 @@ import {
decodeMyComponentSurface,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: myComponentManifest,
}],
@@ -117,7 +117,7 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
```
Module 会自动提供精确的 `[email protected]`,所以作者直接导入
@@ -135,29 +135,14 @@ Module 会自动提供精确的 `[email protected]`,所以作者
pnpm 工作区链接负责解析包,不需要根路径注册表。
-## 7. 安装并锁定
+## 7. 安装
```bash
pnpm install --frozen-lockfile
-
-node --run narratage -- lock-packages <lock-file> \
- --package @narratage/my-component \
- [--package @narratage/other-direct-package ...] \
- --package-root .
-```
-
-这里只列出你直接选择的包。它们的 Manifest 声明的精确逻辑 Module 依赖,会从已安装的物理依赖闭包中自动加入;缺失、摘要不匹配或存在多个候选时,建锁会直接失败。
-
-已有锁只需增加这个直接包时,不必重写其他选择:
-
-```bash
-node --run narratage -- lock-packages <lock-file> \
- --add @narratage/my-component \
- --package-root .
```
-`--remove` 明确撤销一个直接选择,`--refresh` 在选择不变时接受当前安装字节,`--verify`
-只读验证闭包。重复的 `--package` 始终表示一份完整、精确的直接选择,而不是增量添加。
+包管理器负责安装、版本与完整性。Author 或 Run Source 导入逻辑能力时,Narratage 才会加载
+对应包;Manifest 声明的精确 Module 依赖从该包的已安装依赖中加载。
## 8. 在 Author Source 中使用
diff --git a/docs/zh/guide/caption-playground.md b/docs/zh/guide/caption-playground.md
index 5d4f65b1..56c476ae 100644
--- a/docs/zh/guide/caption-playground.md
+++ b/docs/zh/guide/caption-playground.md
@@ -11,7 +11,6 @@ Playground 直接读写普通 Build 使用的同一份 `.svml` 与 `.svs`。
```bash
pnpm caption:playground -- \
--source examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock \
--style base-caption \
--display story.caption \
--recipe examples/talking-film-graph-check/studio.svs#caption.base \
@@ -22,7 +21,7 @@ pnpm caption:playground -- \
打开 `http://localhost:5178`。
-启动命令显式选择源码、包锁、Style 导出、Display 导出、SVS Recipe、字体栈以及本地预览画布。系统没有中央组件注册表、隐藏默认样式或
+启动命令显式选择源码、Style 导出、Display 导出、SVS Recipe、字体栈以及本地预览画布。系统没有中央组件注册表、隐藏默认样式或
Playground 私有工程文件。
表单编辑的是作者语汇,例如 `size`、`padding`、`fill`,不会暴露
diff --git a/docs/zh/guide/packages.md b/docs/zh/guide/packages.md
index d475be6b..0b60f675 100644
--- a/docs/zh/guide/packages.md
+++ b/docs/zh/guide/packages.md
@@ -1,23 +1,30 @@
---
title: 包架构
-description: 五个分层、依赖边界、包的结构与 facet。
+description: 七个分层、依赖边界、包的结构与 facet。
---
# 包架构
-`packages/` 下的工作区包被组织成五个架构分层。每个包自行声明依赖。根工作区会安装完整源码树,让 Package
-Loader 能解析任意被显式锁定的包;但 TypeScript 不维护会掩盖漏依赖的中央路径别名。
+`packages/` 下的工作区包被组织成七个架构分层。每个包自行声明依赖。根工作区会安装完整源码树,让 Package
+Loader 能解析任意被显式选择的包;但 TypeScript 不维护会掩盖漏依赖的中央路径别名。
-## 五个分层
+## 七个分层
-### Layer 1:领域无关的基础层
+### Layer 1:Narratage Core
-这些包实现图语言、Build 状态机、编译器基础设施和 Runtime 端口。它们可以被任意领域复用 —— 不只是视频 —— 并且不依赖 Text、Script、Seedance、Film 或任何视频概念。
+不可变图协议、需求编译器与 Build 状态机。这个闭包与领域无关,不认识源码语法、文件、网络、模型或视频。
```text
@narratage/protocol immutable wire contracts
-@narratage/artifact domain-neutral content-addressed byte type
@narratage/core Demand compiler and Build state machine
+```
+
+### Layer 2:Compiler
+
+负责 Source 发现、Frontend、导入、图展开与参考 Node Host。Source 在强制 Header 中选择自己的
+Frontend;不存在一个认识全部语法的中央解析器。
+
+```text
@narratage/source mandatory Source Header
@narratage/elaborator author declarations and Fragment expansion
@narratage/run syntax-neutral Run Graph
@@ -26,47 +33,40 @@ Loader 能解析任意被显式锁定的包;但 TypeScript 不维护会掩盖
@narratage/workspace replaceable Source/Asset session
@narratage/compiler-node reference Node compiler Host
@narratage/workspace-fs-node workspace filesystem abstraction
-@narratage/component-kit Producer/validator registration
-@narratage/runtime Scheduler and Store ports
-@narratage/runtime-adapter deployment-adapter ABI
-@narratage/runtime-adapter-node project-root resolution
-@narratage/endpoint-kit Endpoint registration
-@narratage/driver-node trusted Node command executor
-@narratage/package-loader-node byte-locked package loading
-@narratage/store-sqlite SQLite Build/Operation stores
-@narratage/artifact-store-fs filesystem Artifact store
-@narratage/artifact-store-s3 S3 Artifact store
-@narratage/credential-store-env environment credentials
-@narratage/credential-store-keychain macOS Keychain credentials
-@narratage/transport invocation seams
-@narratage/transport-aws-lambda Lambda transport
-@narratage/local SQLite/filesystem developer assembly
-```
-
-### Layer 2:作者语言层
-
-面向作者的词汇:Markup Frontend、Script Surface、SVS Recipe、Run Markup Frontend,以及可复用的确定性文字编译。
-
-```text
+@narratage/package-loader-node installed package selection
@narratage/markup official .svml Markup Frontend
-@narratage/script Script Surface
@narratage/svs SVS Recipe Frontend
@narratage/run-markup official .svrun Markup Frontend
-@narratage/text 图原生文字值、模板和确定性渲染
@narratage/compiler-markup-node Markup Frontend + Surface Host assembly
```
-`@narratage/text` 的语义与领域无关,只是位于作者语言层。它输出的普通 `Text` 可以进入模型端口,
-也可以进入可见的视频组件。消费者依赖 Text 窄腰;Text 绝不会反向依赖 Typography、Ranking、
-Sticker、Deck 或任何模型家族。
+### Layer 3:Foundations
-### Layer 3:视频领域层
+可复用的数据与确定性构件。它们支撑视频创作,但不决定成片的创作结构,也不调用外部服务。
-视频专属类型、生成模型族、语音/字幕/轨道契约以及合成。依赖 Layer 1 和 Layer 2,但不依赖任何 Provider。
+```text
+@narratage/artifact 内容寻址字节
+@narratage/component-kit Producer 与 Validator 注册
+@narratage/text 图原生文字模板
+@narratage/media 媒体值
+@narratage/temporal Selection 与 Moment 投影
+@narratage/spatial 布局几何
+@narratage/visual-ir 渲染器无关的视觉词汇
+@narratage/fonts-open 可分发字体资产
+@narratage/media-pipeline 媒体探测与规范化
+@narratage/media-execution 共享 ffmpeg 执行体
+@narratage/transport 调用边界
+@narratage/transport-aws-lambda Lambda transport
+```
+
+### Layer 4:Video authoring
+
+赋予 SVML 视频词汇的包:稿件、精确模型需求、语音、字幕、平级 Track、Film 与渲染声明。
+它们依赖公共合同,但不依赖某个具体 Provider 部署。
```text
-@narratage/media media types
@narratage/narrative authored narrative products
+@narratage/script Script Surface
@narratage/program-space exact frame/sample domain
@narratage/generation 图像/视频/音频生成合同
@narratage/model-kit model family abstractions
@@ -87,12 +87,9 @@ Sticker、Deck 或任何模型家族。
@narratage/speech-alignment speech alignment
@narratage/speech-spine ordered speech-take compilation
@narratage/whisperx WhisperX component
-@narratage/temporal Selection/Moment 投影与调度
-@narratage/spatial Canvas/Frame/Point/Path 几何
@narratage/caption caption planning and timing
@narratage/caption-gemini Gemini caption planner
@narratage/caption-fine 无字段细粒度字幕 Track family
-@narratage/fonts-open exact redistributable font catalog
@narratage/media-track 统一的 Media Item/Sequence Track
@narratage/typography-track typography overlay Track
@narratage/audio-track arbitrary sample-domain Audio Track
@@ -101,18 +98,15 @@ Sticker、Deck 或任何模型家族。
@narratage/screen-overlay self-contained full-canvas overlays
@narratage/film Film composition
@narratage/composition peer Track composition
-@narratage/visual-ir renderer-neutral visual vocabulary
@narratage/hyperframes HyperFrames document compiler
@narratage/render-hyperframes explicit HyperFrames rendering component
@narratage/image-transform image processing component
@narratage/image-compose 有序静态图像合成
@narratage/raster 共享确定性光栅执行合同
@narratage/background-removal 外部图像去背景能力
-@narratage/media-pipeline media inspection/normalization
-@narratage/media-execution shared ffmpeg execution body for Providers
```
-### Layer 4:Provider(Endpoint)包
+### Layer 5:Providers
具备特权的外部能力。依赖 Runtime 端口与共享能力词汇,不依赖精确模型包,也绝不依赖 CLI。
@@ -128,7 +122,26 @@ Sticker、Deck 或任何模型家族。
@narratage/provider-xiaomi-mimo Xiaomi 官方 MiMo TTS API
```
-### Layer 5:应用层
+### Layer 6:Runtime
+
+领域无关的执行端口与可替换部署实现。Runtime 包负责队列、租约、Store、凭据与进程生命周期,
+但不定义作者语法。
+
+```text
+@narratage/runtime Scheduler、Worker 与 Store 端口
+@narratage/endpoint-kit Endpoint 声明
+@narratage/driver-node 可信 Node Command 执行器
+@narratage/runtime-kit 部署包 ABI
+@narratage/runtime-host-node Node Runtime Host ABI
+@narratage/runtime-local 本地 Worker 与组装
+@narratage/store-sqlite SQLite 状态
+@narratage/artifact-store-fs 文件系统 Artifact
+@narratage/artifact-store-s3 S3 Artifact
+@narratage/credential-store-env 环境变量凭据
+@narratage/credential-store-keychain macOS Keychain 凭据
+```
+
+### Layer 7:Applications
```text
@narratage/cli generic command engine (requires explicit Distribution)
@@ -141,9 +154,10 @@ Sticker、Deck 或任何模型家族。
1. **无环的生产依赖图。** 任何 `@narratage/*` 包之间都不存在依赖环。
-2. **领域无关闭包。** 每个 Layer 1 包的传递闭包只包含 Layer 1 的包。`@narratage/core` 只依赖 `@narratage/protocol`。
+2. **领域无关 Core 闭包。** Layer 1 只有 `protocol` 与 `core`,且 `core` 只依赖 `protocol`。
+ Compiler 与 Runtime 也可以领域无关,但它们不属于 Core。
-3. **CLI 独立性。** `@narratage/cli` 和 `@narratage/video-cli` 都不会传递依赖任何 Provider 包。video CLI 同样不依赖任何作者层的视频包(`@narratage/script`、`@narratage/seedance`、`@narratage/media-track`、`@narratage/typography-track`、`@narratage/film`)。作者包通过显式的 package lock 被 activate,而不是通过编译期的 CLI 依赖。这些规则直接体现在 package manifest 中并接受架构审查,不再用源码文本正则来近似证明。
+3. **CLI 独立性。** `@narratage/cli` 和 `@narratage/video-cli` 都不会传递依赖任何 Provider 包。video CLI 同样不依赖任何作者层的视频包(`@narratage/script`、`@narratage/seedance`、`@narratage/media-track`、`@narratage/typography-track`、`@narratage/film`)。Source import 按需激活作者包,Runtime Profile 的逻辑 `use` 名称按需激活运行包;两者都不是 CLI 的编译期依赖。
## 包的结构
@@ -170,7 +184,7 @@ packages/example/
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -180,8 +194,8 @@ packages/example/
```
- `"exports"` 在开发期间直接指向 TypeScript 源码。pnpm 工作区链接根据导入包自身声明的依赖解析 `@narratage/*`。
-- `"svml.activation"` 是该包被 byte-locked 时 Package Loader 会读取的入口。它必须默认导出一个 `NodePackageContribution`。
-- 物理包版本在真正发布前保持 `0.0.0-dev`。Module 与 Frontend manifest 使用相互独立的逻辑协议版本 `1`;精确的实现身份由 lock 摘要确定。
+- `"narratage.activation"` 是该包被选择时 Package Loader 会读取的入口。它必须默认导出一个 `NodePackageContribution`。
+- 物理包版本在真正发布前保持 `0.0.0-dev`。Module 与 Frontend manifest 使用相互独立的逻辑协议版本 `1`。
### activation.ts
@@ -197,45 +211,29 @@ packages/example/
| `author` | Frontend、Surface、Graph Fragment | 仅作者词汇 | 源码中的 `<import>`,经由编译器 Host |
| `compute` | 确定性 Producer、Type Validator | 纯计算 | 编译器 Host |
| `endpoint` | 具备特权的外部能力 | 网络、文件系统、进程、凭据 | Runtime Profile |
-| `runtime` | Scheduler、Store 实现 | 持久化、调度 | Runtime Profile |
+| `infrastructure` | Scheduler、Worker 与 Store 实现 | 持久化、调度 | Runtime Profile |
源码中的 `<import>` 只会 activate author facet。它绝不授予网络、文件系统、进程、凭据或队列权限。
-## 包锁定
-
-SVML 使用按字节锁定的受信任代码执行。加载器会记录每个包的名称、版本和 SHA-256 摘要:
-
-```json
-{
- "format": "svml.node-package-lock@1",
- "artifacts": [
- {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev",
- "digest": "sha256:abc123..."
- }
- ]
-}
-```
+## 包选择
-两个相互独立的包库存服务于不同的信任范围:
+Narratage 不维护中央包注册表,也不维护自定义包锁。npm 或 pnpm 负责安装、版本与字节完整性。
+系统只有两条显式选择路径:
-| Lock 文件 | 包含内容 | 身份范围 |
-|---|---|---|
-| `svml.packages.lock` | Frontend、Surface、Producer、Validator | Author Graph + Run Graph + 执行 Program Closure |
-| `svml.runtime-packages.lock` | Provider、Store、transport | Runtime Closure |
+| 选择来源 | 被激活的包 |
+|---|---|
+| Source import | Frontend、Surface、Producer、Validator |
+| Runtime Profile 的 `use` | Runtime Host、基础设施与 Provider Endpoint |
-`packages sync` 只增长或刷新库存,不会删除其他 Run 的根包。每次编译只激活当前 Source
-请求的精确子集,并把该子集摘要绑定进 Build;Runtime adapter 同样只激活 Profile 声明的
-精确子集。包字节改变后必须显式刷新库存。
+Source import 绝不授予网络、文件系统、进程、凭据或队列权限;这些权限只属于 Runtime
+Profile 显式选择的包。
### 逻辑包地址与 Source 发现
-Source 写的是逻辑语言能力,不是 npm 位置。项目库存通过 `(Host ABI, 逻辑名)` 这对地址,
-把逻辑能力绑定到一个按字节锁定的物理包。因此 Module 与 Run Fragment 可以故意使用同一
-个名字而不会变成同一种能力;一个物理包也可以提供多个逻辑名字。
+Source 写的是逻辑语言能力。逻辑名按约定直接对应已安装的 npm 包名;Host ABI 仍让 Module
+与 Run Fragment 可以使用同一名字而不混为一种能力,一个物理包也可以提供多个逻辑名字。
-编译首先只读取强制 Source Header,从可信库存解析对应 Frontend,调用该 Frontend 自己的
+编译首先只读取强制 Source Header,从已安装包解析对应 Frontend,调用该 Frontend 自己的
`discover()`,继续解析它报告的 Module、Run Fragment 与子 Source,直到本次需要的精确包
子集不再增长,然后才开始语义解码。Markup 是 video Distribution 的启动 Frontend;除此
之外,Script、SVS、Run Markup 和第三方 Frontend 都走同一套发现协议,包选择器不再含有
@@ -243,13 +241,12 @@ Source 写的是逻辑语言能力,不是 npm 位置。项目库存通过 `(Ho
Frontend 实现不是物理包格式里的特权字段。它们与 Run Fragment、Markup Surface、Runtime
Adapter 一样,通过自己的 Host ABI 发布普通 facet;Frontend 使用
-`svml.source-frontend@1`,只有 Source Host 会解释它。
+`narratage.source-frontend@1`,只有 Source Host 会解释它。
Runtime Profile 也遵循同一规则。每个 `use` 选择的是 Runtime Host、Endpoint Adapter 或 Runtime
-Component Adapter ABI 加逻辑名;物理 npm 包只负责声明它提供这个逻辑能力。包名只是首次纳入库存的提示
-和 lockfile 事实,通用 CLI 不维护 Provider 注册表;同名的 Endpoint Adapter 与 Runtime
-Component Adapter 也不会互相冲突。
+Infrastructure ABI 加逻辑名;物理 npm 包只负责声明它提供这个逻辑能力。通用 CLI 不维护
+Provider 注册表;同名的 Endpoint Adapter 与 Runtime
+Infrastructure Adapter 也不会互相冲突。
-逻辑名与物理 npm 包根同名时,`packages sync` 可以直接完成首次纳入。若一个物理合集包
-使用不同名字,开发者需先把它显式加入项目库存;此后 Source 仍只依赖逻辑名。系统绝不会
-仅因为 Source Header 写出了某个名字,就下载或执行一份尚未受信任的代码。
+加载器不会下载包,也不会扫描无关依赖来寻找插件。它只加载 Source 或 Runtime Profile
+明确选择的包,以及这些包 Manifest 精确声明的 Module 依赖。
diff --git a/docs/zh/guide/providers.md b/docs/zh/guide/providers.md
index b5c01845..ecb5ba25 100644
--- a/docs/zh/guide/providers.md
+++ b/docs/zh/guide/providers.md
@@ -28,13 +28,13 @@ Provider 包依赖 Runtime 端口与共享能力词汇,不依赖精确模型
"exports": {
".": "./src/index.ts"
},
- "svml": { "activation": "./src/activation.ts" },
+ "narratage": { "activation": "./src/activation.ts" },
"dependencies": {
"@narratage/endpoint-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"@narratage/generation": "workspace:*"
}
}
@@ -46,18 +46,29 @@ Provider 处理来自 Scheduler 的 Command:提交请求、轮询、下载以
```typescript
// src/provider.ts
-import type { EndpointManifest } from "@narratage/endpoint-kit";
+import { defineEndpointPackage } from "@narratage/endpoint-kit";
export function createMyServiceProvider(options: {
instance: string;
- authority?: string;
+ pool: string;
apiKey: CredentialRef;
defaultConcurrency?: number;
}) {
- // 返回一个包含以下内容的对象:
- // - manifest:声明该 Endpoint 实现的 Capability
- // - handle:处理来自 Scheduler 的 Command
- // - close:清理
+ return defineEndpointPackage({
+ module: { name: "@narratage/provider-my-service", version: "1" },
+ facet: "service",
+ instance: options.instance,
+ pool: options.pool,
+ credentials: { apiKey: options.apiKey },
+ defaultConcurrency: options.defaultConcurrency ?? 2,
+ capabilities: [{
+ capability: myCapability,
+ returns: myResultType,
+ lane: "generate",
+ lifecycle: "recoverable",
+ endpoint: myRecoverableEndpoint,
+ }],
+ });
}
```
@@ -80,13 +91,14 @@ import {
runtimeConfigExact,
runtimeConfigObject,
runtimeConfigPositiveInteger,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createMyServiceProvider } from "./provider.js";
const adapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-my-service",
activate(context) {
+ if (context.pool === undefined) throw new Error("MyService pool is required");
const config = runtimeConfigObject(context.config, "MyService");
runtimeConfigExact(config, ["apiKey", "defaultConcurrency"], "MyService");
const apiKey = runtimeConfigCredentialRef(config.apiKey, "MyService apiKey");
@@ -95,7 +107,7 @@ const adapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createMyServiceProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
apiKey,
...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),
}),
@@ -103,12 +115,12 @@ const adapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [adapter],
};
-export default svmlPackage;
+export default narratagePackage;
```
`activate` 是唯一的纯部署声明。它返回的 Endpoint 同时拥有供 `doctor` 与执行使用的凭据引用、
@@ -122,13 +134,13 @@ manifest 开关,也没有中央 Program 注册表:
```typescript
// src/program.ts
-import type { ManagedProgram } from "@narratage/runtime-adapter";
+import type { ManagedProgram } from "@narratage/runtime-kit";
export function createMyProgram(): ManagedProgram {
return {
id: "my-service",
prepare: { command: "uv", args: ["sync", "--project", "services/my-service", "--frozen"] },
- start: { command: "uv", args: ["run", "--project", "services/my-service", "--frozen", "svml-my-service"] },
+ start: { command: "uv", args: ["run", "--project", "services/my-service", "--frozen", "narratage-my-service"] },
probe: async () => {
// 返回 { state: "ready" } 或 { state: "down", detail: "..." }
},
@@ -159,42 +171,33 @@ const adapter = createRuntimeEndpointAdapterFacet({
```json
"dependencies": {
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
}
```
-锁定进 Runtime 包锁文件:
+用项目的包管理器安装它。Runtime Profile 用 `use` 显式实例化之前,这个包始终不会运行。
-```bash
-node --run narratage -- lock-packages <runtime-lock> \
- --package @narratage/provider-my-service \
- --package-root .
-```
-
-如果 Runtime 包锁已经存在,改用 `--add @narratage/provider-my-service`。这一步只改变本地信任选择;在 Runtime Profile 用 `use` 显式实例化之前,这个包仍然不会运行。
-
-## 7. 在 svml.runtime.json 中引用
+## 7. 在 narratage.runtime.json 中引用
```json
{
- "endpoints": [
- {
+ "endpoints": {
+ "my-service": {
"use": "@narratage/provider-my-service",
- "instance": "my-service.project",
- "authority": "my-service.project",
+ "pool": "my-service.account",
"config": {
"apiKey": { "store": "keychain", "key": "my-service.api-key" },
"defaultConcurrency": 2
}
}
- ]
+ }
}
```
验证配置:
```bash
-node --run narratage -- doctor svml.runtime.json
+narratage doctor narratage.runtime.json
```
## 可供研究的现有 Provider
diff --git a/docs/zh/guide/runtime.md b/docs/zh/guide/runtime.md
index c8cbc111..f70ee0b0 100644
--- a/docs/zh/guide/runtime.md
+++ b/docs/zh/guide/runtime.md
@@ -32,40 +32,37 @@ Profile 选择一个 Runtime 包,并把封闭配置交给它:
```json
{
"format": "narratage.runtime-profile@1",
- "runtimePackageLock": "./svml.runtime-packages.lock",
"runtime": {
- "use": "@narratage/local",
+ "use": "@narratage/runtime-local",
"config": {
"dataRoot": ".narratage/runtimes/local",
- "components": {
- "execution": { "use": "@narratage/local" },
+ "infrastructure": {
+ "execution": { "use": "@narratage/runtime-local" },
"state": { "use": "@narratage/store-sqlite", "config": { "path": "state.sqlite" } },
"artifacts": { "use": "@narratage/artifact-store-fs", "config": { "path": "artifacts" } }
},
- "bindings": {
- "scheduler": "execution.scheduler",
- "worker": "execution.worker",
- "stores": {
- "build": "state.builds",
- "operations": "state.operations",
- "dispatch": "state.dispatch",
- "artifacts": "artifacts",
- "credentials": []
- }
+ "roles": {
+ "scheduler": { "from": "execution", "part": "scheduler" },
+ "worker": { "from": "execution", "part": "worker" },
+ "buildStore": { "from": "state", "part": "builds" },
+ "operationStore": { "from": "state", "part": "operations" },
+ "dispatchStore": { "from": "state", "part": "dispatch" },
+ "artifactStore": { "from": "artifacts", "part": "store" },
+ "credentialStores": []
},
"endpoints": {
"media": { "use": "@narratage/provider-media-local" }
},
- "limits": { "maxOperations": 4 }
+ "capacity": { "maxActiveOperations": 4 }
}
}
}
```
-`components` 配置可替换的 Runtime 基础设施,`bindings` 选择每个角色的确切实例,`endpoints`
-配置能力实现,`limits` 限制整个 Runtime。安装包只增加可用实现,不会自动激活或改变 Core。
+`infrastructure` 创建具名的包实例,`roles` 显式选择实例提供的 part,`endpoints`
+配置外部能力实现,`capacity` 限制整个 Runtime。安装包只增加可用实现,不会自动激活或改变 Core。
-Profile 不包含 Source Workspace、Source package lock 或 Author 包选择。相对 Profile 路径从
+Profile 不包含 Source Workspace 或 Author 包选择。相对 Profile 路径从
Profile 文件解析;本地 Runtime 的私有路径从 `dataRoot` 解析。
## 项目状态与路径
@@ -83,16 +80,25 @@ Profile 文件解析;本地 Runtime 的私有路径从 `dataRoot` 解析。
`runtime use` 只写 `.narratage/runtime` 指针,不启动进程。`check` 和 `plan` 不创建 Runtime 数据。
`narratage paths` 会报告 Workspace、项目状态、Runtime 数据与操作系统级 Host 状态的位置。
-Workspace 独立按以下顺序确定:显式 `--workspace`、所选 `.narratage/runtime` 所在项目、最近的
-Source package lock、入口 Source 目录。Runtime Profile 无权扩大它。
+Workspace 独立按以下顺序确定:显式 `--workspace`、所选 `.narratage/runtime` 所在项目、入口
+Source 目录。Runtime Profile 无权扩大它。
-## Component、Endpoint 与 Managed Program
+## Package、instance、part 与 role
-Runtime Component 是 Scheduler、Worker、Store 等基础设施实现。Binding 明确选择一个实例,包的
-存在本身不具备路由权。Endpoint 实现声明过的 Capability,并负责 Provider 调用。
+Runtime 包是已安装代码;`infrastructure` 中的一项创建一个带配置的 instance。一个 instance
+可以公开多个内聚的 part。例如 `@narratage/store-sqlite` 的 `state` instance 从同一个数据库公开
+`builds`、`operations` 和 `dispatch`。role 通过 `{ from, part }` 精确选择其中一个:
-Managed Program 是 Endpoint 声明的长期外部进程,例如常驻 WhisperX 服务。它不是 Component,
-也不是队列。Endpoint 可以声明探测、准备和启动方法;外部托管时只声明探测。
+```json
+"buildStore": { "from": "state", "part": "builds" }
+```
+
+`from` 只指向 Profile 中的 instance,`part` 只由该包声明。Host 验证这个 part 是否实现所选 role;
+没有中央注册表认识 SQLite,也不会拆解点号字符串来猜归属。Endpoint 则实现声明过的 Capability,
+并负责 Provider 调用。
+
+Managed Program 是 Endpoint 声明的长期外部进程,例如常驻 WhisperX 服务。它不是 Runtime
+infrastructure,也不是队列。Endpoint 可以声明探测、准备和启动方法;外部托管时只声明探测。
```bash
narratage programs status
@@ -106,7 +112,7 @@ Worker 不会自动停止可能被共享的 Program。
## 生命周期
```bash
-narratage runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
narratage runtime up
narratage runtime status
narratage runtime logs
diff --git a/docs/zh/guide/testing.md b/docs/zh/guide/testing.md
index 4659a8b2..7619ebc0 100644
--- a/docs/zh/guide/testing.md
+++ b/docs/zh/guide/testing.md
@@ -35,7 +35,7 @@ describe("someFunction", () => {
默认测试集只保留三类测试:可观察合同、架构边界,以及可能破坏产物、重复付费调用或让运行环境不安全的失败模式。同一事实只在其归属层测试一次;跨包装配使用一个已提交的完整图夹具,不在每个上层重复搭建半条视频链路。
-不要为了让每个包看起来都有覆盖率而写测试,也不要重复比对 Manifest 数组、保留已经删除的预发布参数或数据库形态、把纯文档 UI helper 塞进系统测试。包锁和组件注册本身已经会拒绝 Manifest 与实现漂移。过时行为删除时,其测试也一起删除,不把测试集当作项目历史档案。
+不要为了让每个包看起来都有覆盖率而写测试,也不要重复比对 Manifest 数组、保留已经删除的预发布参数或数据库形态、把纯文档 UI helper 塞进系统测试。组件注册本身会拒绝 Manifest 与实现漂移。过时行为删除时,其测试也一起删除,不把测试集当作项目历史档案。
## 测试模式
@@ -79,8 +79,8 @@ test("generates a video", async (t) => {
| 命令 | 测试内容 | 前置条件 |
|---|---|---|
| `pnpm test:whisperx-service` | Python WhisperX 服务 | Python 3.13、uv、frozen sync |
-| `pnpm test:image-opencv` | OpenCV 图像变换 | `SVML_OPENCV_TESTS=1`、`SVML_OPENCV_PYTHON` |
-| `pnpm test:browser-visual` | 真实浏览器中的渲染几何、层叠与裁剪 | HyperFrames CLI 能启动的 Chrome、`ffmpeg`;非 macOS 还需 `SVML_TEST_FONT_PATH` |
+| `pnpm test:image-opencv` | OpenCV 图像变换 | `NARRATAGE_OPENCV_TESTS=1`、`NARRATAGE_OPENCV_PYTHON` |
+| `pnpm test:browser-visual` | 真实浏览器中的渲染几何、层叠与裁剪 | HyperFrames CLI 能启动的 Chrome、`ffmpeg`;非 macOS 还需 `NARRATAGE_TEST_FONT_PATH` |
| `pnpm smoke:kie` | 实时付费的 KIE 生成 | `KIE_API_KEY` |
## 测试 fixtures
diff --git a/docs/zh/quickstart.md b/docs/zh/quickstart.md
index 6db88e77..b3d86732 100644
--- a/docs/zh/quickstart.md
+++ b/docs/zh/quickstart.md
@@ -41,6 +41,7 @@ cd narratage
```bash
corepack enable
pnpm install --frozen-lockfile
+npm link
```
如果系统没有 `corepack`:
@@ -50,6 +51,7 @@ npm install --global [email protected]
corepack enable
corepack prepare [email protected] --activate
pnpm install --frozen-lockfile
+npm link
```
`pnpm check` 和 `pnpm test` 是修改 Narratage 本身时使用的整仓检查。第一次使用 CLI
@@ -61,17 +63,16 @@ pnpm install --frozen-lockfile
文字、Film 与最终渲染。
```bash
-node --run narratage -- check examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+cd examples/talking-film-graph-check
+narratage check main.svml
```
-`check` 会读取自描述的源码,只加载锁中允许的包,并列出这份 Author Source 声明的公共类型化输出。
+`check` 会读取自描述的源码,只加载源码导入的包,并列出这份 Author Source 声明的公共类型化输出。
接着编译 Run Source:
```bash
-node --run narratage -- plan examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock
+narratage plan build.svrun
```
`plan` 会连接 Author Graph 和 Run Graph,从 `final.video` 反向找到真正需要的子图,冻结将要使用的
@@ -85,16 +86,14 @@ Operations 与外部 Needs。它绝不会启动 Provider。
## 3. 认识项目里的文件
-一个实际视频项目通常有四份由人编写或配置的输入,以及两份自动生成的锁:
+一个实际视频项目通常有四份由人编写或配置的输入:
| 文件 | 回答的问题 |
|---|---|
| `main.svml` | 要做的是什么视频? |
| `studio.svs` | 使用哪些可复用的 Recipe 值? |
| `build.svrun` | 这一次 Run 要哪些输出、选择哪些 Candidate? |
-| `svml.runtime.json` | 在哪台机器、哪些 Store 和 Provider Endpoint 上执行? |
-| `svml.packages.lock` | 允许使用哪些 Author/Compute 包字节? |
-| `svml.runtime-packages.lock` | 允许使用哪些特权 Runtime 包字节? |
+| `narratage.runtime.json` | 在哪台机器、哪些 Store 和 Provider Endpoint 上执行? |
最短的记法是:
@@ -109,21 +108,21 @@ Runtime Profile 说明在哪里做。
## 4. 建立自己的项目
-把视频项目和生成产物放在 Narratage 仓库之外。在项目目录里直接调用源码仓库提供的轻量启动器:
+把视频项目和生成产物放在 Narratage 仓库之外。完成上面的链接后,可以在独立项目目录里直接使用
+`narratage`:
```bash
cd /path/to/my-video
-/path/to/narratage/narratage runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
-/path/to/narratage/narratage packages sync build.svrun
-/path/to/narratage/narratage plan build.svrun
+narratage plan build.svrun
```
-启动器使用 Narratage 仓库已经安装好的依赖,Source 与导出的文件留在项目里;Runtime 状态与
-Artifact 位于所选 Profile 的 `dataRoot`。`runtime use` 只在 `.narratage/runtime` 保存一个本地指针。
-Source lock 属于项目,Profile 独立选择 Runtime lock。`packages sync` 根据两项选择更新库存,
-不会删除其他 Run 需要的包。
+含有 `package.json` 的项目负责自己的能力包安装;普通创作文件夹不需要成为 Node 项目,直接使用
+链接仓库里的包。Source 与导出的文件留在项目里,Runtime 状态与 Artifact 位于所选 Profile 的
+`dataRoot`。`runtime use` 只在 `.narratage/runtime` 保存一个本地指针。Source import 选择作者包,
+Profile 则通过 `use` 独立选择 Runtime 包。
需要完整 Runtime Profile 时,从
[`examples/talking-film-live`](https://github.com/hypit-ai/narratage/tree/main/examples/talking-film-live) 的结构开始:复制文件结构,
@@ -134,7 +133,7 @@ Source lock 属于项目,Profile 独立选择 Runtime lock。`packages sync`
检查并确认计划之后:
```bash
-/path/to/narratage/narratage build build.svrun --follow
+narratage build build.svrun --follow
```
`build` 会自动分配并打印一个新的 Build id、持久化这次 Build、确保对应 Worker 可用,并只启动
@@ -144,11 +143,11 @@ Source lock 属于项目,Profile 独立选择 Runtime lock。`packages sync`
Build 前必须重复的仪式。
```bash
-/path/to/narratage/narratage status <build-id>
+narratage status <build-id> --watch
-/path/to/narratage/narratage queue --watch
+narratage queue
-/path/to/narratage/narratage get <build-id> \
+narratage get <build-id> \
--name final.video \
--to output/final.mp4
```
@@ -173,10 +172,10 @@ Runtime 会归档所有已经接受的中间 Record 和媒体。`get` 只负责
uv python install 3.13
uv sync --project services/whisperx --frozen
uv sync --project services/image-opencv --frozen
-uv run --project services/whisperx --frozen svml-whisperx-prepare
+uv run --project services/whisperx --frozen narratage-whisperx-prepare
```
-修改 Runtime Profile 后运行 `narratage doctor svml.runtime.json`。它会报告缺少的工具、凭据和
+修改 Runtime Profile 后运行 `narratage doctor narratage.runtime.json`。它会报告缺少的工具、凭据和
Endpoint 配置,但不会执行作者图。
## 接下来读什么
diff --git a/docs/zh/quickstart/composition.md b/docs/zh/quickstart/composition.md
index 05d09125..ebb7109c 100644
--- a/docs/zh/quickstart/composition.md
+++ b/docs/zh/quickstart/composition.md
@@ -242,11 +242,9 @@ Build Target,也可以直接接到媒体裁切、音频/帧提取或模型参
### 编译与验证
```bash
-node --run narratage -- check examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --workspace .
+narratage check examples/talking-film-graph-check/main.svml
-node --run narratage -- plan examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --workspace .
+narratage plan examples/talking-film-graph-check/build.svrun
```
`check` 编译 Author Graph——验证所有导入、类型和图的边,而不调用任何外部服务。`plan`
diff --git a/docs/zh/quickstart/preview.md b/docs/zh/quickstart/preview.md
index b3e3d0dd..fa2d1df6 100644
--- a/docs/zh/quickstart/preview.md
+++ b/docs/zh/quickstart/preview.md
@@ -18,10 +18,10 @@ pnpm svml:playground -- --source examples/all-components-preview/main.svml
| --- | --- |
| `--source <main.svml>` | 要读取的 Author Source。必填。 |
| `--run <build.svrun>` | 一个 Run Source,从中读取它已经指名的素材与时序。 |
-| `--runtime <svml.runtime.json>` | 早先 Build 产出的素材存放在哪里。只有通过 `<build-record>` 复用已接受镜头的 Source 才需要。 |
+| `--runtime <narratage.runtime.json>` | 早先 Build 产出的素材存放在哪里。只有通过 `<build-record>` 复用已接受镜头的 Source 才需要。 |
| `--port <number>` | 默认 `5179`。 |
-两个可选参数是叠加的。两个都不给时,Playground 依然能在一个只有 `main.svml` 和 `.svs` 样式表的目录上运行——不需要包锁、不需要 Runtime Profile、不需要任何构建。
+两个可选参数是叠加的。两个都不给时,Playground 依然能在一个只有 `main.svml` 和 `.svs` 样式表的目录上运行,不需要 Runtime Profile 或已有 Build。
::: tip 启动新服务前先停掉上一个
第二个 Playground 会悄悄占用另一个端口,于是你一边读着过期的预览,一边描述着新的改动。先把旧的停掉:
diff --git a/docs/zh/quickstart/run.md b/docs/zh/quickstart/run.md
index 1caadb4c..af0f72cd 100644
--- a/docs/zh/quickstart/run.md
+++ b/docs/zh/quickstart/run.md
@@ -7,11 +7,10 @@ description: 声明 Build 目标、复用结果以及配置运行时环境。
Author Source 定义视频本身。Run Source 从中挑选要产出哪些公开输出,以及是否用明确的 Candidate 来满足它们。Runtime Profile 则选择执行这份计划的机器、Store 与 Provider endpoint。
-先为项目选择一次 Runtime;之后只在包选择变化时同步包信任:
+先为项目选择一次 Runtime:
```bash
-narratage runtime use svml.runtime.json
-narratage packages sync build.svrun
+narratage runtime use narratage.runtime.json
```
日常制作只需要这条短路径:
@@ -22,14 +21,14 @@ narratage build build.svrun --follow
narratage get <build-id> --name final.video --to output/final.mp4
```
-仓库内的源码启动器是 `/path/to/narratage/narratage`;本页写作 `narratage` 的命令,指的是这个启动器,或将来安装好的 CLI。
+快速开始只需链接一次仓库命令。此后本页所有命令都直接写作 `narratage`,在仓库外的视频项目中也一样。
只有 `build` 会真正提交工作。`plan` 是普通预览;`check` 用于编辑源码,`doctor` 用于配置和排查部署。它们都安全,但不是每次 Build 前必须重复的仪式。
```text
main.svml 作者意图
build.svrun 本次 Run 的 Target 与 Candidate 选择
-svml.runtime.json 执行环境
+narratage.runtime.json 执行环境
```
Run Source 与 Runtime Profile 不会悄悄改写视频。创作性的模型选择仍然留在 Author Source,或它显式导入的包里。
@@ -167,17 +166,17 @@ Core 不再给 Candidate 标注 `exact` 或 `substitute`。选择 Candidate 本
## Runtime Profile
-Runtime Profile 选择 Build 在哪里执行。它选择一个锁定的 Runtime 包;该包拥有自己的
-Component、Binding、Endpoint、并发限制、生命周期和私有 `dataRoot`。Profile 不定义
-Source Workspace,也不包含 Source package lock。
+Runtime Profile 选择 Build 在哪里执行。它通过逻辑 `use` 名称选择包、创建具名
+Infrastructure 实例,再把实例暴露的 part 分配给 Runtime role,并配置 Provider endpoint 与
+容量。Profile 不定义 Source Workspace 或 Author 包选择。
```bash
-narratage runtime use svml.runtime.json
+narratage runtime use narratage.runtime.json
narratage paths
```
-`runtime use` 只写入 `.narratage/runtime`,不会启动 Worker、创建 Runtime 数据或修改任何
-package lock。Profile 结构和完整边界见 [Runtime](../guide/runtime.md)。
+`runtime use` 只写入 `.narratage/runtime`,不会启动 Worker、创建 Runtime 数据或修改已安装
+包。Profile 结构和完整边界见 [Runtime](../guide/runtime.md)。
## 配置所选凭据
`check` 与 `plan` 不会请求在线 Provider,因此不需要 API key。在运行 `doctor` 或付费/外部
@@ -237,13 +236,12 @@ Worker。
```bash
cd /work/my-film
-/opt/narratage/narratage runtime use svml.runtime.json
-/opt/narratage/narratage packages sync build.svrun
-/opt/narratage/narratage plan build.svrun
+narratage runtime use narratage.runtime.json
+narratage plan build.svrun
```
-Workspace 依次取显式 `--workspace`、所选 `.narratage/runtime` 所在项目、最近的 Source lock、
-入口 Source 目录。Runtime Profile 无权改变这条源码边界。`--package-root` 只定位已经安装的
+Workspace 依次取显式 `--workspace`、所选 `.narratage/runtime` 所在项目和入口 Source 目录。
+Runtime Profile 无权改变这条源码边界。`--package-root` 只定位已经安装的
`node_modules`;`--asset-root` 只额外授权读取素材字节。
外部项目通常应提交如下 `.gitignore`:
@@ -253,8 +251,7 @@ Workspace 依次取显式 `--workspace`、所选 `.narratage/runtime` 所在项
output/
```
-两份 package lock 属于项目源码,应正常提交。`status`、`builds` 等只读归档命令不会在状态
-尚不存在时初始化 Runtime 数据库。
+`status`、`builds` 等只读归档命令不会在状态尚不存在时初始化 Runtime 数据库。
共享只读素材库不必复制进项目,也不必放宽 Source 边界:
@@ -265,23 +262,18 @@ narratage plan /work/my-film/build.svrun --asset-root /work/shared-media
`--asset-root` 可重复使用,只授权读取素材字节,不允许从那里导入 `.svml/.svs` 源码。该 Host
选项不进入作者或 Build 身份;真正进入图的仍是素材内容摘要。
-Runtime Profile 只选择 Runtime 包、Runtime lock 与该 Runtime 的封闭配置。完整结构只在
+Runtime Profile 只选择 Runtime 包与该 Runtime 的封闭配置。完整结构只在
[Runtime](../guide/runtime.md) 维护,不在 Quickstart 复制第二份。
-### 1. 同步已安装包
-
-安装或更新包后,用一条显式命令同步两份项目包库存:
+### 1. 选择 Runtime
```bash
cd examples/talking-head-aroll
-narratage runtime use svml.runtime.json
-narratage packages sync build.svrun
+narratage runtime use narratage.runtime.json
```
-当前 Author/Run Source 选择作者包,Runtime Profile 选择环境包。`packages sync` 只把本次
-需要的包加入或刷新到库存,不会删除其他 Run 所需的包;明确删除请使用
-`lock-packages --remove`。编译只激活当前 Source 的精确子集。该命令不扫描目录、不启动
-Provider,也不生成媒体。
+Author/Run Source 通过 import 选择作者包,Runtime Profile 通过 `use` 选择环境包;安装、版本
+与完整性由 npm 或 pnpm 负责,不再需要同步另一份包库存。
### 2. 诊断环境
@@ -289,7 +281,7 @@ Provider,也不生成媒体。
narratage doctor
```
-Doctor 校验两份 lock、全部显式 Runtime 角色、Endpoint 配置、凭据是否存在和有界环境探测;它不启动 Worker,也不发付费请求。
+Doctor 校验全部显式 Runtime 角色、Endpoint 配置、凭据是否存在和有界环境探测;它不启动 Worker,也不发付费请求。
`doctor` 有意检查完整 Runtime Profile。若只想检查某次 Run 真正需要的环境,请使用带
所选 Runtime 下的 `plan`。只要计划本身有效,命令就成功;凭据或服务未就绪会写在
@@ -319,11 +311,18 @@ narratage build build.svrun --follow
不带 `--follow` 时,Build 在耐久提交后退出,后台 Worker 继续。带 `--follow` 时终端也只是观察者,并会报告 phase / Operation 数量变化;Ctrl-C 不会取消任务。
+任何时候都可以重新接入观察:
+
+```bash
+narratage status <build-id> --watch
+```
+
+普通的 `status <build-id>` 只打印一次快照。`status --watch` 会在 Build 进入终态时退出;脚本需要限制等待时间时可以加 `--max-wait-ms`。
+
| 标志 | 说明 |
|---|---|
| `--runtime` | 单次命令的 Runtime Profile 覆盖;通常用 `runtime use` 选择一次即可 |
-| `--package-lock` | 包锁定文件的路径 |
-| `--package-root` | 存放 lock 所列已安装包的 Host 目录 |
+| `--package-root` | 存放已安装包的 Host 目录 |
| `--workspace` | 显式 Source Workspace 覆盖项 |
| `--follow` | 将 Build 进度流式输出到终端 |
diff --git a/examples/all-components-preview/svml.runtime.json b/examples/all-components-preview/narratage.runtime.json
similarity index 61%
rename from examples/all-components-preview/svml.runtime.json
rename to examples/all-components-preview/narratage.runtime.json
index 940b4c44..37cc78c1 100644
--- a/examples/all-components-preview/svml.runtime.json
+++ b/examples/all-components-preview/narratage.runtime.json
@@ -1,31 +1,28 @@
{
"format": "narratage.runtime-profile@1",
- "runtimePackageLock": "./svml.runtime-packages.lock",
"runtime": {
- "use": "@narratage/local",
+ "use": "@narratage/runtime-local",
"config": {
"dataRoot": ".narratage/runtimes/local",
- "components": {
- "execution": { "use": "@narratage/local" },
+ "infrastructure": {
+ "execution": { "use": "@narratage/runtime-local" },
"state": { "use": "@narratage/store-sqlite", "config": { "path": "state.sqlite" } },
"artifacts": { "use": "@narratage/artifact-store-fs", "config": { "path": "artifacts" } },
- "credentials.env": { "use": "@narratage/credential-store-env", "config": {} }
+ "credentials": { "use": "@narratage/credential-store-env", "config": {} }
},
- "bindings": {
- "scheduler": "execution.scheduler",
- "worker": "execution.worker",
- "stores": {
- "build": "state.builds",
- "operations": "state.operations",
- "dispatch": "state.dispatch",
- "artifacts": "artifacts",
- "credentials": ["credentials.env"]
- }
+ "roles": {
+ "scheduler": { "from": "execution", "part": "scheduler" },
+ "worker": { "from": "execution", "part": "worker" },
+ "buildStore": { "from": "state", "part": "builds" },
+ "operationStore": { "from": "state", "part": "operations" },
+ "dispatchStore": { "from": "state", "part": "dispatch" },
+ "artifactStore": { "from": "artifacts", "part": "store" },
+ "credentialStores": [{ "from": "credentials", "part": "store" }]
},
"endpoints": {
"kie.all-components": {
"use": "@narratage/provider-kie",
- "authority": "generation",
+ "pool": "generation",
"config": {
"apiKey": { "store": "env", "key": "KIE_API_KEY" },
"defaultConcurrency": 2
@@ -33,22 +30,22 @@
},
"media.all-components": {
"use": "@narratage/provider-media-local",
- "authority": "media",
+ "pool": "media",
"config": { "defaultConcurrency": 2 }
},
"whisperx.all-components": {
"use": "@narratage/provider-whisperx-local",
- "authority": "alignment",
+ "pool": "alignment",
"config": { "defaultConcurrency": 1 }
},
"hyperframes.all-components": {
"use": "@narratage/provider-hyperframes-local",
- "authority": "render",
+ "pool": "render",
"config": { "defaultConcurrency": 1 }
},
"vertex.all-components": {
"use": "@narratage/provider-google-vertex",
- "authority": "planning",
+ "pool": "planning",
"config": {
"projectEnv": "GOOGLE_CLOUD_PROJECT",
"location": "global",
@@ -57,7 +54,7 @@
}
}
},
- "limits": { "maxOperations": 4 }
+ "capacity": { "maxActiveOperations": 4 }
}
}
}
diff --git a/examples/all-components-preview/svml.packages.lock b/examples/all-components-preview/svml.packages.lock
deleted file mode 100644
index 66a16863..00000000
--- a/examples/all-components-preview/svml.packages.lock
+++ /dev/null
@@ -1,1352 +0,0 @@
-{
- "format": "svml.node-package-lock@1",
- "selected": [
- "@narratage/artifact",
- "@narratage/caption",
- "@narratage/caption-fine",
- "@narratage/caption-gemini",
- "@narratage/composition",
- "@narratage/deck-track",
- "@narratage/film",
- "@narratage/fonts-open",
- "@narratage/generation",
- "@narratage/gpt-image",
- "@narratage/hyperframes",
- "@narratage/image-transform",
- "@narratage/media",
- "@narratage/media-pipeline",
- "@narratage/media-track",
- "@narratage/narrative",
- "@narratage/program-space",
- "@narratage/ranking",
- "@narratage/raster",
- "@narratage/render-hyperframes",
- "@narratage/run-markup",
- "@narratage/screen-overlay",
- "@narratage/script",
- "@narratage/seedance",
- "@narratage/semantic-map",
- "@narratage/spatial",
- "@narratage/speech",
- "@narratage/speech-alignment",
- "@narratage/speech-basis",
- "@narratage/speech-evidence",
- "@narratage/speech-spine",
- "@narratage/svs",
- "@narratage/temporal",
- "@narratage/text",
- "@narratage/typography-track",
- "@narratage/visual-ir",
- "@narratage/whisperx"
- ],
- "artifacts": [
- {
- "name": "@fontsource-variable/archivo",
- "version": "5.3.0",
- "digest": "sha256:d0756ae991869df099871e469cc1a3206efc9c50ab34298da0b97aec284fec88"
- },
- {
- "name": "@fontsource-variable/bodoni-moda",
- "version": "5.3.0",
- "digest": "sha256:124e5f7bd2cd952ba895a72847b89bc4fa0a0d831644466393efe61b050622f8"
- },
- {
- "name": "@fontsource-variable/cabin",
- "version": "5.3.0",
- "digest": "sha256:c0da1888b21a3fdc8b391a08b7a59459ce2bdde5a4550bbd34cd6aaf381af93c"
- },
- {
- "name": "@fontsource-variable/caveat",
- "version": "5.3.0",
- "digest": "sha256:21e2ae66cd592a9bd0b53714d04b4aa9adeda6c9340d6180f174829155af2dbe"
- },
- {
- "name": "@fontsource-variable/cinzel",
- "version": "5.3.0",
- "digest": "sha256:883ab987aaf354347d03b5c4a6e59068611dff971011b75c0a2cd8785d084b85"
- },
- {
- "name": "@fontsource-variable/cormorant-garamond",
- "version": "5.3.0",
- "digest": "sha256:5fb212991abe42dc54820a0e99a50d54fd68b8794e05e01fcecd88bc3d9b718f"
- },
- {
- "name": "@fontsource-variable/crimson-pro",
- "version": "5.3.0",
- "digest": "sha256:2af0252ef3293e7f7213467bf2908cbd92a1ac1ef2de8a37ed3134aa553b0854"
- },
- {
- "name": "@fontsource-variable/dm-sans",
- "version": "5.3.0",
- "digest": "sha256:282b5942ecdf37ecb2946c271874f16053e32d7984e465bafa848cd70979b7c5"
- },
- {
- "name": "@fontsource-variable/eb-garamond",
- "version": "5.3.0",
- "digest": "sha256:3f839e82eff702919083009237af1c1975b80f8d9766ac5f97a291cfbf82dea0"
- },
- {
- "name": "@fontsource-variable/figtree",
- "version": "5.3.0",
- "digest": "sha256:bbd1e28aae1070c95fe09ce9bdc94e310b950d35e13d0817fce344d2a57a5c07"
- },
- {
- "name": "@fontsource-variable/fira-code",
- "version": "5.3.0",
- "digest": "sha256:26593d3b4aab4bef1d37b2f7b301739efd6861020b1f44e2cddf14b933453d72"
- },
- {
- "name": "@fontsource-variable/fraunces",
- "version": "5.3.0",
- "digest": "sha256:1da79839589a15663f4c0a75f91899450e20b8d6bd91044c826d07f4ca4d3771"
- },
- {
- "name": "@fontsource-variable/fredoka",
- "version": "5.3.0",
- "digest": "sha256:aeb50015a5e92b2033e5358f391f1221cf7a461f5793ab28d516fa0ee535af85"
- },
- {
- "name": "@fontsource-variable/geist-mono",
- "version": "5.3.0",
- "digest": "sha256:9122fc7e67d7f2788cb82b2eacd489a9430435133488962cbe9ab40ff952dccd"
- },
- {
- "name": "@fontsource-variable/geist",
- "version": "5.3.0",
- "digest": "sha256:01af74b4d77592a1d560c1992568eca3e719117b81b5c2c8798281680180a8c4"
- },
- {
- "name": "@fontsource-variable/instrument-sans",
- "version": "5.3.0",
- "digest": "sha256:10b5fd92cf05d3259b0dfca0b37971b7c522f29b17b5804ddc5bb404ceefc7e3"
- },
- {
- "name": "@fontsource-variable/inter",
- "version": "5.3.0",
- "digest": "sha256:e4ca49893204e3b3d156d22daddb4f96c06a94cc0d0767d6f7613d84d8e3d4fe"
- },
- {
- "name": "@fontsource-variable/jetbrains-mono",
- "version": "5.3.0",
- "digest": "sha256:0445625a317f4ff6cfe58c4272334b4af720309df2339356d3fb81e40c375210"
- },
- {
- "name": "@fontsource-variable/josefin-sans",
- "version": "5.3.0",
- "digest": "sha256:5780323301d2480c3e111de34f9dfc11d24fc165be4fcfbc9293dd34da0dcadd"
- },
- {
- "name": "@fontsource-variable/jost",
- "version": "5.3.0",
- "digest": "sha256:875e424e28d005d8b467aa576de202ae3b84c243eaa52d971e946243c1973439"
- },
- {
- "name": "@fontsource-variable/league-spartan",
- "version": "5.3.0",
- "digest": "sha256:6b05150ad1aeede4aed7505507c8b69187bd25f7897dd43ff7f2e93a0028c37c"
- },
- {
- "name": "@fontsource-variable/lexend",
- "version": "5.3.0",
- "digest": "sha256:ca5800b1c654c71ad3c93a47801c2f5748e49cff9b0985ed375c67f500bd1166"
- },
- {
- "name": "@fontsource-variable/libre-baskerville",
- "version": "5.3.0",
- "digest": "sha256:5297642650a09c5a59f7e602b88b7756d379397da7c6e4dfe273b8f1cc6a225c"
- },
- {
- "name": "@fontsource-variable/lora",
- "version": "5.3.0",
- "digest": "sha256:fdea73d2d75785a45046ef9e2dd1ccac35a1194e31ddabfb0f0b95582d418943"
- },
- {
- "name": "@fontsource-variable/manrope",
- "version": "5.3.0",
- "digest": "sha256:c7821cba633009f45db0ae545cbdcd1de1ec764d299b503ade1b8da6ad7f6f07"
- },
- {
- "name": "@fontsource-variable/merriweather",
- "version": "5.3.0",
- "digest": "sha256:0c264e97ca3f76da2d31726727b120a44910ab2620a45f3e09ae938d0fdcc9c4"
- },
- {
- "name": "@fontsource-variable/montserrat",
- "version": "5.3.0",
- "digest": "sha256:b457c7e96aae71eeee8683e6af5eb766c025b2a889d03daa5298fa2e1abc2855"
- },
- {
- "name": "@fontsource-variable/mulish",
- "version": "5.3.0",
- "digest": "sha256:5ce4f4131ef5c5a7ba7f78e7ea82dc45ea0c4ec0550699cf64568e09e54dbb2d"
- },
- {
- "name": "@fontsource-variable/newsreader",
- "version": "5.3.0",
- "digest": "sha256:3c7c5e41a7d778f342a4108253e062deba68ce5bcba1bad7b3cb962e57132a7a"
- },
- {
- "name": "@fontsource-variable/noto-emoji",
- "version": "5.3.0",
- "digest": "sha256:c135feb03a6be9cabe5bef963d63cfa08c97d3ecdf521aa309324c00cacd9964"
- },
- {
- "name": "@fontsource-variable/noto-naskh-arabic",
- "version": "5.3.0",
- "digest": "sha256:f7637a644a70cf88203426e0ebce7dcb8dc672baf63370437c39fbee8b125b8e"
- },
- {
- "name": "@fontsource-variable/noto-sans-arabic",
- "version": "5.3.0",
- "digest": "sha256:5981bdd510158a68c72e42557bcb3387d6ef9ba958bf5000500fa26fe7373767"
- },
- {
- "name": "@fontsource-variable/noto-sans-devanagari",
- "version": "5.3.0",
- "digest": "sha256:dae73904faa148f60a06af6b267916b6ce656c4c333f1b1de63828b8a5639686"
- },
- {
- "name": "@fontsource-variable/noto-sans-hebrew",
- "version": "5.3.0",
- "digest": "sha256:ff616f500efb9d965be8a95d46ca13f3113704360472286f0596aa0bff5dfbc3"
- },
- {
- "name": "@fontsource-variable/noto-sans-hk",
- "version": "5.3.0",
- "digest": "sha256:faa4e754134193f0c0ffa957c9aae3b75779bd443373a3c1e9759ce5876463d5"
- },
- {
- "name": "@fontsource-variable/noto-sans-jp",
- "version": "5.3.0",
- "digest": "sha256:adf3c03671005935de55199037a2e26ebb81471f95268d7327b54aa6ffbacf62"
- },
- {
- "name": "@fontsource-variable/noto-sans-kr",
- "version": "5.3.0",
- "digest": "sha256:97da1dc319b8f42deda034729ac2bfadb0e3b0992f8034edaa39d7270ba2b042"
- },
- {
- "name": "@fontsource-variable/noto-sans-sc",
- "version": "5.3.0",
- "digest": "sha256:1c49ddaaa5d7aeb0503cfa78914bb4957259108c3dfb262d5f4b2bc49549af89"
- },
- {
- "name": "@fontsource-variable/noto-sans-tc",
- "version": "5.3.0",
- "digest": "sha256:08085bc109242c4034e966d2a9580ee02b261ea04d01dbfc27e316f99223c849"
- },
- {
- "name": "@fontsource-variable/noto-sans-thai",
- "version": "5.3.0",
- "digest": "sha256:ff0050b1cc056bcf88fd713d1dc74f42b0e8799f7931ea89da03a51a03dc4588"
- },
- {
- "name": "@fontsource-variable/noto-sans",
- "version": "5.3.0",
- "digest": "sha256:d27afb70065955c963fc96bf65580a086e6d05c9e4b81177941eb730c5e44dd4"
- },
- {
- "name": "@fontsource-variable/noto-serif-jp",
- "version": "5.3.0",
- "digest": "sha256:c442057a769b0293012b790df56d250f08ec7abf5bcbcbc6ef39b9103329ef68"
- },
- {
- "name": "@fontsource-variable/noto-serif-kr",
- "version": "5.3.0",
- "digest": "sha256:000000dfd6e3700d029217bff41b83cfd0266af9fade349b32441f16facd8dce"
- },
- {
- "name": "@fontsource-variable/noto-serif-sc",
- "version": "5.3.0",
- "digest": "sha256:7d845bd433554bc7a9dc656dc7e0818d6083b080a3e9d69956b97b2cf4221d16"
- },
- {
- "name": "@fontsource-variable/noto-serif-tc",
- "version": "5.3.0",
- "digest": "sha256:58b67399101d6fbfbd1a73c0c06c5de29e24889a1592d922f5afd1f6e550e15d"
- },
- {
- "name": "@fontsource-variable/nunito-sans",
- "version": "5.3.0",
- "digest": "sha256:491045f06b188718c4945f753678c851b0a16348e087e62ec6bd9d91a7f29f07"
- },
- {
- "name": "@fontsource-variable/onest",
- "version": "5.3.0",
- "digest": "sha256:dc69d3aba9dca697a3704954a2c9ed6ad2dde3a508f9cff3cfabf06fed2e7518"
- },
- {
- "name": "@fontsource-variable/open-sans",
- "version": "5.3.0",
- "digest": "sha256:bfa7bb83169eaf59da9c2492b9f87adaf4b07a8a2c5580ae235801842ad74b84"
- },
- {
- "name": "@fontsource-variable/oswald",
- "version": "5.3.0",
- "digest": "sha256:25e3819b4bfdd9fc8786d8d4cbc4bcc5121ad617180ab4e38e33573678a64b28"
- },
- {
- "name": "@fontsource-variable/outfit",
- "version": "5.3.0",
- "digest": "sha256:7da0bec12f2f4cc25652bd2bdfdb8686982121bf96f5182e45df5e7a67e3d134"
- },
- {
- "name": "@fontsource-variable/playfair-display",
- "version": "5.3.0",
- "digest": "sha256:9169e0b0212478bec819d29137e25a5e6770cb59508678a2b3d642706c099551"
- },
- {
- "name": "@fontsource-variable/playpen-sans",
- "version": "5.3.0",
- "digest": "sha256:0cdc396f3617afb4d405378726f48b9ef1dab85e3d1c9c4658450a09cb4335a3"
- },
- {
- "name": "@fontsource-variable/plus-jakarta-sans",
- "version": "5.3.0",
- "digest": "sha256:0d3387379914e9c6e57e67a1ccef7a943b372da8ec46de6956a5fd214e3b2609"
- },
- {
- "name": "@fontsource-variable/quicksand",
- "version": "5.3.0",
- "digest": "sha256:8443330eed78c79d91c3582df8b93d22bd82cd7bc4b7c9ae5c3c0f1499a6cac1"
- },
- {
- "name": "@fontsource-variable/raleway",
- "version": "5.3.0",
- "digest": "sha256:ac1f6114679c0177df758499b8d34def94f5b579a939bf2bb3456023ac2be6dc"
- },
- {
- "name": "@fontsource-variable/rethink-sans",
- "version": "5.3.0",
- "digest": "sha256:90242c18b19a9737e80a66ae6922a9c5bd5250a8972981ac1c09e4f8f8aee372"
- },
- {
- "name": "@fontsource-variable/roboto-condensed",
- "version": "5.3.0",
- "digest": "sha256:2b77bf05ddb63c0ebc2827d267235ee6b2851e0371c559f7a93eaf599d329b54"
- },
- {
- "name": "@fontsource-variable/roboto-mono",
- "version": "5.3.0",
- "digest": "sha256:a83a97b73d190630c8d4801333a73e2c265e0ad2480bc77056ad6a5db1672aae"
- },
- {
- "name": "@fontsource-variable/roboto-slab",
- "version": "5.3.0",
- "digest": "sha256:b6d68b8e9932671733d77695b50c09a23e804e952b7ab8da1a05f06ac827cfef"
- },
- {
- "name": "@fontsource-variable/roboto",
- "version": "5.3.0",
- "digest": "sha256:22fd32070d7eb714439e18dfd00da736b833a4ea4f661c8a3b1761ffe8895b30"
- },
- {
- "name": "@fontsource-variable/rubik",
- "version": "5.3.0",
- "digest": "sha256:b66dbc0f67e2c1e9b075f6ee5ed7eff18a3f7398bfdbc3c463962d1bb5064487"
- },
- {
- "name": "@fontsource-variable/shantell-sans",
- "version": "5.3.0",
- "digest": "sha256:18dcfa8618a3ff5bd420e46bac5fcdbc659242f3c0a67f45fc3ef598a9709fae"
- },
- {
- "name": "@fontsource-variable/sora",
- "version": "5.3.0",
- "digest": "sha256:bd5ff142c0797c37b763ae0a97bd1e9469ae163d084887a4660c73d2cf019693"
- },
- {
- "name": "@fontsource-variable/source-serif-4",
- "version": "5.3.0",
- "digest": "sha256:9833b70d7a2c410496ec00794b3c26034593353ac76fe173f3a6df2e958f6167"
- },
- {
- "name": "@fontsource-variable/space-grotesk",
- "version": "5.3.0",
- "digest": "sha256:9a601acdf9e2b9656f537f6691b40152dbc0c9043b249eeda4980281bcced5e5"
- },
- {
- "name": "@fontsource-variable/unbounded",
- "version": "5.3.0",
- "digest": "sha256:f664f5bbef08608533b00016c00a89b623df987b10a89d4832251b2440370c16"
- },
- {
- "name": "@fontsource-variable/urbanist",
- "version": "5.3.0",
- "digest": "sha256:06b9993e23960a5295ad059f44632e0f37ef3157f69ee06fae315fc47765c289"
- },
- {
- "name": "@fontsource-variable/vollkorn",
- "version": "5.3.0",
- "digest": "sha256:a177bb9b23a8c92311a189943fc8f0fb818b68909a792d82e5dd962795c4e663"
- },
- {
- "name": "@fontsource-variable/work-sans",
- "version": "5.3.0",
- "digest": "sha256:e14b9500f229c1fb1500e6c2c5e816601b95a008ac82a05b7d9fd1abc0421efb"
- },
- {
- "name": "@fontsource/abril-fatface",
- "version": "5.3.0",
- "digest": "sha256:5450fc572771171fa509f606b94038bb34722e3baf643d4f892f51d8fb83bca7"
- },
- {
- "name": "@fontsource/alfa-slab-one",
- "version": "5.3.0",
- "digest": "sha256:f3c3900506c54a7a6e15d1edf4181e10638e7d4aa4686db8114a5ff9287138cc"
- },
- {
- "name": "@fontsource/anton",
- "version": "5.3.0",
- "digest": "sha256:8327a2b26073d4deb0ec66643312e1abd4593ea07631a0e1a414e28743513947"
- },
- {
- "name": "@fontsource/architects-daughter",
- "version": "5.3.0",
- "digest": "sha256:8f944b7f148e1f5c6dcdc8108d6e29a99c23423568ee717bd47fc327a0456d3d"
- },
- {
- "name": "@fontsource/archivo-black",
- "version": "5.3.0",
- "digest": "sha256:abef23f9387cc85892ca65e550546ad47a9cd865a965b80b4c954eb48c14d430"
- },
- {
- "name": "@fontsource/bangers",
- "version": "5.3.0",
- "digest": "sha256:93cc064d70ee9bb054fcab65756111ad2adec1a2563b298ad0e0b423a1bbf8a5"
- },
- {
- "name": "@fontsource/barlow-condensed",
- "version": "5.3.0",
- "digest": "sha256:2bd19ad50f89e4e3697aa36fe7a18780b88d1bf4197a8112d709886bb7f52e47"
- },
- {
- "name": "@fontsource/barlow",
- "version": "5.3.0",
- "digest": "sha256:78fe6d1de271b8a49ebdcc588c7d3b91e46ed8f645d1747b360426c7f3b95a55"
- },
- {
- "name": "@fontsource/bebas-neue",
- "version": "5.3.0",
- "digest": "sha256:19e030c987fb0a607c7c5b7cc49e215319547b4a5bdbad23a847dd72559c0be9"
- },
- {
- "name": "@fontsource/black-ops-one",
- "version": "5.3.0",
- "digest": "sha256:a886f9fa9d0125a8f58a41134c5a68cbfa1d9a9ecac554e28d6749dd3c001d6f"
- },
- {
- "name": "@fontsource/bungee",
- "version": "5.3.0",
- "digest": "sha256:2f6397365b231b67179119ac7c639dd8898753b589549599630e3ad875f6ef10"
- },
- {
- "name": "@fontsource/coming-soon",
- "version": "5.3.0",
- "digest": "sha256:962fff0e0ca29eb40abcade296c2338ad1f4bf17fec694b887e8b0fecd9027f0"
- },
- {
- "name": "@fontsource/dm-serif-display",
- "version": "5.3.0",
- "digest": "sha256:7baa767191a29dcc38c3c1e3d88b18c2aedcda780f0ee96ad371d85121c37105"
- },
- {
- "name": "@fontsource/fira-sans-condensed",
- "version": "5.3.0",
- "digest": "sha256:467d333d5891df9e2648a9d56448d5964c62da005ecb52314ddda3d5ade900f0"
- },
- {
- "name": "@fontsource/gloock",
- "version": "5.3.0",
- "digest": "sha256:3f83f5e92b102434e658b8819a52c5a4684c840788d4a51e57973076e15951be"
- },
- {
- "name": "@fontsource/handlee",
- "version": "5.3.0",
- "digest": "sha256:95e1df2590271e9161503f9de5ec9be5b04a4760638fd508c0d8373105d80963"
- },
- {
- "name": "@fontsource/ibm-plex-mono",
- "version": "5.3.0",
- "digest": "sha256:ce4e3dc94b06c85c8a46a6abd9d80e9dc6550731efdd57fefb1fd352c9271313"
- },
- {
- "name": "@fontsource/instrument-serif",
- "version": "5.3.0",
- "digest": "sha256:788b83afa32264554f58562af494b587f7c955f54c172a3e6b655ec7e5cdbf20"
- },
- {
- "name": "@fontsource/kalam",
- "version": "5.3.0",
- "digest": "sha256:8b628b2523d1f66bfa793f674a5a11b2469b2fe175b48fb5154a34dd50ac58d2"
- },
- {
- "name": "@fontsource/kanit",
- "version": "5.3.0",
- "digest": "sha256:44b66731e8b69804fa498661337bcd20012ed4f15a85a27376dea9175f9a4d2d"
- },
- {
- "name": "@fontsource/lato",
- "version": "5.3.0",
- "digest": "sha256:7b9301126b2841096a8c3c2019c8ff0bc6d3f0cec82666dcc817cc9ae171ca5f"
- },
- {
- "name": "@fontsource/lilita-one",
- "version": "5.3.0",
- "digest": "sha256:b068bbb59d6eefcbc234c2c86751f69cf612ceb342c89929999d2d8964d02f8d"
- },
- {
- "name": "@fontsource/liu-jian-mao-cao",
- "version": "5.3.0",
- "digest": "sha256:f9057013c9fd6c031d093311429c8a05b5d633738edfb5be7d597c6f7ec6b638"
- },
- {
- "name": "@fontsource/long-cang",
- "version": "5.3.0",
- "digest": "sha256:9afe14768b363325209e3c150cf80fc516c80c9241fd369949991bb895f96af0"
- },
- {
- "name": "@fontsource/luckiest-guy",
- "version": "5.3.0",
- "digest": "sha256:6ee2cb66ca3a5d27517685e14e68ff2ea3810a2b8bf68927890312ed7796701d"
- },
- {
- "name": "@fontsource/ma-shan-zheng",
- "version": "5.3.0",
- "digest": "sha256:a02ffc7b1d3c7a419280d698475267a50c6c17065a189197a150afaa2d780651"
- },
- {
- "name": "@fontsource/pacifico",
- "version": "5.3.0",
- "digest": "sha256:4f73e816d6d4873df136642f5dccec552b9b86eb1d893aa0831ffa1dc3d7ebf5"
- },
- {
- "name": "@fontsource/patrick-hand",
- "version": "5.3.0",
- "digest": "sha256:3b90fe2b3da647db3b16b85272baa7260043a242e0308428151d2ad9c6c3f985"
- },
- {
- "name": "@fontsource/permanent-marker",
- "version": "5.3.0",
- "digest": "sha256:e0a02a5f2bf71402f6031b495315dbc8f908ffe45f62dcf2c25aeab9e3445e9d"
- },
- {
- "name": "@fontsource/pinyon-script",
- "version": "5.3.0",
- "digest": "sha256:6a04c8fb82f82c7c778bd9bc4c4de80c9883693dda54b8bd5177f44974c1094e"
- },
- {
- "name": "@fontsource/poppins",
- "version": "5.3.0",
- "digest": "sha256:a6062360c1fb29ca3ea309989341b960051a6dbec3618c30c458c642bf7dad32"
- },
- {
- "name": "@fontsource/righteous",
- "version": "5.3.0",
- "digest": "sha256:79e84f71bdeec58c7a8f9f27713b9ce0bc69c03172deb27303efd39587fb2980"
- },
- {
- "name": "@fontsource/satisfy",
- "version": "5.3.0",
- "digest": "sha256:c7dffc71d3f7cacd478896455d11633b6529ea3b6b90b3a8ea33a3baeaf1e766"
- },
- {
- "name": "@fontsource/shadows-into-light",
- "version": "5.3.0",
- "digest": "sha256:d2ada94bd5e183d93b51e7e971711f6a85f3a0f4469e138f0af7362ee2fc17b6"
- },
- {
- "name": "@fontsource/short-stack",
- "version": "5.3.0",
- "digest": "sha256:f3f57149b79b7aa692199846414def30dd13ff6ed8f837d1731be8d261233e10"
- },
- {
- "name": "@fontsource/space-mono",
- "version": "5.3.0",
- "digest": "sha256:3d45b28d3e4c26cd7aac85d6df23808117dfdde126926394e63f6aa9ae1f355d"
- },
- {
- "name": "@fontsource/zcool-kuaile",
- "version": "5.3.0",
- "digest": "sha256:92769d2814bb9186e26e388dc0656a8a0e2e883829646352024c0aec41dbbbbd"
- },
- {
- "name": "@fontsource/zcool-qingke-huangyou",
- "version": "5.3.0",
- "digest": "sha256:15854638d77023d0e32383f53f490e060cd8e0f8cf4994b2c99fe8522bf74e43"
- },
- {
- "name": "@fontsource/zcool-xiaowei",
- "version": "5.3.0",
- "digest": "sha256:79a87ecebfb75fc4fc01b36db09fe67d2080c090b73e145dc605dd2375974284"
- },
- {
- "name": "@infolektuell/noto-color-emoji",
- "version": "0.2.0",
- "digest": "sha256:1cb876e4d1fbd09da62f17c1599935b132427288052b2ab3afa8a8458329a720"
- },
- {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev",
- "digest": "sha256:b254bc523b6e65563cc9df32b270a4f7fe17a7fb7b26a0fd9dc944d4c16479d1"
- },
- {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev",
- "digest": "sha256:730a3bdccb438d627587756ee71a171ee4d9846b254e5f5c0afc0b8187ed2676"
- },
- {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev",
- "digest": "sha256:1b5cdb014c3ac774e0b998459092d3a26c042733f878cc81c00c0e435420c58a"
- },
- {
- "name": "@narratage/caption",
- "version": "0.0.0-dev",
- "digest": "sha256:46f2273af9f932e4c208a3e7dd692456691f7827967af0efb54b1a4e1a1388b5"
- },
- {
- "name": "@narratage/component-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:a503483ab1e923d1c81473e2f3d433aacfa08703c2d81715e66aa310f170a0ae"
- },
- {
- "name": "@narratage/composition",
- "version": "0.0.0-dev",
- "digest": "sha256:e5724c7fdfe7f4c915cf850de9485d25920415d4d4185010c929abcde233d0fa"
- },
- {
- "name": "@narratage/core",
- "version": "0.0.0-dev",
- "digest": "sha256:1262fed3211025ac608b60c4f7f47c9d493473cb05307ade3671ebafb79f5fe0"
- },
- {
- "name": "@narratage/deck-track",
- "version": "0.0.0-dev",
- "digest": "sha256:e3b3be48960c16775ce0c86aac74c183ede8df5c9881c3e890e0f3f981c7e979"
- },
- {
- "name": "@narratage/elaborator",
- "version": "0.0.0-dev",
- "digest": "sha256:e5e6d5de8eb028e582238f3cb987001a3a332a0645f823d60bb01c3964041161"
- },
- {
- "name": "@narratage/film",
- "version": "0.0.0-dev",
- "digest": "sha256:482d49f5c1abd03cb360c38a973b242bb9a49547fa31d87076e0ee53dc0f6adc"
- },
- {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev",
- "digest": "sha256:876eaa390d8a62b782111895c961ebb4a734de44a3f291feb43e8bf3523e2da5"
- },
- {
- "name": "@narratage/generation",
- "version": "0.0.0-dev",
- "digest": "sha256:840cbc1a4b0d611761d917e7c3be744ba5aa513e8556b92290470cd917c64ce1"
- },
- {
- "name": "@narratage/gpt-image",
- "version": "0.0.0-dev",
- "digest": "sha256:ab4ebcfb7ba421632c25bec53d65376612b5d869d197d9abfc6c140bc18e6a08"
- },
- {
- "name": "@narratage/host",
- "version": "0.0.0-dev",
- "digest": "sha256:041d64f76f14fe995a9242906591d98a37b1d33e2c1aa6d4fa9c14bae1fda8ad"
- },
- {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:c202f0a15af238738846b1d02124d78bcd06f54272eb1bbbb5dfc9c7ec0fabe8"
- },
- {
- "name": "@narratage/image-transform",
- "version": "0.0.0-dev",
- "digest": "sha256:ced71fab980a23f31f3b908936f4d688d7effaf32a22b0a5b3b1a8163cd7c3fb"
- },
- {
- "name": "@narratage/markup",
- "version": "0.0.0-dev",
- "digest": "sha256:8d4f58d79d5d1ea21dedf84ba63064a5fc2c710df499d58e58701b3557fbedc6"
- },
- {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev",
- "digest": "sha256:fa027f725f23153d1f45db6aff658e200e5ce4863858f1cd3969031e10080da9"
- },
- {
- "name": "@narratage/media-track",
- "version": "0.0.0-dev",
- "digest": "sha256:494b5719ddc085eb4e29aaebd3a69ed5cc4ff8de448b2b882a25ed3dce7e0833"
- },
- {
- "name": "@narratage/media",
- "version": "0.0.0-dev",
- "digest": "sha256:688d1a3fb202ccb875d7d3135ed3382ef15f6d8d591a38634449e83a1371615c"
- },
- {
- "name": "@narratage/model-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:7ee53615cec344fc8866832be4ccf2fee88077871557cc98e7d539b78ba7d565"
- },
- {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev",
- "digest": "sha256:da8eee7d882aaadaf64996962920306ec366b026b65d24f33d882391f2a68d24"
- },
- {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev",
- "digest": "sha256:afe21487a254d5d042636a6e22d66e15f6023e461b115d50ceae1f1d44914089"
- },
- {
- "name": "@narratage/protocol",
- "version": "0.0.0-dev",
- "digest": "sha256:9b500750ffce24e7e521dcb6d785fba243222237f10e2b2dbd4887187b657274"
- },
- {
- "name": "@narratage/ranking",
- "version": "0.0.0-dev",
- "digest": "sha256:3e8e1f995b4d9426e44217dae498d570a42c86f1c3c0e3e64da24b86c43ed172"
- },
- {
- "name": "@narratage/raster",
- "version": "0.0.0-dev",
- "digest": "sha256:12e449c4ee9f81b29f03e428768a4196724fe191baecbdcb4ebfd2ca2b2a4e41"
- },
- {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:d214b56eaa2c29383d4b0140696be343b0b755db077a7257b05f614667ed80dc"
- },
- {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev",
- "digest": "sha256:3c88369dc97248f561ef83d2775c02e3e1704751808429734a72faca61a0468e"
- },
- {
- "name": "@narratage/run",
- "version": "0.0.0-dev",
- "digest": "sha256:84ddca1556318111c3b067ff439bb7b94cb7856c30a5762cf07a083b61be2b17"
- },
- {
- "name": "@narratage/screen-overlay",
- "version": "0.0.0-dev",
- "digest": "sha256:a28f1d1d29ab6de5a580a003f6bab36abe7d52319af0a753e796918f42905d85"
- },
- {
- "name": "@narratage/script",
- "version": "0.0.0-dev",
- "digest": "sha256:7c7e837d3e2ecd1ae3aaf4e12c1e73d21f226a9ff7588a865cc1187f166feb0d"
- },
- {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev",
- "digest": "sha256:9d3c20203f9dd4cf4d40b1f1662639fe3bd6d06f62e7629c22566c9f9f9d8f36"
- },
- {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev",
- "digest": "sha256:eb1d5ee85a566713f862b0685df20063c1083dbbd8014bda93427613c5f202e8"
- },
- {
- "name": "@narratage/source",
- "version": "0.0.0-dev",
- "digest": "sha256:3cf49ecaa8e6ea145d642dd90834e887ca073a720364fd890197768e3e1e5cd2"
- },
- {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev",
- "digest": "sha256:c0548cacaf821e6811addd2a5ba9609ceaabb29c7a6d9776f3f1d45fe37ec644"
- },
- {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev",
- "digest": "sha256:fda24a3d99eb883471147a2c3b1c5caa5526fb2721e0943a8146e1e8f3dd4ecc"
- },
- {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev",
- "digest": "sha256:5ba1ca2e8f0049c198a85e446c0847221113e9c89aafde7c5a8a0c8be86fdd96"
- },
- {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev",
- "digest": "sha256:991b1dbcb2136186110bdb12885504f35cce1ade335151f4f0b3e5c552950196"
- },
- {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev",
- "digest": "sha256:209d28a81e41f486cce6173e3647389866b3571131efe2842f5223066ef772f2"
- },
- {
- "name": "@narratage/speech",
- "version": "0.0.0-dev",
- "digest": "sha256:079a337dfdb293f25dc7bb87a7644b3520524e165df913d8085c6c527ed25158"
- },
- {
- "name": "@narratage/svs",
- "version": "0.0.0-dev",
- "digest": "sha256:22bce93d56291e627e4dbeeafcfc8dc1e2217f95d6a88ec5dd0e3221f20babe2"
- },
- {
- "name": "@narratage/temporal",
- "version": "0.0.0-dev",
- "digest": "sha256:ff7659ab2fcd3faba7413ef323de48c9e221a5b47fc25e3aa5f347261156eabe"
- },
- {
- "name": "@narratage/text",
- "version": "0.0.0-dev",
- "digest": "sha256:bc799fdd99df3b7a224f2b1c7581db94649e833c760fe22216935ae3548c150c"
- },
- {
- "name": "@narratage/typography-track",
- "version": "0.0.0-dev",
- "digest": "sha256:57dc722f6010b10cbbb96dce1c593319e43170b5499c5b71e77713f4f412836b"
- },
- {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev",
- "digest": "sha256:2dee587eedeb2d5c16d63b53aec6a476aec7555b40241352a0d8dc0f91db9631"
- },
- {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev",
- "digest": "sha256:65555eac7342e1c538083be0bf627af10ca266c9d9a68221d78c2d88778c91c5"
- }
- ],
- "packages": [
- {
- "package": {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/artifact@1"
- }
- ],
- "facetsDigest": "sha256:a56f39df98f2bff5caf339a427586e73be079eb26697c2313612bf7c07d78e2c",
- "closureDigest": "sha256:d627ce0b82cedc237f8cc923a44dd9d6849240615f5cf971181cc242b7468498"
- },
- {
- "package": {
- "name": "@narratage/caption",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption@1"
- }
- ],
- "facetsDigest": "sha256:1fbbf9bcdc39382ec612df3f29765b5d6ceb8598c0df2c7b5d6b8515f73367a3",
- "closureDigest": "sha256:790bad794d072c3bab93c3d76307b9cc836669681273ab04b1f06709dff1eb5a"
- },
- {
- "package": {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-fine@1"
- }
- ],
- "facetsDigest": "sha256:73e3f528a76fdc553ba2ee87fe5beb5fb2c91b7d4fcdff4ba9e6963d4740fdf6",
- "closureDigest": "sha256:894767197868c4df9cfec52541621b53298e5dcef78dc692b90dc7f73c1a2aa7"
- },
- {
- "package": {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-gemini@1"
- }
- ],
- "facetsDigest": "sha256:894d546ffa3c9e221fc6b686d11bc117d15a250399332e3ae1c1d28a547e0f30",
- "closureDigest": "sha256:7ae1df06b13ad365e05f8d1b45eb045bddc832976dc612898aff0e05d0c9366f"
- },
- {
- "package": {
- "name": "@narratage/composition",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/composition@1"
- }
- ],
- "facetsDigest": "sha256:05c22bda8c301365c1cfff2c0afa80067f3d2a0fba167a57ebf923af720a5c34",
- "closureDigest": "sha256:7d309e990bdfaf84168b43bd8b41a3b6f25dd394eb53c7bb34340fd59c0a67a9"
- },
- {
- "package": {
- "name": "@narratage/deck-track",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/deck-track@1"
- }
- ],
- "facetsDigest": "sha256:a969929d929b22148363dc0dd12bc60d2e61f6e186d146554f1bcf51f55f7845",
- "closureDigest": "sha256:7593d4b7c035e49ce59e4e9c0f1cadf8f07fd7c086b2d4105784a83fe9e1fb7b"
- },
- {
- "package": {
- "name": "@narratage/film",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/film@1"
- }
- ],
- "facetsDigest": "sha256:b96fd578be298ab154d1ad30a27d7e54ae0cf2f8f52f52d7bf13c0785d2a8da7",
- "closureDigest": "sha256:f98b81818ae8bc4d0b5e47edb5ef9a080b092f65766178d0dad4dc7b86d74b55"
- },
- {
- "package": {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/fonts-open@1"
- }
- ],
- "facetsDigest": "sha256:de93037cec9a364da45fedc69a2d82cca93c5866e475942241c008f46c3a8da9",
- "closureDigest": "sha256:716b251dd7100f055b10dbb6c92d799f19ac1c9e3d17aeaaa38eef421ebe4512"
- },
- {
- "package": {
- "name": "@narratage/generation",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/generation@1"
- }
- ],
- "facetsDigest": "sha256:d9ee4c44949ca2d24967e7d81898999db84ab592fdaaafe1bd6d22a28ea5e094",
- "closureDigest": "sha256:8f86d9c4e36b2a01d484f44ea59278ec4deedd86cc1797ca6d84ba5bd2ca38ff"
- },
- {
- "package": {
- "name": "@narratage/gpt-image",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/gpt-image@1"
- },
- {
- "abi": "svml.module@1",
- "name": "@narratage/gpt-image/clean@1"
- }
- ],
- "facetsDigest": "sha256:45c292c4b6dd39acec22e896379fca2c42f8a39c6f5211195a83a3fcc1044db5",
- "closureDigest": "sha256:f870451de07aa9969902141fa74602439c53a2cac74b023cededccf7e0ae5540"
- },
- {
- "package": {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:7596800f1ce4506145f9ff50c768bfc07131c5ea8d421711a6b5268ce13960f7",
- "closureDigest": "sha256:1a45cbbbfdf5b2da33be35fdb33aac91fa7536fa29b75d3959e1fc9ae52e0bf2"
- },
- {
- "package": {
- "name": "@narratage/image-transform",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/image-transform@1"
- }
- ],
- "facetsDigest": "sha256:9b25cec76fbf30e59177addb1c065fca7baa0a03a1eb2af141f52354ba3ce28a",
- "closureDigest": "sha256:0493e3228c77d865874f431f343b3a777658690dbed099ea9789c2e53c038a2c"
- },
- {
- "package": {
- "name": "@narratage/media",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media@1"
- }
- ],
- "facetsDigest": "sha256:5bbef7d089f36dd1ea36b743b1b4f03289ccb8a2fc50383e3b355982916ccfc6",
- "closureDigest": "sha256:70cbebe094cab5f1990f5effcdfd72f48a78e5cf2316b3629049d1eca34cfa35"
- },
- {
- "package": {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media-pipeline@1"
- }
- ],
- "facetsDigest": "sha256:a96ae88d7813e660bb496b77e53f66ed7e218b20d4e157632c9a4fd832580a92",
- "closureDigest": "sha256:a37b9c1903ce96a1b7554147e8a48dd2104bc54dc732909edeb6a77c37f2ce36"
- },
- {
- "package": {
- "name": "@narratage/media-track",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media-track@1"
- }
- ],
- "facetsDigest": "sha256:c9d43bfabee11db7c1ad5f65286ef568ff51c09def5f5f05b4510fca36b0336f",
- "closureDigest": "sha256:d147833a92ccb5c520bcf8ee1545c5b62e5a8af8f46d99a7c6a86abe24976fbd"
- },
- {
- "package": {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/narrative@1"
- }
- ],
- "facetsDigest": "sha256:8d535e4842c8bf287e62f8ecc803927b79d02b3cb438ba3959c369fb1d2a828d",
- "closureDigest": "sha256:aa91fbb77dc816674cc84bbe05ed1e4c784aafbbd13e1ce282b07b4cbb3f9e0d"
- },
- {
- "package": {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/program-space@1"
- }
- ],
- "facetsDigest": "sha256:92ebae07c9947d9d18277c0d8f784d5740c092f14dd3efa263138aec454ca91a",
- "closureDigest": "sha256:1e7cff66aec35080ccbacc0e7e2d850cd08206a59c6c400546646608d649659b"
- },
- {
- "package": {
- "name": "@narratage/ranking",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/ranking@1"
- }
- ],
- "facetsDigest": "sha256:2f3de1f3f02d7c57ed8489c23234ae6265ded95497bf0cd60589726972e7fda7",
- "closureDigest": "sha256:c1278c09a7d7c4d4579035ed4385ca7b13e90d0ecbad6b57a29f85783930a794"
- },
- {
- "package": {
- "name": "@narratage/raster",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/raster@1"
- }
- ],
- "facetsDigest": "sha256:4801d4128840216adc451dfc55593127aad41f8fec6d221e288ff7b1c7cad9c4",
- "closureDigest": "sha256:ef6888cd399b7bb949930ffb33f3f502b3a8bca60dd19730b255e92bef8a13c3"
- },
- {
- "package": {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/render-hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:31b63a4bf10385d31feb50114811c5185b78a0caab6b7c1646c86a61c4958128",
- "closureDigest": "sha256:1ba24f24c93b7aa090d41a62b6708f93364c906e483efea007bac9d399db7bf5"
- },
- {
- "package": {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/run-markup@1"
- }
- ],
- "facetsDigest": "sha256:c38a4e2e76a2f87b6a401bf0cad4b18f04274689ffae22c09f8f520046a7123e",
- "closureDigest": "sha256:f9cf27428f0d85d63930f56b9e23df481c4e956d5d86c03fef5c88e62dd22fb7"
- },
- {
- "package": {
- "name": "@narratage/screen-overlay",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/screen-overlay@1"
- }
- ],
- "facetsDigest": "sha256:5e1d4c2c60bda7a5d25ff5393e7d2606fd0c253562d886382d1d248982cc87ca",
- "closureDigest": "sha256:a54950e5050ab0c245438477b0cec0414c5eeefa3c0acfa1abb0f5790c59e4ed"
- },
- {
- "package": {
- "name": "@narratage/script",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/script@1"
- }
- ],
- "facetsDigest": "sha256:acc754c61e24f93d5e2692ceb6998a3638cc384de8e512e155738435663a8342",
- "closureDigest": "sha256:cbf4fe4ec28ae6958956ee67d02c8a4a30d2e4e5cbd64d8952e317c6df435fbb"
- },
- {
- "package": {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/seedance@1"
- }
- ],
- "facetsDigest": "sha256:41615659f664d3480af5a50c81df188b6fc848628c60bc82d37eb7735071f111",
- "closureDigest": "sha256:3ea90ac12b4ac7bddce6064ac99d946aa89745c0fbf06861100415c12bd63882"
- },
- {
- "package": {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/semantic-map@1"
- }
- ],
- "facetsDigest": "sha256:80cad17557218021f4912919b0fc5bbfda61523fc40242e12dafd92a5ca52d28",
- "closureDigest": "sha256:162ab0d26ba8577910bea38e44f39909bfd275033175e8c6892a21f8a298f8b0"
- },
- {
- "package": {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/spatial@1"
- }
- ],
- "facetsDigest": "sha256:4e6da482a365cd36423f3baf568ea741f2e0eddf26b559bce43d3c4270830c91",
- "closureDigest": "sha256:dde427e997833b5ed6639deeed75070eb98bc9e50c8f0a7da8f31fefe4435724"
- },
- {
- "package": {
- "name": "@narratage/speech",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech@1"
- }
- ],
- "facetsDigest": "sha256:e86e5c90307ab183d2ea5d75e4ca0daab4f2b65905feb79c387871370d625e3a",
- "closureDigest": "sha256:8be1559095728f977914d56c4e7dfd070362d7bbddfb0565062129fe27a67d8d"
- },
- {
- "package": {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-alignment@1"
- }
- ],
- "facetsDigest": "sha256:b55e20b4fdf24cbfaf956447ff62885e81638fdbcbb61f25483392a1c8fac8c9",
- "closureDigest": "sha256:34ff2b938c8cdb94823a2843e882ac9d1e8f51f46dee02a6b0342b69f48c5be3"
- },
- {
- "package": {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-basis@1"
- }
- ],
- "facetsDigest": "sha256:3e7413acb9b39071fad0ea2e99777ae9ab7a4b636041a8345ec1d08428859b3f",
- "closureDigest": "sha256:e0a9f8e7c454beb36d67e9bd358383fc91567e70e9f43f75290a831028e39576"
- },
- {
- "package": {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-evidence@1"
- }
- ],
- "facetsDigest": "sha256:26f3ab63067b382373a9c4c24569bd672302370f5d0c64a055d61862959fc4d0",
- "closureDigest": "sha256:0df8b3aa5a3c29300be9779b7f6f53fc44051665f956b20d554551d4100272f6"
- },
- {
- "package": {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-spine@1"
- }
- ],
- "facetsDigest": "sha256:340cf867483022b3896008781f24a04e22aa0abc76873cc44787aefdc0219522",
- "closureDigest": "sha256:f215f8ec4e02bf26ff0960b129760eeb80ab59658cd0ec0476481b73c11f09ee"
- },
- {
- "package": {
- "name": "@narratage/svs",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/svs@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/svs@1"
- }
- ],
- "facetsDigest": "sha256:27cb7828391b2cd5b9fd0a6690d16010f23b78540d501aad6f9afa75da33f1da",
- "closureDigest": "sha256:ff88e3ec2e95ef40afb308f240c59ed57149ceff4bf5e58d3429fada1ff702f6"
- },
- {
- "package": {
- "name": "@narratage/temporal",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/temporal@1"
- }
- ],
- "facetsDigest": "sha256:f3cf535add0b1746dc5beb7920935bc36cca953ee044961d35c5c89fe6b7a746",
- "closureDigest": "sha256:b761c6395b3867412c3bf52ebefae1b106aa00f2b546cb7aafacce17801ede81"
- },
- {
- "package": {
- "name": "@narratage/text",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/text@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/text/svs@1"
- }
- ],
- "facetsDigest": "sha256:2d4d0e9eea9ec795fb675ddf7d204bc29fe7eb8e3a743eced944a0cdb50ecf50",
- "closureDigest": "sha256:51afff4d06131cc77a3e6953a9151564dfb79bde943f1250d91d24db1f2c00d4"
- },
- {
- "package": {
- "name": "@narratage/typography-track",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/typography-track@1"
- }
- ],
- "facetsDigest": "sha256:063c2641007f401709acfed6eab95ae9c566de1e0987a06c7cdce305abe33aa7",
- "closureDigest": "sha256:489ec9e9f0bdfa329ddf39537529b95f14e79b2608c48d6031a47ce2944fdbb3"
- },
- {
- "package": {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/visual-ir@1"
- }
- ],
- "facetsDigest": "sha256:039735354a109969a18b2c26ab8b02bb6d09a7a35f993336e8e8711e6d429f14",
- "closureDigest": "sha256:7653a66f3fdff9894e02cf080e3c9cf11fbbb28e93b3adc55b8ed99d7de42bab"
- },
- {
- "package": {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/whisperx@1"
- }
- ],
- "facetsDigest": "sha256:64c0e76dea02b19be28bc7425e11938fd9c1dbb9994dde3a6d98c41da819b85e",
- "closureDigest": "sha256:233b055191b86b8527083fe601c89216d7dabbce7a227123dc5d6b2117322753"
- }
- ],
- "digest": "sha256:5089b8f7904a7d9782e28b7a4cd869fd398aad7ddf5fcd835b02a918933fb2ec"
-}
diff --git a/examples/all-components-preview/svml.runtime-packages.lock b/examples/all-components-preview/svml.runtime-packages.lock
deleted file mode 100644
index 2f109c4c..00000000
--- a/examples/all-components-preview/svml.runtime-packages.lock
+++ /dev/null
@@ -1,1044 +0,0 @@
-{
- "format": "svml.node-package-lock@1",
- "selected": [
- "@narratage/artifact-store-fs",
- "@narratage/credential-store-env",
- "@narratage/local",
- "@narratage/provider-google-vertex",
- "@narratage/provider-hyperframes-local",
- "@narratage/provider-kie",
- "@narratage/provider-media-local",
- "@narratage/provider-whisperx-local",
- "@narratage/store-sqlite"
- ],
- "artifacts": [
- {
- "name": "@esbuild/darwin-arm64",
- "version": "0.25.12",
- "digest": "sha256:f3ca2a2dd0e67a3e2beaf9d45626a7209a22ca5725e076d1e04008691655cd43"
- },
- {
- "name": "@google/genai",
- "version": "1.52.0",
- "digest": "sha256:39117de2d79f62402c4905b9b7ed58fa34c04c4d9e85c6272613437a0ff60f5c"
- },
- {
- "name": "@hono/node-server",
- "version": "2.0.12",
- "digest": "sha256:87923b51e3cbe9ca6b5d712bd97d5a1181a21d269f06cfca6931d827627986ba"
- },
- {
- "name": "@img/colour",
- "version": "1.1.0",
- "digest": "sha256:07db37307451577b10a7e1b851470ec9b290ae05459a1540102d91e553ad607b"
- },
- {
- "name": "@isaacs/fs-minipass",
- "version": "4.0.1",
- "digest": "sha256:774ff19c91750abdf4d4b8d715bc0e12246bdaf2239f3e7441b9cdd21f224d72"
- },
- {
- "name": "@narratage/artifact-store-fs",
- "version": "0.0.0-dev",
- "digest": "sha256:609d09f53cba3f7367ef59502dc02f6c71d52b4f36914a0ebff8ac34703c8775"
- },
- {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev",
- "digest": "sha256:b254bc523b6e65563cc9df32b270a4f7fe17a7fb7b26a0fd9dc944d4c16479d1"
- },
- {
- "name": "@narratage/background-removal",
- "version": "0.0.0-dev",
- "digest": "sha256:ec0aa2d6ff0996940c7aedb1cd901a6ab0038e6e6a62ca701e623e39d3b81807"
- },
- {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev",
- "digest": "sha256:1b5cdb014c3ac774e0b998459092d3a26c042733f878cc81c00c0e435420c58a"
- },
- {
- "name": "@narratage/caption",
- "version": "0.0.0-dev",
- "digest": "sha256:46f2273af9f932e4c208a3e7dd692456691f7827967af0efb54b1a4e1a1388b5"
- },
- {
- "name": "@narratage/component-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:a503483ab1e923d1c81473e2f3d433aacfa08703c2d81715e66aa310f170a0ae"
- },
- {
- "name": "@narratage/composition",
- "version": "0.0.0-dev",
- "digest": "sha256:e5724c7fdfe7f4c915cf850de9485d25920415d4d4185010c929abcde233d0fa"
- },
- {
- "name": "@narratage/core",
- "version": "0.0.0-dev",
- "digest": "sha256:1262fed3211025ac608b60c4f7f47c9d493473cb05307ade3671ebafb79f5fe0"
- },
- {
- "name": "@narratage/credential-store-env",
- "version": "0.0.0-dev",
- "digest": "sha256:86ca20d6418e2c591359971f6afc59232c391fac37e3150eb5ed95adda495fe9"
- },
- {
- "name": "@narratage/driver-node",
- "version": "0.0.0-dev",
- "digest": "sha256:22cd089084eb82ca73f08d8e768a480327106f705dffd14b26381d36ea1e08cf"
- },
- {
- "name": "@narratage/elaborator",
- "version": "0.0.0-dev",
- "digest": "sha256:e5e6d5de8eb028e582238f3cb987001a3a332a0645f823d60bb01c3964041161"
- },
- {
- "name": "@narratage/endpoint-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:89eeade4f411bc5c1095647a07502b3912efff590099fd00b998901a755e59c4"
- },
- {
- "name": "@narratage/generation",
- "version": "0.0.0-dev",
- "digest": "sha256:840cbc1a4b0d611761d917e7c3be744ba5aa513e8556b92290470cd917c64ce1"
- },
- {
- "name": "@narratage/host",
- "version": "0.0.0-dev",
- "digest": "sha256:041d64f76f14fe995a9242906591d98a37b1d33e2c1aa6d4fa9c14bae1fda8ad"
- },
- {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:c202f0a15af238738846b1d02124d78bcd06f54272eb1bbbb5dfc9c7ec0fabe8"
- },
- {
- "name": "@narratage/local",
- "version": "0.0.0-dev",
- "digest": "sha256:ac56790c50bedb1e3380ca251463c3e41adfc1edc27cb8e6960791f95ec621de"
- },
- {
- "name": "@narratage/markup",
- "version": "0.0.0-dev",
- "digest": "sha256:8d4f58d79d5d1ea21dedf84ba63064a5fc2c710df499d58e58701b3557fbedc6"
- },
- {
- "name": "@narratage/media-execution",
- "version": "0.0.0-dev",
- "digest": "sha256:d096c01b5c7c18ba2a2ba3919bfffb8b5ac669a418d8e19ed847254a158e9ccf"
- },
- {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev",
- "digest": "sha256:fa027f725f23153d1f45db6aff658e200e5ce4863858f1cd3969031e10080da9"
- },
- {
- "name": "@narratage/media",
- "version": "0.0.0-dev",
- "digest": "sha256:688d1a3fb202ccb875d7d3135ed3382ef15f6d8d591a38634449e83a1371615c"
- },
- {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev",
- "digest": "sha256:da8eee7d882aaadaf64996962920306ec366b026b65d24f33d882391f2a68d24"
- },
- {
- "name": "@narratage/package-loader-node",
- "version": "0.0.0-dev",
- "digest": "sha256:9e155cff9e6263d2d954bca05a676cedb9d816286ee31b0d19d98e94eafca72d"
- },
- {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev",
- "digest": "sha256:afe21487a254d5d042636a6e22d66e15f6023e461b115d50ceae1f1d44914089"
- },
- {
- "name": "@narratage/protocol",
- "version": "0.0.0-dev",
- "digest": "sha256:9b500750ffce24e7e521dcb6d785fba243222237f10e2b2dbd4887187b657274"
- },
- {
- "name": "@narratage/provider-google-vertex",
- "version": "0.0.0-dev",
- "digest": "sha256:c8861059e5e7b652bfc1f0d4da6fef5b05d149f21c57916c4dabc8bb90c0276b"
- },
- {
- "name": "@narratage/provider-hyperframes-local",
- "version": "0.0.0-dev",
- "digest": "sha256:4827eaae0955d045f92ead0ee42d12521268fa8fded6372a3f53521d65ccfcba"
- },
- {
- "name": "@narratage/provider-kie",
- "version": "0.0.0-dev",
- "digest": "sha256:c67139c64f5b841d73d245d190ac8134591d58e363e13a26d9370040f79d1eed"
- },
- {
- "name": "@narratage/provider-media-local",
- "version": "0.0.0-dev",
- "digest": "sha256:eefbd7478a1c37eb3ddc28af0a70cf8fac2e1d8c37ed61a3026b36f03c8f21d4"
- },
- {
- "name": "@narratage/provider-whisperx-local",
- "version": "0.0.0-dev",
- "digest": "sha256:65e080a86701e76c9fafbe60235c38db1262557392ed7be3a0e893a73752bd30"
- },
- {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:d214b56eaa2c29383d4b0140696be343b0b755db077a7257b05f614667ed80dc"
- },
- {
- "name": "@narratage/runtime-adapter-node",
- "version": "0.0.0-dev",
- "digest": "sha256:0ce0b9d4ab66c1ba248b7925a859b4654429d5cd68f4309d2932a6070456cbb6"
- },
- {
- "name": "@narratage/runtime-adapter",
- "version": "0.0.0-dev",
- "digest": "sha256:37bfc677595841a6b4491b0066894271f252150e96b47dcd10123eecfe29cc3a"
- },
- {
- "name": "@narratage/runtime",
- "version": "0.0.0-dev",
- "digest": "sha256:9dc9cbeb2c3124c219da91237a02693cc6cd0c3f2511f20329c0f7cddffb2d06"
- },
- {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev",
- "digest": "sha256:eb1d5ee85a566713f862b0685df20063c1083dbbd8014bda93427613c5f202e8"
- },
- {
- "name": "@narratage/source",
- "version": "0.0.0-dev",
- "digest": "sha256:3cf49ecaa8e6ea145d642dd90834e887ca073a720364fd890197768e3e1e5cd2"
- },
- {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev",
- "digest": "sha256:c0548cacaf821e6811addd2a5ba9609ceaabb29c7a6d9776f3f1d45fe37ec644"
- },
- {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev",
- "digest": "sha256:fda24a3d99eb883471147a2c3b1c5caa5526fb2721e0943a8146e1e8f3dd4ecc"
- },
- {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev",
- "digest": "sha256:991b1dbcb2136186110bdb12885504f35cce1ade335151f4f0b3e5c552950196"
- },
- {
- "name": "@narratage/speech",
- "version": "0.0.0-dev",
- "digest": "sha256:079a337dfdb293f25dc7bb87a7644b3520524e165df913d8085c6c527ed25158"
- },
- {
- "name": "@narratage/store-sqlite",
- "version": "0.0.0-dev",
- "digest": "sha256:35e7243a129b0db8d7b1c9876411015e8c48cdb241506bfae5cbec7dfc2d512b"
- },
- {
- "name": "@narratage/svs",
- "version": "0.0.0-dev",
- "digest": "sha256:22bce93d56291e627e4dbeeafcfc8dc1e2217f95d6a88ec5dd0e3221f20babe2"
- },
- {
- "name": "@narratage/text",
- "version": "0.0.0-dev",
- "digest": "sha256:bc799fdd99df3b7a224f2b1c7581db94649e833c760fe22216935ae3548c150c"
- },
- {
- "name": "@narratage/validation",
- "version": "0.0.0-dev",
- "digest": "sha256:a73ba0cc3620754cda2c1064d3de1ce98563f72290e1e9af585253b095ff61c9"
- },
- {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev",
- "digest": "sha256:2dee587eedeb2d5c16d63b53aec6a476aec7555b40241352a0d8dc0f91db9631"
- },
- {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev",
- "digest": "sha256:65555eac7342e1c538083be0bf627af10ca266c9d9a68221d78c2d88778c91c5"
- },
- {
- "name": "@narratage/workspace",
- "version": "0.0.0-dev",
- "digest": "sha256:9f6dbe410a7bcab639ad0655998d36bf2d697ea1b2c1c0f52a818cef995fc0c6"
- },
- {
- "name": "@protobufjs/aspromise",
- "version": "1.1.2",
- "digest": "sha256:f2add582f001704c44380f69857f6d90976f8253b0d50aa78a3a18f07631f13b"
- },
- {
- "name": "@protobufjs/base64",
- "version": "1.1.2",
- "digest": "sha256:06b2c0c727a5c9245ca32469d0e5dd3476a1e16ba784de9a95e74378dad3be9f"
- },
- {
- "name": "@protobufjs/codegen",
- "version": "2.0.5",
- "digest": "sha256:1c2559930a27a866b83dcb32f945cb64c250d1b9a3d4846e10f9d67da7768fb1"
- },
- {
- "name": "@protobufjs/eventemitter",
- "version": "1.1.1",
- "digest": "sha256:c7ca7d4689ac40f5eaced3b446878c365640bab53923cfeeab0700393c78fa6d"
- },
- {
- "name": "@protobufjs/fetch",
- "version": "1.1.1",
- "digest": "sha256:4994a6ce027bf9c7cacf231612c9abf1c3bca106f1449981d2a950f4d5374fa5"
- },
- {
- "name": "@protobufjs/float",
- "version": "1.0.2",
- "digest": "sha256:6b39ca0e75f52ebbe0677dfc91289f771ed6ef764fe9b16b1089bba341df7e1b"
- },
- {
- "name": "@protobufjs/path",
- "version": "1.1.2",
- "digest": "sha256:f08474b157f229b416f4dfcd18af1394d6958099d2fb45f19196cace5ab8eb2a"
- },
- {
- "name": "@protobufjs/pool",
- "version": "1.1.0",
- "digest": "sha256:7fa58344bd7fd34f3d82ff681a2b9a1c1563f59bc525b04af18b83cc6862e351"
- },
- {
- "name": "@protobufjs/utf8",
- "version": "1.1.2",
- "digest": "sha256:a6e8be152be53993c5419c77351035d2f50c96548ea68a93ada5174872cab407"
- },
- {
- "name": "@puppeteer/browsers",
- "version": "3.1.0",
- "digest": "sha256:9c4a4b23834c62a8501f9cff553920437bc5241e5f2544d315784988b9b4d22c"
- },
- {
- "name": "@swc/helpers",
- "version": "0.5.23",
- "digest": "sha256:01e3a2aad97cb967224f124ee00312ed152a533f41c000975a3210efd6772315"
- },
- {
- "name": "@types/node",
- "version": "24.10.1",
- "digest": "sha256:8fa0086cef5b28049d3962a131ab7b458f6c6c123fd34439963f2b49c92e26aa"
- },
- {
- "name": "@types/retry",
- "version": "0.12.0",
- "digest": "sha256:3c0d455fdb883a9189bef24b8c28c20e38b1b81790627941fc52345f883776df"
- },
- {
- "name": "adm-zip",
- "version": "0.6.0",
- "digest": "sha256:b406b53cc1036ecd32ccd3a8f3be7910407e0206e47ac1f66e9024c37dedcdcb"
- },
- {
- "name": "agent-base",
- "version": "7.1.4",
- "digest": "sha256:87c907df716766b5486f32790957525a8d90af4ebec634205d4a2c22a767cae7"
- },
- {
- "name": "ansi-regex",
- "version": "6.2.2",
- "digest": "sha256:68e9c06b4a3650fed19bf0a3c20b215197209ddf856caa9a1a37b7f65de5a261"
- },
- {
- "name": "ansi-styles",
- "version": "6.2.3",
- "digest": "sha256:08da2e7a0903460c053d125d67ba55ac722d241ad858a09d3c6a0dfddf463e9e"
- },
- {
- "name": "base64-js",
- "version": "1.5.1",
- "digest": "sha256:21a8ff2186d871c92b2c8958df9d84ec967c2ecc26cb34a4632ee97856a7f3e1"
- },
- {
- "name": "bignumber.js",
- "version": "9.3.1",
- "digest": "sha256:c92307157c59bc4c56472278bb6ff718de1c31b56966927fa4eed154a3346e10"
- },
- {
- "name": "boolean",
- "version": "3.2.0",
- "digest": "sha256:9b07b070e89665a6ac71741ea8dd263a61b6bc3092f5c0236539cfe27c261ae5"
- },
- {
- "name": "brotli",
- "version": "1.3.3",
- "digest": "sha256:6e0c406465c179419228a0d4216e6224c40f37f60b19633e40c5b82a6bb3ba85"
- },
- {
- "name": "buffer-equal-constant-time",
- "version": "1.0.1",
- "digest": "sha256:8d532751643065156075c5b68d933386cde05759e773cccef4b77b2603f5d710"
- },
- {
- "name": "bundle-name",
- "version": "4.1.0",
- "digest": "sha256:56f299ebfb4532b990395d71ada619f840f8c53e8eef6308ce7bde7637c00e42"
- },
- {
- "name": "chownr",
- "version": "3.0.0",
- "digest": "sha256:480200db20b6b01b0187ae42d558bdf27e6f73c125c6c9563484bb588efdd52e"
- },
- {
- "name": "chromium-bidi",
- "version": "17.0.2",
- "digest": "sha256:7bce511709957dca1ea983de42c287aceebb65c0bfd6187487bcd30d52043275"
- },
- {
- "name": "citty",
- "version": "0.2.2",
- "digest": "sha256:2b96f0ef41541f40c6f3a67af0c3a743a56e2bf112d9243f52d492ac291b4fc6"
- },
- {
- "name": "cliui",
- "version": "9.0.1",
- "digest": "sha256:2f6fb31a6f05a074d8adde9542a46b71d956e278023349a21faaecfc1c6eb3f9"
- },
- {
- "name": "clone",
- "version": "2.1.2",
- "digest": "sha256:6b43f7ff5c6b3d978e723fc90dd0189436551098ec7138745f78b4a2f0b9f92a"
- },
- {
- "name": "compare-versions",
- "version": "6.1.1",
- "digest": "sha256:0ecd82fb4bbcae3fb65167f1df07c5a20edf3a48bac63ac2c184807bc56ecb2e"
- },
- {
- "name": "data-uri-to-buffer",
- "version": "4.0.1",
- "digest": "sha256:c83b4a18728c036e0a089e8d87706b7518784740ab58dc58ab7359d01cf3f1a4"
- },
- {
- "name": "debug",
- "version": "4.4.3",
- "digest": "sha256:304ed6a95b411a078e03c3916e660500aa9f9de06bf11cc06033ad54a707159a"
- },
- {
- "name": "default-browser-id",
- "version": "5.0.1",
- "digest": "sha256:b82fe817c2d5f1c050e5b584b1eb8ce0451a17cceebb89f44d99e92957e53cbd"
- },
- {
- "name": "default-browser",
- "version": "5.5.0",
- "digest": "sha256:170da580f2ba618cf36559651c369ce0e0b4c41c7faa4e147dfceefc22623c91"
- },
- {
- "name": "define-data-property",
- "version": "1.1.4",
- "digest": "sha256:fca69f48ebf1f761ed87558da2bf54e89279c2584fcde2dfe5251eeb1bbe49ba"
- },
- {
- "name": "define-lazy-prop",
- "version": "3.0.0",
- "digest": "sha256:d2ae304cf9cedf0e9884084f1b12c57ac626c35ed65591209bd1ed28e1c636cd"
- },
- {
- "name": "define-properties",
- "version": "1.2.1",
- "digest": "sha256:14a3c2884fe52795ff8d4989c42ac4eef50b03e43f092906e8bb9840f8c604ed"
- },
- {
- "name": "detect-libc",
- "version": "2.1.2",
- "digest": "sha256:f6d1cbe84b3768d0e4ec3a27f4935426f28d6db884b5154d316a3eb602b4f05a"
- },
- {
- "name": "detect-node",
- "version": "2.1.0",
- "digest": "sha256:e23f21cd23c3ac8eeb414fdd1cf07b444d5304d9e911489d093a54598eeec6f0"
- },
- {
- "name": "devtools-protocol",
- "version": "0.0.1653615",
- "digest": "sha256:0bc61b4492f895d3371a959e93936a707d30f0594ea1eb78924930392348c953"
- },
- {
- "name": "dfa",
- "version": "1.2.0",
- "digest": "sha256:f03697bc42cb361276cadcea1f3354f3192f359929d16589ff76cdfb772190da"
- },
- {
- "name": "ecdsa-sig-formatter",
- "version": "1.0.11",
- "digest": "sha256:c55a4220e735c26105c997912755884cf1f28e199c254bbd20522697c78b75c5"
- },
- {
- "name": "emoji-regex",
- "version": "10.6.0",
- "digest": "sha256:d4264fdc970ebe1e634439e4ccdf6b36bfb6e26ebad76ca797dcf18f58502433"
- },
- {
- "name": "es-define-property",
- "version": "1.0.1",
- "digest": "sha256:e65a28b769b86eb72a671971474f14d847c452b610cdedca2034ac4f487b41b1"
- },
- {
- "name": "es-errors",
- "version": "1.3.0",
- "digest": "sha256:15f3b370a55bf67732a9cf17b937e397921adeab248d83f24180d2e14d9b6bde"
- },
- {
- "name": "es6-error",
- "version": "4.1.1",
- "digest": "sha256:71b2330b85518b245ca6adefb1d77a696e750066d7229fd77ee51faea2a5d5a0"
- },
- {
- "name": "esbuild",
- "version": "0.25.12",
- "digest": "sha256:be6c7e2b09ea76a30532597e0171955e4588e7d4b984cb451f48f6cd3792240c"
- },
- {
- "name": "escalade",
- "version": "3.2.0",
- "digest": "sha256:3bb68ed8d0bf46965d493d7dc86d31eed3e8bcc82a07e20add860f51c106fd76"
- },
- {
- "name": "escape-string-regexp",
- "version": "4.0.0",
- "digest": "sha256:bf695cc4ec820bb7987a35f1af3d14f282a12a38594034836c2c292fc5050f98"
- },
- {
- "name": "extend",
- "version": "3.0.2",
- "digest": "sha256:c750753a00e753b94978ebf4a84d2bd75353fee1b88a8d85ac1e20ff6a1a365d"
- },
- {
- "name": "fast-deep-equal",
- "version": "3.1.3",
- "digest": "sha256:42ed3c3d2be15e877da479f9efe80816a085c7b3d57fe775d8e27e017546df5d"
- },
- {
- "name": "fetch-blob",
- "version": "3.2.0",
- "digest": "sha256:8a36c6aa8a9c8590e310d56fbf34b18f50687671554f7e812720acdfec8a7a0b"
- },
- {
- "name": "fontkit",
- "version": "2.0.4",
- "digest": "sha256:d2d7bf266cf637cbf1c1793701cdb859e99c16f12a3fb695d3f51341508c25d0"
- },
- {
- "name": "formdata-polyfill",
- "version": "4.0.10",
- "digest": "sha256:b9e931ab6b16d43c9381acd755f875752bff06fb508bdf07ff7ea0880b48d17a"
- },
- {
- "name": "gaxios",
- "version": "7.3.0",
- "digest": "sha256:2991703a4dafa9356326e924f7d66845f1f194662f5ef6a7ee6b8d7a29069cf5"
- },
- {
- "name": "gcp-metadata",
- "version": "8.1.2",
- "digest": "sha256:af943933cc72cc8a0a8cbd66933574b4c7820b1c938bf3ae870dc2d29daa69e9"
- },
- {
- "name": "get-caller-file",
- "version": "2.0.5",
- "digest": "sha256:9299b9f4312e40ce1abc93cf8508accfb7b9dfe0e2296e76861aee9832953f2b"
- },
- {
- "name": "get-east-asian-width",
- "version": "1.6.0",
- "digest": "sha256:80eb6329f500e01c525d107113329a5e19875dccee4a2dedd44bdb5d25928aeb"
- },
- {
- "name": "giget",
- "version": "3.3.1",
- "digest": "sha256:9095c8b2da2f8477877a1989dd7916da8bfb9a5545012d3da7a7bb50ff9eaa6c"
- },
- {
- "name": "global-agent",
- "version": "3.0.0",
- "digest": "sha256:138a78e1e7a5b8a3239361cbe4caf161c508f052b1b304cc6669470fb72816c2"
- },
- {
- "name": "globalthis",
- "version": "1.0.4",
- "digest": "sha256:df76d0da25ab8f020149cf066d2b62f82b65507c51a9c52cf6a3789e9a95ed8d"
- },
- {
- "name": "google-auth-library",
- "version": "10.9.1",
- "digest": "sha256:b7f30655126e71587c52c64baca556ce2ab5d3e2fbc2030f4f396acaa1b7afe0"
- },
- {
- "name": "google-logging-utils",
- "version": "1.1.3",
- "digest": "sha256:30c7f506015c8218718eceacd978339dfc50cee3a95cdbb04d5d7d677973f044"
- },
- {
- "name": "gopd",
- "version": "1.2.0",
- "digest": "sha256:463bf770beed8a51af109438a6555033de1bda940f5107edd84ace4e6ae3abb7"
- },
- {
- "name": "has-property-descriptors",
- "version": "1.0.2",
- "digest": "sha256:47f1621c5f96430ea46c12fa90c0b41c5e4648f3c5e3e8b6956ec6da91019d9c"
- },
- {
- "name": "hono",
- "version": "4.12.32",
- "digest": "sha256:ae1c33cc0a384ff91e495e9cc15265037386a0e80b23e0f29c27414a21bc1790"
- },
- {
- "name": "https-proxy-agent",
- "version": "7.0.6",
- "digest": "sha256:1013657bea7f02247aee642cbfdf6dca7a534d331b6eed367cf52c08b3c178ca"
- },
- {
- "name": "hyperframes",
- "version": "0.7.101",
- "digest": "sha256:24b78079c74422ce7aa3c3fd4ef79a2b40e2ea00127e7a8a7eb8be5d865e0853"
- },
- {
- "name": "ignore",
- "version": "5.3.2",
- "digest": "sha256:7ce8e139988a7b67710913ff265acfc7993aff1fba9b86bb984b3b999ef4d8b1"
- },
- {
- "name": "is-docker",
- "version": "3.0.0",
- "digest": "sha256:d43df9b09e7fd1e920406578921e339b79b4c6a523c25b3a0174b852caad2b41"
- },
- {
- "name": "is-inside-container",
- "version": "1.0.0",
- "digest": "sha256:7c224fc7e359fea06620a9f78c40826d544960685f9300451f58da95f6824aa1"
- },
- {
- "name": "is-wsl",
- "version": "3.1.1",
- "digest": "sha256:cd19b82a536ef031451c4e195351671f5c605cc1e2e6c435d38be0d439ebbc80"
- },
- {
- "name": "json-bigint",
- "version": "1.0.0",
- "digest": "sha256:78dbd36c1b196e087861980c4b198b2d2a4184856ab0cde2e9a2d8b640447b7a"
- },
- {
- "name": "json-stringify-safe",
- "version": "5.0.1",
- "digest": "sha256:cf420f3e9067d97fbd8718cce170ee811dcbe682296a80ea9c2a1b84fa49418d"
- },
- {
- "name": "jwa",
- "version": "2.0.1",
- "digest": "sha256:1ce4c87eefeff5866cc15c5358d465af06e4d1c762aa4d3bcca1dd77b085733d"
- },
- {
- "name": "jws",
- "version": "4.0.1",
- "digest": "sha256:9600a6d676cf870a248805ccc40bfda53e1194edf481e78fe7deab6c6f5ff123"
- },
- {
- "name": "long",
- "version": "5.3.2",
- "digest": "sha256:3d4d047be707c9fcd186c912864dcc9e0937a69dddf2f64b659d0a5e352d9c3e"
- },
- {
- "name": "matcher",
- "version": "3.0.0",
- "digest": "sha256:5bd2c657e8d48258b4eee6b85abfd6baeea1905880e1961b87e2f5d1b666f363"
- },
- {
- "name": "minipass",
- "version": "7.1.3",
- "digest": "sha256:b3c7c7268719f290572b07cc710c208f964e7e03cd5e4c87f6ee78931cb42d8e"
- },
- {
- "name": "minizlib",
- "version": "3.1.0",
- "digest": "sha256:ccd3f7ae56753854094bd4c874baf36ed0464f627c80c902402d7266c9b61339"
- },
- {
- "name": "mitt",
- "version": "3.0.1",
- "digest": "sha256:ce6aef694a3aa3a2aa0238ced1462fdd1e6365fa2ff5e49a175a9fad1f5c29a9"
- },
- {
- "name": "modern-tar",
- "version": "0.7.7",
- "digest": "sha256:891e12cd4440bfdcb4db46ba8e4a3a3f7a752ad42d26d3f4c5948762894a31b2"
- },
- {
- "name": "ms",
- "version": "2.1.3",
- "digest": "sha256:a141890e3a2dfb54d5bdd95b901821c311d9841e7f2ce2e3e5dbabee3af4e66d"
- },
- {
- "name": "nanoid",
- "version": "3.3.16",
- "digest": "sha256:ed57ac355bbd0cd97a4325bef9895b2d842a9b46ada0ba3a255a93c496872768"
- },
- {
- "name": "node-domexception",
- "version": "1.0.0",
- "digest": "sha256:8415ab26ce05a24c58531f511872cc884be27733e9879a9b14c0644f0f288ef3"
- },
- {
- "name": "node-fetch",
- "version": "3.3.2",
- "digest": "sha256:3cf962b70037de2f7ddc2d715b498cdec94400649ea3907c1a1f4c760e553b3e"
- },
- {
- "name": "object-keys",
- "version": "1.1.1",
- "digest": "sha256:e93bdcdfbfebe00ef728b53ec4d1ec41dfa3e7598520255106b84fe25c4600cf"
- },
- {
- "name": "onnxruntime-common",
- "version": "1.21.1",
- "digest": "sha256:8ecfbe59731de65bdff1f5b82652af349f93b66db55de3f49aa4b067e5b6a9ff"
- },
- {
- "name": "onnxruntime-node",
- "version": "1.21.1",
- "digest": "sha256:de224ff89b23f42422f15ba1d1a40a8624436a246f60ffa21dc5d6eb8bbe7bc9"
- },
- {
- "name": "open",
- "version": "10.2.0",
- "digest": "sha256:704838b6e442ca0c07b232e471e2d33e3f8c3907ff4dac65c34cc5452e690f80"
- },
- {
- "name": "p-retry",
- "version": "4.6.2",
- "digest": "sha256:ad26b9b16e3bcac0fd71295607fb400e5cccc3e9cebaef2477b187cc06820c40"
- },
- {
- "name": "pako",
- "version": "0.2.9",
- "digest": "sha256:bc932e8cd7a506f19b273d28312c01eca0eb29a8277b3341d52f72c8a3c6dc87"
- },
- {
- "name": "picocolors",
- "version": "1.1.1",
- "digest": "sha256:533a587e52703f20267c68cce3bb13d15f0d111e77641b4fc15dfd0909541da7"
- },
- {
- "name": "postcss",
- "version": "8.5.25",
- "digest": "sha256:86cae1a4a2f7db456622414bdc5fab2f2894a814431206dae3bd56b5da0c8da7"
- },
- {
- "name": "prettier",
- "version": "3.9.6",
- "digest": "sha256:ab64dd2b905d298318673b85f56619555497b4c4ca587e65cc87cbd0088be18f"
- },
- {
- "name": "protobufjs",
- "version": "7.6.5",
- "digest": "sha256:f261811e191755ef6c287354088d20f040f51f8106917669940f0efe90c51378"
- },
- {
- "name": "puppeteer-core",
- "version": "25.5.0",
- "digest": "sha256:c7081e270d302135c3febe5e13145104041d2ce60307b1fba3cba83d8a9ac5e7"
- },
- {
- "name": "restructure",
- "version": "3.0.2",
- "digest": "sha256:afe0b1af07f709de30108a7f34d1cbc24240d5af47058908b3ab948387411f47"
- },
- {
- "name": "retry",
- "version": "0.13.1",
- "digest": "sha256:20439b301564d3af33e4a4ae5a14fdb20546f77d4f467706301b444645d3a3f7"
- },
- {
- "name": "roarr",
- "version": "2.15.4",
- "digest": "sha256:95a31fad16046a827ad5f4aecede3eabca4590bebb7c558fb4319f692c382f2e"
- },
- {
- "name": "run-applescript",
- "version": "7.1.0",
- "digest": "sha256:7a1b536c998db95296d89b6adfcdde3849eae8ebb938a88343dd7880feb1010f"
- },
- {
- "name": "safe-buffer",
- "version": "5.2.1",
- "digest": "sha256:bf6c4b10b5ebca05c55cb32fc8da545f8200e8ac3e73233d9b8d30d3206b229e"
- },
- {
- "name": "semver-compare",
- "version": "1.0.0",
- "digest": "sha256:3b5950314b60d01814af7091f197e54621d66500d0c6b30f1622f12fd2fbe86c"
- },
- {
- "name": "semver",
- "version": "7.8.5",
- "digest": "sha256:782f8f680bcdbb9a8adad55a695c158f2c75a3ca1a7440d7174ba0164f666b1d"
- },
- {
- "name": "serialize-error",
- "version": "7.0.1",
- "digest": "sha256:16c05ffdf0930c58bdf64a77ff384fdfc90d41006e640cfb58a2dd2772931b4d"
- },
- {
- "name": "sharp",
- "version": "0.35.3",
- "digest": "sha256:d5a0288867e280eafbb69100ba8df01a02b6ee36a0106111d083f06e2e6093f2"
- },
- {
- "name": "source-map-js",
- "version": "1.2.1",
- "digest": "sha256:ebeb8811bac667d76a17286fb9e2398e970224d4caf437039330b6a7a1cbd6e8"
- },
- {
- "name": "sprintf-js",
- "version": "1.1.3",
- "digest": "sha256:c745235a5311cf6565a67449381ba71ab68fbb1f244180b547d4c7783b530d94"
- },
- {
- "name": "string-width",
- "version": "7.2.0",
- "digest": "sha256:6d33893de56cb9280537fad3eac2a768c279e403431764010cdfae3051f061fd"
- },
- {
- "name": "string-width",
- "version": "8.2.2",
- "digest": "sha256:ff4c8083cc6990b6514251a1430f6f5ea1fc5df49eb09085ece93ebea3a8a8bd"
- },
- {
- "name": "strip-ansi",
- "version": "7.2.0",
- "digest": "sha256:d93d07a9c18cd1a7c3b97b06ab2b67771b10ec1bd3e8a566d71042e8f75c5103"
- },
- {
- "name": "tar",
- "version": "7.5.22",
- "digest": "sha256:cd33e317cf398c1e65cde8099cb2f6ad40797b59bc950b5ae21cc174f263604a"
- },
- {
- "name": "tiny-inflate",
- "version": "1.0.3",
- "digest": "sha256:1bf162535f9aa8155774d4be09711f32730e6a5b5433706155e485b7b6ed8d46"
- },
- {
- "name": "tslib",
- "version": "2.8.1",
- "digest": "sha256:be0ff64197522f7466475b202e5642ac2fc7453bf77bd401e3c5af405fae5e08"
- },
- {
- "name": "type-fest",
- "version": "0.13.1",
- "digest": "sha256:7ecf27eb506bbdff58c42c4fa8ca5d7f9fe371d77503a41d8d0dd96070ff5ba9"
- },
- {
- "name": "typed-query-selector",
- "version": "2.12.2",
- "digest": "sha256:03010157f77e88b71831120e82c8d607d61c13d0dde047793fe2752e26bd9bab"
- },
- {
- "name": "undici-types",
- "version": "7.16.0",
- "digest": "sha256:56b851f33e38ba7913791a0d6cd2d862088b1efabe04fc599f961cf0611e12f5"
- },
- {
- "name": "unicode-properties",
- "version": "1.4.1",
- "digest": "sha256:f32f120a86229d5ddc6253bd8362ca9f3ec6665c55dcd4b12207db642a506524"
- },
- {
- "name": "unicode-trie",
- "version": "2.0.0",
- "digest": "sha256:32767668f5e23f4e9882cff32feae4b9dae6a9a5516ad4aeabf0fd01e856e6a5"
- },
- {
- "name": "web-streams-polyfill",
- "version": "3.3.3",
- "digest": "sha256:a9a0913d9acc78134f762f33c210311fada5ec4dcc0cb913bd237338f2fb8840"
- },
- {
- "name": "webdriver-bidi-protocol",
- "version": "0.4.2",
- "digest": "sha256:fe55ecd5a6990c02d57aa3149d4d4bcbd62cd27fcd69ee859739c91a0673f36c"
- },
- {
- "name": "wrap-ansi",
- "version": "9.0.2",
- "digest": "sha256:7db579468d39db77518c5f6951ac1b36330b5d81253e762ca171872aa9a6a3f3"
- },
- {
- "name": "ws",
- "version": "8.21.1",
- "digest": "sha256:e301f9237b858df0cc503d608fd5918640518c3378d8373d1f8a763e7977f838"
- },
- {
- "name": "wsl-utils",
- "version": "0.1.0",
- "digest": "sha256:5a8be00a56eb39f7923f42016f86f7ef3d15f36794d189ca9615d8b84ef8245f"
- },
- {
- "name": "y18n",
- "version": "5.0.8",
- "digest": "sha256:b60b70efd3b784a66f22536369d3c445582c3a76b6903615726c9743fff936e3"
- },
- {
- "name": "yallist",
- "version": "5.0.0",
- "digest": "sha256:d16e9bce9588bb0f5b3cf3a3d16e6628b0d234b58d6d85961a946fabf52ad4ee"
- },
- {
- "name": "yargs-parser",
- "version": "22.0.0",
- "digest": "sha256:4341e3a4b3ea190fc549c665549a24b30bb0ca67e8607cbf4e72eaa497d7b493"
- },
- {
- "name": "yargs",
- "version": "18.1.0",
- "digest": "sha256:c2f28503e8f01b19f87037b16b4bcd7145bad43dbe79bed7beab51c031cbc39d"
- },
- {
- "name": "zod",
- "version": "3.25.76",
- "digest": "sha256:6771243deb9b85f002496af9a1ffd198078b61794ef04e352fbe062c9cfa083a"
- }
- ],
- "packages": [
- {
- "package": {
- "name": "@narratage/artifact-store-fs",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/artifact-store-fs"
- }
- ],
- "facetsDigest": "sha256:d06bf1c242e6b819ab605471f7332e1150e1ebf5f81e08cf77f9bfff082ea197",
- "closureDigest": "sha256:941a2c17d30e3cc733a8415557aecd80c45b7de0493ee69b670270fc7e492ae2"
- },
- {
- "package": {
- "name": "@narratage/credential-store-env",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/credential-store-env"
- }
- ],
- "facetsDigest": "sha256:cac24cfb3965fe73d76c8b90e1fb676ff5f7606928fb38ff3b1aeb8eb9e3ea0e",
- "closureDigest": "sha256:e3dfea4ee0734eb0ae53593b5aaae2ee05d652aa6322055e0dc0d3a58e4009b1"
- },
- {
- "package": {
- "name": "@narratage/local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.node-runtime-host-adapter@1",
- "name": "@narratage/local"
- },
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/local"
- }
- ],
- "facetsDigest": "sha256:552616c833a22031c623b0ad24f08a843f72f332eff2113032d63e2539d42e88",
- "closureDigest": "sha256:8baca82be34ae891ca52c8835e23116e51ccf59086ae3f90243f5c41bc6c12f0"
- },
- {
- "package": {
- "name": "@narratage/provider-google-vertex",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-google-vertex"
- }
- ],
- "facetsDigest": "sha256:485fc29d1efcdaeb4e395980975b35090ea6aef0f78d02108d3bd9b3f11aeb91",
- "closureDigest": "sha256:a9c49b1ee0b7e446739c552f006efdb2e02a6fbd95026be9ac2e2a4f579bcbff"
- },
- {
- "package": {
- "name": "@narratage/provider-hyperframes-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-hyperframes-local"
- }
- ],
- "facetsDigest": "sha256:e08dde3e4d38b167dca29cdc54eb2bb5e9ebc294e0e42b371099d53d6c44b402",
- "closureDigest": "sha256:8716f0eda32fec48f21cccfdb15b953f6708100923be2f9d1ed577c10db40f19"
- },
- {
- "package": {
- "name": "@narratage/provider-kie",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-kie"
- }
- ],
- "facetsDigest": "sha256:110648301d69b5b49ea553d285a27626f6fb74ebc74ee67175f688f914d7d74b",
- "closureDigest": "sha256:f7f87ad8a1ad76f950edf27bbd8a69bc9080da2b408fec8945d619cea8bf3208"
- },
- {
- "package": {
- "name": "@narratage/provider-media-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-media-local"
- }
- ],
- "facetsDigest": "sha256:998de772acb283828fee16310e77922bf43597bca1efa768e8398166a90af27d",
- "closureDigest": "sha256:d8386c799c6f77909767076e81a3932be033bf24e0eb65b07f79a14e7bf759a8"
- },
- {
- "package": {
- "name": "@narratage/provider-whisperx-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-whisperx-local"
- }
- ],
- "facetsDigest": "sha256:e7d4f1e2fd56f2bcb5dbc36e1faae48d2680bb839aed4a43eb0cb23207ffbe1d",
- "closureDigest": "sha256:8e38557baf5fb4c5abcdc4f6a702a8e792fd19b36a088e0f9fee6a68577e367b"
- },
- {
- "package": {
- "name": "@narratage/store-sqlite",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/store-sqlite"
- }
- ],
- "facetsDigest": "sha256:dcd11bfeb19b68e69aeecd31d34de36045dd92e36039d651385081ce4180080b",
- "closureDigest": "sha256:dbc85921b27942e27a5fde033803962733f20970536cbdfd2059ff249e22d946"
- }
- ],
- "digest": "sha256:a038c726f4d7a38e761a8d07b317187e7bd1178130560e0aeeeaa6c75c2fcd30"
-}
diff --git a/examples/bootstrap/README.md b/examples/bootstrap/README.md
index c41746ac..8d361315 100644
--- a/examples/bootstrap/README.md
+++ b/examples/bootstrap/README.md
@@ -5,8 +5,7 @@ self-described Markup entry source can import the Script Surface and recursively
source selected by another Header. There is no built-in video prelude or suffix-selected parser:
```bash
-node --run narratage -- check examples/bootstrap/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --root .
+narratage check examples/bootstrap/main.svml --workspace .
```
The Recipe is intentionally unused. This example therefore checks Source/Module Closure and
diff --git a/examples/street-interview-preview/align-transcript.ts b/examples/street-interview-preview/align-transcript.ts
index 03b38968..2f87d2c1 100644
--- a/examples/street-interview-preview/align-transcript.ts
+++ b/examples/street-interview-preview/align-transcript.ts
@@ -80,7 +80,7 @@ for (const scene of SCENES) {
// long as the whole frames its recordings occupy.
const frameCount = Math.ceil(elapsed * FRAME_RATE.numerator / FRAME_RATE.denominator);
const space: ProgramSpace = sealProgramSpace({
- contract: "svml.program-space@1",
+ contract: "narratage.program-space@1",
durationSec: frameCount * FRAME_RATE.denominator / FRAME_RATE.numerator,
frameRate: { ...FRAME_RATE },
});
@@ -104,7 +104,7 @@ const segments: AlignedTranscriptSegment[] = bounds.map((segment) => ({
}));
const evidence: AlignedTranscriptEvidence = {
- contract: "svml.aligned-transcript-evidence@1",
+ contract: "narratage.aligned-transcript-evidence@1",
durationSec: space.durationSec,
segments,
};
@@ -116,7 +116,7 @@ const evidence: AlignedTranscriptEvidence = {
* the bytes.
*/
const basis: SpeechAudioBasis = {
- contract: "svml.speech-audio-basis@1",
+ contract: "narratage.speech-audio-basis@1",
programSpace: space,
audio: {
kind: "blob",
diff --git a/examples/street-interview-preview/space.json b/examples/street-interview-preview/space.json
index d897c40c..df007639 100644
--- a/examples/street-interview-preview/space.json
+++ b/examples/street-interview-preview/space.json
@@ -1,5 +1,5 @@
{
- "contract": "svml.program-space@1",
+ "contract": "narratage.program-space@1",
"durationSec": 31.291666666666668,
"frameRate": {
"numerator": 24,
diff --git a/examples/street-interview-preview/timing.json b/examples/street-interview-preview/timing.json
index b9ad5bd9..950144e0 100644
--- a/examples/street-interview-preview/timing.json
+++ b/examples/street-interview-preview/timing.json
@@ -1,5 +1,5 @@
{
- "contract": "svml.complete-semantic-map@1",
+ "contract": "narratage.complete-semantic-map@1",
"tokens": [
{
"tokenId": "segment:hook:token:1",
diff --git a/examples/talking-film-graph-check/README.md b/examples/talking-film-graph-check/README.md
index 31d69835..9e10f338 100644
--- a/examples/talking-film-graph-check/README.md
+++ b/examples/talking-film-graph-check/README.md
@@ -6,12 +6,10 @@ explicit HyperFrames rendering. `check` and `plan` do not invoke Seedance, Whisp
HyperFrames.
```bash
-node --run narratage -- check examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --root .
-node --run narratage -- check examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --root .
-node --run narratage -- plan examples/talking-film-graph-check/build.svrun \
- --package-lock examples/talking-film-graph-check/svml.packages.lock --root .
+cd examples/talking-film-graph-check
+narratage check main.svml
+narratage check build.svrun
+narratage plan build.svrun
```
The Gemini planner receives readable indivisible display atoms and resolved Style runs only. Its
diff --git a/examples/talking-film-graph-check/svml.packages.lock b/examples/talking-film-graph-check/svml.packages.lock
deleted file mode 100644
index 8ff88f38..00000000
--- a/examples/talking-film-graph-check/svml.packages.lock
+++ /dev/null
@@ -1,1228 +0,0 @@
-{
- "format": "svml.node-package-lock@1",
- "selected": [
- "@narratage/artifact",
- "@narratage/caption",
- "@narratage/caption-fine",
- "@narratage/caption-gemini",
- "@narratage/composition",
- "@narratage/film",
- "@narratage/fonts-open",
- "@narratage/generation",
- "@narratage/hyperframes",
- "@narratage/media",
- "@narratage/media-pipeline",
- "@narratage/media-track",
- "@narratage/narrative",
- "@narratage/program-space",
- "@narratage/render-hyperframes",
- "@narratage/run-markup",
- "@narratage/script",
- "@narratage/seedance",
- "@narratage/semantic-map",
- "@narratage/spatial",
- "@narratage/speech",
- "@narratage/speech-alignment",
- "@narratage/speech-basis",
- "@narratage/speech-evidence",
- "@narratage/speech-spine",
- "@narratage/svs",
- "@narratage/temporal",
- "@narratage/text",
- "@narratage/typography-track",
- "@narratage/visual-ir",
- "@narratage/whisperx"
- ],
- "artifacts": [
- {
- "name": "@fontsource-variable/archivo",
- "version": "5.3.0",
- "digest": "sha256:d0756ae991869df099871e469cc1a3206efc9c50ab34298da0b97aec284fec88"
- },
- {
- "name": "@fontsource-variable/bodoni-moda",
- "version": "5.3.0",
- "digest": "sha256:124e5f7bd2cd952ba895a72847b89bc4fa0a0d831644466393efe61b050622f8"
- },
- {
- "name": "@fontsource-variable/cabin",
- "version": "5.3.0",
- "digest": "sha256:c0da1888b21a3fdc8b391a08b7a59459ce2bdde5a4550bbd34cd6aaf381af93c"
- },
- {
- "name": "@fontsource-variable/caveat",
- "version": "5.3.0",
- "digest": "sha256:21e2ae66cd592a9bd0b53714d04b4aa9adeda6c9340d6180f174829155af2dbe"
- },
- {
- "name": "@fontsource-variable/cinzel",
- "version": "5.3.0",
- "digest": "sha256:883ab987aaf354347d03b5c4a6e59068611dff971011b75c0a2cd8785d084b85"
- },
- {
- "name": "@fontsource-variable/cormorant-garamond",
- "version": "5.3.0",
- "digest": "sha256:5fb212991abe42dc54820a0e99a50d54fd68b8794e05e01fcecd88bc3d9b718f"
- },
- {
- "name": "@fontsource-variable/crimson-pro",
- "version": "5.3.0",
- "digest": "sha256:2af0252ef3293e7f7213467bf2908cbd92a1ac1ef2de8a37ed3134aa553b0854"
- },
- {
- "name": "@fontsource-variable/dm-sans",
- "version": "5.3.0",
- "digest": "sha256:282b5942ecdf37ecb2946c271874f16053e32d7984e465bafa848cd70979b7c5"
- },
- {
- "name": "@fontsource-variable/eb-garamond",
- "version": "5.3.0",
- "digest": "sha256:3f839e82eff702919083009237af1c1975b80f8d9766ac5f97a291cfbf82dea0"
- },
- {
- "name": "@fontsource-variable/figtree",
- "version": "5.3.0",
- "digest": "sha256:bbd1e28aae1070c95fe09ce9bdc94e310b950d35e13d0817fce344d2a57a5c07"
- },
- {
- "name": "@fontsource-variable/fira-code",
- "version": "5.3.0",
- "digest": "sha256:26593d3b4aab4bef1d37b2f7b301739efd6861020b1f44e2cddf14b933453d72"
- },
- {
- "name": "@fontsource-variable/fraunces",
- "version": "5.3.0",
- "digest": "sha256:1da79839589a15663f4c0a75f91899450e20b8d6bd91044c826d07f4ca4d3771"
- },
- {
- "name": "@fontsource-variable/fredoka",
- "version": "5.3.0",
- "digest": "sha256:aeb50015a5e92b2033e5358f391f1221cf7a461f5793ab28d516fa0ee535af85"
- },
- {
- "name": "@fontsource-variable/geist-mono",
- "version": "5.3.0",
- "digest": "sha256:9122fc7e67d7f2788cb82b2eacd489a9430435133488962cbe9ab40ff952dccd"
- },
- {
- "name": "@fontsource-variable/geist",
- "version": "5.3.0",
- "digest": "sha256:01af74b4d77592a1d560c1992568eca3e719117b81b5c2c8798281680180a8c4"
- },
- {
- "name": "@fontsource-variable/instrument-sans",
- "version": "5.3.0",
- "digest": "sha256:10b5fd92cf05d3259b0dfca0b37971b7c522f29b17b5804ddc5bb404ceefc7e3"
- },
- {
- "name": "@fontsource-variable/inter",
- "version": "5.3.0",
- "digest": "sha256:e4ca49893204e3b3d156d22daddb4f96c06a94cc0d0767d6f7613d84d8e3d4fe"
- },
- {
- "name": "@fontsource-variable/jetbrains-mono",
- "version": "5.3.0",
- "digest": "sha256:0445625a317f4ff6cfe58c4272334b4af720309df2339356d3fb81e40c375210"
- },
- {
- "name": "@fontsource-variable/josefin-sans",
- "version": "5.3.0",
- "digest": "sha256:5780323301d2480c3e111de34f9dfc11d24fc165be4fcfbc9293dd34da0dcadd"
- },
- {
- "name": "@fontsource-variable/jost",
- "version": "5.3.0",
- "digest": "sha256:875e424e28d005d8b467aa576de202ae3b84c243eaa52d971e946243c1973439"
- },
- {
- "name": "@fontsource-variable/league-spartan",
- "version": "5.3.0",
- "digest": "sha256:6b05150ad1aeede4aed7505507c8b69187bd25f7897dd43ff7f2e93a0028c37c"
- },
- {
- "name": "@fontsource-variable/lexend",
- "version": "5.3.0",
- "digest": "sha256:ca5800b1c654c71ad3c93a47801c2f5748e49cff9b0985ed375c67f500bd1166"
- },
- {
- "name": "@fontsource-variable/libre-baskerville",
- "version": "5.3.0",
- "digest": "sha256:5297642650a09c5a59f7e602b88b7756d379397da7c6e4dfe273b8f1cc6a225c"
- },
- {
- "name": "@fontsource-variable/lora",
- "version": "5.3.0",
- "digest": "sha256:fdea73d2d75785a45046ef9e2dd1ccac35a1194e31ddabfb0f0b95582d418943"
- },
- {
- "name": "@fontsource-variable/manrope",
- "version": "5.3.0",
- "digest": "sha256:c7821cba633009f45db0ae545cbdcd1de1ec764d299b503ade1b8da6ad7f6f07"
- },
- {
- "name": "@fontsource-variable/merriweather",
- "version": "5.3.0",
- "digest": "sha256:0c264e97ca3f76da2d31726727b120a44910ab2620a45f3e09ae938d0fdcc9c4"
- },
- {
- "name": "@fontsource-variable/montserrat",
- "version": "5.3.0",
- "digest": "sha256:b457c7e96aae71eeee8683e6af5eb766c025b2a889d03daa5298fa2e1abc2855"
- },
- {
- "name": "@fontsource-variable/mulish",
- "version": "5.3.0",
- "digest": "sha256:5ce4f4131ef5c5a7ba7f78e7ea82dc45ea0c4ec0550699cf64568e09e54dbb2d"
- },
- {
- "name": "@fontsource-variable/newsreader",
- "version": "5.3.0",
- "digest": "sha256:3c7c5e41a7d778f342a4108253e062deba68ce5bcba1bad7b3cb962e57132a7a"
- },
- {
- "name": "@fontsource-variable/noto-emoji",
- "version": "5.3.0",
- "digest": "sha256:c135feb03a6be9cabe5bef963d63cfa08c97d3ecdf521aa309324c00cacd9964"
- },
- {
- "name": "@fontsource-variable/noto-naskh-arabic",
- "version": "5.3.0",
- "digest": "sha256:f7637a644a70cf88203426e0ebce7dcb8dc672baf63370437c39fbee8b125b8e"
- },
- {
- "name": "@fontsource-variable/noto-sans-arabic",
- "version": "5.3.0",
- "digest": "sha256:5981bdd510158a68c72e42557bcb3387d6ef9ba958bf5000500fa26fe7373767"
- },
- {
- "name": "@fontsource-variable/noto-sans-devanagari",
- "version": "5.3.0",
- "digest": "sha256:dae73904faa148f60a06af6b267916b6ce656c4c333f1b1de63828b8a5639686"
- },
- {
- "name": "@fontsource-variable/noto-sans-hebrew",
- "version": "5.3.0",
- "digest": "sha256:ff616f500efb9d965be8a95d46ca13f3113704360472286f0596aa0bff5dfbc3"
- },
- {
- "name": "@fontsource-variable/noto-sans-hk",
- "version": "5.3.0",
- "digest": "sha256:faa4e754134193f0c0ffa957c9aae3b75779bd443373a3c1e9759ce5876463d5"
- },
- {
- "name": "@fontsource-variable/noto-sans-jp",
- "version": "5.3.0",
- "digest": "sha256:adf3c03671005935de55199037a2e26ebb81471f95268d7327b54aa6ffbacf62"
- },
- {
- "name": "@fontsource-variable/noto-sans-kr",
- "version": "5.3.0",
- "digest": "sha256:97da1dc319b8f42deda034729ac2bfadb0e3b0992f8034edaa39d7270ba2b042"
- },
- {
- "name": "@fontsource-variable/noto-sans-sc",
- "version": "5.3.0",
- "digest": "sha256:1c49ddaaa5d7aeb0503cfa78914bb4957259108c3dfb262d5f4b2bc49549af89"
- },
- {
- "name": "@fontsource-variable/noto-sans-tc",
- "version": "5.3.0",
- "digest": "sha256:08085bc109242c4034e966d2a9580ee02b261ea04d01dbfc27e316f99223c849"
- },
- {
- "name": "@fontsource-variable/noto-sans-thai",
- "version": "5.3.0",
- "digest": "sha256:ff0050b1cc056bcf88fd713d1dc74f42b0e8799f7931ea89da03a51a03dc4588"
- },
- {
- "name": "@fontsource-variable/noto-sans",
- "version": "5.3.0",
- "digest": "sha256:d27afb70065955c963fc96bf65580a086e6d05c9e4b81177941eb730c5e44dd4"
- },
- {
- "name": "@fontsource-variable/noto-serif-jp",
- "version": "5.3.0",
- "digest": "sha256:c442057a769b0293012b790df56d250f08ec7abf5bcbcbc6ef39b9103329ef68"
- },
- {
- "name": "@fontsource-variable/noto-serif-kr",
- "version": "5.3.0",
- "digest": "sha256:000000dfd6e3700d029217bff41b83cfd0266af9fade349b32441f16facd8dce"
- },
- {
- "name": "@fontsource-variable/noto-serif-sc",
- "version": "5.3.0",
- "digest": "sha256:7d845bd433554bc7a9dc656dc7e0818d6083b080a3e9d69956b97b2cf4221d16"
- },
- {
- "name": "@fontsource-variable/noto-serif-tc",
- "version": "5.3.0",
- "digest": "sha256:58b67399101d6fbfbd1a73c0c06c5de29e24889a1592d922f5afd1f6e550e15d"
- },
- {
- "name": "@fontsource-variable/nunito-sans",
- "version": "5.3.0",
- "digest": "sha256:491045f06b188718c4945f753678c851b0a16348e087e62ec6bd9d91a7f29f07"
- },
- {
- "name": "@fontsource-variable/onest",
- "version": "5.3.0",
- "digest": "sha256:dc69d3aba9dca697a3704954a2c9ed6ad2dde3a508f9cff3cfabf06fed2e7518"
- },
- {
- "name": "@fontsource-variable/open-sans",
- "version": "5.3.0",
- "digest": "sha256:bfa7bb83169eaf59da9c2492b9f87adaf4b07a8a2c5580ae235801842ad74b84"
- },
- {
- "name": "@fontsource-variable/oswald",
- "version": "5.3.0",
- "digest": "sha256:25e3819b4bfdd9fc8786d8d4cbc4bcc5121ad617180ab4e38e33573678a64b28"
- },
- {
- "name": "@fontsource-variable/outfit",
- "version": "5.3.0",
- "digest": "sha256:7da0bec12f2f4cc25652bd2bdfdb8686982121bf96f5182e45df5e7a67e3d134"
- },
- {
- "name": "@fontsource-variable/playfair-display",
- "version": "5.3.0",
- "digest": "sha256:9169e0b0212478bec819d29137e25a5e6770cb59508678a2b3d642706c099551"
- },
- {
- "name": "@fontsource-variable/playpen-sans",
- "version": "5.3.0",
- "digest": "sha256:0cdc396f3617afb4d405378726f48b9ef1dab85e3d1c9c4658450a09cb4335a3"
- },
- {
- "name": "@fontsource-variable/plus-jakarta-sans",
- "version": "5.3.0",
- "digest": "sha256:0d3387379914e9c6e57e67a1ccef7a943b372da8ec46de6956a5fd214e3b2609"
- },
- {
- "name": "@fontsource-variable/quicksand",
- "version": "5.3.0",
- "digest": "sha256:8443330eed78c79d91c3582df8b93d22bd82cd7bc4b7c9ae5c3c0f1499a6cac1"
- },
- {
- "name": "@fontsource-variable/raleway",
- "version": "5.3.0",
- "digest": "sha256:ac1f6114679c0177df758499b8d34def94f5b579a939bf2bb3456023ac2be6dc"
- },
- {
- "name": "@fontsource-variable/rethink-sans",
- "version": "5.3.0",
- "digest": "sha256:90242c18b19a9737e80a66ae6922a9c5bd5250a8972981ac1c09e4f8f8aee372"
- },
- {
- "name": "@fontsource-variable/roboto-condensed",
- "version": "5.3.0",
- "digest": "sha256:2b77bf05ddb63c0ebc2827d267235ee6b2851e0371c559f7a93eaf599d329b54"
- },
- {
- "name": "@fontsource-variable/roboto-mono",
- "version": "5.3.0",
- "digest": "sha256:a83a97b73d190630c8d4801333a73e2c265e0ad2480bc77056ad6a5db1672aae"
- },
- {
- "name": "@fontsource-variable/roboto-slab",
- "version": "5.3.0",
- "digest": "sha256:b6d68b8e9932671733d77695b50c09a23e804e952b7ab8da1a05f06ac827cfef"
- },
- {
- "name": "@fontsource-variable/roboto",
- "version": "5.3.0",
- "digest": "sha256:22fd32070d7eb714439e18dfd00da736b833a4ea4f661c8a3b1761ffe8895b30"
- },
- {
- "name": "@fontsource-variable/rubik",
- "version": "5.3.0",
- "digest": "sha256:b66dbc0f67e2c1e9b075f6ee5ed7eff18a3f7398bfdbc3c463962d1bb5064487"
- },
- {
- "name": "@fontsource-variable/shantell-sans",
- "version": "5.3.0",
- "digest": "sha256:18dcfa8618a3ff5bd420e46bac5fcdbc659242f3c0a67f45fc3ef598a9709fae"
- },
- {
- "name": "@fontsource-variable/sora",
- "version": "5.3.0",
- "digest": "sha256:bd5ff142c0797c37b763ae0a97bd1e9469ae163d084887a4660c73d2cf019693"
- },
- {
- "name": "@fontsource-variable/source-serif-4",
- "version": "5.3.0",
- "digest": "sha256:9833b70d7a2c410496ec00794b3c26034593353ac76fe173f3a6df2e958f6167"
- },
- {
- "name": "@fontsource-variable/space-grotesk",
- "version": "5.3.0",
- "digest": "sha256:9a601acdf9e2b9656f537f6691b40152dbc0c9043b249eeda4980281bcced5e5"
- },
- {
- "name": "@fontsource-variable/unbounded",
- "version": "5.3.0",
- "digest": "sha256:f664f5bbef08608533b00016c00a89b623df987b10a89d4832251b2440370c16"
- },
- {
- "name": "@fontsource-variable/urbanist",
- "version": "5.3.0",
- "digest": "sha256:06b9993e23960a5295ad059f44632e0f37ef3157f69ee06fae315fc47765c289"
- },
- {
- "name": "@fontsource-variable/vollkorn",
- "version": "5.3.0",
- "digest": "sha256:a177bb9b23a8c92311a189943fc8f0fb818b68909a792d82e5dd962795c4e663"
- },
- {
- "name": "@fontsource-variable/work-sans",
- "version": "5.3.0",
- "digest": "sha256:e14b9500f229c1fb1500e6c2c5e816601b95a008ac82a05b7d9fd1abc0421efb"
- },
- {
- "name": "@fontsource/abril-fatface",
- "version": "5.3.0",
- "digest": "sha256:5450fc572771171fa509f606b94038bb34722e3baf643d4f892f51d8fb83bca7"
- },
- {
- "name": "@fontsource/alfa-slab-one",
- "version": "5.3.0",
- "digest": "sha256:f3c3900506c54a7a6e15d1edf4181e10638e7d4aa4686db8114a5ff9287138cc"
- },
- {
- "name": "@fontsource/anton",
- "version": "5.3.0",
- "digest": "sha256:8327a2b26073d4deb0ec66643312e1abd4593ea07631a0e1a414e28743513947"
- },
- {
- "name": "@fontsource/architects-daughter",
- "version": "5.3.0",
- "digest": "sha256:8f944b7f148e1f5c6dcdc8108d6e29a99c23423568ee717bd47fc327a0456d3d"
- },
- {
- "name": "@fontsource/archivo-black",
- "version": "5.3.0",
- "digest": "sha256:abef23f9387cc85892ca65e550546ad47a9cd865a965b80b4c954eb48c14d430"
- },
- {
- "name": "@fontsource/bangers",
- "version": "5.3.0",
- "digest": "sha256:93cc064d70ee9bb054fcab65756111ad2adec1a2563b298ad0e0b423a1bbf8a5"
- },
- {
- "name": "@fontsource/barlow-condensed",
- "version": "5.3.0",
- "digest": "sha256:2bd19ad50f89e4e3697aa36fe7a18780b88d1bf4197a8112d709886bb7f52e47"
- },
- {
- "name": "@fontsource/barlow",
- "version": "5.3.0",
- "digest": "sha256:78fe6d1de271b8a49ebdcc588c7d3b91e46ed8f645d1747b360426c7f3b95a55"
- },
- {
- "name": "@fontsource/bebas-neue",
- "version": "5.3.0",
- "digest": "sha256:19e030c987fb0a607c7c5b7cc49e215319547b4a5bdbad23a847dd72559c0be9"
- },
- {
- "name": "@fontsource/black-ops-one",
- "version": "5.3.0",
- "digest": "sha256:a886f9fa9d0125a8f58a41134c5a68cbfa1d9a9ecac554e28d6749dd3c001d6f"
- },
- {
- "name": "@fontsource/bungee",
- "version": "5.3.0",
- "digest": "sha256:2f6397365b231b67179119ac7c639dd8898753b589549599630e3ad875f6ef10"
- },
- {
- "name": "@fontsource/coming-soon",
- "version": "5.3.0",
- "digest": "sha256:962fff0e0ca29eb40abcade296c2338ad1f4bf17fec694b887e8b0fecd9027f0"
- },
- {
- "name": "@fontsource/dm-serif-display",
- "version": "5.3.0",
- "digest": "sha256:7baa767191a29dcc38c3c1e3d88b18c2aedcda780f0ee96ad371d85121c37105"
- },
- {
- "name": "@fontsource/fira-sans-condensed",
- "version": "5.3.0",
- "digest": "sha256:467d333d5891df9e2648a9d56448d5964c62da005ecb52314ddda3d5ade900f0"
- },
- {
- "name": "@fontsource/gloock",
- "version": "5.3.0",
- "digest": "sha256:3f83f5e92b102434e658b8819a52c5a4684c840788d4a51e57973076e15951be"
- },
- {
- "name": "@fontsource/handlee",
- "version": "5.3.0",
- "digest": "sha256:95e1df2590271e9161503f9de5ec9be5b04a4760638fd508c0d8373105d80963"
- },
- {
- "name": "@fontsource/ibm-plex-mono",
- "version": "5.3.0",
- "digest": "sha256:ce4e3dc94b06c85c8a46a6abd9d80e9dc6550731efdd57fefb1fd352c9271313"
- },
- {
- "name": "@fontsource/instrument-serif",
- "version": "5.3.0",
- "digest": "sha256:788b83afa32264554f58562af494b587f7c955f54c172a3e6b655ec7e5cdbf20"
- },
- {
- "name": "@fontsource/kalam",
- "version": "5.3.0",
- "digest": "sha256:8b628b2523d1f66bfa793f674a5a11b2469b2fe175b48fb5154a34dd50ac58d2"
- },
- {
- "name": "@fontsource/kanit",
- "version": "5.3.0",
- "digest": "sha256:44b66731e8b69804fa498661337bcd20012ed4f15a85a27376dea9175f9a4d2d"
- },
- {
- "name": "@fontsource/lato",
- "version": "5.3.0",
- "digest": "sha256:7b9301126b2841096a8c3c2019c8ff0bc6d3f0cec82666dcc817cc9ae171ca5f"
- },
- {
- "name": "@fontsource/lilita-one",
- "version": "5.3.0",
- "digest": "sha256:b068bbb59d6eefcbc234c2c86751f69cf612ceb342c89929999d2d8964d02f8d"
- },
- {
- "name": "@fontsource/liu-jian-mao-cao",
- "version": "5.3.0",
- "digest": "sha256:f9057013c9fd6c031d093311429c8a05b5d633738edfb5be7d597c6f7ec6b638"
- },
- {
- "name": "@fontsource/long-cang",
- "version": "5.3.0",
- "digest": "sha256:9afe14768b363325209e3c150cf80fc516c80c9241fd369949991bb895f96af0"
- },
- {
- "name": "@fontsource/luckiest-guy",
- "version": "5.3.0",
- "digest": "sha256:6ee2cb66ca3a5d27517685e14e68ff2ea3810a2b8bf68927890312ed7796701d"
- },
- {
- "name": "@fontsource/ma-shan-zheng",
- "version": "5.3.0",
- "digest": "sha256:a02ffc7b1d3c7a419280d698475267a50c6c17065a189197a150afaa2d780651"
- },
- {
- "name": "@fontsource/pacifico",
- "version": "5.3.0",
- "digest": "sha256:4f73e816d6d4873df136642f5dccec552b9b86eb1d893aa0831ffa1dc3d7ebf5"
- },
- {
- "name": "@fontsource/patrick-hand",
- "version": "5.3.0",
- "digest": "sha256:3b90fe2b3da647db3b16b85272baa7260043a242e0308428151d2ad9c6c3f985"
- },
- {
- "name": "@fontsource/permanent-marker",
- "version": "5.3.0",
- "digest": "sha256:e0a02a5f2bf71402f6031b495315dbc8f908ffe45f62dcf2c25aeab9e3445e9d"
- },
- {
- "name": "@fontsource/pinyon-script",
- "version": "5.3.0",
- "digest": "sha256:6a04c8fb82f82c7c778bd9bc4c4de80c9883693dda54b8bd5177f44974c1094e"
- },
- {
- "name": "@fontsource/poppins",
- "version": "5.3.0",
- "digest": "sha256:a6062360c1fb29ca3ea309989341b960051a6dbec3618c30c458c642bf7dad32"
- },
- {
- "name": "@fontsource/righteous",
- "version": "5.3.0",
- "digest": "sha256:79e84f71bdeec58c7a8f9f27713b9ce0bc69c03172deb27303efd39587fb2980"
- },
- {
- "name": "@fontsource/satisfy",
- "version": "5.3.0",
- "digest": "sha256:c7dffc71d3f7cacd478896455d11633b6529ea3b6b90b3a8ea33a3baeaf1e766"
- },
- {
- "name": "@fontsource/shadows-into-light",
- "version": "5.3.0",
- "digest": "sha256:d2ada94bd5e183d93b51e7e971711f6a85f3a0f4469e138f0af7362ee2fc17b6"
- },
- {
- "name": "@fontsource/short-stack",
- "version": "5.3.0",
- "digest": "sha256:f3f57149b79b7aa692199846414def30dd13ff6ed8f837d1731be8d261233e10"
- },
- {
- "name": "@fontsource/space-mono",
- "version": "5.3.0",
- "digest": "sha256:3d45b28d3e4c26cd7aac85d6df23808117dfdde126926394e63f6aa9ae1f355d"
- },
- {
- "name": "@fontsource/zcool-kuaile",
- "version": "5.3.0",
- "digest": "sha256:92769d2814bb9186e26e388dc0656a8a0e2e883829646352024c0aec41dbbbbd"
- },
- {
- "name": "@fontsource/zcool-qingke-huangyou",
- "version": "5.3.0",
- "digest": "sha256:15854638d77023d0e32383f53f490e060cd8e0f8cf4994b2c99fe8522bf74e43"
- },
- {
- "name": "@fontsource/zcool-xiaowei",
- "version": "5.3.0",
- "digest": "sha256:79a87ecebfb75fc4fc01b36db09fe67d2080c090b73e145dc605dd2375974284"
- },
- {
- "name": "@infolektuell/noto-color-emoji",
- "version": "0.2.0",
- "digest": "sha256:1cb876e4d1fbd09da62f17c1599935b132427288052b2ab3afa8a8458329a720"
- },
- {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev",
- "digest": "sha256:b254bc523b6e65563cc9df32b270a4f7fe17a7fb7b26a0fd9dc944d4c16479d1"
- },
- {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev",
- "digest": "sha256:730a3bdccb438d627587756ee71a171ee4d9846b254e5f5c0afc0b8187ed2676"
- },
- {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev",
- "digest": "sha256:1b5cdb014c3ac774e0b998459092d3a26c042733f878cc81c00c0e435420c58a"
- },
- {
- "name": "@narratage/caption",
- "version": "0.0.0-dev",
- "digest": "sha256:46f2273af9f932e4c208a3e7dd692456691f7827967af0efb54b1a4e1a1388b5"
- },
- {
- "name": "@narratage/component-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:a503483ab1e923d1c81473e2f3d433aacfa08703c2d81715e66aa310f170a0ae"
- },
- {
- "name": "@narratage/composition",
- "version": "0.0.0-dev",
- "digest": "sha256:e5724c7fdfe7f4c915cf850de9485d25920415d4d4185010c929abcde233d0fa"
- },
- {
- "name": "@narratage/core",
- "version": "0.0.0-dev",
- "digest": "sha256:1262fed3211025ac608b60c4f7f47c9d493473cb05307ade3671ebafb79f5fe0"
- },
- {
- "name": "@narratage/elaborator",
- "version": "0.0.0-dev",
- "digest": "sha256:e5e6d5de8eb028e582238f3cb987001a3a332a0645f823d60bb01c3964041161"
- },
- {
- "name": "@narratage/film",
- "version": "0.0.0-dev",
- "digest": "sha256:482d49f5c1abd03cb360c38a973b242bb9a49547fa31d87076e0ee53dc0f6adc"
- },
- {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev",
- "digest": "sha256:876eaa390d8a62b782111895c961ebb4a734de44a3f291feb43e8bf3523e2da5"
- },
- {
- "name": "@narratage/generation",
- "version": "0.0.0-dev",
- "digest": "sha256:840cbc1a4b0d611761d917e7c3be744ba5aa513e8556b92290470cd917c64ce1"
- },
- {
- "name": "@narratage/host",
- "version": "0.0.0-dev",
- "digest": "sha256:041d64f76f14fe995a9242906591d98a37b1d33e2c1aa6d4fa9c14bae1fda8ad"
- },
- {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:c202f0a15af238738846b1d02124d78bcd06f54272eb1bbbb5dfc9c7ec0fabe8"
- },
- {
- "name": "@narratage/markup",
- "version": "0.0.0-dev",
- "digest": "sha256:8d4f58d79d5d1ea21dedf84ba63064a5fc2c710df499d58e58701b3557fbedc6"
- },
- {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev",
- "digest": "sha256:fa027f725f23153d1f45db6aff658e200e5ce4863858f1cd3969031e10080da9"
- },
- {
- "name": "@narratage/media-track",
- "version": "0.0.0-dev",
- "digest": "sha256:494b5719ddc085eb4e29aaebd3a69ed5cc4ff8de448b2b882a25ed3dce7e0833"
- },
- {
- "name": "@narratage/media",
- "version": "0.0.0-dev",
- "digest": "sha256:688d1a3fb202ccb875d7d3135ed3382ef15f6d8d591a38634449e83a1371615c"
- },
- {
- "name": "@narratage/model-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:7ee53615cec344fc8866832be4ccf2fee88077871557cc98e7d539b78ba7d565"
- },
- {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev",
- "digest": "sha256:da8eee7d882aaadaf64996962920306ec366b026b65d24f33d882391f2a68d24"
- },
- {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev",
- "digest": "sha256:afe21487a254d5d042636a6e22d66e15f6023e461b115d50ceae1f1d44914089"
- },
- {
- "name": "@narratage/protocol",
- "version": "0.0.0-dev",
- "digest": "sha256:9b500750ffce24e7e521dcb6d785fba243222237f10e2b2dbd4887187b657274"
- },
- {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:d214b56eaa2c29383d4b0140696be343b0b755db077a7257b05f614667ed80dc"
- },
- {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev",
- "digest": "sha256:3c88369dc97248f561ef83d2775c02e3e1704751808429734a72faca61a0468e"
- },
- {
- "name": "@narratage/run",
- "version": "0.0.0-dev",
- "digest": "sha256:84ddca1556318111c3b067ff439bb7b94cb7856c30a5762cf07a083b61be2b17"
- },
- {
- "name": "@narratage/script",
- "version": "0.0.0-dev",
- "digest": "sha256:7c7e837d3e2ecd1ae3aaf4e12c1e73d21f226a9ff7588a865cc1187f166feb0d"
- },
- {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev",
- "digest": "sha256:9d3c20203f9dd4cf4d40b1f1662639fe3bd6d06f62e7629c22566c9f9f9d8f36"
- },
- {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev",
- "digest": "sha256:eb1d5ee85a566713f862b0685df20063c1083dbbd8014bda93427613c5f202e8"
- },
- {
- "name": "@narratage/source",
- "version": "0.0.0-dev",
- "digest": "sha256:3cf49ecaa8e6ea145d642dd90834e887ca073a720364fd890197768e3e1e5cd2"
- },
- {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev",
- "digest": "sha256:c0548cacaf821e6811addd2a5ba9609ceaabb29c7a6d9776f3f1d45fe37ec644"
- },
- {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev",
- "digest": "sha256:fda24a3d99eb883471147a2c3b1c5caa5526fb2721e0943a8146e1e8f3dd4ecc"
- },
- {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev",
- "digest": "sha256:5ba1ca2e8f0049c198a85e446c0847221113e9c89aafde7c5a8a0c8be86fdd96"
- },
- {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev",
- "digest": "sha256:991b1dbcb2136186110bdb12885504f35cce1ade335151f4f0b3e5c552950196"
- },
- {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev",
- "digest": "sha256:209d28a81e41f486cce6173e3647389866b3571131efe2842f5223066ef772f2"
- },
- {
- "name": "@narratage/speech",
- "version": "0.0.0-dev",
- "digest": "sha256:079a337dfdb293f25dc7bb87a7644b3520524e165df913d8085c6c527ed25158"
- },
- {
- "name": "@narratage/svs",
- "version": "0.0.0-dev",
- "digest": "sha256:22bce93d56291e627e4dbeeafcfc8dc1e2217f95d6a88ec5dd0e3221f20babe2"
- },
- {
- "name": "@narratage/temporal",
- "version": "0.0.0-dev",
- "digest": "sha256:ff7659ab2fcd3faba7413ef323de48c9e221a5b47fc25e3aa5f347261156eabe"
- },
- {
- "name": "@narratage/text",
- "version": "0.0.0-dev",
- "digest": "sha256:bc799fdd99df3b7a224f2b1c7581db94649e833c760fe22216935ae3548c150c"
- },
- {
- "name": "@narratage/typography-track",
- "version": "0.0.0-dev",
- "digest": "sha256:57dc722f6010b10cbbb96dce1c593319e43170b5499c5b71e77713f4f412836b"
- },
- {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev",
- "digest": "sha256:2dee587eedeb2d5c16d63b53aec6a476aec7555b40241352a0d8dc0f91db9631"
- },
- {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev",
- "digest": "sha256:65555eac7342e1c538083be0bf627af10ca266c9d9a68221d78c2d88778c91c5"
- }
- ],
- "packages": [
- {
- "package": {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/artifact@1"
- }
- ],
- "facetsDigest": "sha256:a56f39df98f2bff5caf339a427586e73be079eb26697c2313612bf7c07d78e2c",
- "closureDigest": "sha256:d627ce0b82cedc237f8cc923a44dd9d6849240615f5cf971181cc242b7468498"
- },
- {
- "package": {
- "name": "@narratage/caption",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption@1"
- }
- ],
- "facetsDigest": "sha256:1fbbf9bcdc39382ec612df3f29765b5d6ceb8598c0df2c7b5d6b8515f73367a3",
- "closureDigest": "sha256:790bad794d072c3bab93c3d76307b9cc836669681273ab04b1f06709dff1eb5a"
- },
- {
- "package": {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-fine@1"
- }
- ],
- "facetsDigest": "sha256:73e3f528a76fdc553ba2ee87fe5beb5fb2c91b7d4fcdff4ba9e6963d4740fdf6",
- "closureDigest": "sha256:894767197868c4df9cfec52541621b53298e5dcef78dc692b90dc7f73c1a2aa7"
- },
- {
- "package": {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-gemini@1"
- }
- ],
- "facetsDigest": "sha256:894d546ffa3c9e221fc6b686d11bc117d15a250399332e3ae1c1d28a547e0f30",
- "closureDigest": "sha256:7ae1df06b13ad365e05f8d1b45eb045bddc832976dc612898aff0e05d0c9366f"
- },
- {
- "package": {
- "name": "@narratage/composition",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/composition@1"
- }
- ],
- "facetsDigest": "sha256:05c22bda8c301365c1cfff2c0afa80067f3d2a0fba167a57ebf923af720a5c34",
- "closureDigest": "sha256:7d309e990bdfaf84168b43bd8b41a3b6f25dd394eb53c7bb34340fd59c0a67a9"
- },
- {
- "package": {
- "name": "@narratage/film",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/film@1"
- }
- ],
- "facetsDigest": "sha256:b96fd578be298ab154d1ad30a27d7e54ae0cf2f8f52f52d7bf13c0785d2a8da7",
- "closureDigest": "sha256:f98b81818ae8bc4d0b5e47edb5ef9a080b092f65766178d0dad4dc7b86d74b55"
- },
- {
- "package": {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/fonts-open@1"
- }
- ],
- "facetsDigest": "sha256:de93037cec9a364da45fedc69a2d82cca93c5866e475942241c008f46c3a8da9",
- "closureDigest": "sha256:716b251dd7100f055b10dbb6c92d799f19ac1c9e3d17aeaaa38eef421ebe4512"
- },
- {
- "package": {
- "name": "@narratage/generation",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/generation@1"
- }
- ],
- "facetsDigest": "sha256:d9ee4c44949ca2d24967e7d81898999db84ab592fdaaafe1bd6d22a28ea5e094",
- "closureDigest": "sha256:8f86d9c4e36b2a01d484f44ea59278ec4deedd86cc1797ca6d84ba5bd2ca38ff"
- },
- {
- "package": {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:7596800f1ce4506145f9ff50c768bfc07131c5ea8d421711a6b5268ce13960f7",
- "closureDigest": "sha256:1a45cbbbfdf5b2da33be35fdb33aac91fa7536fa29b75d3959e1fc9ae52e0bf2"
- },
- {
- "package": {
- "name": "@narratage/media",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media@1"
- }
- ],
- "facetsDigest": "sha256:5bbef7d089f36dd1ea36b743b1b4f03289ccb8a2fc50383e3b355982916ccfc6",
- "closureDigest": "sha256:70cbebe094cab5f1990f5effcdfd72f48a78e5cf2316b3629049d1eca34cfa35"
- },
- {
- "package": {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media-pipeline@1"
- }
- ],
- "facetsDigest": "sha256:a96ae88d7813e660bb496b77e53f66ed7e218b20d4e157632c9a4fd832580a92",
- "closureDigest": "sha256:a37b9c1903ce96a1b7554147e8a48dd2104bc54dc732909edeb6a77c37f2ce36"
- },
- {
- "package": {
- "name": "@narratage/media-track",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media-track@1"
- }
- ],
- "facetsDigest": "sha256:c9d43bfabee11db7c1ad5f65286ef568ff51c09def5f5f05b4510fca36b0336f",
- "closureDigest": "sha256:d147833a92ccb5c520bcf8ee1545c5b62e5a8af8f46d99a7c6a86abe24976fbd"
- },
- {
- "package": {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/narrative@1"
- }
- ],
- "facetsDigest": "sha256:8d535e4842c8bf287e62f8ecc803927b79d02b3cb438ba3959c369fb1d2a828d",
- "closureDigest": "sha256:aa91fbb77dc816674cc84bbe05ed1e4c784aafbbd13e1ce282b07b4cbb3f9e0d"
- },
- {
- "package": {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/program-space@1"
- }
- ],
- "facetsDigest": "sha256:92ebae07c9947d9d18277c0d8f784d5740c092f14dd3efa263138aec454ca91a",
- "closureDigest": "sha256:1e7cff66aec35080ccbacc0e7e2d850cd08206a59c6c400546646608d649659b"
- },
- {
- "package": {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/render-hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:31b63a4bf10385d31feb50114811c5185b78a0caab6b7c1646c86a61c4958128",
- "closureDigest": "sha256:1ba24f24c93b7aa090d41a62b6708f93364c906e483efea007bac9d399db7bf5"
- },
- {
- "package": {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/run-markup@1"
- }
- ],
- "facetsDigest": "sha256:c38a4e2e76a2f87b6a401bf0cad4b18f04274689ffae22c09f8f520046a7123e",
- "closureDigest": "sha256:f9cf27428f0d85d63930f56b9e23df481c4e956d5d86c03fef5c88e62dd22fb7"
- },
- {
- "package": {
- "name": "@narratage/script",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/script@1"
- }
- ],
- "facetsDigest": "sha256:acc754c61e24f93d5e2692ceb6998a3638cc384de8e512e155738435663a8342",
- "closureDigest": "sha256:cbf4fe4ec28ae6958956ee67d02c8a4a30d2e4e5cbd64d8952e317c6df435fbb"
- },
- {
- "package": {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/seedance@1"
- }
- ],
- "facetsDigest": "sha256:41615659f664d3480af5a50c81df188b6fc848628c60bc82d37eb7735071f111",
- "closureDigest": "sha256:3ea90ac12b4ac7bddce6064ac99d946aa89745c0fbf06861100415c12bd63882"
- },
- {
- "package": {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/semantic-map@1"
- }
- ],
- "facetsDigest": "sha256:80cad17557218021f4912919b0fc5bbfda61523fc40242e12dafd92a5ca52d28",
- "closureDigest": "sha256:162ab0d26ba8577910bea38e44f39909bfd275033175e8c6892a21f8a298f8b0"
- },
- {
- "package": {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/spatial@1"
- }
- ],
- "facetsDigest": "sha256:4e6da482a365cd36423f3baf568ea741f2e0eddf26b559bce43d3c4270830c91",
- "closureDigest": "sha256:dde427e997833b5ed6639deeed75070eb98bc9e50c8f0a7da8f31fefe4435724"
- },
- {
- "package": {
- "name": "@narratage/speech",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech@1"
- }
- ],
- "facetsDigest": "sha256:e86e5c90307ab183d2ea5d75e4ca0daab4f2b65905feb79c387871370d625e3a",
- "closureDigest": "sha256:8be1559095728f977914d56c4e7dfd070362d7bbddfb0565062129fe27a67d8d"
- },
- {
- "package": {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-alignment@1"
- }
- ],
- "facetsDigest": "sha256:b55e20b4fdf24cbfaf956447ff62885e81638fdbcbb61f25483392a1c8fac8c9",
- "closureDigest": "sha256:34ff2b938c8cdb94823a2843e882ac9d1e8f51f46dee02a6b0342b69f48c5be3"
- },
- {
- "package": {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-basis@1"
- }
- ],
- "facetsDigest": "sha256:3e7413acb9b39071fad0ea2e99777ae9ab7a4b636041a8345ec1d08428859b3f",
- "closureDigest": "sha256:e0a9f8e7c454beb36d67e9bd358383fc91567e70e9f43f75290a831028e39576"
- },
- {
- "package": {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-evidence@1"
- }
- ],
- "facetsDigest": "sha256:26f3ab63067b382373a9c4c24569bd672302370f5d0c64a055d61862959fc4d0",
- "closureDigest": "sha256:0df8b3aa5a3c29300be9779b7f6f53fc44051665f956b20d554551d4100272f6"
- },
- {
- "package": {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-spine@1"
- }
- ],
- "facetsDigest": "sha256:340cf867483022b3896008781f24a04e22aa0abc76873cc44787aefdc0219522",
- "closureDigest": "sha256:f215f8ec4e02bf26ff0960b129760eeb80ab59658cd0ec0476481b73c11f09ee"
- },
- {
- "package": {
- "name": "@narratage/svs",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/svs@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/svs@1"
- }
- ],
- "facetsDigest": "sha256:27cb7828391b2cd5b9fd0a6690d16010f23b78540d501aad6f9afa75da33f1da",
- "closureDigest": "sha256:ff88e3ec2e95ef40afb308f240c59ed57149ceff4bf5e58d3429fada1ff702f6"
- },
- {
- "package": {
- "name": "@narratage/temporal",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/temporal@1"
- }
- ],
- "facetsDigest": "sha256:f3cf535add0b1746dc5beb7920935bc36cca953ee044961d35c5c89fe6b7a746",
- "closureDigest": "sha256:b761c6395b3867412c3bf52ebefae1b106aa00f2b546cb7aafacce17801ede81"
- },
- {
- "package": {
- "name": "@narratage/text",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/text@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/text/svs@1"
- }
- ],
- "facetsDigest": "sha256:2d4d0e9eea9ec795fb675ddf7d204bc29fe7eb8e3a743eced944a0cdb50ecf50",
- "closureDigest": "sha256:51afff4d06131cc77a3e6953a9151564dfb79bde943f1250d91d24db1f2c00d4"
- },
- {
- "package": {
- "name": "@narratage/typography-track",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/typography-track@1"
- }
- ],
- "facetsDigest": "sha256:063c2641007f401709acfed6eab95ae9c566de1e0987a06c7cdce305abe33aa7",
- "closureDigest": "sha256:489ec9e9f0bdfa329ddf39537529b95f14e79b2608c48d6031a47ce2944fdbb3"
- },
- {
- "package": {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/visual-ir@1"
- }
- ],
- "facetsDigest": "sha256:039735354a109969a18b2c26ab8b02bb6d09a7a35f993336e8e8711e6d429f14",
- "closureDigest": "sha256:7653a66f3fdff9894e02cf080e3c9cf11fbbb28e93b3adc55b8ed99d7de42bab"
- },
- {
- "package": {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/whisperx@1"
- }
- ],
- "facetsDigest": "sha256:64c0e76dea02b19be28bc7425e11938fd9c1dbb9994dde3a6d98c41da819b85e",
- "closureDigest": "sha256:233b055191b86b8527083fe601c89216d7dabbce7a227123dc5d6b2117322753"
- }
- ],
- "digest": "sha256:f48396a2f7f8cafe5383bea15ca6c4669a9f0e9214000ba8615cf26a8bcbc6ab"
-}
diff --git a/examples/talking-film-live/README.md b/examples/talking-film-live/README.md
index a9771ea6..565c9ebc 100644
--- a/examples/talking-film-live/README.md
+++ b/examples/talking-film-live/README.md
@@ -27,26 +27,20 @@ the source and Run Graph without making a paid Provider request. `narratage buil
selected Runtime and rejects missing capability coverage before scheduling external work; neither
command promises that remote credentials and service health are valid.
-Run the complete graph through the explicit Run Graph and declarative local Runtime Profile:
-
-The checked-in `svml.packages.lock` selects each author, Run and deterministic compute package
-independently; there is no implicit video bundle. After changing a selected package implementation,
-refresh its already explicit selection with
-`node --run narratage -- lock-packages examples/talking-film-live/svml.packages.lock --refresh`.
-The independent `svml.runtime-packages.lock` selects Local execution, SQLite state, filesystem
-Artifacts, environment credentials, KIE, local media, local WhisperX, Vertex and local HyperFrames
-adapters; adding another implementation does not change the CLI.
+Run the complete graph through the explicit Run Graph and declarative local Runtime Profile. Source
+imports select author and compute packages. The Profile selects Local execution, SQLite state,
+filesystem Artifacts, credentials, KIE, media, WhisperX, Vertex and HyperFrames packages.
```bash
cd examples/talking-film-live
-../../narratage runtime use svml.runtime.json
-../../narratage runtime up
+narratage runtime use narratage.runtime.json
+narratage runtime up
-../../narratage build build.svrun --follow
+narratage build build.svrun --follow
-../../narratage inspect <build-id>
+narratage inspect <build-id>
-../../narratage get <build-id> \
+narratage get <build-id> \
--name final.video \
--to output/final.mp4
```
@@ -54,11 +48,11 @@ cd examples/talking-film-live
`build` prints the fresh automatic Build id assigned to this durable submission. `--follow` only
observes the detached Worker; closing this terminal does not cancel the Build.
-`build.svrun` owns the Targets and any explicit Candidate selections. `svml.runtime.json` owns Provider instances,
+`build.svrun` owns the Targets and any explicit Candidate selections. `narratage.runtime.json` owns Provider instances,
credentials and concurrency. The Build archives all accepted intermediate Records and referenced
Artifacts even when no destination path is requested. `get` only makes an optional copy of the
already archived named target. The CLI accepts the declarative JSON Runtime Profile shown here;
-applications that embed Narratage assemble Runtime roles directly through `@narratage/local`.
+applications that embed Narratage assemble Runtime roles directly through `@narratage/runtime-local`.
To reuse the paid shot outputs from a verified earlier Build, add two zero-input Build Record
Candidates and their explicit Satisfaction edges to another `.svrun`:
diff --git a/examples/talking-film-live/svml.runtime.json b/examples/talking-film-live/narratage.runtime.json
similarity index 65%
rename from examples/talking-film-live/svml.runtime.json
rename to examples/talking-film-live/narratage.runtime.json
index d5c31fc3..be0a77b6 100644
--- a/examples/talking-film-live/svml.runtime.json
+++ b/examples/talking-film-live/narratage.runtime.json
@@ -1,26 +1,23 @@
{
"format": "narratage.runtime-profile@1",
- "runtimePackageLock": "./svml.runtime-packages.lock",
"runtime": {
- "use": "@narratage/local",
+ "use": "@narratage/runtime-local",
"config": {
"dataRoot": ".narratage/runtimes/local",
- "components": {
- "execution": { "use": "@narratage/local" },
+ "infrastructure": {
+ "execution": { "use": "@narratage/runtime-local" },
"state": { "use": "@narratage/store-sqlite", "config": { "path": "state.sqlite" } },
"artifacts": { "use": "@narratage/artifact-store-fs", "config": { "path": "artifacts" } },
- "credentials.env": { "use": "@narratage/credential-store-env", "config": {} }
+ "credentials": { "use": "@narratage/credential-store-env", "config": {} }
},
- "bindings": {
- "scheduler": "execution.scheduler",
- "worker": "execution.worker",
- "stores": {
- "build": "state.builds",
- "operations": "state.operations",
- "dispatch": "state.dispatch",
- "artifacts": "artifacts",
- "credentials": ["credentials.env"]
- }
+ "roles": {
+ "scheduler": { "from": "execution", "part": "scheduler" },
+ "worker": { "from": "execution", "part": "worker" },
+ "buildStore": { "from": "state", "part": "builds" },
+ "operationStore": { "from": "state", "part": "operations" },
+ "dispatchStore": { "from": "state", "part": "dispatch" },
+ "artifactStore": { "from": "artifacts", "part": "store" },
+ "credentialStores": [{ "from": "credentials", "part": "store" }]
},
"endpoints": {
"kie.talking-film": {
@@ -51,7 +48,7 @@
"config": { "workers": 2, "quality": "standard", "defaultConcurrency": 1 }
}
},
- "limits": { "maxOperations": 4 }
+ "capacity": { "maxActiveOperations": 4 }
}
}
}
diff --git a/examples/talking-film-live/svml.packages.lock b/examples/talking-film-live/svml.packages.lock
deleted file mode 100644
index d1efd8a0..00000000
--- a/examples/talking-film-live/svml.packages.lock
+++ /dev/null
@@ -1,1210 +0,0 @@
-{
- "format": "svml.node-package-lock@1",
- "selected": [
- "@narratage/caption",
- "@narratage/caption-fine",
- "@narratage/caption-gemini",
- "@narratage/estimate",
- "@narratage/film",
- "@narratage/fonts-open",
- "@narratage/media",
- "@narratage/render-hyperframes",
- "@narratage/run-markup",
- "@narratage/script",
- "@narratage/seedance",
- "@narratage/spatial",
- "@narratage/speech-spine",
- "@narratage/svs",
- "@narratage/text",
- "@narratage/typography-track",
- "@narratage/whisperx"
- ],
- "artifacts": [
- {
- "name": "@fontsource-variable/archivo",
- "version": "5.3.0",
- "digest": "sha256:d0756ae991869df099871e469cc1a3206efc9c50ab34298da0b97aec284fec88"
- },
- {
- "name": "@fontsource-variable/bodoni-moda",
- "version": "5.3.0",
- "digest": "sha256:124e5f7bd2cd952ba895a72847b89bc4fa0a0d831644466393efe61b050622f8"
- },
- {
- "name": "@fontsource-variable/cabin",
- "version": "5.3.0",
- "digest": "sha256:c0da1888b21a3fdc8b391a08b7a59459ce2bdde5a4550bbd34cd6aaf381af93c"
- },
- {
- "name": "@fontsource-variable/caveat",
- "version": "5.3.0",
- "digest": "sha256:21e2ae66cd592a9bd0b53714d04b4aa9adeda6c9340d6180f174829155af2dbe"
- },
- {
- "name": "@fontsource-variable/cinzel",
- "version": "5.3.0",
- "digest": "sha256:883ab987aaf354347d03b5c4a6e59068611dff971011b75c0a2cd8785d084b85"
- },
- {
- "name": "@fontsource-variable/cormorant-garamond",
- "version": "5.3.0",
- "digest": "sha256:5fb212991abe42dc54820a0e99a50d54fd68b8794e05e01fcecd88bc3d9b718f"
- },
- {
- "name": "@fontsource-variable/crimson-pro",
- "version": "5.3.0",
- "digest": "sha256:2af0252ef3293e7f7213467bf2908cbd92a1ac1ef2de8a37ed3134aa553b0854"
- },
- {
- "name": "@fontsource-variable/dm-sans",
- "version": "5.3.0",
- "digest": "sha256:282b5942ecdf37ecb2946c271874f16053e32d7984e465bafa848cd70979b7c5"
- },
- {
- "name": "@fontsource-variable/eb-garamond",
- "version": "5.3.0",
- "digest": "sha256:3f839e82eff702919083009237af1c1975b80f8d9766ac5f97a291cfbf82dea0"
- },
- {
- "name": "@fontsource-variable/figtree",
- "version": "5.3.0",
- "digest": "sha256:bbd1e28aae1070c95fe09ce9bdc94e310b950d35e13d0817fce344d2a57a5c07"
- },
- {
- "name": "@fontsource-variable/fira-code",
- "version": "5.3.0",
- "digest": "sha256:26593d3b4aab4bef1d37b2f7b301739efd6861020b1f44e2cddf14b933453d72"
- },
- {
- "name": "@fontsource-variable/fraunces",
- "version": "5.3.0",
- "digest": "sha256:1da79839589a15663f4c0a75f91899450e20b8d6bd91044c826d07f4ca4d3771"
- },
- {
- "name": "@fontsource-variable/fredoka",
- "version": "5.3.0",
- "digest": "sha256:aeb50015a5e92b2033e5358f391f1221cf7a461f5793ab28d516fa0ee535af85"
- },
- {
- "name": "@fontsource-variable/geist-mono",
- "version": "5.3.0",
- "digest": "sha256:9122fc7e67d7f2788cb82b2eacd489a9430435133488962cbe9ab40ff952dccd"
- },
- {
- "name": "@fontsource-variable/geist",
- "version": "5.3.0",
- "digest": "sha256:01af74b4d77592a1d560c1992568eca3e719117b81b5c2c8798281680180a8c4"
- },
- {
- "name": "@fontsource-variable/instrument-sans",
- "version": "5.3.0",
- "digest": "sha256:10b5fd92cf05d3259b0dfca0b37971b7c522f29b17b5804ddc5bb404ceefc7e3"
- },
- {
- "name": "@fontsource-variable/inter",
- "version": "5.3.0",
- "digest": "sha256:e4ca49893204e3b3d156d22daddb4f96c06a94cc0d0767d6f7613d84d8e3d4fe"
- },
- {
- "name": "@fontsource-variable/jetbrains-mono",
- "version": "5.3.0",
- "digest": "sha256:0445625a317f4ff6cfe58c4272334b4af720309df2339356d3fb81e40c375210"
- },
- {
- "name": "@fontsource-variable/josefin-sans",
- "version": "5.3.0",
- "digest": "sha256:5780323301d2480c3e111de34f9dfc11d24fc165be4fcfbc9293dd34da0dcadd"
- },
- {
- "name": "@fontsource-variable/jost",
- "version": "5.3.0",
- "digest": "sha256:875e424e28d005d8b467aa576de202ae3b84c243eaa52d971e946243c1973439"
- },
- {
- "name": "@fontsource-variable/league-spartan",
- "version": "5.3.0",
- "digest": "sha256:6b05150ad1aeede4aed7505507c8b69187bd25f7897dd43ff7f2e93a0028c37c"
- },
- {
- "name": "@fontsource-variable/lexend",
- "version": "5.3.0",
- "digest": "sha256:ca5800b1c654c71ad3c93a47801c2f5748e49cff9b0985ed375c67f500bd1166"
- },
- {
- "name": "@fontsource-variable/libre-baskerville",
- "version": "5.3.0",
- "digest": "sha256:5297642650a09c5a59f7e602b88b7756d379397da7c6e4dfe273b8f1cc6a225c"
- },
- {
- "name": "@fontsource-variable/lora",
- "version": "5.3.0",
- "digest": "sha256:fdea73d2d75785a45046ef9e2dd1ccac35a1194e31ddabfb0f0b95582d418943"
- },
- {
- "name": "@fontsource-variable/manrope",
- "version": "5.3.0",
- "digest": "sha256:c7821cba633009f45db0ae545cbdcd1de1ec764d299b503ade1b8da6ad7f6f07"
- },
- {
- "name": "@fontsource-variable/merriweather",
- "version": "5.3.0",
- "digest": "sha256:0c264e97ca3f76da2d31726727b120a44910ab2620a45f3e09ae938d0fdcc9c4"
- },
- {
- "name": "@fontsource-variable/montserrat",
- "version": "5.3.0",
- "digest": "sha256:b457c7e96aae71eeee8683e6af5eb766c025b2a889d03daa5298fa2e1abc2855"
- },
- {
- "name": "@fontsource-variable/mulish",
- "version": "5.3.0",
- "digest": "sha256:5ce4f4131ef5c5a7ba7f78e7ea82dc45ea0c4ec0550699cf64568e09e54dbb2d"
- },
- {
- "name": "@fontsource-variable/newsreader",
- "version": "5.3.0",
- "digest": "sha256:3c7c5e41a7d778f342a4108253e062deba68ce5bcba1bad7b3cb962e57132a7a"
- },
- {
- "name": "@fontsource-variable/noto-emoji",
- "version": "5.3.0",
- "digest": "sha256:c135feb03a6be9cabe5bef963d63cfa08c97d3ecdf521aa309324c00cacd9964"
- },
- {
- "name": "@fontsource-variable/noto-naskh-arabic",
- "version": "5.3.0",
- "digest": "sha256:f7637a644a70cf88203426e0ebce7dcb8dc672baf63370437c39fbee8b125b8e"
- },
- {
- "name": "@fontsource-variable/noto-sans-arabic",
- "version": "5.3.0",
- "digest": "sha256:5981bdd510158a68c72e42557bcb3387d6ef9ba958bf5000500fa26fe7373767"
- },
- {
- "name": "@fontsource-variable/noto-sans-devanagari",
- "version": "5.3.0",
- "digest": "sha256:dae73904faa148f60a06af6b267916b6ce656c4c333f1b1de63828b8a5639686"
- },
- {
- "name": "@fontsource-variable/noto-sans-hebrew",
- "version": "5.3.0",
- "digest": "sha256:ff616f500efb9d965be8a95d46ca13f3113704360472286f0596aa0bff5dfbc3"
- },
- {
- "name": "@fontsource-variable/noto-sans-hk",
- "version": "5.3.0",
- "digest": "sha256:faa4e754134193f0c0ffa957c9aae3b75779bd443373a3c1e9759ce5876463d5"
- },
- {
- "name": "@fontsource-variable/noto-sans-jp",
- "version": "5.3.0",
- "digest": "sha256:adf3c03671005935de55199037a2e26ebb81471f95268d7327b54aa6ffbacf62"
- },
- {
- "name": "@fontsource-variable/noto-sans-kr",
- "version": "5.3.0",
- "digest": "sha256:97da1dc319b8f42deda034729ac2bfadb0e3b0992f8034edaa39d7270ba2b042"
- },
- {
- "name": "@fontsource-variable/noto-sans-sc",
- "version": "5.3.0",
- "digest": "sha256:1c49ddaaa5d7aeb0503cfa78914bb4957259108c3dfb262d5f4b2bc49549af89"
- },
- {
- "name": "@fontsource-variable/noto-sans-tc",
- "version": "5.3.0",
- "digest": "sha256:08085bc109242c4034e966d2a9580ee02b261ea04d01dbfc27e316f99223c849"
- },
- {
- "name": "@fontsource-variable/noto-sans-thai",
- "version": "5.3.0",
- "digest": "sha256:ff0050b1cc056bcf88fd713d1dc74f42b0e8799f7931ea89da03a51a03dc4588"
- },
- {
- "name": "@fontsource-variable/noto-sans",
- "version": "5.3.0",
- "digest": "sha256:d27afb70065955c963fc96bf65580a086e6d05c9e4b81177941eb730c5e44dd4"
- },
- {
- "name": "@fontsource-variable/noto-serif-jp",
- "version": "5.3.0",
- "digest": "sha256:c442057a769b0293012b790df56d250f08ec7abf5bcbcbc6ef39b9103329ef68"
- },
- {
- "name": "@fontsource-variable/noto-serif-kr",
- "version": "5.3.0",
- "digest": "sha256:000000dfd6e3700d029217bff41b83cfd0266af9fade349b32441f16facd8dce"
- },
- {
- "name": "@fontsource-variable/noto-serif-sc",
- "version": "5.3.0",
- "digest": "sha256:7d845bd433554bc7a9dc656dc7e0818d6083b080a3e9d69956b97b2cf4221d16"
- },
- {
- "name": "@fontsource-variable/noto-serif-tc",
- "version": "5.3.0",
- "digest": "sha256:58b67399101d6fbfbd1a73c0c06c5de29e24889a1592d922f5afd1f6e550e15d"
- },
- {
- "name": "@fontsource-variable/nunito-sans",
- "version": "5.3.0",
- "digest": "sha256:491045f06b188718c4945f753678c851b0a16348e087e62ec6bd9d91a7f29f07"
- },
- {
- "name": "@fontsource-variable/onest",
- "version": "5.3.0",
- "digest": "sha256:dc69d3aba9dca697a3704954a2c9ed6ad2dde3a508f9cff3cfabf06fed2e7518"
- },
- {
- "name": "@fontsource-variable/open-sans",
- "version": "5.3.0",
- "digest": "sha256:bfa7bb83169eaf59da9c2492b9f87adaf4b07a8a2c5580ae235801842ad74b84"
- },
- {
- "name": "@fontsource-variable/oswald",
- "version": "5.3.0",
- "digest": "sha256:25e3819b4bfdd9fc8786d8d4cbc4bcc5121ad617180ab4e38e33573678a64b28"
- },
- {
- "name": "@fontsource-variable/outfit",
- "version": "5.3.0",
- "digest": "sha256:7da0bec12f2f4cc25652bd2bdfdb8686982121bf96f5182e45df5e7a67e3d134"
- },
- {
- "name": "@fontsource-variable/playfair-display",
- "version": "5.3.0",
- "digest": "sha256:9169e0b0212478bec819d29137e25a5e6770cb59508678a2b3d642706c099551"
- },
- {
- "name": "@fontsource-variable/playpen-sans",
- "version": "5.3.0",
- "digest": "sha256:0cdc396f3617afb4d405378726f48b9ef1dab85e3d1c9c4658450a09cb4335a3"
- },
- {
- "name": "@fontsource-variable/plus-jakarta-sans",
- "version": "5.3.0",
- "digest": "sha256:0d3387379914e9c6e57e67a1ccef7a943b372da8ec46de6956a5fd214e3b2609"
- },
- {
- "name": "@fontsource-variable/quicksand",
- "version": "5.3.0",
- "digest": "sha256:8443330eed78c79d91c3582df8b93d22bd82cd7bc4b7c9ae5c3c0f1499a6cac1"
- },
- {
- "name": "@fontsource-variable/raleway",
- "version": "5.3.0",
- "digest": "sha256:ac1f6114679c0177df758499b8d34def94f5b579a939bf2bb3456023ac2be6dc"
- },
- {
- "name": "@fontsource-variable/rethink-sans",
- "version": "5.3.0",
- "digest": "sha256:90242c18b19a9737e80a66ae6922a9c5bd5250a8972981ac1c09e4f8f8aee372"
- },
- {
- "name": "@fontsource-variable/roboto-condensed",
- "version": "5.3.0",
- "digest": "sha256:2b77bf05ddb63c0ebc2827d267235ee6b2851e0371c559f7a93eaf599d329b54"
- },
- {
- "name": "@fontsource-variable/roboto-mono",
- "version": "5.3.0",
- "digest": "sha256:a83a97b73d190630c8d4801333a73e2c265e0ad2480bc77056ad6a5db1672aae"
- },
- {
- "name": "@fontsource-variable/roboto-slab",
- "version": "5.3.0",
- "digest": "sha256:b6d68b8e9932671733d77695b50c09a23e804e952b7ab8da1a05f06ac827cfef"
- },
- {
- "name": "@fontsource-variable/roboto",
- "version": "5.3.0",
- "digest": "sha256:22fd32070d7eb714439e18dfd00da736b833a4ea4f661c8a3b1761ffe8895b30"
- },
- {
- "name": "@fontsource-variable/rubik",
- "version": "5.3.0",
- "digest": "sha256:b66dbc0f67e2c1e9b075f6ee5ed7eff18a3f7398bfdbc3c463962d1bb5064487"
- },
- {
- "name": "@fontsource-variable/shantell-sans",
- "version": "5.3.0",
- "digest": "sha256:18dcfa8618a3ff5bd420e46bac5fcdbc659242f3c0a67f45fc3ef598a9709fae"
- },
- {
- "name": "@fontsource-variable/sora",
- "version": "5.3.0",
- "digest": "sha256:bd5ff142c0797c37b763ae0a97bd1e9469ae163d084887a4660c73d2cf019693"
- },
- {
- "name": "@fontsource-variable/source-serif-4",
- "version": "5.3.0",
- "digest": "sha256:9833b70d7a2c410496ec00794b3c26034593353ac76fe173f3a6df2e958f6167"
- },
- {
- "name": "@fontsource-variable/space-grotesk",
- "version": "5.3.0",
- "digest": "sha256:9a601acdf9e2b9656f537f6691b40152dbc0c9043b249eeda4980281bcced5e5"
- },
- {
- "name": "@fontsource-variable/unbounded",
- "version": "5.3.0",
- "digest": "sha256:f664f5bbef08608533b00016c00a89b623df987b10a89d4832251b2440370c16"
- },
- {
- "name": "@fontsource-variable/urbanist",
- "version": "5.3.0",
- "digest": "sha256:06b9993e23960a5295ad059f44632e0f37ef3157f69ee06fae315fc47765c289"
- },
- {
- "name": "@fontsource-variable/vollkorn",
- "version": "5.3.0",
- "digest": "sha256:a177bb9b23a8c92311a189943fc8f0fb818b68909a792d82e5dd962795c4e663"
- },
- {
- "name": "@fontsource-variable/work-sans",
- "version": "5.3.0",
- "digest": "sha256:e14b9500f229c1fb1500e6c2c5e816601b95a008ac82a05b7d9fd1abc0421efb"
- },
- {
- "name": "@fontsource/abril-fatface",
- "version": "5.3.0",
- "digest": "sha256:5450fc572771171fa509f606b94038bb34722e3baf643d4f892f51d8fb83bca7"
- },
- {
- "name": "@fontsource/alfa-slab-one",
- "version": "5.3.0",
- "digest": "sha256:f3c3900506c54a7a6e15d1edf4181e10638e7d4aa4686db8114a5ff9287138cc"
- },
- {
- "name": "@fontsource/anton",
- "version": "5.3.0",
- "digest": "sha256:8327a2b26073d4deb0ec66643312e1abd4593ea07631a0e1a414e28743513947"
- },
- {
- "name": "@fontsource/architects-daughter",
- "version": "5.3.0",
- "digest": "sha256:8f944b7f148e1f5c6dcdc8108d6e29a99c23423568ee717bd47fc327a0456d3d"
- },
- {
- "name": "@fontsource/archivo-black",
- "version": "5.3.0",
- "digest": "sha256:abef23f9387cc85892ca65e550546ad47a9cd865a965b80b4c954eb48c14d430"
- },
- {
- "name": "@fontsource/bangers",
- "version": "5.3.0",
- "digest": "sha256:93cc064d70ee9bb054fcab65756111ad2adec1a2563b298ad0e0b423a1bbf8a5"
- },
- {
- "name": "@fontsource/barlow-condensed",
- "version": "5.3.0",
- "digest": "sha256:2bd19ad50f89e4e3697aa36fe7a18780b88d1bf4197a8112d709886bb7f52e47"
- },
- {
- "name": "@fontsource/barlow",
- "version": "5.3.0",
- "digest": "sha256:78fe6d1de271b8a49ebdcc588c7d3b91e46ed8f645d1747b360426c7f3b95a55"
- },
- {
- "name": "@fontsource/bebas-neue",
- "version": "5.3.0",
- "digest": "sha256:19e030c987fb0a607c7c5b7cc49e215319547b4a5bdbad23a847dd72559c0be9"
- },
- {
- "name": "@fontsource/black-ops-one",
- "version": "5.3.0",
- "digest": "sha256:a886f9fa9d0125a8f58a41134c5a68cbfa1d9a9ecac554e28d6749dd3c001d6f"
- },
- {
- "name": "@fontsource/bungee",
- "version": "5.3.0",
- "digest": "sha256:2f6397365b231b67179119ac7c639dd8898753b589549599630e3ad875f6ef10"
- },
- {
- "name": "@fontsource/coming-soon",
- "version": "5.3.0",
- "digest": "sha256:962fff0e0ca29eb40abcade296c2338ad1f4bf17fec694b887e8b0fecd9027f0"
- },
- {
- "name": "@fontsource/dm-serif-display",
- "version": "5.3.0",
- "digest": "sha256:7baa767191a29dcc38c3c1e3d88b18c2aedcda780f0ee96ad371d85121c37105"
- },
- {
- "name": "@fontsource/fira-sans-condensed",
- "version": "5.3.0",
- "digest": "sha256:467d333d5891df9e2648a9d56448d5964c62da005ecb52314ddda3d5ade900f0"
- },
- {
- "name": "@fontsource/gloock",
- "version": "5.3.0",
- "digest": "sha256:3f83f5e92b102434e658b8819a52c5a4684c840788d4a51e57973076e15951be"
- },
- {
- "name": "@fontsource/handlee",
- "version": "5.3.0",
- "digest": "sha256:95e1df2590271e9161503f9de5ec9be5b04a4760638fd508c0d8373105d80963"
- },
- {
- "name": "@fontsource/ibm-plex-mono",
- "version": "5.3.0",
- "digest": "sha256:ce4e3dc94b06c85c8a46a6abd9d80e9dc6550731efdd57fefb1fd352c9271313"
- },
- {
- "name": "@fontsource/instrument-serif",
- "version": "5.3.0",
- "digest": "sha256:788b83afa32264554f58562af494b587f7c955f54c172a3e6b655ec7e5cdbf20"
- },
- {
- "name": "@fontsource/kalam",
- "version": "5.3.0",
- "digest": "sha256:8b628b2523d1f66bfa793f674a5a11b2469b2fe175b48fb5154a34dd50ac58d2"
- },
- {
- "name": "@fontsource/kanit",
- "version": "5.3.0",
- "digest": "sha256:44b66731e8b69804fa498661337bcd20012ed4f15a85a27376dea9175f9a4d2d"
- },
- {
- "name": "@fontsource/lato",
- "version": "5.3.0",
- "digest": "sha256:7b9301126b2841096a8c3c2019c8ff0bc6d3f0cec82666dcc817cc9ae171ca5f"
- },
- {
- "name": "@fontsource/lilita-one",
- "version": "5.3.0",
- "digest": "sha256:b068bbb59d6eefcbc234c2c86751f69cf612ceb342c89929999d2d8964d02f8d"
- },
- {
- "name": "@fontsource/liu-jian-mao-cao",
- "version": "5.3.0",
- "digest": "sha256:f9057013c9fd6c031d093311429c8a05b5d633738edfb5be7d597c6f7ec6b638"
- },
- {
- "name": "@fontsource/long-cang",
- "version": "5.3.0",
- "digest": "sha256:9afe14768b363325209e3c150cf80fc516c80c9241fd369949991bb895f96af0"
- },
- {
- "name": "@fontsource/luckiest-guy",
- "version": "5.3.0",
- "digest": "sha256:6ee2cb66ca3a5d27517685e14e68ff2ea3810a2b8bf68927890312ed7796701d"
- },
- {
- "name": "@fontsource/ma-shan-zheng",
- "version": "5.3.0",
- "digest": "sha256:a02ffc7b1d3c7a419280d698475267a50c6c17065a189197a150afaa2d780651"
- },
- {
- "name": "@fontsource/pacifico",
- "version": "5.3.0",
- "digest": "sha256:4f73e816d6d4873df136642f5dccec552b9b86eb1d893aa0831ffa1dc3d7ebf5"
- },
- {
- "name": "@fontsource/patrick-hand",
- "version": "5.3.0",
- "digest": "sha256:3b90fe2b3da647db3b16b85272baa7260043a242e0308428151d2ad9c6c3f985"
- },
- {
- "name": "@fontsource/permanent-marker",
- "version": "5.3.0",
- "digest": "sha256:e0a02a5f2bf71402f6031b495315dbc8f908ffe45f62dcf2c25aeab9e3445e9d"
- },
- {
- "name": "@fontsource/pinyon-script",
- "version": "5.3.0",
- "digest": "sha256:6a04c8fb82f82c7c778bd9bc4c4de80c9883693dda54b8bd5177f44974c1094e"
- },
- {
- "name": "@fontsource/poppins",
- "version": "5.3.0",
- "digest": "sha256:a6062360c1fb29ca3ea309989341b960051a6dbec3618c30c458c642bf7dad32"
- },
- {
- "name": "@fontsource/righteous",
- "version": "5.3.0",
- "digest": "sha256:79e84f71bdeec58c7a8f9f27713b9ce0bc69c03172deb27303efd39587fb2980"
- },
- {
- "name": "@fontsource/satisfy",
- "version": "5.3.0",
- "digest": "sha256:c7dffc71d3f7cacd478896455d11633b6529ea3b6b90b3a8ea33a3baeaf1e766"
- },
- {
- "name": "@fontsource/shadows-into-light",
- "version": "5.3.0",
- "digest": "sha256:d2ada94bd5e183d93b51e7e971711f6a85f3a0f4469e138f0af7362ee2fc17b6"
- },
- {
- "name": "@fontsource/short-stack",
- "version": "5.3.0",
- "digest": "sha256:f3f57149b79b7aa692199846414def30dd13ff6ed8f837d1731be8d261233e10"
- },
- {
- "name": "@fontsource/space-mono",
- "version": "5.3.0",
- "digest": "sha256:3d45b28d3e4c26cd7aac85d6df23808117dfdde126926394e63f6aa9ae1f355d"
- },
- {
- "name": "@fontsource/zcool-kuaile",
- "version": "5.3.0",
- "digest": "sha256:92769d2814bb9186e26e388dc0656a8a0e2e883829646352024c0aec41dbbbbd"
- },
- {
- "name": "@fontsource/zcool-qingke-huangyou",
- "version": "5.3.0",
- "digest": "sha256:15854638d77023d0e32383f53f490e060cd8e0f8cf4994b2c99fe8522bf74e43"
- },
- {
- "name": "@fontsource/zcool-xiaowei",
- "version": "5.3.0",
- "digest": "sha256:79a87ecebfb75fc4fc01b36db09fe67d2080c090b73e145dc605dd2375974284"
- },
- {
- "name": "@infolektuell/noto-color-emoji",
- "version": "0.2.0",
- "digest": "sha256:1cb876e4d1fbd09da62f17c1599935b132427288052b2ab3afa8a8458329a720"
- },
- {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev",
- "digest": "sha256:b254bc523b6e65563cc9df32b270a4f7fe17a7fb7b26a0fd9dc944d4c16479d1"
- },
- {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev",
- "digest": "sha256:730a3bdccb438d627587756ee71a171ee4d9846b254e5f5c0afc0b8187ed2676"
- },
- {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev",
- "digest": "sha256:1b5cdb014c3ac774e0b998459092d3a26c042733f878cc81c00c0e435420c58a"
- },
- {
- "name": "@narratage/caption",
- "version": "0.0.0-dev",
- "digest": "sha256:46f2273af9f932e4c208a3e7dd692456691f7827967af0efb54b1a4e1a1388b5"
- },
- {
- "name": "@narratage/component-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:a503483ab1e923d1c81473e2f3d433aacfa08703c2d81715e66aa310f170a0ae"
- },
- {
- "name": "@narratage/composition",
- "version": "0.0.0-dev",
- "digest": "sha256:e5724c7fdfe7f4c915cf850de9485d25920415d4d4185010c929abcde233d0fa"
- },
- {
- "name": "@narratage/core",
- "version": "0.0.0-dev",
- "digest": "sha256:1262fed3211025ac608b60c4f7f47c9d493473cb05307ade3671ebafb79f5fe0"
- },
- {
- "name": "@narratage/elaborator",
- "version": "0.0.0-dev",
- "digest": "sha256:e5e6d5de8eb028e582238f3cb987001a3a332a0645f823d60bb01c3964041161"
- },
- {
- "name": "@narratage/estimate",
- "version": "0.0.0-dev",
- "digest": "sha256:96943c839ec65c4bbf6e2fa687332861d1625a3ab8dc897e4d845e6e58c3a293"
- },
- {
- "name": "@narratage/film",
- "version": "0.0.0-dev",
- "digest": "sha256:482d49f5c1abd03cb360c38a973b242bb9a49547fa31d87076e0ee53dc0f6adc"
- },
- {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev",
- "digest": "sha256:876eaa390d8a62b782111895c961ebb4a734de44a3f291feb43e8bf3523e2da5"
- },
- {
- "name": "@narratage/generation",
- "version": "0.0.0-dev",
- "digest": "sha256:840cbc1a4b0d611761d917e7c3be744ba5aa513e8556b92290470cd917c64ce1"
- },
- {
- "name": "@narratage/host",
- "version": "0.0.0-dev",
- "digest": "sha256:041d64f76f14fe995a9242906591d98a37b1d33e2c1aa6d4fa9c14bae1fda8ad"
- },
- {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:c202f0a15af238738846b1d02124d78bcd06f54272eb1bbbb5dfc9c7ec0fabe8"
- },
- {
- "name": "@narratage/markup",
- "version": "0.0.0-dev",
- "digest": "sha256:8d4f58d79d5d1ea21dedf84ba63064a5fc2c710df499d58e58701b3557fbedc6"
- },
- {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev",
- "digest": "sha256:fa027f725f23153d1f45db6aff658e200e5ce4863858f1cd3969031e10080da9"
- },
- {
- "name": "@narratage/media-track",
- "version": "0.0.0-dev",
- "digest": "sha256:494b5719ddc085eb4e29aaebd3a69ed5cc4ff8de448b2b882a25ed3dce7e0833"
- },
- {
- "name": "@narratage/media",
- "version": "0.0.0-dev",
- "digest": "sha256:688d1a3fb202ccb875d7d3135ed3382ef15f6d8d591a38634449e83a1371615c"
- },
- {
- "name": "@narratage/model-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:7ee53615cec344fc8866832be4ccf2fee88077871557cc98e7d539b78ba7d565"
- },
- {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev",
- "digest": "sha256:da8eee7d882aaadaf64996962920306ec366b026b65d24f33d882391f2a68d24"
- },
- {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev",
- "digest": "sha256:afe21487a254d5d042636a6e22d66e15f6023e461b115d50ceae1f1d44914089"
- },
- {
- "name": "@narratage/protocol",
- "version": "0.0.0-dev",
- "digest": "sha256:9b500750ffce24e7e521dcb6d785fba243222237f10e2b2dbd4887187b657274"
- },
- {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:d214b56eaa2c29383d4b0140696be343b0b755db077a7257b05f614667ed80dc"
- },
- {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev",
- "digest": "sha256:3c88369dc97248f561ef83d2775c02e3e1704751808429734a72faca61a0468e"
- },
- {
- "name": "@narratage/run",
- "version": "0.0.0-dev",
- "digest": "sha256:84ddca1556318111c3b067ff439bb7b94cb7856c30a5762cf07a083b61be2b17"
- },
- {
- "name": "@narratage/script",
- "version": "0.0.0-dev",
- "digest": "sha256:7c7e837d3e2ecd1ae3aaf4e12c1e73d21f226a9ff7588a865cc1187f166feb0d"
- },
- {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev",
- "digest": "sha256:9d3c20203f9dd4cf4d40b1f1662639fe3bd6d06f62e7629c22566c9f9f9d8f36"
- },
- {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev",
- "digest": "sha256:eb1d5ee85a566713f862b0685df20063c1083dbbd8014bda93427613c5f202e8"
- },
- {
- "name": "@narratage/source",
- "version": "0.0.0-dev",
- "digest": "sha256:3cf49ecaa8e6ea145d642dd90834e887ca073a720364fd890197768e3e1e5cd2"
- },
- {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev",
- "digest": "sha256:c0548cacaf821e6811addd2a5ba9609ceaabb29c7a6d9776f3f1d45fe37ec644"
- },
- {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev",
- "digest": "sha256:fda24a3d99eb883471147a2c3b1c5caa5526fb2721e0943a8146e1e8f3dd4ecc"
- },
- {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev",
- "digest": "sha256:5ba1ca2e8f0049c198a85e446c0847221113e9c89aafde7c5a8a0c8be86fdd96"
- },
- {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev",
- "digest": "sha256:991b1dbcb2136186110bdb12885504f35cce1ade335151f4f0b3e5c552950196"
- },
- {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev",
- "digest": "sha256:209d28a81e41f486cce6173e3647389866b3571131efe2842f5223066ef772f2"
- },
- {
- "name": "@narratage/speech",
- "version": "0.0.0-dev",
- "digest": "sha256:079a337dfdb293f25dc7bb87a7644b3520524e165df913d8085c6c527ed25158"
- },
- {
- "name": "@narratage/svs",
- "version": "0.0.0-dev",
- "digest": "sha256:22bce93d56291e627e4dbeeafcfc8dc1e2217f95d6a88ec5dd0e3221f20babe2"
- },
- {
- "name": "@narratage/temporal",
- "version": "0.0.0-dev",
- "digest": "sha256:ff7659ab2fcd3faba7413ef323de48c9e221a5b47fc25e3aa5f347261156eabe"
- },
- {
- "name": "@narratage/text",
- "version": "0.0.0-dev",
- "digest": "sha256:bc799fdd99df3b7a224f2b1c7581db94649e833c760fe22216935ae3548c150c"
- },
- {
- "name": "@narratage/typography-track",
- "version": "0.0.0-dev",
- "digest": "sha256:57dc722f6010b10cbbb96dce1c593319e43170b5499c5b71e77713f4f412836b"
- },
- {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev",
- "digest": "sha256:2dee587eedeb2d5c16d63b53aec6a476aec7555b40241352a0d8dc0f91db9631"
- },
- {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev",
- "digest": "sha256:65555eac7342e1c538083be0bf627af10ca266c9d9a68221d78c2d88778c91c5"
- },
- {
- "name": "cmu-pronouncing-dictionary",
- "version": "3.0.0",
- "digest": "sha256:9771ce965a3170bd1853f1d61dc1f517f31613e0d1775d07b0381f3b75364b31"
- }
- ],
- "packages": [
- {
- "package": {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/artifact@1"
- }
- ],
- "facetsDigest": "sha256:a56f39df98f2bff5caf339a427586e73be079eb26697c2313612bf7c07d78e2c",
- "closureDigest": "sha256:d627ce0b82cedc237f8cc923a44dd9d6849240615f5cf971181cc242b7468498"
- },
- {
- "package": {
- "name": "@narratage/caption",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption@1"
- }
- ],
- "facetsDigest": "sha256:1fbbf9bcdc39382ec612df3f29765b5d6ceb8598c0df2c7b5d6b8515f73367a3",
- "closureDigest": "sha256:790bad794d072c3bab93c3d76307b9cc836669681273ab04b1f06709dff1eb5a"
- },
- {
- "package": {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-fine@1"
- }
- ],
- "facetsDigest": "sha256:73e3f528a76fdc553ba2ee87fe5beb5fb2c91b7d4fcdff4ba9e6963d4740fdf6",
- "closureDigest": "sha256:894767197868c4df9cfec52541621b53298e5dcef78dc692b90dc7f73c1a2aa7"
- },
- {
- "package": {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-gemini@1"
- }
- ],
- "facetsDigest": "sha256:894d546ffa3c9e221fc6b686d11bc117d15a250399332e3ae1c1d28a547e0f30",
- "closureDigest": "sha256:7ae1df06b13ad365e05f8d1b45eb045bddc832976dc612898aff0e05d0c9366f"
- },
- {
- "package": {
- "name": "@narratage/composition",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/composition@1"
- }
- ],
- "facetsDigest": "sha256:05c22bda8c301365c1cfff2c0afa80067f3d2a0fba167a57ebf923af720a5c34",
- "closureDigest": "sha256:7d309e990bdfaf84168b43bd8b41a3b6f25dd394eb53c7bb34340fd59c0a67a9"
- },
- {
- "package": {
- "name": "@narratage/estimate",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/estimate@1"
- }
- ],
- "facetsDigest": "sha256:c22a49bd60d2e8061f9cd57c57869a6bcdcfb1a39886ad68f5f4f62a8ddc663a",
- "closureDigest": "sha256:85f440f06d6e65eeb3ca38768a6a64796994ead70a78e4d9fc518697b0da71c3"
- },
- {
- "package": {
- "name": "@narratage/film",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/film@1"
- }
- ],
- "facetsDigest": "sha256:b96fd578be298ab154d1ad30a27d7e54ae0cf2f8f52f52d7bf13c0785d2a8da7",
- "closureDigest": "sha256:f98b81818ae8bc4d0b5e47edb5ef9a080b092f65766178d0dad4dc7b86d74b55"
- },
- {
- "package": {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/fonts-open@1"
- }
- ],
- "facetsDigest": "sha256:de93037cec9a364da45fedc69a2d82cca93c5866e475942241c008f46c3a8da9",
- "closureDigest": "sha256:716b251dd7100f055b10dbb6c92d799f19ac1c9e3d17aeaaa38eef421ebe4512"
- },
- {
- "package": {
- "name": "@narratage/generation",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/generation@1"
- }
- ],
- "facetsDigest": "sha256:d9ee4c44949ca2d24967e7d81898999db84ab592fdaaafe1bd6d22a28ea5e094",
- "closureDigest": "sha256:8f86d9c4e36b2a01d484f44ea59278ec4deedd86cc1797ca6d84ba5bd2ca38ff"
- },
- {
- "package": {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:7596800f1ce4506145f9ff50c768bfc07131c5ea8d421711a6b5268ce13960f7",
- "closureDigest": "sha256:1a45cbbbfdf5b2da33be35fdb33aac91fa7536fa29b75d3959e1fc9ae52e0bf2"
- },
- {
- "package": {
- "name": "@narratage/media",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media@1"
- }
- ],
- "facetsDigest": "sha256:5bbef7d089f36dd1ea36b743b1b4f03289ccb8a2fc50383e3b355982916ccfc6",
- "closureDigest": "sha256:70cbebe094cab5f1990f5effcdfd72f48a78e5cf2316b3629049d1eca34cfa35"
- },
- {
- "package": {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media-pipeline@1"
- }
- ],
- "facetsDigest": "sha256:a96ae88d7813e660bb496b77e53f66ed7e218b20d4e157632c9a4fd832580a92",
- "closureDigest": "sha256:a37b9c1903ce96a1b7554147e8a48dd2104bc54dc732909edeb6a77c37f2ce36"
- },
- {
- "package": {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/narrative@1"
- }
- ],
- "facetsDigest": "sha256:8d535e4842c8bf287e62f8ecc803927b79d02b3cb438ba3959c369fb1d2a828d",
- "closureDigest": "sha256:aa91fbb77dc816674cc84bbe05ed1e4c784aafbbd13e1ce282b07b4cbb3f9e0d"
- },
- {
- "package": {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/program-space@1"
- }
- ],
- "facetsDigest": "sha256:92ebae07c9947d9d18277c0d8f784d5740c092f14dd3efa263138aec454ca91a",
- "closureDigest": "sha256:1e7cff66aec35080ccbacc0e7e2d850cd08206a59c6c400546646608d649659b"
- },
- {
- "package": {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/render-hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:31b63a4bf10385d31feb50114811c5185b78a0caab6b7c1646c86a61c4958128",
- "closureDigest": "sha256:1ba24f24c93b7aa090d41a62b6708f93364c906e483efea007bac9d399db7bf5"
- },
- {
- "package": {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/run-markup@1"
- }
- ],
- "facetsDigest": "sha256:c38a4e2e76a2f87b6a401bf0cad4b18f04274689ffae22c09f8f520046a7123e",
- "closureDigest": "sha256:f9cf27428f0d85d63930f56b9e23df481c4e956d5d86c03fef5c88e62dd22fb7"
- },
- {
- "package": {
- "name": "@narratage/script",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/script@1"
- }
- ],
- "facetsDigest": "sha256:acc754c61e24f93d5e2692ceb6998a3638cc384de8e512e155738435663a8342",
- "closureDigest": "sha256:cbf4fe4ec28ae6958956ee67d02c8a4a30d2e4e5cbd64d8952e317c6df435fbb"
- },
- {
- "package": {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/seedance@1"
- }
- ],
- "facetsDigest": "sha256:41615659f664d3480af5a50c81df188b6fc848628c60bc82d37eb7735071f111",
- "closureDigest": "sha256:3ea90ac12b4ac7bddce6064ac99d946aa89745c0fbf06861100415c12bd63882"
- },
- {
- "package": {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/semantic-map@1"
- }
- ],
- "facetsDigest": "sha256:80cad17557218021f4912919b0fc5bbfda61523fc40242e12dafd92a5ca52d28",
- "closureDigest": "sha256:162ab0d26ba8577910bea38e44f39909bfd275033175e8c6892a21f8a298f8b0"
- },
- {
- "package": {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/spatial@1"
- }
- ],
- "facetsDigest": "sha256:4e6da482a365cd36423f3baf568ea741f2e0eddf26b559bce43d3c4270830c91",
- "closureDigest": "sha256:dde427e997833b5ed6639deeed75070eb98bc9e50c8f0a7da8f31fefe4435724"
- },
- {
- "package": {
- "name": "@narratage/speech",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech@1"
- }
- ],
- "facetsDigest": "sha256:e86e5c90307ab183d2ea5d75e4ca0daab4f2b65905feb79c387871370d625e3a",
- "closureDigest": "sha256:8be1559095728f977914d56c4e7dfd070362d7bbddfb0565062129fe27a67d8d"
- },
- {
- "package": {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-alignment@1"
- }
- ],
- "facetsDigest": "sha256:b55e20b4fdf24cbfaf956447ff62885e81638fdbcbb61f25483392a1c8fac8c9",
- "closureDigest": "sha256:34ff2b938c8cdb94823a2843e882ac9d1e8f51f46dee02a6b0342b69f48c5be3"
- },
- {
- "package": {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-basis@1"
- }
- ],
- "facetsDigest": "sha256:3e7413acb9b39071fad0ea2e99777ae9ab7a4b636041a8345ec1d08428859b3f",
- "closureDigest": "sha256:e0a9f8e7c454beb36d67e9bd358383fc91567e70e9f43f75290a831028e39576"
- },
- {
- "package": {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-evidence@1"
- }
- ],
- "facetsDigest": "sha256:26f3ab63067b382373a9c4c24569bd672302370f5d0c64a055d61862959fc4d0",
- "closureDigest": "sha256:0df8b3aa5a3c29300be9779b7f6f53fc44051665f956b20d554551d4100272f6"
- },
- {
- "package": {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-spine@1"
- }
- ],
- "facetsDigest": "sha256:340cf867483022b3896008781f24a04e22aa0abc76873cc44787aefdc0219522",
- "closureDigest": "sha256:f215f8ec4e02bf26ff0960b129760eeb80ab59658cd0ec0476481b73c11f09ee"
- },
- {
- "package": {
- "name": "@narratage/svs",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/svs@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/svs@1"
- }
- ],
- "facetsDigest": "sha256:27cb7828391b2cd5b9fd0a6690d16010f23b78540d501aad6f9afa75da33f1da",
- "closureDigest": "sha256:ff88e3ec2e95ef40afb308f240c59ed57149ceff4bf5e58d3429fada1ff702f6"
- },
- {
- "package": {
- "name": "@narratage/text",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/text@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/text/svs@1"
- }
- ],
- "facetsDigest": "sha256:2d4d0e9eea9ec795fb675ddf7d204bc29fe7eb8e3a743eced944a0cdb50ecf50",
- "closureDigest": "sha256:51afff4d06131cc77a3e6953a9151564dfb79bde943f1250d91d24db1f2c00d4"
- },
- {
- "package": {
- "name": "@narratage/typography-track",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/typography-track@1"
- }
- ],
- "facetsDigest": "sha256:063c2641007f401709acfed6eab95ae9c566de1e0987a06c7cdce305abe33aa7",
- "closureDigest": "sha256:489ec9e9f0bdfa329ddf39537529b95f14e79b2608c48d6031a47ce2944fdbb3"
- },
- {
- "package": {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/visual-ir@1"
- }
- ],
- "facetsDigest": "sha256:039735354a109969a18b2c26ab8b02bb6d09a7a35f993336e8e8711e6d429f14",
- "closureDigest": "sha256:7653a66f3fdff9894e02cf080e3c9cf11fbbb28e93b3adc55b8ed99d7de42bab"
- },
- {
- "package": {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/whisperx@1"
- }
- ],
- "facetsDigest": "sha256:64c0e76dea02b19be28bc7425e11938fd9c1dbb9994dde3a6d98c41da819b85e",
- "closureDigest": "sha256:233b055191b86b8527083fe601c89216d7dabbce7a227123dc5d6b2117322753"
- }
- ],
- "digest": "sha256:08cea3a161efc3a7c06c73a3ac5ccbaf3bcefa4894798a03cf088f8b2d18347f"
-}
diff --git a/examples/talking-film-live/svml.runtime-packages.lock b/examples/talking-film-live/svml.runtime-packages.lock
deleted file mode 100644
index 2f109c4c..00000000
--- a/examples/talking-film-live/svml.runtime-packages.lock
+++ /dev/null
@@ -1,1044 +0,0 @@
-{
- "format": "svml.node-package-lock@1",
- "selected": [
- "@narratage/artifact-store-fs",
- "@narratage/credential-store-env",
- "@narratage/local",
- "@narratage/provider-google-vertex",
- "@narratage/provider-hyperframes-local",
- "@narratage/provider-kie",
- "@narratage/provider-media-local",
- "@narratage/provider-whisperx-local",
- "@narratage/store-sqlite"
- ],
- "artifacts": [
- {
- "name": "@esbuild/darwin-arm64",
- "version": "0.25.12",
- "digest": "sha256:f3ca2a2dd0e67a3e2beaf9d45626a7209a22ca5725e076d1e04008691655cd43"
- },
- {
- "name": "@google/genai",
- "version": "1.52.0",
- "digest": "sha256:39117de2d79f62402c4905b9b7ed58fa34c04c4d9e85c6272613437a0ff60f5c"
- },
- {
- "name": "@hono/node-server",
- "version": "2.0.12",
- "digest": "sha256:87923b51e3cbe9ca6b5d712bd97d5a1181a21d269f06cfca6931d827627986ba"
- },
- {
- "name": "@img/colour",
- "version": "1.1.0",
- "digest": "sha256:07db37307451577b10a7e1b851470ec9b290ae05459a1540102d91e553ad607b"
- },
- {
- "name": "@isaacs/fs-minipass",
- "version": "4.0.1",
- "digest": "sha256:774ff19c91750abdf4d4b8d715bc0e12246bdaf2239f3e7441b9cdd21f224d72"
- },
- {
- "name": "@narratage/artifact-store-fs",
- "version": "0.0.0-dev",
- "digest": "sha256:609d09f53cba3f7367ef59502dc02f6c71d52b4f36914a0ebff8ac34703c8775"
- },
- {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev",
- "digest": "sha256:b254bc523b6e65563cc9df32b270a4f7fe17a7fb7b26a0fd9dc944d4c16479d1"
- },
- {
- "name": "@narratage/background-removal",
- "version": "0.0.0-dev",
- "digest": "sha256:ec0aa2d6ff0996940c7aedb1cd901a6ab0038e6e6a62ca701e623e39d3b81807"
- },
- {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev",
- "digest": "sha256:1b5cdb014c3ac774e0b998459092d3a26c042733f878cc81c00c0e435420c58a"
- },
- {
- "name": "@narratage/caption",
- "version": "0.0.0-dev",
- "digest": "sha256:46f2273af9f932e4c208a3e7dd692456691f7827967af0efb54b1a4e1a1388b5"
- },
- {
- "name": "@narratage/component-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:a503483ab1e923d1c81473e2f3d433aacfa08703c2d81715e66aa310f170a0ae"
- },
- {
- "name": "@narratage/composition",
- "version": "0.0.0-dev",
- "digest": "sha256:e5724c7fdfe7f4c915cf850de9485d25920415d4d4185010c929abcde233d0fa"
- },
- {
- "name": "@narratage/core",
- "version": "0.0.0-dev",
- "digest": "sha256:1262fed3211025ac608b60c4f7f47c9d493473cb05307ade3671ebafb79f5fe0"
- },
- {
- "name": "@narratage/credential-store-env",
- "version": "0.0.0-dev",
- "digest": "sha256:86ca20d6418e2c591359971f6afc59232c391fac37e3150eb5ed95adda495fe9"
- },
- {
- "name": "@narratage/driver-node",
- "version": "0.0.0-dev",
- "digest": "sha256:22cd089084eb82ca73f08d8e768a480327106f705dffd14b26381d36ea1e08cf"
- },
- {
- "name": "@narratage/elaborator",
- "version": "0.0.0-dev",
- "digest": "sha256:e5e6d5de8eb028e582238f3cb987001a3a332a0645f823d60bb01c3964041161"
- },
- {
- "name": "@narratage/endpoint-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:89eeade4f411bc5c1095647a07502b3912efff590099fd00b998901a755e59c4"
- },
- {
- "name": "@narratage/generation",
- "version": "0.0.0-dev",
- "digest": "sha256:840cbc1a4b0d611761d917e7c3be744ba5aa513e8556b92290470cd917c64ce1"
- },
- {
- "name": "@narratage/host",
- "version": "0.0.0-dev",
- "digest": "sha256:041d64f76f14fe995a9242906591d98a37b1d33e2c1aa6d4fa9c14bae1fda8ad"
- },
- {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:c202f0a15af238738846b1d02124d78bcd06f54272eb1bbbb5dfc9c7ec0fabe8"
- },
- {
- "name": "@narratage/local",
- "version": "0.0.0-dev",
- "digest": "sha256:ac56790c50bedb1e3380ca251463c3e41adfc1edc27cb8e6960791f95ec621de"
- },
- {
- "name": "@narratage/markup",
- "version": "0.0.0-dev",
- "digest": "sha256:8d4f58d79d5d1ea21dedf84ba63064a5fc2c710df499d58e58701b3557fbedc6"
- },
- {
- "name": "@narratage/media-execution",
- "version": "0.0.0-dev",
- "digest": "sha256:d096c01b5c7c18ba2a2ba3919bfffb8b5ac669a418d8e19ed847254a158e9ccf"
- },
- {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev",
- "digest": "sha256:fa027f725f23153d1f45db6aff658e200e5ce4863858f1cd3969031e10080da9"
- },
- {
- "name": "@narratage/media",
- "version": "0.0.0-dev",
- "digest": "sha256:688d1a3fb202ccb875d7d3135ed3382ef15f6d8d591a38634449e83a1371615c"
- },
- {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev",
- "digest": "sha256:da8eee7d882aaadaf64996962920306ec366b026b65d24f33d882391f2a68d24"
- },
- {
- "name": "@narratage/package-loader-node",
- "version": "0.0.0-dev",
- "digest": "sha256:9e155cff9e6263d2d954bca05a676cedb9d816286ee31b0d19d98e94eafca72d"
- },
- {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev",
- "digest": "sha256:afe21487a254d5d042636a6e22d66e15f6023e461b115d50ceae1f1d44914089"
- },
- {
- "name": "@narratage/protocol",
- "version": "0.0.0-dev",
- "digest": "sha256:9b500750ffce24e7e521dcb6d785fba243222237f10e2b2dbd4887187b657274"
- },
- {
- "name": "@narratage/provider-google-vertex",
- "version": "0.0.0-dev",
- "digest": "sha256:c8861059e5e7b652bfc1f0d4da6fef5b05d149f21c57916c4dabc8bb90c0276b"
- },
- {
- "name": "@narratage/provider-hyperframes-local",
- "version": "0.0.0-dev",
- "digest": "sha256:4827eaae0955d045f92ead0ee42d12521268fa8fded6372a3f53521d65ccfcba"
- },
- {
- "name": "@narratage/provider-kie",
- "version": "0.0.0-dev",
- "digest": "sha256:c67139c64f5b841d73d245d190ac8134591d58e363e13a26d9370040f79d1eed"
- },
- {
- "name": "@narratage/provider-media-local",
- "version": "0.0.0-dev",
- "digest": "sha256:eefbd7478a1c37eb3ddc28af0a70cf8fac2e1d8c37ed61a3026b36f03c8f21d4"
- },
- {
- "name": "@narratage/provider-whisperx-local",
- "version": "0.0.0-dev",
- "digest": "sha256:65e080a86701e76c9fafbe60235c38db1262557392ed7be3a0e893a73752bd30"
- },
- {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:d214b56eaa2c29383d4b0140696be343b0b755db077a7257b05f614667ed80dc"
- },
- {
- "name": "@narratage/runtime-adapter-node",
- "version": "0.0.0-dev",
- "digest": "sha256:0ce0b9d4ab66c1ba248b7925a859b4654429d5cd68f4309d2932a6070456cbb6"
- },
- {
- "name": "@narratage/runtime-adapter",
- "version": "0.0.0-dev",
- "digest": "sha256:37bfc677595841a6b4491b0066894271f252150e96b47dcd10123eecfe29cc3a"
- },
- {
- "name": "@narratage/runtime",
- "version": "0.0.0-dev",
- "digest": "sha256:9dc9cbeb2c3124c219da91237a02693cc6cd0c3f2511f20329c0f7cddffb2d06"
- },
- {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev",
- "digest": "sha256:eb1d5ee85a566713f862b0685df20063c1083dbbd8014bda93427613c5f202e8"
- },
- {
- "name": "@narratage/source",
- "version": "0.0.0-dev",
- "digest": "sha256:3cf49ecaa8e6ea145d642dd90834e887ca073a720364fd890197768e3e1e5cd2"
- },
- {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev",
- "digest": "sha256:c0548cacaf821e6811addd2a5ba9609ceaabb29c7a6d9776f3f1d45fe37ec644"
- },
- {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev",
- "digest": "sha256:fda24a3d99eb883471147a2c3b1c5caa5526fb2721e0943a8146e1e8f3dd4ecc"
- },
- {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev",
- "digest": "sha256:991b1dbcb2136186110bdb12885504f35cce1ade335151f4f0b3e5c552950196"
- },
- {
- "name": "@narratage/speech",
- "version": "0.0.0-dev",
- "digest": "sha256:079a337dfdb293f25dc7bb87a7644b3520524e165df913d8085c6c527ed25158"
- },
- {
- "name": "@narratage/store-sqlite",
- "version": "0.0.0-dev",
- "digest": "sha256:35e7243a129b0db8d7b1c9876411015e8c48cdb241506bfae5cbec7dfc2d512b"
- },
- {
- "name": "@narratage/svs",
- "version": "0.0.0-dev",
- "digest": "sha256:22bce93d56291e627e4dbeeafcfc8dc1e2217f95d6a88ec5dd0e3221f20babe2"
- },
- {
- "name": "@narratage/text",
- "version": "0.0.0-dev",
- "digest": "sha256:bc799fdd99df3b7a224f2b1c7581db94649e833c760fe22216935ae3548c150c"
- },
- {
- "name": "@narratage/validation",
- "version": "0.0.0-dev",
- "digest": "sha256:a73ba0cc3620754cda2c1064d3de1ce98563f72290e1e9af585253b095ff61c9"
- },
- {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev",
- "digest": "sha256:2dee587eedeb2d5c16d63b53aec6a476aec7555b40241352a0d8dc0f91db9631"
- },
- {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev",
- "digest": "sha256:65555eac7342e1c538083be0bf627af10ca266c9d9a68221d78c2d88778c91c5"
- },
- {
- "name": "@narratage/workspace",
- "version": "0.0.0-dev",
- "digest": "sha256:9f6dbe410a7bcab639ad0655998d36bf2d697ea1b2c1c0f52a818cef995fc0c6"
- },
- {
- "name": "@protobufjs/aspromise",
- "version": "1.1.2",
- "digest": "sha256:f2add582f001704c44380f69857f6d90976f8253b0d50aa78a3a18f07631f13b"
- },
- {
- "name": "@protobufjs/base64",
- "version": "1.1.2",
- "digest": "sha256:06b2c0c727a5c9245ca32469d0e5dd3476a1e16ba784de9a95e74378dad3be9f"
- },
- {
- "name": "@protobufjs/codegen",
- "version": "2.0.5",
- "digest": "sha256:1c2559930a27a866b83dcb32f945cb64c250d1b9a3d4846e10f9d67da7768fb1"
- },
- {
- "name": "@protobufjs/eventemitter",
- "version": "1.1.1",
- "digest": "sha256:c7ca7d4689ac40f5eaced3b446878c365640bab53923cfeeab0700393c78fa6d"
- },
- {
- "name": "@protobufjs/fetch",
- "version": "1.1.1",
- "digest": "sha256:4994a6ce027bf9c7cacf231612c9abf1c3bca106f1449981d2a950f4d5374fa5"
- },
- {
- "name": "@protobufjs/float",
- "version": "1.0.2",
- "digest": "sha256:6b39ca0e75f52ebbe0677dfc91289f771ed6ef764fe9b16b1089bba341df7e1b"
- },
- {
- "name": "@protobufjs/path",
- "version": "1.1.2",
- "digest": "sha256:f08474b157f229b416f4dfcd18af1394d6958099d2fb45f19196cace5ab8eb2a"
- },
- {
- "name": "@protobufjs/pool",
- "version": "1.1.0",
- "digest": "sha256:7fa58344bd7fd34f3d82ff681a2b9a1c1563f59bc525b04af18b83cc6862e351"
- },
- {
- "name": "@protobufjs/utf8",
- "version": "1.1.2",
- "digest": "sha256:a6e8be152be53993c5419c77351035d2f50c96548ea68a93ada5174872cab407"
- },
- {
- "name": "@puppeteer/browsers",
- "version": "3.1.0",
- "digest": "sha256:9c4a4b23834c62a8501f9cff553920437bc5241e5f2544d315784988b9b4d22c"
- },
- {
- "name": "@swc/helpers",
- "version": "0.5.23",
- "digest": "sha256:01e3a2aad97cb967224f124ee00312ed152a533f41c000975a3210efd6772315"
- },
- {
- "name": "@types/node",
- "version": "24.10.1",
- "digest": "sha256:8fa0086cef5b28049d3962a131ab7b458f6c6c123fd34439963f2b49c92e26aa"
- },
- {
- "name": "@types/retry",
- "version": "0.12.0",
- "digest": "sha256:3c0d455fdb883a9189bef24b8c28c20e38b1b81790627941fc52345f883776df"
- },
- {
- "name": "adm-zip",
- "version": "0.6.0",
- "digest": "sha256:b406b53cc1036ecd32ccd3a8f3be7910407e0206e47ac1f66e9024c37dedcdcb"
- },
- {
- "name": "agent-base",
- "version": "7.1.4",
- "digest": "sha256:87c907df716766b5486f32790957525a8d90af4ebec634205d4a2c22a767cae7"
- },
- {
- "name": "ansi-regex",
- "version": "6.2.2",
- "digest": "sha256:68e9c06b4a3650fed19bf0a3c20b215197209ddf856caa9a1a37b7f65de5a261"
- },
- {
- "name": "ansi-styles",
- "version": "6.2.3",
- "digest": "sha256:08da2e7a0903460c053d125d67ba55ac722d241ad858a09d3c6a0dfddf463e9e"
- },
- {
- "name": "base64-js",
- "version": "1.5.1",
- "digest": "sha256:21a8ff2186d871c92b2c8958df9d84ec967c2ecc26cb34a4632ee97856a7f3e1"
- },
- {
- "name": "bignumber.js",
- "version": "9.3.1",
- "digest": "sha256:c92307157c59bc4c56472278bb6ff718de1c31b56966927fa4eed154a3346e10"
- },
- {
- "name": "boolean",
- "version": "3.2.0",
- "digest": "sha256:9b07b070e89665a6ac71741ea8dd263a61b6bc3092f5c0236539cfe27c261ae5"
- },
- {
- "name": "brotli",
- "version": "1.3.3",
- "digest": "sha256:6e0c406465c179419228a0d4216e6224c40f37f60b19633e40c5b82a6bb3ba85"
- },
- {
- "name": "buffer-equal-constant-time",
- "version": "1.0.1",
- "digest": "sha256:8d532751643065156075c5b68d933386cde05759e773cccef4b77b2603f5d710"
- },
- {
- "name": "bundle-name",
- "version": "4.1.0",
- "digest": "sha256:56f299ebfb4532b990395d71ada619f840f8c53e8eef6308ce7bde7637c00e42"
- },
- {
- "name": "chownr",
- "version": "3.0.0",
- "digest": "sha256:480200db20b6b01b0187ae42d558bdf27e6f73c125c6c9563484bb588efdd52e"
- },
- {
- "name": "chromium-bidi",
- "version": "17.0.2",
- "digest": "sha256:7bce511709957dca1ea983de42c287aceebb65c0bfd6187487bcd30d52043275"
- },
- {
- "name": "citty",
- "version": "0.2.2",
- "digest": "sha256:2b96f0ef41541f40c6f3a67af0c3a743a56e2bf112d9243f52d492ac291b4fc6"
- },
- {
- "name": "cliui",
- "version": "9.0.1",
- "digest": "sha256:2f6fb31a6f05a074d8adde9542a46b71d956e278023349a21faaecfc1c6eb3f9"
- },
- {
- "name": "clone",
- "version": "2.1.2",
- "digest": "sha256:6b43f7ff5c6b3d978e723fc90dd0189436551098ec7138745f78b4a2f0b9f92a"
- },
- {
- "name": "compare-versions",
- "version": "6.1.1",
- "digest": "sha256:0ecd82fb4bbcae3fb65167f1df07c5a20edf3a48bac63ac2c184807bc56ecb2e"
- },
- {
- "name": "data-uri-to-buffer",
- "version": "4.0.1",
- "digest": "sha256:c83b4a18728c036e0a089e8d87706b7518784740ab58dc58ab7359d01cf3f1a4"
- },
- {
- "name": "debug",
- "version": "4.4.3",
- "digest": "sha256:304ed6a95b411a078e03c3916e660500aa9f9de06bf11cc06033ad54a707159a"
- },
- {
- "name": "default-browser-id",
- "version": "5.0.1",
- "digest": "sha256:b82fe817c2d5f1c050e5b584b1eb8ce0451a17cceebb89f44d99e92957e53cbd"
- },
- {
- "name": "default-browser",
- "version": "5.5.0",
- "digest": "sha256:170da580f2ba618cf36559651c369ce0e0b4c41c7faa4e147dfceefc22623c91"
- },
- {
- "name": "define-data-property",
- "version": "1.1.4",
- "digest": "sha256:fca69f48ebf1f761ed87558da2bf54e89279c2584fcde2dfe5251eeb1bbe49ba"
- },
- {
- "name": "define-lazy-prop",
- "version": "3.0.0",
- "digest": "sha256:d2ae304cf9cedf0e9884084f1b12c57ac626c35ed65591209bd1ed28e1c636cd"
- },
- {
- "name": "define-properties",
- "version": "1.2.1",
- "digest": "sha256:14a3c2884fe52795ff8d4989c42ac4eef50b03e43f092906e8bb9840f8c604ed"
- },
- {
- "name": "detect-libc",
- "version": "2.1.2",
- "digest": "sha256:f6d1cbe84b3768d0e4ec3a27f4935426f28d6db884b5154d316a3eb602b4f05a"
- },
- {
- "name": "detect-node",
- "version": "2.1.0",
- "digest": "sha256:e23f21cd23c3ac8eeb414fdd1cf07b444d5304d9e911489d093a54598eeec6f0"
- },
- {
- "name": "devtools-protocol",
- "version": "0.0.1653615",
- "digest": "sha256:0bc61b4492f895d3371a959e93936a707d30f0594ea1eb78924930392348c953"
- },
- {
- "name": "dfa",
- "version": "1.2.0",
- "digest": "sha256:f03697bc42cb361276cadcea1f3354f3192f359929d16589ff76cdfb772190da"
- },
- {
- "name": "ecdsa-sig-formatter",
- "version": "1.0.11",
- "digest": "sha256:c55a4220e735c26105c997912755884cf1f28e199c254bbd20522697c78b75c5"
- },
- {
- "name": "emoji-regex",
- "version": "10.6.0",
- "digest": "sha256:d4264fdc970ebe1e634439e4ccdf6b36bfb6e26ebad76ca797dcf18f58502433"
- },
- {
- "name": "es-define-property",
- "version": "1.0.1",
- "digest": "sha256:e65a28b769b86eb72a671971474f14d847c452b610cdedca2034ac4f487b41b1"
- },
- {
- "name": "es-errors",
- "version": "1.3.0",
- "digest": "sha256:15f3b370a55bf67732a9cf17b937e397921adeab248d83f24180d2e14d9b6bde"
- },
- {
- "name": "es6-error",
- "version": "4.1.1",
- "digest": "sha256:71b2330b85518b245ca6adefb1d77a696e750066d7229fd77ee51faea2a5d5a0"
- },
- {
- "name": "esbuild",
- "version": "0.25.12",
- "digest": "sha256:be6c7e2b09ea76a30532597e0171955e4588e7d4b984cb451f48f6cd3792240c"
- },
- {
- "name": "escalade",
- "version": "3.2.0",
- "digest": "sha256:3bb68ed8d0bf46965d493d7dc86d31eed3e8bcc82a07e20add860f51c106fd76"
- },
- {
- "name": "escape-string-regexp",
- "version": "4.0.0",
- "digest": "sha256:bf695cc4ec820bb7987a35f1af3d14f282a12a38594034836c2c292fc5050f98"
- },
- {
- "name": "extend",
- "version": "3.0.2",
- "digest": "sha256:c750753a00e753b94978ebf4a84d2bd75353fee1b88a8d85ac1e20ff6a1a365d"
- },
- {
- "name": "fast-deep-equal",
- "version": "3.1.3",
- "digest": "sha256:42ed3c3d2be15e877da479f9efe80816a085c7b3d57fe775d8e27e017546df5d"
- },
- {
- "name": "fetch-blob",
- "version": "3.2.0",
- "digest": "sha256:8a36c6aa8a9c8590e310d56fbf34b18f50687671554f7e812720acdfec8a7a0b"
- },
- {
- "name": "fontkit",
- "version": "2.0.4",
- "digest": "sha256:d2d7bf266cf637cbf1c1793701cdb859e99c16f12a3fb695d3f51341508c25d0"
- },
- {
- "name": "formdata-polyfill",
- "version": "4.0.10",
- "digest": "sha256:b9e931ab6b16d43c9381acd755f875752bff06fb508bdf07ff7ea0880b48d17a"
- },
- {
- "name": "gaxios",
- "version": "7.3.0",
- "digest": "sha256:2991703a4dafa9356326e924f7d66845f1f194662f5ef6a7ee6b8d7a29069cf5"
- },
- {
- "name": "gcp-metadata",
- "version": "8.1.2",
- "digest": "sha256:af943933cc72cc8a0a8cbd66933574b4c7820b1c938bf3ae870dc2d29daa69e9"
- },
- {
- "name": "get-caller-file",
- "version": "2.0.5",
- "digest": "sha256:9299b9f4312e40ce1abc93cf8508accfb7b9dfe0e2296e76861aee9832953f2b"
- },
- {
- "name": "get-east-asian-width",
- "version": "1.6.0",
- "digest": "sha256:80eb6329f500e01c525d107113329a5e19875dccee4a2dedd44bdb5d25928aeb"
- },
- {
- "name": "giget",
- "version": "3.3.1",
- "digest": "sha256:9095c8b2da2f8477877a1989dd7916da8bfb9a5545012d3da7a7bb50ff9eaa6c"
- },
- {
- "name": "global-agent",
- "version": "3.0.0",
- "digest": "sha256:138a78e1e7a5b8a3239361cbe4caf161c508f052b1b304cc6669470fb72816c2"
- },
- {
- "name": "globalthis",
- "version": "1.0.4",
- "digest": "sha256:df76d0da25ab8f020149cf066d2b62f82b65507c51a9c52cf6a3789e9a95ed8d"
- },
- {
- "name": "google-auth-library",
- "version": "10.9.1",
- "digest": "sha256:b7f30655126e71587c52c64baca556ce2ab5d3e2fbc2030f4f396acaa1b7afe0"
- },
- {
- "name": "google-logging-utils",
- "version": "1.1.3",
- "digest": "sha256:30c7f506015c8218718eceacd978339dfc50cee3a95cdbb04d5d7d677973f044"
- },
- {
- "name": "gopd",
- "version": "1.2.0",
- "digest": "sha256:463bf770beed8a51af109438a6555033de1bda940f5107edd84ace4e6ae3abb7"
- },
- {
- "name": "has-property-descriptors",
- "version": "1.0.2",
- "digest": "sha256:47f1621c5f96430ea46c12fa90c0b41c5e4648f3c5e3e8b6956ec6da91019d9c"
- },
- {
- "name": "hono",
- "version": "4.12.32",
- "digest": "sha256:ae1c33cc0a384ff91e495e9cc15265037386a0e80b23e0f29c27414a21bc1790"
- },
- {
- "name": "https-proxy-agent",
- "version": "7.0.6",
- "digest": "sha256:1013657bea7f02247aee642cbfdf6dca7a534d331b6eed367cf52c08b3c178ca"
- },
- {
- "name": "hyperframes",
- "version": "0.7.101",
- "digest": "sha256:24b78079c74422ce7aa3c3fd4ef79a2b40e2ea00127e7a8a7eb8be5d865e0853"
- },
- {
- "name": "ignore",
- "version": "5.3.2",
- "digest": "sha256:7ce8e139988a7b67710913ff265acfc7993aff1fba9b86bb984b3b999ef4d8b1"
- },
- {
- "name": "is-docker",
- "version": "3.0.0",
- "digest": "sha256:d43df9b09e7fd1e920406578921e339b79b4c6a523c25b3a0174b852caad2b41"
- },
- {
- "name": "is-inside-container",
- "version": "1.0.0",
- "digest": "sha256:7c224fc7e359fea06620a9f78c40826d544960685f9300451f58da95f6824aa1"
- },
- {
- "name": "is-wsl",
- "version": "3.1.1",
- "digest": "sha256:cd19b82a536ef031451c4e195351671f5c605cc1e2e6c435d38be0d439ebbc80"
- },
- {
- "name": "json-bigint",
- "version": "1.0.0",
- "digest": "sha256:78dbd36c1b196e087861980c4b198b2d2a4184856ab0cde2e9a2d8b640447b7a"
- },
- {
- "name": "json-stringify-safe",
- "version": "5.0.1",
- "digest": "sha256:cf420f3e9067d97fbd8718cce170ee811dcbe682296a80ea9c2a1b84fa49418d"
- },
- {
- "name": "jwa",
- "version": "2.0.1",
- "digest": "sha256:1ce4c87eefeff5866cc15c5358d465af06e4d1c762aa4d3bcca1dd77b085733d"
- },
- {
- "name": "jws",
- "version": "4.0.1",
- "digest": "sha256:9600a6d676cf870a248805ccc40bfda53e1194edf481e78fe7deab6c6f5ff123"
- },
- {
- "name": "long",
- "version": "5.3.2",
- "digest": "sha256:3d4d047be707c9fcd186c912864dcc9e0937a69dddf2f64b659d0a5e352d9c3e"
- },
- {
- "name": "matcher",
- "version": "3.0.0",
- "digest": "sha256:5bd2c657e8d48258b4eee6b85abfd6baeea1905880e1961b87e2f5d1b666f363"
- },
- {
- "name": "minipass",
- "version": "7.1.3",
- "digest": "sha256:b3c7c7268719f290572b07cc710c208f964e7e03cd5e4c87f6ee78931cb42d8e"
- },
- {
- "name": "minizlib",
- "version": "3.1.0",
- "digest": "sha256:ccd3f7ae56753854094bd4c874baf36ed0464f627c80c902402d7266c9b61339"
- },
- {
- "name": "mitt",
- "version": "3.0.1",
- "digest": "sha256:ce6aef694a3aa3a2aa0238ced1462fdd1e6365fa2ff5e49a175a9fad1f5c29a9"
- },
- {
- "name": "modern-tar",
- "version": "0.7.7",
- "digest": "sha256:891e12cd4440bfdcb4db46ba8e4a3a3f7a752ad42d26d3f4c5948762894a31b2"
- },
- {
- "name": "ms",
- "version": "2.1.3",
- "digest": "sha256:a141890e3a2dfb54d5bdd95b901821c311d9841e7f2ce2e3e5dbabee3af4e66d"
- },
- {
- "name": "nanoid",
- "version": "3.3.16",
- "digest": "sha256:ed57ac355bbd0cd97a4325bef9895b2d842a9b46ada0ba3a255a93c496872768"
- },
- {
- "name": "node-domexception",
- "version": "1.0.0",
- "digest": "sha256:8415ab26ce05a24c58531f511872cc884be27733e9879a9b14c0644f0f288ef3"
- },
- {
- "name": "node-fetch",
- "version": "3.3.2",
- "digest": "sha256:3cf962b70037de2f7ddc2d715b498cdec94400649ea3907c1a1f4c760e553b3e"
- },
- {
- "name": "object-keys",
- "version": "1.1.1",
- "digest": "sha256:e93bdcdfbfebe00ef728b53ec4d1ec41dfa3e7598520255106b84fe25c4600cf"
- },
- {
- "name": "onnxruntime-common",
- "version": "1.21.1",
- "digest": "sha256:8ecfbe59731de65bdff1f5b82652af349f93b66db55de3f49aa4b067e5b6a9ff"
- },
- {
- "name": "onnxruntime-node",
- "version": "1.21.1",
- "digest": "sha256:de224ff89b23f42422f15ba1d1a40a8624436a246f60ffa21dc5d6eb8bbe7bc9"
- },
- {
- "name": "open",
- "version": "10.2.0",
- "digest": "sha256:704838b6e442ca0c07b232e471e2d33e3f8c3907ff4dac65c34cc5452e690f80"
- },
- {
- "name": "p-retry",
- "version": "4.6.2",
- "digest": "sha256:ad26b9b16e3bcac0fd71295607fb400e5cccc3e9cebaef2477b187cc06820c40"
- },
- {
- "name": "pako",
- "version": "0.2.9",
- "digest": "sha256:bc932e8cd7a506f19b273d28312c01eca0eb29a8277b3341d52f72c8a3c6dc87"
- },
- {
- "name": "picocolors",
- "version": "1.1.1",
- "digest": "sha256:533a587e52703f20267c68cce3bb13d15f0d111e77641b4fc15dfd0909541da7"
- },
- {
- "name": "postcss",
- "version": "8.5.25",
- "digest": "sha256:86cae1a4a2f7db456622414bdc5fab2f2894a814431206dae3bd56b5da0c8da7"
- },
- {
- "name": "prettier",
- "version": "3.9.6",
- "digest": "sha256:ab64dd2b905d298318673b85f56619555497b4c4ca587e65cc87cbd0088be18f"
- },
- {
- "name": "protobufjs",
- "version": "7.6.5",
- "digest": "sha256:f261811e191755ef6c287354088d20f040f51f8106917669940f0efe90c51378"
- },
- {
- "name": "puppeteer-core",
- "version": "25.5.0",
- "digest": "sha256:c7081e270d302135c3febe5e13145104041d2ce60307b1fba3cba83d8a9ac5e7"
- },
- {
- "name": "restructure",
- "version": "3.0.2",
- "digest": "sha256:afe0b1af07f709de30108a7f34d1cbc24240d5af47058908b3ab948387411f47"
- },
- {
- "name": "retry",
- "version": "0.13.1",
- "digest": "sha256:20439b301564d3af33e4a4ae5a14fdb20546f77d4f467706301b444645d3a3f7"
- },
- {
- "name": "roarr",
- "version": "2.15.4",
- "digest": "sha256:95a31fad16046a827ad5f4aecede3eabca4590bebb7c558fb4319f692c382f2e"
- },
- {
- "name": "run-applescript",
- "version": "7.1.0",
- "digest": "sha256:7a1b536c998db95296d89b6adfcdde3849eae8ebb938a88343dd7880feb1010f"
- },
- {
- "name": "safe-buffer",
- "version": "5.2.1",
- "digest": "sha256:bf6c4b10b5ebca05c55cb32fc8da545f8200e8ac3e73233d9b8d30d3206b229e"
- },
- {
- "name": "semver-compare",
- "version": "1.0.0",
- "digest": "sha256:3b5950314b60d01814af7091f197e54621d66500d0c6b30f1622f12fd2fbe86c"
- },
- {
- "name": "semver",
- "version": "7.8.5",
- "digest": "sha256:782f8f680bcdbb9a8adad55a695c158f2c75a3ca1a7440d7174ba0164f666b1d"
- },
- {
- "name": "serialize-error",
- "version": "7.0.1",
- "digest": "sha256:16c05ffdf0930c58bdf64a77ff384fdfc90d41006e640cfb58a2dd2772931b4d"
- },
- {
- "name": "sharp",
- "version": "0.35.3",
- "digest": "sha256:d5a0288867e280eafbb69100ba8df01a02b6ee36a0106111d083f06e2e6093f2"
- },
- {
- "name": "source-map-js",
- "version": "1.2.1",
- "digest": "sha256:ebeb8811bac667d76a17286fb9e2398e970224d4caf437039330b6a7a1cbd6e8"
- },
- {
- "name": "sprintf-js",
- "version": "1.1.3",
- "digest": "sha256:c745235a5311cf6565a67449381ba71ab68fbb1f244180b547d4c7783b530d94"
- },
- {
- "name": "string-width",
- "version": "7.2.0",
- "digest": "sha256:6d33893de56cb9280537fad3eac2a768c279e403431764010cdfae3051f061fd"
- },
- {
- "name": "string-width",
- "version": "8.2.2",
- "digest": "sha256:ff4c8083cc6990b6514251a1430f6f5ea1fc5df49eb09085ece93ebea3a8a8bd"
- },
- {
- "name": "strip-ansi",
- "version": "7.2.0",
- "digest": "sha256:d93d07a9c18cd1a7c3b97b06ab2b67771b10ec1bd3e8a566d71042e8f75c5103"
- },
- {
- "name": "tar",
- "version": "7.5.22",
- "digest": "sha256:cd33e317cf398c1e65cde8099cb2f6ad40797b59bc950b5ae21cc174f263604a"
- },
- {
- "name": "tiny-inflate",
- "version": "1.0.3",
- "digest": "sha256:1bf162535f9aa8155774d4be09711f32730e6a5b5433706155e485b7b6ed8d46"
- },
- {
- "name": "tslib",
- "version": "2.8.1",
- "digest": "sha256:be0ff64197522f7466475b202e5642ac2fc7453bf77bd401e3c5af405fae5e08"
- },
- {
- "name": "type-fest",
- "version": "0.13.1",
- "digest": "sha256:7ecf27eb506bbdff58c42c4fa8ca5d7f9fe371d77503a41d8d0dd96070ff5ba9"
- },
- {
- "name": "typed-query-selector",
- "version": "2.12.2",
- "digest": "sha256:03010157f77e88b71831120e82c8d607d61c13d0dde047793fe2752e26bd9bab"
- },
- {
- "name": "undici-types",
- "version": "7.16.0",
- "digest": "sha256:56b851f33e38ba7913791a0d6cd2d862088b1efabe04fc599f961cf0611e12f5"
- },
- {
- "name": "unicode-properties",
- "version": "1.4.1",
- "digest": "sha256:f32f120a86229d5ddc6253bd8362ca9f3ec6665c55dcd4b12207db642a506524"
- },
- {
- "name": "unicode-trie",
- "version": "2.0.0",
- "digest": "sha256:32767668f5e23f4e9882cff32feae4b9dae6a9a5516ad4aeabf0fd01e856e6a5"
- },
- {
- "name": "web-streams-polyfill",
- "version": "3.3.3",
- "digest": "sha256:a9a0913d9acc78134f762f33c210311fada5ec4dcc0cb913bd237338f2fb8840"
- },
- {
- "name": "webdriver-bidi-protocol",
- "version": "0.4.2",
- "digest": "sha256:fe55ecd5a6990c02d57aa3149d4d4bcbd62cd27fcd69ee859739c91a0673f36c"
- },
- {
- "name": "wrap-ansi",
- "version": "9.0.2",
- "digest": "sha256:7db579468d39db77518c5f6951ac1b36330b5d81253e762ca171872aa9a6a3f3"
- },
- {
- "name": "ws",
- "version": "8.21.1",
- "digest": "sha256:e301f9237b858df0cc503d608fd5918640518c3378d8373d1f8a763e7977f838"
- },
- {
- "name": "wsl-utils",
- "version": "0.1.0",
- "digest": "sha256:5a8be00a56eb39f7923f42016f86f7ef3d15f36794d189ca9615d8b84ef8245f"
- },
- {
- "name": "y18n",
- "version": "5.0.8",
- "digest": "sha256:b60b70efd3b784a66f22536369d3c445582c3a76b6903615726c9743fff936e3"
- },
- {
- "name": "yallist",
- "version": "5.0.0",
- "digest": "sha256:d16e9bce9588bb0f5b3cf3a3d16e6628b0d234b58d6d85961a946fabf52ad4ee"
- },
- {
- "name": "yargs-parser",
- "version": "22.0.0",
- "digest": "sha256:4341e3a4b3ea190fc549c665549a24b30bb0ca67e8607cbf4e72eaa497d7b493"
- },
- {
- "name": "yargs",
- "version": "18.1.0",
- "digest": "sha256:c2f28503e8f01b19f87037b16b4bcd7145bad43dbe79bed7beab51c031cbc39d"
- },
- {
- "name": "zod",
- "version": "3.25.76",
- "digest": "sha256:6771243deb9b85f002496af9a1ffd198078b61794ef04e352fbe062c9cfa083a"
- }
- ],
- "packages": [
- {
- "package": {
- "name": "@narratage/artifact-store-fs",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/artifact-store-fs"
- }
- ],
- "facetsDigest": "sha256:d06bf1c242e6b819ab605471f7332e1150e1ebf5f81e08cf77f9bfff082ea197",
- "closureDigest": "sha256:941a2c17d30e3cc733a8415557aecd80c45b7de0493ee69b670270fc7e492ae2"
- },
- {
- "package": {
- "name": "@narratage/credential-store-env",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/credential-store-env"
- }
- ],
- "facetsDigest": "sha256:cac24cfb3965fe73d76c8b90e1fb676ff5f7606928fb38ff3b1aeb8eb9e3ea0e",
- "closureDigest": "sha256:e3dfea4ee0734eb0ae53593b5aaae2ee05d652aa6322055e0dc0d3a58e4009b1"
- },
- {
- "package": {
- "name": "@narratage/local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.node-runtime-host-adapter@1",
- "name": "@narratage/local"
- },
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/local"
- }
- ],
- "facetsDigest": "sha256:552616c833a22031c623b0ad24f08a843f72f332eff2113032d63e2539d42e88",
- "closureDigest": "sha256:8baca82be34ae891ca52c8835e23116e51ccf59086ae3f90243f5c41bc6c12f0"
- },
- {
- "package": {
- "name": "@narratage/provider-google-vertex",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-google-vertex"
- }
- ],
- "facetsDigest": "sha256:485fc29d1efcdaeb4e395980975b35090ea6aef0f78d02108d3bd9b3f11aeb91",
- "closureDigest": "sha256:a9c49b1ee0b7e446739c552f006efdb2e02a6fbd95026be9ac2e2a4f579bcbff"
- },
- {
- "package": {
- "name": "@narratage/provider-hyperframes-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-hyperframes-local"
- }
- ],
- "facetsDigest": "sha256:e08dde3e4d38b167dca29cdc54eb2bb5e9ebc294e0e42b371099d53d6c44b402",
- "closureDigest": "sha256:8716f0eda32fec48f21cccfdb15b953f6708100923be2f9d1ed577c10db40f19"
- },
- {
- "package": {
- "name": "@narratage/provider-kie",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-kie"
- }
- ],
- "facetsDigest": "sha256:110648301d69b5b49ea553d285a27626f6fb74ebc74ee67175f688f914d7d74b",
- "closureDigest": "sha256:f7f87ad8a1ad76f950edf27bbd8a69bc9080da2b408fec8945d619cea8bf3208"
- },
- {
- "package": {
- "name": "@narratage/provider-media-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-media-local"
- }
- ],
- "facetsDigest": "sha256:998de772acb283828fee16310e77922bf43597bca1efa768e8398166a90af27d",
- "closureDigest": "sha256:d8386c799c6f77909767076e81a3932be033bf24e0eb65b07f79a14e7bf759a8"
- },
- {
- "package": {
- "name": "@narratage/provider-whisperx-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-whisperx-local"
- }
- ],
- "facetsDigest": "sha256:e7d4f1e2fd56f2bcb5dbc36e1faae48d2680bb839aed4a43eb0cb23207ffbe1d",
- "closureDigest": "sha256:8e38557baf5fb4c5abcdc4f6a702a8e792fd19b36a088e0f9fee6a68577e367b"
- },
- {
- "package": {
- "name": "@narratage/store-sqlite",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/store-sqlite"
- }
- ],
- "facetsDigest": "sha256:dcd11bfeb19b68e69aeecd31d34de36045dd92e36039d651385081ce4180080b",
- "closureDigest": "sha256:dbc85921b27942e27a5fde033803962733f20970536cbdfd2059ff249e22d946"
- }
- ],
- "digest": "sha256:a038c726f4d7a38e761a8d07b317187e7bd1178130560e0aeeeaa6c75c2fcd30"
-}
diff --git a/examples/talking-head-aroll/README.md b/examples/talking-head-aroll/README.md
index 49b1b20e..d6e3590e 100644
--- a/examples/talking-head-aroll/README.md
+++ b/examples/talking-head-aroll/README.md
@@ -23,35 +23,34 @@ single `final.video` target.
The current deterministic estimate is 12, 15, 15 and 15 seconds. The Recipe deliberately caps a
take at Seedance's 15-second request limit.
-Synchronize both package locks from the Run Source and Runtime Profile:
+Select the Runtime Profile:
```sh
cd examples/talking-head-aroll
-../../narratage runtime use svml.runtime.json
-../../narratage packages sync build.svrun
+narratage runtime use narratage.runtime.json
```
Inspect the authored graph—including the visible `*.prompt` Text output and `*.program`—without a paid call:
```sh
-../../narratage check main.svml
+narratage check main.svml
```
Inspect the exact paid plan before submitting it:
```sh
-../../narratage plan build.svrun
+narratage plan build.svrun
```
Build the complete film after preparing the managed local WhisperX service and exposing `KIE_API_KEY`,
`GOOGLE_CLOUD_PROJECT` and `GOOGLE_APPLICATION_CREDENTIALS_JSON`:
```sh
-../../narratage runtime up
+narratage runtime up
-../../narratage build build.svrun --follow
+narratage build build.svrun --follow
-../../narratage get <build-id> \
+narratage get <build-id> \
--name final.video \
--to output/final.mp4
```
@@ -63,7 +62,7 @@ Run the same downstream film from the four archived generated shots without anot
submission:
```sh
-../../narratage build reuse-generated.svrun --follow
+narratage build reuse-generated.svrun --follow
```
Before this second command, replace `REPLACE_WITH_BUILD_ID` in `reuse-generated.svrun` with the
@@ -77,5 +76,5 @@ This brand-neutral fixture demonstrates the same topology with two explicit Run
generation and reuse through zero-input Build-Record Candidates. Local source assets and generated
Records are intentionally not committed.
-The package lock lists independent packages. It is not a hidden video bundle, and the video CLI
+Source imports select independent packages. There is no hidden video bundle, and the video CLI
contains no authoring or Run-language package by default.
diff --git a/examples/talking-head-aroll/svml.runtime.json b/examples/talking-head-aroll/narratage.runtime.json
similarity index 66%
rename from examples/talking-head-aroll/svml.runtime.json
rename to examples/talking-head-aroll/narratage.runtime.json
index 8ee79970..72436d3b 100644
--- a/examples/talking-head-aroll/svml.runtime.json
+++ b/examples/talking-head-aroll/narratage.runtime.json
@@ -1,26 +1,23 @@
{
"format": "narratage.runtime-profile@1",
- "runtimePackageLock": "./svml.runtime-packages.lock",
"runtime": {
- "use": "@narratage/local",
+ "use": "@narratage/runtime-local",
"config": {
"dataRoot": ".narratage/runtimes/local",
- "components": {
- "execution": { "use": "@narratage/local" },
+ "infrastructure": {
+ "execution": { "use": "@narratage/runtime-local" },
"state": { "use": "@narratage/store-sqlite", "config": { "path": "state.sqlite" } },
"artifacts": { "use": "@narratage/artifact-store-fs", "config": { "path": "artifacts" } },
- "credentials.env": { "use": "@narratage/credential-store-env", "config": {} }
+ "credentials": { "use": "@narratage/credential-store-env", "config": {} }
},
- "bindings": {
- "scheduler": "execution.scheduler",
- "worker": "execution.worker",
- "stores": {
- "build": "state.builds",
- "operations": "state.operations",
- "dispatch": "state.dispatch",
- "artifacts": "artifacts",
- "credentials": ["credentials.env"]
- }
+ "roles": {
+ "scheduler": { "from": "execution", "part": "scheduler" },
+ "worker": { "from": "execution", "part": "worker" },
+ "buildStore": { "from": "state", "part": "builds" },
+ "operationStore": { "from": "state", "part": "operations" },
+ "dispatchStore": { "from": "state", "part": "dispatch" },
+ "artifactStore": { "from": "artifacts", "part": "store" },
+ "credentialStores": [{ "from": "credentials", "part": "store" }]
},
"endpoints": {
"kie.talking-head-aroll": {
@@ -52,7 +49,7 @@
"config": { "workers": 2, "quality": "standard", "defaultConcurrency": 1 }
}
},
- "limits": { "maxOperations": 4 }
+ "capacity": { "maxActiveOperations": 4 }
}
}
}
diff --git a/examples/talking-head-aroll/svml.packages.lock b/examples/talking-head-aroll/svml.packages.lock
deleted file mode 100644
index 3d37d148..00000000
--- a/examples/talking-head-aroll/svml.packages.lock
+++ /dev/null
@@ -1,1190 +0,0 @@
-{
- "format": "svml.node-package-lock@1",
- "selected": [
- "@narratage/caption",
- "@narratage/caption-fine",
- "@narratage/caption-gemini",
- "@narratage/estimate",
- "@narratage/film",
- "@narratage/fonts-open",
- "@narratage/media",
- "@narratage/render-hyperframes",
- "@narratage/run-markup",
- "@narratage/script",
- "@narratage/seedance",
- "@narratage/spatial",
- "@narratage/speech-spine",
- "@narratage/svs",
- "@narratage/text",
- "@narratage/whisperx"
- ],
- "artifacts": [
- {
- "name": "@fontsource-variable/archivo",
- "version": "5.3.0",
- "digest": "sha256:d0756ae991869df099871e469cc1a3206efc9c50ab34298da0b97aec284fec88"
- },
- {
- "name": "@fontsource-variable/bodoni-moda",
- "version": "5.3.0",
- "digest": "sha256:124e5f7bd2cd952ba895a72847b89bc4fa0a0d831644466393efe61b050622f8"
- },
- {
- "name": "@fontsource-variable/cabin",
- "version": "5.3.0",
- "digest": "sha256:c0da1888b21a3fdc8b391a08b7a59459ce2bdde5a4550bbd34cd6aaf381af93c"
- },
- {
- "name": "@fontsource-variable/caveat",
- "version": "5.3.0",
- "digest": "sha256:21e2ae66cd592a9bd0b53714d04b4aa9adeda6c9340d6180f174829155af2dbe"
- },
- {
- "name": "@fontsource-variable/cinzel",
- "version": "5.3.0",
- "digest": "sha256:883ab987aaf354347d03b5c4a6e59068611dff971011b75c0a2cd8785d084b85"
- },
- {
- "name": "@fontsource-variable/cormorant-garamond",
- "version": "5.3.0",
- "digest": "sha256:5fb212991abe42dc54820a0e99a50d54fd68b8794e05e01fcecd88bc3d9b718f"
- },
- {
- "name": "@fontsource-variable/crimson-pro",
- "version": "5.3.0",
- "digest": "sha256:2af0252ef3293e7f7213467bf2908cbd92a1ac1ef2de8a37ed3134aa553b0854"
- },
- {
- "name": "@fontsource-variable/dm-sans",
- "version": "5.3.0",
- "digest": "sha256:282b5942ecdf37ecb2946c271874f16053e32d7984e465bafa848cd70979b7c5"
- },
- {
- "name": "@fontsource-variable/eb-garamond",
- "version": "5.3.0",
- "digest": "sha256:3f839e82eff702919083009237af1c1975b80f8d9766ac5f97a291cfbf82dea0"
- },
- {
- "name": "@fontsource-variable/figtree",
- "version": "5.3.0",
- "digest": "sha256:bbd1e28aae1070c95fe09ce9bdc94e310b950d35e13d0817fce344d2a57a5c07"
- },
- {
- "name": "@fontsource-variable/fira-code",
- "version": "5.3.0",
- "digest": "sha256:26593d3b4aab4bef1d37b2f7b301739efd6861020b1f44e2cddf14b933453d72"
- },
- {
- "name": "@fontsource-variable/fraunces",
- "version": "5.3.0",
- "digest": "sha256:1da79839589a15663f4c0a75f91899450e20b8d6bd91044c826d07f4ca4d3771"
- },
- {
- "name": "@fontsource-variable/fredoka",
- "version": "5.3.0",
- "digest": "sha256:aeb50015a5e92b2033e5358f391f1221cf7a461f5793ab28d516fa0ee535af85"
- },
- {
- "name": "@fontsource-variable/geist-mono",
- "version": "5.3.0",
- "digest": "sha256:9122fc7e67d7f2788cb82b2eacd489a9430435133488962cbe9ab40ff952dccd"
- },
- {
- "name": "@fontsource-variable/geist",
- "version": "5.3.0",
- "digest": "sha256:01af74b4d77592a1d560c1992568eca3e719117b81b5c2c8798281680180a8c4"
- },
- {
- "name": "@fontsource-variable/instrument-sans",
- "version": "5.3.0",
- "digest": "sha256:10b5fd92cf05d3259b0dfca0b37971b7c522f29b17b5804ddc5bb404ceefc7e3"
- },
- {
- "name": "@fontsource-variable/inter",
- "version": "5.3.0",
- "digest": "sha256:e4ca49893204e3b3d156d22daddb4f96c06a94cc0d0767d6f7613d84d8e3d4fe"
- },
- {
- "name": "@fontsource-variable/jetbrains-mono",
- "version": "5.3.0",
- "digest": "sha256:0445625a317f4ff6cfe58c4272334b4af720309df2339356d3fb81e40c375210"
- },
- {
- "name": "@fontsource-variable/josefin-sans",
- "version": "5.3.0",
- "digest": "sha256:5780323301d2480c3e111de34f9dfc11d24fc165be4fcfbc9293dd34da0dcadd"
- },
- {
- "name": "@fontsource-variable/jost",
- "version": "5.3.0",
- "digest": "sha256:875e424e28d005d8b467aa576de202ae3b84c243eaa52d971e946243c1973439"
- },
- {
- "name": "@fontsource-variable/league-spartan",
- "version": "5.3.0",
- "digest": "sha256:6b05150ad1aeede4aed7505507c8b69187bd25f7897dd43ff7f2e93a0028c37c"
- },
- {
- "name": "@fontsource-variable/lexend",
- "version": "5.3.0",
- "digest": "sha256:ca5800b1c654c71ad3c93a47801c2f5748e49cff9b0985ed375c67f500bd1166"
- },
- {
- "name": "@fontsource-variable/libre-baskerville",
- "version": "5.3.0",
- "digest": "sha256:5297642650a09c5a59f7e602b88b7756d379397da7c6e4dfe273b8f1cc6a225c"
- },
- {
- "name": "@fontsource-variable/lora",
- "version": "5.3.0",
- "digest": "sha256:fdea73d2d75785a45046ef9e2dd1ccac35a1194e31ddabfb0f0b95582d418943"
- },
- {
- "name": "@fontsource-variable/manrope",
- "version": "5.3.0",
- "digest": "sha256:c7821cba633009f45db0ae545cbdcd1de1ec764d299b503ade1b8da6ad7f6f07"
- },
- {
- "name": "@fontsource-variable/merriweather",
- "version": "5.3.0",
- "digest": "sha256:0c264e97ca3f76da2d31726727b120a44910ab2620a45f3e09ae938d0fdcc9c4"
- },
- {
- "name": "@fontsource-variable/montserrat",
- "version": "5.3.0",
- "digest": "sha256:b457c7e96aae71eeee8683e6af5eb766c025b2a889d03daa5298fa2e1abc2855"
- },
- {
- "name": "@fontsource-variable/mulish",
- "version": "5.3.0",
- "digest": "sha256:5ce4f4131ef5c5a7ba7f78e7ea82dc45ea0c4ec0550699cf64568e09e54dbb2d"
- },
- {
- "name": "@fontsource-variable/newsreader",
- "version": "5.3.0",
- "digest": "sha256:3c7c5e41a7d778f342a4108253e062deba68ce5bcba1bad7b3cb962e57132a7a"
- },
- {
- "name": "@fontsource-variable/noto-emoji",
- "version": "5.3.0",
- "digest": "sha256:c135feb03a6be9cabe5bef963d63cfa08c97d3ecdf521aa309324c00cacd9964"
- },
- {
- "name": "@fontsource-variable/noto-naskh-arabic",
- "version": "5.3.0",
- "digest": "sha256:f7637a644a70cf88203426e0ebce7dcb8dc672baf63370437c39fbee8b125b8e"
- },
- {
- "name": "@fontsource-variable/noto-sans-arabic",
- "version": "5.3.0",
- "digest": "sha256:5981bdd510158a68c72e42557bcb3387d6ef9ba958bf5000500fa26fe7373767"
- },
- {
- "name": "@fontsource-variable/noto-sans-devanagari",
- "version": "5.3.0",
- "digest": "sha256:dae73904faa148f60a06af6b267916b6ce656c4c333f1b1de63828b8a5639686"
- },
- {
- "name": "@fontsource-variable/noto-sans-hebrew",
- "version": "5.3.0",
- "digest": "sha256:ff616f500efb9d965be8a95d46ca13f3113704360472286f0596aa0bff5dfbc3"
- },
- {
- "name": "@fontsource-variable/noto-sans-hk",
- "version": "5.3.0",
- "digest": "sha256:faa4e754134193f0c0ffa957c9aae3b75779bd443373a3c1e9759ce5876463d5"
- },
- {
- "name": "@fontsource-variable/noto-sans-jp",
- "version": "5.3.0",
- "digest": "sha256:adf3c03671005935de55199037a2e26ebb81471f95268d7327b54aa6ffbacf62"
- },
- {
- "name": "@fontsource-variable/noto-sans-kr",
- "version": "5.3.0",
- "digest": "sha256:97da1dc319b8f42deda034729ac2bfadb0e3b0992f8034edaa39d7270ba2b042"
- },
- {
- "name": "@fontsource-variable/noto-sans-sc",
- "version": "5.3.0",
- "digest": "sha256:1c49ddaaa5d7aeb0503cfa78914bb4957259108c3dfb262d5f4b2bc49549af89"
- },
- {
- "name": "@fontsource-variable/noto-sans-tc",
- "version": "5.3.0",
- "digest": "sha256:08085bc109242c4034e966d2a9580ee02b261ea04d01dbfc27e316f99223c849"
- },
- {
- "name": "@fontsource-variable/noto-sans-thai",
- "version": "5.3.0",
- "digest": "sha256:ff0050b1cc056bcf88fd713d1dc74f42b0e8799f7931ea89da03a51a03dc4588"
- },
- {
- "name": "@fontsource-variable/noto-sans",
- "version": "5.3.0",
- "digest": "sha256:d27afb70065955c963fc96bf65580a086e6d05c9e4b81177941eb730c5e44dd4"
- },
- {
- "name": "@fontsource-variable/noto-serif-jp",
- "version": "5.3.0",
- "digest": "sha256:c442057a769b0293012b790df56d250f08ec7abf5bcbcbc6ef39b9103329ef68"
- },
- {
- "name": "@fontsource-variable/noto-serif-kr",
- "version": "5.3.0",
- "digest": "sha256:000000dfd6e3700d029217bff41b83cfd0266af9fade349b32441f16facd8dce"
- },
- {
- "name": "@fontsource-variable/noto-serif-sc",
- "version": "5.3.0",
- "digest": "sha256:7d845bd433554bc7a9dc656dc7e0818d6083b080a3e9d69956b97b2cf4221d16"
- },
- {
- "name": "@fontsource-variable/noto-serif-tc",
- "version": "5.3.0",
- "digest": "sha256:58b67399101d6fbfbd1a73c0c06c5de29e24889a1592d922f5afd1f6e550e15d"
- },
- {
- "name": "@fontsource-variable/nunito-sans",
- "version": "5.3.0",
- "digest": "sha256:491045f06b188718c4945f753678c851b0a16348e087e62ec6bd9d91a7f29f07"
- },
- {
- "name": "@fontsource-variable/onest",
- "version": "5.3.0",
- "digest": "sha256:dc69d3aba9dca697a3704954a2c9ed6ad2dde3a508f9cff3cfabf06fed2e7518"
- },
- {
- "name": "@fontsource-variable/open-sans",
- "version": "5.3.0",
- "digest": "sha256:bfa7bb83169eaf59da9c2492b9f87adaf4b07a8a2c5580ae235801842ad74b84"
- },
- {
- "name": "@fontsource-variable/oswald",
- "version": "5.3.0",
- "digest": "sha256:25e3819b4bfdd9fc8786d8d4cbc4bcc5121ad617180ab4e38e33573678a64b28"
- },
- {
- "name": "@fontsource-variable/outfit",
- "version": "5.3.0",
- "digest": "sha256:7da0bec12f2f4cc25652bd2bdfdb8686982121bf96f5182e45df5e7a67e3d134"
- },
- {
- "name": "@fontsource-variable/playfair-display",
- "version": "5.3.0",
- "digest": "sha256:9169e0b0212478bec819d29137e25a5e6770cb59508678a2b3d642706c099551"
- },
- {
- "name": "@fontsource-variable/playpen-sans",
- "version": "5.3.0",
- "digest": "sha256:0cdc396f3617afb4d405378726f48b9ef1dab85e3d1c9c4658450a09cb4335a3"
- },
- {
- "name": "@fontsource-variable/plus-jakarta-sans",
- "version": "5.3.0",
- "digest": "sha256:0d3387379914e9c6e57e67a1ccef7a943b372da8ec46de6956a5fd214e3b2609"
- },
- {
- "name": "@fontsource-variable/quicksand",
- "version": "5.3.0",
- "digest": "sha256:8443330eed78c79d91c3582df8b93d22bd82cd7bc4b7c9ae5c3c0f1499a6cac1"
- },
- {
- "name": "@fontsource-variable/raleway",
- "version": "5.3.0",
- "digest": "sha256:ac1f6114679c0177df758499b8d34def94f5b579a939bf2bb3456023ac2be6dc"
- },
- {
- "name": "@fontsource-variable/rethink-sans",
- "version": "5.3.0",
- "digest": "sha256:90242c18b19a9737e80a66ae6922a9c5bd5250a8972981ac1c09e4f8f8aee372"
- },
- {
- "name": "@fontsource-variable/roboto-condensed",
- "version": "5.3.0",
- "digest": "sha256:2b77bf05ddb63c0ebc2827d267235ee6b2851e0371c559f7a93eaf599d329b54"
- },
- {
- "name": "@fontsource-variable/roboto-mono",
- "version": "5.3.0",
- "digest": "sha256:a83a97b73d190630c8d4801333a73e2c265e0ad2480bc77056ad6a5db1672aae"
- },
- {
- "name": "@fontsource-variable/roboto-slab",
- "version": "5.3.0",
- "digest": "sha256:b6d68b8e9932671733d77695b50c09a23e804e952b7ab8da1a05f06ac827cfef"
- },
- {
- "name": "@fontsource-variable/roboto",
- "version": "5.3.0",
- "digest": "sha256:22fd32070d7eb714439e18dfd00da736b833a4ea4f661c8a3b1761ffe8895b30"
- },
- {
- "name": "@fontsource-variable/rubik",
- "version": "5.3.0",
- "digest": "sha256:b66dbc0f67e2c1e9b075f6ee5ed7eff18a3f7398bfdbc3c463962d1bb5064487"
- },
- {
- "name": "@fontsource-variable/shantell-sans",
- "version": "5.3.0",
- "digest": "sha256:18dcfa8618a3ff5bd420e46bac5fcdbc659242f3c0a67f45fc3ef598a9709fae"
- },
- {
- "name": "@fontsource-variable/sora",
- "version": "5.3.0",
- "digest": "sha256:bd5ff142c0797c37b763ae0a97bd1e9469ae163d084887a4660c73d2cf019693"
- },
- {
- "name": "@fontsource-variable/source-serif-4",
- "version": "5.3.0",
- "digest": "sha256:9833b70d7a2c410496ec00794b3c26034593353ac76fe173f3a6df2e958f6167"
- },
- {
- "name": "@fontsource-variable/space-grotesk",
- "version": "5.3.0",
- "digest": "sha256:9a601acdf9e2b9656f537f6691b40152dbc0c9043b249eeda4980281bcced5e5"
- },
- {
- "name": "@fontsource-variable/unbounded",
- "version": "5.3.0",
- "digest": "sha256:f664f5bbef08608533b00016c00a89b623df987b10a89d4832251b2440370c16"
- },
- {
- "name": "@fontsource-variable/urbanist",
- "version": "5.3.0",
- "digest": "sha256:06b9993e23960a5295ad059f44632e0f37ef3157f69ee06fae315fc47765c289"
- },
- {
- "name": "@fontsource-variable/vollkorn",
- "version": "5.3.0",
- "digest": "sha256:a177bb9b23a8c92311a189943fc8f0fb818b68909a792d82e5dd962795c4e663"
- },
- {
- "name": "@fontsource-variable/work-sans",
- "version": "5.3.0",
- "digest": "sha256:e14b9500f229c1fb1500e6c2c5e816601b95a008ac82a05b7d9fd1abc0421efb"
- },
- {
- "name": "@fontsource/abril-fatface",
- "version": "5.3.0",
- "digest": "sha256:5450fc572771171fa509f606b94038bb34722e3baf643d4f892f51d8fb83bca7"
- },
- {
- "name": "@fontsource/alfa-slab-one",
- "version": "5.3.0",
- "digest": "sha256:f3c3900506c54a7a6e15d1edf4181e10638e7d4aa4686db8114a5ff9287138cc"
- },
- {
- "name": "@fontsource/anton",
- "version": "5.3.0",
- "digest": "sha256:8327a2b26073d4deb0ec66643312e1abd4593ea07631a0e1a414e28743513947"
- },
- {
- "name": "@fontsource/architects-daughter",
- "version": "5.3.0",
- "digest": "sha256:8f944b7f148e1f5c6dcdc8108d6e29a99c23423568ee717bd47fc327a0456d3d"
- },
- {
- "name": "@fontsource/archivo-black",
- "version": "5.3.0",
- "digest": "sha256:abef23f9387cc85892ca65e550546ad47a9cd865a965b80b4c954eb48c14d430"
- },
- {
- "name": "@fontsource/bangers",
- "version": "5.3.0",
- "digest": "sha256:93cc064d70ee9bb054fcab65756111ad2adec1a2563b298ad0e0b423a1bbf8a5"
- },
- {
- "name": "@fontsource/barlow-condensed",
- "version": "5.3.0",
- "digest": "sha256:2bd19ad50f89e4e3697aa36fe7a18780b88d1bf4197a8112d709886bb7f52e47"
- },
- {
- "name": "@fontsource/barlow",
- "version": "5.3.0",
- "digest": "sha256:78fe6d1de271b8a49ebdcc588c7d3b91e46ed8f645d1747b360426c7f3b95a55"
- },
- {
- "name": "@fontsource/bebas-neue",
- "version": "5.3.0",
- "digest": "sha256:19e030c987fb0a607c7c5b7cc49e215319547b4a5bdbad23a847dd72559c0be9"
- },
- {
- "name": "@fontsource/black-ops-one",
- "version": "5.3.0",
- "digest": "sha256:a886f9fa9d0125a8f58a41134c5a68cbfa1d9a9ecac554e28d6749dd3c001d6f"
- },
- {
- "name": "@fontsource/bungee",
- "version": "5.3.0",
- "digest": "sha256:2f6397365b231b67179119ac7c639dd8898753b589549599630e3ad875f6ef10"
- },
- {
- "name": "@fontsource/coming-soon",
- "version": "5.3.0",
- "digest": "sha256:962fff0e0ca29eb40abcade296c2338ad1f4bf17fec694b887e8b0fecd9027f0"
- },
- {
- "name": "@fontsource/dm-serif-display",
- "version": "5.3.0",
- "digest": "sha256:7baa767191a29dcc38c3c1e3d88b18c2aedcda780f0ee96ad371d85121c37105"
- },
- {
- "name": "@fontsource/fira-sans-condensed",
- "version": "5.3.0",
- "digest": "sha256:467d333d5891df9e2648a9d56448d5964c62da005ecb52314ddda3d5ade900f0"
- },
- {
- "name": "@fontsource/gloock",
- "version": "5.3.0",
- "digest": "sha256:3f83f5e92b102434e658b8819a52c5a4684c840788d4a51e57973076e15951be"
- },
- {
- "name": "@fontsource/handlee",
- "version": "5.3.0",
- "digest": "sha256:95e1df2590271e9161503f9de5ec9be5b04a4760638fd508c0d8373105d80963"
- },
- {
- "name": "@fontsource/ibm-plex-mono",
- "version": "5.3.0",
- "digest": "sha256:ce4e3dc94b06c85c8a46a6abd9d80e9dc6550731efdd57fefb1fd352c9271313"
- },
- {
- "name": "@fontsource/instrument-serif",
- "version": "5.3.0",
- "digest": "sha256:788b83afa32264554f58562af494b587f7c955f54c172a3e6b655ec7e5cdbf20"
- },
- {
- "name": "@fontsource/kalam",
- "version": "5.3.0",
- "digest": "sha256:8b628b2523d1f66bfa793f674a5a11b2469b2fe175b48fb5154a34dd50ac58d2"
- },
- {
- "name": "@fontsource/kanit",
- "version": "5.3.0",
- "digest": "sha256:44b66731e8b69804fa498661337bcd20012ed4f15a85a27376dea9175f9a4d2d"
- },
- {
- "name": "@fontsource/lato",
- "version": "5.3.0",
- "digest": "sha256:7b9301126b2841096a8c3c2019c8ff0bc6d3f0cec82666dcc817cc9ae171ca5f"
- },
- {
- "name": "@fontsource/lilita-one",
- "version": "5.3.0",
- "digest": "sha256:b068bbb59d6eefcbc234c2c86751f69cf612ceb342c89929999d2d8964d02f8d"
- },
- {
- "name": "@fontsource/liu-jian-mao-cao",
- "version": "5.3.0",
- "digest": "sha256:f9057013c9fd6c031d093311429c8a05b5d633738edfb5be7d597c6f7ec6b638"
- },
- {
- "name": "@fontsource/long-cang",
- "version": "5.3.0",
- "digest": "sha256:9afe14768b363325209e3c150cf80fc516c80c9241fd369949991bb895f96af0"
- },
- {
- "name": "@fontsource/luckiest-guy",
- "version": "5.3.0",
- "digest": "sha256:6ee2cb66ca3a5d27517685e14e68ff2ea3810a2b8bf68927890312ed7796701d"
- },
- {
- "name": "@fontsource/ma-shan-zheng",
- "version": "5.3.0",
- "digest": "sha256:a02ffc7b1d3c7a419280d698475267a50c6c17065a189197a150afaa2d780651"
- },
- {
- "name": "@fontsource/pacifico",
- "version": "5.3.0",
- "digest": "sha256:4f73e816d6d4873df136642f5dccec552b9b86eb1d893aa0831ffa1dc3d7ebf5"
- },
- {
- "name": "@fontsource/patrick-hand",
- "version": "5.3.0",
- "digest": "sha256:3b90fe2b3da647db3b16b85272baa7260043a242e0308428151d2ad9c6c3f985"
- },
- {
- "name": "@fontsource/permanent-marker",
- "version": "5.3.0",
- "digest": "sha256:e0a02a5f2bf71402f6031b495315dbc8f908ffe45f62dcf2c25aeab9e3445e9d"
- },
- {
- "name": "@fontsource/pinyon-script",
- "version": "5.3.0",
- "digest": "sha256:6a04c8fb82f82c7c778bd9bc4c4de80c9883693dda54b8bd5177f44974c1094e"
- },
- {
- "name": "@fontsource/poppins",
- "version": "5.3.0",
- "digest": "sha256:a6062360c1fb29ca3ea309989341b960051a6dbec3618c30c458c642bf7dad32"
- },
- {
- "name": "@fontsource/righteous",
- "version": "5.3.0",
- "digest": "sha256:79e84f71bdeec58c7a8f9f27713b9ce0bc69c03172deb27303efd39587fb2980"
- },
- {
- "name": "@fontsource/satisfy",
- "version": "5.3.0",
- "digest": "sha256:c7dffc71d3f7cacd478896455d11633b6529ea3b6b90b3a8ea33a3baeaf1e766"
- },
- {
- "name": "@fontsource/shadows-into-light",
- "version": "5.3.0",
- "digest": "sha256:d2ada94bd5e183d93b51e7e971711f6a85f3a0f4469e138f0af7362ee2fc17b6"
- },
- {
- "name": "@fontsource/short-stack",
- "version": "5.3.0",
- "digest": "sha256:f3f57149b79b7aa692199846414def30dd13ff6ed8f837d1731be8d261233e10"
- },
- {
- "name": "@fontsource/space-mono",
- "version": "5.3.0",
- "digest": "sha256:3d45b28d3e4c26cd7aac85d6df23808117dfdde126926394e63f6aa9ae1f355d"
- },
- {
- "name": "@fontsource/zcool-kuaile",
- "version": "5.3.0",
- "digest": "sha256:92769d2814bb9186e26e388dc0656a8a0e2e883829646352024c0aec41dbbbbd"
- },
- {
- "name": "@fontsource/zcool-qingke-huangyou",
- "version": "5.3.0",
- "digest": "sha256:15854638d77023d0e32383f53f490e060cd8e0f8cf4994b2c99fe8522bf74e43"
- },
- {
- "name": "@fontsource/zcool-xiaowei",
- "version": "5.3.0",
- "digest": "sha256:79a87ecebfb75fc4fc01b36db09fe67d2080c090b73e145dc605dd2375974284"
- },
- {
- "name": "@infolektuell/noto-color-emoji",
- "version": "0.2.0",
- "digest": "sha256:1cb876e4d1fbd09da62f17c1599935b132427288052b2ab3afa8a8458329a720"
- },
- {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev",
- "digest": "sha256:b254bc523b6e65563cc9df32b270a4f7fe17a7fb7b26a0fd9dc944d4c16479d1"
- },
- {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev",
- "digest": "sha256:730a3bdccb438d627587756ee71a171ee4d9846b254e5f5c0afc0b8187ed2676"
- },
- {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev",
- "digest": "sha256:1b5cdb014c3ac774e0b998459092d3a26c042733f878cc81c00c0e435420c58a"
- },
- {
- "name": "@narratage/caption",
- "version": "0.0.0-dev",
- "digest": "sha256:46f2273af9f932e4c208a3e7dd692456691f7827967af0efb54b1a4e1a1388b5"
- },
- {
- "name": "@narratage/component-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:a503483ab1e923d1c81473e2f3d433aacfa08703c2d81715e66aa310f170a0ae"
- },
- {
- "name": "@narratage/composition",
- "version": "0.0.0-dev",
- "digest": "sha256:e5724c7fdfe7f4c915cf850de9485d25920415d4d4185010c929abcde233d0fa"
- },
- {
- "name": "@narratage/core",
- "version": "0.0.0-dev",
- "digest": "sha256:1262fed3211025ac608b60c4f7f47c9d493473cb05307ade3671ebafb79f5fe0"
- },
- {
- "name": "@narratage/elaborator",
- "version": "0.0.0-dev",
- "digest": "sha256:e5e6d5de8eb028e582238f3cb987001a3a332a0645f823d60bb01c3964041161"
- },
- {
- "name": "@narratage/estimate",
- "version": "0.0.0-dev",
- "digest": "sha256:96943c839ec65c4bbf6e2fa687332861d1625a3ab8dc897e4d845e6e58c3a293"
- },
- {
- "name": "@narratage/film",
- "version": "0.0.0-dev",
- "digest": "sha256:482d49f5c1abd03cb360c38a973b242bb9a49547fa31d87076e0ee53dc0f6adc"
- },
- {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev",
- "digest": "sha256:876eaa390d8a62b782111895c961ebb4a734de44a3f291feb43e8bf3523e2da5"
- },
- {
- "name": "@narratage/generation",
- "version": "0.0.0-dev",
- "digest": "sha256:840cbc1a4b0d611761d917e7c3be744ba5aa513e8556b92290470cd917c64ce1"
- },
- {
- "name": "@narratage/host",
- "version": "0.0.0-dev",
- "digest": "sha256:041d64f76f14fe995a9242906591d98a37b1d33e2c1aa6d4fa9c14bae1fda8ad"
- },
- {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:c202f0a15af238738846b1d02124d78bcd06f54272eb1bbbb5dfc9c7ec0fabe8"
- },
- {
- "name": "@narratage/markup",
- "version": "0.0.0-dev",
- "digest": "sha256:8d4f58d79d5d1ea21dedf84ba63064a5fc2c710df499d58e58701b3557fbedc6"
- },
- {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev",
- "digest": "sha256:fa027f725f23153d1f45db6aff658e200e5ce4863858f1cd3969031e10080da9"
- },
- {
- "name": "@narratage/media-track",
- "version": "0.0.0-dev",
- "digest": "sha256:494b5719ddc085eb4e29aaebd3a69ed5cc4ff8de448b2b882a25ed3dce7e0833"
- },
- {
- "name": "@narratage/media",
- "version": "0.0.0-dev",
- "digest": "sha256:688d1a3fb202ccb875d7d3135ed3382ef15f6d8d591a38634449e83a1371615c"
- },
- {
- "name": "@narratage/model-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:7ee53615cec344fc8866832be4ccf2fee88077871557cc98e7d539b78ba7d565"
- },
- {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev",
- "digest": "sha256:da8eee7d882aaadaf64996962920306ec366b026b65d24f33d882391f2a68d24"
- },
- {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev",
- "digest": "sha256:afe21487a254d5d042636a6e22d66e15f6023e461b115d50ceae1f1d44914089"
- },
- {
- "name": "@narratage/protocol",
- "version": "0.0.0-dev",
- "digest": "sha256:9b500750ffce24e7e521dcb6d785fba243222237f10e2b2dbd4887187b657274"
- },
- {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:d214b56eaa2c29383d4b0140696be343b0b755db077a7257b05f614667ed80dc"
- },
- {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev",
- "digest": "sha256:3c88369dc97248f561ef83d2775c02e3e1704751808429734a72faca61a0468e"
- },
- {
- "name": "@narratage/run",
- "version": "0.0.0-dev",
- "digest": "sha256:84ddca1556318111c3b067ff439bb7b94cb7856c30a5762cf07a083b61be2b17"
- },
- {
- "name": "@narratage/script",
- "version": "0.0.0-dev",
- "digest": "sha256:7c7e837d3e2ecd1ae3aaf4e12c1e73d21f226a9ff7588a865cc1187f166feb0d"
- },
- {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev",
- "digest": "sha256:9d3c20203f9dd4cf4d40b1f1662639fe3bd6d06f62e7629c22566c9f9f9d8f36"
- },
- {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev",
- "digest": "sha256:eb1d5ee85a566713f862b0685df20063c1083dbbd8014bda93427613c5f202e8"
- },
- {
- "name": "@narratage/source",
- "version": "0.0.0-dev",
- "digest": "sha256:3cf49ecaa8e6ea145d642dd90834e887ca073a720364fd890197768e3e1e5cd2"
- },
- {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev",
- "digest": "sha256:c0548cacaf821e6811addd2a5ba9609ceaabb29c7a6d9776f3f1d45fe37ec644"
- },
- {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev",
- "digest": "sha256:fda24a3d99eb883471147a2c3b1c5caa5526fb2721e0943a8146e1e8f3dd4ecc"
- },
- {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev",
- "digest": "sha256:5ba1ca2e8f0049c198a85e446c0847221113e9c89aafde7c5a8a0c8be86fdd96"
- },
- {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev",
- "digest": "sha256:991b1dbcb2136186110bdb12885504f35cce1ade335151f4f0b3e5c552950196"
- },
- {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev",
- "digest": "sha256:209d28a81e41f486cce6173e3647389866b3571131efe2842f5223066ef772f2"
- },
- {
- "name": "@narratage/speech",
- "version": "0.0.0-dev",
- "digest": "sha256:079a337dfdb293f25dc7bb87a7644b3520524e165df913d8085c6c527ed25158"
- },
- {
- "name": "@narratage/svs",
- "version": "0.0.0-dev",
- "digest": "sha256:22bce93d56291e627e4dbeeafcfc8dc1e2217f95d6a88ec5dd0e3221f20babe2"
- },
- {
- "name": "@narratage/temporal",
- "version": "0.0.0-dev",
- "digest": "sha256:ff7659ab2fcd3faba7413ef323de48c9e221a5b47fc25e3aa5f347261156eabe"
- },
- {
- "name": "@narratage/text",
- "version": "0.0.0-dev",
- "digest": "sha256:bc799fdd99df3b7a224f2b1c7581db94649e833c760fe22216935ae3548c150c"
- },
- {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev",
- "digest": "sha256:2dee587eedeb2d5c16d63b53aec6a476aec7555b40241352a0d8dc0f91db9631"
- },
- {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev",
- "digest": "sha256:65555eac7342e1c538083be0bf627af10ca266c9d9a68221d78c2d88778c91c5"
- },
- {
- "name": "cmu-pronouncing-dictionary",
- "version": "3.0.0",
- "digest": "sha256:9771ce965a3170bd1853f1d61dc1f517f31613e0d1775d07b0381f3b75364b31"
- }
- ],
- "packages": [
- {
- "package": {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/artifact@1"
- }
- ],
- "facetsDigest": "sha256:a56f39df98f2bff5caf339a427586e73be079eb26697c2313612bf7c07d78e2c",
- "closureDigest": "sha256:d627ce0b82cedc237f8cc923a44dd9d6849240615f5cf971181cc242b7468498"
- },
- {
- "package": {
- "name": "@narratage/caption",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption@1"
- }
- ],
- "facetsDigest": "sha256:1fbbf9bcdc39382ec612df3f29765b5d6ceb8598c0df2c7b5d6b8515f73367a3",
- "closureDigest": "sha256:790bad794d072c3bab93c3d76307b9cc836669681273ab04b1f06709dff1eb5a"
- },
- {
- "package": {
- "name": "@narratage/caption-fine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-fine@1"
- }
- ],
- "facetsDigest": "sha256:73e3f528a76fdc553ba2ee87fe5beb5fb2c91b7d4fcdff4ba9e6963d4740fdf6",
- "closureDigest": "sha256:894767197868c4df9cfec52541621b53298e5dcef78dc692b90dc7f73c1a2aa7"
- },
- {
- "package": {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/caption-gemini@1"
- }
- ],
- "facetsDigest": "sha256:894d546ffa3c9e221fc6b686d11bc117d15a250399332e3ae1c1d28a547e0f30",
- "closureDigest": "sha256:7ae1df06b13ad365e05f8d1b45eb045bddc832976dc612898aff0e05d0c9366f"
- },
- {
- "package": {
- "name": "@narratage/composition",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/composition@1"
- }
- ],
- "facetsDigest": "sha256:05c22bda8c301365c1cfff2c0afa80067f3d2a0fba167a57ebf923af720a5c34",
- "closureDigest": "sha256:7d309e990bdfaf84168b43bd8b41a3b6f25dd394eb53c7bb34340fd59c0a67a9"
- },
- {
- "package": {
- "name": "@narratage/estimate",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/estimate@1"
- }
- ],
- "facetsDigest": "sha256:c22a49bd60d2e8061f9cd57c57869a6bcdcfb1a39886ad68f5f4f62a8ddc663a",
- "closureDigest": "sha256:85f440f06d6e65eeb3ca38768a6a64796994ead70a78e4d9fc518697b0da71c3"
- },
- {
- "package": {
- "name": "@narratage/film",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/film@1"
- }
- ],
- "facetsDigest": "sha256:b96fd578be298ab154d1ad30a27d7e54ae0cf2f8f52f52d7bf13c0785d2a8da7",
- "closureDigest": "sha256:f98b81818ae8bc4d0b5e47edb5ef9a080b092f65766178d0dad4dc7b86d74b55"
- },
- {
- "package": {
- "name": "@narratage/fonts-open",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/fonts-open@1"
- }
- ],
- "facetsDigest": "sha256:de93037cec9a364da45fedc69a2d82cca93c5866e475942241c008f46c3a8da9",
- "closureDigest": "sha256:716b251dd7100f055b10dbb6c92d799f19ac1c9e3d17aeaaa38eef421ebe4512"
- },
- {
- "package": {
- "name": "@narratage/generation",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/generation@1"
- }
- ],
- "facetsDigest": "sha256:d9ee4c44949ca2d24967e7d81898999db84ab592fdaaafe1bd6d22a28ea5e094",
- "closureDigest": "sha256:8f86d9c4e36b2a01d484f44ea59278ec4deedd86cc1797ca6d84ba5bd2ca38ff"
- },
- {
- "package": {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:7596800f1ce4506145f9ff50c768bfc07131c5ea8d421711a6b5268ce13960f7",
- "closureDigest": "sha256:1a45cbbbfdf5b2da33be35fdb33aac91fa7536fa29b75d3959e1fc9ae52e0bf2"
- },
- {
- "package": {
- "name": "@narratage/media",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media@1"
- }
- ],
- "facetsDigest": "sha256:5bbef7d089f36dd1ea36b743b1b4f03289ccb8a2fc50383e3b355982916ccfc6",
- "closureDigest": "sha256:70cbebe094cab5f1990f5effcdfd72f48a78e5cf2316b3629049d1eca34cfa35"
- },
- {
- "package": {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/media-pipeline@1"
- }
- ],
- "facetsDigest": "sha256:a96ae88d7813e660bb496b77e53f66ed7e218b20d4e157632c9a4fd832580a92",
- "closureDigest": "sha256:a37b9c1903ce96a1b7554147e8a48dd2104bc54dc732909edeb6a77c37f2ce36"
- },
- {
- "package": {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/narrative@1"
- }
- ],
- "facetsDigest": "sha256:8d535e4842c8bf287e62f8ecc803927b79d02b3cb438ba3959c369fb1d2a828d",
- "closureDigest": "sha256:aa91fbb77dc816674cc84bbe05ed1e4c784aafbbd13e1ce282b07b4cbb3f9e0d"
- },
- {
- "package": {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/program-space@1"
- }
- ],
- "facetsDigest": "sha256:92ebae07c9947d9d18277c0d8f784d5740c092f14dd3efa263138aec454ca91a",
- "closureDigest": "sha256:1e7cff66aec35080ccbacc0e7e2d850cd08206a59c6c400546646608d649659b"
- },
- {
- "package": {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/render-hyperframes@1"
- }
- ],
- "facetsDigest": "sha256:31b63a4bf10385d31feb50114811c5185b78a0caab6b7c1646c86a61c4958128",
- "closureDigest": "sha256:1ba24f24c93b7aa090d41a62b6708f93364c906e483efea007bac9d399db7bf5"
- },
- {
- "package": {
- "name": "@narratage/run-markup",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/run-markup@1"
- }
- ],
- "facetsDigest": "sha256:c38a4e2e76a2f87b6a401bf0cad4b18f04274689ffae22c09f8f520046a7123e",
- "closureDigest": "sha256:f9cf27428f0d85d63930f56b9e23df481c4e956d5d86c03fef5c88e62dd22fb7"
- },
- {
- "package": {
- "name": "@narratage/script",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/script@1"
- }
- ],
- "facetsDigest": "sha256:acc754c61e24f93d5e2692ceb6998a3638cc384de8e512e155738435663a8342",
- "closureDigest": "sha256:cbf4fe4ec28ae6958956ee67d02c8a4a30d2e4e5cbd64d8952e317c6df435fbb"
- },
- {
- "package": {
- "name": "@narratage/seedance",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/seedance@1"
- }
- ],
- "facetsDigest": "sha256:41615659f664d3480af5a50c81df188b6fc848628c60bc82d37eb7735071f111",
- "closureDigest": "sha256:3ea90ac12b4ac7bddce6064ac99d946aa89745c0fbf06861100415c12bd63882"
- },
- {
- "package": {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/semantic-map@1"
- }
- ],
- "facetsDigest": "sha256:80cad17557218021f4912919b0fc5bbfda61523fc40242e12dafd92a5ca52d28",
- "closureDigest": "sha256:162ab0d26ba8577910bea38e44f39909bfd275033175e8c6892a21f8a298f8b0"
- },
- {
- "package": {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/spatial@1"
- }
- ],
- "facetsDigest": "sha256:4e6da482a365cd36423f3baf568ea741f2e0eddf26b559bce43d3c4270830c91",
- "closureDigest": "sha256:dde427e997833b5ed6639deeed75070eb98bc9e50c8f0a7da8f31fefe4435724"
- },
- {
- "package": {
- "name": "@narratage/speech",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech@1"
- }
- ],
- "facetsDigest": "sha256:e86e5c90307ab183d2ea5d75e4ca0daab4f2b65905feb79c387871370d625e3a",
- "closureDigest": "sha256:8be1559095728f977914d56c4e7dfd070362d7bbddfb0565062129fe27a67d8d"
- },
- {
- "package": {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-alignment@1"
- }
- ],
- "facetsDigest": "sha256:b55e20b4fdf24cbfaf956447ff62885e81638fdbcbb61f25483392a1c8fac8c9",
- "closureDigest": "sha256:34ff2b938c8cdb94823a2843e882ac9d1e8f51f46dee02a6b0342b69f48c5be3"
- },
- {
- "package": {
- "name": "@narratage/speech-basis",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-basis@1"
- }
- ],
- "facetsDigest": "sha256:3e7413acb9b39071fad0ea2e99777ae9ab7a4b636041a8345ec1d08428859b3f",
- "closureDigest": "sha256:e0a9f8e7c454beb36d67e9bd358383fc91567e70e9f43f75290a831028e39576"
- },
- {
- "package": {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-evidence@1"
- }
- ],
- "facetsDigest": "sha256:26f3ab63067b382373a9c4c24569bd672302370f5d0c64a055d61862959fc4d0",
- "closureDigest": "sha256:0df8b3aa5a3c29300be9779b7f6f53fc44051665f956b20d554551d4100272f6"
- },
- {
- "package": {
- "name": "@narratage/speech-spine",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/speech-spine@1"
- }
- ],
- "facetsDigest": "sha256:340cf867483022b3896008781f24a04e22aa0abc76873cc44787aefdc0219522",
- "closureDigest": "sha256:f215f8ec4e02bf26ff0960b129760eeb80ab59658cd0ec0476481b73c11f09ee"
- },
- {
- "package": {
- "name": "@narratage/svs",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/svs@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/svs@1"
- }
- ],
- "facetsDigest": "sha256:27cb7828391b2cd5b9fd0a6690d16010f23b78540d501aad6f9afa75da33f1da",
- "closureDigest": "sha256:ff88e3ec2e95ef40afb308f240c59ed57149ceff4bf5e58d3429fada1ff702f6"
- },
- {
- "package": {
- "name": "@narratage/text",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/text@1"
- },
- {
- "abi": "svml.source-frontend@1",
- "name": "@narratage/text/svs@1"
- }
- ],
- "facetsDigest": "sha256:2d4d0e9eea9ec795fb675ddf7d204bc29fe7eb8e3a743eced944a0cdb50ecf50",
- "closureDigest": "sha256:51afff4d06131cc77a3e6953a9151564dfb79bde943f1250d91d24db1f2c00d4"
- },
- {
- "package": {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/visual-ir@1"
- }
- ],
- "facetsDigest": "sha256:039735354a109969a18b2c26ab8b02bb6d09a7a35f993336e8e8711e6d429f14",
- "closureDigest": "sha256:7653a66f3fdff9894e02cf080e3c9cf11fbbb28e93b3adc55b8ed99d7de42bab"
- },
- {
- "package": {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.module@1",
- "name": "@narratage/whisperx@1"
- }
- ],
- "facetsDigest": "sha256:64c0e76dea02b19be28bc7425e11938fd9c1dbb9994dde3a6d98c41da819b85e",
- "closureDigest": "sha256:233b055191b86b8527083fe601c89216d7dabbce7a227123dc5d6b2117322753"
- }
- ],
- "digest": "sha256:d9336d5b418b1221706f3dedf6c0c7ee082a8db6725a996817f626cace3b668c"
-}
diff --git a/examples/talking-head-aroll/svml.runtime-packages.lock b/examples/talking-head-aroll/svml.runtime-packages.lock
deleted file mode 100644
index 2f109c4c..00000000
--- a/examples/talking-head-aroll/svml.runtime-packages.lock
+++ /dev/null
@@ -1,1044 +0,0 @@
-{
- "format": "svml.node-package-lock@1",
- "selected": [
- "@narratage/artifact-store-fs",
- "@narratage/credential-store-env",
- "@narratage/local",
- "@narratage/provider-google-vertex",
- "@narratage/provider-hyperframes-local",
- "@narratage/provider-kie",
- "@narratage/provider-media-local",
- "@narratage/provider-whisperx-local",
- "@narratage/store-sqlite"
- ],
- "artifacts": [
- {
- "name": "@esbuild/darwin-arm64",
- "version": "0.25.12",
- "digest": "sha256:f3ca2a2dd0e67a3e2beaf9d45626a7209a22ca5725e076d1e04008691655cd43"
- },
- {
- "name": "@google/genai",
- "version": "1.52.0",
- "digest": "sha256:39117de2d79f62402c4905b9b7ed58fa34c04c4d9e85c6272613437a0ff60f5c"
- },
- {
- "name": "@hono/node-server",
- "version": "2.0.12",
- "digest": "sha256:87923b51e3cbe9ca6b5d712bd97d5a1181a21d269f06cfca6931d827627986ba"
- },
- {
- "name": "@img/colour",
- "version": "1.1.0",
- "digest": "sha256:07db37307451577b10a7e1b851470ec9b290ae05459a1540102d91e553ad607b"
- },
- {
- "name": "@isaacs/fs-minipass",
- "version": "4.0.1",
- "digest": "sha256:774ff19c91750abdf4d4b8d715bc0e12246bdaf2239f3e7441b9cdd21f224d72"
- },
- {
- "name": "@narratage/artifact-store-fs",
- "version": "0.0.0-dev",
- "digest": "sha256:609d09f53cba3f7367ef59502dc02f6c71d52b4f36914a0ebff8ac34703c8775"
- },
- {
- "name": "@narratage/artifact",
- "version": "0.0.0-dev",
- "digest": "sha256:b254bc523b6e65563cc9df32b270a4f7fe17a7fb7b26a0fd9dc944d4c16479d1"
- },
- {
- "name": "@narratage/background-removal",
- "version": "0.0.0-dev",
- "digest": "sha256:ec0aa2d6ff0996940c7aedb1cd901a6ab0038e6e6a62ca701e623e39d3b81807"
- },
- {
- "name": "@narratage/caption-gemini",
- "version": "0.0.0-dev",
- "digest": "sha256:1b5cdb014c3ac774e0b998459092d3a26c042733f878cc81c00c0e435420c58a"
- },
- {
- "name": "@narratage/caption",
- "version": "0.0.0-dev",
- "digest": "sha256:46f2273af9f932e4c208a3e7dd692456691f7827967af0efb54b1a4e1a1388b5"
- },
- {
- "name": "@narratage/component-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:a503483ab1e923d1c81473e2f3d433aacfa08703c2d81715e66aa310f170a0ae"
- },
- {
- "name": "@narratage/composition",
- "version": "0.0.0-dev",
- "digest": "sha256:e5724c7fdfe7f4c915cf850de9485d25920415d4d4185010c929abcde233d0fa"
- },
- {
- "name": "@narratage/core",
- "version": "0.0.0-dev",
- "digest": "sha256:1262fed3211025ac608b60c4f7f47c9d493473cb05307ade3671ebafb79f5fe0"
- },
- {
- "name": "@narratage/credential-store-env",
- "version": "0.0.0-dev",
- "digest": "sha256:86ca20d6418e2c591359971f6afc59232c391fac37e3150eb5ed95adda495fe9"
- },
- {
- "name": "@narratage/driver-node",
- "version": "0.0.0-dev",
- "digest": "sha256:22cd089084eb82ca73f08d8e768a480327106f705dffd14b26381d36ea1e08cf"
- },
- {
- "name": "@narratage/elaborator",
- "version": "0.0.0-dev",
- "digest": "sha256:e5e6d5de8eb028e582238f3cb987001a3a332a0645f823d60bb01c3964041161"
- },
- {
- "name": "@narratage/endpoint-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:89eeade4f411bc5c1095647a07502b3912efff590099fd00b998901a755e59c4"
- },
- {
- "name": "@narratage/generation",
- "version": "0.0.0-dev",
- "digest": "sha256:840cbc1a4b0d611761d917e7c3be744ba5aa513e8556b92290470cd917c64ce1"
- },
- {
- "name": "@narratage/host",
- "version": "0.0.0-dev",
- "digest": "sha256:041d64f76f14fe995a9242906591d98a37b1d33e2c1aa6d4fa9c14bae1fda8ad"
- },
- {
- "name": "@narratage/hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:c202f0a15af238738846b1d02124d78bcd06f54272eb1bbbb5dfc9c7ec0fabe8"
- },
- {
- "name": "@narratage/local",
- "version": "0.0.0-dev",
- "digest": "sha256:ac56790c50bedb1e3380ca251463c3e41adfc1edc27cb8e6960791f95ec621de"
- },
- {
- "name": "@narratage/markup",
- "version": "0.0.0-dev",
- "digest": "sha256:8d4f58d79d5d1ea21dedf84ba63064a5fc2c710df499d58e58701b3557fbedc6"
- },
- {
- "name": "@narratage/media-execution",
- "version": "0.0.0-dev",
- "digest": "sha256:d096c01b5c7c18ba2a2ba3919bfffb8b5ac669a418d8e19ed847254a158e9ccf"
- },
- {
- "name": "@narratage/media-pipeline",
- "version": "0.0.0-dev",
- "digest": "sha256:fa027f725f23153d1f45db6aff658e200e5ce4863858f1cd3969031e10080da9"
- },
- {
- "name": "@narratage/media",
- "version": "0.0.0-dev",
- "digest": "sha256:688d1a3fb202ccb875d7d3135ed3382ef15f6d8d591a38634449e83a1371615c"
- },
- {
- "name": "@narratage/narrative",
- "version": "0.0.0-dev",
- "digest": "sha256:da8eee7d882aaadaf64996962920306ec366b026b65d24f33d882391f2a68d24"
- },
- {
- "name": "@narratage/package-loader-node",
- "version": "0.0.0-dev",
- "digest": "sha256:9e155cff9e6263d2d954bca05a676cedb9d816286ee31b0d19d98e94eafca72d"
- },
- {
- "name": "@narratage/program-space",
- "version": "0.0.0-dev",
- "digest": "sha256:afe21487a254d5d042636a6e22d66e15f6023e461b115d50ceae1f1d44914089"
- },
- {
- "name": "@narratage/protocol",
- "version": "0.0.0-dev",
- "digest": "sha256:9b500750ffce24e7e521dcb6d785fba243222237f10e2b2dbd4887187b657274"
- },
- {
- "name": "@narratage/provider-google-vertex",
- "version": "0.0.0-dev",
- "digest": "sha256:c8861059e5e7b652bfc1f0d4da6fef5b05d149f21c57916c4dabc8bb90c0276b"
- },
- {
- "name": "@narratage/provider-hyperframes-local",
- "version": "0.0.0-dev",
- "digest": "sha256:4827eaae0955d045f92ead0ee42d12521268fa8fded6372a3f53521d65ccfcba"
- },
- {
- "name": "@narratage/provider-kie",
- "version": "0.0.0-dev",
- "digest": "sha256:c67139c64f5b841d73d245d190ac8134591d58e363e13a26d9370040f79d1eed"
- },
- {
- "name": "@narratage/provider-media-local",
- "version": "0.0.0-dev",
- "digest": "sha256:eefbd7478a1c37eb3ddc28af0a70cf8fac2e1d8c37ed61a3026b36f03c8f21d4"
- },
- {
- "name": "@narratage/provider-whisperx-local",
- "version": "0.0.0-dev",
- "digest": "sha256:65e080a86701e76c9fafbe60235c38db1262557392ed7be3a0e893a73752bd30"
- },
- {
- "name": "@narratage/render-hyperframes",
- "version": "0.0.0-dev",
- "digest": "sha256:d214b56eaa2c29383d4b0140696be343b0b755db077a7257b05f614667ed80dc"
- },
- {
- "name": "@narratage/runtime-adapter-node",
- "version": "0.0.0-dev",
- "digest": "sha256:0ce0b9d4ab66c1ba248b7925a859b4654429d5cd68f4309d2932a6070456cbb6"
- },
- {
- "name": "@narratage/runtime-adapter",
- "version": "0.0.0-dev",
- "digest": "sha256:37bfc677595841a6b4491b0066894271f252150e96b47dcd10123eecfe29cc3a"
- },
- {
- "name": "@narratage/runtime",
- "version": "0.0.0-dev",
- "digest": "sha256:9dc9cbeb2c3124c219da91237a02693cc6cd0c3f2511f20329c0f7cddffb2d06"
- },
- {
- "name": "@narratage/semantic-map",
- "version": "0.0.0-dev",
- "digest": "sha256:eb1d5ee85a566713f862b0685df20063c1083dbbd8014bda93427613c5f202e8"
- },
- {
- "name": "@narratage/source",
- "version": "0.0.0-dev",
- "digest": "sha256:3cf49ecaa8e6ea145d642dd90834e887ca073a720364fd890197768e3e1e5cd2"
- },
- {
- "name": "@narratage/spatial",
- "version": "0.0.0-dev",
- "digest": "sha256:c0548cacaf821e6811addd2a5ba9609ceaabb29c7a6d9776f3f1d45fe37ec644"
- },
- {
- "name": "@narratage/speech-alignment",
- "version": "0.0.0-dev",
- "digest": "sha256:fda24a3d99eb883471147a2c3b1c5caa5526fb2721e0943a8146e1e8f3dd4ecc"
- },
- {
- "name": "@narratage/speech-evidence",
- "version": "0.0.0-dev",
- "digest": "sha256:991b1dbcb2136186110bdb12885504f35cce1ade335151f4f0b3e5c552950196"
- },
- {
- "name": "@narratage/speech",
- "version": "0.0.0-dev",
- "digest": "sha256:079a337dfdb293f25dc7bb87a7644b3520524e165df913d8085c6c527ed25158"
- },
- {
- "name": "@narratage/store-sqlite",
- "version": "0.0.0-dev",
- "digest": "sha256:35e7243a129b0db8d7b1c9876411015e8c48cdb241506bfae5cbec7dfc2d512b"
- },
- {
- "name": "@narratage/svs",
- "version": "0.0.0-dev",
- "digest": "sha256:22bce93d56291e627e4dbeeafcfc8dc1e2217f95d6a88ec5dd0e3221f20babe2"
- },
- {
- "name": "@narratage/text",
- "version": "0.0.0-dev",
- "digest": "sha256:bc799fdd99df3b7a224f2b1c7581db94649e833c760fe22216935ae3548c150c"
- },
- {
- "name": "@narratage/validation",
- "version": "0.0.0-dev",
- "digest": "sha256:a73ba0cc3620754cda2c1064d3de1ce98563f72290e1e9af585253b095ff61c9"
- },
- {
- "name": "@narratage/visual-ir",
- "version": "0.0.0-dev",
- "digest": "sha256:2dee587eedeb2d5c16d63b53aec6a476aec7555b40241352a0d8dc0f91db9631"
- },
- {
- "name": "@narratage/whisperx",
- "version": "0.0.0-dev",
- "digest": "sha256:65555eac7342e1c538083be0bf627af10ca266c9d9a68221d78c2d88778c91c5"
- },
- {
- "name": "@narratage/workspace",
- "version": "0.0.0-dev",
- "digest": "sha256:9f6dbe410a7bcab639ad0655998d36bf2d697ea1b2c1c0f52a818cef995fc0c6"
- },
- {
- "name": "@protobufjs/aspromise",
- "version": "1.1.2",
- "digest": "sha256:f2add582f001704c44380f69857f6d90976f8253b0d50aa78a3a18f07631f13b"
- },
- {
- "name": "@protobufjs/base64",
- "version": "1.1.2",
- "digest": "sha256:06b2c0c727a5c9245ca32469d0e5dd3476a1e16ba784de9a95e74378dad3be9f"
- },
- {
- "name": "@protobufjs/codegen",
- "version": "2.0.5",
- "digest": "sha256:1c2559930a27a866b83dcb32f945cb64c250d1b9a3d4846e10f9d67da7768fb1"
- },
- {
- "name": "@protobufjs/eventemitter",
- "version": "1.1.1",
- "digest": "sha256:c7ca7d4689ac40f5eaced3b446878c365640bab53923cfeeab0700393c78fa6d"
- },
- {
- "name": "@protobufjs/fetch",
- "version": "1.1.1",
- "digest": "sha256:4994a6ce027bf9c7cacf231612c9abf1c3bca106f1449981d2a950f4d5374fa5"
- },
- {
- "name": "@protobufjs/float",
- "version": "1.0.2",
- "digest": "sha256:6b39ca0e75f52ebbe0677dfc91289f771ed6ef764fe9b16b1089bba341df7e1b"
- },
- {
- "name": "@protobufjs/path",
- "version": "1.1.2",
- "digest": "sha256:f08474b157f229b416f4dfcd18af1394d6958099d2fb45f19196cace5ab8eb2a"
- },
- {
- "name": "@protobufjs/pool",
- "version": "1.1.0",
- "digest": "sha256:7fa58344bd7fd34f3d82ff681a2b9a1c1563f59bc525b04af18b83cc6862e351"
- },
- {
- "name": "@protobufjs/utf8",
- "version": "1.1.2",
- "digest": "sha256:a6e8be152be53993c5419c77351035d2f50c96548ea68a93ada5174872cab407"
- },
- {
- "name": "@puppeteer/browsers",
- "version": "3.1.0",
- "digest": "sha256:9c4a4b23834c62a8501f9cff553920437bc5241e5f2544d315784988b9b4d22c"
- },
- {
- "name": "@swc/helpers",
- "version": "0.5.23",
- "digest": "sha256:01e3a2aad97cb967224f124ee00312ed152a533f41c000975a3210efd6772315"
- },
- {
- "name": "@types/node",
- "version": "24.10.1",
- "digest": "sha256:8fa0086cef5b28049d3962a131ab7b458f6c6c123fd34439963f2b49c92e26aa"
- },
- {
- "name": "@types/retry",
- "version": "0.12.0",
- "digest": "sha256:3c0d455fdb883a9189bef24b8c28c20e38b1b81790627941fc52345f883776df"
- },
- {
- "name": "adm-zip",
- "version": "0.6.0",
- "digest": "sha256:b406b53cc1036ecd32ccd3a8f3be7910407e0206e47ac1f66e9024c37dedcdcb"
- },
- {
- "name": "agent-base",
- "version": "7.1.4",
- "digest": "sha256:87c907df716766b5486f32790957525a8d90af4ebec634205d4a2c22a767cae7"
- },
- {
- "name": "ansi-regex",
- "version": "6.2.2",
- "digest": "sha256:68e9c06b4a3650fed19bf0a3c20b215197209ddf856caa9a1a37b7f65de5a261"
- },
- {
- "name": "ansi-styles",
- "version": "6.2.3",
- "digest": "sha256:08da2e7a0903460c053d125d67ba55ac722d241ad858a09d3c6a0dfddf463e9e"
- },
- {
- "name": "base64-js",
- "version": "1.5.1",
- "digest": "sha256:21a8ff2186d871c92b2c8958df9d84ec967c2ecc26cb34a4632ee97856a7f3e1"
- },
- {
- "name": "bignumber.js",
- "version": "9.3.1",
- "digest": "sha256:c92307157c59bc4c56472278bb6ff718de1c31b56966927fa4eed154a3346e10"
- },
- {
- "name": "boolean",
- "version": "3.2.0",
- "digest": "sha256:9b07b070e89665a6ac71741ea8dd263a61b6bc3092f5c0236539cfe27c261ae5"
- },
- {
- "name": "brotli",
- "version": "1.3.3",
- "digest": "sha256:6e0c406465c179419228a0d4216e6224c40f37f60b19633e40c5b82a6bb3ba85"
- },
- {
- "name": "buffer-equal-constant-time",
- "version": "1.0.1",
- "digest": "sha256:8d532751643065156075c5b68d933386cde05759e773cccef4b77b2603f5d710"
- },
- {
- "name": "bundle-name",
- "version": "4.1.0",
- "digest": "sha256:56f299ebfb4532b990395d71ada619f840f8c53e8eef6308ce7bde7637c00e42"
- },
- {
- "name": "chownr",
- "version": "3.0.0",
- "digest": "sha256:480200db20b6b01b0187ae42d558bdf27e6f73c125c6c9563484bb588efdd52e"
- },
- {
- "name": "chromium-bidi",
- "version": "17.0.2",
- "digest": "sha256:7bce511709957dca1ea983de42c287aceebb65c0bfd6187487bcd30d52043275"
- },
- {
- "name": "citty",
- "version": "0.2.2",
- "digest": "sha256:2b96f0ef41541f40c6f3a67af0c3a743a56e2bf112d9243f52d492ac291b4fc6"
- },
- {
- "name": "cliui",
- "version": "9.0.1",
- "digest": "sha256:2f6fb31a6f05a074d8adde9542a46b71d956e278023349a21faaecfc1c6eb3f9"
- },
- {
- "name": "clone",
- "version": "2.1.2",
- "digest": "sha256:6b43f7ff5c6b3d978e723fc90dd0189436551098ec7138745f78b4a2f0b9f92a"
- },
- {
- "name": "compare-versions",
- "version": "6.1.1",
- "digest": "sha256:0ecd82fb4bbcae3fb65167f1df07c5a20edf3a48bac63ac2c184807bc56ecb2e"
- },
- {
- "name": "data-uri-to-buffer",
- "version": "4.0.1",
- "digest": "sha256:c83b4a18728c036e0a089e8d87706b7518784740ab58dc58ab7359d01cf3f1a4"
- },
- {
- "name": "debug",
- "version": "4.4.3",
- "digest": "sha256:304ed6a95b411a078e03c3916e660500aa9f9de06bf11cc06033ad54a707159a"
- },
- {
- "name": "default-browser-id",
- "version": "5.0.1",
- "digest": "sha256:b82fe817c2d5f1c050e5b584b1eb8ce0451a17cceebb89f44d99e92957e53cbd"
- },
- {
- "name": "default-browser",
- "version": "5.5.0",
- "digest": "sha256:170da580f2ba618cf36559651c369ce0e0b4c41c7faa4e147dfceefc22623c91"
- },
- {
- "name": "define-data-property",
- "version": "1.1.4",
- "digest": "sha256:fca69f48ebf1f761ed87558da2bf54e89279c2584fcde2dfe5251eeb1bbe49ba"
- },
- {
- "name": "define-lazy-prop",
- "version": "3.0.0",
- "digest": "sha256:d2ae304cf9cedf0e9884084f1b12c57ac626c35ed65591209bd1ed28e1c636cd"
- },
- {
- "name": "define-properties",
- "version": "1.2.1",
- "digest": "sha256:14a3c2884fe52795ff8d4989c42ac4eef50b03e43f092906e8bb9840f8c604ed"
- },
- {
- "name": "detect-libc",
- "version": "2.1.2",
- "digest": "sha256:f6d1cbe84b3768d0e4ec3a27f4935426f28d6db884b5154d316a3eb602b4f05a"
- },
- {
- "name": "detect-node",
- "version": "2.1.0",
- "digest": "sha256:e23f21cd23c3ac8eeb414fdd1cf07b444d5304d9e911489d093a54598eeec6f0"
- },
- {
- "name": "devtools-protocol",
- "version": "0.0.1653615",
- "digest": "sha256:0bc61b4492f895d3371a959e93936a707d30f0594ea1eb78924930392348c953"
- },
- {
- "name": "dfa",
- "version": "1.2.0",
- "digest": "sha256:f03697bc42cb361276cadcea1f3354f3192f359929d16589ff76cdfb772190da"
- },
- {
- "name": "ecdsa-sig-formatter",
- "version": "1.0.11",
- "digest": "sha256:c55a4220e735c26105c997912755884cf1f28e199c254bbd20522697c78b75c5"
- },
- {
- "name": "emoji-regex",
- "version": "10.6.0",
- "digest": "sha256:d4264fdc970ebe1e634439e4ccdf6b36bfb6e26ebad76ca797dcf18f58502433"
- },
- {
- "name": "es-define-property",
- "version": "1.0.1",
- "digest": "sha256:e65a28b769b86eb72a671971474f14d847c452b610cdedca2034ac4f487b41b1"
- },
- {
- "name": "es-errors",
- "version": "1.3.0",
- "digest": "sha256:15f3b370a55bf67732a9cf17b937e397921adeab248d83f24180d2e14d9b6bde"
- },
- {
- "name": "es6-error",
- "version": "4.1.1",
- "digest": "sha256:71b2330b85518b245ca6adefb1d77a696e750066d7229fd77ee51faea2a5d5a0"
- },
- {
- "name": "esbuild",
- "version": "0.25.12",
- "digest": "sha256:be6c7e2b09ea76a30532597e0171955e4588e7d4b984cb451f48f6cd3792240c"
- },
- {
- "name": "escalade",
- "version": "3.2.0",
- "digest": "sha256:3bb68ed8d0bf46965d493d7dc86d31eed3e8bcc82a07e20add860f51c106fd76"
- },
- {
- "name": "escape-string-regexp",
- "version": "4.0.0",
- "digest": "sha256:bf695cc4ec820bb7987a35f1af3d14f282a12a38594034836c2c292fc5050f98"
- },
- {
- "name": "extend",
- "version": "3.0.2",
- "digest": "sha256:c750753a00e753b94978ebf4a84d2bd75353fee1b88a8d85ac1e20ff6a1a365d"
- },
- {
- "name": "fast-deep-equal",
- "version": "3.1.3",
- "digest": "sha256:42ed3c3d2be15e877da479f9efe80816a085c7b3d57fe775d8e27e017546df5d"
- },
- {
- "name": "fetch-blob",
- "version": "3.2.0",
- "digest": "sha256:8a36c6aa8a9c8590e310d56fbf34b18f50687671554f7e812720acdfec8a7a0b"
- },
- {
- "name": "fontkit",
- "version": "2.0.4",
- "digest": "sha256:d2d7bf266cf637cbf1c1793701cdb859e99c16f12a3fb695d3f51341508c25d0"
- },
- {
- "name": "formdata-polyfill",
- "version": "4.0.10",
- "digest": "sha256:b9e931ab6b16d43c9381acd755f875752bff06fb508bdf07ff7ea0880b48d17a"
- },
- {
- "name": "gaxios",
- "version": "7.3.0",
- "digest": "sha256:2991703a4dafa9356326e924f7d66845f1f194662f5ef6a7ee6b8d7a29069cf5"
- },
- {
- "name": "gcp-metadata",
- "version": "8.1.2",
- "digest": "sha256:af943933cc72cc8a0a8cbd66933574b4c7820b1c938bf3ae870dc2d29daa69e9"
- },
- {
- "name": "get-caller-file",
- "version": "2.0.5",
- "digest": "sha256:9299b9f4312e40ce1abc93cf8508accfb7b9dfe0e2296e76861aee9832953f2b"
- },
- {
- "name": "get-east-asian-width",
- "version": "1.6.0",
- "digest": "sha256:80eb6329f500e01c525d107113329a5e19875dccee4a2dedd44bdb5d25928aeb"
- },
- {
- "name": "giget",
- "version": "3.3.1",
- "digest": "sha256:9095c8b2da2f8477877a1989dd7916da8bfb9a5545012d3da7a7bb50ff9eaa6c"
- },
- {
- "name": "global-agent",
- "version": "3.0.0",
- "digest": "sha256:138a78e1e7a5b8a3239361cbe4caf161c508f052b1b304cc6669470fb72816c2"
- },
- {
- "name": "globalthis",
- "version": "1.0.4",
- "digest": "sha256:df76d0da25ab8f020149cf066d2b62f82b65507c51a9c52cf6a3789e9a95ed8d"
- },
- {
- "name": "google-auth-library",
- "version": "10.9.1",
- "digest": "sha256:b7f30655126e71587c52c64baca556ce2ab5d3e2fbc2030f4f396acaa1b7afe0"
- },
- {
- "name": "google-logging-utils",
- "version": "1.1.3",
- "digest": "sha256:30c7f506015c8218718eceacd978339dfc50cee3a95cdbb04d5d7d677973f044"
- },
- {
- "name": "gopd",
- "version": "1.2.0",
- "digest": "sha256:463bf770beed8a51af109438a6555033de1bda940f5107edd84ace4e6ae3abb7"
- },
- {
- "name": "has-property-descriptors",
- "version": "1.0.2",
- "digest": "sha256:47f1621c5f96430ea46c12fa90c0b41c5e4648f3c5e3e8b6956ec6da91019d9c"
- },
- {
- "name": "hono",
- "version": "4.12.32",
- "digest": "sha256:ae1c33cc0a384ff91e495e9cc15265037386a0e80b23e0f29c27414a21bc1790"
- },
- {
- "name": "https-proxy-agent",
- "version": "7.0.6",
- "digest": "sha256:1013657bea7f02247aee642cbfdf6dca7a534d331b6eed367cf52c08b3c178ca"
- },
- {
- "name": "hyperframes",
- "version": "0.7.101",
- "digest": "sha256:24b78079c74422ce7aa3c3fd4ef79a2b40e2ea00127e7a8a7eb8be5d865e0853"
- },
- {
- "name": "ignore",
- "version": "5.3.2",
- "digest": "sha256:7ce8e139988a7b67710913ff265acfc7993aff1fba9b86bb984b3b999ef4d8b1"
- },
- {
- "name": "is-docker",
- "version": "3.0.0",
- "digest": "sha256:d43df9b09e7fd1e920406578921e339b79b4c6a523c25b3a0174b852caad2b41"
- },
- {
- "name": "is-inside-container",
- "version": "1.0.0",
- "digest": "sha256:7c224fc7e359fea06620a9f78c40826d544960685f9300451f58da95f6824aa1"
- },
- {
- "name": "is-wsl",
- "version": "3.1.1",
- "digest": "sha256:cd19b82a536ef031451c4e195351671f5c605cc1e2e6c435d38be0d439ebbc80"
- },
- {
- "name": "json-bigint",
- "version": "1.0.0",
- "digest": "sha256:78dbd36c1b196e087861980c4b198b2d2a4184856ab0cde2e9a2d8b640447b7a"
- },
- {
- "name": "json-stringify-safe",
- "version": "5.0.1",
- "digest": "sha256:cf420f3e9067d97fbd8718cce170ee811dcbe682296a80ea9c2a1b84fa49418d"
- },
- {
- "name": "jwa",
- "version": "2.0.1",
- "digest": "sha256:1ce4c87eefeff5866cc15c5358d465af06e4d1c762aa4d3bcca1dd77b085733d"
- },
- {
- "name": "jws",
- "version": "4.0.1",
- "digest": "sha256:9600a6d676cf870a248805ccc40bfda53e1194edf481e78fe7deab6c6f5ff123"
- },
- {
- "name": "long",
- "version": "5.3.2",
- "digest": "sha256:3d4d047be707c9fcd186c912864dcc9e0937a69dddf2f64b659d0a5e352d9c3e"
- },
- {
- "name": "matcher",
- "version": "3.0.0",
- "digest": "sha256:5bd2c657e8d48258b4eee6b85abfd6baeea1905880e1961b87e2f5d1b666f363"
- },
- {
- "name": "minipass",
- "version": "7.1.3",
- "digest": "sha256:b3c7c7268719f290572b07cc710c208f964e7e03cd5e4c87f6ee78931cb42d8e"
- },
- {
- "name": "minizlib",
- "version": "3.1.0",
- "digest": "sha256:ccd3f7ae56753854094bd4c874baf36ed0464f627c80c902402d7266c9b61339"
- },
- {
- "name": "mitt",
- "version": "3.0.1",
- "digest": "sha256:ce6aef694a3aa3a2aa0238ced1462fdd1e6365fa2ff5e49a175a9fad1f5c29a9"
- },
- {
- "name": "modern-tar",
- "version": "0.7.7",
- "digest": "sha256:891e12cd4440bfdcb4db46ba8e4a3a3f7a752ad42d26d3f4c5948762894a31b2"
- },
- {
- "name": "ms",
- "version": "2.1.3",
- "digest": "sha256:a141890e3a2dfb54d5bdd95b901821c311d9841e7f2ce2e3e5dbabee3af4e66d"
- },
- {
- "name": "nanoid",
- "version": "3.3.16",
- "digest": "sha256:ed57ac355bbd0cd97a4325bef9895b2d842a9b46ada0ba3a255a93c496872768"
- },
- {
- "name": "node-domexception",
- "version": "1.0.0",
- "digest": "sha256:8415ab26ce05a24c58531f511872cc884be27733e9879a9b14c0644f0f288ef3"
- },
- {
- "name": "node-fetch",
- "version": "3.3.2",
- "digest": "sha256:3cf962b70037de2f7ddc2d715b498cdec94400649ea3907c1a1f4c760e553b3e"
- },
- {
- "name": "object-keys",
- "version": "1.1.1",
- "digest": "sha256:e93bdcdfbfebe00ef728b53ec4d1ec41dfa3e7598520255106b84fe25c4600cf"
- },
- {
- "name": "onnxruntime-common",
- "version": "1.21.1",
- "digest": "sha256:8ecfbe59731de65bdff1f5b82652af349f93b66db55de3f49aa4b067e5b6a9ff"
- },
- {
- "name": "onnxruntime-node",
- "version": "1.21.1",
- "digest": "sha256:de224ff89b23f42422f15ba1d1a40a8624436a246f60ffa21dc5d6eb8bbe7bc9"
- },
- {
- "name": "open",
- "version": "10.2.0",
- "digest": "sha256:704838b6e442ca0c07b232e471e2d33e3f8c3907ff4dac65c34cc5452e690f80"
- },
- {
- "name": "p-retry",
- "version": "4.6.2",
- "digest": "sha256:ad26b9b16e3bcac0fd71295607fb400e5cccc3e9cebaef2477b187cc06820c40"
- },
- {
- "name": "pako",
- "version": "0.2.9",
- "digest": "sha256:bc932e8cd7a506f19b273d28312c01eca0eb29a8277b3341d52f72c8a3c6dc87"
- },
- {
- "name": "picocolors",
- "version": "1.1.1",
- "digest": "sha256:533a587e52703f20267c68cce3bb13d15f0d111e77641b4fc15dfd0909541da7"
- },
- {
- "name": "postcss",
- "version": "8.5.25",
- "digest": "sha256:86cae1a4a2f7db456622414bdc5fab2f2894a814431206dae3bd56b5da0c8da7"
- },
- {
- "name": "prettier",
- "version": "3.9.6",
- "digest": "sha256:ab64dd2b905d298318673b85f56619555497b4c4ca587e65cc87cbd0088be18f"
- },
- {
- "name": "protobufjs",
- "version": "7.6.5",
- "digest": "sha256:f261811e191755ef6c287354088d20f040f51f8106917669940f0efe90c51378"
- },
- {
- "name": "puppeteer-core",
- "version": "25.5.0",
- "digest": "sha256:c7081e270d302135c3febe5e13145104041d2ce60307b1fba3cba83d8a9ac5e7"
- },
- {
- "name": "restructure",
- "version": "3.0.2",
- "digest": "sha256:afe0b1af07f709de30108a7f34d1cbc24240d5af47058908b3ab948387411f47"
- },
- {
- "name": "retry",
- "version": "0.13.1",
- "digest": "sha256:20439b301564d3af33e4a4ae5a14fdb20546f77d4f467706301b444645d3a3f7"
- },
- {
- "name": "roarr",
- "version": "2.15.4",
- "digest": "sha256:95a31fad16046a827ad5f4aecede3eabca4590bebb7c558fb4319f692c382f2e"
- },
- {
- "name": "run-applescript",
- "version": "7.1.0",
- "digest": "sha256:7a1b536c998db95296d89b6adfcdde3849eae8ebb938a88343dd7880feb1010f"
- },
- {
- "name": "safe-buffer",
- "version": "5.2.1",
- "digest": "sha256:bf6c4b10b5ebca05c55cb32fc8da545f8200e8ac3e73233d9b8d30d3206b229e"
- },
- {
- "name": "semver-compare",
- "version": "1.0.0",
- "digest": "sha256:3b5950314b60d01814af7091f197e54621d66500d0c6b30f1622f12fd2fbe86c"
- },
- {
- "name": "semver",
- "version": "7.8.5",
- "digest": "sha256:782f8f680bcdbb9a8adad55a695c158f2c75a3ca1a7440d7174ba0164f666b1d"
- },
- {
- "name": "serialize-error",
- "version": "7.0.1",
- "digest": "sha256:16c05ffdf0930c58bdf64a77ff384fdfc90d41006e640cfb58a2dd2772931b4d"
- },
- {
- "name": "sharp",
- "version": "0.35.3",
- "digest": "sha256:d5a0288867e280eafbb69100ba8df01a02b6ee36a0106111d083f06e2e6093f2"
- },
- {
- "name": "source-map-js",
- "version": "1.2.1",
- "digest": "sha256:ebeb8811bac667d76a17286fb9e2398e970224d4caf437039330b6a7a1cbd6e8"
- },
- {
- "name": "sprintf-js",
- "version": "1.1.3",
- "digest": "sha256:c745235a5311cf6565a67449381ba71ab68fbb1f244180b547d4c7783b530d94"
- },
- {
- "name": "string-width",
- "version": "7.2.0",
- "digest": "sha256:6d33893de56cb9280537fad3eac2a768c279e403431764010cdfae3051f061fd"
- },
- {
- "name": "string-width",
- "version": "8.2.2",
- "digest": "sha256:ff4c8083cc6990b6514251a1430f6f5ea1fc5df49eb09085ece93ebea3a8a8bd"
- },
- {
- "name": "strip-ansi",
- "version": "7.2.0",
- "digest": "sha256:d93d07a9c18cd1a7c3b97b06ab2b67771b10ec1bd3e8a566d71042e8f75c5103"
- },
- {
- "name": "tar",
- "version": "7.5.22",
- "digest": "sha256:cd33e317cf398c1e65cde8099cb2f6ad40797b59bc950b5ae21cc174f263604a"
- },
- {
- "name": "tiny-inflate",
- "version": "1.0.3",
- "digest": "sha256:1bf162535f9aa8155774d4be09711f32730e6a5b5433706155e485b7b6ed8d46"
- },
- {
- "name": "tslib",
- "version": "2.8.1",
- "digest": "sha256:be0ff64197522f7466475b202e5642ac2fc7453bf77bd401e3c5af405fae5e08"
- },
- {
- "name": "type-fest",
- "version": "0.13.1",
- "digest": "sha256:7ecf27eb506bbdff58c42c4fa8ca5d7f9fe371d77503a41d8d0dd96070ff5ba9"
- },
- {
- "name": "typed-query-selector",
- "version": "2.12.2",
- "digest": "sha256:03010157f77e88b71831120e82c8d607d61c13d0dde047793fe2752e26bd9bab"
- },
- {
- "name": "undici-types",
- "version": "7.16.0",
- "digest": "sha256:56b851f33e38ba7913791a0d6cd2d862088b1efabe04fc599f961cf0611e12f5"
- },
- {
- "name": "unicode-properties",
- "version": "1.4.1",
- "digest": "sha256:f32f120a86229d5ddc6253bd8362ca9f3ec6665c55dcd4b12207db642a506524"
- },
- {
- "name": "unicode-trie",
- "version": "2.0.0",
- "digest": "sha256:32767668f5e23f4e9882cff32feae4b9dae6a9a5516ad4aeabf0fd01e856e6a5"
- },
- {
- "name": "web-streams-polyfill",
- "version": "3.3.3",
- "digest": "sha256:a9a0913d9acc78134f762f33c210311fada5ec4dcc0cb913bd237338f2fb8840"
- },
- {
- "name": "webdriver-bidi-protocol",
- "version": "0.4.2",
- "digest": "sha256:fe55ecd5a6990c02d57aa3149d4d4bcbd62cd27fcd69ee859739c91a0673f36c"
- },
- {
- "name": "wrap-ansi",
- "version": "9.0.2",
- "digest": "sha256:7db579468d39db77518c5f6951ac1b36330b5d81253e762ca171872aa9a6a3f3"
- },
- {
- "name": "ws",
- "version": "8.21.1",
- "digest": "sha256:e301f9237b858df0cc503d608fd5918640518c3378d8373d1f8a763e7977f838"
- },
- {
- "name": "wsl-utils",
- "version": "0.1.0",
- "digest": "sha256:5a8be00a56eb39f7923f42016f86f7ef3d15f36794d189ca9615d8b84ef8245f"
- },
- {
- "name": "y18n",
- "version": "5.0.8",
- "digest": "sha256:b60b70efd3b784a66f22536369d3c445582c3a76b6903615726c9743fff936e3"
- },
- {
- "name": "yallist",
- "version": "5.0.0",
- "digest": "sha256:d16e9bce9588bb0f5b3cf3a3d16e6628b0d234b58d6d85961a946fabf52ad4ee"
- },
- {
- "name": "yargs-parser",
- "version": "22.0.0",
- "digest": "sha256:4341e3a4b3ea190fc549c665549a24b30bb0ca67e8607cbf4e72eaa497d7b493"
- },
- {
- "name": "yargs",
- "version": "18.1.0",
- "digest": "sha256:c2f28503e8f01b19f87037b16b4bcd7145bad43dbe79bed7beab51c031cbc39d"
- },
- {
- "name": "zod",
- "version": "3.25.76",
- "digest": "sha256:6771243deb9b85f002496af9a1ffd198078b61794ef04e352fbe062c9cfa083a"
- }
- ],
- "packages": [
- {
- "package": {
- "name": "@narratage/artifact-store-fs",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/artifact-store-fs"
- }
- ],
- "facetsDigest": "sha256:d06bf1c242e6b819ab605471f7332e1150e1ebf5f81e08cf77f9bfff082ea197",
- "closureDigest": "sha256:941a2c17d30e3cc733a8415557aecd80c45b7de0493ee69b670270fc7e492ae2"
- },
- {
- "package": {
- "name": "@narratage/credential-store-env",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/credential-store-env"
- }
- ],
- "facetsDigest": "sha256:cac24cfb3965fe73d76c8b90e1fb676ff5f7606928fb38ff3b1aeb8eb9e3ea0e",
- "closureDigest": "sha256:e3dfea4ee0734eb0ae53593b5aaae2ee05d652aa6322055e0dc0d3a58e4009b1"
- },
- {
- "package": {
- "name": "@narratage/local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.node-runtime-host-adapter@1",
- "name": "@narratage/local"
- },
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/local"
- }
- ],
- "facetsDigest": "sha256:552616c833a22031c623b0ad24f08a843f72f332eff2113032d63e2539d42e88",
- "closureDigest": "sha256:8baca82be34ae891ca52c8835e23116e51ccf59086ae3f90243f5c41bc6c12f0"
- },
- {
- "package": {
- "name": "@narratage/provider-google-vertex",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-google-vertex"
- }
- ],
- "facetsDigest": "sha256:485fc29d1efcdaeb4e395980975b35090ea6aef0f78d02108d3bd9b3f11aeb91",
- "closureDigest": "sha256:a9c49b1ee0b7e446739c552f006efdb2e02a6fbd95026be9ac2e2a4f579bcbff"
- },
- {
- "package": {
- "name": "@narratage/provider-hyperframes-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-hyperframes-local"
- }
- ],
- "facetsDigest": "sha256:e08dde3e4d38b167dca29cdc54eb2bb5e9ebc294e0e42b371099d53d6c44b402",
- "closureDigest": "sha256:8716f0eda32fec48f21cccfdb15b953f6708100923be2f9d1ed577c10db40f19"
- },
- {
- "package": {
- "name": "@narratage/provider-kie",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-kie"
- }
- ],
- "facetsDigest": "sha256:110648301d69b5b49ea553d285a27626f6fb74ebc74ee67175f688f914d7d74b",
- "closureDigest": "sha256:f7f87ad8a1ad76f950edf27bbd8a69bc9080da2b408fec8945d619cea8bf3208"
- },
- {
- "package": {
- "name": "@narratage/provider-media-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-media-local"
- }
- ],
- "facetsDigest": "sha256:998de772acb283828fee16310e77922bf43597bca1efa768e8398166a90af27d",
- "closureDigest": "sha256:d8386c799c6f77909767076e81a3932be033bf24e0eb65b07f79a14e7bf759a8"
- },
- {
- "package": {
- "name": "@narratage/provider-whisperx-local",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-endpoint-adapter-host@1",
- "name": "@narratage/provider-whisperx-local"
- }
- ],
- "facetsDigest": "sha256:e7d4f1e2fd56f2bcb5dbc36e1faae48d2680bb839aed4a43eb0cb23207ffbe1d",
- "closureDigest": "sha256:8e38557baf5fb4c5abcdc4f6a702a8e792fd19b36a088e0f9fee6a68577e367b"
- },
- {
- "package": {
- "name": "@narratage/store-sqlite",
- "version": "0.0.0-dev"
- },
- "offers": [
- {
- "abi": "svml.runtime-component-adapter-host@1",
- "name": "@narratage/store-sqlite"
- }
- ],
- "facetsDigest": "sha256:dcd11bfeb19b68e69aeecd31d34de36045dd92e36039d651385081ce4180080b",
- "closureDigest": "sha256:dbc85921b27942e27a5fde033803962733f20970536cbdfd2059ff249e22d946"
- }
- ],
- "digest": "sha256:a038c726f4d7a38e761a8d07b317187e7bd1178130560e0aeeeaa6c75c2fcd30"
-}
diff --git a/narratage b/narratage
index a17ae363..83077785 100755
--- a/narratage
+++ b/narratage
@@ -3,11 +3,9 @@ set -eu
launcher_path=$(node -e 'process.stdout.write(require("node:fs").realpathSync(process.argv[1]))' "$0")
launcher_dir=$(CDPATH= cd -- "$(dirname -- "$launcher_path")" && pwd)
-loader="$launcher_dir/node_modules/tsx/dist/loader.mjs"
-if [ ! -f "$loader" ]; then
+launcher="$launcher_dir/bin/narratage.mjs"
+if [ ! -f "$launcher" ]; then
echo "Narratage dependencies are not installed in $launcher_dir; run: pnpm install --frozen-lockfile" >&2
exit 1
fi
-exec node --disable-warning=ExperimentalWarning \
- --import "$loader" \
- "$launcher_dir/packages/video-cli/src/cli.ts" "$@"
+exec node "$launcher" "$@"
diff --git a/package.json b/package.json
index b5697ad9..772210cb 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,9 @@
"license": "SEE LICENSE IN LICENSE",
"private": true,
"type": "module",
+ "bin": {
+ "narratage": "./bin/narratage.mjs"
+ },
"packageManager": "[email protected]",
"scripts": {
"check": "tsc -p tsconfig.json --noEmit",
@@ -13,10 +16,11 @@
"test": "node --import tsx --test 'packages/*/test/**/*.test.ts' 'services/*/test/**/*.test.ts' 'tools/*/test/**/*.test.ts' 'test/**/*.test.ts'",
"test:release": "node --import tsx --test tools/repository-hygiene.test.mjs",
"test:whisperx-service": "uv run --project services/whisperx --frozen python -m unittest discover -s services/whisperx/tests -p 'test_*.py'",
- "test:browser-visual": "SVML_BROWSER_TESTS=1 node --import tsx --test packages/hyperframes/test/browser-visual.test.ts",
- "test:image-opencv": "SVML_OPENCV_TESTS=1 SVML_OPENCV_PYTHON=services/image-opencv/.venv/bin/python node --import tsx --test packages/provider-image-opencv-local/test/provider.test.ts",
+ "test:browser-visual": "NARRATAGE_BROWSER_TESTS=1 node --import tsx --test packages/hyperframes/test/browser-visual.test.ts",
+ "test:image-opencv": "NARRATAGE_OPENCV_TESTS=1 NARRATAGE_OPENCV_PYTHON=services/image-opencv/.venv/bin/python node --import tsx --test packages/provider-image-opencv-local/test/provider.test.ts",
"smoke:kie": "node --import tsx packages/provider-kie/test/live-smoke.ts",
- "narratage": "node --disable-warning=ExperimentalWarning --import tsx packages/video-cli/src/cli.ts",
+ "cli:build": "node bin/build-cli.mjs",
+ "narratage": "node bin/narratage.mjs",
"caption:playground": "pnpm --filter @narratage/caption-playground exec node --import tsx start.ts",
"svml:playground": "pnpm --filter @narratage/svml-playground exec node --import tsx start.ts",
"build:media-lambda": "pnpm --filter @narratage/media-lambda build",
@@ -50,7 +54,7 @@
"@narratage/hyperframes": "workspace:*",
"@narratage/image-compose": "workspace:*",
"@narratage/image-transform": "workspace:*",
- "@narratage/local": "workspace:*",
+ "@narratage/runtime-local": "workspace:*",
"@narratage/media": "workspace:*",
"@narratage/media-track": "workspace:*",
"@narratage/media-pipeline": "workspace:*",
@@ -73,8 +77,8 @@
"@narratage/raster": "workspace:*",
"@narratage/render-hyperframes": "workspace:*",
"@narratage/run-markup": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"@narratage/screen-overlay": "workspace:*",
"@narratage/script": "workspace:*",
"@narratage/seedance": "workspace:*",
diff --git a/packages/artifact-store-fs/README.md b/packages/artifact-store-fs/README.md
index 4899e912..0c09ead8 100644
--- a/packages/artifact-store-fs/README.md
+++ b/packages/artifact-store-fs/README.md
@@ -6,6 +6,6 @@ The path is deployment configuration. Artifact identity is the SHA-256 digest of
same adapter can later be replaced by S3 without changing Core, component or Endpoint contracts.
This package does not store BuildState, Endpoint checkpoints, credentials or author library records.
-`createFileArtifactStorePackage()` contributes the configured store through the generic Runtime
-Component Adapter protocol. Its absolute root is bound into Runtime instance identity; the Local Host
-does not need filesystem-specific registration code.
+`createFileArtifactStorePackage()` creates one Runtime infrastructure instance exposing the `store`
+part with the `artifact-store` role. Its absolute root is bound into that instance's identity; the
+Runtime Host does not need filesystem-specific registration code.
diff --git a/packages/artifact-store-fs/package.json b/packages/artifact-store-fs/package.json
index 1176642b..df91b819 100644
--- a/packages/artifact-store-fs/package.json
+++ b/packages/artifact-store-fs/package.json
@@ -7,12 +7,12 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
}
}
diff --git a/packages/artifact-store-fs/src/activation.ts b/packages/artifact-store-fs/src/activation.ts
index 947961fc..7f8d8e88 100644
--- a/packages/artifact-store-fs/src/activation.ts
+++ b/packages/artifact-store-fs/src/activation.ts
@@ -1,15 +1,15 @@
import { resolve } from "node:path";
import {
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
runtimeConfigExact,
runtimeConfigObject,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createFileArtifactStorePackage } from "./store.js";
-const fileArtifactStoreAdapter = createRuntimeComponentAdapterFacet({
+const fileArtifactStoreAdapter = createRuntimeInfrastructureAdapterFacet({
use: "@narratage/artifact-store-fs",
validate(context) {
const config = runtimeConfigObject(context.config, "filesystem ArtifactStore");
@@ -27,9 +27,9 @@ const fileArtifactStoreAdapter = createRuntimeComponentAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [fileArtifactStoreAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/artifact-store-fs/src/index.ts b/packages/artifact-store-fs/src/index.ts
index 7272956f..96eab4f7 100644
--- a/packages/artifact-store-fs/src/index.ts
+++ b/packages/artifact-store-fs/src/index.ts
@@ -1,7 +1,2 @@
-export {
- FileArtifactStore,
- createFileArtifactStorePackage,
- fileArtifactStoreImplementationDigest,
- fileArtifactStoreModuleRef,
-} from "./store.js";
+export { FileArtifactStore, createFileArtifactStorePackage, fileArtifactStoreModuleRef } from "./store.js";
export type * from "./store.js";
diff --git a/packages/artifact-store-fs/src/store.ts b/packages/artifact-store-fs/src/store.ts
index 40b20bc1..f9209c13 100644
--- a/packages/artifact-store-fs/src/store.ts
+++ b/packages/artifact-store-fs/src/store.ts
@@ -11,18 +11,14 @@ import { dirname, join, resolve } from "node:path";
import { digestOf, isDigest } from "@narratage/protocol";
import type { BlobRef, Digest } from "@narratage/protocol";
-import { defineRuntimeComponentPackage } from "@narratage/runtime";
-import type { ArtifactStore, RuntimeComponentPackage } from "@narratage/runtime";
+import { defineRuntimeInfrastructurePackage } from "@narratage/runtime";
+import type { ArtifactStore, RuntimeInfrastructurePackage } from "@narratage/runtime";
export const fileArtifactStoreModuleRef = {
name: "@narratage/artifact-store-fs",
version: "1",
} as const;
-export const fileArtifactStoreImplementationDigest = digestOf(
- "@narratage/artifact-store-fs/artifact-store@1",
-);
-
export type CreateFileArtifactStorePackageOptions = {
readonly root: string;
readonly instance?: string;
@@ -188,18 +184,15 @@ export class FileArtifactStore implements ArtifactStore {
export function createFileArtifactStorePackage(
options: CreateFileArtifactStorePackageOptions,
-): RuntimeComponentPackage {
- const instance = options.instance ?? "artifacts.fs";
- return defineRuntimeComponentPackage({
+): RuntimeInfrastructurePackage {
+ const instance = options.instance ?? "artifacts";
+ return defineRuntimeInfrastructurePackage({
module: fileArtifactStoreModuleRef,
- components: [{
+ instance,
+ parts: [{
role: "artifact-store",
+ part: "store",
facet: "artifact-store",
- instance,
- implementation: {
- digest: fileArtifactStoreImplementationDigest,
- },
- configuration: { root: resolve(options.root) },
port: new FileArtifactStore(options.root),
}],
});
diff --git a/packages/artifact-store-fs/test/store.test.ts b/packages/artifact-store-fs/test/store.test.ts
index 9bf862fb..7dfec59f 100644
--- a/packages/artifact-store-fs/test/store.test.ts
+++ b/packages/artifact-store-fs/test/store.test.ts
@@ -7,7 +7,7 @@ import test from "node:test";
import { FileArtifactStore } from "@narratage/artifact-store-fs";
test("filesystem artifacts are content-addressed and survive adapter restart", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-artifacts-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-artifacts-"));
try {
const bytes = new TextEncoder().encode("one immutable video artifact");
const first = new FileArtifactStore(directory);
@@ -30,7 +30,7 @@ test("filesystem artifacts are content-addressed and survive adapter restart", a
});
test("filesystem artifacts expose optional streaming and explicit retention capabilities", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-artifacts-stream-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-artifacts-stream-"));
try {
const store = new FileArtifactStore(directory);
const artifact = await store.putStream((async function* () {
diff --git a/packages/artifact-store-s3/README.md b/packages/artifact-store-s3/README.md
index cc9403c1..f01dc617 100644
--- a/packages/artifact-store-s3/README.md
+++ b/packages/artifact-store-s3/README.md
@@ -21,17 +21,18 @@ actually perform instead of failing midway through a Build.
```ts
const artifacts = createS3ArtifactStorePackage({
instance: "artifacts.team",
- bucket: "team-svml-artifacts",
+ bucket: "team-narratage-artifacts",
prefix: "development",
region: "us-east-1",
expectedBucketOwner: "123456789012",
});
-// Supply this package beside explicit Scheduler/Worker, state and CredentialStore packages,
-// then select `artifacts.team` as runtimeSelection.stores.artifacts.
+// A Runtime Profile creates this as a named infrastructure instance, then selects
+// its `store` part for the `artifactStore` role.
```
-`createProjectLocalRuntime()` never infers the other required Components from this package.
+The package exposes only its own `store` part. It never infers or installs the Scheduler, Worker,
+state or Credential Store selected for the other Runtime roles.
The AWS SDK default credential chain or an explicitly injected trusted client owns AWS
authentication. Secret bytes never enter the package contribution or Runtime Closure; bucket,
diff --git a/packages/artifact-store-s3/package.json b/packages/artifact-store-s3/package.json
index 76ec8842..ebe1683e 100644
--- a/packages/artifact-store-s3/package.json
+++ b/packages/artifact-store-s3/package.json
@@ -7,13 +7,13 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.1103.0",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
}
}
diff --git a/packages/artifact-store-s3/src/activation.ts b/packages/artifact-store-s3/src/activation.ts
index 2d6954be..bac9b0b8 100644
--- a/packages/artifact-store-s3/src/activation.ts
+++ b/packages/artifact-store-s3/src/activation.ts
@@ -1,12 +1,12 @@
import {
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
runtimeConfigBoolean,
runtimeConfigExact,
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-kit";
import { AwsS3ObjectClient } from "./client.js";
import { createS3ArtifactStorePackage, s3ArtifactKey } from "./store.js";
@@ -31,7 +31,7 @@ function validateConfig(context: RuntimeAdapterFactoryContext): void {
}
}
-const s3ArtifactStoreRuntimeAdapter = createRuntimeComponentAdapterFacet({
+const s3ArtifactStoreRuntimeAdapter = createRuntimeInfrastructureAdapterFacet({
use: "@narratage/artifact-store-s3",
validate: validateConfig,
create(context) {
@@ -81,7 +81,7 @@ const s3ArtifactStoreRuntimeAdapter = createRuntimeComponentAdapterFacet({
// bucket as the expected owner" without depending on any object.
await client.head({
Bucket: bucket,
- Key: `${runtimeConfigString(config.prefix, "S3 prefix") ?? ""}/.svml-doctor-probe`.replace(/^\/+/u, ""),
+ Key: `${runtimeConfigString(config.prefix, "S3 prefix") ?? ""}/.narratage-doctor-probe`.replace(/^\/+/u, ""),
...(owner === undefined ? {} : { ExpectedBucketOwner: owner }),
});
return [];
@@ -96,9 +96,9 @@ const s3ArtifactStoreRuntimeAdapter = createRuntimeComponentAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [s3ArtifactStoreRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/artifact-store-s3/src/index.ts b/packages/artifact-store-s3/src/index.ts
index 0913a590..8e980aa5 100644
--- a/packages/artifact-store-s3/src/index.ts
+++ b/packages/artifact-store-s3/src/index.ts
@@ -1,10 +1,4 @@
export { AwsS3ObjectClient } from "./client.js";
export type { S3ListPage, S3ObjectClient } from "./client.js";
-export {
- S3ArtifactStore,
- createS3ArtifactStorePackage,
- s3ArtifactKey,
- s3ArtifactStoreImplementationDigest,
- s3ArtifactStoreModuleRef,
-} from "./store.js";
+export { S3ArtifactStore, createS3ArtifactStorePackage, s3ArtifactKey, s3ArtifactStoreModuleRef } from "./store.js";
export type * from "./store.js";
diff --git a/packages/artifact-store-s3/src/store.ts b/packages/artifact-store-s3/src/store.ts
index 895f7d46..30dc47cb 100644
--- a/packages/artifact-store-s3/src/store.ts
+++ b/packages/artifact-store-s3/src/store.ts
@@ -2,8 +2,8 @@ import { createHash, randomUUID } from "node:crypto";
import { digestOf, isDigest } from "@narratage/protocol";
import type { BlobRef, Digest } from "@narratage/protocol";
-import { defineRuntimeComponentPackage } from "@narratage/runtime";
-import type { ArtifactStore, RuntimeComponentPackage } from "@narratage/runtime";
+import { defineRuntimeInfrastructurePackage } from "@narratage/runtime";
+import type { ArtifactStore, RuntimeInfrastructurePackage } from "@narratage/runtime";
import { AwsS3ObjectClient } from "./client.js";
import type { S3ListPage, S3ObjectClient } from "./client.js";
@@ -13,10 +13,6 @@ export const s3ArtifactStoreModuleRef = {
version: "1",
} as const;
-export const s3ArtifactStoreImplementationDigest = digestOf(
- "@narratage/artifact-store-s3/artifact-store@1",
-);
-
/**
* Where an Artifact lives in a bucket, given its digest.
*
@@ -146,8 +142,8 @@ export class S3ArtifactStore implements ArtifactStore {
ChecksumSHA256: hash.digest("base64"),
IfNoneMatch: "*",
Metadata: {
- "svml-digest": digest,
- "svml-size": String(copy.byteLength),
+ "narratage-digest": digest,
+ "narratage-size": String(copy.byteLength),
},
...(this.#expectedBucketOwner === undefined
? {}
@@ -326,7 +322,7 @@ export class S3ArtifactStore implements ArtifactStore {
CopySource: `${this.#bucket}/${staging}`,
ContentType: mediaType,
MetadataDirective: "REPLACE",
- Metadata: { "svml-digest": digest, "svml-size": String(size) },
+ Metadata: { "narratage-digest": digest, "narratage-size": String(size) },
IfNoneMatch: "*",
...owner,
});
@@ -381,8 +377,8 @@ export class S3ArtifactStore implements ArtifactStore {
export function createS3ArtifactStorePackage(
options: CreateS3ArtifactStorePackageOptions,
-): RuntimeComponentPackage {
- const instance = options.instance ?? "artifacts.s3";
+): RuntimeInfrastructurePackage {
+ const instance = options.instance ?? "artifacts";
assert(instance.trim().length > 0, "S3 ArtifactStore instance id must not be empty");
const prefix = normalizePrefix(options.prefix);
const configuration = {
@@ -399,16 +395,13 @@ export function createS3ArtifactStorePackage(
...(options.endpoint === undefined ? {} : { endpoint: options.endpoint }),
...(options.forcePathStyle === undefined ? {} : { forcePathStyle: options.forcePathStyle }),
});
- return defineRuntimeComponentPackage({
+ return defineRuntimeInfrastructurePackage({
module: s3ArtifactStoreModuleRef,
- components: [{
+ instance,
+ parts: [{
role: "artifact-store",
+ part: "store",
facet: "artifact-store",
- instance,
- implementation: {
- digest: s3ArtifactStoreImplementationDigest,
- },
- configuration,
port: new S3ArtifactStore({
client,
bucket: options.bucket,
diff --git a/packages/artifact-store-s3/test/store.test.ts b/packages/artifact-store-s3/test/store.test.ts
index 10513a83..677754a1 100644
--- a/packages/artifact-store-s3/test/store.test.ts
+++ b/packages/artifact-store-s3/test/store.test.ts
@@ -57,8 +57,7 @@ test("configured S3 service locks its location", () => {
region: "us-east-1",
expectedBucketOwner: "123456789012",
});
- assert.equal(configured.components[0]?.instance.id, "artifacts.team");
- assert.ok(configured.components[0]?.instance.configurationDigest);
+ assert.equal(configured.parts[0]?.instance.id, "artifacts.team.store");
});
/** A client that can do everything, backed by an in-memory bucket. */
diff --git a/packages/artifact/package.json b/packages/artifact/package.json
index 024d3c11..e66134fb 100644
--- a/packages/artifact/package.json
+++ b/packages/artifact/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/artifact/src/activation.ts b/packages/artifact/src/activation.ts
index 9cc28ba7..40ac759c 100644
--- a/packages/artifact/src/activation.ts
+++ b/packages/artifact/src/activation.ts
@@ -1,8 +1,8 @@
import { artifactManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: artifactManifest }],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/artifact/src/index.ts b/packages/artifact/src/index.ts
index f92ead67..6138dc3d 100644
--- a/packages/artifact/src/index.ts
+++ b/packages/artifact/src/index.ts
@@ -15,17 +15,15 @@ export const artifactTypes = {
export const blobArtifactValueSchema: ValueSchema = { kind: "blob" };
export const artifactManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: artifactModuleRef.name,
version: artifactModuleRef.version,
dependencies: [],
- types: [{ name: artifactTypes.blob.name, schema: blobArtifactValueSchema }],
+ types: [{ name: artifactTypes.blob.name }],
capabilities: [],
producers: [],
};
-export const artifactManifestDigest = digestOf(artifactManifest);
export const artifactDependency = {
module: artifactModuleRef,
- digest: artifactManifestDigest,
} as const;
diff --git a/packages/audio-track/package.json b/packages/audio-track/package.json
index 39371645..7a28748d 100644
--- a/packages/audio-track/package.json
+++ b/packages/audio-track/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/audio-track/src/activation.ts b/packages/audio-track/src/activation.ts
index 3a0866b8..091f6c61 100644
--- a/packages/audio-track/src/activation.ts
+++ b/packages/audio-track/src/activation.ts
@@ -7,8 +7,8 @@ import {
audioTrackMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: audioTrackManifest }],
components: [audioTrackComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -17,4 +17,4 @@ export const svmlPackage = {
handler: decodeAudioTrackSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/audio-track/src/component.ts b/packages/audio-track/src/component.ts
index b7b8b121..9545c061 100644
--- a/packages/audio-track/src/component.ts
+++ b/packages/audio-track/src/component.ts
@@ -7,17 +7,7 @@ import type { StoredValue } from "@narratage/protocol";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import { audioTrackProducers, audioTrackTypes } from "./manifest.js";
-import {
- appendMomentAudioItem,
- appendProgramAudioItem,
- appendSelectionAudioItem,
- assertAudioTrackProgram,
- audioTrackImplementationDigests,
- audioTrackValidatorDigests,
- createAudioTrackSet,
- finalizeAudioTrack,
- renderAudioTrack,
-} from "./program.js";
+import { appendMomentAudioItem, appendProgramAudioItem, appendSelectionAudioItem, assertAudioTrackProgram, createAudioTrackSet, finalizeAudioTrack, renderAudioTrack } from "./program.js";
import type { AudioClipSpec, AudioTrackHeader, AudioTrackProgram, AudioTrackSet } from "./types.js";
function inline<T>(value: StoredValue | undefined, label: string): T {
@@ -30,34 +20,33 @@ const base = (inputs: Parameters<typeof appendProgramAudioItem>) => output(appen
export const audioTrackComponent = {
producers: [
- { producer: audioTrackProducers.createSet, implementationDigest: audioTrackImplementationDigests.createSet, handler: () => ({ outputs: { set: output(createAudioTrackSet()) }, needs: {} }) },
- { producer: audioTrackProducers.appendProgram, implementationDigest: audioTrackImplementationDigests.appendProgram, handler: ({ inputs }) => ({ outputs: { set: base([
+ { producer: audioTrackProducers.createSet, handler: () => ({ outputs: { set: output(createAudioTrackSet()) }, needs: {} }) },
+ { producer: audioTrackProducers.appendProgram, handler: ({ inputs }) => ({ outputs: { set: base([
inline<AudioTrackSet>(inputs.set?.value, "AudioTrackSet"), inline<AudioTrackHeader>(inputs.header?.value, "AudioTrackHeader"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<SynchronizedMedia>(inputs.media?.value, "SynchronizedMedia"),
inline<AudioClipSpec>(inputs.spec?.value, "AudioClipSpec"),
]) }, needs: {} }) },
- { producer: audioTrackProducers.appendSelection, implementationDigest: audioTrackImplementationDigests.appendSelection, handler: ({ inputs }) => ({ outputs: { set: output(appendSelectionAudioItem(
+ { producer: audioTrackProducers.appendSelection, handler: ({ inputs }) => ({ outputs: { set: output(appendSelectionAudioItem(
inline<AudioTrackSet>(inputs.set?.value, "AudioTrackSet"), inline<AudioTrackHeader>(inputs.header?.value, "AudioTrackHeader"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<SynchronizedMedia>(inputs.media?.value, "SynchronizedMedia"),
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"), inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelection"),
inline<AudioClipSpec>(inputs.spec?.value, "AudioClipSpec"),
)) }, needs: {} }) },
- { producer: audioTrackProducers.appendMoment, implementationDigest: audioTrackImplementationDigests.appendMoment, handler: ({ inputs }) => ({ outputs: { set: output(appendMomentAudioItem(
+ { producer: audioTrackProducers.appendMoment, handler: ({ inputs }) => ({ outputs: { set: output(appendMomentAudioItem(
inline<AudioTrackSet>(inputs.set?.value, "AudioTrackSet"), inline<AudioTrackHeader>(inputs.header?.value, "AudioTrackHeader"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<SynchronizedMedia>(inputs.media?.value, "SynchronizedMedia"),
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"), inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMoment"),
inline<AudioClipSpec>(inputs.spec?.value, "AudioClipSpec"),
)) }, needs: {} }) },
- { producer: audioTrackProducers.finalize, implementationDigest: audioTrackImplementationDigests.finalize, handler: ({ inputs }) => ({ outputs: { program: output(finalizeAudioTrack(
+ { producer: audioTrackProducers.finalize, handler: ({ inputs }) => ({ outputs: { program: output(finalizeAudioTrack(
inline<AudioTrackSet>(inputs.set?.value, "AudioTrackSet"), inline<AudioTrackHeader>(inputs.header?.value, "AudioTrackHeader"),
)) }, needs: {} }) },
- { producer: audioTrackProducers.render, implementationDigest: audioTrackImplementationDigests.render, handler: ({ inputs }) => ({ outputs: { track: output(renderAudioTrack(
+ { producer: audioTrackProducers.render, handler: ({ inputs }) => ({ outputs: { track: output(renderAudioTrack(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<AudioTrackProgram>(inputs.program?.value, "AudioTrackProgram"),
)) }, needs: {} }) },
],
validators: [{
type: audioTrackTypes.program,
- implementationDigest: audioTrackValidatorDigests.program,
handler: ({ value }) => assertAudioTrackProgram(inline<AudioTrackProgram>(value, "AudioTrackProgram")),
}],
} satisfies ComponentPackage;
diff --git a/packages/audio-track/src/index.ts b/packages/audio-track/src/index.ts
index 93f19085..43be5c5e 100644
--- a/packages/audio-track/src/index.ts
+++ b/packages/audio-track/src/index.ts
@@ -1,36 +1,7 @@
export { audioTrackComponent } from "./component.js";
export { createAudioTrackFragment, programAudioTrackFragment } from "./fragment.js";
export type { AudioTrackFragmentItem } from "./fragment.js";
-export {
- audioClipSpecSchema,
- audioTrackDependency,
- audioTrackHeaderSchema,
- audioTrackManifest,
- audioTrackMarkupSurfaces,
- audioTrackManifestDigest,
- audioTrackModuleRef,
- audioTrackProducers,
- audioTrackProgramSchema,
- audioTrackSetSchema,
- audioTrackSurfaceImplementationDigest,
- audioTrackTypes,
-} from "./manifest.js";
+export { audioClipSpecSchema, audioTrackDependency, audioTrackHeaderSchema, audioTrackManifest, audioTrackMarkupSurfaces, audioTrackModuleRef, audioTrackProducers, audioTrackProgramSchema, audioTrackSetSchema, audioTrackTypes } from "./manifest.js";
export { decodeAudioTrackSurface } from "./surface.js";
-export {
- appendMomentAudioItem,
- appendProgramAudioItem,
- appendSelectionAudioItem,
- assertAudioClipSpec,
- assertAudioTrackHeader,
- assertAudioTrackProgram,
- assertAudioTrackSet,
- audioTrackImplementationDigests,
- audioTrackValidatorDigests,
- createAudioTrackSet,
- finalizeAudioTrack,
- renderAudioTrack,
- sealAudioClipSpec,
- sealAudioTrackHeader,
- sealAudioTrackProgram,
-} from "./program.js";
+export { appendMomentAudioItem, appendProgramAudioItem, appendSelectionAudioItem, assertAudioClipSpec, assertAudioTrackHeader, assertAudioTrackProgram, assertAudioTrackSet, createAudioTrackSet, finalizeAudioTrack, renderAudioTrack, sealAudioClipSpec, sealAudioTrackHeader, sealAudioTrackProgram } from "./program.js";
export type * from "./types.js";
diff --git a/packages/audio-track/src/manifest.ts b/packages/audio-track/src/manifest.ts
index 21750922..da36bb1b 100644
--- a/packages/audio-track/src/manifest.ts
+++ b/packages/audio-track/src/manifest.ts
@@ -7,8 +7,6 @@ import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narrata
import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
import { temporalDependency } from "@narratage/temporal";
-import { audioTrackImplementationDigests, audioTrackValidatorDigests } from "./program.js";
-
export const audioTrackModuleRef = { name: "@narratage/audio-track", version: "1" } as const;
export const audioTrackTypes = {
header: { module: audioTrackModuleRef, name: "AudioTrackHeader" },
@@ -82,8 +80,6 @@ export const audioTrackProgramSchema: ValueSchema = object({
items: { schema: { kind: "array", minItems: 1, items: item } },
});
-export const audioTrackSurfaceImplementationDigest = digestOf("@narratage/audio-track/track-surface@1");
-
const validator = (digest: ReturnType<typeof digestOf>) => ({
implementation: { digest },
});
@@ -96,32 +92,28 @@ const baseInputs = [
export const audioTrackMarkupSurfaces = [{
name: "track", tag: "Track", mode: "structured",
outputs: [audioTrackTypes.header, audioTrackTypes.clipSpec, audioTrackTypes.program, compositionTypes.audioTrack],
- implementation: {
- digest: audioTrackSurfaceImplementationDigest,
- },
}] as const;
export const audioTrackManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: audioTrackModuleRef.name,
version: audioTrackModuleRef.version,
dependencies: [mediaDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, temporalDependency, compositionDependency],
types: [
- { name: audioTrackTypes.header.name, schema: audioTrackHeaderSchema },
- { name: audioTrackTypes.clipSpec.name, schema: audioClipSpecSchema },
- { name: audioTrackTypes.set.name, schema: audioTrackSetSchema },
- { name: audioTrackTypes.program.name, schema: audioTrackProgramSchema, validator: validator(audioTrackValidatorDigests.program) },
+ { name: audioTrackTypes.header.name },
+ { name: audioTrackTypes.clipSpec.name },
+ { name: audioTrackTypes.set.name },
+ { name: audioTrackTypes.program.name },
],
capabilities: [],
producers: [
- { name: audioTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [], implementation: { digest: audioTrackImplementationDigests.createSet } },
- { name: audioTrackProducers.appendProgram.name, inputs: [...baseInputs], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [], implementation: { digest: audioTrackImplementationDigests.appendProgram } },
- { name: audioTrackProducers.appendSelection.name, inputs: [...baseInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [], implementation: { digest: audioTrackImplementationDigests.appendSelection } },
- { name: audioTrackProducers.appendMoment.name, inputs: [...baseInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [], implementation: { digest: audioTrackImplementationDigests.appendMoment } },
- { name: audioTrackProducers.finalize.name, inputs: [{ name: "set", type: audioTrackTypes.set }, { name: "header", type: audioTrackTypes.header }], outputs: [{ name: "program", type: audioTrackTypes.program }], needs: [], implementation: { digest: audioTrackImplementationDigests.finalize } },
- { name: audioTrackProducers.render.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: audioTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.audioTrack }], needs: [], implementation: { digest: audioTrackImplementationDigests.render } },
+ { name: audioTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [] },
+ { name: audioTrackProducers.appendProgram.name, inputs: [...baseInputs], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [] },
+ { name: audioTrackProducers.appendSelection.name, inputs: [...baseInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [] },
+ { name: audioTrackProducers.appendMoment.name, inputs: [...baseInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [] },
+ { name: audioTrackProducers.finalize.name, inputs: [{ name: "set", type: audioTrackTypes.set }, { name: "header", type: audioTrackTypes.header }], outputs: [{ name: "program", type: audioTrackTypes.program }], needs: [] },
+ { name: audioTrackProducers.render.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: audioTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.audioTrack }], needs: [] },
],
};
-export const audioTrackManifestDigest = digestOf(audioTrackManifest);
-export const audioTrackDependency = { module: audioTrackModuleRef, digest: audioTrackManifestDigest } as const;
+export const audioTrackDependency = { module: audioTrackModuleRef } as const;
diff --git a/packages/audio-track/src/program.ts b/packages/audio-track/src/program.ts
index 14ebbe17..c9a97959 100644
--- a/packages/audio-track/src/program.ts
+++ b/packages/audio-track/src/program.ts
@@ -28,19 +28,6 @@ import type {
AudioTrackSet,
} from "./types.js";
-export const audioTrackImplementationDigests = {
- createSet: digestOf("@narratage/audio-track/create-set@1"),
- appendProgram: digestOf("@narratage/audio-track/append-program@1"),
- appendSelection: digestOf("@narratage/audio-track/append-selection@1"),
- appendMoment: digestOf("@narratage/audio-track/append-moment@1"),
- finalize: digestOf("@narratage/audio-track/finalize@1"),
- render: digestOf("@narratage/audio-track/render@1"),
-} as const;
-
-export const audioTrackValidatorDigests = {
- program: digestOf("@narratage/audio-track/validate-program@1"),
-} as const;
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
diff --git a/packages/audio-track/test/audio-track.test.ts b/packages/audio-track/test/audio-track.test.ts
index 79686a44..b7bb82c0 100644
--- a/packages/audio-track/test/audio-track.test.ts
+++ b/packages/audio-track/test/audio-track.test.ts
@@ -235,10 +235,9 @@ test("the self-described Audio Surface parses into the same finite Producer grap
const fixtureSurface = {
name: "inputs", tag: "Inputs", mode: "structured",
outputs: [mediaTypes.synchronized, programSpaceTypes.programSpace],
- implementation: { digest: fixtureSurfaceDigest },
} as const;
const fixtureManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: fixtureModule.name,
version: fixtureModule.version,
dependencies: [mediaDependency, programSpaceDependency],
diff --git a/packages/background-removal/package.json b/packages/background-removal/package.json
index bf00579f..c4c1cb15 100644
--- a/packages/background-removal/package.json
+++ b/packages/background-removal/package.json
@@ -5,7 +5,7 @@
"private": true,
"type": "module",
"exports": { ".": "./src/index.ts" },
- "svml": { "activation": "./src/activation.ts" },
+ "narratage": { "activation": "./src/activation.ts" },
"dependencies": {
"@narratage/artifact": "workspace:*",
"@narratage/component-kit": "workspace:*",
diff --git a/packages/background-removal/src/activation.ts b/packages/background-removal/src/activation.ts
index 80ef08f9..6df71223 100644
--- a/packages/background-removal/src/activation.ts
+++ b/packages/background-removal/src/activation.ts
@@ -6,8 +6,8 @@ import {
backgroundRemovalMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: backgroundRemovalManifest }],
components: [backgroundRemovalComponent],
hostFacets: [{ ...createMarkupSurfaceHostFacet({
@@ -15,4 +15,4 @@ export const svmlPackage = {
declaration: backgroundRemovalMarkupSurfaces.find((item) => item.name === "background")!, handler: decodeBackgroundRemovalSurface,
}) }],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/background-removal/src/component.ts b/packages/background-removal/src/component.ts
index 923424ac..ddf9a3ef 100644
--- a/packages/background-removal/src/component.ts
+++ b/packages/background-removal/src/component.ts
@@ -1,7 +1,7 @@
import type { ComponentPackage, ProducerHandlerContext } from "@narratage/component-kit";
import type { StoredValue } from "@narratage/protocol";
-import { backgroundRemovalImplementationDigests, backgroundRemovalProducers } from "./manifest.js";
+import { backgroundRemovalProducers } from "./manifest.js";
import { backgroundRemovalRequest } from "./program.js";
function blob(value: StoredValue | undefined) {
@@ -12,7 +12,6 @@ function blob(value: StoredValue | undefined) {
export const backgroundRemovalComponent = {
producers: [{
producer: backgroundRemovalProducers.request,
- implementationDigest: backgroundRemovalImplementationDigests.request,
handler: ({ inputs }: ProducerHandlerContext) => ({
outputs: {}, needs: { image: backgroundRemovalRequest(blob(inputs.source?.value)) },
}),
diff --git a/packages/background-removal/src/index.ts b/packages/background-removal/src/index.ts
index 1c8dd073..16f9be19 100644
--- a/packages/background-removal/src/index.ts
+++ b/packages/background-removal/src/index.ts
@@ -1,9 +1,6 @@
export { backgroundRemovalComponent } from "./component.js";
export { backgroundRemovalFragment } from "./fragment.js";
-export {
- backgroundRemovalCapabilities, backgroundRemovalDependency, backgroundRemovalImplementationDigests,
- backgroundRemovalManifest, backgroundRemovalMarkupSurfaces, backgroundRemovalManifestDigest, backgroundRemovalModuleRef, backgroundRemovalProducers,
-} from "./manifest.js";
+export { backgroundRemovalCapabilities, backgroundRemovalDependency, backgroundRemovalManifest, backgroundRemovalMarkupSurfaces, backgroundRemovalModuleRef, backgroundRemovalProducers } from "./manifest.js";
export { assertBackgroundRemovalRequest, backgroundRemovalRequest } from "./program.js";
export { decodeBackgroundRemovalSurface } from "./surface.js";
export type * from "./types.js";
diff --git a/packages/background-removal/src/manifest.ts b/packages/background-removal/src/manifest.ts
index db58ccaf..54b3f6fc 100644
--- a/packages/background-removal/src/manifest.ts
+++ b/packages/background-removal/src/manifest.ts
@@ -9,27 +9,20 @@ export const backgroundRemovalCapabilities = {
export const backgroundRemovalProducers = {
request: { module: backgroundRemovalModuleRef, name: "request-background-removal" },
} satisfies Record<string, ProducerRef>;
-export const backgroundRemovalImplementationDigests = {
- request: digestOf("@narratage/background-removal/request@1/direct-need"),
- surface: digestOf("@narratage/background-removal/background-surface@1"),
-} as const;
export const backgroundRemovalMarkupSurfaces = [{
name: "background", tag: "Background", mode: "structured", outputs: [artifactTypes.blob],
- implementation: { digest: backgroundRemovalImplementationDigests.surface },
}] as const;
export const backgroundRemovalManifest: ModuleManifest = {
- format: "svml.module@1", name: backgroundRemovalModuleRef.name, version: backgroundRemovalModuleRef.version,
+ format: "narratage.module@1", name: backgroundRemovalModuleRef.name, version: backgroundRemovalModuleRef.version,
dependencies: [artifactDependency], types: [],
capabilities: [{ name: backgroundRemovalCapabilities.remove.name, returns: artifactTypes.blob }],
producers: [{
name: backgroundRemovalProducers.request.name,
inputs: [{ name: "source", type: artifactTypes.blob }], outputs: [],
needs: [{ name: "image", capability: backgroundRemovalCapabilities.remove, returns: artifactTypes.blob }],
- implementation: { digest: backgroundRemovalImplementationDigests.request },
}],
};
-export const backgroundRemovalManifestDigest = digestOf(backgroundRemovalManifest);
-export const backgroundRemovalDependency = { module: backgroundRemovalModuleRef, digest: backgroundRemovalManifestDigest } as const;
+export const backgroundRemovalDependency = { module: backgroundRemovalModuleRef } as const;
diff --git a/packages/caption-fine/package.json b/packages/caption-fine/package.json
index 3a37d5df..98211b7c 100644
--- a/packages/caption-fine/package.json
+++ b/packages/caption-fine/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/caption-fine/src/activation.ts b/packages/caption-fine/src/activation.ts
index 4cafcc84..5e9be360 100644
--- a/packages/caption-fine/src/activation.ts
+++ b/packages/caption-fine/src/activation.ts
@@ -9,8 +9,8 @@ import {
captionFineMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: captionFineManifest,
}],
@@ -29,4 +29,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/caption-fine/src/component.ts b/packages/caption-fine/src/component.ts
index 458ac0fd..654aef31 100644
--- a/packages/caption-fine/src/component.ts
+++ b/packages/caption-fine/src/component.ts
@@ -6,7 +6,7 @@ import type { StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
import { captionFineProducers } from "./manifest.js";
-import { renderFineCaption, renderFineCaptionImplementationDigest } from "./render.js";
+import { renderFineCaption } from "./render.js";
function inline<T>(value: StoredValue | undefined, subject: string): T {
if (value?.kind !== "inline") throw new Error(`${subject} must be inline`);
@@ -16,7 +16,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
export const captionFineComponent = {
producers: [{
producer: captionFineProducers.render,
- implementationDigest: renderFineCaptionImplementationDigest,
handler: ({ inputs }) => ({
outputs: { track: { kind: "inline", value: canonicalize(renderFineCaption(
inline<TimedCaptionProjection>(inputs.caption?.value, "TimedCaptionProjection"),
diff --git a/packages/caption-fine/src/index.ts b/packages/caption-fine/src/index.ts
index d50718e2..1a7ce53a 100644
--- a/packages/caption-fine/src/index.ts
+++ b/packages/caption-fine/src/index.ts
@@ -1,13 +1,7 @@
export { captionFineComponent } from "./component.js";
export { fineCaptionTrackFragment } from "./fragment.js";
-export {
- captionFineManifest, captionFineMarkupSurfaces,
- captionFineModuleRef,
- captionFineProducers,
- captionFineStyleSurfaceImplementationDigest,
- captionFineTrackSurfaceImplementationDigest,
-} from "./manifest.js";
-export { renderFineCaption, renderFineCaptionImplementationDigest } from "./render.js";
+export { captionFineManifest, captionFineMarkupSurfaces, captionFineModuleRef, captionFineProducers } from "./manifest.js";
+export { renderFineCaption } from "./render.js";
export {
fineCaptionOneShotMotions,
fineCaptionOptionalRecipeProperties,
diff --git a/packages/caption-fine/src/manifest.ts b/packages/caption-fine/src/manifest.ts
index c94695bf..1eedcb83 100644
--- a/packages/caption-fine/src/manifest.ts
+++ b/packages/caption-fine/src/manifest.ts
@@ -7,33 +7,27 @@ import { semanticMapDependency } from "@narratage/semantic-map";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef } from "@narratage/protocol";
-import { renderFineCaptionImplementationDigest } from "./render.js";
-
export const captionFineModuleRef = { name: "@narratage/caption-fine", version: "1" } as const;
export const captionFineProducers = {
render: { module: captionFineModuleRef, name: "render-fine-caption" },
} satisfies Record<string, ProducerRef>;
-export const captionFineStyleSurfaceImplementationDigest = digestOf("@narratage/caption-fine/full-orthogonal-style-surface@1");
-export const captionFineTrackSurfaceImplementationDigest = digestOf("@narratage/caption-fine/full-orthogonal-track-surface@1");
export const captionFineMarkupSurfaces = [
{
name: "style", tag: "Style", mode: "structured", outputs: [captionTypes.style],
- implementation: { digest: captionFineStyleSurfaceImplementationDigest },
},
{
name: "track", tag: "Track", mode: "structured", outputs: [compositionTypes.visualTrack],
- implementation: { digest: captionFineTrackSurfaceImplementationDigest },
},
] as const;
export const captionFineManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: captionFineModuleRef.name,
version: captionFineModuleRef.version,
dependencies: [
- { module: captionModuleRef, digest: digestOf(captionManifest) },
+ { module: captionModuleRef },
compositionDependency,
mediaDependency,
narrativeDependency,
@@ -52,6 +46,5 @@ export const captionFineManifest: ModuleManifest = {
],
outputs: [{ name: "track", type: compositionTypes.visualTrack }],
needs: [],
- implementation: { digest: renderFineCaptionImplementationDigest },
}],
};
diff --git a/packages/caption-fine/src/render.ts b/packages/caption-fine/src/render.ts
index e6a3e4b5..4fe6a71a 100644
--- a/packages/caption-fine/src/render.ts
+++ b/packages/caption-fine/src/render.ts
@@ -24,8 +24,6 @@ import type {
FineCaptionUnderline,
} from "./types.js";
-export const renderFineCaptionImplementationDigest = digestOf("@narratage/caption-fine/full-orthogonal-renderer-with-mute@1");
-
function clamp(value: number, minimum: number, maximum: number): number {
return Math.max(minimum, Math.min(maximum, value));
}
@@ -761,7 +759,7 @@ export function renderFineCaption(
}];
});
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: program.id,
presents,
});
diff --git a/packages/caption-gemini/package.json b/packages/caption-gemini/package.json
index 29af1414..893c84f4 100644
--- a/packages/caption-gemini/package.json
+++ b/packages/caption-gemini/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/caption-gemini/src/activation.ts b/packages/caption-gemini/src/activation.ts
index 1642150e..2d9c352a 100644
--- a/packages/caption-gemini/src/activation.ts
+++ b/packages/caption-gemini/src/activation.ts
@@ -5,8 +5,8 @@ import {
captionGeminiMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: captionGeminiManifest }],
components: [captionGeminiComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -15,4 +15,4 @@ export const svmlPackage = {
handler: decodeCaptionGeminiPlannerSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/caption-gemini/src/component.ts b/packages/caption-gemini/src/component.ts
index a6ae456c..af3cc05e 100644
--- a/packages/caption-gemini/src/component.ts
+++ b/packages/caption-gemini/src/component.ts
@@ -4,7 +4,7 @@ import type { CaptionDisplaySequence } from "@narratage/narrative";
import type { StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
-import { captionGeminiImplementationDigests, captionGeminiProducers, captionGeminiTypes } from "./manifest.js";
+import { captionGeminiProducers, captionGeminiTypes } from "./manifest.js";
import { verifyCaptionGeminiProgram } from "./program.js";
import { compileCaptionGeminiRequest, verifyCaptionGeminiRequest } from "./request.js";
import type { CaptionGeminiProgram, CaptionGeminiRequest } from "./types.js";
@@ -18,7 +18,6 @@ export const captionGeminiComponent = {
producers: [
{
producer: captionGeminiProducers.compile,
- implementationDigest: captionGeminiImplementationDigests.compile,
handler: ({ inputs }) => ({
outputs: {
request: {
@@ -35,7 +34,6 @@ export const captionGeminiComponent = {
},
{
producer: captionGeminiProducers.request,
- implementationDigest: captionGeminiImplementationDigests.request,
handler: ({ inputs }) => {
const request = inline<CaptionGeminiRequest>(inputs.request?.value, "CaptionGeminiRequest");
verifyCaptionGeminiRequest(request);
@@ -46,12 +44,10 @@ export const captionGeminiComponent = {
validators: [
{
type: captionGeminiTypes.program,
- implementationDigest: captionGeminiImplementationDigests.programValidator,
handler: ({ value }) => verifyCaptionGeminiProgram(inline(value, "CaptionGeminiProgram")),
},
{
type: captionGeminiTypes.request,
- implementationDigest: captionGeminiImplementationDigests.requestValidator,
handler: ({ value }) => verifyCaptionGeminiRequest(inline(value, "CaptionGeminiRequest")),
},
],
diff --git a/packages/caption-gemini/src/index.ts b/packages/caption-gemini/src/index.ts
index 87136ffa..08c37579 100644
--- a/packages/caption-gemini/src/index.ts
+++ b/packages/caption-gemini/src/index.ts
@@ -1,16 +1,6 @@
export { captionGeminiComponent } from "./component.js";
export { captionGeminiPlanningFragment } from "./fragment.js";
-export {
- captionGeminiCapabilities,
- captionGeminiImplementationDigests,
- captionGeminiManifest, captionGeminiMarkupSurfaces,
- captionGeminiManifestDigest,
- captionGeminiModuleRef,
- captionGeminiProducers,
- captionGeminiProgramSchema,
- captionGeminiRequestSchema,
- captionGeminiTypes,
-} from "./manifest.js";
+export { captionGeminiCapabilities, captionGeminiManifest, captionGeminiMarkupSurfaces, captionGeminiModuleRef, captionGeminiProducers, captionGeminiTypes } from "./manifest.js";
export { sealCaptionGeminiPlan, verifyCaptionGeminiPlan } from "./plan.js";
export { sealCaptionGeminiProgram, verifyCaptionGeminiProgram } from "./program.js";
export {
diff --git a/packages/caption-gemini/src/manifest.ts b/packages/caption-gemini/src/manifest.ts
index 233b2e57..36a769cb 100644
--- a/packages/caption-gemini/src/manifest.ts
+++ b/packages/caption-gemini/src/manifest.ts
@@ -1,7 +1,6 @@
import { captionManifest, captionModuleRef, captionTypes } from "@narratage/caption";
import { narrativeDependency, narrativeTypes } from "@narratage/narrative";
-import { digestOf } from "@narratage/protocol";
-import type { CapabilityRef, ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
+import type { CapabilityRef, ModuleManifest, ProducerRef, TypeRef } from "@narratage/protocol";
export const captionGeminiModuleRef = { name: "@narratage/caption-gemini", version: "1" } as const;
export const captionGeminiTypes = {
@@ -15,92 +14,26 @@ export const captionGeminiProducers = {
compile: { module: captionGeminiModuleRef, name: "compile-caption-gemini-request" },
request: { module: captionGeminiModuleRef, name: "request-caption-gemini-plan" },
} satisfies Record<string, ProducerRef>;
-export const captionGeminiImplementationDigests = {
- compile: digestOf("@narratage/caption-gemini/compile-readable-atoms-structured-fields@1"),
- request: digestOf("@narratage/caption-gemini/request-readable-atoms-plan@1"),
- programValidator: digestOf("@narratage/caption-gemini/validate-program@1"),
- requestValidator: digestOf("@narratage/caption-gemini/validate-readable-atoms-request@1"),
- plannerSurface: digestOf("@narratage/caption-gemini/display-planner-surface@1"),
-} as const;
-
-const string = { kind: "string", minLength: 1 } as const satisfies ValueSchema;
-const nonNegativeInteger = { kind: "number", integer: true, minimum: 0 } as const satisfies ValueSchema;
-const object = (
- fields: Readonly<Record<string, { readonly schema: ValueSchema; readonly optional?: boolean }>>,
-): ValueSchema => ({ kind: "object", fields });
-const model = { kind: "string", enum: ["gemini-2.5-flash", "gemini-3.1-pro-preview"] } as const satisfies ValueSchema;
-const fieldValueSchema: ValueSchema = {
- kind: "oneOf",
- variants: [
- object({ kind: { schema: { kind: "literal", value: "boolean" } } }),
- object({
- kind: { schema: { kind: "literal", value: "enum" } },
- values: { schema: { kind: "array", minItems: 1, items: string } },
- }),
- object({
- kind: { schema: { kind: "literal", value: "number" } },
- minimum: { schema: { kind: "number" }, optional: true },
- maximum: { schema: { kind: "number" }, optional: true },
- }),
- ],
-};
-const fieldDeclaration = object({
- id: { schema: string }, value: { schema: fieldValueSchema }, instruction: { schema: string },
- minimumPerCue: { schema: nonNegativeInteger }, maximumPerCue: { schema: nonNegativeInteger },
-});
-const planningRun = object({
- id: { schema: string }, styleId: { schema: string },
- atoms: { schema: { kind: "array", minItems: 1, items: object({
- id: { schema: string }, words: { schema: { kind: "array", minItems: 1, items: object({
- id: { schema: string }, text: { schema: string },
- }) } },
- }) } },
- cueMinimumWords: { schema: nonNegativeInteger }, cueMaximumWords: { schema: nonNegativeInteger },
- cueInstruction: { schema: string }, fields: { schema: { kind: "array", items: fieldDeclaration } },
-});
-export const captionGeminiProgramSchema: ValueSchema = object({
-
- model: { schema: model },
-});
-export const captionGeminiRequestSchema: ValueSchema = object({
- model: { schema: model },
- runs: { schema: { kind: "array", minItems: 1, items: planningRun } },
- systemInstruction: { schema: string }, prompt: { schema: string },
- temperature: { schema: { kind: "literal", value: 0.2 } },
-});
-
-function ownedType(name: string, schema: ValueSchema, digestValue: ReturnType<typeof digestOf>) {
- return {
- name,
- schema,
- validator: {
- implementation: { digest: digestValue },
- },
- };
-}
export const captionGeminiMarkupSurfaces = [{
name: "planner",
tag: "Planner",
mode: "structured",
outputs: [captionGeminiTypes.program, captionTypes.plan],
- implementation: {
- digest: captionGeminiImplementationDigests.plannerSurface,
- },
}] as const;
export const captionGeminiManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: captionGeminiModuleRef.name,
version: captionGeminiModuleRef.version,
dependencies: [
narrativeDependency,
- { module: captionModuleRef, digest: digestOf(captionManifest) },
+ { module: captionModuleRef },
],
types: [
- ownedType(captionGeminiTypes.program.name, captionGeminiProgramSchema, captionGeminiImplementationDigests.programValidator),
- ownedType(captionGeminiTypes.request.name, captionGeminiRequestSchema, captionGeminiImplementationDigests.requestValidator),
+ { name: captionGeminiTypes.program.name },
+ { name: captionGeminiTypes.request.name },
],
capabilities: [{ name: captionGeminiCapabilities.plan.name, returns: captionTypes.plan }],
producers: [
@@ -113,20 +46,12 @@ export const captionGeminiManifest: ModuleManifest = {
],
outputs: [{ name: "request", type: captionGeminiTypes.request }],
needs: [],
- implementation: {
- digest: captionGeminiImplementationDigests.compile,
- },
},
{
name: captionGeminiProducers.request.name,
inputs: [{ name: "request", type: captionGeminiTypes.request }],
outputs: [],
needs: [{ name: "plan", capability: captionGeminiCapabilities.plan, returns: captionTypes.plan }],
- implementation: {
- digest: captionGeminiImplementationDigests.request,
- },
},
],
};
-
-export const captionGeminiManifestDigest = digestOf(captionGeminiManifest);
diff --git a/packages/caption/package.json b/packages/caption/package.json
index fbe78f84..2499aa6a 100644
--- a/packages/caption/package.json
+++ b/packages/caption/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/caption/src/activation.ts b/packages/caption/src/activation.ts
index 38ded202..9351f11d 100644
--- a/packages/caption/src/activation.ts
+++ b/packages/caption/src/activation.ts
@@ -5,8 +5,8 @@ import {
captionMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: captionManifest }],
components: [captionComponent],
hostFacets: [
@@ -14,4 +14,4 @@ export const svmlPackage = {
declaration: captionMarkupSurfaces.find((item) => item.name === "program")!, handler: decodeCaptionProgramSurface }),
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/caption/src/component.ts b/packages/caption/src/component.ts
index 06282d53..bb17ee69 100644
--- a/packages/caption/src/component.ts
+++ b/packages/caption/src/component.ts
@@ -4,12 +4,7 @@ import type { CompleteSemanticMap } from "@narratage/semantic-map";
import type { StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
-import {
- captionPlanImplementationDigest,
- captionProducers,
- captionTypes,
- captionValidatorDigests,
-} from "./manifest.js";
+import { captionProducers, captionTypes } from "./manifest.js";
import { assertCaptionPlan } from "./plan.js";
import { assertCaptionProgram, assertCaptionStyle } from "./style.js";
import { temporalizeCaptionPlan } from "./temporalize.js";
@@ -31,7 +26,6 @@ export const captionComponent = {
producers: [
{
producer: captionProducers.temporalizePlan,
- implementationDigest: captionPlanImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
caption: {
@@ -52,22 +46,18 @@ export const captionComponent = {
validators: [
{
type: captionTypes.style,
- implementationDigest: captionValidatorDigests.style,
handler: ({ value }) => assertCaptionStyle(inline<CaptionStyleIntent>(value, "CaptionStyle")),
},
{
type: captionTypes.program,
- implementationDigest: captionValidatorDigests.program,
handler: ({ value }) => assertCaptionProgram(inline<CaptionProgram>(value, "CaptionProgram")),
},
{
type: captionTypes.plan,
- implementationDigest: captionValidatorDigests.plan,
handler: ({ value }) => assertCaptionPlan(inline(value, "CaptionPlan")),
},
{
type: captionTypes.timedProjection,
- implementationDigest: captionValidatorDigests.timedProjection,
handler: ({ value }) => assertTimedCaptionProjection(
inline<TimedCaptionProjection>(value, "TimedCaptionProjection"),
),
diff --git a/packages/caption/src/index.ts b/packages/caption/src/index.ts
index cc1fa78b..0a225a2d 100644
--- a/packages/caption/src/index.ts
+++ b/packages/caption/src/index.ts
@@ -7,19 +7,7 @@ export {
} from "./display.js";
export { captionComponent } from "./component.js";
export { plannedCaptionTimingFragment } from "./fragment.js";
-export {
- captionProgramSchema,
- captionProgramSurfaceImplementationDigest,
- captionPlanImplementationDigest,
- captionPlanSchema,
- captionStyleSchema,
- captionManifest, captionMarkupSurfaces,
- captionModuleRef,
- captionProducers,
- captionTypes,
- captionValidatorDigests,
- timedCaptionProjectionSchema,
-} from "./manifest.js";
+export { captionProgramSchema, captionPlanSchema, captionStyleSchema, captionManifest, captionMarkupSurfaces, captionModuleRef, captionProducers, captionTypes, timedCaptionProjectionSchema } from "./manifest.js";
export { decodeCaptionProgramSurface } from "./surface.js";
export { assertCaptionPlan, assertCaptionPlanForProgram, sealCaptionPlan } from "./plan.js";
export {
diff --git a/packages/caption/src/manifest.ts b/packages/caption/src/manifest.ts
index 3e1e9461..47b8ebd1 100644
--- a/packages/caption/src/manifest.ts
+++ b/packages/caption/src/manifest.ts
@@ -13,14 +13,6 @@ export const captionTypes = {
plan: { module: captionModuleRef, name: "CaptionPlan" },
timedProjection: { module: captionModuleRef, name: "TimedCaptionProjection" },
} satisfies Record<string, TypeRef>;
-export const captionPlanImplementationDigest = digestOf("@narratage/caption/temporalize-whole-atoms-to-frames-with-mute@1");
-export const captionValidatorDigests = {
- style: digestOf("@narratage/caption/validate-style@1"),
- program: digestOf("@narratage/caption/validate-display-program-with-mute@1"),
- plan: digestOf("@narratage/caption/validate-atom-plan@1"),
- timedProjection: digestOf("@narratage/caption/validate-frame-timed-atoms@1"),
-} as const;
-export const captionProgramSurfaceImplementationDigest = digestOf("@narratage/caption/display-program-surface-with-mute@1");
const string = { kind: "string", minLength: 1 } as const;
const number = { kind: "number", minimum: 0 } as const;
@@ -104,29 +96,19 @@ export const captionProgramSchema: ValueSchema = object({
export const captionMarkupSurfaces = [{
name: "program", tag: "Program", mode: "structured", outputs: [captionTypes.program],
- implementation: { digest: captionProgramSurfaceImplementationDigest },
}] as const;
export const captionManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: captionModuleRef.name,
version: captionModuleRef.version,
dependencies: [narrativeDependency, semanticMapDependency],
types: [
- { name: captionTypes.style.name, schema: captionStyleSchema, validator: { implementation: {
- digest: captionValidatorDigests.style,
- } } },
- { name: captionTypes.program.name, schema: captionProgramSchema, validator: { implementation: {
- digest: captionValidatorDigests.program,
- } } },
- { name: captionTypes.plan.name, schema: captionPlanSchema, validator: { implementation: {
- digest: captionValidatorDigests.plan,
- } } },
- { name: captionTypes.timedProjection.name, schema: timedCaptionProjectionSchema,
- validator: { implementation: {
- digest: captionValidatorDigests.timedProjection,
- } } },
+ { name: captionTypes.style.name },
+ { name: captionTypes.program.name },
+ { name: captionTypes.plan.name },
+ { name: captionTypes.timedProjection.name },
],
capabilities: [],
producers: [
@@ -140,7 +122,6 @@ export const captionManifest: ModuleManifest = {
{ name: "plan", type: captionTypes.plan },
],
outputs: [{ name: "caption", type: captionTypes.timedProjection }], needs: [],
- implementation: { digest: captionPlanImplementationDigest },
},
],
};
diff --git a/packages/cli/README.md b/packages/cli/README.md
index aad63b69..0208d17e 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -2,14 +2,14 @@
Domain-neutral command engine for Build compilation, execution, inspection and egress.
-The engine implements `lock-packages`, `check`, `plan`, `build`, `status`, `builds`, `inspect`, `get`
+The engine implements `check`, `plan`, `build`, `status`, `builds`, `inspect`, `get`
and `cancel`, but owns no default author vocabulary, Frontend or Provider adapter. Its caller
must pass one explicit `CliDistribution`:
```ts
type CliDistribution = {
packageRoot?: string;
- bootstrapPackages: readonly NodePackageBinding[];
+ bootstrapPackages: readonly LoadedPackage[];
createCompiler(options): NodeCompiler;
runtimeProfileRevision(path): Promise<string>;
createRuntimeFromConfig(path): Promise<CliRuntime>;
@@ -18,7 +18,8 @@ type CliDistribution = {
A Distribution is trusted application assembly, not Core data or source-import authority. The
official `@narratage/video-cli` selects `@narratage/compiler-markup-node` and the current video Runtime
-adapters, but no author-package aggregate. A package lock selects the exact Author/Run packages.
+adapters, but no author-package aggregate. Source imports select Author and Run packages from the
+project's installed dependencies.
Another domain can reuse this command engine without installing any video package.
The Worker lifecycle compares only the opaque revision supplied by the Distribution; the command
engine does not parse a Runtime Profile or know which files that Profile considers deployment input.
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4d33e802..ab242512 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -15,10 +15,10 @@
"@narratage/protocol": "workspace:*",
"@narratage/run": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"@narratage/source": "workspace:*"
},
"devDependencies": {
- "@narratage/local": "workspace:*"
+ "@narratage/runtime-local": "workspace:*"
}
}
diff --git a/packages/cli/src/distribution.ts b/packages/cli/src/distribution.ts
index 79ea9d34..77b0d450 100644
--- a/packages/cli/src/distribution.ts
+++ b/packages/cli/src/distribution.ts
@@ -1,6 +1,6 @@
import type { NodeCompiler } from "@narratage/compiler-node";
-import type { NodePackageBinding, NodePackageContribution } from "@narratage/package-loader-node";
-import type { NodeRuntimeHost } from "@narratage/runtime-adapter-node";
+import type { LoadedPackage, NodePackageContribution } from "@narratage/package-loader-node";
+import type { NodeRuntimeHost } from "@narratage/runtime-host-node";
export type CliCompilerOptions = {
/** Canonical containment boundary for Author and Run Sources plus source assets. */
@@ -17,10 +17,13 @@ export type CliCompilerOptions = {
* It is Host configuration, never Core state or source-import authority.
*/
export type CliDistribution = {
- /** Host location from which installed locked packages resolve. A caller may explicitly override it. */
- readonly packageRoot?: string;
+ /**
+ * Installation-local fallback for development checkouts and embedded Distributions.
+ * A real project with package.json always resolves its own installed capability packages first.
+ */
+ readonly fallbackPackageRoot?: string;
/** Explicit Host bootstrap packages; never inferred from Source contents. */
- readonly bootstrapPackages: readonly NodePackageBinding[];
+ readonly bootstrapPackages: readonly LoadedPackage[];
createCompiler(options: CliCompilerOptions): NodeCompiler;
/**
* Read the self-described Run Source and its Author Source closure, then return
@@ -32,11 +35,11 @@ export type CliDistribution = {
discoverSourcePackages?(path: string, options?: {
readonly workspaceRoot?: string;
/** Exact packages already trusted for the current fixed-point discovery pass. */
- readonly packages?: readonly NodePackageBinding[];
+ readonly packages?: readonly LoadedPackage[];
}): Promise<{
readonly selected: readonly string[];
readonly logical?: readonly import("@narratage/package-loader-node").LogicalPackageAddress[];
}>;
- /** Load the Runtime Host selected by the Profile's locked `runtime.use` package. */
- openRuntimeHost(path: string): Promise<NodeRuntimeHost>;
+ /** Load the Runtime Host selected by the Profile's `runtime.use` package. */
+ openRuntimeHost(path: string, options: { readonly packageRoot: string }): Promise<NodeRuntimeHost>;
};
diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts
index a2c2bf98..474f0fc8 100644
--- a/packages/cli/src/main.ts
+++ b/packages/cli/src/main.ts
@@ -1,22 +1,17 @@
import { randomUUID } from "node:crypto";
-import { dirname, isAbsolute, relative, resolve, sep } from "node:path";
+import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
import { readFile, stat } from "node:fs/promises";
import type { NodeCompiledSourceClosure } from "@narratage/compiler-node";
-import type { NodeRuntimeHost } from "@narratage/runtime-adapter-node";
+import type { NodeRuntimeHost } from "@narratage/runtime-host-node";
import { plannedNeeds } from "@narratage/runtime";
import type { BuildCatalogDescriptor, CapacityReservation, OperationProgress } from "@narratage/runtime";
import type { BuildState, CapabilityRef, TypeRef } from "@narratage/protocol";
import { parseSourceHeader } from "@narratage/source";
import {
- createNodePackageLock,
- createNodePackageInventory,
- loadNodePackageSet,
- readNodePackageLock,
- selectNodePackageSpecifiers,
- writeNodePackageLock,
+ loadNodePackageSelection,
} from "@narratage/package-loader-node";
-import type { LoadedNodePackageSet, NodePackageLock } from "@narratage/package-loader-node";
+import type { LoadedPackage } from "@narratage/package-loader-node";
import {
acceptedArchivedOutputs,
@@ -42,12 +37,8 @@ import type {
} from "./runtime-port.js";
import { writeCliHelp, writeCliOutput } from "./output.js";
import type { CliColorMode, CliIo } from "./output.js";
-import { withPackageLockEdit } from "./package-lock-edit.js";
import { narratageHostStateRoot, narratageProjectStateRoot } from "./paths.js";
-import {
- createDiscoveredSourceInventory,
- loadDiscoveredSourcePackages,
-} from "./source-packages.js";
+import { loadDiscoveredSourcePackages } from "./source-packages.js";
import {
clearRuntimeProfile,
findRuntimeProfile,
@@ -62,17 +53,12 @@ type ParsedArgs = {
/** Canonical containment boundary for Author and Run Sources plus source assets. */
readonly workspaceRoot: string | undefined;
readonly assetRoots: readonly string[];
- /** Host directory whose node_modules contains the packages named by a package lock. */
+ /** Host directory whose node_modules contains selected packages. */
readonly packageRoot: string | undefined;
readonly runtime: string | undefined;
readonly follow: boolean;
readonly maxWaitMs: number | undefined;
- readonly packageLock: string | undefined;
readonly packages: readonly string[];
- readonly addPackages: readonly string[];
- readonly removePackages: readonly string[];
- readonly refresh: boolean;
- readonly verifyPackageLock: boolean;
readonly record: string | undefined;
readonly output: string | undefined;
readonly name: string | undefined;
@@ -96,12 +82,12 @@ type ParsedArgs = {
readonly seenOptions: readonly string[];
};
-async function nearestSourcePackageLock(start: string): Promise<string | undefined> {
+async function nearestProjectPackageRoot(start: string): Promise<string | undefined> {
let directory = resolve(start);
while (true) {
- const candidate = resolve(directory, "svml.packages.lock");
+ const candidate = resolve(directory, "package.json");
try {
- if ((await stat(candidate)).isFile()) return candidate;
+ if ((await stat(candidate)).isFile()) return directory;
} catch (error) {
if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) throw error;
}
@@ -111,10 +97,16 @@ async function nearestSourcePackageLock(start: string): Promise<string | undefin
}
}
+async function defaultPackageRoot(
+ projectStart: string,
+ fallback: string | undefined,
+): Promise<string> {
+ return await nearestProjectPackageRoot(projectStart) ?? fallback ?? resolve(projectStart);
+}
+
function parseArgs(argv: readonly string[]): ParsedArgs {
const [command, ...tail] = argv;
- const scoped = command === "programs" || command === "runtime" || command === "auth"
- || command === "packages";
+ const scoped = command === "programs" || command === "runtime" || command === "auth";
const action = scoped ? tail[0] : undefined;
const positional = scoped ? tail.slice(1) : tail;
const noFile = command === "builds" || command === "queue" || command === "paths";
@@ -127,12 +119,7 @@ function parseArgs(argv: readonly string[]): ParsedArgs {
let runtime: string | undefined;
let follow = false;
let maxWaitMs: number | undefined;
- let packageLock: string | undefined;
const packages: string[] = [];
- const addPackages: string[] = [];
- const removePackages: string[] = [];
- let refresh = false;
- let verifyPackageLock = false;
let record: string | undefined;
let output: string | undefined;
let name: string | undefined;
@@ -155,8 +142,8 @@ function parseArgs(argv: readonly string[]): ParsedArgs {
const item = rest[index]!;
if (item.startsWith("--")) {
const repeatable = [
- "--package", "--add", "--remove", "--json", "--jsonl", "--watch", "--verbose", "--debug",
- "--no-color", "--refresh", "--follow", "--apply", "--no-programs", "--asset-root",
+ "--package", "--json", "--jsonl", "--watch", "--verbose", "--debug",
+ "--no-color", "--follow", "--apply", "--no-programs", "--asset-root",
].includes(item);
if (!repeatable && seenOptions.has(item)) throw new Error(`${item} cannot be repeated`);
seenOptions.add(item);
@@ -214,13 +201,6 @@ function parseArgs(argv: readonly string[]): ParsedArgs {
index += 1;
continue;
}
- if (item === "--package-lock") {
- const value = rest[index + 1];
- if (value === undefined || value.startsWith("--")) throw new Error("--package-lock requires a lock file");
- packageLock = resolve(value);
- index += 1;
- continue;
- }
if (item === "--package") {
const value = rest[index + 1];
if (value === undefined || value.startsWith("--")) throw new Error("--package requires an installed package name");
@@ -228,28 +208,6 @@ function parseArgs(argv: readonly string[]): ParsedArgs {
index += 1;
continue;
}
- if (item === "--add") {
- const value = rest[index + 1];
- if (value === undefined || value.startsWith("--")) throw new Error("--add requires an installed package name");
- addPackages.push(value);
- index += 1;
- continue;
- }
- if (item === "--remove") {
- const value = rest[index + 1];
- if (value === undefined || value.startsWith("--")) throw new Error("--remove requires a selected package name");
- removePackages.push(value);
- index += 1;
- continue;
- }
- if (item === "--refresh") {
- refresh = true;
- continue;
- }
- if (item === "--verify") {
- verifyPackageLock = true;
- continue;
- }
if (item === "--runtime") {
const value = rest[index + 1];
if (value === undefined || value.startsWith("--")) throw new Error("--runtime requires a Runtime Profile");
@@ -364,12 +322,7 @@ function parseArgs(argv: readonly string[]): ParsedArgs {
runtime,
follow,
maxWaitMs,
- packageLock,
packages,
- addPackages,
- removePackages,
- refresh,
- verifyPackageLock,
record,
output,
name,
@@ -396,16 +349,10 @@ function assertCommandOptions(args: ParsedArgs): void {
const allowed = new Set(common);
const add = (...items: readonly string[]): void => { for (const item of items) allowed.add(item); };
switch (args.command) {
- case "lock-packages":
- add("--package", "--add", "--remove", "--refresh", "--verify", "--package-root");
- break;
- case "packages":
- add("--runtime", "--workspace", "--package-root");
- break;
case "programs":
// This command has older, more specific diagnostics for deployment-selection
// flags and waiting on status/down; let its handler render those repairs.
- add("--max-wait-ms", "--runtime", "--package-lock", "--package-root", "--package", "--apply");
+ add("--max-wait-ms", "--runtime", "--apply");
break;
case "runtime":
add("--runtime");
@@ -431,6 +378,9 @@ function assertCommandOptions(args: ParsedArgs): void {
add("--runtime", "--reason");
break;
case "status":
+ add("--runtime", "--watch");
+ if (args.watch) add("--max-wait-ms");
+ break;
case "builds":
case "history":
case "inspect":
@@ -439,10 +389,10 @@ function assertCommandOptions(args: ParsedArgs): void {
break;
case "check":
case "plan":
- add("--runtime", "--package-lock", "--package-root", "--workspace", "--asset-root");
+ add("--runtime", "--package-root", "--workspace", "--asset-root");
break;
case "build":
- add("--runtime", "--package-lock", "--package-root", "--workspace", "--asset-root", "--follow",
+ add("--runtime", "--package-root", "--workspace", "--asset-root", "--follow",
"--max-wait-ms", "--no-programs");
break;
}
@@ -462,10 +412,6 @@ function assertCommandOptions(args: ParsedArgs): void {
function usage(): string {
return [
"usage:",
- " narratage lock-packages <lock> --package name [...] [--package-root directory] # exact create/replace",
- " narratage lock-packages <lock> (--add name [...] | --remove name [...]) [--package-root directory]",
- " narratage lock-packages <lock> (--refresh | --verify) [--package-root directory]",
- " narratage packages sync <run-source> [--runtime <runtime-profile>] [--workspace workspace]",
" narratage doctor [<runtime-profile>]",
" narratage programs up|down|status [<runtime-profile>] [--max-wait-ms milliseconds]",
" narratage runtime use <runtime-profile>",
@@ -473,10 +419,10 @@ function usage(): string {
" narratage runtime up|status|logs|down [<runtime-profile>]",
" narratage queue [--runtime profile.json] [--watch]",
" narratage gc [<runtime-profile>] [--apply]",
- " narratage check <self-described-source> [--runtime profile.json] [--package-lock file] [--workspace workspace] [--asset-root directory]",
- " narratage plan <run-source> [--runtime profile.json] [--package-lock file] [--workspace workspace] [--asset-root directory]",
+ " narratage check <self-described-source> [--runtime profile.json] [--workspace workspace] [--asset-root directory]",
+ " narratage plan <run-source> [--runtime profile.json] [--workspace workspace] [--asset-root directory]",
" narratage build <run-source> [--runtime profile.json] [--workspace workspace] [--asset-root directory] [--follow] [--no-programs]",
- " narratage status <build-id> [--runtime profile.json]",
+ " narratage status <build-id> [--runtime profile.json] [--watch]",
" narratage builds [--runtime profile.json]",
" narratage history [source-output-name] [--runtime profile.json] [--source author.svml]",
" narratage inspect <build-id> [--runtime profile.json]",
@@ -502,7 +448,7 @@ function createCatalogDescriptor(options: {
return { name: item.name, ref: item.ref };
});
return {
- format: "svml.build-catalog-descriptor@1",
+ format: "narratage.build-catalog-descriptor@1",
core: options.core,
source: {
path: resolve(options.source),
@@ -562,7 +508,7 @@ function capabilityName(capability: CapabilityRef): string {
async function preflightPlan(
host: NodeRuntimeHost,
state: BuildState,
- implementationPackages?: LoadedNodePackageSet,
+ implementationPackages?: readonly LoadedPackage[],
) {
const capabilities = demandedCapabilities(state);
const result = await host.doctor({
@@ -594,7 +540,7 @@ function assertPreflight(
async function loadRuntime(
host: NodeRuntimeHost,
- implementationPackages?: LoadedNodePackageSet,
+ implementationPackages?: readonly LoadedPackage[],
): Promise<CliRuntime> {
return await host.createRuntime({
...(implementationPackages === undefined ? {} : { implementationPackages }),
@@ -642,23 +588,23 @@ function formatOperationProgress(progress: OperationProgress): string {
return `${progress.phase} · ${amount}${progress.unit === undefined ? "" : ` ${progress.unit}`}`;
}
-type QueueRouteSummary = {
- readonly authority: string;
- readonly route: string;
+type QueueLaneSummary = {
+ readonly pool: string;
+ readonly lane: string;
readonly queued: number;
readonly active: number;
readonly inFlight: number;
};
/** Derive the Provider → capability view from generic tickets; no model registry participates. */
-function summarizeQueueRoutes(capacity: readonly CapacityReservation[]): readonly QueueRouteSummary[] {
- const groups = new Map<string, { authority: string; route: string; queued: number; active: number; inFlight: number }>();
+function summarizeQueueLanes(capacity: readonly CapacityReservation[]): readonly QueueLaneSummary[] {
+ const groups = new Map<string, { pool: string; lane: string; queued: number; active: number; inFlight: number }>();
for (const ticket of capacity) {
if (ticket.queue === undefined) continue;
- const key = `${ticket.queue.authority}\u0000${ticket.queue.route}`;
+ const key = `${ticket.queue.pool}\u0000${ticket.queue.lane}`;
const group = groups.get(key) ?? {
- authority: ticket.queue.authority,
- route: ticket.queue.route,
+ pool: ticket.queue.pool,
+ lane: ticket.queue.lane,
queued: 0,
active: 0,
inFlight: 0,
@@ -669,18 +615,18 @@ function summarizeQueueRoutes(capacity: readonly CapacityReservation[]): readonl
groups.set(key, group);
}
return [...groups.values()].sort((left, right) =>
- left.authority.localeCompare(right.authority) || left.route.localeCompare(right.route));
+ left.pool.localeCompare(right.pool) || left.lane.localeCompare(right.lane));
}
-function queueRouteLines(groups: readonly QueueRouteSummary[]): readonly string[] {
+function queueLaneLines(groups: readonly QueueLaneSummary[]): readonly string[] {
const lines: string[] = [];
- let authority: string | undefined;
+ let pool: string | undefined;
for (const group of groups) {
- if (group.authority !== authority) {
- authority = group.authority;
- lines.push(authority);
+ if (group.pool !== pool) {
+ pool = group.pool;
+ lines.push(pool);
}
- lines.push(` ${group.route}: queued ${group.queued} · active ${group.active} · remote ${group.inFlight}`);
+ lines.push(` ${group.lane}: queued ${group.queued} · active ${group.active} · remote ${group.inFlight}`);
}
return lines;
}
@@ -702,7 +648,7 @@ function inlineValuePreview(value: unknown, limit = 240): string {
}
async function observeBuild(
- runtime: CliRuntime,
+ runtime: Pick<CliRuntimeArchiveControl, "activity" | "status">,
initial: CliBuildSubmission,
options: {
readonly maxWaitMs?: number;
@@ -747,7 +693,7 @@ async function observeBuild(
if (worker.state !== "running") {
throw new Error(
`Runtime Worker is ${worker.state}; Build ${current.id} remains durable. `
- + "Run narratage runtime up, then inspect the same Build again",
+ + `Run narratage runtime up, then run narratage status ${current.id} --watch again`,
);
}
}
@@ -802,8 +748,7 @@ type RuntimeArchiveView = Pick<CliRuntimeArchiveControl, "status" | "close">;
/**
* A Run Source needs the archive only when it names a historical Build Candidate.
- * Delay Store assembly until that edge is actually resolved, while still letting
- * the Runtime Profile single-source the author package lock for every plan.
+ * Delay Store assembly until that edge is actually resolved.
*/
function lazyRuntimeArchive(
host: NodeRuntimeHost,
@@ -834,6 +779,15 @@ export async function runCli(
return;
}
let args = parseArgs(argv);
+ let selectedRuntimeProjectRoot: string | undefined;
+ const commandProjectRoot = (): string => args.workspaceRoot
+ ?? selectedRuntimeProjectRoot
+ ?? ((args.command === "check" || args.command === "plan" || args.command === "build"
+ || args.command === "packages") && args.file !== undefined
+ ? dirname(resolve(args.file))
+ : process.cwd());
+ const packageRootForProject = async (projectRoot = commandProjectRoot()): Promise<string> =>
+ args.packageRoot ?? await defaultPackageRoot(projectRoot, distribution.fallbackPackageRoot);
const writeOperational = (
machine: unknown,
title: string,
@@ -859,24 +813,23 @@ export async function runCli(
io.write(` · ${verb} ${event.id}\n`);
};
const runtimeHosts = new Map<string, Promise<NodeRuntimeHost>>();
- const runtimeHost = async (path: string): Promise<NodeRuntimeHost> => {
+ const runtimeHost = async (path: string, requestedPackageRoot?: string): Promise<NodeRuntimeHost> => {
const profile = resolve(path);
- let opened = runtimeHosts.get(profile);
+ const packageRoot = requestedPackageRoot ?? await packageRootForProject();
+ const key = `${profile}\u0000${packageRoot}`;
+ let opened = runtimeHosts.get(key);
if (opened === undefined) {
- opened = distribution.openRuntimeHost(profile);
- runtimeHosts.set(profile, opened);
+ opened = distribution.openRuntimeHost(profile, { packageRoot });
+ runtimeHosts.set(key, opened);
}
return await opened;
};
if (args.command === "_worker") {
if (args.file === undefined || args.readyFile === undefined) throw new Error("internal Worker launch is incomplete");
- const implementationPackages = args.packageLock === undefined
+ const implementationPackages = args.packages.length === 0
? undefined
- : await loadNodePackageSet(
- args.packageLock,
- args.packageRoot ?? distribution.packageRoot ?? dirname(args.packageLock),
- );
- await (await runtimeHost(args.file)).runWorker(args.readyFile, {
+ : await loadNodePackageSelection(args.packages, await packageRootForProject());
+ await (await runtimeHost(args.file, await packageRootForProject())).runWorker(args.readyFile, {
...(implementationPackages === undefined ? {} : { implementationPackages }),
});
return;
@@ -888,20 +841,15 @@ export async function runCli(
if (args.file === undefined) throw new Error("runtime use requires a Runtime Profile");
assertCommandOptions(args);
const profile = resolve(args.file);
- const packageSelection = await (await runtimeHost(profile)).resolvePackages();
const selected = await selectRuntimeProfile(args.workspaceRoot ?? process.cwd(), profile);
writeOperational({
format: "narratage.cli-runtime-selection@1",
profile: selected.profile,
project: selected.projectRoot,
selectionFile: selected.selectionFile,
- runtimePackageLock: packageSelection?.runtimePackageLock,
}, "Runtime selected", "success", [
["Profile", selected.profile],
["Project", selected.projectRoot],
- ...(packageSelection?.runtimePackageLock === undefined
- ? []
- : [["Runtime lock", packageSelection.runtimePackageLock] as const]),
]);
return;
}
@@ -928,10 +876,8 @@ export async function runCli(
|| args.command === "doctor" || args.command === "gc") && args.file !== undefined;
const runtimeWasExplicit = args.runtime !== undefined || positionalRuntime;
let runtimeNeedsHint = runtimeWasExplicit;
- let selectedRuntimeProjectRoot: string | undefined;
if (args.runtime === undefined && !positionalRuntime) {
- const sourceScoped = args.command === "check" || args.command === "plan" || args.command === "build"
- || args.command === "packages";
+ const sourceScoped = args.command === "check" || args.command === "plan" || args.command === "build";
const start = sourceScoped && args.file !== undefined ? dirname(resolve(args.file)) : process.cwd();
const selected = await findRuntimeProfile(start);
if (selected !== undefined) {
@@ -942,7 +888,7 @@ export async function runCli(
|| isAbsolute(cwdFromProject);
}
}
- const known = args.command === "lock-packages" || args.command === "packages" || args.command === "check" || args.command === "plan"
+ const known = args.command === "check" || args.command === "plan"
|| args.command === "build" || args.command === "status" || args.command === "builds"
|| args.command === "history"
|| args.command === "inspect" || args.command === "get" || args.command === "cancel"
@@ -956,11 +902,15 @@ export async function runCli(
if (!operational || (!fileOptional && args.file === undefined)) {
throw new Error(usage());
}
- if (args.watch && args.command !== "queue") throw new Error("--watch applies only to queue");
+ if (args.watch && args.command !== "queue" && args.command !== "status") {
+ throw new Error("--watch applies only to status or queue");
+ }
if (args.jsonl && (args.command !== "queue" || !args.watch)) {
throw new Error("--jsonl applies only to queue --watch");
}
- if (args.watch && args.json) throw new Error("queue --watch is a stream; use --jsonl instead of --json");
+ if (args.command === "queue" && args.watch && args.json) {
+ throw new Error("queue --watch is a stream; use --jsonl instead of --json");
+ }
if (args.noPrograms && args.command !== "build") {
throw new Error("--no-programs is only valid for build; no other command starts an external program");
}
@@ -972,24 +922,23 @@ export async function runCli(
const workspaceRoot = args.workspaceRoot
?? selectedRuntimeProjectRoot
?? (source === undefined ? process.cwd() : dirname(resolve(source)));
- const packageLock = await nearestSourcePackageLock(workspaceRoot);
- return await (await runtimeHost(profile)).controller({
+ const packageRoot = await packageRootForProject(workspaceRoot);
+ return await (await runtimeHost(profile, packageRoot)).controller({
workspaceRoot,
- ...(packageLock === undefined ? {} : { packageLock }),
- packageRoot: args.packageRoot ?? distribution.packageRoot ?? workspaceRoot,
+ packageRoot,
});
};
if (args.command === "paths") {
const projectRoot = selectedRuntimeProjectRoot ?? process.cwd();
- const runtimeSelection = args.runtime === undefined
+ const runtimePaths = args.runtime === undefined
? undefined
- : await (await runtimeHost(args.runtime)).resolvePackages();
+ : await (await runtimeHost(args.runtime)).resolvePaths();
const machine = {
format: "narratage.cli-paths@1" as const,
project: projectRoot,
projectState: narratageProjectStateRoot(projectRoot),
profile: args.runtime,
- runtimeData: runtimeSelection?.runtimeDataRoot,
+ runtimeData: runtimePaths?.runtimeDataRoot,
hostState: narratageHostStateRoot(),
};
writeOperational(machine, "Narratage paths", "info", [
@@ -1001,256 +950,8 @@ export async function runCli(
]);
return;
}
- if (args.command === "lock-packages") {
- const exact = args.packages.length > 0;
- const mutation = args.addPackages.length > 0 || args.removePackages.length > 0;
- const modes = [exact, mutation, args.refresh, args.verifyPackageLock].filter(Boolean).length;
- if (modes !== 1) {
- throw new Error(
- "lock-packages requires exactly one operation: an exact --package selection, --add/--remove, --refresh, or --verify",
- );
- }
- if (args.packageLock !== undefined) throw new Error("lock-packages does not accept --package-lock");
- if (args.workspaceRoot !== undefined) {
- throw new Error("lock-packages does not compile a Workspace; use --package-root to locate installed packages");
- }
- const output = resolve(args.file!);
- const packageRoot = args.packageRoot ?? distribution.packageRoot ?? dirname(output);
-
- if (args.verifyPackageLock) {
- const loaded = await loadNodePackageSet(output, packageRoot);
- writeOperational({
- ok: true,
- mode: "verify",
- packageLock: output,
- digest: loaded.lock.digest,
- selected: loaded.lock.selected,
- packages: loaded.lock.packages,
- }, "Package lock verified", "success", [
- ["Path", output], ["Selected", String(loaded.lock.selected.length)],
- ["Activated", String(loaded.lock.packages.length)], ["Digest", loaded.lock.digest],
- ]);
- return;
- }
-
- await withPackageLockEdit(output, async () => {
- let mode: "replace" | "mutate" | "refresh";
- let selected: readonly string[];
- let added: readonly string[] = [];
- let removed: readonly string[] = [];
- let previous: NodePackageLock | undefined;
- let retainedSelection: readonly string[] | undefined;
- if (exact) {
- mode = "replace";
- selected = [...new Set(args.packages)].sort();
- } else {
- const current = await readNodePackageLock(output);
- if (args.refresh) {
- mode = "refresh";
- selected = current.selected;
- } else {
- mode = "mutate";
- const additions = new Set(args.addPackages);
- const removals = new Set(args.removePackages);
- const conflict = [...additions].find((name) => removals.has(name));
- if (conflict !== undefined) {
- throw new Error(`${conflict} cannot be added and removed in the same package-lock transaction`);
- }
- const currentSet = new Set(current.selected);
- const missing = [...removals].find((name) => !currentSet.has(name));
- if (missing !== undefined) {
- throw new Error(`${missing} is not selected by ${output}; no package authority was removed`);
- }
- added = [...additions].filter((name) => !currentSet.has(name)).sort();
- removed = [...removals].sort();
- if (added.length === 0 && removed.length === 0) {
- writeOperational({
- ok: true,
- changed: false,
- mode,
- packageLock: output,
- digest: current.digest,
- selected: current.selected,
- added,
- removed,
- packages: current.packages,
- }, "Package lock unchanged", "info", [
- ["Path", output], ["Selected", String(current.selected.length)], ["Digest", current.digest],
- ]);
- return;
- }
- previous = current;
- retainedSelection = current.selected.filter((name) => !removals.has(name));
- for (const name of removals) currentSet.delete(name);
- for (const name of additions) currentSet.add(name);
- selected = [...currentSet].sort();
- }
- }
- const lock = await createNodePackageLock(selected, packageRoot,
- previous === undefined || retainedSelection === undefined
- ? {}
- : { retain: { from: previous, selected: retainedSelection } });
- const artifactKey = (item: { readonly name: string; readonly version: string }): string =>
- `${item.name}@${item.version}`;
- const packageKey = (item: NodePackageLock["packages"][number]): string =>
- `${item.package.name}@${item.package.version}`;
- const physicalBefore = new Set(previous?.artifacts.map(artifactKey) ?? []);
- const physicalAfter = new Set(lock.artifacts.map(artifactKey));
- const activatedBefore = new Set(previous?.packages.map(packageKey) ?? []);
- const activatedAfter = new Set(lock.packages.map(packageKey));
- const closureChanges = previous === undefined ? undefined : {
- physical: {
- added: [...physicalAfter].filter((key) => !physicalBefore.has(key)).sort(),
- removed: [...physicalBefore].filter((key) => !physicalAfter.has(key)).sort(),
- },
- activated: {
- added: [...activatedAfter].filter((key) => !activatedBefore.has(key)).sort(),
- removed: [...activatedBefore].filter((key) => !activatedAfter.has(key)).sort(),
- },
- };
- await writeNodePackageLock(output, lock);
- writeOperational({
- ok: true,
- changed: true,
- mode,
- packageLock: output,
- digest: lock.digest,
- selected: lock.selected,
- added,
- removed,
- ...(closureChanges === undefined ? {} : { closureChanges }),
- packages: lock.packages,
- },
- "Package lock written", "success", [
- ["Path", output], ["Mode", mode], ["Selected", String(lock.selected.length)],
- ["Activated", String(lock.packages.length)],
- ...(closureChanges === undefined ? [] : [
- ["Physical + / -", `${closureChanges.physical.added.length} / ${closureChanges.physical.removed.length}`] as const,
- ["Activated + / -", `${closureChanges.activated.added.length} / ${closureChanges.activated.removed.length}`] as const,
- ]),
- ["Digest", lock.digest],
- ]);
- });
- return;
- }
- if (args.command === "packages") {
- if (args.action !== "sync") {
- throw new Error("packages takes one action: packages sync <run-source>");
- }
- if (args.runtime === undefined) {
- throw new Error(
- "packages sync requires a Runtime; run narratage runtime use <profile> or pass --runtime <profile>",
- );
- }
- const source = resolve(args.file!);
- const profile = resolve(args.runtime);
- const selection = await (await runtimeHost(profile)).resolvePackages();
- if (selection.runtimePackageLock === undefined) {
- throw new Error("packages sync requires the Runtime Profile to declare runtimePackageLock");
- }
- if (selection.runtimeSelection === undefined) {
- throw new Error("this Distribution cannot discover Runtime packages from the selected Profile");
- }
- const runtimeSelection = selection.runtimeSelection;
- const sourceLock = await nearestSourcePackageLock(dirname(source))
- ?? resolve(dirname(source), "svml.packages.lock");
- const syncWorkspaceRoot = args.workspaceRoot ?? selectedRuntimeProjectRoot ?? dirname(sourceLock);
- const packageRoot = args.packageRoot ?? selection.packageRoot ?? distribution.packageRoot ?? dirname(profile);
- const locks = [resolve(sourceLock), resolve(selection.runtimePackageLock)].sort();
- if (locks[0] === locks[1]) throw new Error("packageLock and runtimePackageLock must be different files");
- const summarizeDifference = (before: NodePackageLock | undefined, after: NodePackageLock) => {
- const oldArtifacts = new Map(before?.artifacts.map((item) => [`${item.name}@${item.version}`, item.digest]) ?? []);
- const newArtifacts = new Map(after.artifacts.map((item) => [`${item.name}@${item.version}`, item.digest]));
- return {
- added: [...newArtifacts.keys()].filter((key) => !oldArtifacts.has(key)).sort(),
- removed: [...oldArtifacts.keys()].filter((key) => !newArtifacts.has(key)).sort(),
- changed: [...newArtifacts.entries()]
- .filter(([key, digest]) => oldArtifacts.has(key) && oldArtifacts.get(key) !== digest)
- .map(([key]) => key).sort(),
- };
- };
- const readExistingLock = async (path: string): Promise<NodePackageLock | undefined> => {
- try {
- return await readNodePackageLock(path);
- } catch (error) {
- if (error !== null && typeof error === "object" && "code" in error
- && (error as { readonly code?: unknown }).code === "ENOENT") return undefined;
- throw error;
- }
- };
- await withPackageLockEdit(locks[0]!, async () => await withPackageLockEdit(locks[1]!, async () => {
- const authorBefore = await readExistingLock(sourceLock);
- const runtimeBefore = await readExistingLock(selection.runtimePackageLock!);
- const discovered = await createDiscoveredSourceInventory(distribution, {
- source,
- ...(syncWorkspaceRoot === undefined ? {} : { workspaceRoot: syncWorkspaceRoot }),
- packageRoot,
- selected: authorBefore?.selected ?? [],
- });
- const sourceSelection = discovered.sourceSelection;
- const authorSelected = discovered.packages.lock.selected;
- let runtimeRoots = [...new Set(runtimeBefore?.selected ?? [])].sort();
- let runtimeInventory = await createNodePackageInventory(runtimeRoots, packageRoot);
- const logical = runtimeSelection.logical ?? [];
- while (true) {
- const offered = new Set(runtimeInventory.lock.packages.flatMap((item) =>
- item.offers.map((offer) => `${offer.abi}\u0000${offer.name}`)));
- const missing = logical.filter((address) => !offered.has(`${address.abi}\u0000${address.name}`));
- if (missing.length === 0) break;
- const additions = missing.map((address) => address.name);
- const next = [...new Set([...runtimeRoots, ...additions])].sort();
- if (JSON.stringify(next) === JSON.stringify(runtimeRoots)) {
- throw new Error("Runtime Adapter package discovery made no progress");
- }
- runtimeRoots = next;
- runtimeInventory = await createNodePackageInventory(runtimeRoots, packageRoot);
- }
- selectNodePackageSpecifiers(runtimeInventory.lock, runtimeSelection);
- const runtimeSelected = runtimeInventory.lock.selected;
- const authorAfter = discovered.packages.lock;
- const runtimeAfter = runtimeInventory.lock;
- if (authorBefore?.digest !== authorAfter.digest) await writeNodePackageLock(sourceLock, authorAfter);
- if (runtimeBefore?.digest !== runtimeAfter.digest) await writeNodePackageLock(selection.runtimePackageLock!, runtimeAfter);
- const author = summarizeDifference(authorBefore, authorAfter);
- const runtime = summarizeDifference(runtimeBefore, runtimeAfter);
- const changed = [...author.added, ...author.removed, ...author.changed,
- ...runtime.added, ...runtime.removed, ...runtime.changed].length > 0
- || authorBefore?.digest !== authorAfter.digest || runtimeBefore?.digest !== runtimeAfter.digest;
- writeOperational({
- ok: true,
- changed,
- source,
- profile,
- packageRoot,
- selected: {
- author: authorSelected,
- runtime: runtimeSelected,
- },
- author: { path: sourceLock, digest: authorAfter.digest, difference: author },
- runtime: { path: selection.runtimePackageLock, digest: runtimeAfter.digest, difference: runtime },
- }, changed ? "Project package locks synchronized" : "Project package locks already current",
- changed ? "success" : "info", [
- ["Run", source], ["Profile", profile],
- ["Author packages", String(sourceSelection.selected.length)],
- ["Runtime adapters", String(runtimeSelection.logical?.length ?? 0)],
- ["Updated entries", String(author.added.length + author.removed.length + author.changed.length
- + runtime.added.length + runtime.removed.length + runtime.changed.length)],
- ], args.verbose ? [
- `Package root ${packageRoot}`,
- ...sourceSelection.selected.map((item) => `Author selected ${item}`),
- ...(runtimeSelection.logical ?? []).map((item) => `Runtime selected ${item.abi} ${item.name}`),
- ...author.changed.map((item) => `Author changed ${item}`),
- ...author.added.map((item) => `Author added ${item}`),
- ...author.removed.map((item) => `Author removed ${item}`),
- ...runtime.changed.map((item) => `Runtime changed ${item}`),
- ...runtime.added.map((item) => `Runtime added ${item}`),
- ...runtime.removed.map((item) => `Runtime removed ${item}`),
- ] : []);
- }));
- return;
- }
if (args.command === "doctor") {
- if (args.packageLock !== undefined || args.packageRoot !== undefined || args.packages.length > 0 || args.apply) {
+ if (args.packageRoot !== undefined || args.packages.length > 0 || args.apply) {
throw new Error("doctor reads all deployment selection from the Runtime Profile itself");
}
const profileInput = args.runtime ?? args.file;
@@ -1273,8 +974,7 @@ export async function runCli(
if (args.file !== undefined && args.runtime !== undefined) {
throw new Error("programs reads all deployment selection from the Runtime Profile itself; provide that Profile only once");
}
- if (args.packageLock !== undefined || args.packageRoot !== undefined
- || args.packages.length > 0 || args.apply) {
+ if (args.packageRoot !== undefined || args.packages.length > 0 || args.apply) {
throw new Error("programs reads all deployment selection from the Runtime Profile itself");
}
if (args.action !== "up" && args.action !== "down" && args.action !== "status") {
@@ -1329,17 +1029,9 @@ export async function runCli(
const profile = resolve(profileInput);
const controller = await runtimeController(profile);
if (args.action === "up") {
- // Validate the exact Runtime Closure against unfinished work before replacing a stale Worker
- // or starting external programs. A refusal must leave the old execution environment intact.
- const workspaceRoot = args.workspaceRoot ?? selectedRuntimeProjectRoot ?? process.cwd();
- const sourceLock = await nearestSourcePackageLock(workspaceRoot);
- const implementationPackages = sourceLock === undefined
- ? undefined
- : await loadNodePackageSet(
- sourceLock,
- args.packageRoot ?? distribution.packageRoot ?? workspaceRoot,
- );
- const validated = await loadRuntime(await runtimeHost(profile), implementationPackages);
+ // Validate the Runtime Profile before replacing a stale Worker or starting programs.
+ const packageRoot = await packageRootForProject();
+ const validated = await loadRuntime(await runtimeHost(profile, packageRoot));
await validated.close();
const external = await controller.programs.up({
...(args.maxWaitMs === undefined ? {} : { maxWaitMs: args.maxWaitMs }),
@@ -1382,7 +1074,7 @@ export async function runCli(
return;
}
// These are independent views over one Profile. Load them concurrently without inventing a
- // second registry; each selected package remains the authority for its own report.
+ // second registry; each selected package remains responsible for its own report.
const runtimeLoading = loadRuntimeArchive(await runtimeHost(profile));
let runtime: CliRuntimeArchiveControl | undefined;
try {
@@ -1396,7 +1088,7 @@ export async function runCli(
const queue = await runtime.queue();
const counts = Object.fromEntries(["queued", "leased", "waiting", "blocked", "settling", "terminal"]
.map((phase) => [phase, queue.dispatches.filter((item) => item.phase === phase).length]));
- const routes = summarizeQueueRoutes(queue.capacity);
+ const lanes = summarizeQueueLanes(queue.capacity);
const ready = worker.state === "running"
&& external.programs.every((item) => item.state.state === "ready");
const active = ["queued", "leased", "waiting", "blocked", "settling"]
@@ -1409,7 +1101,7 @@ export async function runCli(
ready,
attention,
worker,
- queue: { counts, routes, capacity: queue.capacity },
+ queue: { counts, lanes, capacity: queue.capacity },
programs: external.programs,
};
writeOperational(machine, "Runtime status", attention ? "warning" : ready ? "success" : "info", [
@@ -1421,7 +1113,7 @@ export async function runCli(
["Capacity reservations", String(queue.capacity.length)],
], [
...unavailable.map(programLine),
- ...queueRouteLines(routes),
+ ...queueLaneLines(lanes),
]);
} finally {
if (runtime !== undefined) await runtime.close();
@@ -1430,7 +1122,7 @@ export async function runCli(
return;
}
if (args.command === "gc") {
- if (args.packageLock !== undefined || args.packageRoot !== undefined || args.packages.length > 0) {
+ if (args.packageRoot !== undefined || args.packages.length > 0) {
throw new Error("gc reads all deployment selection from the Runtime Profile itself");
}
const profileInput = args.runtime ?? args.file;
@@ -1518,7 +1210,6 @@ export async function runCli(
return;
}
if (args.apply) throw new Error("--apply is only valid for gc");
- if (args.refresh) throw new Error("--refresh is only valid for lock-packages");
if (args.noPrograms && args.command !== "build") {
throw new Error("--no-programs is only valid for build; no other command starts an external program");
}
@@ -1567,14 +1258,14 @@ export async function runCli(
at: Date.now(),
worker,
dispatches: queue.dispatches,
- routes: summarizeQueueRoutes(queue.capacity),
+ lanes: summarizeQueueLanes(queue.capacity),
capacity: queue.capacity,
operations: queue.operations.map((item) => ({
id: item.id,
build: item.build,
endpoint: item.endpoint,
- authority: item.authority,
- route: item.route,
+ pool: item.pool,
+ lane: item.lane,
attempt: item.attempt,
revision: item.revision,
status: item.status,
@@ -1587,14 +1278,14 @@ export async function runCli(
item.status === "created" || item.status === "pending");
const buildLines = active.slice(0, args.verbose ? undefined : 12).map((item) =>
`${item.build}: ${item.phase}${item.admission === "open" ? "" : ` · ${item.admission}`}`);
- const routeLines = queueRouteLines(summarizeQueueRoutes(queue.capacity));
+ const laneLines = queueLaneLines(summarizeQueueLanes(queue.capacity));
const genericCapacityLines = queue.capacity.filter((item) => item.queue === undefined)
.slice(0, args.verbose ? undefined : 12)
.map((item) => `${item.resources.map((resource) => resource.id).join(" + ")}: ${item.active === undefined
? "queued"
: "active"} · ${item.build}`);
const operationLines = activeOperations.slice(0, args.verbose ? undefined : 12).map((item) =>
- `${item.build} · ${item.authority} → ${item.route}: ${item.progress === undefined
+ `${item.build} · ${item.pool} → ${item.lane}: ${item.progress === undefined
? item.status
: formatOperationProgress(item.progress)}`);
writeOperational(value, "Runtime queue", active.length === 0 ? "success" : "info", [
@@ -1605,7 +1296,7 @@ export async function runCli(
], [
...buildLines,
...(operationLines.length === 0 ? [] : ["Operations:", ...operationLines]),
- ...(routeLines.length === 0 ? [] : ["Provider queues:", ...routeLines]),
+ ...(laneLines.length === 0 ? [] : ["Provider queues:", ...laneLines]),
...(genericCapacityLines.length === 0 ? [] : ["Other resources:", ...genericCapacityLines]),
]);
};
@@ -1632,7 +1323,11 @@ export async function runCli(
};
}));
writeOperational({ builds }, "Build archive", "info", [["Builds", String(entries.length)]],
- builds.map((item) => `${item.build}: ${item.status ?? "unknown"}`));
+ builds.map((item) => {
+ const source = basename(item.run?.path ?? item.source.path);
+ const targets = item.targets.length === 0 ? "no named target" : item.targets.join(", ");
+ return `${item.build}: ${item.status ?? "unknown"} · ${source} · ${targets}`;
+ }));
} else if (args.command === "history") {
const catalogs = await runtime.builds();
const entries = (await Promise.all(catalogs.map(async (catalog) => {
@@ -1675,12 +1370,34 @@ export async function runCli(
return `${item.build}: ${item.output.name} · ${created} · ${shortDigest}`;
}));
} else if (args.command === "status") {
- const status = await runtime.status(args.file!);
+ let status = await runtime.status(args.file!);
+ if (args.watch && status.build !== undefined && status.dispatch !== undefined) {
+ await observeBuild(runtime, {
+ id: status.build.build,
+ state: status.build.state,
+ status: submissionStatus(status.dispatch),
+ dispatch: status.dispatch,
+ }, {
+ ...(args.maxWaitMs === undefined ? {} : { maxWaitMs: args.maxWaitMs }),
+ controller: await runtimeController(args.runtime),
+ ...(args.json ? {} : {
+ onProgress: (progress) => {
+ const operations = Object.entries(progress.operations)
+ .map(([operationStatus, count]) => `${count} ${operationStatus}`)
+ .join(", ");
+ io.write(` · ${progress.build}: ${progress.phase}`
+ + `${operations.length === 0 ? "" : ` · ${operations}`}\n`);
+ for (const line of progress.activity) io.write(` ${line}\n`);
+ },
+ }),
+ });
+ status = await runtime.status(args.file!);
+ }
const effectiveStatus = status.dispatch === undefined
? status.build?.state.status
: submissionStatus(status.dispatch);
const machine = {
- build: status.build === undefined ? undefined : {
+ build: status.build === undefined ? null : {
id: status.build.build,
revision: status.build.revision,
core: status.build.state.id,
@@ -1689,7 +1406,7 @@ export async function runCli(
diagnostics: status.build.state.diagnostics,
},
catalog: status.catalog === undefined
- ? undefined
+ ? null
: summarizeBuildCatalog(status.catalog, status.build?.state),
operations: status.operations.map((operation) => ({
id: operation.id,
@@ -1703,13 +1420,22 @@ export async function runCli(
...(operation.failure === undefined ? {} : { failure: operation.failure }),
...(operation.cancellation === undefined ? {} : { cancellation: operation.cancellation }),
})),
- dispatch: status.dispatch,
+ dispatch: status.dispatch ?? null,
};
const phase = status.dispatch?.phase ?? "missing";
const notableOperations = status.operations.filter((operation) =>
- operation.status === "failed" || operation.status === "cancelled");
- writeOperational(machine, status.build === undefined ? "Build not found" : "Build status",
- status.build === undefined ? "warning" : status.dispatch?.terminal === "failed" ? "error" : "info", [
+ operation.status !== "completed").slice(0, args.verbose ? undefined : 12);
+ const terminal = status.dispatch?.phase === "terminal";
+ writeOperational(machine, status.build === undefined
+ ? "Build not found"
+ : args.watch
+ ? terminal ? "Build finished" : "Build still running"
+ : "Build status",
+ status.build === undefined
+ ? "warning"
+ : status.dispatch?.terminal === "failed"
+ ? "error"
+ : args.watch && !terminal ? "warning" : "info", [
["Build", args.file!],
["Status", effectiveStatus ?? "missing"],
...(status.build === undefined || effectiveStatus === status.build.state.status
@@ -1717,9 +1443,11 @@ export async function runCli(
: [["Core", status.build.state.status] as const]),
["Dispatch", phase],
["Operations", String(status.operations.length)],
- ], notableOperations.map((operation) => operation.failure === undefined
- ? `${operation.endpoint}: ${operation.status}`
- : `${operation.endpoint}: ${operation.failure.code} — ${operation.failure.message}`)
+ ], notableOperations.map((operation) => operation.failure !== undefined
+ ? `${operation.endpoint}: ${operation.failure.code} — ${operation.failure.message}`
+ : operation.progress === undefined
+ ? `${operation.endpoint}: ${operation.status}`
+ : `${operation.endpoint}: ${formatOperationProgress(operation.progress)}`)
.concat(status.dispatch?.reason === undefined ? [] : [`Reason ${status.dispatch.reason}`]));
if (status.build === undefined || status.dispatch?.terminal === "failed") io.setExitCode?.(1);
} else if (args.command === "inspect") {
@@ -1886,35 +1614,24 @@ export async function runCli(
}
return;
}
- if (args.packages.length > 0) throw new Error("--package is only valid for lock-packages");
- const runtimePackageSelection = args.runtime === undefined
- ? undefined
- : await (await runtimeHost(args.runtime)).resolvePackages();
- const discoveredPackageLock = args.file === undefined
+ if (args.packages.length > 0) throw new Error("--package is reserved for the internal Worker launch");
+ const runtimePaths = args.runtime === undefined
? undefined
- : await nearestSourcePackageLock(dirname(resolve(args.file)));
- const effectivePackageLock = args.packageLock ?? discoveredPackageLock;
- const effectivePackageRoot = args.packageRoot ?? runtimePackageSelection?.packageRoot;
+ : await (await runtimeHost(args.runtime)).resolvePaths();
+ const effectivePackageRoot = args.packageRoot ?? runtimePaths?.packageRoot;
const effectiveWorkspaceRoot = args.workspaceRoot
?? selectedRuntimeProjectRoot
- ?? (effectivePackageLock === undefined ? dirname(resolve(args.file!)) : dirname(resolve(effectivePackageLock)));
- if (effectivePackageRoot !== undefined && effectivePackageLock === undefined) {
- throw new Error("--package-root locates the installed packages named by --package-lock; provide both options");
- }
- const loadedPackageSet = effectivePackageLock === undefined
+ ?? dirname(resolve(args.file!));
+ const sourcePackageRoot = effectivePackageRoot
+ ?? await defaultPackageRoot(effectiveWorkspaceRoot, distribution.fallbackPackageRoot);
+ const loadedPackageSet = distribution.discoverSourcePackages === undefined
? undefined
- : distribution.discoverSourcePackages === undefined
- ? await loadNodePackageSet(
- effectivePackageLock,
- effectivePackageRoot ?? distribution.packageRoot ?? dirname(effectivePackageLock),
- )
- : await loadDiscoveredSourcePackages(distribution, {
+ : await loadDiscoveredSourcePackages(distribution, {
source: args.file!,
...(effectiveWorkspaceRoot === undefined ? {} : { workspaceRoot: effectiveWorkspaceRoot }),
- packageLock: effectivePackageLock,
- packageRoot: effectivePackageRoot ?? distribution.packageRoot ?? dirname(effectivePackageLock),
+ packageRoot: sourcePackageRoot,
});
- const packageContributions = (loadedPackageSet?.packages ?? distribution.bootstrapPackages)
+ const packageContributions = (loadedPackageSet ?? distribution.bootstrapPackages)
.map((item) => item.contribution);
const runFrontends = collectRunFrontends(packageContributions);
const compiler = distribution.createCompiler({
@@ -1930,9 +1647,7 @@ export async function runCli(
const message = runMode
? `Frontend ${sourceHeader.using} is ambiguously registered as Author and Run`
: `No trusted Author or Run compiler accepts Frontend ${sourceHeader.using}`;
- throw new Error(effectivePackageLock === undefined && !runMode
- ? `${message}; run narratage runtime use <profile>, or pass --runtime <profile> or --package-lock <lock>`
- : message);
+ throw new Error(message);
}
if ((args.command === "plan" || args.command === "build") && !runMode) {
throw new Error(`${args.command} requires a self-described Run Source; check Author Sources independently`);
@@ -2008,7 +1723,7 @@ export async function runCli(
} finally {
await archive.close();
}
- const result = loadedRun.compiler.planCompilation(loadedRun, loadedPackageSet?.lock.digest);
+ const result = loadedRun.compiler.planCompilation(loadedRun);
let runtime: CliRuntime | undefined;
try {
const catalog = createCatalogDescriptor({
@@ -2024,13 +1739,18 @@ export async function runCli(
// remain in Core; they never reclaim a previous Build.
id: `bld_${randomUUID()}`,
state: result.state,
+ ...(loadedPackageSet === undefined ? {} : {
+ implementationPackages: loadedPackageSet.map((item) => item.specifier),
+ }),
catalog,
attachments: result.compilation.attachments,
} as const;
const controller = await (await runtimeHost(args.runtime)).controller({
workspaceRoot: effectiveWorkspaceRoot,
- ...(effectivePackageLock === undefined ? {} : { packageLock: effectivePackageLock }),
- packageRoot: effectivePackageRoot ?? distribution.packageRoot ?? effectiveWorkspaceRoot,
+ ...(loadedPackageSet === undefined ? {} : {
+ implementationPackages: loadedPackageSet.map((item) => item.specifier),
+ }),
+ packageRoot: sourcePackageRoot,
});
let programs: Awaited<ReturnType<typeof startDeclaredPrograms>> | undefined;
let worker = await controller.worker.status();
@@ -2139,8 +1859,7 @@ export async function runCli(
["Worker", worker.state === "running" ? String(worker.pid) : worker.state],
["Goals", String(machine.goals.length)],
], terminal ? terminalLines : [
- `Status narratage status ${built.id}${runtimeHint}`,
- `Watch narratage queue${runtimeHint} --watch`,
+ `Watch narratage status ${built.id}${runtimeHint} --watch`,
`Cancel narratage cancel ${built.id}${runtimeHint}`,
]);
if (built.status === "failed") io.setExitCode?.(1);
@@ -2161,7 +1880,7 @@ export async function runCli(
packageContributions,
...(runtime === undefined ? {} : { runtime }),
});
- const result = loaded.compiler.planCompilation(loaded, loadedPackageSet?.lock.digest);
+ const result = loaded.compiler.planCompilation(loaded);
const preflight = args.runtime === undefined
? undefined
: await preflightPlan(await runtimeHost(args.runtime), result.state, loadedPackageSet);
diff --git a/packages/cli/src/output.ts b/packages/cli/src/output.ts
index 8524ccef..f8640331 100644
--- a/packages/cli/src/output.ts
+++ b/packages/cli/src/output.ts
@@ -448,7 +448,7 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
colors.accent(colors.strong("narratage check")),
colors.dim("Validate one self-described Author Source or Run Source without executing it."),
"",
- " narratage check <source> [--runtime <profile>] [--package-lock <lock>] [--workspace <workspace>] [--asset-root <directory>]",
+ " narratage check <source> [--runtime <profile>] [--workspace <workspace>] [--asset-root <directory>]",
],
doctor: [
colors.accent(colors.strong("narratage doctor")),
@@ -460,7 +460,7 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
colors.accent(colors.strong("narratage plan")),
colors.dim("Freeze the demanded subgraph and expose explicit Run choices and every external Need."),
"",
- " narratage plan <run-source> [--runtime <profile>] [--package-lock <lock>] [--workspace <workspace>] [--asset-root <directory>]",
+ " narratage plan <run-source> [--runtime <profile>] [--workspace <workspace>] [--asset-root <directory>]",
"",
"With --runtime, plan also preflights only the demanded deployment slice.",
"Planning never starts external work.",
@@ -496,7 +496,7 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
],
queue: [
colors.accent(colors.strong("narratage queue")),
- colors.dim("Inspect durable Build dispatch and Provider-authority capacity."),
+ colors.dim("Inspect durable Build dispatch and Provider pool capacity."),
"",
" narratage queue [--runtime <profile>] [--watch]",
" narratage queue [--runtime <profile>] --watch --jsonl",
@@ -515,9 +515,11 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
],
status: [
colors.accent(colors.strong("narratage status")),
- colors.dim("Show the current state of one Build and its notable external Operations."),
+ colors.dim("Show one Build now, or keep watching it without owning execution."),
"",
- " narratage status <build-id> [--runtime <profile>]",
+ " narratage status <build-id> [--runtime <profile>] [--watch]",
+ " --watch observe until terminal; the Worker still owns execution",
+ " --max-wait-ms <ms> stop watching after a bounded wait",
],
inspect: [
colors.accent(colors.strong("narratage inspect")),
@@ -558,15 +560,6 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
"",
" narratage gc [<profile>] [--apply]",
],
- packages: [
- colors.accent(colors.strong("narratage packages")),
- colors.dim("Derive both package locks from one Run Source and Runtime Profile."),
- "",
- " narratage packages sync <run-source> [--runtime <profile>] [--workspace <workspace>]",
- "",
- "The sources select author packages; the Profile selects Runtime packages.",
- "This never installs packages or runs Providers.",
- ],
};
const selected = topics[topic];
return selected === undefined ? undefined : [...selected, ...common];
@@ -574,6 +567,8 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
export function writeCliHelp(io: CliIo, topic?: string): void {
const colors = palette(io.terminal?.isTTY === true && io.terminal.color);
+ const row = (command: string, description: string, width = 30): string =>
+ ` ${command.padEnd(width)}${description}`;
if (topic !== undefined) {
const selected = commandHelp(topic, colors);
if (selected !== undefined) {
@@ -586,45 +581,40 @@ export function writeCliHelp(io: CliIo, topic?: string): void {
colors.dim('"First, there was narration. Then, there were montages."'),
"",
colors.strong("Typical flow"),
- " runtime use <profile> select this project's execution environment",
- " plan <run-source> see exactly what this Run will demand",
- " build <run-source> submit durable work; add --follow to watch",
- " get <build-id> read or copy an archived result",
- " packages sync ... setup step after package selection changes",
- " doctor <profile> diagnose deployment setup when needed",
+ row("runtime use <profile>", "select this project's execution environment", 40),
+ row("plan <run-source>", "see exactly what this Run will demand", 40),
+ row("build <run-source>", "submit durable work; add --follow to watch", 40),
+ row("get <build-id>", "read or copy an archived result", 40),
+ row("doctor [profile]", "diagnose deployment setup when needed", 40),
"",
colors.strong("Authoring"),
- " check <source> verify one self-described Author or Run source",
- " plan <run-source> freeze and inspect a Build plan",
- " build <run-source> submit a durable Build; --follow only observes",
+ row("check <source>", "verify one self-described Author or Run source"),
+ row("plan <run-source>", "freeze and inspect a Build plan"),
+ row("build <run-source>", "submit a durable Build; --follow only observes"),
"",
colors.strong("Archive"),
- " builds list known Builds",
- " history [output] find accepted historical Logical Outputs",
- " status <build-id> show Build and Operation status",
- " inspect <build-id> inspect accepted Records and demanded outputs",
- " get <build-id> read or materialize one archived result",
- " cancel <build-id> withdraw one Build and reconcile submitted work",
+ row("builds", "list known Builds"),
+ row("history [output]", "find accepted historical Logical Outputs"),
+ row("status <build-id> [--watch]", "show or continuously observe one Build"),
+ row("inspect <build-id>", "inspect accepted Records and demanded outputs"),
+ row("get <build-id>", "read or materialize one archived result"),
+ row("cancel <build-id>", "withdraw one Build and reconcile submitted work"),
"",
colors.strong("Runtime"),
- " doctor <profile> validate deployment without executing",
- " runtime use|unset select this project's Runtime Profile",
- " runtime up|status|logs|down manage the durable Worker",
- " programs up|status|down manage declared external programs only",
- " queue [--watch] inspect durable dispatch and shared capacity",
- " paths show every effective state location",
- " auth status|login|logout manage Endpoint-declared credential references",
- " gc <profile> report unreachable Artifacts; --apply deletes",
- "",
- colors.strong("Packages"),
- " packages sync <run> derive both project locks",
- " lock-packages <file> set, add, remove, refresh or verify local package trust",
+ row("doctor [profile]", "validate deployment without executing"),
+ row("runtime use|unset", "select this project's Runtime Profile"),
+ row("runtime up|status|logs|down", "manage the durable Worker"),
+ row("programs up|status|down", "manage declared external programs only"),
+ row("queue [--watch]", "inspect durable dispatch and shared capacity"),
+ row("paths", "show every effective state location"),
+ row("auth status|login|logout", "manage Endpoint-declared credential references"),
+ row("gc [profile]", "report unreachable Artifacts; --apply deletes"),
"",
colors.strong("Output"),
- " --json complete machine-readable result",
- " --verbose reveal identities and complete lists",
- " --color auto|always|never control ANSI color",
- " --debug include internal trace frames on failure",
+ row("--json", "complete machine-readable result"),
+ row("--verbose", "reveal identities and complete lists"),
+ row("--color auto|always|never", "control ANSI color"),
+ row("--debug", "include internal trace frames on failure"),
"",
].join("\n"));
}
diff --git a/packages/cli/src/package-lock-edit.ts b/packages/cli/src/package-lock-edit.ts
deleted file mode 100644
index 20b6a7c1..00000000
--- a/packages/cli/src/package-lock-edit.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { open, readFile, rm } from "node:fs/promises";
-import { hostname } from "node:os";
-import { resolve } from "node:path";
-
-function isAlreadyExists(error: unknown): boolean {
- return error !== null && typeof error === "object" && "code" in error
- && (error as { readonly code?: unknown }).code === "EEXIST";
-}
-
-/**
- * Serialize local package-lock writers with the same deliberately simple protocol Git uses for
- * its index: one sibling sentinel, no daemon and no hidden stale-lock recovery.
- */
-export async function withPackageLockEdit<T>(
- packageLock: string,
- action: () => Promise<T>,
-): Promise<T> {
- const target = resolve(packageLock);
- const sentinel = `${target}.editing`;
- let handle: Awaited<ReturnType<typeof open>>;
- try {
- handle = await open(sentinel, "wx", 0o600);
- } catch (error) {
- if (!isAlreadyExists(error)) throw error;
- const owner = await readFile(sentinel, "utf8").catch(() => "unknown owner");
- throw new Error(
- `package lock ${target} is already being edited (${owner.trim().slice(0, 300)}); `
- + `if that process no longer exists, remove ${sentinel}`,
- );
- }
- try {
- await handle.writeFile(`${JSON.stringify({
- format: "narratage.package-lock-edit@1",
- pid: process.pid,
- host: hostname(),
- startedAt: new Date().toISOString(),
- target,
- })}\n`, "utf8");
- await handle.sync();
- return await action();
- } finally {
- await handle.close().catch(() => undefined);
- await rm(sentinel, { force: true }).catch(() => undefined);
- }
-}
diff --git a/packages/cli/src/runtime-port.ts b/packages/cli/src/runtime-port.ts
index 661f7003..d4f6277a 100644
--- a/packages/cli/src/runtime-port.ts
+++ b/packages/cli/src/runtime-port.ts
@@ -13,4 +13,4 @@ export type {
RuntimeHostMaintenance as CliRuntimeMaintenance,
RuntimeHostStatus as CliRuntimeStatus,
RuntimeWorkerState as CliRuntimeWorkerState,
-} from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-host-node";
diff --git a/packages/cli/src/source-discovery.ts b/packages/cli/src/source-discovery.ts
index 3f2e25de..c58c51be 100644
--- a/packages/cli/src/source-discovery.ts
+++ b/packages/cli/src/source-discovery.ts
@@ -3,7 +3,7 @@ import { dirname, isAbsolute, relative, resolve } from "node:path";
import { authorFrontendsFromHostFacets, prepareAuthorSource } from "@narratage/elaborator";
import type { AuthorFrontend } from "@narratage/elaborator";
-import type { LogicalPackageAddress, NodePackageBinding } from "@narratage/package-loader-node";
+import type { LogicalPackageAddress, LoadedPackage } from "@narratage/package-loader-node";
import { modulePackageAbi } from "@narratage/protocol";
import { prepareRunSource, runFragmentHostAbi, runFrontendsFromHostFacets } from "@narratage/run";
import type { RunFrontend } from "@narratage/run";
@@ -14,7 +14,7 @@ function isWithin(root: string, path: string): boolean {
return relation === "" || (!relation.startsWith("..") && !isAbsolute(relation));
}
-/** Conventional physical hint used only when the trusted inventory has no binding yet. */
+/** Conventional physical package name for a logical Source import. */
function physicalPackage(request: string): string {
const version = request.lastIndexOf("@");
if (version <= 0) throw new Error(`Package request ${request} must end in @version`);
@@ -49,7 +49,7 @@ export async function discoverSourcePackages(
sourcePath: string,
options: {
readonly workspaceRoot?: string;
- readonly packages?: readonly NodePackageBinding[];
+ readonly packages?: readonly LoadedPackage[];
readonly bootstrapAuthorFrontends?: readonly AuthorFrontend[];
readonly bootstrapRunFrontends?: readonly RunFrontend[];
} = {},
diff --git a/packages/cli/src/source-packages.ts b/packages/cli/src/source-packages.ts
index a462c79c..16667986 100644
--- a/packages/cli/src/source-packages.ts
+++ b/packages/cli/src/source-packages.ts
@@ -1,12 +1,12 @@
import {
- createNodePackageInventory,
loadNodePackageSelection,
- selectNodePackageSpecifiers,
} from "@narratage/package-loader-node";
import type {
- LoadedNodePackageSet,
- NodePackageBinding,
+ LoadedPackage,
+ LogicalPackageAddress,
+ NodePackageSelectionRequest,
} from "@narratage/package-loader-node";
+import { modulePackageAbi } from "@narratage/protocol";
import type { CliDistribution } from "./distribution.js";
@@ -16,20 +16,16 @@ type DiscoveryOptions = {
readonly packageRoot: string;
};
-function selectedKey(value: LoadedNodePackageSet): string {
- return JSON.stringify(value.lock.selected);
-}
-
function mergePackages(
- ...groups: readonly (readonly NodePackageBinding[])[]
-): readonly NodePackageBinding[] {
+ ...groups: readonly (readonly LoadedPackage[])[]
+): readonly LoadedPackage[] {
return [...new Map(groups.flat().map((item) => [item.specifier, item])).values()];
}
async function discover(
distribution: CliDistribution,
options: DiscoveryOptions,
- packages: readonly NodePackageBinding[],
+ packages: readonly LoadedPackage[],
) {
const selection = await distribution.discoverSourcePackages?.(options.source, {
...(options.workspaceRoot === undefined ? {} : { workspaceRoot: options.workspaceRoot }),
@@ -39,47 +35,40 @@ async function discover(
return selection;
}
-/** Select only the trusted inventory subset reached by recursive Frontend discovery. */
+function offers(packages: readonly LoadedPackage[], address: LogicalPackageAddress): number {
+ return packages.filter((item) => [
+ ...(item.contribution.modules ?? []).flatMap((module) => [
+ `${module.manifest.name}@${module.manifest.version}`,
+ ...(module.specifiers ?? []),
+ ].map((name) => ({ abi: modulePackageAbi, name }))),
+ ...(item.contribution.hostFacets ?? []).flatMap((facet) =>
+ (facet.offers ?? []).map((name) => ({ abi: facet.abi, name }))),
+ ].some((offer) => offer.abi === address.abi && offer.name === address.name)).length;
+}
+
+function selectionSatisfied(
+ selection: NodePackageSelectionRequest,
+ packages: readonly LoadedPackage[],
+): boolean {
+ const installed = new Set(packages.map((item) => item.specifier));
+ return selection.selected.every((item) => installed.has(item))
+ && (selection.logical ?? []).every((address) => offers(packages, address) === 1);
+}
+
+/** Load only the installed packages reached by recursive Frontend discovery. */
export async function loadDiscoveredSourcePackages(
distribution: CliDistribution,
- options: DiscoveryOptions & { readonly packageLock: string },
-): Promise<LoadedNodePackageSet> {
+ options: DiscoveryOptions,
+): Promise<readonly LoadedPackage[]> {
let packages = distribution.bootstrapPackages;
- let previous = "";
while (true) {
const selection = await discover(distribution, options, packages);
- const loaded = await loadNodePackageSelection(options.packageLock, selection, options.packageRoot);
- const key = selectedKey(loaded);
- if (key === previous) return loaded;
- previous = key;
- packages = mergePackages(distribution.bootstrapPackages, loaded.packages);
- }
-}
-
-/**
- * Grow a project inventory until every package exposed by recursive Frontend discovery is trusted.
- * Unknown logical names use their conventional npm-looking spelling only for first enrollment.
- */
-export async function createDiscoveredSourceInventory(
- distribution: CliDistribution,
- options: DiscoveryOptions & { readonly selected: readonly string[] },
-): Promise<{
- readonly packages: LoadedNodePackageSet;
- readonly sourceSelection: Awaited<ReturnType<NonNullable<CliDistribution["discoverSourcePackages"]>>>;
-}> {
- let roots = [...new Set(options.selected)].sort();
- let inventory = await createNodePackageInventory(roots, options.packageRoot);
- while (true) {
- const sourceSelection = await discover(distribution, options,
- mergePackages(distribution.bootstrapPackages, inventory.packages));
- const next = [...new Set([...roots, ...sourceSelection.selected])].sort();
- if (JSON.stringify(next) === JSON.stringify(roots)) {
- // A conventional physical hint is not proof that the package actually offers the requested
- // logical ABI. Refuse a stable but invalid inventory before writing it.
- selectNodePackageSpecifiers(inventory.lock, sourceSelection);
- return { packages: inventory, sourceSelection };
+ if (selectionSatisfied(selection, packages)) return packages;
+ const loaded = await loadNodePackageSelection(selection, options.packageRoot);
+ const next = mergePackages(distribution.bootstrapPackages, loaded);
+ if (next.map((item) => item.specifier).join("\u0000") === packages.map((item) => item.specifier).join("\u0000")) {
+ throw new Error("Source package discovery did not satisfy its logical package requirements");
}
- roots = next;
- inventory = await createNodePackageInventory(roots, options.packageRoot);
+ packages = next;
}
}
diff --git a/packages/cli/test/build-programs.test.ts b/packages/cli/test/build-programs.test.ts
index f7bacf79..89ca0c0b 100644
--- a/packages/cli/test/build-programs.test.ts
+++ b/packages/cli/test/build-programs.test.ts
@@ -26,11 +26,11 @@ function distribution(
name: "test",
bootstrapPackages: [{
specifier: "@example/run-frontend",
+ digest: digestOf("@example/run-frontend"),
contribution: {
- format: "svml.node-package@1",
+ format: "narratage.node-package@1",
hostFacets: [createRunFrontendHostFacet({
id: "@narratage/run-markup@1",
- implementationDigest: digestOf("test-run-frontend"),
discover() { throw new Error("createRuntimeFromConfig is unavailable"); },
decode() { throw new Error("createRuntimeFromConfig is unavailable"); },
})],
@@ -44,7 +44,7 @@ function distribution(
}),
openRuntimeHost: async (path: string) => ({
profile: path,
- resolvePackages: async () => ({}),
+ resolvePaths: async () => ({}),
controller: async () => ({
profile: path,
dataRoot: "/tmp",
@@ -72,7 +72,7 @@ function distribution(
}
async function runSource(): Promise<string> {
- const root = await mkdtemp(join(tmpdir(), "svml-build-programs-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-build-programs-"));
const path = join(root, "build.svrun");
await writeFile(path, '<?svml using="@narratage/run-markup@1"?>\n<svrun/>\n', "utf8");
return path;
@@ -83,7 +83,7 @@ test("a Build that cannot construct its Runtime starts no declared external prog
const source = await runSource();
await assert.rejects(
async () => await runCli(
- ["build", source, "--runtime", "/p/svml.runtime.json"],
+ ["build", source, "--runtime", "/p/narratage.runtime.json"],
io,
distribution(calls, [{
id: "whisperx",
@@ -106,7 +106,7 @@ test("--no-programs leaves the declared programs alone", async () => {
// never consulted rather than merely tolerated.
await assert.rejects(
async () => await runCli(
- ["build", source, "--runtime", "/p/svml.runtime.json", "--no-programs"],
+ ["build", source, "--runtime", "/p/narratage.runtime.json", "--no-programs"],
io,
distribution(calls, [{
id: "whisperx",
diff --git a/packages/cli/test/control-commands.test.ts b/packages/cli/test/control-commands.test.ts
index fb8d6dcf..0b6c4637 100644
--- a/packages/cli/test/control-commands.test.ts
+++ b/packages/cli/test/control-commands.test.ts
@@ -55,6 +55,80 @@ test("queue opens durable control without constructing execution Providers", asy
assert.deepEqual(result.operations, []);
});
+test("status --watch reattaches to one durable Build until it becomes terminal", async () => {
+ const calls: string[] = [];
+ const state = {
+ id: "sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+ status: "active",
+ diagnostics: [],
+ };
+ const dispatch = (phase: "queued" | "terminal") => ({
+ format: "narratage.build-dispatch-identity@1",
+ id: "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+ build: "build-watch",
+ core: state.id,
+ revision: phase === "queued" ? 0 : 1,
+ createdAt: 1,
+ updatedAt: phase === "queued" ? 1 : 2,
+ priority: 0,
+ availableAt: 1,
+ admission: phase === "queued" ? "open" : "closed",
+ phase,
+ ...(phase === "terminal" ? { terminal: "complete" } : {}),
+ });
+ let statusReads = 0;
+ const control = {
+ async status() {
+ statusReads += 1;
+ calls.push("archive.status");
+ const terminal = statusReads > 1;
+ return {
+ build: { build: "build-watch", revision: terminal ? 1 : 0, state },
+ catalog: undefined,
+ operations: [],
+ dispatch: dispatch(terminal ? "terminal" : "queued"),
+ };
+ },
+ async activity() {
+ calls.push("archive.activity");
+ return { operations: [], dispatch: dispatch("terminal") };
+ },
+ async close() { calls.push("archive.close"); },
+ } as unknown as CliRuntimeArchiveControl;
+ const distribution = {
+ openRuntimeHost: async (path: string) => ({
+ profile: path,
+ openArchive: async () => control,
+ controller: async () => ({
+ worker: { status: async () => ({ state: "running", profile: path, pid: 1, logPath: "/tmp/worker.log" }) },
+ }),
+ createRuntime: async () => {
+ throw new Error("status must not construct execution Providers");
+ },
+ }),
+ } as unknown as CliDistribution;
+ let output = "";
+
+ await runCli([
+ "status", "build-watch", "--runtime", "/tmp/runtime.json", "--watch", "--json",
+ ], { write: (text) => { output += text; } }, distribution);
+
+ const result = JSON.parse(output) as {
+ readonly build: { readonly id: string; readonly status: string };
+ readonly dispatch: { readonly terminal?: string };
+ };
+ assert.equal(result.build.id, "build-watch");
+ assert.equal(result.build.status, "complete");
+ assert.equal(result.dispatch.terminal, "complete");
+ assert.deepEqual(calls, [
+ "archive.status",
+ "archive.activity",
+ "archive.status",
+ "archive.status",
+ "archive.close",
+ ]);
+});
+
test("command options fail closed instead of being silently ignored", async () => {
const distribution = {
openRuntimeHost: async (path: string) => {
@@ -88,9 +162,9 @@ test("command options fail closed instead of being silently ignored", async () =
);
await assert.rejects(
async () => await runCli([
- "queue", "--runtime", "/tmp/svml.runtime.ts",
+ "queue", "--runtime", "/tmp/narratage.runtime.ts",
], io, distribution),
- /profile delegated: .*svml\.runtime\.ts/u,
+ /profile delegated: .*narratage\.runtime\.ts/u,
);
});
@@ -104,7 +178,7 @@ test("auth opens only one Endpoint credential control, never the execution Runti
slot: "apiKey",
label: "KIE API key",
kind: "secret",
- ref: { format: "svml.credential-ref@1", store: "env", key: "KIE_API_KEY" },
+ ref: { format: "narratage.credential-ref@1", store: "env", key: "KIE_API_KEY" },
configured: false,
writable: false,
}];
@@ -148,7 +222,7 @@ test("auth login rejects a read-only CredentialStore before asking for a secret"
slot: "apiKey",
label: "KIE API key",
kind: "secret",
- ref: { format: "svml.credential-ref@1", store: "env", key: "KIE_API_KEY" },
+ ref: { format: "narratage.credential-ref@1", store: "env", key: "KIE_API_KEY" },
configured: false,
writable: false,
}];
diff --git a/packages/cli/test/output.test.ts b/packages/cli/test/output.test.ts
index 44ba7d62..6c1abb83 100644
--- a/packages/cli/test/output.test.ts
+++ b/packages/cli/test/output.test.ts
@@ -150,7 +150,7 @@ test("JSON mode is exact machine data with no terminal decoration", () => {
};
const output = capture({ json: true, color: "always", verbose: true }, {
kind: "doctor",
- profile: "/project/svml.runtime.json",
+ profile: "/project/narratage.runtime.json",
machine,
}, { isTTY: true, color: true, unicode: true, columns: 100 });
assert.deepEqual(JSON.parse(output), machine);
@@ -160,7 +160,7 @@ test("JSON mode is exact machine data with no terminal decoration", () => {
test("plan keeps named Run choices visible and leaves graph internals to verbose output", () => {
const plan: BuildPlan = {
- format: "svml.plan@1",
+ format: "narratage.plan@1",
id: digest,
graph: digest,
request: digest,
@@ -208,7 +208,7 @@ test("plan keeps named Run choices visible and leaves graph internals to verbose
test("a plan with no Needs stays compact without knowing any Provider names", () => {
const plan: BuildPlan = {
- format: "svml.plan@1",
+ format: "narratage.plan@1",
id: digest,
graph: digest,
request: digest,
@@ -227,7 +227,7 @@ test("a plan with no Needs stays compact without knowing any Provider names", ()
test("plan runtime preflight presents only demanded capabilities", () => {
const plan: BuildPlan = {
- format: "svml.plan@1",
+ format: "narratage.plan@1",
id: digest,
graph: digest,
request: digest,
diff --git a/packages/cli/test/programs-command.test.ts b/packages/cli/test/programs-command.test.ts
index 8b5a6b93..c25d2d5d 100644
--- a/packages/cli/test/programs-command.test.ts
+++ b/packages/cli/test/programs-command.test.ts
@@ -46,26 +46,26 @@ function distribution(calls: string[], reports: readonly CliManagedProgramReport
test("programs dispatches lifecycle through the selected Runtime Controller", async () => {
const calls: string[] = [];
- await runCli(["programs", "up", "/p/svml.runtime.json", "--max-wait-ms", "1000"], io, distribution(calls));
- await runCli(["programs", "down", "/p/svml.runtime.json"], io, distribution(calls));
- await runCli(["programs", "status", "/p/svml.runtime.json"], io, distribution(calls));
+ await runCli(["programs", "up", "/p/narratage.runtime.json", "--max-wait-ms", "1000"], io, distribution(calls));
+ await runCli(["programs", "down", "/p/narratage.runtime.json"], io, distribution(calls));
+ await runCli(["programs", "status", "/p/narratage.runtime.json"], io, distribution(calls));
assert.deepEqual(calls, [
- 'up /p/svml.runtime.json {"maxWaitMs":1000}',
- "down /p/svml.runtime.json",
- "report /p/svml.runtime.json",
+ 'up /p/narratage.runtime.json {"maxWaitMs":1000}',
+ "down /p/narratage.runtime.json",
+ "report /p/narratage.runtime.json",
]);
});
test("programs accepts only up, down and status", async () => {
await assert.rejects(
- runCli(["programs", "restart", "/p/svml.runtime.json"], io, distribution([])),
+ runCli(["programs", "restart", "/p/narratage.runtime.json"], io, distribution([])),
/programs takes up, down or status/u,
);
});
test("waiting belongs only to programs up", async () => {
await assert.rejects(
- runCli(["programs", "status", "/p/svml.runtime.json", "--max-wait-ms", "1000"], io, distribution([])),
+ runCli(["programs", "status", "/p/narratage.runtime.json", "--max-wait-ms", "1000"], io, distribution([])),
/--max-wait-ms applies to programs up/u,
);
});
@@ -73,7 +73,7 @@ test("waiting belongs only to programs up", async () => {
test("program status may report down without failing the observation", async () => {
let output = "";
let exitCode: number | undefined;
- await runCli(["programs", "status", "/project/svml.runtime.json"], {
+ await runCli(["programs", "status", "/project/narratage.runtime.json"], {
write(text) { output += text; },
setExitCode(code) { exitCode = code; },
}, distribution([], [{
@@ -97,7 +97,7 @@ test("runtime up validates the Runtime before it starts Programs", async () => {
}),
} as unknown as CliDistribution;
await assert.rejects(
- runCli(["runtime", "up", "/p/svml.runtime.json"], io, selected),
+ runCli(["runtime", "up", "/p/narratage.runtime.json"], io, selected),
/Runtime Closure conflict/u,
);
assert.deepEqual(calls, []);
diff --git a/packages/cli/test/runtime-build-process.test.ts b/packages/cli/test/runtime-build-process.test.ts
index eb9208dd..e064d55e 100644
--- a/packages/cli/test/runtime-build-process.test.ts
+++ b/packages/cli/test/runtime-build-process.test.ts
@@ -7,18 +7,16 @@ import { promisify } from "node:util";
import test from "node:test";
import {
- createNodePackageLock,
- readNodePackageLock,
- writeNodePackageLock,
+ loadNodePackageSelection,
} from "@narratage/package-loader-node";
import { digestOf } from "@narratage/protocol";
-import { runtimeConfigRevision } from "@narratage/local/config";
+import { runtimeConfigRevision } from "@narratage/runtime-local/config";
import {
ensureRuntimeProcess,
runtimeProcessStatus,
stopRuntimeProcess,
-} from "@narratage/local/worker-process";
+} from "@narratage/runtime-local/worker-process";
const execute = promisify(execFile);
const cliEntry = join(process.cwd(), "packages", "video-cli", "src", "cli.ts");
@@ -78,22 +76,10 @@ async function waitForBuild(
test("CLI exits after durable submission and a restarted detached Worker completes a non-video Build", async () => {
const project = await mkdtemp(join(tmpdir(), "narratage-runtime-build-process-"));
- const authorLockPath = join(project, "svml.packages.lock");
- const runtimeLockPath = join(project, "svml.runtime-packages.lock");
- const profile = join(project, "svml.runtime.json");
+ const profile = join(project, "narratage.runtime.json");
const source = join(project, "main.svml");
const run = join(project, "build.svrun");
try {
- await writeNodePackageLock(authorLockPath, await createNodePackageLock([
- "@narratage/run-markup",
- "@narratage/text",
- ], process.cwd()));
- await writeNodePackageLock(runtimeLockPath, await createNodePackageLock([
- "@narratage/local",
- "@narratage/store-sqlite",
- "@narratage/artifact-store-fs",
- "@narratage/credential-store-env",
- ], process.cwd()));
await writeFile(join(project, "pass.svs"), `<?svml using="@narratage/text/svs@1"?>
<sheet version="1" id="pass">
@@ -115,39 +101,39 @@ test("CLI exits after durable submission and a restarted detached Worker complet
`, "utf8");
await writeFile(profile, JSON.stringify({
format: "narratage.runtime-profile@1",
- runtimePackageLock: "./svml.runtime-packages.lock",
runtime: {
- use: "@narratage/local",
+ use: "@narratage/runtime-local",
config: {
dataRoot: ".narratage/runtime",
- components: {
- execution: { use: "@narratage/local" },
+ infrastructure: {
+ execution: { use: "@narratage/runtime-local" },
state: { use: "@narratage/store-sqlite", config: { path: "runtime.sqlite" } },
artifacts: { use: "@narratage/artifact-store-fs", config: { path: "artifacts" } },
- "credentials.env": { use: "@narratage/credential-store-env", config: {} },
+ credentials: { use: "@narratage/credential-store-env", config: {} },
},
- bindings: {
- scheduler: "execution.scheduler",
- worker: "execution.worker",
- stores: {
- build: "state.builds",
- operations: "state.operations",
- dispatch: "state.dispatch",
- artifacts: "artifacts",
- credentials: ["credentials.env"],
- },
+ roles: {
+ scheduler: { from: "execution", part: "scheduler" },
+ worker: { from: "execution", part: "worker" },
+ buildStore: { from: "state", part: "builds" },
+ operationStore: { from: "state", part: "operations" },
+ dispatchStore: { from: "state", part: "dispatch" },
+ artifactStore: { from: "artifacts", part: "store" },
+ credentialStores: [{ from: "credentials", part: "store" }],
},
endpoints: {},
- limits: { maxOperations: 2 },
+ capacity: { maxActiveOperations: 2 },
},
},
}, null, 2), "utf8");
const dataRoot = join(project, ".narratage", "runtime");
+ const authorPackages = await loadNodePackageSelection([
+ "@narratage/run-markup",
+ "@narratage/text",
+ ], process.cwd());
const workerRevision = digestOf({
format: "narratage.runtime-worker-revision@1",
profile: await runtimeConfigRevision(profile),
- source: (await readNodePackageLock(authorLockPath)).digest,
});
const parked = await ensureRuntimeProcess(profile, dataRoot, {
command: process.execPath,
@@ -161,7 +147,7 @@ test("CLI exits after durable submission and a restarted detached Worker complet
process.on("SIGTERM", () => process.exit(0));
setInterval(() => {}, 1000);
`],
- }, workerRevision, 5_000);
+ }, workerRevision, 5_000, authorPackages.map((item) => item.specifier));
const submitted = await cli(project, [
"build", run,
"--runtime", profile,
diff --git a/packages/cli/test/runtime-selection.test.ts b/packages/cli/test/runtime-selection.test.ts
index 151c5008..6434eb29 100644
--- a/packages/cli/test/runtime-selection.test.ts
+++ b/packages/cli/test/runtime-selection.test.ts
@@ -34,7 +34,7 @@ test("runtime use lets later CLI commands reuse the selected Profile", async ()
const root = await mkdtemp(join(tmpdir(), "narratage-runtime-cli-"));
const previous = process.cwd();
try {
- const profile = join(root, "svml.runtime.json");
+ const profile = join(root, "narratage.runtime.json");
const otherProfile = join(root, "other.runtime.json");
await writeFile(profile, "{}\n", "utf8");
await writeFile(otherProfile, "{}\n", "utf8");
@@ -46,10 +46,7 @@ test("runtime use lets later CLI commands reuse the selected Profile", async ()
const distribution = {
openRuntimeHost: async (path: string) => ({
profile: path,
- resolvePackages: async () => {
- calls.push(`select:${resolve(path)}`);
- return { runtimePackageLock: join(root, "svml.runtime-packages.lock") };
- },
+ resolvePaths: async () => ({}),
openArchive: async () => {
calls.push(`queue:${resolve(path)}`);
return control;
@@ -67,7 +64,6 @@ test("runtime use lets later CLI commands reuse the selected Profile", async ()
await runCli(["runtime", "unset", "--json"], { write() {} }, distribution);
assert.deepEqual(calls, [
- `select:${profile}`,
`queue:${await realpath(profile)}`,
`queue:${otherProfile}`,
]);
diff --git a/packages/cli/test/source-discovery.test.ts b/packages/cli/test/source-discovery.test.ts
index 7ff1cfa1..dd43785a 100644
--- a/packages/cli/test/source-discovery.test.ts
+++ b/packages/cli/test/source-discovery.test.ts
@@ -12,7 +12,7 @@ import { sourceFrontendPackageAbi } from "@narratage/source";
import { discoverSourcePackages } from "../src/source-discovery.js";
test("third-party Frontends discover same-named ABI requirements through physical package bindings", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-third-party-discovery-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-cli-third-party-discovery-"));
try {
await writeFile(join(root, "build.svrun"), `<?svml using="@logical/run@1"?>\nrun`, "utf8");
await writeFile(join(root, "main.story"), `<?svml using="@logical/story@1"?>\nstory`, "utf8");
@@ -20,9 +20,8 @@ test("third-party Frontends discover same-named ABI requirements through physica
const packages = [
{
specifier: "@physical/run-suite",
- contribution: { format: "svml.node-package@1" as const, hostFacets: [createRunFrontendHostFacet({
+ contribution: { format: "narratage.node-package@1" as const, hostFacets: [createRunFrontendHostFacet({
id: "@logical/run@1",
- implementationDigest: digestOf("third-party-run"),
discover: () => ({
author: { source: "./main.story" },
imports: [{ from: "@logical/shared@1", as: "preview" }],
@@ -32,9 +31,8 @@ test("third-party Frontends discover same-named ABI requirements through physica
},
{
specifier: "@physical/story-suite",
- contribution: { format: "svml.node-package@1" as const, hostFacets: [createAuthorFrontendHostFacet({
+ contribution: { format: "narratage.node-package@1" as const, hostFacets: [createAuthorFrontendHostFacet({
id: "@logical/story@1",
- implementationDigest: digestOf("third-party-story"),
discover: () => ({
modules: ["@logical/shared@1"],
sources: [{ from: "./child.svml", alias: "child" }],
@@ -44,9 +42,9 @@ test("third-party Frontends discover same-named ABI requirements through physica
},
{
specifier: "@physical/module-suite",
- contribution: { format: "svml.node-package@1" as const, modules: [{
+ contribution: { format: "narratage.node-package@1" as const, modules: [{
manifest: {
- format: "svml.module@1" as const,
+ format: "narratage.module@1" as const,
name: "@logical/shared",
version: "1",
dependencies: [], types: [], capabilities: [], producers: [],
@@ -56,14 +54,14 @@ test("third-party Frontends discover same-named ABI requirements through physica
},
{
specifier: "@physical/fragment-suite",
- contribution: { format: "svml.node-package@1" as const, hostFacets: [{
+ contribution: { format: "narratage.node-package@1" as const, hostFacets: [{
abi: runFragmentHostAbi,
offers: ["@logical/shared@1"],
identity: { contract: "example.fragment@1" },
implementation: {},
}] },
},
- ];
+ ].map((item) => ({ ...item, digest: digestOf(item.specifier) }));
const discovered = await discoverSourcePackages(join(root, "build.svrun"), {
workspaceRoot: root,
packages,
diff --git a/packages/comment-sticker/package.json b/packages/comment-sticker/package.json
index 6c723a0b..48d391a2 100644
--- a/packages/comment-sticker/package.json
+++ b/packages/comment-sticker/package.json
@@ -5,7 +5,7 @@
"private": true,
"type": "module",
"exports": { ".": "./src/index.ts" },
- "svml": { "activation": "./src/activation.ts" },
+ "narratage": { "activation": "./src/activation.ts" },
"dependencies": {
"@narratage/artifact": "workspace:*",
"@narratage/component-kit": "workspace:*",
diff --git a/packages/comment-sticker/src/activation.ts b/packages/comment-sticker/src/activation.ts
index 6d8e760d..64cda0d0 100644
--- a/packages/comment-sticker/src/activation.ts
+++ b/packages/comment-sticker/src/activation.ts
@@ -9,8 +9,8 @@ import {
commentStickerMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: commentStickerManifest,
}],
@@ -29,4 +29,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/comment-sticker/src/component.ts b/packages/comment-sticker/src/component.ts
index a559b902..7e61b931 100644
--- a/packages/comment-sticker/src/component.ts
+++ b/packages/comment-sticker/src/component.ts
@@ -8,19 +8,7 @@ import type { CanvasSpace, SpatialFrame } from "@narratage/spatial";
import type { Text } from "@narratage/text";
import { commentStickerProducers, commentStickerTypes } from "./manifest.js";
-import {
- appendMomentCommentSticker,
- appendProgramCommentSticker,
- appendSelectionCommentSticker,
- assertCommentStickerProgram,
- commentStickerImplementationDigests,
- commentStickerValidatorDigests,
- createCommentStickerSet,
- createCommentStickerContent,
- setCommentStickerContentText,
- finalizeCommentSticker,
- renderCommentSticker,
-} from "./program.js";
+import { appendMomentCommentSticker, appendProgramCommentSticker, appendSelectionCommentSticker, assertCommentStickerProgram, createCommentStickerSet, createCommentStickerContent, setCommentStickerContentText, finalizeCommentSticker, renderCommentSticker } from "./program.js";
import type {
CommentStickerHeader,
CommentStickerContent,
@@ -53,18 +41,16 @@ export const commentStickerComponent = {
producers: [
{
producer: commentStickerProducers.createContent,
- implementationDigest: commentStickerImplementationDigests.createContent,
handler: ({ inputs }) => ({ outputs: { content: output(createCommentStickerContent(
inline<Text>(inputs.comment?.value, "Text"),
)) }, needs: {} }),
},
...([
- [commentStickerProducers.setContentAuthor, commentStickerImplementationDigests.setContentAuthor, "author"],
- [commentStickerProducers.setContentHeader, commentStickerImplementationDigests.setContentHeader, "header"],
- [commentStickerProducers.setContentMeta, commentStickerImplementationDigests.setContentMeta, "meta"],
- ] as const).map(([producer, implementationDigest, field]) => ({
+ [commentStickerProducers.setContentAuthor, "author"],
+ [commentStickerProducers.setContentHeader, "header"],
+ [commentStickerProducers.setContentMeta, "meta"],
+ ] as const).map(([producer, field]) => ({
producer,
- implementationDigest,
handler: ({ inputs }: ProducerHandlerContext) => ({ outputs: { content: output(setCommentStickerContentText(
inline<CommentStickerContent>(inputs.content?.value, "CommentStickerContent"),
field,
@@ -73,15 +59,13 @@ export const commentStickerComponent = {
})),
{
producer: commentStickerProducers.createSet,
- implementationDigest: commentStickerImplementationDigests.createSet,
handler: () => ({ outputs: { set: output(createCommentStickerSet()) }, needs: {} }),
},
...([
- [commentStickerProducers.appendProgram, commentStickerImplementationDigests.appendProgram, false],
- [commentStickerProducers.appendProgramAvatar, commentStickerImplementationDigests.appendProgramAvatar, true],
- ] as const).map(([producer, implementationDigest, avatar]) => ({
+ [commentStickerProducers.appendProgram, false],
+ [commentStickerProducers.appendProgramAvatar, true],
+ ] as const).map(([producer, avatar]) => ({
producer,
- implementationDigest,
handler: ({ inputs }: ProducerHandlerContext) => {
const values = common(inputs);
return { outputs: { set: output(appendProgramCommentSticker(
@@ -91,11 +75,10 @@ export const commentStickerComponent = {
},
})),
...([
- [commentStickerProducers.appendSelection, commentStickerImplementationDigests.appendSelection, false],
- [commentStickerProducers.appendSelectionAvatar, commentStickerImplementationDigests.appendSelectionAvatar, true],
- ] as const).map(([producer, implementationDigest, avatar]) => ({
+ [commentStickerProducers.appendSelection, false],
+ [commentStickerProducers.appendSelectionAvatar, true],
+ ] as const).map(([producer, avatar]) => ({
producer,
- implementationDigest,
handler: ({ inputs }: ProducerHandlerContext) => {
const values = common(inputs);
return { outputs: { set: output(appendSelectionCommentSticker(
@@ -107,11 +90,10 @@ export const commentStickerComponent = {
},
})),
...([
- [commentStickerProducers.appendMoment, commentStickerImplementationDigests.appendMoment, false],
- [commentStickerProducers.appendMomentAvatar, commentStickerImplementationDigests.appendMomentAvatar, true],
- ] as const).map(([producer, implementationDigest, avatar]) => ({
+ [commentStickerProducers.appendMoment, false],
+ [commentStickerProducers.appendMomentAvatar, true],
+ ] as const).map(([producer, avatar]) => ({
producer,
- implementationDigest,
handler: ({ inputs }: ProducerHandlerContext) => {
const values = common(inputs);
return { outputs: { set: output(appendMomentCommentSticker(
@@ -124,7 +106,6 @@ export const commentStickerComponent = {
})),
{
producer: commentStickerProducers.finalize,
- implementationDigest: commentStickerImplementationDigests.finalize,
handler: ({ inputs }) => ({ outputs: { program: output(finalizeCommentSticker(
inline<CommentStickerSet>(inputs.set?.value, "CommentStickerSet"),
inline<CommentStickerHeader>(inputs.header?.value, "CommentStickerHeader"),
@@ -132,7 +113,6 @@ export const commentStickerComponent = {
},
{
producer: commentStickerProducers.render,
- implementationDigest: commentStickerImplementationDigests.render,
handler: ({ inputs }) => ({ outputs: { track: output(renderCommentSticker(
inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
@@ -142,7 +122,6 @@ export const commentStickerComponent = {
],
validators: [{
type: commentStickerTypes.program,
- implementationDigest: commentStickerValidatorDigests.program,
handler: ({ value }) => assertCommentStickerProgram(inline<CommentStickerProgram>(value, "CommentStickerProgram")),
}],
} satisfies ComponentPackage;
diff --git a/packages/comment-sticker/src/index.ts b/packages/comment-sticker/src/index.ts
index aaa89cfe..56c4fdb4 100644
--- a/packages/comment-sticker/src/index.ts
+++ b/packages/comment-sticker/src/index.ts
@@ -2,42 +2,7 @@ export { decodeCommentStickerStyle } from "./author.js";
export { commentStickerComponent } from "./component.js";
export { createCommentStickerFragment } from "./fragment.js";
export type { CommentStickerFragmentItem } from "./fragment.js";
-export {
- commentStickerDependency,
- commentStickerHeaderSchema,
- commentStickerItemSpecSchema,
- commentStickerManifest, commentStickerMarkupSurfaces,
- commentStickerManifestDigest,
- commentStickerModuleRef,
- commentStickerProducers,
- commentStickerProgramSchema,
- commentStickerSetSchema,
- commentStickerStyleSchema,
- commentStickerStyleSurfaceImplementationDigest,
- commentStickerTrackSurfaceImplementationDigest,
- commentStickerTypes,
-} from "./manifest.js";
-export {
- appendMomentCommentSticker,
- appendProgramCommentSticker,
- appendSelectionCommentSticker,
- assertCommentStickerContent,
- assertCommentStickerHeader,
- assertCommentStickerItemSpec,
- assertCommentStickerProgram,
- assertCommentStickerSet,
- assertCommentStickerStyle,
- commentStickerImplementationDigests,
- commentStickerValidatorDigests,
- createCommentStickerSet,
- createCommentStickerContent,
- finalizeCommentSticker,
- renderCommentSticker,
- sealCommentStickerHeader,
- sealCommentStickerItemSpec,
- sealCommentStickerProgram,
- sealCommentStickerStyle,
- setCommentStickerContentText,
-} from "./program.js";
+export { commentStickerDependency, commentStickerHeaderSchema, commentStickerItemSpecSchema, commentStickerManifest, commentStickerMarkupSurfaces, commentStickerModuleRef, commentStickerProducers, commentStickerProgramSchema, commentStickerSetSchema, commentStickerStyleSchema, commentStickerTypes } from "./manifest.js";
+export { appendMomentCommentSticker, appendProgramCommentSticker, appendSelectionCommentSticker, assertCommentStickerContent, assertCommentStickerHeader, assertCommentStickerItemSpec, assertCommentStickerProgram, assertCommentStickerSet, assertCommentStickerStyle, createCommentStickerSet, createCommentStickerContent, finalizeCommentSticker, renderCommentSticker, sealCommentStickerHeader, sealCommentStickerItemSpec, sealCommentStickerProgram, sealCommentStickerStyle, setCommentStickerContentText } from "./program.js";
export { decodeCommentStickerStyleSurface, decodeCommentStickerTrackSurface } from "./surface.js";
export type * from "./types.js";
diff --git a/packages/comment-sticker/src/manifest.ts b/packages/comment-sticker/src/manifest.ts
index 6768762e..69787ce1 100644
--- a/packages/comment-sticker/src/manifest.ts
+++ b/packages/comment-sticker/src/manifest.ts
@@ -10,8 +10,6 @@ import { spatialDependency, spatialFrameSchema, spatialTypes } from "@narratage/
import { temporalDependency } from "@narratage/temporal";
import { textDependency, textTypes } from "@narratage/text";
-import { commentStickerImplementationDigests, commentStickerValidatorDigests } from "./program.js";
-
export const commentStickerModuleRef = { name: "@narratage/comment-sticker", version: "1" } as const;
export const commentStickerTypes = {
@@ -136,9 +134,6 @@ export const commentStickerProgramSchema: ValueSchema = object({
id: { schema: string },
items: { schema: { kind: "array", minItems: 1, items: item } },
});
-
-export const commentStickerStyleSurfaceImplementationDigest = digestOf("@narratage/comment-sticker/style-surface@1");
-export const commentStickerTrackSurfaceImplementationDigest = digestOf("@narratage/comment-sticker/track-surface@1");
const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: registered(digest) });
const appendInputs = [
@@ -149,56 +144,53 @@ const appendInputs = [
] as const;
export const commentStickerMarkupSurfaces = [
- { name: "style", tag: "Style", mode: "structured", outputs: [commentStickerTypes.style], implementation: { digest: commentStickerStyleSurfaceImplementationDigest } },
- { name: "track", tag: "Track", mode: "structured", outputs: [textTypes.text, commentStickerTypes.header, commentStickerTypes.itemSpec, commentStickerTypes.program, compositionTypes.visualTrack], implementation: { digest: commentStickerTrackSurfaceImplementationDigest } },
+ { name: "style", tag: "Style", mode: "structured", outputs: [commentStickerTypes.style] },
+ { name: "track", tag: "Track", mode: "structured", outputs: [textTypes.text, commentStickerTypes.header, commentStickerTypes.itemSpec, commentStickerTypes.program, compositionTypes.visualTrack] },
] as const;
export const commentStickerManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: commentStickerModuleRef.name,
version: commentStickerModuleRef.version,
dependencies: [artifactDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, mediaDependency, compositionDependency, textDependency],
types: [
- { name: commentStickerTypes.header.name, schema: commentStickerHeaderSchema },
- { name: commentStickerTypes.style.name, schema: commentStickerStyleSchema },
- { name: commentStickerTypes.itemSpec.name, schema: commentStickerItemSpecSchema },
- { name: commentStickerTypes.content.name, schema: content },
- { name: commentStickerTypes.set.name, schema: commentStickerSetSchema },
- { name: commentStickerTypes.program.name, schema: commentStickerProgramSchema, validator: validator(commentStickerValidatorDigests.program) },
+ { name: commentStickerTypes.header.name },
+ { name: commentStickerTypes.style.name },
+ { name: commentStickerTypes.itemSpec.name },
+ { name: commentStickerTypes.content.name },
+ { name: commentStickerTypes.set.name },
+ { name: commentStickerTypes.program.name },
],
capabilities: [],
producers: [
- { name: commentStickerProducers.createContent.name, inputs: [{ name: "comment", type: textTypes.text }], outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [], implementation: registered(commentStickerImplementationDigests.createContent) },
+ { name: commentStickerProducers.createContent.name, inputs: [{ name: "comment", type: textTypes.text }], outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [] },
...([
- [commentStickerProducers.setContentAuthor, commentStickerImplementationDigests.setContentAuthor, "author"],
- [commentStickerProducers.setContentHeader, commentStickerImplementationDigests.setContentHeader, "header"],
- [commentStickerProducers.setContentMeta, commentStickerImplementationDigests.setContentMeta, "meta"],
- ] as const).map(([producer, implementationDigest, field]) => ({
+ [commentStickerProducers.setContentAuthor, "author"],
+ [commentStickerProducers.setContentHeader, "header"],
+ [commentStickerProducers.setContentMeta, "meta"],
+ ] as const).map(([producer, field]) => ({
name: producer.name,
inputs: [{ name: "content", type: commentStickerTypes.content }, { name: field, type: textTypes.text }],
outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [],
- implementation: registered(implementationDigest),
})),
- { name: commentStickerProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: commentStickerTypes.set }], needs: [], implementation: registered(commentStickerImplementationDigests.createSet) },
+ { name: commentStickerProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: commentStickerTypes.set }], needs: [] },
...([
- [commentStickerProducers.appendProgram, commentStickerImplementationDigests.appendProgram, []],
- [commentStickerProducers.appendProgramAvatar, commentStickerImplementationDigests.appendProgramAvatar, [{ name: "avatar", type: artifactTypes.blob }]],
- [commentStickerProducers.appendSelection, commentStickerImplementationDigests.appendSelection, [{ name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }]],
- [commentStickerProducers.appendSelectionAvatar, commentStickerImplementationDigests.appendSelectionAvatar, [{ name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }, { name: "avatar", type: artifactTypes.blob }]],
- [commentStickerProducers.appendMoment, commentStickerImplementationDigests.appendMoment, [{ name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }]],
- [commentStickerProducers.appendMomentAvatar, commentStickerImplementationDigests.appendMomentAvatar, [{ name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }, { name: "avatar", type: artifactTypes.blob }]],
- ] as const).map(([producer, implementationDigest, extra]) => ({
+ [commentStickerProducers.appendProgram, []],
+ [commentStickerProducers.appendProgramAvatar, [{ name: "avatar", type: artifactTypes.blob }]],
+ [commentStickerProducers.appendSelection, [{ name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }]],
+ [commentStickerProducers.appendSelectionAvatar, [{ name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }, { name: "avatar", type: artifactTypes.blob }]],
+ [commentStickerProducers.appendMoment, [{ name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }]],
+ [commentStickerProducers.appendMomentAvatar, [{ name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }, { name: "avatar", type: artifactTypes.blob }]],
+ ] as const).map(([producer, extra]) => ({
name: producer.name,
inputs: [...appendInputs, ...extra],
outputs: [{ name: "set", type: commentStickerTypes.set }],
needs: [],
- implementation: registered(implementationDigest),
})),
- { name: commentStickerProducers.finalize.name, inputs: [{ name: "set", type: commentStickerTypes.set }, { name: "header", type: commentStickerTypes.header }], outputs: [{ name: "program", type: commentStickerTypes.program }], needs: [], implementation: registered(commentStickerImplementationDigests.finalize) },
- { name: commentStickerProducers.render.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }, { name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: commentStickerTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered(commentStickerImplementationDigests.render) },
+ { name: commentStickerProducers.finalize.name, inputs: [{ name: "set", type: commentStickerTypes.set }, { name: "header", type: commentStickerTypes.header }], outputs: [{ name: "program", type: commentStickerTypes.program }], needs: [] },
+ { name: commentStickerProducers.render.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }, { name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: commentStickerTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
],
};
-export const commentStickerManifestDigest = digestOf(commentStickerManifest);
-export const commentStickerDependency = { module: commentStickerModuleRef, digest: commentStickerManifestDigest } as const;
+export const commentStickerDependency = { module: commentStickerModuleRef } as const;
diff --git a/packages/comment-sticker/src/program.ts b/packages/comment-sticker/src/program.ts
index 99186111..ce6d9b21 100644
--- a/packages/comment-sticker/src/program.ts
+++ b/packages/comment-sticker/src/program.ts
@@ -39,26 +39,6 @@ import type {
CommentStickerTextStyle,
} from "./types.js";
-export const commentStickerImplementationDigests = {
- createSet: digestOf("@narratage/comment-sticker/create-set@1"),
- appendProgram: digestOf("@narratage/comment-sticker/append-program@1"),
- appendProgramAvatar: digestOf("@narratage/comment-sticker/append-program-avatar@1"),
- appendSelection: digestOf("@narratage/comment-sticker/append-selection@1"),
- appendSelectionAvatar: digestOf("@narratage/comment-sticker/append-selection-avatar@1"),
- appendMoment: digestOf("@narratage/comment-sticker/append-moment@1"),
- appendMomentAvatar: digestOf("@narratage/comment-sticker/append-moment-avatar@1"),
- createContent: digestOf("@narratage/comment-sticker/create-content@1"),
- setContentAuthor: digestOf("@narratage/comment-sticker/set-content-author@1"),
- setContentHeader: digestOf("@narratage/comment-sticker/set-content-header@1"),
- setContentMeta: digestOf("@narratage/comment-sticker/set-content-meta@1"),
- finalize: digestOf("@narratage/comment-sticker/finalize@1"),
- render: digestOf("@narratage/comment-sticker/render@1"),
-} as const;
-
-export const commentStickerValidatorDigests = {
- program: digestOf("@narratage/comment-sticker/validate-program@1"),
-} as const;
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
@@ -635,7 +615,7 @@ export function renderCommentSticker(canvas: CanvasSpace, space: ProgramSpace, p
assertProgramSpaceIdentity(space);
assertCommentStickerProgram(program);
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: program.id,
presents: program.items.map((item) => ({
id: item.id,
diff --git a/packages/comment-sticker/test/comment-sticker.test.ts b/packages/comment-sticker/test/comment-sticker.test.ts
index 2ec9bc36..ac4b62fd 100644
--- a/packages/comment-sticker/test/comment-sticker.test.ts
+++ b/packages/comment-sticker/test/comment-sticker.test.ts
@@ -91,8 +91,8 @@ test("explicit metadata is rendered and the terminal compiler accepts the Track
canvas: { width: 1080, height: 1920, clearColor: "#000000" },
tracks: [rendered],
}, space);
- assert.match(document.html, /data-svml-element-id="meta"/u);
- assert.match(document.html, /data-svml-element-id="body"/u);
+ assert.match(document.html, /data-narratage-element-id="meta"/u);
+ assert.match(document.html, /data-narratage-element-id="body"/u);
});
test("SVS controls appearance and local motion but cannot smuggle geometry", () => {
diff --git a/packages/compiler-markup-node/test/compiler.test.ts b/packages/compiler-markup-node/test/compiler.test.ts
index 73623ab9..2e684ae2 100644
--- a/packages/compiler-markup-node/test/compiler.test.ts
+++ b/packages/compiler-markup-node/test/compiler.test.ts
@@ -10,30 +10,27 @@ import test from "node:test";
import { createMarkupNodeCompiler } from "@narratage/compiler-markup-node";
import type { NodePackageContribution } from "@narratage/package-loader-node";
-import { digestOf } from "@narratage/protocol";
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import { NodeFilesystemWorkspace } from "@narratage/workspace-fs-node";
const module = { name: "example.card", version: "1" } as const;
const resultType = { module, name: "CardResult" } as const;
-const implementationDigest = digestOf("example.card/card-surface@1");
const cardSurface = {
name: "card",
tag: "Card",
mode: "structured",
outputs: [resultType],
- implementation: { digest: implementationDigest },
} as const;
const installedPackage: NodePackageContribution = {
- format: "svml.node-package@1",
+ format: "narratage.node-package@1",
modules: [{
manifest: {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: module.name,
version: module.version,
dependencies: [],
- types: [{ name: resultType.name, schema: { kind: "string", minLength: 1 } }],
+ types: [{ name: resultType.name }],
capabilities: [],
producers: [],
},
@@ -67,7 +64,7 @@ const installedPackage: NodePackageContribution = {
};
test("Markup compiler alone selects Markup Surface Host facets from a generic package contribution", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-markup-compiler-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-markup-compiler-"));
try {
const source = join(root, "main.svml");
await writeFile(source, `<?svml using="@narratage/markup@1"?>
diff --git a/packages/compiler-node/README.md b/packages/compiler-node/README.md
index 54f70e28..faf9900b 100644
--- a/packages/compiler-node/README.md
+++ b/packages/compiler-node/README.md
@@ -53,6 +53,6 @@ The package contains no Script, video, Provider, queue, credentials or rendering
non-video application can use it with only its own manifests, Frontends, Surfaces and chosen
Workspace implementation.
-Package installation, lockfile-based third-party code loading and sandbox execution remain Host
+Package installation, third-party code loading and sandbox execution remain Host
features above this registry; treating an import string as permission to execute npm code would
violate the trust boundary.
diff --git a/packages/compiler-node/src/modules.ts b/packages/compiler-node/src/modules.ts
index 427e85aa..533c8466 100644
--- a/packages/compiler-node/src/modules.ts
+++ b/packages/compiler-node/src/modules.ts
@@ -1,7 +1,4 @@
-import {
- computeModuleDigest,
- createResolvedClosure,
-} from "@narratage/core";
+import { createResolvedClosure } from "@narratage/core";
import type {
ModuleManifest,
ModuleRef,
@@ -90,13 +87,6 @@ export class ModulePackageRegistry implements ModulePackageRegistryLike {
dependencyKey,
);
}
- if (computeModuleDigest(resolved) !== dependency.digest) {
- throw new NodeCompilerError(
- "MODULE_DEPENDENCY_DIGEST_MISMATCH",
- `${key} requires another digest of ${dependencyKey}`,
- dependencyKey,
- );
- }
visit(dependencyKey);
}
};
diff --git a/packages/compiler-node/src/run.ts b/packages/compiler-node/src/run.ts
index d9637428..5d56ea9e 100644
--- a/packages/compiler-node/src/run.ts
+++ b/packages/compiler-node/src/run.ts
@@ -14,7 +14,6 @@ import type {
BuildRequest,
BuildState,
BuildState as ArchivedBuildState,
- Digest,
StoredValue,
} from "@narratage/protocol";
import {
@@ -276,7 +275,7 @@ export class NodeRunCompiler {
};
}
- planCompilation(compilation: NodeCompiledRun, implementationClosure?: Digest): PlannedBuild {
+ planCompilation(compilation: NodeCompiledRun): PlannedBuild {
const authorGraph = compilation.author.graph;
const selected = new Map(compilation.run.graph.satisfactions.map((item) => [item.output, item.candidate]));
const fullGraph = sealCompiledGraph({
@@ -290,20 +289,18 @@ export class NodeRunCompiler {
});
const fullRequest = sealBuildRequest({
graph: fullGraph.id,
- ...(implementationClosure === undefined ? {} : { implementationClosure }),
targets: compilation.run.graph.targets,
});
const sliced = sliceExecution(compilation.program, fullGraph, fullRequest);
const request = sealBuildRequest({
graph: sliced.graph.id,
- ...(implementationClosure === undefined ? {} : { implementationClosure }),
targets: compilation.run.graph.targets,
});
const state = start(sliced.program, sliced.graph, request);
return { compilation, request: state.request, plan: state.plan, state };
}
- async planFile(file: string, implementationClosure?: Digest): Promise<PlannedBuild> {
- return this.planCompilation(await this.compileFile(file), implementationClosure);
+ async planFile(file: string): Promise<PlannedBuild> {
+ return this.planCompilation(await this.compileFile(file));
}
}
diff --git a/packages/compiler-node/test/compiler.test.ts b/packages/compiler-node/test/compiler.test.ts
index 9ae16862..6435f551 100644
--- a/packages/compiler-node/test/compiler.test.ts
+++ b/packages/compiler-node/test/compiler.test.ts
@@ -53,7 +53,7 @@ import { NodeFilesystemWorkspace } from "@narratage/workspace-fs-node";
function emptyManifest(name: string, version = "1"): ModuleManifest {
return {
- format: "svml.module@1",
+ format: "narratage.module@1",
name,
version,
dependencies: [],
@@ -63,13 +63,12 @@ function emptyManifest(name: string, version = "1"): ModuleManifest {
};
}
-test("registered module imports close exact transitive manifest dependencies", () => {
+test("registered module imports close transitive module dependencies", () => {
const base = emptyManifest("example.base");
const feature: ModuleManifest = {
...emptyManifest("example.feature"),
dependencies: [{
module: { name: base.name, version: base.version },
- digest: computeModuleDigest(base),
}],
};
const modules = new ModulePackageRegistry();
@@ -83,7 +82,7 @@ test("registered module imports close exact transitive manifest dependencies", (
);
});
-test("module registration is atomic and dependency digests cannot drift", () => {
+test("module registration is atomic", () => {
const first = emptyManifest("example.first");
const second = emptyManifest("example.second");
const modules = new ModulePackageRegistry();
@@ -94,19 +93,6 @@ test("module registration is atomic and dependency digests cannot drift", () =>
);
assert.equal(modules.resolve("example.second@1"), undefined);
- const wrongDependency: ModuleManifest = {
- ...emptyManifest("example.wrong"),
- dependencies: [{
- module: { name: first.name, version: first.version },
- digest: digestOf("another implementation"),
- }],
- };
- modules.register({ manifest: wrongDependency });
- assert.throws(
- () => modules.createClosure(["example.wrong@1"]),
- (error: unknown) => error instanceof NodeCompilerError
- && error.code === "MODULE_DEPENDENCY_DIGEST_MISMATCH",
- );
});
const laboratory = { name: "example.compiler-lab", version: "1" } as const;
@@ -115,23 +101,19 @@ const producer = { module: laboratory, name: "produce" } satisfies ProducerRef;
const surfaceDigest = digestOf("example.compiler-lab/surface@1");
const resultSurface = {
name: "result", tag: "Result", mode: "structured", outputs: [],
- implementation: { digest: surfaceDigest },
} as const;
const laboratoryManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: laboratory.name,
version: laboratory.version,
dependencies: [],
- types: [{ name: resultType.name, schema: { kind: "string", minLength: 1 } }],
+ types: [{ name: resultType.name }],
capabilities: [],
producers: [{
name: producer.name,
inputs: [],
outputs: [{ name: "result", type: resultType }],
needs: [],
- implementation: {
- digest: digestOf("example.compiler-lab/produce@1"),
- },
}],
};
const fragment = sealGraphFragment({
@@ -154,11 +136,10 @@ const assetType = { module: assetLaboratory, name: "Asset" } satisfies TypeRef;
const assetSurfaceDigest = digestOf("example.asset-lab/surface@1");
const assetSurface = {
name: "asset", tag: "Asset", mode: "structured", outputs: [assetType],
- implementation: { digest: assetSurfaceDigest },
} as const;
const assetManifest: ModuleManifest = {
...emptyManifest(assetLaboratory.name),
- types: [{ name: assetType.name, schema: { kind: "blob" } }],
+ types: [{ name: assetType.name }],
};
function compiler(
@@ -214,16 +195,12 @@ const previewManifest: ModuleManifest = {
...emptyManifest(previewModule.name),
dependencies: [{
module: laboratory,
- digest: computeModuleDigest(laboratoryManifest),
}],
producers: [{
name: previewProducer.name,
inputs: [],
outputs: [{ name: "result", type: resultType }],
needs: [],
- implementation: {
- digest: digestOf("example.compiler-preview/preview@1"),
- },
}],
};
const previewFragment = sealGraphFragment({
@@ -351,7 +328,7 @@ async function readAttachment(attachment: ArtifactAttachment | undefined): Promi
}
test("Node Compiler discovers real imports and emits a named public Author Graph export", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-compiler-node-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-compiler-node-"));
const file = join(root, "main.svml");
await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
@@ -368,7 +345,7 @@ test("Node Compiler discovers real imports and emits a named public Author Graph
});
test("Author Frontend identity comes only from the mandatory Source Header, never the suffix", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-self-described-source-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-self-described-source-"));
const text = `<?svml using="@narratage/markup@1"?>
<svml>
<import as="lab" from="example.compiler-lab@1"/>
@@ -392,7 +369,7 @@ test("Author Frontend identity comes only from the mandatory Source Header, neve
});
test("Run-only Fragment modules extend the execution closure without polluting the Author Graph", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-dual-graph-closure-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-dual-graph-closure-"));
const unused = emptyManifest("example.unused-video-feature");
const authorFile = join(root, "main.svml");
const runFile = join(root, "build.svrun");
@@ -440,7 +417,7 @@ test("Run-only Fragment modules extend the execution closure without polluting t
});
test("static Run checking accepts a future BuildRecord without opening a BuildArchive", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-future-build-record-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-future-build-record-"));
const authorFile = join(root, "main.svml");
const runFile = join(root, "reuse.svrun");
await writeFile(authorFile, `<?svml using="@narratage/markup@1"?>
@@ -477,7 +454,7 @@ test("static Run checking accepts a future BuildRecord without opening a BuildAr
});
test("static Run checking suggests the nearest Author export", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-run-target-suggestion-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-run-target-suggestion-"));
const authorFile = join(root, "main.svml");
const runFile = join(root, "build.svrun");
await writeFile(authorFile, `<?svml using="@narratage/markup@1"?>
@@ -505,7 +482,7 @@ test("static Run checking suggests the nearest Author export", async () => {
});
test("source assets become graph values and a Host transfer bundle without closure metadata", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-source-assets-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-source-assets-"));
const file = join(root, "main.svml");
const asset = join(root, "reference.bin");
await writeFile(file, `<?svml using="@narratage/markup@1"?>
@@ -527,7 +504,7 @@ test("source assets become graph values and a Host transfer bundle without closu
});
test("an installed package Surface can contribute locked bytes without an author file or network", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-embedded-assets-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-embedded-assets-"));
const file = join(root, "main.svml");
await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
@@ -545,7 +522,7 @@ test("an installed package Surface can contribute locked bytes without an author
});
test("Run compilation retains embedded Author attachments for later Runtime staging", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-run-author-attachments-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-run-author-attachments-"));
const authorFile = join(root, "main.svml");
const runFile = join(root, "build.svrun");
await writeFile(authorFile, `<?svml using="@narratage/markup@1"?>
@@ -575,7 +552,7 @@ test("Run compilation retains embedded Author attachments for later Runtime stag
});
test("filesystem Workspace contains symlinks and locks source text plus asset identity once", async () => {
- const parent = await mkdtemp(join(tmpdir(), "svml-source-host-"));
+ const parent = await mkdtemp(join(tmpdir(), "narratage-source-host-"));
const root = join(parent, "project");
await mkdir(root);
const entryPath = join(root, "main.svml");
@@ -623,7 +600,7 @@ test("filesystem Workspace contains symlinks and locks source text plus asset id
});
test("an asset root widens bytes without widening Source imports", async () => {
- const parent = await mkdtemp(join(tmpdir(), "svml-asset-root-"));
+ const parent = await mkdtemp(join(tmpdir(), "narratage-asset-root-"));
const project = join(parent, "project");
const library = join(parent, "library");
await mkdir(project);
@@ -646,7 +623,7 @@ test("an asset root widens bytes without widening Source imports", async () => {
});
test("filesystem and in-memory Workspaces compile identical source and bytes to one semantic result", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-workspace-equivalence-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-workspace-equivalence-"));
const file = join(root, "main.svml");
const source = `<?svml using="@narratage/markup@1"?>
<svml>
diff --git a/packages/component-kit/README.md b/packages/component-kit/README.md
index e6b677a7..0e19bcd2 100644
--- a/packages/component-kit/README.md
+++ b/packages/component-kit/README.md
@@ -2,11 +2,11 @@
The minimal host-neutral SDK for trusted deterministic compute components. A package exports
enumerable Producer and Type-owner Validator facets. Both identities are data: an exact nominal
-reference plus implementation digest and handler. Package locks and Hosts can inspect and compare
-the identities without running an opaque `install()` callback. Producer handlers receive only the
+reference plus handler. Hosts enumerate them without running an opaque `install()` callback.
+Producer handlers receive only the
Core command, Producer identity and immutable typed inputs.
-They receive no ArtifactStore, credentials, network client, queue or Runtime Component. Work that
+They receive no ArtifactStore, credentials, network client, queue or Runtime infrastructure. Work that
needs those authorities must emit an explicit Need and be implemented by a separately selected
Endpoint package. `@narratage/driver-node` implements the structural registrar but is not part of this
SDK.
diff --git a/packages/component-kit/src/index.ts b/packages/component-kit/src/index.ts
index e7fba2f0..6a6c9c69 100644
--- a/packages/component-kit/src/index.ts
+++ b/packages/component-kit/src/index.ts
@@ -1,6 +1,5 @@
import type {
CanonicalValue,
- Digest,
InvokeProducerCommand,
ProducerRef,
StoredValue,
@@ -23,7 +22,6 @@ export type TypeValidatorHandler = (
export interface TypeValidatorRegistrar {
register(
type: TypeRef,
- implementationDigest: Digest,
handler: TypeValidatorHandler,
): void;
}
@@ -51,15 +49,13 @@ export type ProducerHandler = (
export interface ProducerRegistrar {
registerProducer(
producer: ProducerRef,
- implementationDigest: Digest,
handler: ProducerHandler,
): void;
}
-/** Enumerable deterministic Producer identity and its trusted implementation. */
+/** Enumerable deterministic Producer handler owned by its package. */
export type ProducerFacet = {
readonly producer: ProducerRef;
- readonly implementationDigest: Digest;
readonly handler: ProducerHandler;
};
@@ -68,14 +64,13 @@ export function registerProducerFacets(
facets: readonly ProducerFacet[],
): void {
for (const facet of facets) {
- registry.registerProducer(facet.producer, facet.implementationDigest, facet.handler);
+ registry.registerProducer(facet.producer, facet.handler);
}
}
-/** Enumerable validator identity. Package locks can bind this without serializing its handler. */
+/** Package-owned semantic validator. */
export type TypeValidatorFacet = {
readonly type: TypeRef;
- readonly implementationDigest: Digest;
readonly handler: TypeValidatorHandler;
};
@@ -84,11 +79,11 @@ export function registerTypeValidatorFacets(
facets: readonly TypeValidatorFacet[],
): void {
for (const facet of facets) {
- registry.register(facet.type, facet.implementationDigest, facet.handler);
+ registry.register(facet.type, facet.handler);
}
}
-/** Trusted deterministic implementation package; it selects no Provider or Runtime Component. */
+/** Trusted deterministic implementation package; it selects no Provider or Runtime infrastructure. */
export type ComponentPackage = {
readonly producers?: readonly ProducerFacet[];
readonly validators?: readonly TypeValidatorFacet[];
diff --git a/packages/composition/package.json b/packages/composition/package.json
index 07b0f3b9..13c7be80 100644
--- a/packages/composition/package.json
+++ b/packages/composition/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/composition/src/activation.ts b/packages/composition/src/activation.ts
index f878387a..31993ca0 100644
--- a/packages/composition/src/activation.ts
+++ b/packages/composition/src/activation.ts
@@ -1,3 +1,3 @@
import { compositionComponent, compositionManifest } from "./index.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: compositionManifest }], components: [compositionComponent] };
-export default svmlPackage;
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: compositionManifest }], components: [compositionComponent] };
+export default narratagePackage;
diff --git a/packages/composition/src/component.ts b/packages/composition/src/component.ts
index 27cc1f67..f03bb11e 100644
--- a/packages/composition/src/component.ts
+++ b/packages/composition/src/component.ts
@@ -1,10 +1,10 @@
import type { ComponentPackage } from "@narratage/component-kit";
-import { compositionTypes, compositionValidatorDigests } from "./manifest.js";
+import { compositionTypes } from "./manifest.js";
import { assertAudioTrackIdentity, assertCompositionIdentity, assertVisualTrackIdentity } from "./track.js";
import type { AudioTrack, Composition, VisualTrack } from "./track.js";
function inline(value: { readonly kind: string; readonly value?: unknown }, subject: string): unknown { if (value.kind !== "inline") throw new Error(`${subject} must be inline`); return value.value; }
export const compositionComponent = { validators: [
- { type: compositionTypes.visualTrack, implementationDigest: compositionValidatorDigests.visualTrack, handler: ({ value }) => assertVisualTrackIdentity(inline(value, "VisualTrack") as VisualTrack) },
- { type: compositionTypes.audioTrack, implementationDigest: compositionValidatorDigests.audioTrack, handler: ({ value }) => assertAudioTrackIdentity(inline(value, "AudioTrack") as AudioTrack) },
- { type: compositionTypes.composition, implementationDigest: compositionValidatorDigests.composition, handler: ({ value }) => assertCompositionIdentity(inline(value, "Composition") as Composition) },
+ { type: compositionTypes.visualTrack, handler: ({ value }) => assertVisualTrackIdentity(inline(value, "VisualTrack") as VisualTrack) },
+ { type: compositionTypes.audioTrack, handler: ({ value }) => assertAudioTrackIdentity(inline(value, "AudioTrack") as AudioTrack) },
+ { type: compositionTypes.composition, handler: ({ value }) => assertCompositionIdentity(inline(value, "Composition") as Composition) },
] } satisfies ComponentPackage;
diff --git a/packages/composition/src/index.ts b/packages/composition/src/index.ts
index e1c1845f..65961148 100644
--- a/packages/composition/src/index.ts
+++ b/packages/composition/src/index.ts
@@ -1,5 +1,5 @@
export { compositionComponent } from "./component.js";
-export { compositionDependency, compositionManifest, compositionManifestDigest, compositionModuleRef, compositionTypes, compositionValidatorDigests } from "./manifest.js";
+export { compositionDependency, compositionManifest, compositionModuleRef, compositionTypes } from "./manifest.js";
export {
audioTrackSchema,
compositionSchema,
diff --git a/packages/composition/src/manifest.ts b/packages/composition/src/manifest.ts
index 658bfe22..c9b41212 100644
--- a/packages/composition/src/manifest.ts
+++ b/packages/composition/src/manifest.ts
@@ -5,13 +5,11 @@ import type { ModuleManifest, TypeRef } from "@narratage/protocol";
import { audioTrackSchema, compositionSchema, visualTrackSchema } from "./schema.js";
export const compositionModuleRef = { name: "@narratage/composition", version: "1" } as const;
export const compositionTypes = { visualTrack: { module: compositionModuleRef, name: "VisualTrack" }, audioTrack: { module: compositionModuleRef, name: "AudioTrack" }, composition: { module: compositionModuleRef, name: "Composition" } } satisfies Record<string, TypeRef>;
-export const compositionValidatorDigests = { visualTrack: digestOf("@narratage/composition/validate-visual-track@1"), audioTrack: digestOf("@narratage/composition/validate-audio-track@1"), composition: digestOf("@narratage/composition/validate-composition@1") } as const;
const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: { digest } });
-export const compositionManifest: ModuleManifest = { format: "svml.module@1", name: compositionModuleRef.name, version: compositionModuleRef.version,
+export const compositionManifest: ModuleManifest = { format: "narratage.module@1", name: compositionModuleRef.name, version: compositionModuleRef.version,
dependencies: [mediaDependency, programSpaceDependency, visualIrDependency], types: [
- { name: compositionTypes.visualTrack.name, schema: visualTrackSchema, validator: validator(compositionValidatorDigests.visualTrack) },
- { name: compositionTypes.audioTrack.name, schema: audioTrackSchema, validator: validator(compositionValidatorDigests.audioTrack) },
- { name: compositionTypes.composition.name, schema: compositionSchema, validator: validator(compositionValidatorDigests.composition) },
+ { name: compositionTypes.visualTrack.name },
+ { name: compositionTypes.audioTrack.name },
+ { name: compositionTypes.composition.name },
], capabilities: [], producers: [] };
-export const compositionManifestDigest = digestOf(compositionManifest);
-export const compositionDependency = { module: compositionModuleRef, digest: compositionManifestDigest } as const;
+export const compositionDependency = { module: compositionModuleRef } as const;
diff --git a/packages/composition/test/render.test.ts b/packages/composition/test/render.test.ts
index 6686a806..f7afa370 100644
--- a/packages/composition/test/render.test.ts
+++ b/packages/composition/test/render.test.ts
@@ -81,7 +81,7 @@ test("CompositableSurfaceRef distinguishes a typed alpha surface from an ordinar
test("exact fonts own font selection and cannot conflict with raw CSS font facts", () => {
const invalid = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "invalid-font-track",
presents: [{
id: "title",
@@ -109,7 +109,7 @@ test("exact fonts own font selection and cannot conflict with raw CSS font facts
test("animated materialized Surfaces must exactly share the Present frame domain", () => {
const valid = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "surface-track",
presents: [{
id: "surface",
@@ -150,7 +150,7 @@ test("animated materialized Surfaces must exactly share the Present frame domain
test("a local mask owns exactly one mask root and one content root inside its Present", () => {
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "masked-text",
presents: [{
id: "mask",
diff --git a/packages/composition/test/track.test.ts b/packages/composition/test/track.test.ts
index dc29d2c0..97bb3a41 100644
--- a/packages/composition/test/track.test.ts
+++ b/packages/composition/test/track.test.ts
@@ -50,7 +50,7 @@ function fixture() {
frameRate: { numerator: 30, denominator: 1 },
});
const visual = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "caption",
presents: [{
id: "cue-1",
@@ -157,7 +157,7 @@ test("VisualTrack cannot silently extend the versioned public Visual IR", () =>
canvas: { width: 1080, height: 1920, clearColor: "#000000" },
tracks: [unknownStyle],
}), programSpace),
- /outside svml\.visual-ir@1/u,
+ /outside narratage\.visual-ir@1/u,
);
const fixedPosition = sealVisualTrack({
diff --git a/packages/core/README.md b/packages/core/README.md
index 5153cb21..7c6ba209 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -3,7 +3,7 @@
The domain-neutral Demand compiler and verified Build state machine.
The package accepts an already resolved module closure, typed authored modules, a complete
-`svml.graph@1` and a `svml.build-request@1`. It verifies explicit Satisfaction and compiles the finite
+`narratage.graph@1` and a `narratage.build-request@1`. It verifies explicit Satisfaction and compiles the finite
BuildPlan by traversing backwards from every Target, resolving Logical Outputs and memoizing shared
atomic Operations by stable OperationId during compilation. The BuildPlan is frozen before any
external Command; execution performs no Candidate selection, graph mutation or content-based
diff --git a/packages/core/src/graph.ts b/packages/core/src/graph.ts
index ced98b3a..2eb35abe 100644
--- a/packages/core/src/graph.ts
+++ b/packages/core/src/graph.ts
@@ -91,7 +91,7 @@ export function sealCompiledGraph(
operations: [...graph.operations].map(normalizeOperation).sort((a, b) => a.id.localeCompare(b.id)),
};
const content = {
- format: "svml.graph@1" as const,
+ format: "narratage.graph@1" as const,
...normalized,
};
return { ...content, id: digestOf(content) };
@@ -104,11 +104,8 @@ export function sealBuildRequest(
.map((target) => ({ output: target.output }))
.sort((a, b) => a.output.localeCompare(b.output));
const content = {
- format: "svml.build-request@1" as const,
+ format: "narratage.build-request@1" as const,
graph: request.graph,
- ...(request.implementationClosure === undefined
- ? {}
- : { implementationClosure: request.implementationClosure }),
targets,
};
return { ...content, digest: digestOf(content) };
@@ -251,7 +248,7 @@ function verifySatisfaction(
}
export function verifyCompiledGraph(program: LinkedProgram, graph: CompiledGraph): void {
- invariant(graph.format === "svml.graph@1", "UNSUPPORTED_GRAPH", "unsupported compiled graph format");
+ invariant(graph.format === "narratage.graph@1", "UNSUPPORTED_GRAPH", "unsupported compiled graph format");
invariant(isDigest(graph.id), "INVALID_DIGEST", "compiled graph id is invalid");
invariant(
graph.program === program.semanticDigest,
@@ -309,17 +306,12 @@ export function verifyBuildRequest(
): void {
verifyCompiledGraph(program, graph);
invariant(
- request.format === "svml.build-request@1",
+ request.format === "narratage.build-request@1",
"UNSUPPORTED_BUILD_REQUEST",
"unsupported BuildRequest format",
);
invariant(isDigest(request.digest), "INVALID_DIGEST", "BuildRequest digest is invalid");
invariant(request.graph === graph.id, "BUILD_REQUEST_GRAPH_MISMATCH", "BuildRequest belongs to another graph");
- invariant(
- request.implementationClosure === undefined || isDigest(request.implementationClosure),
- "INVALID_IMPLEMENTATION_CLOSURE_DIGEST",
- "BuildRequest implementation closure digest is invalid",
- );
const { digest: _digest, ...content } = request;
invariant(request.digest === digestOf(content), "BUILD_REQUEST_DIGEST_MISMATCH", "BuildRequest digest differs");
invariant(request.targets.length > 0, "EMPTY_BUILD_TARGETS", "BuildRequest has no Targets");
diff --git a/packages/core/src/link.ts b/packages/core/src/link.ts
index 94457fd0..13a245b2 100644
--- a/packages/core/src/link.ts
+++ b/packages/core/src/link.ts
@@ -6,6 +6,7 @@ import type {
ModuleRef,
ProducerRef,
ResolvedModule,
+ ResolvedModuleManifest,
ResolvedModuleClosure,
ResolvedCapabilityDeclaration,
ResolvedProducerDeclaration,
@@ -17,7 +18,6 @@ import type {
import { digestOf, isDigest, recordDigest, semanticRecordsDigest } from "./canonical.js";
import { invariant } from "./error.js";
import { capabilityKey, moduleKey, producerKey, sameModule, sameType, typeKey } from "./reference.js";
-import { validateStoredValue } from "./schema.js";
export type TypedRecordDraft = Omit<TypedRecord, "digest">;
@@ -25,13 +25,33 @@ function manifestRef(manifest: ModuleManifest): ModuleRef {
return { name: manifest.name, version: manifest.version };
}
-export function computeModuleDigest(manifest: ModuleManifest): Digest {
+function resolvedManifest(manifest: ModuleManifest): ResolvedModuleManifest {
+ return {
+ format: manifest.format,
+ name: manifest.name,
+ version: manifest.version,
+ dependencies: manifest.dependencies.map((dependency) => ({ module: { ...dependency.module } })),
+ types: manifest.types.map((type) => ({ name: type.name })),
+ capabilities: manifest.capabilities.map((capability) => ({
+ name: capability.name,
+ returns: structuredClone(capability.returns),
+ })),
+ producers: manifest.producers.map((producer) => ({
+ name: producer.name,
+ inputs: structuredClone(producer.inputs),
+ outputs: structuredClone(producer.outputs),
+ needs: structuredClone(producer.needs),
+ })),
+ };
+}
+
+export function computeModuleDigest(manifest: ResolvedModuleManifest): Digest {
return digestOf(manifest);
}
function computeClosureDigest(modules: readonly ResolvedModule[]): Digest {
return digestOf({
- format: "svml.closure@1",
+ format: "narratage.closure@1",
modules: [...modules]
.sort((left, right) => moduleKey(left.manifest).localeCompare(moduleKey(right.manifest)))
.map((module) => ({ ref: manifestRef(module.manifest), digest: module.digest })),
@@ -41,16 +61,15 @@ function computeClosureDigest(modules: readonly ResolvedModule[]): Digest {
export function createResolvedClosure(
manifests: readonly ModuleManifest[],
): ResolvedModuleClosure {
- const modules = manifests.map((manifest) => ({
- digest: computeModuleDigest(manifest),
- manifest,
- }));
+ const modules = manifests.map((definition) => {
+ const manifest = resolvedManifest(definition);
+ return { digest: computeModuleDigest(manifest), manifest };
+ });
const closure: ResolvedModuleClosure = {
- format: "svml.closure@1",
+ format: "narratage.closure@1",
modules,
digest: computeClosureDigest(modules),
};
- verifyClosure(closure);
return closure;
}
@@ -64,7 +83,7 @@ function ensureUniqueNames(names: readonly string[], kind: string, owner: string
}
export function verifyClosure(closure: ResolvedModuleClosure): void {
- invariant(closure.format === "svml.closure@1", "UNSUPPORTED_CLOSURE", "unsupported closure format");
+ invariant(closure.format === "narratage.closure@1", "UNSUPPORTED_CLOSURE", "unsupported closure format");
invariant(isDigest(closure.digest), "INVALID_DIGEST", "closure digest is invalid");
const modules = new Map<string, ResolvedModule>();
@@ -73,7 +92,7 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
const key = moduleKey(ref);
invariant(ref.name.length > 0, "EMPTY_MODULE_NAME", "module name is empty");
invariant(ref.version.length > 0, "EMPTY_MODULE_VERSION", `${ref.name} version is empty`);
- invariant(module.manifest.format === "svml.module@1", "UNSUPPORTED_MODULE", `${key} format is unsupported`);
+ invariant(module.manifest.format === "narratage.module@1", "UNSUPPORTED_MODULE", `${key} format is unsupported`);
invariant(!modules.has(key), "DUPLICATE_MODULE", `duplicate module ${key}`, key);
invariant(isDigest(module.digest), "INVALID_DIGEST", `${key} digest is invalid`, key);
invariant(
@@ -90,14 +109,6 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
"dependency",
key,
);
- for (const type of module.manifest.types) {
- if (type.validator === undefined) continue;
- invariant(
- isDigest(type.validator.implementation.digest),
- "INVALID_DIGEST",
- `${key}#${type.name} validator digest is invalid`,
- );
- }
for (const producer of module.manifest.producers) {
ensureUniqueNames(producer.inputs.map((item) => item.name), "input port", `${key}#${producer.name}`);
ensureUniqueNames(producer.outputs.map((item) => item.name), "output port", `${key}#${producer.name}`);
@@ -107,11 +118,6 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
"PRODUCER_RESULT_NORMAL_FORM",
`${key}#${producer.name} must declare exactly one public result`,
);
- invariant(
- isDigest(producer.implementation.digest),
- "INVALID_DIGEST",
- `${key}#${producer.name} implementation digest is invalid`,
- );
}
modules.set(key, module);
}
@@ -124,11 +130,6 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
"MISSING_DEPENDENCY",
`${moduleKey(module.manifest)} requires ${moduleKey(dependency.module)}`,
);
- invariant(
- resolved.digest === dependency.digest,
- "DEPENDENCY_DIGEST_MISMATCH",
- `${moduleKey(dependency.module)} does not match the required digest`,
- );
}
}
@@ -256,7 +257,6 @@ export function verifyRecordStructure(
record.id,
);
const declaration = resolveType(closure, record.type);
- validateStoredValue(record.value, declaration.schema, `$record.${record.id}`);
return declaration;
}
diff --git a/packages/core/src/plan.ts b/packages/core/src/plan.ts
index 3d8fac12..762b538d 100644
--- a/packages/core/src/plan.ts
+++ b/packages/core/src/plan.ts
@@ -100,7 +100,7 @@ function planContent(
selections: BuildPlan["selections"],
): Omit<BuildPlan, "id"> {
return {
- format: "svml.plan@1",
+ format: "narratage.plan@1",
graph: graph.id,
request: request.digest,
steps,
@@ -231,7 +231,7 @@ function validatePlanStructure(
request: BuildRequest,
plan: BuildPlan,
): void {
- invariant(plan.format === "svml.plan@1", "UNSUPPORTED_PLAN", "unsupported build plan format");
+ invariant(plan.format === "narratage.plan@1", "UNSUPPORTED_PLAN", "unsupported build plan format");
invariant(plan.graph === graph.id, "PLAN_GRAPH_MISMATCH", "build plan belongs to another graph");
invariant(plan.request === request.digest, "PLAN_REQUEST_MISMATCH", "build plan belongs to another request");
const { id: _id, ...content } = plan;
diff --git a/packages/core/src/reducer.ts b/packages/core/src/reducer.ts
index 51a354dd..3eb640ba 100644
--- a/packages/core/src/reducer.ts
+++ b/packages/core/src/reducer.ts
@@ -128,7 +128,6 @@ function acceptProducerEvent(
const derivationDraft: Omit<Derivation, "id"> = {
step: step.id,
producer: step.producer,
- implementationDigest: producer.implementation.digest,
inputs: inputs.map((record) => ({ id: record.id, digest: record.digest })),
outputs: outputDrafts.map(({ id, digest }) => ({ id, digest })),
needs: needDrafts.map((need) => ({ id: need.id, requestDigest: need.requestDigest })),
@@ -185,7 +184,6 @@ function acceptNeedEvent(
need: need.id,
requestDigest: event.requestDigest,
fulfiller: event.fulfiller,
- ...(event.implementation === undefined ? {} : { implementation: event.implementation }),
output: need.result,
outputDigest,
event: { id: event.id, digest: acceptedEventDigest },
@@ -324,7 +322,7 @@ export function start(
): BuildState {
const plan: BuildPlan = compileBuild(program, graph, request);
const state: BuildState = {
- format: "svml.build@1",
+ format: "narratage.build@1",
id: digestOf({
closure: program.closure.digest,
semantic: program.semanticDigest,
diff --git a/packages/core/src/verify.ts b/packages/core/src/verify.ts
index 4422bb13..78860d01 100644
--- a/packages/core/src/verify.ts
+++ b/packages/core/src/verify.ts
@@ -38,12 +38,6 @@ function verifyDerivation(state: BuildState, derivation: Derivation): void {
`${derivation.id} does not use its planned producer`,
derivation.id,
);
- invariant(
- derivation.implementationDigest === producer.implementation.digest,
- "IMPLEMENTATION_DIGEST_MISMATCH",
- `${derivation.id} implementation digest does not match`,
- derivation.id,
- );
invariant(
JSON.stringify(derivation.inputs.map((item) => item.id).sort()) ===
JSON.stringify(Object.values(step.inputs).sort()),
@@ -100,14 +94,6 @@ function verifyReceipt(state: BuildState, receipt: Receipt): void {
const need = state.needs.find((item) => item.id === receipt.need);
invariant(need !== undefined, "RECEIPT_UNKNOWN_NEED", `${receipt.id} references an unknown need`);
invariant(receipt.fulfiller.length > 0, "EMPTY_FULFILLER", `${receipt.id} fulfiller is empty`);
- if (receipt.implementation !== undefined) {
- invariant(isDigest(receipt.implementation.digest), "INVALID_IMPLEMENTATION_DIGEST", receipt.id);
- invariant(
- isDigest(receipt.implementation.configurationDigest),
- "INVALID_CONFIGURATION_DIGEST",
- receipt.id,
- );
- }
invariant(
receipt.requestDigest === need.requestDigest,
"REQUEST_DIGEST_MISMATCH",
@@ -163,7 +149,7 @@ function verifyOutstanding(state: BuildState, command: CoreCommand): void {
}
export function verifyBuildState(state: BuildState): void {
- invariant(state.format === "svml.build@1", "UNSUPPORTED_BUILD", "unsupported build state format");
+ invariant(state.format === "narratage.build@1", "UNSUPPORTED_BUILD", "unsupported build state format");
invariant(
state.status === "active" || state.status === "complete" || state.status === "failed",
"INVALID_BUILD_STATUS",
diff --git a/packages/core/test/core.test.ts b/packages/core/test/core.test.ts
index 2e32064d..e99c05d7 100644
--- a/packages/core/test/core.test.ts
+++ b/packages/core/test/core.test.ts
@@ -119,21 +119,6 @@ test("accepted events are idempotent and conflicting reuse is rejected", () => {
);
});
-test("schema-invalid producer output is rejected before it becomes a Record", () => {
- const initial = onlyProducer(createGreetingBuild());
- assert.throws(
- () =>
- reduce(initial.state, {
- kind: "producer-completed",
- id: "event:invalid",
- command: initial.command.id,
- outputs: { prompt: { kind: "inline", value: 42 } },
- needs: {},
- }),
- (error: unknown) => error instanceof CoreError && error.code === "VALUE_SCHEMA_MISMATCH",
- );
-});
-
test("oneOf literal discrimination preserves exact-one semantics", () => {
const tagged = (tag: string): ValueSchema => ({
kind: "object",
diff --git a/packages/core/test/demand.test.ts b/packages/core/test/demand.test.ts
index 471c5992..e8d18431 100644
--- a/packages/core/test/demand.test.ts
+++ b/packages/core/test/demand.test.ts
@@ -67,28 +67,20 @@ const implementation = (name: string) => ({
});
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: moduleRef.name,
version: moduleRef.version,
dependencies: [],
types: [
- { name: types.head.name, schema: { kind: "string", minLength: 1 } },
- { name: types.duration.name, schema: { kind: "number", minimum: 0 } },
- { name: types.image.name, schema: { kind: "string", minLength: 1 } },
- { name: types.imageSet.name, schema: { kind: "array", items: { kind: "string" }, minItems: 1 } },
+ { name: types.head.name },
+ { name: types.duration.name },
+ { name: types.image.name },
+ { name: types.imageSet.name },
{
name: types.product.name,
- schema: {
- kind: "object",
- fields: {
- C: { schema: { kind: "string", minLength: 1 } },
- D: { schema: { kind: "string", minLength: 1 } },
- },
- },
},
...[types.a, types.b, types.c, types.d, types.combined].map((type) => ({
name: type.name,
- schema: { kind: "string" as const, minLength: 1 },
})),
],
capabilities: [{ name: seedanceCapability.name, returns: types.image }],
@@ -98,14 +90,12 @@ const manifest: ModuleManifest = {
inputs: [{ name: "head", type: types.head }],
outputs: [{ name: "image", type: types.image }],
needs: [],
- implementation: implementation("p1"),
},
{
name: producers.p2.name,
inputs: [{ name: "head", type: types.head }, { name: "image1", type: types.image }],
outputs: [{ name: "image", type: types.image }],
needs: [],
- implementation: implementation("p2"),
},
{
name: producers.p3.name,
@@ -116,7 +106,6 @@ const manifest: ModuleManifest = {
],
outputs: [{ name: "image", type: types.image }],
needs: [],
- implementation: implementation("p3"),
},
{
name: producers.collect.name,
@@ -127,7 +116,6 @@ const manifest: ModuleManifest = {
],
outputs: [{ name: "images", type: types.imageSet }],
needs: [],
- implementation: implementation("collect"),
},
{
name: producers.seedance.name,
@@ -139,14 +127,12 @@ const manifest: ModuleManifest = {
],
outputs: [],
needs: [{ name: "media", capability: seedanceCapability, returns: types.image }],
- implementation: implementation("seedance"),
},
{
name: producers.black.name,
inputs: [{ name: "duration", type: types.duration }],
outputs: [{ name: "media", type: types.image }],
needs: [],
- implementation: implementation("black"),
},
...[
[producers.a1, "value", types.a],
@@ -156,49 +142,42 @@ const manifest: ModuleManifest = {
inputs: [],
outputs: [{ name: name as string, type: type as TypeRef }],
needs: [],
- implementation: implementation((ref as ProducerRef).name),
})),
{
name: producers.b1.name,
inputs: [{ name: "A", type: types.a }, { name: "B", type: types.b }],
outputs: [{ name: "C", type: types.c }],
needs: [],
- implementation: implementation("b1"),
},
{
name: producers.b2.name,
inputs: [{ name: "A", type: types.a }, { name: "B", type: types.b }],
outputs: [{ name: "D", type: types.d }],
needs: [],
- implementation: implementation("b2"),
},
{
name: producers.makeProduct.name,
inputs: [{ name: "A", type: types.a }, { name: "B", type: types.b }],
outputs: [{ name: "product", type: types.product }],
needs: [],
- implementation: implementation("make-product"),
},
{
name: producers.projectC.name,
inputs: [{ name: "product", type: types.product }],
outputs: [{ name: "C", type: types.c }],
needs: [],
- implementation: implementation("project-c"),
},
{
name: producers.projectD.name,
inputs: [{ name: "product", type: types.product }],
outputs: [{ name: "D", type: types.d }],
needs: [],
- implementation: implementation("project-d"),
},
{
name: producers.c.name,
inputs: [{ name: "C", type: types.c }, { name: "D", type: types.d }],
outputs: [{ name: "combined", type: types.combined }],
needs: [],
- implementation: implementation("c"),
},
],
};
@@ -398,21 +377,6 @@ test("an Existing Value is a normal Candidate root and prevents the paid Need fr
assert.deepEqual(transition.outstanding, []);
});
-test("Provided Values are checked against the Logical Output Contract", () => {
- const program = createProgram();
- const graph = createImageGraph(program);
- const invalid = sealCompiledGraph({
- program: graph.program,
- outputs: graph.outputs,
- operations: graph.operations,
- candidates: graph.candidates.map((item) => item.id === "existing-image1"
- ? providedCandidate("existing-image1", types.image, "provided:image1", 42)
- : item),
- });
- const selected = selectCandidates(invalid, [choose("image1", "existing-image1")]);
- assert.throws(() => start(program, selected, request(selected, ["image1"])), /must be a string/u);
-});
-
test("Provided state survives JSON round-trip and regenerates identical ready Commands", () => {
const state = fixture(["image3"], [
choose("image1", "existing-image1"),
diff --git a/packages/core/test/greeting-fixture.ts b/packages/core/test/greeting-fixture.ts
index 7a0b1655..59b2c0e9 100644
--- a/packages/core/test/greeting-fixture.ts
+++ b/packages/core/test/greeting-fixture.ts
@@ -37,38 +37,19 @@ export const producers = {
assemble: { module: moduleRef, name: "assemble" },
} satisfies Record<string, ProducerRef>;
-export const implementationDigests = {
- makePrompt: digestOf("example.greeting/make-prompt@0"),
- requestText: digestOf("example.greeting/request-text@0"),
- placeholderText: digestOf("example.greeting/placeholder-text@0"),
- assemble: digestOf("example.greeting/assemble@0"),
-};
-
export const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: moduleRef.name,
version: moduleRef.version,
dependencies: [],
types: [
{
name: types.intent.name,
- schema: {
- kind: "object",
- fields: {
- name: { schema: { kind: "string", minLength: 1 } },
- },
- },
},
- { name: types.prompt.name, schema: { kind: "string", minLength: 1 } },
- { name: types.generated.name, schema: { kind: "string", minLength: 1 } },
+ { name: types.prompt.name },
+ { name: types.generated.name },
{
name: types.document.name,
- schema: {
- kind: "object",
- fields: {
- text: { schema: { kind: "string", minLength: 1 } },
- },
- },
},
],
capabilities: [{ name: capabilities.generation.name, returns: types.generated }],
@@ -78,9 +59,6 @@ export const manifest: ModuleManifest = {
inputs: [{ name: "intent", type: types.intent }],
outputs: [{ name: "prompt", type: types.prompt }],
needs: [],
- implementation: {
- digest: implementationDigests.makePrompt,
- },
},
{
name: producers.requestText.name,
@@ -91,27 +69,18 @@ export const manifest: ModuleManifest = {
capability: capabilities.generation,
returns: types.generated,
}],
- implementation: {
- digest: implementationDigests.requestText,
- },
},
{
name: producers.placeholderText.name,
inputs: [{ name: "prompt", type: types.prompt }],
outputs: [{ name: "generated", type: types.generated }],
needs: [],
- implementation: {
- digest: implementationDigests.placeholderText,
- },
},
{
name: producers.assemble.name,
inputs: [{ name: "generated", type: types.generated }],
outputs: [{ name: "document", type: types.document }],
needs: [],
- implementation: {
- digest: implementationDigests.assemble,
- },
},
],
};
@@ -197,7 +166,6 @@ export function greetingGraph(program: LinkedProgram, includeSide = false): Comp
export function createGreetingBuild(options?: {
readonly generationRealization?: "primary" | "placeholder";
- readonly implementationClosure?: import("@narratage/protocol").Digest;
readonly includeSideTarget?: boolean;
}): BuildState {
const closure = createResolvedClosure([manifest]);
@@ -221,9 +189,6 @@ export function createGreetingBuild(options?: {
: sourceGraph;
const request = sealBuildRequest({
graph: graph.id,
- ...(options?.implementationClosure === undefined
- ? {}
- : { implementationClosure: options.implementationClosure }),
targets: [...(options?.includeSideTarget ? [{ output: "side-document" }] : []), {
output: "document",
}],
diff --git a/packages/credential-store-env/README.md b/packages/credential-store-env/README.md
index c7915f06..138f055d 100644
--- a/packages/credential-store-env/README.md
+++ b/packages/credential-store-env/README.md
@@ -10,9 +10,9 @@ The store resolves only the requested key at Endpoint invocation time. It never
serializes the environment. Secret values are handed only to that Endpoint call and do not enter
BuildState, Runtime Closure, Operation checkpoints, logs or SQLite through framework code.
-`createEnvironmentCredentialStorePackage()` exposes it through the same generic Runtime Component
+`createEnvironmentCredentialStorePackage()` exposes it through the same generic Runtime infrastructure
package ABI as every other CredentialStore. A Runtime Profile must activate and select it
-explicitly; `@narratage/local` supplies no credential default. Several selected Stores may coexist,
+explicitly; `@narratage/runtime-local` supplies no credential default. Several selected Stores may coexist,
and this one declines every reference whose `store` is not `env`.
The environment facet is intentionally read-only. Interactive `auth login/logout` requires a
diff --git a/packages/credential-store-env/package.json b/packages/credential-store-env/package.json
index 447ddb26..d9594fde 100644
--- a/packages/credential-store-env/package.json
+++ b/packages/credential-store-env/package.json
@@ -7,12 +7,12 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
}
}
diff --git a/packages/credential-store-env/src/activation.ts b/packages/credential-store-env/src/activation.ts
index 6085e099..7b578626 100644
--- a/packages/credential-store-env/src/activation.ts
+++ b/packages/credential-store-env/src/activation.ts
@@ -1,12 +1,12 @@
import {
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
runtimeConfigExact,
runtimeConfigObject,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createEnvironmentCredentialStorePackage } from "./index.js";
-const environmentCredentialStoreAdapter = createRuntimeComponentAdapterFacet({
+const environmentCredentialStoreAdapter = createRuntimeInfrastructureAdapterFacet({
use: "@narratage/credential-store-env",
validate(context) {
const config = runtimeConfigObject(context.config, "environment CredentialStore");
@@ -17,9 +17,9 @@ const environmentCredentialStoreAdapter = createRuntimeComponentAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [environmentCredentialStoreAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/credential-store-env/src/index.ts b/packages/credential-store-env/src/index.ts
index a7a8b34c..a0827c3d 100644
--- a/packages/credential-store-env/src/index.ts
+++ b/packages/credential-store-env/src/index.ts
@@ -1,10 +1,10 @@
import { digestOf } from "@narratage/protocol";
-import { defineRuntimeComponentPackage } from "@narratage/runtime";
+import { defineRuntimeInfrastructurePackage } from "@narratage/runtime";
import type {
CredentialRef,
CredentialStore,
CredentialValue,
- RuntimeComponentPackage,
+ RuntimeInfrastructurePackage,
} from "@narratage/runtime";
import { verifyCredentialRef } from "@narratage/runtime";
@@ -13,10 +13,6 @@ export const environmentCredentialStoreModuleRef = {
version: "1",
} as const;
-export const environmentCredentialStoreImplementationDigest = digestOf(
- "@narratage/credential-store-env/credential-store@1",
-);
-
export type CreateEnvironmentCredentialStorePackageOptions = {
readonly instance?: string;
readonly environment?: NodeJS.ProcessEnv;
@@ -41,18 +37,15 @@ export class EnvironmentCredentialStore implements CredentialStore {
export function createEnvironmentCredentialStorePackage(
options: CreateEnvironmentCredentialStorePackageOptions = {},
-): RuntimeComponentPackage {
- const instance = options.instance ?? "credentials.env";
- return defineRuntimeComponentPackage({
+): RuntimeInfrastructurePackage {
+ const instance = options.instance ?? "credentials";
+ return defineRuntimeInfrastructurePackage({
module: environmentCredentialStoreModuleRef,
- components: [{
+ instance,
+ parts: [{
role: "credential-store",
+ part: "store",
facet: "credential-store",
- instance,
- implementation: {
- digest: environmentCredentialStoreImplementationDigest,
- },
- configuration: { source: "process-environment", explicitKeysOnly: true },
port: new EnvironmentCredentialStore(options.environment),
}],
});
diff --git a/packages/credential-store-keychain/package.json b/packages/credential-store-keychain/package.json
index 9c663503..24a3c78f 100644
--- a/packages/credential-store-keychain/package.json
+++ b/packages/credential-store-keychain/package.json
@@ -7,12 +7,12 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
}
}
diff --git a/packages/credential-store-keychain/src/activation.ts b/packages/credential-store-keychain/src/activation.ts
index cf04bb98..f2eb768e 100644
--- a/packages/credential-store-keychain/src/activation.ts
+++ b/packages/credential-store-keychain/src/activation.ts
@@ -1,13 +1,13 @@
import {
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
runtimeConfigExact,
runtimeConfigObject,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createKeychainCredentialStorePackage } from "./store.js";
-const keychainCredentialStoreRuntimeAdapter = createRuntimeComponentAdapterFacet({
+const keychainCredentialStoreRuntimeAdapter = createRuntimeInfrastructureAdapterFacet({
use: "@narratage/credential-store-keychain",
validate(context) {
const config = runtimeConfigObject(context.config, "keychain CredentialStore");
@@ -25,9 +25,9 @@ const keychainCredentialStoreRuntimeAdapter = createRuntimeComponentAdapterFacet
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [keychainCredentialStoreRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/credential-store-keychain/src/index.ts b/packages/credential-store-keychain/src/index.ts
index f4825e09..a0bb0372 100644
--- a/packages/credential-store-keychain/src/index.ts
+++ b/packages/credential-store-keychain/src/index.ts
@@ -1,9 +1,4 @@
-export {
- KeychainCredentialStore,
- createKeychainCredentialStorePackage,
- keychainCredentialStoreImplementationDigest,
- keychainCredentialStoreModuleRef,
-} from "./store.js";
+export { KeychainCredentialStore, createKeychainCredentialStorePackage, keychainCredentialStoreModuleRef } from "./store.js";
export type {
CreateKeychainCredentialStorePackageOptions,
KeychainDeleter,
diff --git a/packages/credential-store-keychain/src/store.ts b/packages/credential-store-keychain/src/store.ts
index d67d1148..1e87ba22 100644
--- a/packages/credential-store-keychain/src/store.ts
+++ b/packages/credential-store-keychain/src/store.ts
@@ -1,11 +1,11 @@
import { execFile } from "node:child_process";
import { digestOf } from "@narratage/protocol";
-import { defineRuntimeComponentPackage, verifyCredentialRef } from "@narratage/runtime";
+import { defineRuntimeInfrastructurePackage, verifyCredentialRef } from "@narratage/runtime";
import type {
CredentialRef,
CredentialValue,
- RuntimeComponentPackage,
+ RuntimeInfrastructurePackage,
WritableCredentialStore,
} from "@narratage/runtime";
@@ -14,10 +14,6 @@ export const keychainCredentialStoreModuleRef = {
version: "1",
} as const;
-export const keychainCredentialStoreImplementationDigest = digestOf(
- "@narratage/credential-store-keychain/credential-store@1",
-);
-
/** Reads one named secret. Substituted in tests so no test touches a real keychain. */
export type KeychainReader = (service: string, account: string) => Promise<string | undefined>;
export type KeychainWriter = (service: string, account: string, secret: string) => Promise<void>;
@@ -133,19 +129,16 @@ export class KeychainCredentialStore implements WritableCredentialStore {
export function createKeychainCredentialStorePackage(
options: CreateKeychainCredentialStorePackageOptions = {},
-): RuntimeComponentPackage {
- const instance = options.instance ?? "credentials.keychain";
+): RuntimeInfrastructurePackage {
+ const instance = options.instance ?? "credentials";
const service = options.service ?? DEFAULT_SERVICE;
- return defineRuntimeComponentPackage({
+ return defineRuntimeInfrastructurePackage({
module: keychainCredentialStoreModuleRef,
- components: [{
+ instance,
+ parts: [{
role: "credential-store",
+ part: "store",
facet: "credential-store",
- instance,
- implementation: {
- digest: keychainCredentialStoreImplementationDigest,
- },
- configuration: { source: "os-keychain", service, explicitKeysOnly: true },
port: new KeychainCredentialStore({
service,
...(options.read === undefined ? {} : { read: options.read }),
diff --git a/packages/credential-store-keychain/test/store.test.ts b/packages/credential-store-keychain/test/store.test.ts
index 65f8d5c6..47ed6ffc 100644
--- a/packages/credential-store-keychain/test/store.test.ts
+++ b/packages/credential-store-keychain/test/store.test.ts
@@ -28,22 +28,17 @@ test("an absent entry is absent, and an empty one is not a secret", async () =>
test("a malformed reference is refused before anything is looked up", async () => {
let asked = 0;
const store = new KeychainCredentialStore({ read: async () => { asked += 1; return "x"; } });
- await assert.rejects(async () => await store.resolve({ format: "svml.credential-ref@1", store: "keychain", key: " " } as never));
+ await assert.rejects(async () => await store.resolve({ format: "narratage.credential-ref@1", store: "keychain", key: " " } as never));
assert.equal(asked, 0);
});
test("the configured service is part of the instance's identity", () => {
const configured = createKeychainCredentialStorePackage({ instance: "credentials.team", service: "acme" });
- assert.equal(configured.components[0]?.instance.id, "credentials.team");
+ assert.equal(configured.parts[0]?.instance.id, "credentials.team.store");
// Configuration reaches identity as a digest and is not carried in the
// Closure, so the proof that the service name counts is that a different
// name is a different instance.
const other = createKeychainCredentialStorePackage({ instance: "credentials.team", service: "other" });
- assert.ok(configured.components[0]?.instance.configurationDigest);
- assert.notEqual(
- configured.components[0]?.instance.configurationDigest,
- other.components[0]?.instance.configurationDigest,
- );
});
test("writable facet stores and removes only keychain-owned references", async () => {
diff --git a/packages/deck-track/package.json b/packages/deck-track/package.json
index 60d8b8a4..b657956e 100644
--- a/packages/deck-track/package.json
+++ b/packages/deck-track/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/deck-track/src/activation.ts b/packages/deck-track/src/activation.ts
index 648e3896..f9e20a34 100644
--- a/packages/deck-track/src/activation.ts
+++ b/packages/deck-track/src/activation.ts
@@ -9,8 +9,8 @@ import {
depthStackMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: depthStackManifest,
}],
@@ -29,4 +29,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/deck-track/src/component.ts b/packages/deck-track/src/component.ts
index 91334264..9ef051c5 100644
--- a/packages/deck-track/src/component.ts
+++ b/packages/deck-track/src/component.ts
@@ -10,17 +10,7 @@ import type { Text } from "@narratage/text";
import { renderDepthStack } from "./lower.js";
import { depthStackProducers, depthStackTypes } from "./manifest.js";
-import {
- appendDepthStackMomentCard,
- assertDepthStackProgram,
- createDepthStackCardSet,
- depthStackImplementationDigests,
- depthStackValidatorDigests,
- finalizeDepthStackAtProgramEnd,
- finalizeDepthStackUntilMoment,
- finalizeDepthStackUntilSelection,
- bindDepthStackCardLabelText,
-} from "./program.js";
+import { appendDepthStackMomentCard, assertDepthStackProgram, createDepthStackCardSet, finalizeDepthStackAtProgramEnd, finalizeDepthStackUntilMoment, finalizeDepthStackUntilSelection, bindDepthStackCardLabelText } from "./program.js";
import type {
DepthStackCardLabel,
DepthStackCardLabelStyle,
@@ -51,7 +41,6 @@ export const depthStackComponent = {
producers: [
{
producer: depthStackProducers.bindLabelText,
- implementationDigest: depthStackImplementationDigests.bindLabelText,
handler: ({ inputs }) => ({ outputs: { label: output(bindDepthStackCardLabelText(
inline<DepthStackCardLabelStyle>(inputs.style?.value, "DepthStackCardLabelStyle"),
inline<Text>(inputs.content?.value, "Text"),
@@ -59,12 +48,10 @@ export const depthStackComponent = {
},
{
producer: depthStackProducers.createCards,
- implementationDigest: depthStackImplementationDigests.createCards,
handler: () => ({ outputs: { set: output(createDepthStackCardSet()) }, needs: {} }),
},
{
producer: depthStackProducers.appendMomentCard,
- implementationDigest: depthStackImplementationDigests.appendMomentCard,
handler: ({ inputs }) => ({ outputs: { set: output(appendDepthStackMomentCard(
inline<DepthStackCardSet>(inputs.set?.value, "DepthStackCardSet"),
inline<MediaLayerSet>(inputs.material?.value, "MediaLayerSet"),
@@ -77,7 +64,6 @@ export const depthStackComponent = {
},
{
producer: depthStackProducers.finalizeProgramEnd,
- implementationDigest: depthStackImplementationDigests.finalizeProgramEnd,
handler: ({ inputs }) => {
const value = finalizeInputs(inputs);
return { outputs: { program: output(finalizeDepthStackAtProgramEnd(
@@ -87,7 +73,6 @@ export const depthStackComponent = {
},
{
producer: depthStackProducers.finalizeUntilMoment,
- implementationDigest: depthStackImplementationDigests.finalizeUntilMoment,
handler: ({ inputs }) => {
const value = finalizeInputs(inputs);
return { outputs: { program: output(finalizeDepthStackUntilMoment(
@@ -100,9 +85,6 @@ export const depthStackComponent = {
...([depthStackProducers.finalizeUntilSelectionStart, depthStackProducers.finalizeUntilSelectionEnd] as const)
.map((producer, index) => ({
producer,
- implementationDigest: index === 0
- ? depthStackImplementationDigests.finalizeUntilSelectionStart
- : depthStackImplementationDigests.finalizeUntilSelectionEnd,
handler: ({ inputs }: ProducerHandlerContext) => {
const value = finalizeInputs(inputs);
return { outputs: { program: output(finalizeDepthStackUntilSelection(
@@ -115,7 +97,6 @@ export const depthStackComponent = {
})),
{
producer: depthStackProducers.render,
- implementationDigest: depthStackImplementationDigests.render,
handler: ({ inputs }) => ({ outputs: { track: output(renderDepthStack(
inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
@@ -125,7 +106,6 @@ export const depthStackComponent = {
],
validators: [{
type: depthStackTypes.program,
- implementationDigest: depthStackValidatorDigests.program,
handler: ({ value }) => assertDepthStackProgram(inline<DepthStackProgram>(value, "DepthStackProgram")),
}],
} satisfies ComponentPackage;
diff --git a/packages/deck-track/src/index.ts b/packages/deck-track/src/index.ts
index 58690fac..d7bf646a 100644
--- a/packages/deck-track/src/index.ts
+++ b/packages/deck-track/src/index.ts
@@ -11,48 +11,6 @@ export {
decodeDepthStackSurface,
} from "./surface.js";
export { renderDepthStack } from "./lower.js";
-export {
- depthStackCardLabelSchema,
- depthStackCardLabelStyleSchema,
- depthStackCardSetSchema,
- depthStackCardSpecSchema,
- depthStackDependency,
- depthStackHeaderSchema,
- depthStackManifest, depthStackMarkupSurfaces,
- depthStackManifestDigest,
- depthStackModuleRef,
- depthStackProducers,
- depthStackProgramSchema,
- depthStackSpecSchema,
- depthStackSurfaceImplementationDigests,
- depthStackTypes,
-} from "./manifest.js";
-export {
- appendDepthStackCard,
- appendDepthStackMomentCard,
- assertDepthStackCardLabel,
- assertDepthStackCardLabelStyle,
- assertDepthStackCardSet,
- assertDepthStackCardSpec,
- assertDepthStackHeader,
- assertDepthStackProgram,
- assertDepthStackProgramIdentity,
- assertDepthStackSpec,
- createDepthStackCardSet,
- depthStackImplementationDigests,
- depthStackValidatorDigests,
- finalizeDepthStack,
- finalizeDepthStackAtProgramEnd,
- finalizeDepthStackUntilMoment,
- finalizeDepthStackUntilSelection,
- noDepthStackCardLabel,
- resolveDepthStackPose,
- resolveDepthStackState,
- sealDepthStackCardLabel,
- sealDepthStackCardLabelStyle,
- bindDepthStackCardLabelText,
- sealDepthStackCardSpec,
- sealDepthStackHeader,
- sealDepthStackSpec,
-} from "./program.js";
+export { depthStackCardLabelSchema, depthStackCardLabelStyleSchema, depthStackCardSetSchema, depthStackCardSpecSchema, depthStackDependency, depthStackHeaderSchema, depthStackManifest, depthStackMarkupSurfaces, depthStackModuleRef, depthStackProducers, depthStackProgramSchema, depthStackSpecSchema, depthStackTypes } from "./manifest.js";
+export { appendDepthStackCard, appendDepthStackMomentCard, assertDepthStackCardLabel, assertDepthStackCardLabelStyle, assertDepthStackCardSet, assertDepthStackCardSpec, assertDepthStackHeader, assertDepthStackProgram, assertDepthStackProgramIdentity, assertDepthStackSpec, createDepthStackCardSet, finalizeDepthStack, finalizeDepthStackAtProgramEnd, finalizeDepthStackUntilMoment, finalizeDepthStackUntilSelection, noDepthStackCardLabel, resolveDepthStackPose, resolveDepthStackState, sealDepthStackCardLabel, sealDepthStackCardLabelStyle, bindDepthStackCardLabelText, sealDepthStackCardSpec, sealDepthStackHeader, sealDepthStackSpec } from "./program.js";
export type * from "./types.js";
diff --git a/packages/deck-track/src/lower.ts b/packages/deck-track/src/lower.ts
index a8a14cb8..f49646c6 100644
--- a/packages/deck-track/src/lower.ts
+++ b/packages/deck-track/src/lower.ts
@@ -358,7 +358,7 @@ export function renderDepthStack(
}
}
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: program.id,
presents,
});
diff --git a/packages/deck-track/src/manifest.ts b/packages/deck-track/src/manifest.ts
index 23f59054..65f1d172 100644
--- a/packages/deck-track/src/manifest.ts
+++ b/packages/deck-track/src/manifest.ts
@@ -23,8 +23,6 @@ import { spatialDependency, spatialFrameSchema, spatialTypes } from "@narratage/
import { temporalDependency } from "@narratage/temporal";
import { textDependency, textTypes } from "@narratage/text";
-import { depthStackImplementationDigests, depthStackValidatorDigests } from "./program.js";
-
export const depthStackModuleRef = { name: "@narratage/deck-track", version: "1" } as const;
export const depthStackTypes = {
header: { module: depthStackModuleRef, name: "DepthStackHeader" },
@@ -109,11 +107,6 @@ export const depthStackProgramSchema: ValueSchema = object({
terminalFrame: { schema: positiveInteger }, frame: { schema: spatialFrameSchema }, spec: { schema: depthStackSpecSchema },
cards: { schema: { kind: "array", minItems: 1, items: card } },
});
-
-export const depthStackSurfaceImplementationDigests = {
- label: digestOf("@narratage/deck-track/label-surface@1"),
- track: digestOf("@narratage/deck-track/depth-stack-surface@1"),
-} as const;
const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: registered(digest) });
const finalizeInputs = [
@@ -123,51 +116,50 @@ const finalizeInputs = [
] as const;
export const depthStackMarkupSurfaces = [
- { name: "label", tag: "Label", mode: "structured", outputs: [textTypes.text, depthStackTypes.cardLabelStyle, depthStackTypes.cardLabel], implementation: { digest: depthStackSurfaceImplementationDigests.label } },
+ { name: "label", tag: "Label", mode: "structured", outputs: [textTypes.text, depthStackTypes.cardLabelStyle, depthStackTypes.cardLabel] },
{ name: "track", tag: "DepthStack", mode: "structured", outputs: [
depthStackTypes.header, depthStackTypes.spec, depthStackTypes.cardSpec,
spatialTypes.fit, mediaTrackTypes.sampleLayerSpec, mediaTrackTypes.paintLayerSpec,
depthStackTypes.cardLabel, depthStackTypes.cardLabelStyle, textTypes.text,
depthStackTypes.program, compositionTypes.visualTrack,
- ], implementation: { digest: depthStackSurfaceImplementationDigests.track } },
+ ] },
] as const;
export const depthStackManifest: ModuleManifest = {
- format: "svml.module@1", name: depthStackModuleRef.name, version: depthStackModuleRef.version,
+ format: "narratage.module@1", name: depthStackModuleRef.name, version: depthStackModuleRef.version,
dependencies: [narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, mediaDependency, mediaTrackDependency, compositionDependency, textDependency],
types: [
- { name: depthStackTypes.header.name, schema: depthStackHeaderSchema },
- { name: depthStackTypes.spec.name, schema: depthStackSpecSchema },
- { name: depthStackTypes.cardSpec.name, schema: depthStackCardSpecSchema },
- { name: depthStackTypes.cardLabel.name, schema: depthStackCardLabelSchema },
- { name: depthStackTypes.cardLabelStyle.name, schema: depthStackCardLabelStyleSchema },
- { name: depthStackTypes.cardSet.name, schema: depthStackCardSetSchema },
- { name: depthStackTypes.program.name, schema: depthStackProgramSchema, validator: validator(depthStackValidatorDigests.program) },
+ { name: depthStackTypes.header.name },
+ { name: depthStackTypes.spec.name },
+ { name: depthStackTypes.cardSpec.name },
+ { name: depthStackTypes.cardLabel.name },
+ { name: depthStackTypes.cardLabelStyle.name },
+ { name: depthStackTypes.cardSet.name },
+ { name: depthStackTypes.program.name },
], capabilities: [],
producers: [
- { name: depthStackProducers.bindLabelText.name, inputs: [{ name: "style", type: depthStackTypes.cardLabelStyle }, { name: "content", type: textTypes.text }], outputs: [{ name: "label", type: depthStackTypes.cardLabel }], needs: [], implementation: registered(depthStackImplementationDigests.bindLabelText) },
- { name: depthStackProducers.createCards.name, inputs: [], outputs: [{ name: "set", type: depthStackTypes.cardSet }], needs: [], implementation: registered(depthStackImplementationDigests.createCards) },
+ { name: depthStackProducers.bindLabelText.name, inputs: [{ name: "style", type: depthStackTypes.cardLabelStyle }, { name: "content", type: textTypes.text }], outputs: [{ name: "label", type: depthStackTypes.cardLabel }], needs: [] },
+ { name: depthStackProducers.createCards.name, inputs: [], outputs: [{ name: "set", type: depthStackTypes.cardSet }], needs: [] },
{ name: depthStackProducers.appendMomentCard.name, inputs: [
{ name: "set", type: depthStackTypes.cardSet }, { name: "material", type: mediaTrackTypes.layerSet },
{ name: "label", type: depthStackTypes.cardLabel }, { name: "spec", type: depthStackTypes.cardSpec },
{ name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment },
{ name: "space", type: programSpaceTypes.programSpace },
- ], outputs: [{ name: "set", type: depthStackTypes.cardSet }], needs: [], implementation: registered(depthStackImplementationDigests.appendMomentCard) },
- { name: depthStackProducers.finalizeProgramEnd.name, inputs: finalizeInputs, outputs: [{ name: "program", type: depthStackTypes.program }], needs: [], implementation: registered(depthStackImplementationDigests.finalizeProgramEnd) },
+ ], outputs: [{ name: "set", type: depthStackTypes.cardSet }], needs: [] },
+ { name: depthStackProducers.finalizeProgramEnd.name, inputs: finalizeInputs, outputs: [{ name: "program", type: depthStackTypes.program }], needs: [] },
...([
- [depthStackProducers.finalizeUntilMoment, narrativeTypes.moment, depthStackImplementationDigests.finalizeUntilMoment],
- [depthStackProducers.finalizeUntilSelectionStart, narrativeTypes.selection, depthStackImplementationDigests.finalizeUntilSelectionStart],
- [depthStackProducers.finalizeUntilSelectionEnd, narrativeTypes.selection, depthStackImplementationDigests.finalizeUntilSelectionEnd],
- ] as const).map(([producer, terminalType, implementationDigest]) => ({
+ [depthStackProducers.finalizeUntilMoment, narrativeTypes.moment],
+ [depthStackProducers.finalizeUntilSelectionStart, narrativeTypes.selection],
+ [depthStackProducers.finalizeUntilSelectionEnd, narrativeTypes.selection],
+ ] as const).map(([producer, terminalType]) => ({
name: producer.name, inputs: [...finalizeInputs, { name: "map", type: semanticMapTypes.complete }, { name: "terminal", type: terminalType }],
- outputs: [{ name: "program", type: depthStackTypes.program }], needs: [], implementation: registered(implementationDigest),
+ outputs: [{ name: "program", type: depthStackTypes.program }], needs: [],
})),
{ name: depthStackProducers.render.name, inputs: [
{ name: "canvas", type: spatialTypes.canvas }, { name: "space", type: programSpaceTypes.programSpace },
{ name: "program", type: depthStackTypes.program },
- ], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered(depthStackImplementationDigests.render) },
+ ], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
],
};
-export const depthStackManifestDigest = digestOf(depthStackManifest);
-export const depthStackDependency = { module: depthStackModuleRef, digest: depthStackManifestDigest } as const;
+export const depthStackDependency = { module: depthStackModuleRef } as const;
diff --git a/packages/deck-track/src/program.ts b/packages/deck-track/src/program.ts
index 41bfa68b..429bcadc 100644
--- a/packages/deck-track/src/program.ts
+++ b/packages/deck-track/src/program.ts
@@ -37,21 +37,6 @@ import type {
DepthStackState,
} from "./types.js";
-export const depthStackImplementationDigests = {
- bindLabelText: digestOf("@narratage/deck-track/bind-label-text@1"),
- createCards: digestOf("@narratage/deck-track/create-cards@1"),
- appendMomentCard: digestOf("@narratage/deck-track/append-moment-card@1"),
- finalizeProgramEnd: digestOf("@narratage/deck-track/finalize-program-end@1"),
- finalizeUntilMoment: digestOf("@narratage/deck-track/finalize-until-moment@1"),
- finalizeUntilSelectionStart: digestOf("@narratage/deck-track/finalize-until-selection-start@1"),
- finalizeUntilSelectionEnd: digestOf("@narratage/deck-track/finalize-until-selection-end@1"),
- render: digestOf("@narratage/deck-track/render-depth-stack@1"),
-} as const;
-
-export const depthStackValidatorDigests = {
- program: digestOf("@narratage/deck-track/validate-program@1"),
-} as const;
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
diff --git a/packages/deck-track/test/deck-track.test.ts b/packages/deck-track/test/deck-track.test.ts
index 21696a05..00214395 100644
--- a/packages/deck-track/test/deck-track.test.ts
+++ b/packages/deck-track/test/deck-track.test.ts
@@ -473,7 +473,7 @@ test("Label Surface accepts ordinary graph Text without copying it during author
test("another Deck family can coexist by contributing only the existing VisualTrack waist", () => {
const other: ModuleManifest = {
- format: "svml.module@1" as const,
+ format: "narratage.module@1" as const,
name: "example.carousel",
version: "1",
dependencies: [compositionDependency],
@@ -482,9 +482,6 @@ test("another Deck family can coexist by contributing only the existing VisualTr
inputs: [],
outputs: [{ name: "track", type: compositionTypes.visualTrack }],
needs: [],
- implementation: {
- digest: digestOf("example.carousel/render@1"),
- },
}],
};
const closure = createResolvedClosure([
diff --git a/packages/driver-node/README.md b/packages/driver-node/README.md
index 8c48b898..4bf08e9f 100644
--- a/packages/driver-node/README.md
+++ b/packages/driver-node/README.md
@@ -10,23 +10,22 @@ construction remain outside the execution Driver.
- `EndpointRegistry` binds an already explicit external capability to implementations that may use
APIs, credentials, queues, local runtimes, devices or human services.
- Registrations may declare generic scheduling resources. Provider registrations claim one shared
- Authority plus one exact capability Route. The environment-neutral `@narratage/runtime`
+ Provider pool plus one exact capability lane. The environment-neutral `@narratage/runtime`
Scheduler acquires all claims atomically across Builds; a Runtime Profile may override limits.
- A Producer receives only its command identity and immutable typed inputs. It has no ArtifactStore,
credentials, network, queue or store handle; external work must be emitted as a typed `Need`.
-- Endpoints match the locked `CapabilityRef` and return `TypeRef`. Multiple exact endpoints require
+- Endpoints match an exact `CapabilityRef` and return `TypeRef`. Multiple exact endpoints require
`bind()`. The Registry never routes by return type alone.
- Production-style assembly uses `applyRuntimeClosure()`: Endpoint instance, exact capability and
- return Type, implementation digest, non-secret configuration digest, declared credential slots
- and Profile-owned scheduling must all match atomically.
+ return Type, declared credential slots and Profile-owned scheduling must all match.
A low-level trusted embedding may still register one immediate Endpoint directly; recoverable
- execution always requires the locked Runtime Closure.
+ execution uses the Runtime selection supplied by the host.
- Long-lived external work uses `registerRecoverableEndpoint()`, not an immediate Handler. The Driver
creates a content-addressed Operation before `start()`, persists pending checkpoints, calls
`resume()` for an existing Operation, and replays a persisted completion without another external
- call. A recoverable Endpoint is blocked unless both its locked Runtime Closure and an
+ call. A recoverable Endpoint is blocked unless both its Runtime selection and an
`OperationStore` are present.
-- Endpoint credentials are resolved only for the slots declared by that locked endpoint, immediately
+- Endpoint credentials are resolved only for the slots declared by that endpoint, immediately
before `start/resume/cancel`; secret bytes never become OperationStore or Core state.
- A pending Endpoint may publish `wakeAt`. Retryable terminal failure creates a new attempt and
Operation id under the endpoint's finite retry policy; cancellation becomes an explicit terminal
@@ -34,12 +33,11 @@ construction remain outside the execution Driver.
- Preview, fallback and reuse are graph-level Candidates selected before Core planning, not Endpoint
modes. A reused value is an Existing-Value Candidate; “Pin” is only a possible host UI word for
authoring that explicit selection.
-- Endpoint identity becomes the Receipt fulfiller. The Driver also copies the locked Endpoint
- implementation/configuration and applied Runtime closure digests into the Receipt; handlers return
- only value and operational metadata and cannot self-assert implementation identity.
+- Endpoint identity becomes the Receipt fulfiller; handlers return only value and operational
+ metadata and cannot choose that identity themselves.
- `TypeValidatorRegistry` is a separate exact-Type registry. Before an Event exists, the Driver
- structurally checks every result, executes the Type owner's digest-locked validator when declared,
- and attaches the resulting receipt. Producer and Endpoint handlers cannot self-assert validation.
+ executes the selected Type owner's validator. Producer and Endpoint handlers cannot self-assert
+ validation.
Build state is serializable. Missing Endpoints, generation latency and transient endpoint errors pause a
build without replaying completed Producers.
diff --git a/packages/driver-node/src/driver.ts b/packages/driver-node/src/driver.ts
index 2002f0da..5c677af5 100644
--- a/packages/driver-node/src/driver.ts
+++ b/packages/driver-node/src/driver.ts
@@ -67,7 +67,7 @@ type Executable =
readonly command: FulfillNeedCommand;
readonly endpointId: string;
readonly resources: readonly import("@narratage/runtime").RuntimeResourceClaim[];
- readonly queue?: import("@narratage/runtime").RuntimeQueueRoute;
+ readonly queue?: import("@narratage/runtime").RuntimeQueueLane;
readonly registration: EndpointRegistration;
};
@@ -156,16 +156,6 @@ export class NodeDriver {
},
};
}
- const declaration = resolveProducer(state.program.closure, command.producer);
- if (registration.implementationDigest !== declaration.implementation.digest) {
- return {
- blocked: {
- command: command.id,
- reason: "implementation-mismatch",
- subject: producerRegistryKey(command.producer),
- },
- };
- }
return {
executable: {
command,
@@ -215,15 +205,6 @@ export class NodeDriver {
},
};
}
- if (registration.kind === "recoverable" && this.endpoints.runtimeClosureDigest() === undefined) {
- return {
- blocked: {
- command: command.id,
- reason: "missing-runtime-closure",
- subject: registration.id,
- },
- };
- }
return {
executable: {
command,
@@ -250,20 +231,12 @@ export class NodeDriver {
result.value,
this.validators,
);
- const runtimeImplementation = executable.registration.runtimeImplementation;
- const implementation = runtimeImplementation === undefined
- ? undefined
- : {
- digest: runtimeImplementation.digest,
- configurationDigest: runtimeImplementation.configurationDigest,
- };
const content = {
kind: "need-fulfilled",
command: executable.command.id,
value: result.value,
requestDigest: executable.command.need.requestDigest,
fulfiller: executable.endpointId,
- ...(implementation === undefined ? {} : { implementation }),
} as const;
return { ...content, id: `event:${digestOf(content)}` };
}
@@ -311,7 +284,7 @@ export class NodeDriver {
kind: "command-failed",
command: executable.command.id,
code: "CANCELLED",
- message: `Operation ${snapshot.id} was cancelled by the Runtime authority`,
+ message: `Operation ${snapshot.id} was cancelled by the Runtime pool`,
} as const;
return {
status: "completed",
@@ -335,9 +308,8 @@ export class NodeDriver {
|| snapshot.build !== expected.build
|| snapshot.command !== expected.command
|| snapshot.endpoint !== expected.endpoint
- || snapshot.authority !== expected.authority
- || snapshot.route !== expected.route
- || snapshot.runtimeClosure !== expected.runtimeClosure) {
+ || snapshot.pool !== expected.pool
+ || snapshot.lane !== expected.lane) {
throw new Error(`Operation history for ${expected.command} is not one contiguous retry chain`);
}
});
@@ -351,25 +323,19 @@ export class NodeDriver {
if (executable.registration.kind !== "recoverable") throw new Error("Endpoint is not recoverable");
const operations = this.operations;
if (operations === undefined) throw new Error("recoverable Endpoint requires OperationStore");
- const runtimeClosure = this.endpoints.runtimeClosureDigest();
- if (runtimeClosure === undefined) throw new Error("recoverable Endpoint requires Runtime Closure");
- const implementation = executable.registration.runtimeImplementation;
- if (implementation === undefined) throw new Error("recoverable Endpoint has no implementation identity");
- if (executable.queue === undefined) throw new Error("recoverable Endpoint has no Provider Authority route");
+ if (executable.queue === undefined) throw new Error("recoverable Endpoint has no Provider pool/lane");
const base = {
build: context.build,
command: executable.command.id,
endpoint: executable.endpointId,
- authority: executable.queue.authority,
- route: executable.queue.route,
- runtimeClosure,
+ pool: executable.queue.pool,
+ lane: executable.queue.lane,
} as const;
const maxAttempts = executable.registration.retry?.maxAttempts ?? 1;
const history = await operations.list({
build: base.build,
command: base.command,
endpoint: base.endpoint,
- runtimeClosure: base.runtimeClosure,
});
this.#assertOperationHistory(history, base);
let latest = history.at(-1);
@@ -596,9 +562,8 @@ export class NodeDriver {
build: operation.build,
command: operation.command,
endpoint: operation.endpoint,
- authority: operation.authority,
- route: operation.route,
- runtimeClosure: operation.runtimeClosure,
+ pool: operation.pool,
+ lane: operation.lane,
attempt: operation.attempt,
};
const endpointContext = {
diff --git a/packages/driver-node/src/registry.ts b/packages/driver-node/src/registry.ts
index 83f2fa3d..53762a6c 100644
--- a/packages/driver-node/src/registry.ts
+++ b/packages/driver-node/src/registry.ts
@@ -9,12 +9,10 @@ import type {
} from "@narratage/component-kit";
import type {
CapabilityRef,
- Digest,
Need,
ProducerRef,
TypeRef,
} from "@narratage/protocol";
-import { isDigest } from "@narratage/protocol";
import {
RuntimeModuleRegistry,
runtimeEndpoint,
@@ -57,8 +55,8 @@ function verifyScheduling(scheduling: SchedulingHint | undefined): void {
});
if (new Set(ids).size !== ids.length) throw new Error("scheduling resources contain duplicate ids");
if (scheduling.queue !== undefined
- && (scheduling.queue.authority.trim().length === 0 || scheduling.queue.route.trim().length === 0)) {
- throw new Error("scheduling queue authority and route must not be empty");
+ && (scheduling.queue.pool.trim().length === 0 || scheduling.queue.lane.trim().length === 0)) {
+ throw new Error("scheduling queue pool and lane must not be empty");
}
}
@@ -79,14 +77,13 @@ export class ProducerRegistry implements ProducerRegistrar {
registerProducer(
producer: ProducerRef,
- implementationDigest: Digest,
handler: ProducerHandler,
options: { readonly scheduling?: SchedulingHint } = {},
): void {
const key = producerRegistryKey(producer);
if (this.#producers.has(key)) throw new Error(`producer ${key} is already registered`);
verifyScheduling(options.scheduling);
- this.#producers.set(key, { implementationDigest, handler, ...options });
+ this.#producers.set(key, { handler, ...options });
}
producer(ref: ProducerRef): ProducerRegistration | undefined {
@@ -110,9 +107,9 @@ function verifyEndpointOptions(options: EndpointOptions): void {
export class EndpointRegistry implements EndpointRegistrar {
readonly #registrations: EndpointRegistration[] = [];
- readonly #bindings = new Map<string, string>();
+ readonly #offers = new Map<string, string>();
readonly #runtimeScheduling = new Map<string, SchedulingHint>();
- #runtimeClosure: Digest | undefined;
+ #bound = false;
registerImmediateEndpoint(
id: string,
@@ -123,18 +120,6 @@ export class EndpointRegistry implements EndpointRegistrar {
): void {
if (!id.trim()) throw new Error("endpoint id must not be empty");
verifyEndpointOptions(options);
- if (options.runtimeImplementation !== undefined) {
- if (!isDigest(options.runtimeImplementation.digest)) {
- throw new Error("Endpoint runtime implementation digest is invalid");
- }
- if (!isDigest(options.runtimeImplementation.configurationDigest)) {
- throw new Error("Endpoint runtime configuration digest is invalid");
- }
- const facet = options.runtimeImplementation.facet;
- if (!facet.name.trim() || !facet.module.name.trim() || !facet.module.version.trim()) {
- throw new Error("Endpoint runtime implementation facet is invalid");
- }
- }
const duplicate = this.#registrations.some((candidate) =>
candidate.id === id && sameRef(candidate.capability, capability));
if (duplicate) throw new Error(`endpoint ${id} already registers ${endpointCapabilityKey(capability)}`);
@@ -150,95 +135,72 @@ export class EndpointRegistry implements EndpointRegistrar {
): void {
if (!id.trim()) throw new Error("endpoint id must not be empty");
verifyEndpointOptions(options);
- if (options.runtimeImplementation === undefined || !isDigest(options.runtimeImplementation.digest)) {
- throw new Error("recoverable Endpoint requires a valid Runtime implementation identity");
- }
- if (!isDigest(options.runtimeImplementation.configurationDigest)) {
- throw new Error("recoverable Endpoint requires a valid Runtime configuration identity");
- }
- const facet = options.runtimeImplementation.facet;
- if (!facet.name.trim() || !facet.module.name.trim() || !facet.module.version.trim()) {
- throw new Error("Endpoint runtime implementation facet is invalid");
- }
const duplicate = this.#registrations.some((candidate) =>
candidate.id === id && sameRef(candidate.capability, capability));
if (duplicate) throw new Error(`endpoint ${id} already registers ${endpointCapabilityKey(capability)}`);
this.#registrations.push({ kind: "recoverable", id, capability, returns, endpoint, ...options });
}
- runtimeClosureDigest(): Digest | undefined {
- return this.#runtimeClosure;
- }
-
- /** Bind only implementation-verified Endpoint instances from one locked Runtime Closure. */
+ /** Bind the Endpoint instances selected by one resolved Runtime profile. */
applyRuntimeClosure(
closure: RuntimeClosure,
modules: RuntimeModuleRegistry,
): void {
modules.verifyClosure(closure);
- if (this.#runtimeClosure !== undefined && this.#runtimeClosure !== closure.digest) {
- throw new Error("Endpoint Registry is already bound to another Runtime Closure");
- }
+ if (this.#bound) throw new Error("Endpoint Registry is already bound");
const pending: { readonly key: string; readonly endpoint: string; readonly scheduling: SchedulingHint }[] = [];
- for (const binding of closure.endpoints) {
- const endpoint = runtimeEndpoint(closure, binding.endpoint);
- if (endpoint === undefined) throw new Error(`Runtime Endpoint ${binding.endpoint} is unavailable`);
+ for (const offer of closure.endpoints) {
+ const endpoint = runtimeEndpoint(closure, offer.endpoint);
+ if (endpoint === undefined) throw new Error(`Runtime Endpoint ${offer.endpoint} is unavailable`);
const registration = this.#registrations.find((candidate) =>
candidate.id === endpoint.id
- && sameRef(candidate.capability, binding.capability)
- && sameRef(candidate.returns, binding.returns));
+ && sameRef(candidate.capability, offer.capability)
+ && sameRef(candidate.returns, offer.returns));
if (registration === undefined) {
- throw new Error(`Endpoint ${endpoint.id} is not registered for ${endpointCapabilityKey(binding.capability)}`);
+ throw new Error(`Endpoint ${endpoint.id} is not registered for ${endpointCapabilityKey(offer.capability)}`);
}
const expectedKind = endpoint.lifecycle;
if (registration.kind !== expectedKind) {
throw new Error(`Endpoint ${endpoint.id} lifecycle does not match the Runtime Closure`);
}
- const implementation = registration.runtimeImplementation;
- if (implementation === undefined
- || implementation.digest !== endpoint.implementation.digest
- || implementation.configurationDigest !== endpoint.configurationDigest
- || !sameRef(implementation.facet, endpoint.facet)) {
- throw new Error(`Endpoint ${endpoint.id} implementation does not match the Runtime Closure`);
- }
const credentialSlots = Object.keys(registration.credentials ?? {}).sort();
if (JSON.stringify(credentialSlots) !== JSON.stringify(endpoint.credentialSlots)) {
throw new Error(`Endpoint ${endpoint.id} credential slots do not match the Runtime Closure`);
}
- const route = endpoint.routes.find((item) =>
- sameRef(item.capability, binding.capability) && sameRef(item.returns, binding.returns));
- if (route === undefined) throw new Error(`Endpoint ${endpoint.id} has no locked scheduling route`);
+ const lane = endpoint.lanes.find((item) =>
+ sameRef(item.capability, offer.capability) && sameRef(item.returns, offer.returns));
+ if (lane === undefined) throw new Error(`Endpoint ${endpoint.id} has no locked scheduling lane`);
const scheduling = {
- queue: { authority: endpoint.authority, route: route.route },
+ queue: { pool: endpoint.pool, lane: lane.lane },
resources: [
{
- id: `authority:${endpoint.authority}`,
+ id: `pool:${endpoint.pool}`,
maxActive: endpoint.maxConcurrency,
maxInFlight: endpoint.maxConcurrency,
},
{
- id: `route:${endpoint.authority}/${route.route}`,
- maxActive: route.maxConcurrency,
- maxInFlight: route.maxConcurrency,
+ id: `lane:${endpoint.pool}/${lane.lane}`,
+ maxActive: lane.maxConcurrency,
+ maxInFlight: lane.maxConcurrency,
},
],
};
pending.push({
- key: endpointCapabilityKey(binding.capability),
+ key: endpointCapabilityKey(offer.capability),
endpoint: endpoint.id,
scheduling,
});
}
for (const item of pending) {
- this.#bindings.set(item.key, item.endpoint);
+ this.#offers.set(item.key, item.endpoint);
this.#runtimeScheduling.set(`${item.endpoint}\n${item.key}`, item.scheduling);
}
- this.#runtimeClosure = closure.digest;
+ this.#bound = true;
}
resolve(need: Need): EndpointResolution {
const key = endpointCapabilityKey(need.capability);
- const bound = this.#bindings.get(key);
+ const bound = this.#offers.get(key);
const registrations = this.#registrations.filter((registration) =>
sameRef(registration.capability, need.capability)
&& sameRef(registration.returns, need.returns)
diff --git a/packages/driver-node/src/types.ts b/packages/driver-node/src/types.ts
index 05db1a4d..e676f71b 100644
--- a/packages/driver-node/src/types.ts
+++ b/packages/driver-node/src/types.ts
@@ -34,11 +34,9 @@ export type BlockedCommand = {
readonly command: string;
readonly reason:
| "missing-producer"
- | "implementation-mismatch"
| "missing-endpoint"
| "ambiguous-endpoint"
- | "missing-operation-store"
- | "missing-runtime-closure";
+ | "missing-operation-store";
readonly subject: string;
};
@@ -49,11 +47,10 @@ export type DriverRunResult = {
readonly blocked: readonly BlockedCommand[];
};
-/** Endpoint/implementation scheduling metadata; it never changes Core demand or command identity. */
+/** Endpoint scheduling metadata; it never changes Core demand or command identity. */
export type SchedulingHint = EndpointScheduling;
export type ProducerRegistration = {
- readonly implementationDigest: Digest;
readonly handler: ProducerHandler;
readonly scheduling?: SchedulingHint;
};
diff --git a/packages/driver-node/test/driver.test.ts b/packages/driver-node/test/driver.test.ts
index 45b8a4f7..89d474cf 100644
--- a/packages/driver-node/test/driver.test.ts
+++ b/packages/driver-node/test/driver.test.ts
@@ -12,13 +12,7 @@ import {
} from "@narratage/driver-node";
import { credentialRef } from "@narratage/runtime";
-import {
- capabilities,
- createGreetingBuild,
- implementationDigests,
- producers as greetingProducers,
- types,
-} from "../../core/test/greeting-fixture.js";
+import { capabilities, createGreetingBuild, producers as greetingProducers, types } from "../../core/test/greeting-fixture.js";
function inlineString(value: unknown): string {
if (typeof value !== "string") throw new Error("expected inline string");
@@ -41,7 +35,7 @@ function configuredRegistry(): {
const endpoints = new EndpointRegistry();
const calls = { prompt: 0, request: 0, assemble: 0, fulfill: 0 };
- producers.registerProducer(greetingProducers.makePrompt, implementationDigests.makePrompt, ({ inputs }) => {
+ producers.registerProducer(greetingProducers.makePrompt, ({ inputs }) => {
calls.prompt += 1;
const intent = inputs.intent;
if (intent?.value.kind !== "inline") throw new Error("intent must be inline");
@@ -56,7 +50,7 @@ function configuredRegistry(): {
};
});
- producers.registerProducer(greetingProducers.requestText, implementationDigests.requestText, ({ inputs }) => {
+ producers.registerProducer(greetingProducers.requestText, ({ inputs }) => {
calls.request += 1;
const prompt = inputs.prompt;
assert.equal(prompt?.value.kind, "inline");
@@ -66,7 +60,7 @@ function configuredRegistry(): {
};
});
- producers.registerProducer(greetingProducers.assemble, implementationDigests.assemble, ({ inputs }) => {
+ producers.registerProducer(greetingProducers.assemble, ({ inputs }) => {
calls.assemble += 1;
const generated = inputs.generated;
assert.equal(generated?.value.kind, "inline");
@@ -94,30 +88,18 @@ test("Driver pauses at an unbound Need, serializes, then resumes without rerunni
assert.deepEqual(calls, { prompt: 1, request: 1, assemble: 0, fulfill: 0 });
const restored = parseBuildState(serializeBuildState(paused.state));
- const endpointImplementation = {
- facet: {
- module: { name: "example/runtime", version: "1" },
- name: "generation",
- },
- digest: digestOf("example:generation-implementation"),
- configurationDigest: digestOf({ model: "fixture" }),
- } as const;
endpoints.registerImmediateEndpoint("example:generation", capabilities.generation, types.generated, ({ need }) => {
calls.fulfill += 1;
assert.deepEqual(need.constraints, { prompt: "Greet Ada" });
return {
value: { kind: "inline", value: "Hello, Ada!" },
};
- }, { runtimeImplementation: endpointImplementation });
+ });
const completed = await driver.run(restored);
assert.equal(completed.status, "complete");
assert.deepEqual(calls, { prompt: 1, request: 1, assemble: 1, fulfill: 1 });
assert.equal(completed.state.receipts[0]?.fulfiller, "example:generation");
- assert.deepEqual(completed.state.receipts[0]?.implementation, {
- digest: endpointImplementation.digest,
- configurationDigest: endpointImplementation.configurationDigest,
- });
});
test("Endpoint Registry rejects ambiguity until a Runtime Closure selects one endpoint", async () => {
@@ -211,7 +193,6 @@ test("an alternate Candidate is explicitly selected before execution, never by E
const { producers, endpoints } = configuredRegistry();
producers.registerProducer(
greetingProducers.placeholderText,
- implementationDigests.placeholderText,
() => ({
outputs: { generated: { kind: "inline", value: "Compatible placeholder" } },
needs: {},
@@ -228,18 +209,6 @@ test("an alternate Candidate is explicitly selected before execution, never by E
assert.equal(accepted.state.receipts.length, 0, "an Alternative Producer is not disguised as an Endpoint receipt");
});
-test("Driver refuses a registered implementation whose digest differs from the locked closure", async () => {
- const producers = new ProducerRegistry();
- producers.registerProducer(greetingProducers.makePrompt, implementationDigests.assemble, () => ({
- outputs: { prompt: { kind: "inline", value: "wrong implementation" } },
- needs: {},
- }));
- const result = await new NodeDriver({ producers }).run(createGreetingBuild());
- assert.equal(result.status, "paused");
- assert.equal(result.blocked[0]?.reason, "implementation-mismatch");
- assert.equal(result.state.records.length, 1);
-});
-
test("MemoryArtifactStore is content addressed and returns defensive copies", async () => {
const store = new MemoryArtifactStore();
const source = new Uint8Array([1, 2, 3]);
diff --git a/packages/driver-node/test/scheduler.test.ts b/packages/driver-node/test/scheduler.test.ts
index 1c7a00c1..935c74e8 100644
--- a/packages/driver-node/test/scheduler.test.ts
+++ b/packages/driver-node/test/scheduler.test.ts
@@ -8,18 +8,15 @@ import {
EndpointRegistry,
serializeBuildState,
} from "@narratage/driver-node";
-import type {
- RecoverableEndpoint,
- RuntimeEndpointImplementation,
-} from "@narratage/endpoint-kit";
+import type { RecoverableEndpoint } from "@narratage/endpoint-kit";
import {
LocalBuildScheduler,
MemoryBuildStore,
MemoryOperationStore,
RuntimeModuleRegistry,
localSchedulerOptionsFromClosure,
- resolveRuntimeProfile,
- sealRuntimeProfile,
+ resolveRuntimeClosure,
+ sealResolvedRuntimeProfile,
} from "@narratage/runtime";
import type {
OperationStore,
@@ -36,14 +33,7 @@ import {
start,
} from "@narratage/core";
-import {
- capabilities,
- createGreetingBuild,
- implementationDigests,
- manifest,
- producers as greetingProducers,
- types,
-} from "../../core/test/greeting-fixture.js";
+import { capabilities, createGreetingBuild, manifest, producers as greetingProducers, types } from "../../core/test/greeting-fixture.js";
function createParallelGreetingBuild(generationCount = 2) {
const generations = ["a", "b", "c"].slice(0, generationCount);
@@ -116,7 +106,6 @@ function configuredExecutor(options: {
readonly resource: string;
readonly defaultConcurrency: number;
readonly observe: (active: number) => void;
- readonly runtimeImplementation?: RuntimeEndpointImplementation;
readonly endpointId?: string;
}) {
const producers = new ProducerRegistry();
@@ -146,27 +135,24 @@ function configuredExecutor(options: {
maxInFlight: options.defaultConcurrency,
}],
},
- ...(options.runtimeImplementation === undefined
- ? {}
- : { runtimeImplementation: options.runtimeImplementation }),
},
);
return { executor: new NodeDriver({ producers, endpoints }), endpoints, getCalls: () => calls };
}
function registerGreetingProducers(producers: ProducerRegistry): void {
- producers.registerProducer(greetingProducers.makePrompt, implementationDigests.makePrompt, ({ inputs }) => {
+ producers.registerProducer(greetingProducers.makePrompt, ({ inputs }) => {
const intent = inputs.intent;
assert.equal(intent?.value.kind, "inline");
const name = (intent.value.value as { readonly name: string }).name;
return { outputs: { prompt: { kind: "inline", value: `Greet ${name}` } }, needs: {} };
});
- producers.registerProducer(greetingProducers.requestText, implementationDigests.requestText, ({ inputs }) => {
+ producers.registerProducer(greetingProducers.requestText, ({ inputs }) => {
const prompt = inputs.prompt;
assert.equal(prompt?.value.kind, "inline");
return { outputs: {}, needs: { generation: { prompt: prompt.value.value } } };
});
- producers.registerProducer(greetingProducers.assemble, implementationDigests.assemble, ({ inputs }) => {
+ producers.registerProducer(greetingProducers.assemble, ({ inputs }) => {
const generated = inputs.generated;
assert.equal(generated?.value.kind, "inline");
return {
@@ -178,27 +164,19 @@ function registerGreetingProducers(producers: ProducerRegistry): void {
const runtimeModule = { name: "example.scheduler-runtime", version: "1" } as const;
const providerFacet = { module: runtimeModule, name: "generation-endpoint" } as const;
-const providerImplementationDigest = digestOf("example.scheduler-runtime/generation-endpoint@1");
-
function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverable" = "immediate") {
const manifest: RuntimeModuleManifest = {
- format: "svml.runtime-module@1",
+ format: "narratage.runtime-module@1",
name: runtimeModule.name,
version: runtimeModule.version,
facets: [
{
name: "scheduler",
role: "scheduler",
- implementation: {
- digest: digestOf("example.scheduler-runtime/scheduler@1"),
- },
},
{
name: "operations",
role: "operation-store",
- implementation: {
- digest: digestOf("example.scheduler-runtime/operations@1"),
- },
},
...([
["worker", "worker"],
@@ -209,16 +187,10 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
] as const).map(([name, role]) => ({
name,
role,
- implementation: {
- digest: digestOf(`example.scheduler-runtime/${name}@1`),
- },
})),
{
name: providerFacet.name,
role: "capability-endpoint",
- implementation: {
- digest: providerImplementationDigest,
- },
fulfills: [{ capability: capabilities.generation, returns: types.generated }],
lifecycle,
defaultConcurrency: 1,
@@ -227,7 +199,7 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
};
const modules = new RuntimeModuleRegistry();
modules.register(manifest);
- const closure = resolveRuntimeProfile(modules, sealRuntimeProfile({
+ const closure = resolveRuntimeClosure(modules, sealResolvedRuntimeProfile({
instances: [
{ id: "scheduler.local", facet: { module: runtimeModule, name: "scheduler" } },
{ id: "worker.local", facet: { module: runtimeModule, name: "worker" } },
@@ -236,8 +208,8 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
{ id: "dispatch.memory", facet: { module: runtimeModule, name: "dispatch" } },
{ id: "artifacts.memory", facet: { module: runtimeModule, name: "artifacts" } },
{ id: "credentials.memory", facet: { module: runtimeModule, name: "credentials" } },
- { id: "generation.local", facet: providerFacet, authority: "fixture.account" },
- ].map((instance) => ({ ...instance, configurationDigest: digestOf({}) })),
+ { id: "generation.local", facet: providerFacet, pool: "fixture.account" },
+ ],
scheduler: "scheduler.local",
worker: "worker.local",
stores: {
@@ -255,9 +227,9 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
scheduling: {
maxConcurrency: 8,
resources: [
- { id: "authority:fixture.account", maxConcurrency: laneLimit },
+ { id: "pool:fixture.account", maxConcurrency: laneLimit },
{
- id: `route:fixture.account/${capabilities.generation.module.name}@${capabilities.generation.module.version}#${capabilities.generation.name}`,
+ id: `lane:fixture.account/${capabilities.generation.module.name}@${capabilities.generation.module.version}#${capabilities.generation.name}`,
maxConcurrency: laneLimit,
},
],
@@ -280,14 +252,7 @@ function recoverableExecutor(
capabilities.generation,
types.generated,
endpoint,
- {
- runtimeImplementation: {
- facet: providerFacet,
- digest: providerImplementationDigest,
- configurationDigest: digestOf({}),
- },
- ...(retry === undefined ? {} : { retry }),
- },
+ retry === undefined ? {} : { retry },
);
endpoints.applyRuntimeClosure(runtime.closure, runtime.modules);
return {
@@ -299,7 +264,7 @@ function recoverableExecutor(
test("one local Scheduler shares an Endpoint resource across multiple Builds", async () => {
let maximumActive = 0;
const { executor, getCalls } = configuredExecutor({
- resource: "authority:fixture.account",
+ resource: "pool:fixture.account",
defaultConcurrency: 1,
observe(active) {
maximumActive = Math.max(maximumActive, active);
@@ -315,12 +280,12 @@ test("one local Scheduler shares an Endpoint resource across multiple Builds", a
assert.equal(getCalls(), 2);
assert.equal(maximumActive, 1);
assert.equal(results.every((result) =>
- result.outcomes.some((entry) => entry.resources.includes("authority:fixture.account"))), true);
+ result.outcomes.some((entry) => entry.resources.includes("pool:fixture.account"))), true);
});
-test("a Runtime Profile resource override changes parallelism without changing either Build", async () => {
+test("a Resolved Runtime resource override changes parallelism without changing either Build", async () => {
let maximumActive = 0;
- const resource = "authority:fixture.account";
+ const resource = "pool:fixture.account";
const { executor } = configuredExecutor({
resource,
defaultConcurrency: 1,
@@ -346,7 +311,7 @@ test("a Runtime Profile resource override changes parallelism without changing e
test("independent paid commands inside one Build may fill the same resource without duplicating their shared upstream", async () => {
let maximumActive = 0;
const { executor, getCalls } = configuredExecutor({
- resource: "authority:fixture.account",
+ resource: "pool:fixture.account",
defaultConcurrency: 2,
observe(active) {
maximumActive = Math.max(maximumActive, active);
@@ -367,7 +332,7 @@ test("independent paid commands inside one Build may fill the same resource with
test("durable scheduling keeps the rest of an in-flight command batch after one event is stored", async () => {
let maximumActive = 0;
const { executor, getCalls } = configuredExecutor({
- resource: "authority:fixture.account",
+ resource: "pool:fixture.account",
defaultConcurrency: 2,
observe(active) {
maximumActive = Math.max(maximumActive, active);
@@ -392,13 +357,13 @@ test("durable scheduling keeps the rest of an in-flight command batch after one
test("durable scheduling can drain successful sibling commands after another sibling errors", async () => {
const producers = new ProducerRegistry();
- producers.registerProducer(greetingProducers.makePrompt, implementationDigests.makePrompt, ({ inputs }) => {
+ producers.registerProducer(greetingProducers.makePrompt, ({ inputs }) => {
const intent = inputs.intent;
assert.equal(intent?.value.kind, "inline");
return { outputs: { prompt: { kind: "inline", value: "Greet Ada" } }, needs: {} };
});
let calls = 0;
- producers.registerProducer(greetingProducers.requestText, implementationDigests.requestText, async () => {
+ producers.registerProducer(greetingProducers.requestText, async () => {
calls += 1;
const call = calls;
if (call === 1) throw new Error("fixture producer failed");
@@ -424,17 +389,12 @@ test("durable scheduling can drain successful sibling commands after another sib
item.producer.name === greetingProducers.requestText.name).length, 2);
});
-test("a locked Runtime Closure assembles exact Endpoint code and Scheduler policy without manual bind", async () => {
+test("a resolved Runtime selects an Endpoint and Scheduler policy without manual bind", async () => {
let maximumActive = 0;
const { closure, modules } = resolvedRuntime(2);
const { executor, endpoints } = configuredExecutor({
- resource: "authority:ignored-registration",
+ resource: "pool:ignored-registration",
defaultConcurrency: 1,
- runtimeImplementation: {
- facet: providerFacet,
- digest: providerImplementationDigest,
- configurationDigest: digestOf({}),
- },
endpointId: "generation.local",
observe(active) {
maximumActive = Math.max(maximumActive, active);
@@ -450,52 +410,15 @@ test("a locked Runtime Closure assembles exact Endpoint code and Scheduler polic
]);
assert.deepEqual(results.map((result) => result.status), ["complete", "complete"]);
- assert.equal(maximumActive, 2, "the locked Profile override, not registration order, owns the resource");
+ assert.equal(maximumActive, 2, "the selected Profile override owns the resource");
assert.equal(results.every((result) => result.state.receipts[0]?.fulfiller === "generation.local"), true);
});
-test("a same-name Endpoint with different implementation bytes is rejected before execution", () => {
- const { closure, modules } = resolvedRuntime(1);
- const { endpoints } = configuredExecutor({
- resource: "authority:fixture.account",
- defaultConcurrency: 1,
- runtimeImplementation: {
- facet: providerFacet,
- digest: digestOf("tampered-endpoint-implementation"),
- configurationDigest: digestOf({}),
- },
- endpointId: "generation.local",
- observe() {},
- });
- assert.throws(() => endpoints.applyRuntimeClosure(closure, modules), /implementation does not match/u);
-});
-
-test("a same-name Endpoint with different configured-instance identity is rejected", () => {
- const { closure, modules } = resolvedRuntime(1);
- const { endpoints } = configuredExecutor({
- resource: "authority:fixture.account",
- defaultConcurrency: 1,
- runtimeImplementation: {
- facet: providerFacet,
- digest: providerImplementationDigest,
- configurationDigest: digestOf({ baseUrl: "https://another-endpoint.test" }),
- },
- endpointId: "generation.local",
- observe() {},
- });
- assert.throws(() => endpoints.applyRuntimeClosure(closure, modules), /implementation does not match/u);
-});
-
test("a recoverable Runtime facet cannot be activated by a one-shot Handler", () => {
const { closure, modules } = resolvedRuntime(1, "recoverable");
const { endpoints } = configuredExecutor({
- resource: "authority:fixture.account",
+ resource: "pool:fixture.account",
defaultConcurrency: 1,
- runtimeImplementation: {
- facet: providerFacet,
- digest: providerImplementationDigest,
- configurationDigest: digestOf({}),
- },
endpointId: "generation.local",
observe() {},
});
diff --git a/packages/driver-node/test/validation.test.ts b/packages/driver-node/test/validation.test.ts
index aed3e1f8..e1e730e1 100644
--- a/packages/driver-node/test/validation.test.ts
+++ b/packages/driver-node/test/validation.test.ts
@@ -4,7 +4,6 @@ import test from "node:test";
import {
computeModuleDigest,
createResolvedClosure,
- digestOf,
link,
sealBuildRequest,
sealCompiledGraph,
@@ -27,7 +26,6 @@ import type {
ProducerRef,
TypeRef,
} from "@narratage/protocol";
-import { parseModuleManifestText } from "@narratage/protocol";
import {
TypeValidationError,
TypeValidatorRegistry,
@@ -49,32 +47,13 @@ const measureProducer = { module: sensorModule, name: "measure" } satisfies Prod
const requestProducer = { module: sensorModule, name: "request-measurement" } satisfies ProducerRef;
const reportProducer = { module: reportModule, name: "write-report" } satisfies ProducerRef;
-const validatorDigest = digestOf("example.measurement-contract/even-integer-validator@1");
-const producerDigests = {
- measure: digestOf("example.sensor/measure@1"),
- request: digestOf("example.sensor/request-measurement@1"),
- report: digestOf("example.report/write-report@1"),
-};
-
const contractManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: contractModule.name,
version: contractModule.version,
dependencies: [],
types: [{
name: measurementType.name,
- schema: {
- kind: "object",
- fields: {
- value: { schema: { kind: "number", integer: true } },
- unit: { schema: { kind: "literal", value: "ticks" } },
- },
- },
- validator: {
- implementation: {
- digest: validatorDigest,
- },
- },
}],
capabilities: [],
producers: [],
@@ -82,11 +61,10 @@ const contractManifest: ModuleManifest = {
const contractDependency = {
module: contractModule,
- digest: computeModuleDigest(contractManifest),
};
const sensorManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: sensorModule.name,
version: sensorModule.version,
dependencies: [contractDependency],
@@ -98,9 +76,6 @@ const sensorManifest: ModuleManifest = {
inputs: [],
outputs: [{ name: "measurement", type: measurementType }],
needs: [],
- implementation: {
- digest: producerDigests.measure,
- },
},
{
name: requestProducer.name,
@@ -111,34 +86,28 @@ const sensorManifest: ModuleManifest = {
capability: measurementCapability,
returns: measurementType,
}],
- implementation: {
- digest: producerDigests.request,
- },
},
],
};
const reportManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: reportModule.name,
version: reportModule.version,
dependencies: [contractDependency],
- types: [{ name: reportType.name, schema: { kind: "string", minLength: 1 } }],
+ types: [{ name: reportType.name }],
capabilities: [],
producers: [{
name: reportProducer.name,
inputs: [{ name: "measurement", type: measurementType }],
outputs: [{ name: "report", type: reportType }],
needs: [],
- implementation: {
- digest: producerDigests.report,
- },
}],
};
-function registry(digest = validatorDigest): TypeValidatorRegistry {
+function registry(): TypeValidatorRegistry {
const validators = new TypeValidatorRegistry();
- validators.register(measurementType, digest, ({ value }) => {
+ validators.register(measurementType, ({ value }) => {
if (value.kind !== "inline" || value.value === null || Array.isArray(value.value)
|| typeof value.value !== "object") {
throw new Error("measurement must be inline");
@@ -209,11 +178,11 @@ function outputBuild(linked: LinkedProgram, graph = outputGraph(linked)) {
function hosts(measured: number): ProducerRegistry {
const hosts = new ProducerRegistry();
- hosts.registerProducer(measureProducer, producerDigests.measure, () => ({
+ hosts.registerProducer(measureProducer, () => ({
outputs: { measurement: { kind: "inline", value: { value: measured, unit: "ticks" } } },
needs: {},
}));
- hosts.registerProducer(reportProducer, producerDigests.report, ({ inputs }) => ({
+ hosts.registerProducer(reportProducer, ({ inputs }) => ({
outputs: {
report: {
kind: "inline",
@@ -254,23 +223,6 @@ test("a structurally valid but semantically invalid Producer value never enters
assert.equal(result.state.acceptedEvents.length, 0);
});
-test("missing or digest-mismatched validator implementations fail before record admission", async () => {
- const linked = program();
- const missing = await new NodeDriver({
- producers: hosts(4),
- validators: new TypeValidatorRegistry(),
- }).run(outputBuild(linked));
- assert.equal(missing.status, "paused");
- assert.match(missing.outcomes[0]?.message ?? "", /validator is not registered/u);
-
- const mismatched = await new NodeDriver({
- producers: hosts(4),
- validators: registry(digestOf("wrong-validator")),
- }).run(outputBuild(linked));
- assert.equal(mismatched.status, "paused");
- assert.match(mismatched.outcomes[0]?.message ?? "", /does not match the locked Manifest/u);
-});
-
function providerGraph(linked: LinkedProgram): CompiledGraph {
return sealCompiledGraph({
program: linked.semanticDigest,
@@ -302,7 +254,7 @@ async function providerBuild(measured: number) {
const linked = program();
const graph = providerGraph(linked);
const hosts = new ProducerRegistry();
- hosts.registerProducer(requestProducer, producerDigests.request, () => ({
+ hosts.registerProducer(requestProducer, () => ({
outputs: {},
needs: { measurement: { sample: "latest" } },
}));
@@ -352,11 +304,6 @@ test("authored values cross the Type owner's validation gate without carrying va
assert.deepEqual(admitted, raw);
});
-test("the static Manifest reader discovers validator declarations without executing them", () => {
- const parsed = parseModuleManifestText(JSON.stringify(contractManifest));
- assert.deepEqual(parsed.types[0]?.validator, contractManifest.types[0]?.validator);
-});
-
test("Type validation errors remain machine distinguishable", async () => {
await assert.rejects(
() => validateValue(
diff --git a/packages/elaborator/README.md b/packages/elaborator/README.md
index f535788e..793392d7 100644
--- a/packages/elaborator/README.md
+++ b/packages/elaborator/README.md
@@ -3,13 +3,13 @@
Parser-independent author linking and static Graph Fragment elaboration outside SVML Core.
The package is the optional compilation layer between authored declarations and the domain-free
-Kernel. A frontend, API or visual editor first emits one sealed `svml.author-module@1` containing
+Kernel. A frontend, API or visual editor first emits one sealed `narratage.author-module@1` containing
component calls with symbolic Record/Component-output references. The Elaborator then works in two
phases:
1. lock every referenced Fragment and predeclare every component export;
2. resolve references, reject missing values, type mismatches and cycles, hygienically instantiate
- Fragments, then emit one ordinary `svml.graph@1` for Core.
+ Fragments, then emit one ordinary `narratage.graph@1` for Core.
Because all exports are collected before any input is resolved, declaration order has no meaning
and a component may reference a later component. The linker itself does not parse `.svml`, execute
@@ -47,7 +47,7 @@ reject a Record but is forbidden to rewrite Record identity, Type, value, digest
`@narratage/compiler-node` wires this to `@narratage/validation` by default, so authored
values use the same Type-owner gate as Producer, Provider and provided Candidate values.
-A `svml.fragment@1` value may reference only declared Fragment inputs and local Operations. It
+A `narratage.fragment@1` value may reference only declared Fragment inputs and local Operations. It
contains no JavaScript callback, ambient file lookup, credential access or Runtime endpoint. Before
expansion the Elaborator verifies producer ports, types, cycles, reachable exports and Semantic
Input Envelopes.
diff --git a/packages/elaborator/src/fragment.ts b/packages/elaborator/src/fragment.ts
index 4f25ebb3..58fab0ab 100644
--- a/packages/elaborator/src/fragment.ts
+++ b/packages/elaborator/src/fragment.ts
@@ -47,7 +47,7 @@ export type FragmentExport = {
};
export type GraphFragment = {
- readonly format: "svml.fragment@1";
+ readonly format: "narratage.fragment@1";
readonly id: Digest;
readonly inputs: readonly { readonly name: string; readonly type: TypeRef }[];
readonly operations: readonly FragmentOperation[];
@@ -68,7 +68,7 @@ export type ElaboratedFragmentExport = {
};
export type ElaboratedFragment = {
- readonly format: "svml.fragment-instance@1";
+ readonly format: "narratage.fragment-instance@1";
readonly id: Digest;
readonly fragment: Digest;
readonly instance: string;
@@ -174,7 +174,7 @@ function normalizeExport(item: FragmentExport): FragmentExport {
function fragmentContent(fragment: Omit<GraphFragment, "id">): Omit<GraphFragment, "id"> {
return {
- format: "svml.fragment@1",
+ format: "narratage.fragment@1",
inputs: [...fragment.inputs]
.map((input) => ({ name: input.name, type: input.type }))
.sort((left, right) => left.name.localeCompare(right.name)),
@@ -186,7 +186,7 @@ function fragmentContent(fragment: Omit<GraphFragment, "id">): Omit<GraphFragmen
export function sealGraphFragment(
fragment: Omit<GraphFragment, "format" | "id">,
): GraphFragment {
- const content = fragmentContent({ format: "svml.fragment@1", ...fragment });
+ const content = fragmentContent({ format: "narratage.fragment@1", ...fragment });
return { ...content, id: digestOf(content) };
}
@@ -213,7 +213,7 @@ function resultType(program: LinkedProgram, operation: FragmentOperation): TypeR
}
export function verifyGraphFragment(program: LinkedProgram, fragment: GraphFragment): void {
- assert(fragment.format === "svml.fragment@1", "UNSUPPORTED_FRAGMENT", "unsupported Graph Fragment format");
+ assert(fragment.format === "narratage.fragment@1", "UNSUPPORTED_FRAGMENT", "unsupported Graph Fragment format");
assert(isDigest(fragment.id), "INVALID_FRAGMENT_DIGEST", "Graph Fragment id is not a digest");
assert(fragment.id === digestOf(fragmentContent(fragment)), "FRAGMENT_DIGEST_MISMATCH", "Graph Fragment digest differs");
assert(fragment.exports.length > 0, "EMPTY_FRAGMENT_EXPORTS", `${fragment.id} has no exports`);
@@ -370,7 +370,7 @@ export function elaborateGraphFragment(
};
});
const content = {
- format: "svml.fragment-instance@1" as const,
+ format: "narratage.fragment-instance@1" as const,
fragment: fragment.id,
instance: request.id,
inputs,
diff --git a/packages/elaborator/src/source.ts b/packages/elaborator/src/source.ts
index a7f28c70..4c48eacb 100644
--- a/packages/elaborator/src/source.ts
+++ b/packages/elaborator/src/source.ts
@@ -4,7 +4,6 @@ import {
digestOf,
isDigest,
link,
- verifyRecordStructure,
} from "@narratage/core";
import type {
Digest,
@@ -93,7 +92,6 @@ export type Awaitable<T> = T | Promise<T>;
export type AuthorFrontend = {
readonly id: string;
- readonly implementationDigest: Digest;
discover(source: AuthorFrontendSourceUnit): Awaitable<AuthorSourceDiscovery>;
decode(source: AuthorFrontendSourceUnit, context: AuthorSourceDecodeContext): Awaitable<DecodedAuthorSource>;
};
@@ -107,9 +105,6 @@ export class AuthorFrontendRegistry implements AuthorFrontendRegistryLike {
register(frontend: AuthorFrontend): void {
if (frontend.id.length === 0) throw new SourceClosureError("EMPTY_FRONTEND_ID", "Frontend id is empty");
- if (!isDigest(frontend.implementationDigest)) {
- throw new SourceClosureError("INVALID_FRONTEND_DIGEST", `${frontend.id} implementation digest is invalid`);
- }
if (this.#frontends.has(frontend.id)) {
throw new SourceClosureError("DUPLICATE_FRONTEND", `Frontend ${frontend.id} is already registered`, frontend.id);
}
@@ -125,14 +120,14 @@ export type AuthorSourceResolver = SourceResolver;
export type AuthorSourceAssetResolver = SourceAssetResolver;
-/** Host-owned admission gate; it may reject a Record but cannot rewrite author meaning. */
+/** Host-owned admission gate for one already sealed authored Record. */
export type AuthorRecordAdmitter = (
closure: ResolvedModuleClosure,
record: TypedRecord,
-) => Awaitable<TypedRecord>;
+) => Awaitable<void>;
export type SourceClosureUnit = CompiledSourceIdentity & {
- readonly format: "svml.source-unit@1";
+ readonly format: "narratage.source-unit@1";
readonly id: Digest;
readonly imports: readonly {
readonly alias: string;
@@ -141,7 +136,7 @@ export type SourceClosureUnit = CompiledSourceIdentity & {
};
export type SourceClosure = {
- readonly format: "svml.source-closure@1";
+ readonly format: "narratage.source-closure@1";
readonly id: Digest;
readonly entry: Digest;
readonly units: readonly SourceClosureUnit[];
@@ -191,7 +186,7 @@ export class SourceClosureError extends Error {
function sourceUnitContent(unit: SourceClosureUnit): Omit<SourceClosureUnit, "id"> {
return {
- format: "svml.source-unit@1",
+ format: "narratage.source-unit@1",
...compiledSourceIdentity(unit),
imports: [...unit.imports]
.map((item) => ({
@@ -204,7 +199,7 @@ function sourceUnitContent(unit: SourceClosureUnit): Omit<SourceClosureUnit, "id
function sourceClosureContent(closure: SourceClosure): Omit<SourceClosure, "id"> {
return {
- format: "svml.source-closure@1",
+ format: "narratage.source-closure@1",
entry: closure.entry,
units: [...closure.units].sort((left, right) => left.id.localeCompare(right.id)),
};
@@ -346,9 +341,8 @@ function hygienizeSource(
}));
const exports = decoded.exports.map((item) => ({ ...item, ref: mapRef(item.ref) }));
const unitContent = {
- format: "svml.source-unit@1" as const,
+ format: "narratage.source-unit@1" as const,
frontend: frontend.id,
- frontendDigest: frontend.implementationDigest,
sourceDigest,
semanticDigest,
imports: imports
@@ -361,9 +355,8 @@ function hygienizeSource(
return {
unit: {
id: digestOf(unitContent),
- format: "svml.source-unit@1",
+ format: "narratage.source-unit@1",
frontend: frontend.id,
- frontendDigest: frontend.implementationDigest,
sourceDigest: unitContent.sourceDigest,
semanticDigest,
imports: unitContent.imports,
@@ -410,7 +403,6 @@ export async function compileSourceClosure(
);
const frontend = request.frontends.resolve(frontendId);
assert(frontend !== undefined, "UNKNOWN_FRONTEND", `Frontend ${frontendId} is not registered`, frontendId);
- assert(isDigest(frontend.implementationDigest), "INVALID_FRONTEND_DIGEST", `${frontendId} digest is invalid`);
visiting.push(key);
const discovery = await (request.discover === undefined
? frontend.discover(source)
@@ -490,35 +482,13 @@ export async function compileSourceClosure(
});
const admittedRecords: TypedRecord[] = [];
for (const record of rawDecoded.records) {
- const admitted = request.admitRecord === undefined
- ? record
- : await request.admitRecord(request.closure, record);
- assert(
- canonicalStringify({
- id: admitted.id,
- type: admitted.type,
- value: admitted.value,
- digest: admitted.digest,
- origin: admitted.origin,
- }) === canonicalStringify({
- id: record.id,
- type: record.type,
- value: record.value,
- digest: record.digest,
- origin: record.origin,
- }),
- "RECORD_ADMISSION_REWRITE",
- `Record admission rewrote ${source.name}:${record.id}`,
- record.id,
- );
- verifyRecordStructure(request.closure, admitted);
- admittedRecords.push(admitted);
+ await request.admitRecord?.(request.closure, record);
+ admittedRecords.push(record);
}
const decoded: DecodedAuthorSource = {
...rawDecoded,
records: admittedRecords,
};
- link(request.closure, decoded.records);
const result = hygienizeSource(source, digestOf(rawSource.text), frontend, decoded, imports);
visiting.pop();
cache.set(key, result);
@@ -549,7 +519,7 @@ export async function compileSourceClosure(
const graph = elaborateAuthorGraph(program, components, (id) => fragments.get(id));
const units = ordered.map((unit) => unit.unit).sort((left, right) => left.id.localeCompare(right.id));
const closureContent = {
- format: "svml.source-closure@1" as const,
+ format: "narratage.source-closure@1" as const,
entry: entry.unit.id,
units,
};
@@ -571,11 +541,11 @@ export async function compileSourceClosure(
}
export function verifySourceClosure(closure: SourceClosure): void {
- assert(closure.format === "svml.source-closure@1", "UNSUPPORTED_SOURCE_CLOSURE", "unsupported Source Closure format");
+ assert(closure.format === "narratage.source-closure@1", "UNSUPPORTED_SOURCE_CLOSURE", "unsupported Source Closure format");
assert(isDigest(closure.id), "INVALID_SOURCE_CLOSURE_DIGEST", "Source Closure digest is invalid");
const units = new Map<string, SourceClosureUnit>();
for (const unit of closure.units) {
- assert(unit.format === "svml.source-unit@1", "UNSUPPORTED_SOURCE_UNIT", "unsupported SourceUnit format");
+ assert(unit.format === "narratage.source-unit@1", "UNSUPPORTED_SOURCE_UNIT", "unsupported SourceUnit format");
assert(isDigest(unit.id), "INVALID_SOURCE_UNIT_DIGEST", "SourceUnit digest is invalid");
assert(unit.id === digestOf(sourceUnitContent(unit)), "SOURCE_UNIT_DIGEST_MISMATCH", `SourceUnit ${unit.id} digest differs`);
assert(!units.has(unit.id), "DUPLICATE_SOURCE_UNIT", `Source Closure repeats ${unit.id}`, unit.id);
diff --git a/packages/elaborator/test/author.test.ts b/packages/elaborator/test/author.test.ts
index 89a56749..9ec19948 100644
--- a/packages/elaborator/test/author.test.ts
+++ b/packages/elaborator/test/author.test.ts
@@ -31,14 +31,14 @@ const reportProducer = { module: laboratory, name: "write-report" } satisfies Pr
const echoProducer = { module: laboratory, name: "echo-sample" } satisfies ProducerRef;
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: laboratory.name,
version: laboratory.version,
dependencies: [],
types: [
- { name: sampleType.name, schema: { kind: "string", minLength: 1 } },
- { name: measurementType.name, schema: { kind: "number" } },
- { name: reportType.name, schema: { kind: "string", minLength: 1 } },
+ { name: sampleType.name },
+ { name: measurementType.name },
+ { name: reportType.name },
],
capabilities: [],
producers: [
@@ -47,27 +47,18 @@ const manifest: ModuleManifest = {
inputs: [{ name: "sample", type: sampleType }],
outputs: [{ name: "measurement", type: measurementType }],
needs: [],
- implementation: {
- digest: digestOf("example.laboratory/measure@1"),
- },
},
{
name: reportProducer.name,
inputs: [{ name: "measurement", type: measurementType }],
outputs: [{ name: "report", type: reportType }],
needs: [],
- implementation: {
- digest: digestOf("example.laboratory/write-report@1"),
- },
},
{
name: echoProducer.name,
inputs: [{ name: "sample", type: sampleType }],
outputs: [{ name: "sample", type: sampleType }],
needs: [],
- implementation: {
- digest: digestOf("example.laboratory/echo-sample@1"),
- },
},
],
};
diff --git a/packages/elaborator/test/fragment.test.ts b/packages/elaborator/test/fragment.test.ts
index b6f1f753..b7a1550c 100644
--- a/packages/elaborator/test/fragment.test.ts
+++ b/packages/elaborator/test/fragment.test.ts
@@ -42,11 +42,11 @@ const requestType = { module: testModule, name: "Request" } satisfies TypeRef;
const generateProducer = { module: testModule, name: "generate" } satisfies ProducerRef;
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: testModule.name,
version: testModule.version,
dependencies: [speechDependency],
- types: [{ name: requestType.name, schema: { kind: "string", minLength: 1 } }],
+ types: [{ name: requestType.name }],
capabilities: [],
producers: [{
name: generateProducer.name,
@@ -56,9 +56,6 @@ const manifest: ModuleManifest = {
],
outputs: [{ name: "take", type: speechTypes.basis }],
needs: [],
- implementation: {
- digest: digestOf("example.fragment-speech/generate@1"),
- },
}],
};
diff --git a/packages/endpoint-kit/README.md b/packages/endpoint-kit/README.md
index d5db64a2..b6a73944 100644
--- a/packages/endpoint-kit/README.md
+++ b/packages/endpoint-kit/README.md
@@ -4,7 +4,7 @@ Host-neutral SDK for exact external capability endpoints.
An Endpoint is any installed implementation that fulfills one declared `Need`: a vendor API, local
process, Lambda function, human service or device. `defineEndpointPackage()` produces its static
-Runtime Manifest, configured instance, exact bindings and installation facet from one source of
+Runtime Manifest, configured instance, exact offers and installation facet from one source of
truth. It depends on no Driver, Node filesystem, queue or domain package.
Concrete distributions may still be named after a real provider, such as `@narratage/provider-kie`.
diff --git a/packages/endpoint-kit/src/index.ts b/packages/endpoint-kit/src/index.ts
index 7b716fee..5cac69b9 100644
--- a/packages/endpoint-kit/src/index.ts
+++ b/packages/endpoint-kit/src/index.ts
@@ -1,12 +1,6 @@
-import {
- canonicalize,
- digestOf,
- isDigest,
-} from "@narratage/protocol";
import type {
CanonicalValue,
CapabilityRef,
- Digest,
FulfillNeedCommand,
ModuleRef,
Need,
@@ -20,10 +14,10 @@ import type {
OperationFailure,
OperationIdentity,
OperationProgress,
- RuntimeEndpointBinding,
+ EndpointOffer,
RuntimeFacetRef,
RuntimeModuleManifest,
- RuntimeProfileInstance,
+ RuntimeFacetInstance,
} from "@narratage/runtime";
import { verifyCredentialRef } from "@narratage/runtime";
@@ -89,8 +83,8 @@ export type EndpointScheduling = {
readonly maxInFlight: number;
}[];
readonly queue?: {
- readonly authority: string;
- readonly route: string;
+ readonly pool: string;
+ readonly lane: string;
};
};
@@ -99,17 +93,9 @@ export type EndpointRetryPolicy = {
readonly maxAttempts: number;
};
-export type RuntimeEndpointImplementation = {
- readonly facet: RuntimeFacetRef;
- readonly digest: Digest;
- /** Identity of the configured endpoint instance; secret values are never part of it. */
- readonly configurationDigest: Digest;
-};
-
export type EndpointRegistrationOptions = {
readonly supports?: (need: Need) => boolean;
readonly scheduling?: EndpointScheduling;
- readonly runtimeImplementation?: RuntimeEndpointImplementation;
readonly credentials?: Readonly<Record<string, CredentialRef>>;
readonly retry?: EndpointRetryPolicy;
};
@@ -134,8 +120,8 @@ export interface EndpointRegistrar {
export type EndpointPackage = {
readonly manifest: RuntimeModuleManifest;
- readonly instance: RuntimeProfileInstance;
- readonly bindings: readonly RuntimeEndpointBinding[];
+ readonly instance: RuntimeFacetInstance;
+ readonly offers: readonly EndpointOffer[];
/** Host-facing login material declared by this exact configured Endpoint instance. */
readonly credentials: readonly EndpointCredentialDescription[];
install(registry: EndpointRegistrar): Awaitable<void>;
@@ -154,8 +140,8 @@ type EndpointCapabilityBase = {
readonly returns: TypeRef;
readonly supports?: (need: Need) => boolean;
/** Stable Provider-local queue lane. Defaults to the capability name. */
- readonly route?: string;
- /** Route capacity; the Provider authority keeps its independent total capacity. */
+ readonly lane?: string;
+ /** Lane capacity; the Provider pool keeps its independent total capacity. */
readonly maxConcurrency?: number;
};
@@ -177,18 +163,13 @@ export type DefineEndpointPackageOptions = {
readonly facet: string;
readonly instance: string;
/** Explicit non-secret account, deployment or compute-pool identity. */
- readonly authority: string;
- readonly implementation: {
- readonly digest: Digest;
- };
- /** Non-secret deployment facts such as base URL, region and credential references. */
- readonly configuration?: CanonicalValue;
+ readonly pool: string;
readonly credentials?: Readonly<Record<string, CredentialRef>>;
readonly credentialInputs?: Readonly<Record<string, {
readonly label: string;
readonly kind?: "secret" | "json";
}>>;
- /** Total capacity shared by every route under this configured Provider authority. */
+ /** Total capacity shared by every lane under this configured Provider pool. */
readonly defaultConcurrency?: number;
readonly capabilities: readonly EndpointCapability[];
};
@@ -212,27 +193,26 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En
"Endpoint module identity is invalid");
assert(options.facet.trim().length > 0, "Endpoint facet is empty");
assert(options.instance.trim().length > 0, "Endpoint instance is empty");
- assert(options.authority.trim().length > 0, "Endpoint Provider Authority is empty");
- assert(isDigest(options.implementation.digest), "Endpoint implementation digest is invalid");
+ assert(options.pool.trim().length > 0, "Endpoint Provider Pool is empty");
assert(options.capabilities.length > 0, "Endpoint package declares no capability");
const lifecycle = options.capabilities[0]!.lifecycle;
assert(options.capabilities.every((item) => item.lifecycle === lifecycle),
"one Endpoint facet cannot mix immediate and recoverable lifecycles");
const keys = options.capabilities.map((item) => refKey(item.capability));
assert(new Set(keys).size === keys.length, "Endpoint package repeats a capability");
- const routes = options.capabilities.map((item) => item.route ?? item.capability.name);
- assert(routes.every((route) => route.trim().length > 0), "Endpoint package route is empty");
- const routeConcurrency = new Map<string, number>();
+ const lanes = options.capabilities.map((item) => item.lane ?? item.capability.name);
+ assert(lanes.every((lane) => lane.trim().length > 0), "Endpoint package lane is empty");
+ const laneConcurrency = new Map<string, number>();
for (const capability of options.capabilities) {
- const route = capability.route ?? capability.capability.name;
+ const lane = capability.lane ?? capability.capability.name;
const concurrency = positiveInteger(
capability.maxConcurrency ?? options.defaultConcurrency ?? 1,
`${capability.capability.name} maxConcurrency`,
);
- const previous = routeConcurrency.get(route);
+ const previous = laneConcurrency.get(lane);
assert(previous === undefined || previous === concurrency,
- `Endpoint package route ${route} has conflicting concurrency limits`);
- routeConcurrency.set(route, concurrency);
+ `Endpoint package lane ${lane} has conflicting concurrency limits`);
+ laneConcurrency.set(lane, concurrency);
}
const credentials = Object.fromEntries(Object.entries(options.credentials ?? {})
.sort(([left], [right]) => left.localeCompare(right))
@@ -259,20 +239,6 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En
ref: structuredClone(ref),
} satisfies EndpointCredentialDescription;
});
- const configuration = canonicalize(options.configuration ?? null);
- const executionPolicy = options.capabilities.map((capability) => ({
- capability: refKey(capability.capability),
- route: capability.route ?? capability.capability.name,
- maxConcurrency: positiveInteger(
- capability.maxConcurrency ?? options.defaultConcurrency ?? 1,
- `${capability.capability.name} maxConcurrency`,
- ),
- lifecycle: capability.lifecycle,
- ...(capability.lifecycle === "recoverable" && capability.retry !== undefined
- ? { retry: { maxAttempts: capability.retry.maxAttempts } }
- : {}),
- })).sort((left, right) => left.capability.localeCompare(right.capability));
- const configurationDigest = digestOf({ configuration, credentials, executionPolicy });
const module = { ...options.module };
const facet = { module, name: options.facet };
const fulfills = options.capabilities.map((item) => ({
@@ -280,20 +246,19 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En
returns: structuredClone(item.returns),
}));
const manifest: RuntimeModuleManifest = {
- format: "svml.runtime-module@1",
+ format: "narratage.runtime-module@1",
name: module.name,
version: module.version,
facets: [{
name: options.facet,
role: "capability-endpoint",
- implementation: { ...options.implementation },
fulfills,
lifecycle,
defaultConcurrency: positiveInteger(options.defaultConcurrency ?? 1, "defaultConcurrency"),
- routes: options.capabilities.map((capability) => ({
+ lanes: options.capabilities.map((capability) => ({
capability: structuredClone(capability.capability),
returns: structuredClone(capability.returns),
- route: capability.route ?? capability.capability.name,
+ lane: capability.lane ?? capability.capability.name,
maxConcurrency: positiveInteger(
capability.maxConcurrency ?? options.defaultConcurrency ?? 1,
`${capability.capability.name} maxConcurrency`,
@@ -302,49 +267,43 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En
credentialSlots: Object.keys(credentials),
}],
};
- const instance: RuntimeProfileInstance = {
+ const instance: RuntimeFacetInstance = {
id: options.instance,
facet,
- authority: options.authority,
- configurationDigest,
+ pool: options.pool,
};
- const bindings: readonly RuntimeEndpointBinding[] = fulfills.map((item) => ({
+ const offers: readonly EndpointOffer[] = fulfills.map((item) => ({
...item,
endpoint: options.instance,
}));
return {
manifest,
instance,
- bindings,
+ offers,
credentials: credentialDescriptions,
install(registry) {
for (const capability of options.capabilities) {
- const route = capability.route ?? capability.capability.name;
+ const lane = capability.lane ?? capability.capability.name;
const authorityConcurrency = positiveInteger(options.defaultConcurrency ?? 1, "defaultConcurrency");
- const routeConcurrency = positiveInteger(
+ const laneConcurrency = positiveInteger(
capability.maxConcurrency ?? authorityConcurrency,
- `${route} maxConcurrency`,
+ `${lane} maxConcurrency`,
);
const common: EndpointRegistrationOptions = {
...(capability.supports === undefined ? {} : { supports: capability.supports }),
- runtimeImplementation: {
- facet,
- digest: options.implementation.digest,
- configurationDigest,
- },
credentials,
scheduling: {
- queue: { authority: options.authority, route },
+ queue: { pool: options.pool, lane },
resources: [
{
- id: `authority:${options.authority}`,
+ id: `pool:${options.pool}`,
maxActive: authorityConcurrency,
maxInFlight: authorityConcurrency,
},
{
- id: `route:${options.authority}/${route}`,
- maxActive: routeConcurrency,
- maxInFlight: routeConcurrency,
+ id: `lane:${options.pool}/${lane}`,
+ maxActive: laneConcurrency,
+ maxInFlight: laneConcurrency,
},
],
},
diff --git a/packages/endpoint-kit/test/endpoint.test.ts b/packages/endpoint-kit/test/endpoint.test.ts
index 889e3e65..b4d91ff9 100644
--- a/packages/endpoint-kit/test/endpoint.test.ts
+++ b/packages/endpoint-kit/test/endpoint.test.ts
@@ -40,21 +40,19 @@ function capturingRegistrar(registrations: CapturedRegistration[]): EndpointRegi
};
}
-test("one Endpoint definition generates Manifest, instance, bindings and host-neutral registration", async () => {
+test("one Endpoint definition generates Manifest, instance, offers and host-neutral registration", async () => {
const endpoint = defineEndpointPackage({
module: { name: "example.provider", version: "1" },
facet: "http-json",
instance: "example.personal",
- authority: "example.personal",
- implementation,
- configuration: { baseUrl: "https://example.test" },
+ pool: "example.personal",
credentials: { apiKey: credentialRef("env", "EXAMPLE_API_KEY") },
defaultConcurrency: 3,
capabilities: [{
lifecycle: "immediate",
capability: capabilities.generation,
returns: types.generated,
- route: "text-generation",
+ lane: "text-generation",
maxConcurrency: 1,
handler: () => ({
value: { kind: "inline", value: "generated" },
@@ -65,7 +63,7 @@ test("one Endpoint definition generates Manifest, instance, bindings and host-ne
assert.equal(endpoint.manifest.facets[0]?.defaultConcurrency, 3);
assert.deepEqual(endpoint.manifest.facets[0]?.credentialSlots, ["apiKey"]);
assert.equal(endpoint.instance.id, "example.personal");
- assert.deepEqual(endpoint.bindings, [{
+ assert.deepEqual(endpoint.offers, [{
capability: capabilities.generation,
returns: types.generated,
endpoint: "example.personal",
@@ -78,41 +76,15 @@ test("one Endpoint definition generates Manifest, instance, bindings and host-ne
assert.deepEqual(registrations[0]?.options.credentials, {
apiKey: credentialRef("env", "EXAMPLE_API_KEY"),
});
- assert.equal(
- registrations[0]?.options.runtimeImplementation?.configurationDigest,
- endpoint.instance.configurationDigest,
- );
assert.deepEqual(registrations[0]?.options.scheduling, {
- queue: { authority: "example.personal", route: "text-generation" },
+ queue: { pool: "example.personal", lane: "text-generation" },
resources: [
- { id: "authority:example.personal", maxActive: 3, maxInFlight: 3 },
- { id: "route:example.personal/text-generation", maxActive: 1, maxInFlight: 1 },
+ { id: "pool:example.personal", maxActive: 3, maxInFlight: 3 },
+ { id: "lane:example.personal/text-generation", maxActive: 1, maxInFlight: 1 },
],
});
});
-test("non-secret Endpoint configuration and credential references change instance identity", () => {
- const configured = (baseUrl: string, variable: string) => defineEndpointPackage({
- module: { name: "example.provider", version: "1" },
- facet: "http-json",
- instance: "example.personal",
- authority: "example.personal",
- implementation,
- configuration: { baseUrl },
- credentials: { apiKey: credentialRef("env", variable) },
- capabilities: [{
- lifecycle: "immediate",
- capability: capabilities.generation,
- returns: types.generated,
- handler: () => ({
- value: { kind: "inline", value: "generated" },
- }),
- }],
- }).instance.configurationDigest;
- assert.notEqual(configured("https://one.test", "KEY"), configured("https://two.test", "KEY"));
- assert.notEqual(configured("https://one.test", "KEY"), configured("https://one.test", "OTHER_KEY"));
-});
-
test("wakeAfter turns polling policy into an explicit Runtime wake hint", () => {
assert.deepEqual(wakeAfter({ job: "123" }, 5_000, 10_000), {
status: "pending",
diff --git a/packages/estimate/package.json b/packages/estimate/package.json
index 23a9dc89..8dc21b34 100644
--- a/packages/estimate/package.json
+++ b/packages/estimate/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/estimate/src/activation.ts b/packages/estimate/src/activation.ts
index 77507e45..f2e04017 100644
--- a/packages/estimate/src/activation.ts
+++ b/packages/estimate/src/activation.ts
@@ -8,8 +8,8 @@ import {
estimateMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: estimateManifest }],
components: [estimateComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -19,4 +19,4 @@ export const svmlPackage = {
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/estimate/src/component.ts b/packages/estimate/src/component.ts
index fb78d38a..385bdd22 100644
--- a/packages/estimate/src/component.ts
+++ b/packages/estimate/src/component.ts
@@ -4,7 +4,7 @@ import { canonicalize } from "@narratage/protocol";
import type { Text } from "@narratage/text";
import { estimateProducers } from "./manifest.js";
-import { estimateSpeechDuration, estimateSpeechImplementationDigest } from "./program.js";
+import { estimateSpeechDuration } from "./program.js";
import type { SpeechEstimatePolicy } from "./types.js";
function inline<T>(value: StoredValue | undefined, subject: string): T {
@@ -15,7 +15,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
export const estimateComponent = {
producers: [{
producer: estimateProducers.speech,
- implementationDigest: estimateSpeechImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
duration: {
diff --git a/packages/estimate/src/index.ts b/packages/estimate/src/index.ts
index 457a6d82..78dcf209 100644
--- a/packages/estimate/src/index.ts
+++ b/packages/estimate/src/index.ts
@@ -1,24 +1,7 @@
export { estimateComponent } from "./component.js";
export { speechEstimateFragment } from "./fragment.js";
-export {
- estimateManifest, estimateMarkupSurfaces,
- estimateManifestDigest,
- estimateModuleRef,
- estimateProducers,
- estimateSurfaceImplementationDigest,
- estimateTypes,
- speechEstimatePolicySchema,
-} from "./manifest.js";
-export {
- assertSpeechEstimatePolicy,
- countSpeechEstimateUnits,
- detectSpeechEstimateLanguage,
- estimateSpeechDuration,
- estimateSpeechImplementationDigest,
- resolveSpeechEstimateRate,
- resolveSpeechEstimateLanguage,
- sealSpeechEstimatePolicy,
-} from "./program.js";
+export { estimateManifest, estimateMarkupSurfaces, estimateModuleRef, estimateProducers, estimateTypes, speechEstimatePolicySchema } from "./manifest.js";
+export { assertSpeechEstimatePolicy, countSpeechEstimateUnits, detectSpeechEstimateLanguage, estimateSpeechDuration, resolveSpeechEstimateRate, resolveSpeechEstimateLanguage, sealSpeechEstimatePolicy } from "./program.js";
export {
decodeSpeechEstimateSurface,
speechEstimatePolicyFromRecipe,
diff --git a/packages/estimate/src/manifest.ts b/packages/estimate/src/manifest.ts
index 97626208..c9ae1a4e 100644
--- a/packages/estimate/src/manifest.ts
+++ b/packages/estimate/src/manifest.ts
@@ -4,8 +4,6 @@ import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
import { svsManifest, svsRecipeType } from "@narratage/svs";
-import { estimateSpeechImplementationDigest } from "./program.js";
-
export const estimateModuleRef = { name: "@narratage/estimate", version: "1" } as const;
export const estimateTypes = {
speechPolicy: { module: estimateModuleRef, name: "SpeechEstimatePolicy" },
@@ -13,9 +11,6 @@ export const estimateTypes = {
export const estimateProducers = {
speech: { module: estimateModuleRef, name: "estimate-speech-duration" },
} satisfies Record<string, ProducerRef>;
-export const estimateSurfaceImplementationDigest = digestOf(
- "@narratage/estimate/speech-surface@1:explicit-policy-without-padding",
-);
const number = { kind: "number" } as const satisfies ValueSchema;
const speechEstimatePolicySchema: ValueSchema = {
@@ -36,22 +31,19 @@ export const estimateMarkupSurfaces = [{
tag: "Speech",
mode: "structured",
outputs: [estimateTypes.speechPolicy, speechTypes.duration],
- implementation: {
- digest: estimateSurfaceImplementationDigest,
- },
}] as const;
export const estimateManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: estimateModuleRef.name,
version: estimateModuleRef.version,
dependencies: [
speechDependency,
textDependency,
- { module: svsRecipeType.module, digest: digestOf(svsManifest) },
+ { module: svsRecipeType.module },
],
- types: [{ name: estimateTypes.speechPolicy.name, schema: speechEstimatePolicySchema }],
+ types: [{ name: estimateTypes.speechPolicy.name }],
capabilities: [],
producers: [{
name: estimateProducers.speech.name,
@@ -61,11 +53,7 @@ export const estimateManifest: ModuleManifest = {
],
outputs: [{ name: "duration", type: speechTypes.duration }],
needs: [],
- implementation: {
- digest: estimateSpeechImplementationDigest,
- },
}],
};
-export const estimateManifestDigest = digestOf(estimateManifest);
export { speechEstimatePolicySchema };
diff --git a/packages/estimate/src/program.ts b/packages/estimate/src/program.ts
index 47734ae1..7bc98eb6 100644
--- a/packages/estimate/src/program.ts
+++ b/packages/estimate/src/program.ts
@@ -11,10 +11,6 @@ import type {
SpeechEstimatePolicy,
} from "./types.js";
-export const estimateSpeechImplementationDigest = digestOf(
- "@narratage/estimate/estimate-speech@1:explicit-delivery-density-without-padding",
-);
-
const PACE_RATE: Readonly<Record<
ResolvedSpeechEstimateLanguage,
Readonly<Record<SpeechEstimatePace, number>>
diff --git a/packages/film/package.json b/packages/film/package.json
index 5b29a250..14ac2600 100644
--- a/packages/film/package.json
+++ b/packages/film/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/film/src/activation.ts b/packages/film/src/activation.ts
index 0d5d7a46..c0873a7f 100644
--- a/packages/film/src/activation.ts
+++ b/packages/film/src/activation.ts
@@ -4,8 +4,8 @@ import {
filmMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: filmManifest }],
components: [filmComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -13,4 +13,4 @@ export const svmlPackage = {
declaration: filmMarkupSurfaces.find((item) => item.name === "film")!, handler: decodeFilmSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/film/src/component.ts b/packages/film/src/component.ts
index cfe29f74..edc9d3e5 100644
--- a/packages/film/src/component.ts
+++ b/packages/film/src/component.ts
@@ -6,16 +6,7 @@ import type { StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
import { filmProducers } from "./manifest.js";
-import {
- appendFilmAudioTrack,
- appendFilmAudioTrackImplementationDigest,
- appendFilmVisualTrack,
- appendFilmVisualTrackImplementationDigest,
- compileFilmComposition,
- compileFilmCompositionImplementationDigest,
- createFilmTrackSet,
- createFilmTrackSetImplementationDigest,
-} from "./program.js";
+import { appendFilmAudioTrack, appendFilmVisualTrack, compileFilmComposition, createFilmTrackSet } from "./program.js";
import type { FilmProgram, FilmTrackSet } from "./types.js";
function inline<T>(value: StoredValue | undefined, subject: string): T {
@@ -27,7 +18,6 @@ export const filmComponent = {
producers: [
{
producer: filmProducers.createTrackSet,
- implementationDigest: createFilmTrackSetImplementationDigest,
handler: () => ({
outputs: { set: { kind: "inline", value: canonicalize(createFilmTrackSet()) } },
needs: {},
@@ -35,7 +25,6 @@ export const filmComponent = {
},
{
producer: filmProducers.appendVisualTrack,
- implementationDigest: appendFilmVisualTrackImplementationDigest,
handler: ({ inputs }) => ({
outputs: { set: { kind: "inline", value: canonicalize(appendFilmVisualTrack(
inline<FilmTrackSet>(inputs.set?.value, "FilmTrackSet"),
@@ -47,7 +36,6 @@ export const filmComponent = {
},
{
producer: filmProducers.appendAudioTrack,
- implementationDigest: appendFilmAudioTrackImplementationDigest,
handler: ({ inputs }) => ({
outputs: { set: { kind: "inline", value: canonicalize(appendFilmAudioTrack(
inline<FilmTrackSet>(inputs.set?.value, "FilmTrackSet"),
@@ -59,7 +47,6 @@ export const filmComponent = {
},
{
producer: filmProducers.compileComposition,
- implementationDigest: compileFilmCompositionImplementationDigest,
handler: ({ inputs }) => ({
outputs: { composition: { kind: "inline", value: canonicalize(compileFilmComposition(
inline<FilmProgram>(inputs.program?.value, "FilmProgram"),
diff --git a/packages/film/src/index.ts b/packages/film/src/index.ts
index c365e5f0..e6ffed91 100644
--- a/packages/film/src/index.ts
+++ b/packages/film/src/index.ts
@@ -1,28 +1,7 @@
export { createFilmAssemblyFragment } from "./fragment.js";
export { filmComponent } from "./component.js";
-export {
- filmManifest, filmMarkupSurfaces,
- filmManifestDigest,
- filmModuleRef,
- filmProgramSchema,
- filmProducers,
- filmSurfaceImplementationDigest,
- filmTrackSetSchema,
- filmTypes,
-} from "./manifest.js";
-export {
- appendFilmAudioTrack,
- appendFilmAudioTrackImplementationDigest,
- appendFilmVisualTrack,
- appendFilmVisualTrackImplementationDigest,
- assertFilmProgramIdentity,
- assertFilmTrackSetIdentity,
- compileFilmComposition,
- compileFilmCompositionImplementationDigest,
- createFilmTrackSet,
- createFilmTrackSetImplementationDigest,
- sealFilmProgram,
-} from "./program.js";
+export { filmManifest, filmMarkupSurfaces, filmModuleRef, filmProgramSchema, filmProducers, filmTrackSetSchema, filmTypes } from "./manifest.js";
+export { appendFilmAudioTrack, appendFilmVisualTrack, assertFilmProgramIdentity, assertFilmTrackSetIdentity, compileFilmComposition, createFilmTrackSet, sealFilmProgram } from "./program.js";
export {
assertFilmRecipe,
filmAppearanceFromRecipe,
diff --git a/packages/film/src/manifest.ts b/packages/film/src/manifest.ts
index 1aa230c5..d2ea25ea 100644
--- a/packages/film/src/manifest.ts
+++ b/packages/film/src/manifest.ts
@@ -5,15 +5,7 @@ import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narrata
import { spatialDependency, spatialTypes } from "@narratage/spatial";
import { svsManifest, svsModuleRef } from "@narratage/svs";
-import {
- appendFilmAudioTrackImplementationDigest,
- appendFilmVisualTrackImplementationDigest,
- compileFilmCompositionImplementationDigest,
- createFilmTrackSetImplementationDigest,
-} from "./program.js";
-
export const filmModuleRef = { name: "@narratage/film", version: "1" } as const;
-export const filmSurfaceImplementationDigest = digestOf("@narratage/film/surface@1");
export const filmTypes = {
program: { module: filmModuleRef, name: "FilmProgram" },
trackSet: { module: filmModuleRef, name: "FilmTrackSet" },
@@ -52,25 +44,22 @@ export const filmMarkupSurfaces = [{
tag: "Film",
mode: "structured",
outputs: [filmTypes.program],
- implementation: {
- digest: filmSurfaceImplementationDigest,
- },
}] as const;
export const filmManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: filmModuleRef.name,
version: filmModuleRef.version,
dependencies: [
programSpaceDependency,
spatialDependency,
compositionDependency,
- { module: svsModuleRef, digest: digestOf(svsManifest) },
+ { module: svsModuleRef },
],
types: [
- { name: filmTypes.program.name, schema: filmProgramSchema },
- { name: filmTypes.trackSet.name, schema: filmTrackSetSchema },
+ { name: filmTypes.program.name },
+ { name: filmTypes.trackSet.name },
],
capabilities: [],
producers: [
@@ -79,9 +68,6 @@ export const filmManifest: ModuleManifest = {
inputs: [],
outputs: [{ name: "set", type: filmTypes.trackSet }],
needs: [],
- implementation: {
- digest: createFilmTrackSetImplementationDigest,
- },
},
{
name: filmProducers.appendVisualTrack.name,
@@ -92,9 +78,6 @@ export const filmManifest: ModuleManifest = {
],
outputs: [{ name: "set", type: filmTypes.trackSet }],
needs: [],
- implementation: {
- digest: appendFilmVisualTrackImplementationDigest,
- },
},
{
name: filmProducers.appendAudioTrack.name,
@@ -105,9 +88,6 @@ export const filmManifest: ModuleManifest = {
],
outputs: [{ name: "set", type: filmTypes.trackSet }],
needs: [],
- implementation: {
- digest: appendFilmAudioTrackImplementationDigest,
- },
},
{
name: filmProducers.compileComposition.name,
@@ -119,11 +99,6 @@ export const filmManifest: ModuleManifest = {
],
outputs: [{ name: "composition", type: compositionTypes.composition }],
needs: [],
- implementation: {
- digest: compileFilmCompositionImplementationDigest,
- },
},
],
};
-
-export const filmManifestDigest = digestOf(filmManifest);
diff --git a/packages/film/src/program.ts b/packages/film/src/program.ts
index 0544796d..5c691eaf 100644
--- a/packages/film/src/program.ts
+++ b/packages/film/src/program.ts
@@ -8,11 +8,6 @@ import { digestOf } from "@narratage/protocol";
import type { FilmProgram, FilmTrackSet } from "./types.js";
-export const createFilmTrackSetImplementationDigest = digestOf("@narratage/film/create-track-set@1");
-export const appendFilmVisualTrackImplementationDigest = digestOf("@narratage/film/append-visual-track@1");
-export const appendFilmAudioTrackImplementationDigest = digestOf("@narratage/film/append-audio-track@1");
-export const compileFilmCompositionImplementationDigest = digestOf("@narratage/film/compile-composition@1");
-
function assertNonEmpty(value: string, label: string): void {
if (!value.trim()) throw new Error(`${label} must not be empty.`);
}
diff --git a/packages/film/test/film.test.ts b/packages/film/test/film.test.ts
index bab0a954..a6c2f348 100644
--- a/packages/film/test/film.test.ts
+++ b/packages/film/test/film.test.ts
@@ -23,42 +23,12 @@ import {
elaborateGraphFragment,
mergeFragmentContributions,
} from "@narratage/elaborator";
-import {
- appendFilmAudioTrack,
- appendFilmAudioTrackImplementationDigest,
- appendFilmVisualTrack,
- appendFilmVisualTrackImplementationDigest,
- compileFilmComposition,
- compileFilmCompositionImplementationDigest,
- createFilmAssemblyFragment,
- createFilmTrackSet,
- createFilmTrackSetImplementationDigest,
- filmManifest,
- filmProducers,
- filmTypes,
- sealFilmProgram,
-} from "@narratage/film";
-import {
- compileHyperframesDocument,
- compileHyperframesImplementationDigest,
- hyperframesDocumentFragment,
- hyperframesManifest,
- hyperframesProducers,
- hyperframesTypes,
-} from "@narratage/hyperframes";
+import { appendFilmAudioTrack, appendFilmVisualTrack, compileFilmComposition, createFilmAssemblyFragment, createFilmTrackSet, filmManifest, filmProducers, filmTypes, sealFilmProgram } from "@narratage/film";
+import { compileHyperframesDocument, hyperframesDocumentFragment, hyperframesManifest, hyperframesProducers, hyperframesTypes } from "@narratage/hyperframes";
import type { CanonicalValue, CompiledGraph, StoredValue, TypedRecord } from "@narratage/protocol";
import { svsManifest } from "@narratage/svs";
import { textManifest } from "@narratage/text";
-import {
- renderTypographyTrack,
- renderTypographyTrackImplementationDigest,
- sealTypographyTrackProgram,
- stillTextMotion,
- typographyTrackFragment,
- typographyTrackManifest,
- typographyTrackProducers,
- typographyTrackTypes,
-} from "@narratage/typography-track";
+import { renderTypographyTrack, sealTypographyTrackProgram, stillTextMotion, typographyTrackFragment, typographyTrackManifest, typographyTrackProducers, typographyTrackTypes } from "@narratage/typography-track";
import type { TextStyle } from "@narratage/typography-track";
import { admitRecord, TypeValidatorRegistry } from "@narratage/validation";
@@ -129,7 +99,7 @@ const textProgram = sealTypographyTrackProgram({
}],
});
const background = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "background-track",
presents: [{
id: "background",
@@ -257,15 +227,15 @@ test("Film stops at Composition and Hyperframes remains an ordinary downstream F
test("the Driver folds peer Tracks, then independently compiles the Composition", async () => {
const registry = new ProducerRegistry();
- registry.registerProducer(typographyTrackProducers.render, renderTypographyTrackImplementationDigest, ({ inputs }) => ({
+ registry.registerProducer(typographyTrackProducers.render, ({ inputs }) => ({
outputs: { track: stored(renderTypographyTrack(inline(inputs.space) as typeof space, inline(inputs.program) as typeof textProgram)) },
needs: {},
}));
- registry.registerProducer(filmProducers.createTrackSet, createFilmTrackSetImplementationDigest, () => ({
+ registry.registerProducer(filmProducers.createTrackSet, () => ({
outputs: { set: stored(createFilmTrackSet()) },
needs: {},
}));
- registry.registerProducer(filmProducers.appendVisualTrack, appendFilmVisualTrackImplementationDigest, ({ inputs }) => ({
+ registry.registerProducer(filmProducers.appendVisualTrack, ({ inputs }) => ({
outputs: { set: stored(appendFilmVisualTrack(
inline(inputs.set) as never,
inline(inputs.space) as typeof space,
@@ -273,7 +243,7 @@ test("the Driver folds peer Tracks, then independently compiles the Composition"
)) },
needs: {},
}));
- registry.registerProducer(filmProducers.appendAudioTrack, appendFilmAudioTrackImplementationDigest, ({ inputs }) => ({
+ registry.registerProducer(filmProducers.appendAudioTrack, ({ inputs }) => ({
outputs: { set: stored(appendFilmAudioTrack(
inline(inputs.set) as never,
inline(inputs.space) as typeof space,
@@ -281,7 +251,7 @@ test("the Driver folds peer Tracks, then independently compiles the Composition"
)) },
needs: {},
}));
- registry.registerProducer(filmProducers.compileComposition, compileFilmCompositionImplementationDigest, ({ inputs }) => ({
+ registry.registerProducer(filmProducers.compileComposition, ({ inputs }) => ({
outputs: { composition: stored(compileFilmComposition(
inline(inputs.program) as never,
inline(inputs.canvas) as typeof canvas,
@@ -290,7 +260,7 @@ test("the Driver folds peer Tracks, then independently compiles the Composition"
)) },
needs: {},
}));
- registry.registerProducer(hyperframesProducers.compile, compileHyperframesImplementationDigest, ({ inputs }) => ({
+ registry.registerProducer(hyperframesProducers.compile, ({ inputs }) => ({
outputs: { document: stored(compileHyperframesDocument(
inline(inputs.composition) as never,
inline(inputs.space) as typeof space,
@@ -303,7 +273,7 @@ test("the Driver folds peer Tracks, then independently compiles the Composition"
const documentRecord = result.state.records.find((record) => record.type.module.name === hyperframesTypes.document.module.name);
assert(documentRecord);
const document = inline(documentRecord) as { readonly html: string };
- assert.match(document.html, /data-svml-text-run="title-text"/u);
+ assert.match(document.html, /data-narratage-text-run="title-text"/u);
assert.match(document.html, /background-track/u);
assert.equal(result.state.records.filter((record) => record.type.name === filmTypes.trackSet.name).length, 4);
});
diff --git a/packages/film/test/surface.test.ts b/packages/film/test/surface.test.ts
index e2e27e3d..b79390df 100644
--- a/packages/film/test/surface.test.ts
+++ b/packages/film/test/surface.test.ts
@@ -40,10 +40,9 @@ const fixtureSurfaceDigest = digestOf("example.film-fixture/inputs-surface@1");
const fixtureSurface = {
name: "inputs", tag: "Inputs", mode: "structured",
outputs: [programSpaceTypes.programSpace, compositionTypes.visualTrack, compositionTypes.audioTrack],
- implementation: { digest: fixtureSurfaceDigest },
} as const;
const fixtureManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: fixtureModule.name,
version: fixtureModule.version,
dependencies: [
@@ -60,7 +59,7 @@ const space = sealProgramSpace({
frameRate: { numerator: 30, denominator: 1 },
});
const visual = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "visual",
presents: [],
});
diff --git a/packages/fonts-open/README.md b/packages/fonts-open/README.md
index b3391fb7..45372974 100644
--- a/packages/fonts-open/README.md
+++ b/packages/fonts-open/README.md
@@ -4,9 +4,9 @@ Workspace package exposing 109 redistributable open font families as exact,
content-addressed `FontArtifactRef` values. The installed packages carry their font bytes and license
files. Author compilation and rendering never download fonts or inspect system font directories.
-A developer who pulls this repository gets the catalog with the ordinary `pnpm install`, then
-includes `@narratage/fonts-open` in the project's explicit `lock-packages` selection. Nothing is
-installed globally and this package has not been published to npm.
+A developer who pulls this repository gets the catalog with the ordinary `pnpm install`; importing
+`@narratage/fonts-open@1` selects it. Nothing is installed globally and this package has not been
+published to npm.
## One exact face
diff --git a/packages/fonts-open/package.json b/packages/fonts-open/package.json
index 79df29db..f3d9fb8f 100644
--- a/packages/fonts-open/package.json
+++ b/packages/fonts-open/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/fonts-open/src/activation.ts b/packages/fonts-open/src/activation.ts
index c5d7b24c..d9d99bcb 100644
--- a/packages/fonts-open/src/activation.ts
+++ b/packages/fonts-open/src/activation.ts
@@ -8,8 +8,8 @@ import {
fontsOpenMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: fontsOpenManifest,
}],
@@ -27,4 +27,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/fonts-open/src/index.ts b/packages/fonts-open/src/index.ts
index f21526b1..a47364c3 100644
--- a/packages/fonts-open/src/index.ts
+++ b/packages/fonts-open/src/index.ts
@@ -9,11 +9,5 @@ export type {
OpenFontFamilyName,
OpenFontStyle,
} from "./catalog.js";
-export {
- fontsOpenFaceSurfaceImplementationDigest,
- fontsOpenStackSurfaceImplementationDigest,
- fontsOpenManifest, fontsOpenMarkupSurfaces,
- fontsOpenManifestDigest,
- fontsOpenModuleRef,
-} from "./manifest.js";
+export { fontsOpenManifest, fontsOpenMarkupSurfaces, fontsOpenModuleRef } from "./manifest.js";
export { decodeOpenFontFaceSurface, decodeOpenFontStackSurface } from "./surface.js";
diff --git a/packages/fonts-open/src/manifest.ts b/packages/fonts-open/src/manifest.ts
index a59e652c..0cac1cd4 100644
--- a/packages/fonts-open/src/manifest.ts
+++ b/packages/fonts-open/src/manifest.ts
@@ -4,34 +4,21 @@ import type { ModuleManifest } from "@narratage/protocol";
export const fontsOpenModuleRef = { name: "@narratage/fonts-open", version: "1" } as const;
-export const fontsOpenFaceSurfaceImplementationDigest = digestOf(
- "@narratage/fonts-open/pinned-open-face-surface@1",
-);
-export const fontsOpenStackSurfaceImplementationDigest = digestOf(
- "@narratage/fonts-open/pinned-open-exact-stack-surface@1",
-);
-
export const fontsOpenMarkupSurfaces = [{
name: "face",
tag: "Face",
mode: "structured",
outputs: [mediaTypes.fontArtifact],
- implementation: {
- digest: fontsOpenFaceSurfaceImplementationDigest,
- },
}, {
name: "stack",
tag: "Stack",
mode: "structured",
outputs: [mediaTypes.fontStack],
- implementation: {
- digest: fontsOpenStackSurfaceImplementationDigest,
- },
}] as const;
export const fontsOpenManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: fontsOpenModuleRef.name,
version: fontsOpenModuleRef.version,
dependencies: [mediaDependency],
@@ -39,5 +26,3 @@ export const fontsOpenManifest: ModuleManifest = {
capabilities: [],
producers: [],
};
-
-export const fontsOpenManifestDigest = digestOf(fontsOpenManifest);
diff --git a/packages/gemini-omni/package.json b/packages/gemini-omni/package.json
index 656aac89..946c7263 100644
--- a/packages/gemini-omni/package.json
+++ b/packages/gemini-omni/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/gemini-omni/src/activation.ts b/packages/gemini-omni/src/activation.ts
index 113095e2..c7389ecd 100644
--- a/packages/gemini-omni/src/activation.ts
+++ b/packages/gemini-omni/src/activation.ts
@@ -7,8 +7,8 @@ import {
} from "./index.js";
import { decodeGeminiOmniVideoSurface } from "./surface.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: geminiOmniManifest }],
components: [geminiOmniComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -17,4 +17,4 @@ export const svmlPackage = {
handler: decodeGeminiOmniVideoSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/gemini-omni/src/index.ts b/packages/gemini-omni/src/index.ts
index b47217f8..593e2d9f 100644
--- a/packages/gemini-omni/src/index.ts
+++ b/packages/gemini-omni/src/index.ts
@@ -63,7 +63,6 @@ const geminiOmniBaseDefinition = defineExactModelModule({
export const geminiOmniEndpoints = geminiOmniBaseDefinition.endpoints;
export const geminiOmniComponent = geminiOmniBaseDefinition.component;
-export const geminiOmniSurfaceImplementationDigest = digestOf("@narratage/gemini-omni/video-surface@1");
const geminiOmniEndpoint = geminiOmniEndpoints.video!;
export const geminiOmniMarkupSurfaces = [{
@@ -75,17 +74,12 @@ export const geminiOmniMarkupSurfaces = [{
geminiOmniEndpoint.mediaBindings.images!.type,
geminiOmniEndpoint.mediaBindings.excerpts!.type,
],
- implementation: {
- digest: geminiOmniSurfaceImplementationDigest,
- },
}] as const;
export const geminiOmniManifest = {
...geminiOmniBaseDefinition.manifest,
};
-export const geminiOmniManifestDigest = digestOf(geminiOmniManifest);
export const geminiOmniDefinition = {
...geminiOmniBaseDefinition,
manifest: geminiOmniManifest,
- manifestDigest: geminiOmniManifestDigest,
};
diff --git a/packages/generation/package.json b/packages/generation/package.json
index fce17237..d4c426f9 100644
--- a/packages/generation/package.json
+++ b/packages/generation/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/generation/src/activation.ts b/packages/generation/src/activation.ts
index 02daa23d..ac25ebfe 100644
--- a/packages/generation/src/activation.ts
+++ b/packages/generation/src/activation.ts
@@ -1,9 +1,9 @@
import { generationComponent, generationManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: generationManifest }],
components: [generationComponent],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/generation/src/component.ts b/packages/generation/src/component.ts
index 705cea1c..cbee2bdd 100644
--- a/packages/generation/src/component.ts
+++ b/packages/generation/src/component.ts
@@ -5,12 +5,7 @@ import {
verifyGeneratedImageSet,
verifyGeneratedVideoSet,
} from "./identity.js";
-import {
- generationProducerDigests,
- generationProducers,
- generationTypes,
- generationValidatorDigests,
-} from "./manifest.js";
+import { generationProducers, generationTypes } from "./manifest.js";
function inline(value: { readonly kind: string; readonly value?: unknown }, subject: string): unknown {
if (value.kind !== "inline") throw new Error(`${subject} must be inline`);
@@ -39,7 +34,6 @@ export const generationComponent = {
producers: [
{
producer: generationProducers.primaryAudio,
- implementationDigest: generationProducerDigests.primaryAudio,
handler: ({ inputs }) => ({
outputs: { audio: primary(inputs.set!.value, "audio") },
needs: {},
@@ -47,7 +41,6 @@ export const generationComponent = {
},
{
producer: generationProducers.primaryImage,
- implementationDigest: generationProducerDigests.primaryImage,
handler: ({ inputs }) => ({
outputs: { image: primary(inputs.set!.value, "image") },
needs: {},
@@ -55,7 +48,6 @@ export const generationComponent = {
},
{
producer: generationProducers.primaryVideo,
- implementationDigest: generationProducerDigests.primaryVideo,
handler: ({ inputs }) => ({
outputs: { video: primary(inputs.set!.value, "video") },
needs: {},
@@ -65,21 +57,18 @@ export const generationComponent = {
validators: [
{
type: generationTypes.audioSet,
- implementationDigest: generationValidatorDigests.audioSet,
handler: ({ value }) => {
verifyGeneratedAudioSet(inline(value, "GeneratedAudioSet"));
},
},
{
type: generationTypes.imageSet,
- implementationDigest: generationValidatorDigests.imageSet,
handler: ({ value }) => {
verifyGeneratedImageSet(inline(value, "GeneratedImageSet"));
},
},
{
type: generationTypes.videoSet,
- implementationDigest: generationValidatorDigests.videoSet,
handler: ({ value }) => {
verifyGeneratedVideoSet(inline(value, "GeneratedVideoSet"));
},
diff --git a/packages/generation/src/index.ts b/packages/generation/src/index.ts
index 9e1a1103..05ee0b13 100644
--- a/packages/generation/src/index.ts
+++ b/packages/generation/src/index.ts
@@ -9,15 +9,7 @@ export {
verifyGeneratedAudioSet,
verifyGeneratedVideoSet,
} from "./identity.js";
-export {
- generationManifest,
- generationManifestDigest,
- generationModuleRef,
- generationProducerDigests,
- generationProducers,
- generationTypes,
- generationValidatorDigests,
-} from "./manifest.js";
+export { generationManifest, generationModuleRef, generationProducers, generationTypes } from "./manifest.js";
export {
assertMappingCoversPorts,
compileWireRequest,
diff --git a/packages/generation/src/manifest.ts b/packages/generation/src/manifest.ts
index 097535ea..0e7371e2 100644
--- a/packages/generation/src/manifest.ts
+++ b/packages/generation/src/manifest.ts
@@ -14,56 +14,26 @@ export const generationTypes = {
videoSet: { module: generationModuleRef, name: "GeneratedVideoSet" },
} satisfies Record<string, TypeRef>;
-export const generationValidatorDigests = {
- audioSet: digestOf("@narratage/generation/validate-generated-audio-set@1"),
- imageSet: digestOf("@narratage/generation/validate-generated-image-set@1"),
- videoSet: digestOf("@narratage/generation/validate-generated-video-set@1"),
-};
-
export const generationProducers = {
primaryAudio: { module: generationModuleRef, name: "select-primary-audio" },
primaryImage: { module: generationModuleRef, name: "select-primary-image" },
primaryVideo: { module: generationModuleRef, name: "select-primary-video" },
} satisfies Record<string, ProducerRef>;
-export const generationProducerDigests = {
- primaryAudio: digestOf("@narratage/generation/select-primary-audio@1"),
- primaryImage: digestOf("@narratage/generation/select-primary-image@1"),
- primaryVideo: digestOf("@narratage/generation/select-primary-video@1"),
-} as const;
-
export const generationManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: generationModuleRef.name,
version: generationModuleRef.version,
dependencies: [artifactDependency],
types: [
{
name: generationTypes.audioSet.name,
- schema: generatedAudioSetSchema,
- validator: {
- implementation: {
- digest: generationValidatorDigests.audioSet,
- },
- },
},
{
name: generationTypes.imageSet.name,
- schema: generatedImageSetSchema,
- validator: {
- implementation: {
- digest: generationValidatorDigests.imageSet,
- },
- },
},
{
name: generationTypes.videoSet.name,
- schema: generatedVideoSetSchema,
- validator: {
- implementation: {
- digest: generationValidatorDigests.videoSet,
- },
- },
},
],
capabilities: [],
@@ -73,9 +43,6 @@ export const generationManifest: ModuleManifest = {
inputs: [{ name: "set", type: generationTypes.audioSet }],
outputs: [{ name: "audio", type: artifactTypes.blob }],
needs: [],
- implementation: {
- digest: generationProducerDigests.primaryAudio,
- },
},
{
name: generationProducers.primaryImage.name,
@@ -85,9 +52,6 @@ export const generationManifest: ModuleManifest = {
type: artifactTypes.blob,
}],
needs: [],
- implementation: {
- digest: generationProducerDigests.primaryImage,
- },
},
{
name: generationProducers.primaryVideo.name,
@@ -97,11 +61,6 @@ export const generationManifest: ModuleManifest = {
type: artifactTypes.blob,
}],
needs: [],
- implementation: {
- digest: generationProducerDigests.primaryVideo,
- },
},
],
};
-
-export const generationManifestDigest = digestOf(generationManifest);
diff --git a/packages/gpt-image/package.json b/packages/gpt-image/package.json
index 91df2ffc..433353b6 100644
--- a/packages/gpt-image/package.json
+++ b/packages/gpt-image/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/gpt-image/src/activation.ts b/packages/gpt-image/src/activation.ts
index c678c17b..aa9d0ede 100644
--- a/packages/gpt-image/src/activation.ts
+++ b/packages/gpt-image/src/activation.ts
@@ -13,8 +13,8 @@ import {
decodeCleanGptImageSurface,
decodeGptImageSurface,
} from "./surface.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: gptImageManifest,
}, {
@@ -34,4 +34,4 @@ export const svmlPackage = {
}),
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/gpt-image/src/index.ts b/packages/gpt-image/src/index.ts
index e4f58d40..e19d7723 100644
--- a/packages/gpt-image/src/index.ts
+++ b/packages/gpt-image/src/index.ts
@@ -6,11 +6,7 @@ import {
import type { GenerationPortTable, GenerationPortValue, GenerationRequest } from "@narratage/generation";
import { defineExactModelModule } from "@narratage/model-kit";
import { digestOf } from "@narratage/protocol";
-import {
- imageTransformManifestDigest,
- imageTransformModuleRef,
- imageTransformTypes,
-} from "@narratage/image-transform";
+import { imageTransformModuleRef, imageTransformTypes } from "@narratage/image-transform";
export const gptImageModuleRef = { name: "@narratage/gpt-image", version: "1" } as const;
@@ -60,18 +56,11 @@ const gptImageBaseDefinition = defineExactModelModule({
export const gptImageEndpoints = gptImageBaseDefinition.endpoints;
export const gptImageComponent = gptImageBaseDefinition.component;
-export const gptImageSurfaceImplementationDigests = {
- image: digestOf("@narratage/gpt-image/image-surface@1"),
- cleanImage: digestOf("@narratage/gpt-image/clean/image-surface@1"),
-} as const;
const gptImageSurfaceDeclaration = {
name: "image",
tag: "Image",
mode: "structured" as const,
outputs: [gptImageEndpoints.image!.draftType, gptImageEndpoints.image!.mediaBindings.images!.type],
- implementation: {
- digest: gptImageSurfaceImplementationDigests.image,
- },
};
export const gptImageMarkupSurfaces = [gptImageSurfaceDeclaration] as const;
@@ -79,11 +68,9 @@ export const gptImageMarkupSurfaces = [gptImageSurfaceDeclaration] as const;
export const gptImageManifest = {
...gptImageBaseDefinition.manifest,
};
-export const gptImageManifestDigest = digestOf(gptImageManifest);
export const gptImageDefinition = {
...gptImageBaseDefinition,
manifest: gptImageManifest,
- manifestDigest: gptImageManifestDigest,
};
/** Optional authoring submodule; the exact GPT model remains independent of post-processing. */
@@ -98,22 +85,18 @@ export const gptImageCleanMarkupSurfaces = [{
gptImageEndpoints.image!.mediaBindings.images!.type,
imageTransformTypes.program,
],
- implementation: {
- digest: gptImageSurfaceImplementationDigests.cleanImage,
- },
}] as const;
export const gptImageCleanManifest = {
- format: "svml.module@1" as const,
+ format: "narratage.module@1" as const,
name: gptImageCleanModuleRef.name,
version: gptImageCleanModuleRef.version,
dependencies: [
- { module: gptImageModuleRef, digest: gptImageManifestDigest },
- { module: imageTransformModuleRef, digest: imageTransformManifestDigest },
+ { module: gptImageModuleRef },
+ { module: imageTransformModuleRef },
],
types: [],
capabilities: [],
producers: [],
};
-export const gptImageCleanManifestDigest = digestOf(gptImageCleanManifest);
export { createGptImageCleanFragment } from "./fragment.js";
diff --git a/packages/gpt-image/test/broll-graph.test.ts b/packages/gpt-image/test/broll-graph.test.ts
index eefac4d9..4c49cfa8 100644
--- a/packages/gpt-image/test/broll-graph.test.ts
+++ b/packages/gpt-image/test/broll-graph.test.ts
@@ -25,12 +25,7 @@ import {
gptImageManifest,
sealGptImage2Draft,
} from "@narratage/gpt-image";
-import {
- gptImageDenoiseV1,
- imageTransformImplementationDigests,
- imageTransformManifest,
- imageTransformTypes,
-} from "@narratage/image-transform";
+import { gptImageDenoiseV1, imageTransformManifest, imageTransformTypes } from "@narratage/image-transform";
import { exactModelMediaInputNames } from "@narratage/model-kit";
import { mediaManifest } from "@narratage/media";
import { narrativeManifest } from "@narratage/narrative";
@@ -86,15 +81,13 @@ function fixture() {
readonly id: string;
readonly type: TypeRef;
readonly value: StoredValue;
- readonly validatorDigest?: Digest;
}> = [];
- const add = (id: string, type: TypeRef, value: StoredValue, validatorDigest?: Digest) =>
- records.push({ id, type, value, ...(validatorDigest === undefined ? {} : { validatorDigest }) });
+ const add = (id: string, type: TypeRef, value: StoredValue) => records.push({ id, type, value });
add("person", artifactTypes.blob, image("person"));
add("product", artifactTypes.blob, image("product"));
add("cleanup", imageTransformTypes.program, {
kind: "inline", value: gptImageDenoiseV1 as unknown as CanonicalValue,
- }, imageTransformImplementationDigests.validator);
+ });
const gptFragments = {
holding: createGptImageCleanFragment([
@@ -109,7 +102,7 @@ function fixture() {
value: sealGptImage2Draft({
prompt: [`${id} prompt`], aspectRatio: ["9:16"], resolution: ["1K"],
}) as unknown as CanonicalValue,
- }, gpt.draftValidatorDigest);
+ });
for (const name of names) add(`${id}.${name}.binding`, gpt.mediaBindings.images!.type, {
kind: "inline",
value: sealGenerationMediaBinding(gptBindingPort as never, { role: "image" }) as unknown as CanonicalValue,
@@ -127,7 +120,7 @@ function fixture() {
prompt: ["A fast montage from all three reference images."],
resolution: ["720p"], aspectRatio: ["9:16"], duration: [6], generateAudio: [false], webSearch: [false],
}) as unknown as CanonicalValue,
- }, seedance.draftValidatorDigest);
+ });
for (const name of ["holding", "walking", "interview"]) add(`montage.${name}.binding`, seedance.mediaBindings.referenceImage!.type, {
kind: "inline",
value: sealGenerationMediaBinding(seedanceBindingPort as never, { role: "image" }) as unknown as CanonicalValue,
@@ -184,8 +177,7 @@ function fixture() {
]),
outputs: { video: "montage.video" },
}];
- const program = link(closure,
- records.map(({ validatorDigest: _validatorDigest, ...record }) => sealRecord({ ...record, origin })));
+ const program = link(closure, records.map((record) => sealRecord({ ...record, origin })));
const fragments = new Map([
...Object.values(gptFragments).map((fragment) => [fragment.id, fragment] as const),
[seedanceFragment.id, seedanceFragment] as const,
diff --git a/packages/grok-imagine/package.json b/packages/grok-imagine/package.json
index 32286ccd..645c2dcf 100644
--- a/packages/grok-imagine/package.json
+++ b/packages/grok-imagine/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/grok-imagine/src/activation.ts b/packages/grok-imagine/src/activation.ts
index ff8674da..3e2219a6 100644
--- a/packages/grok-imagine/src/activation.ts
+++ b/packages/grok-imagine/src/activation.ts
@@ -7,8 +7,8 @@ import {
} from "./index.js";
import { decodeGrokImaginePreviewVideoSurface, decodeGrokImagineVideoSurface } from "./surface.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: grokImagineManifest }],
components: [grokImagineComponent],
hostFacets: [
@@ -24,4 +24,4 @@ export const svmlPackage = {
}),
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/grok-imagine/src/index.ts b/packages/grok-imagine/src/index.ts
index 978d5986..594cf488 100644
--- a/packages/grok-imagine/src/index.ts
+++ b/packages/grok-imagine/src/index.ts
@@ -77,36 +77,26 @@ const grokImagineBaseDefinition = defineExactModelModule({
export const grokImagineEndpoints = grokImagineBaseDefinition.endpoints;
export const grokImagineComponent = grokImagineBaseDefinition.component;
-export const grokImagineSurfaceImplementationDigests = {
- video: digestOf("@narratage/grok-imagine/video-surface@1"),
- previewVideo: digestOf("@narratage/grok-imagine/preview-video-surface@1"),
-} as const;
const surface = (
name: "video" | "preview-video",
tag: "Video" | "PreviewVideo",
endpoint: NonNullable<(typeof grokImagineEndpoints)["video" | "preview-1.5"]>,
- digest: (typeof grokImagineSurfaceImplementationDigests)["video" | "previewVideo"],
) => ({
name,
tag,
mode: "structured" as const,
outputs: [endpoint.draftType, endpoint.mediaBindings.images!.type],
- implementation: {
- digest,
- },
});
export const grokImagineMarkupSurfaces = [
- surface("video", "Video", grokImagineEndpoints.video!, grokImagineSurfaceImplementationDigests.video),
- surface("preview-video", "PreviewVideo", grokImagineEndpoints["preview-1.5"]!, grokImagineSurfaceImplementationDigests.previewVideo),
+ surface("video", "Video", grokImagineEndpoints.video!),
+ surface("preview-video", "PreviewVideo", grokImagineEndpoints["preview-1.5"]!),
] as const;
export const grokImagineManifest = {
...grokImagineBaseDefinition.manifest,
};
-export const grokImagineManifestDigest = digestOf(grokImagineManifest);
export const grokImagineDefinition = {
...grokImagineBaseDefinition,
manifest: grokImagineManifest,
- manifestDigest: grokImagineManifestDigest,
};
diff --git a/packages/host/src/frontend.ts b/packages/host/src/frontend.ts
index 2a5b24b6..2342d174 100644
--- a/packages/host/src/frontend.ts
+++ b/packages/host/src/frontend.ts
@@ -1,11 +1,9 @@
-import { canonicalStringify, isDigest } from "@narratage/protocol";
-import type { Digest } from "@narratage/protocol";
+import { canonicalStringify } from "@narratage/protocol";
import type { HostFacet } from "./facet.js";
export type FrontendImplementation = {
readonly id: string;
- readonly implementationDigest: Digest;
};
export type FrontendHostFacet<
@@ -15,7 +13,6 @@ export type FrontendHostFacet<
readonly offers: readonly [string];
readonly identity: {
readonly kind: Kind;
- readonly implementationDigest: Digest;
};
readonly implementation: Frontend;
};
@@ -26,15 +23,14 @@ export function createFrontendHostFacet<
Frontend extends FrontendImplementation,
>(abi: string, kind: Kind, frontend: Frontend): FrontendHostFacet<Kind, Frontend> {
if (abi.trim().length === 0 || kind.trim().length === 0
- || frontend.id.trim().length === 0 || !isDigest(frontend.implementationDigest)) {
- throw new Error(`${kind || "Source"} Frontend Host facet has an invalid implementation identity`);
+ || frontend.id.trim().length === 0) {
+ throw new Error(`${kind || "Source"} Frontend Host facet has an invalid identity`);
}
return {
abi,
offers: [frontend.id],
identity: {
kind,
- implementationDigest: frontend.implementationDigest,
},
implementation: frontend,
};
diff --git a/packages/hyperframes/README.md b/packages/hyperframes/README.md
index 2509cb76..dc57c26e 100644
--- a/packages/hyperframes/README.md
+++ b/packages/hyperframes/README.md
@@ -3,7 +3,7 @@
Deterministic reference lowering from the generic `Composition` contract to a portable
`HyperframesDocument`.
-This package implements the one closed `svml.visual-ir@1` target declared by every
+This package implements the one closed `narratage.visual-ir@1` target declared by every
VisualTrack. The vocabulary is owned by `@narratage/visual-ir`; Track and Composition values are
owned by `@narratage/composition`. Neither is an author component
and not arbitrary CSS. Unknown properties and alternate browser semantics fail before document
@@ -18,7 +18,7 @@ It deliberately ignores `AudioTrack`. HyperFrames produces a silent visual fact;
compiles and renders program audio separately, then an explicit mux Provider joins the two. Changing
audio can therefore never be implemented by secretly changing HyperFrames HTML or its renderer.
-Media remains content addressed in the compiled HTML as `svml-artifact://` placeholders. The
+Media remains content addressed in the compiled HTML as `narratage-artifact://` placeholders. The
document separately carries each dependency's complete `BlobRef` (digest, byte count and MIME), so
a Provider can verify and name staged bytes without guessing from the hash. A local or hosted
render Runtime calls `materializeHyperframesHtml()` with its own Artifact URL resolver before
@@ -42,7 +42,7 @@ from a user font name or filename extension. The document carries a deduplicated
beside its Artifact set so a staging Runtime can verify the exact bytes before rendering.
The ordinary test suite validates deterministic HTML and Artifact collection. Set
-`SVML_BROWSER_TESTS=1` to run the host integration witness that invokes the installed Hyperframes
+`NARRATAGE_BROWSER_TESTS=1` to run the host integration witness that invokes the installed Hyperframes
CLI, paints a real font and checks straight-alpha composition at the rendered pixel level. That
test needs Chrome and FFmpeg; its multilingual case uses only the locked open-font package, not a
system font. It is a renderer conformance witness, not Core logic.
diff --git a/packages/hyperframes/package.json b/packages/hyperframes/package.json
index a14c624a..5f8e10ea 100644
--- a/packages/hyperframes/package.json
+++ b/packages/hyperframes/package.json
@@ -8,7 +8,7 @@
".": "./src/index.ts",
"./project": "./src/project.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/hyperframes/src/activation.ts b/packages/hyperframes/src/activation.ts
index f674d97c..6ff5929d 100644
--- a/packages/hyperframes/src/activation.ts
+++ b/packages/hyperframes/src/activation.ts
@@ -1,8 +1,8 @@
import { hyperframesComponent, hyperframesManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: hyperframesManifest }],
components: [hyperframesComponent],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/hyperframes/src/component.ts b/packages/hyperframes/src/component.ts
index 2c042754..7023cdb6 100644
--- a/packages/hyperframes/src/component.ts
+++ b/packages/hyperframes/src/component.ts
@@ -4,10 +4,7 @@ import type { Composition } from "@narratage/composition";
import type { CanonicalValue, StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
-import {
- compileHyperframesDocument,
- compileHyperframesImplementationDigest,
-} from "./document.js";
+import { compileHyperframesDocument } from "./document.js";
import { hyperframesProducers } from "./manifest.js";
function inline(value: StoredValue, subject: string): CanonicalValue {
@@ -19,7 +16,6 @@ function inline(value: StoredValue, subject: string): CanonicalValue {
export const hyperframesComponent = {
producers: [{
producer: hyperframesProducers.compile,
- implementationDigest: compileHyperframesImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
document: {
diff --git a/packages/hyperframes/src/document.ts b/packages/hyperframes/src/document.ts
index 28adb39f..5f5d04c1 100644
--- a/packages/hyperframes/src/document.ts
+++ b/packages/hyperframes/src/document.ts
@@ -30,11 +30,9 @@ import {
terminalTextLayoutScript,
} from "./text.js";
-export const compileHyperframesImplementationDigest = digestOf("@narratage/hyperframes/compile@1");
-
const NANOSECONDS = 1_000_000_000n;
-const ARTIFACT_URI = /svml-artifact:\/\/sha256\/([0-9a-f]{64})/gu;
-const SURFACE_ARTIFACT = /data-svml-surface-artifact="(sha256:[0-9a-f]{64})"/gu;
+const ARTIFACT_URI = /narratage-artifact:\/\/sha256\/([0-9a-f]{64})/gu;
+const SURFACE_ARTIFACT = /data-narratage-surface-artifact="(sha256:[0-9a-f]{64})"/gu;
function escapeHtml(value: string): string {
return value
@@ -179,7 +177,7 @@ function percentage(frame: number, totalFrames: number): string {
export function hyperframesArtifactUri(digest: Digest): string {
if (!isDigest(digest)) throw new Error("HyperFrames Artifact digest is invalid.");
- return `svml-artifact://sha256/${digest.slice("sha256:".length)}`;
+ return `narratage-artifact://sha256/${digest.slice("sha256:".length)}`;
}
function css(style: readonly VisualStyleDeclaration[]): string {
@@ -200,7 +198,7 @@ function attributes(values: readonly VisualAttribute[] | undefined): string {
}
function stableDomId(parts: readonly string[]): string {
- return `svml-${digestOf(parts).slice("sha256:".length, "sha256:".length + 20)}`;
+ return `narratage-${digestOf(parts).slice("sha256:".length, "sha256:".length + 20)}`;
}
function exactFontFamily(font: FontArtifactRef): string {
@@ -259,10 +257,10 @@ function renderElement(
"animation-timing-function:linear",
]),
].filter(Boolean).join(";");
- const commonAttributes = `id="${id}" data-svml-element-id="${escapeHtml(element.id)}"${attributes(element.attributes)}`;
+ const commonAttributes = `id="${id}" data-narratage-element-id="${escapeHtml(element.id)}"${attributes(element.attributes)}`;
const animationAttributes = animationName === undefined
? ""
- : ` data-svml-frame-animation data-svml-animation-start-frame="${context.presentStartFrame}" data-svml-animation-duration-frames="${animationDurationFrames}" data-svml-animation-sample-frames="${context.presentDurationFrames}" data-svml-animation-properties="${animationProperties.join(",")}"`;
+ : ` data-narratage-frame-animation data-narratage-animation-start-frame="${context.presentStartFrame}" data-narratage-animation-duration-frames="${animationDurationFrames}" data-narratage-animation-sample-frames="${context.presentDurationFrames}" data-narratage-animation-properties="${animationProperties.join(",")}"`;
const common = `${commonAttributes}${animationAttributes} style="${escapeHtml(inlineStyle)}"`;
if (element.kind === "mask") {
const direct = children.get(element.id) ?? [];
@@ -307,7 +305,7 @@ function renderElement(
return `<image x="0" y="0" width="100%" height="100%" preserveAspectRatio="none" href="${escapeHtml(hyperframesArtifactUri(maskRoot.artifact.digest))}" style="${escapeHtml(css(maskRoot.style))}"/>`;
}
if (maskRoot.kind === "surface" && maskRoot.surface.timing.kind === "still") {
- return `<image data-svml-surface-artifact="${maskRoot.surface.artifact.digest}" x="0" y="0" width="100%" height="100%" preserveAspectRatio="none" href="${escapeHtml(hyperframesArtifactUri(maskRoot.surface.artifact.digest))}" style="${escapeHtml(css(maskRoot.style))}"/>`;
+ return `<image data-narratage-surface-artifact="${maskRoot.surface.artifact.digest}" x="0" y="0" width="100%" height="100%" preserveAspectRatio="none" href="${escapeHtml(hyperframesArtifactUri(maskRoot.surface.artifact.digest))}" style="${escapeHtml(css(maskRoot.style))}"/>`;
}
throw new Error(`Local mask ${element.id} requires a terminal owned text, image or still Surface mask source.`);
})();
@@ -345,23 +343,23 @@ function renderElement(
const partId = `${id}-sample-${String(part).padStart(4, "0")}`;
const media = [
`id="${partId}"`,
- `data-svml-element-id="${escapeHtml(element.id)}"`,
- `data-svml-sampling-part="${part}"`,
+ `data-narratage-element-id="${escapeHtml(element.id)}"`,
+ `data-narratage-sampling-part="${part}"`,
`data-start="${frameSeconds(startFrame, context.programNumerator, context.programDenominator)}"`,
`data-duration="${frameSeconds(durationFrames, context.programNumerator, context.programDenominator)}"`,
`data-track-index="${context.stackIndex}"`,
`data-media-start="${sourceSeconds(run.sourceFrame, element.sampling!.sourceFrameRate)}"`,
`data-playback-rate="${sampledPlaybackRate(segment.rate, element.sampling!.sourceFrameRate, context.programNumerator, context.programDenominator)}"`,
- `data-svml-source-frame="${run.sourceFrame.numerator}/${run.sourceFrame.denominator}"`,
- `data-svml-source-rate="${segment.rate.numerator}/${segment.rate.denominator}"`,
+ `data-narratage-source-frame="${run.sourceFrame.numerator}/${run.sourceFrame.denominator}"`,
+ `data-narratage-source-rate="${segment.rate.numerator}/${segment.rate.denominator}"`,
`style="${escapeHtml(inlineStyle)}"`,
attributes(element.attributes).trim(),
"muted",
"playsinline",
...(element.kind === "surface" ? [
- `data-svml-surface-artifact="${element.surface.artifact.digest}"`,
- `data-svml-alpha-mode="${element.surface.alphaMode}"`,
- `data-svml-color-space="${element.surface.colorSpace}"`,
+ `data-narratage-surface-artifact="${element.surface.artifact.digest}"`,
+ `data-narratage-alpha-mode="${element.surface.alphaMode}"`,
+ `data-narratage-color-space="${element.surface.colorSpace}"`,
`width="${element.surface.width}"`,
`height="${element.surface.height}"`,
] : []),
@@ -372,12 +370,12 @@ function renderElement(
if (element.kind === "surface") {
const source = escapeHtml(hyperframesArtifactUri(element.surface.artifact.digest));
const surface = [
- `data-svml-surface-artifact="${element.surface.artifact.digest}"`,
+ `data-narratage-surface-artifact="${element.surface.artifact.digest}"`,
`data-start="${context.presentStart}"`,
`data-duration="${context.presentDuration}"`,
`data-track-index="${context.stackIndex}"`,
- `data-svml-alpha-mode="${element.surface.alphaMode}"`,
- `data-svml-color-space="${element.surface.colorSpace}"`,
+ `data-narratage-alpha-mode="${element.surface.alphaMode}"`,
+ `data-narratage-color-space="${element.surface.colorSpace}"`,
`width="${element.surface.width}"`,
`height="${element.surface.height}"`,
].join(" ");
@@ -426,7 +424,7 @@ function renderVisualPresent(
programDenominator: denominator,
stackIndex,
});
- return `<div class="clip svml-visual-present" data-svml-track-id="${escapeHtml(track.id)}" data-svml-present-id="${escapeHtml(present.id)}" data-svml-stack-order="${present.stacking.order}" data-svml-stack-tie="${escapeHtml(present.stacking.tieBreak)}" data-track-index="${stackIndex}" data-start="${start}" data-duration="${duration}" style="position:absolute;inset:0;z-index:${stackIndex};overflow:hidden;pointer-events:none">${contents}</div>`;
+ return `<div class="clip narratage-visual-present" data-narratage-track-id="${escapeHtml(track.id)}" data-narratage-present-id="${escapeHtml(present.id)}" data-narratage-stack-order="${present.stacking.order}" data-narratage-stack-tie="${escapeHtml(present.stacking.tieBreak)}" data-track-index="${stackIndex}" data-start="${start}" data-duration="${duration}" style="position:absolute;inset:0;z-index:${stackIndex};overflow:hidden;pointer-events:none">${contents}</div>`;
}
function renderAnimationRules(track: VisualTrack, present: VisualPresent): string[] {
@@ -578,14 +576,14 @@ function frameAnimationRuntime(numerator: number, denominator: number): string {
const denominator = ${denominator};
const millisecondsPerFrame = denominator * 1000 / numerator;
const timelines = [];
- for (const element of document.querySelectorAll("[data-svml-frame-animation]")) {
+ for (const element of document.querySelectorAll("[data-narratage-frame-animation]")) {
void element.getBoundingClientRect();
const animation = element.getAnimations()[0];
if (animation === undefined) throw new Error("Visual IR frame animation did not materialize.");
- const start = Number(element.getAttribute("data-svml-animation-start-frame"));
- const duration = Number(element.getAttribute("data-svml-animation-duration-frames"));
- const sampleDuration = Number(element.getAttribute("data-svml-animation-sample-frames"));
- const properties = String(element.getAttribute("data-svml-animation-properties") || "")
+ const start = Number(element.getAttribute("data-narratage-animation-start-frame"));
+ const duration = Number(element.getAttribute("data-narratage-animation-duration-frames"));
+ const sampleDuration = Number(element.getAttribute("data-narratage-animation-sample-frames"));
+ const properties = String(element.getAttribute("data-narratage-animation-properties") || "")
.split(",").filter(Boolean);
const frames = [];
for (let frame = 0; frame <= sampleDuration; frame += 1) {
@@ -642,7 +640,7 @@ function emitHtml(composition: Composition, programSpace: ProgramSpace): string
</style>
</head>
<body>
- <div data-composition-id="${escapeHtml(composition.id)}" data-start="0" data-no-timeline data-width="${composition.canvas.width}" data-height="${composition.canvas.height}" data-duration="${duration}" data-fps="${fps}" data-svml-frame-count="${frameCount}">
+ <div data-composition-id="${escapeHtml(composition.id)}" data-start="0" data-no-timeline data-width="${composition.canvas.width}" data-height="${composition.canvas.height}" data-duration="${duration}" data-fps="${fps}" data-narratage-frame-count="${frameCount}">
${visualHtml}
</div>${animationRuntime}${textRuntime}
</body>
diff --git a/packages/hyperframes/src/index.ts b/packages/hyperframes/src/index.ts
index a64beb0e..9145364a 100644
--- a/packages/hyperframes/src/index.ts
+++ b/packages/hyperframes/src/index.ts
@@ -1,19 +1,9 @@
export { hyperframesDocumentFragment } from "./fragment.js";
export { hyperframesComponent } from "./component.js";
-export {
- assertHyperframesDocument,
- assertHyperframesFrameIndex,
- assertHyperframesFrameSpan,
- compileHyperframesDocument,
- compileHyperframesImplementationDigest,
- hyperframesArtifactUri,
- hyperframesTime,
- materializeHyperframesHtml,
-} from "./document.js";
+export { assertHyperframesDocument, assertHyperframesFrameIndex, assertHyperframesFrameSpan, compileHyperframesDocument, hyperframesArtifactUri, hyperframesTime, materializeHyperframesHtml } from "./document.js";
export {
hyperframesDocumentSchema,
hyperframesManifest,
- hyperframesManifestDigest,
hyperframesModuleRef,
hyperframesProducers,
hyperframesTypes,
diff --git a/packages/hyperframes/src/manifest.ts b/packages/hyperframes/src/manifest.ts
index ade82b5f..4e0b6b00 100644
--- a/packages/hyperframes/src/manifest.ts
+++ b/packages/hyperframes/src/manifest.ts
@@ -5,8 +5,6 @@ import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
import { VISUAL_IR_V1 } from "@narratage/visual-ir";
-import { compileHyperframesImplementationDigest } from "./document.js";
-
export const hyperframesModuleRef = { name: "@narratage/hyperframes", version: "1" } as const;
export const hyperframesTypes = {
document: { module: hyperframesModuleRef, name: "HyperframesDocument" },
@@ -52,11 +50,11 @@ export const hyperframesDocumentSchema: ValueSchema = {
};
export const hyperframesManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: hyperframesModuleRef.name,
version: hyperframesModuleRef.version,
dependencies: [compositionDependency, mediaDependency, programSpaceDependency],
- types: [{ name: hyperframesTypes.document.name, schema: hyperframesDocumentSchema }],
+ types: [{ name: hyperframesTypes.document.name }],
capabilities: [],
producers: [{
name: hyperframesProducers.compile.name,
@@ -66,10 +64,5 @@ export const hyperframesManifest: ModuleManifest = {
],
outputs: [{ name: "document", type: hyperframesTypes.document }],
needs: [],
- implementation: {
- digest: compileHyperframesImplementationDigest,
- },
}],
};
-
-export const hyperframesManifestDigest = digestOf(hyperframesManifest);
diff --git a/packages/hyperframes/src/text.ts b/packages/hyperframes/src/text.ts
index f55f79e4..8a134bcc 100644
--- a/packages/hyperframes/src/text.ts
+++ b/packages/hyperframes/src/text.ts
@@ -259,7 +259,7 @@ function renderGlyphPaint(
const layers = glyphPaintLayers(paints);
if (layers.length === 0) return context.escape(value);
const singleSolidFill = layers.length === 1 && layers[0]?.kind === "fill" && layers[0].paint.kind === "solid";
- return layers.map((paint, index) => `<span aria-hidden="${index === layers.length - 1 ? "false" : "true"}" data-svml-text-paint-layer="${index}"${styleAttribute(glyphLayerCss(paint, singleSolidFill, context), context.escape)}>${context.escape(value)}</span>`).join("");
+ return layers.map((paint, index) => `<span aria-hidden="${index === layers.length - 1 ? "false" : "true"}" data-narratage-text-paint-layer="${index}"${styleAttribute(glyphLayerCss(paint, singleSolidFill, context), context.escape)}>${context.escape(value)}</span>`).join("");
}
function boxLayers(
@@ -333,7 +333,7 @@ function tailHtml(
: side === "bottom" ? "0 0,100% 0,50% 100%"
: side === "left" ? "100% 0,0 50%,100% 100%" : "0 0,100% 50%,0 100%";
const style = `position:absolute;pointer-events:none;width:${number(tail.widthPx)}px;height:${number(tail.heightPx)}px;${position};background:${colorPaintCss(tail.paint)};clip-path:polygon(${polygon});z-index:${index}`;
- return [`<span aria-hidden="true" data-svml-text-tail="${side}" style="${context.escape(style)}"></span>`];
+ return [`<span aria-hidden="true" data-narratage-text-tail="${side}" style="${context.escape(style)}"></span>`];
}).join("");
}
@@ -439,7 +439,7 @@ function renderDocument(
...boxCss(paints, "grapheme", "isolated"),
...unitAnimationCss(element, "grapheme", graphemeIndex, context),
];
- return `<span data-svml-text-unit-grapheme="${graphemeIndex}"${styleAttribute(styles, context.escape)}>${tailHtml(paints, "grapheme", context, "isolated")}${renderGlyphPaint(value, paints, context)}</span>`;
+ return `<span data-narratage-text-unit-grapheme="${graphemeIndex}"${styleAttribute(styles, context.escape)}>${tailHtml(paints, "grapheme", context, "isolated")}${renderGlyphPaint(value, paints, context)}</span>`;
};
return document.paragraphs.map((paragraph) => {
const paragraphIndex = indices.paragraph++;
@@ -456,7 +456,7 @@ function renderDocument(
}
const wordIndex = indices.word++;
const wordContent = graphemes(segment.text, inline.language ?? typography.language).map((grapheme) => renderGrapheme(grapheme, paints)).join("");
- return `<span data-svml-text-unit-word="${wordIndex}"${styleAttribute([
+ return `<span data-narratage-text-unit-word="${wordIndex}"${styleAttribute([
"position:relative",
...boxCss(paints, "word", "isolated"),
...unitAnimationCss(element, "word", wordIndex, context),
@@ -473,7 +473,7 @@ function renderDocument(
...boxCss(paints, "grapheme", "joined"),
...unitAnimationCss(element, "run", runIndex, context),
];
- return `<span data-svml-text-run="${context.escape(inline.id)}" data-svml-text-unit-run="${runIndex}" ${textLanguageAttributes(typography, context.escape, inline.language, inline.direction)}${styleAttribute(runStyle, context.escape)}>${tailHtml(paints, "run", context)}${tailHtml(paints, "word", context, "joined")}${tailHtml(paints, "grapheme", context, "joined")}${runContents}</span>`;
+ return `<span data-narratage-text-run="${context.escape(inline.id)}" data-narratage-text-unit-run="${runIndex}" ${textLanguageAttributes(typography, context.escape, inline.language, inline.direction)}${styleAttribute(runStyle, context.escape)}>${tailHtml(paints, "run", context)}${tailHtml(paints, "word", context, "joined")}${tailHtml(paints, "grapheme", context, "joined")}${runContents}</span>`;
}).join("");
const paragraphStyle = [
"position:relative",
@@ -481,7 +481,7 @@ function renderDocument(
...boxCss(paragraphPaints, "paragraph"),
...unitAnimationCss(element, "paragraph", paragraphIndex, context),
];
- return `<div data-svml-text-paragraph="${context.escape(paragraph.id)}" data-svml-text-unit-paragraph="${paragraphIndex}" ${textLanguageAttributes(paragraphTypography, context.escape)}${styleAttribute(paragraphStyle, context.escape)}>${tailHtml(paragraphPaints, "paragraph", context)}<span data-svml-text-line-fragments${styleAttribute([
+ return `<div data-narratage-text-paragraph="${context.escape(paragraph.id)}" data-narratage-text-unit-paragraph="${paragraphIndex}" ${textLanguageAttributes(paragraphTypography, context.escape)}${styleAttribute(paragraphStyle, context.escape)}>${tailHtml(paragraphPaints, "paragraph", context)}<span data-narratage-text-line-fragments${styleAttribute([
"position:relative",
"box-decoration-break:clone",
"-webkit-box-decoration-break:clone",
@@ -634,37 +634,37 @@ function renderPathDocument(element: VisualPathTextElement, context: TextRenderC
const text = segmentRun(inline.text, inline.language ?? typography.language).map((segment) => {
if (!segment.wordLike) return graphemes(segment.text, inline.language ?? typography.language).map((value) => {
const index = indices.grapheme++;
- return `<tspan data-svml-text-unit-grapheme="${index}"${styleAttribute(unitAnimationCss(element, "grapheme", index, context), context.escape)}>${context.escape(value)}</tspan>`;
+ return `<tspan data-narratage-text-unit-grapheme="${index}"${styleAttribute(unitAnimationCss(element, "grapheme", index, context), context.escape)}>${context.escape(value)}</tspan>`;
}).join("");
const word = indices.word++;
const value = graphemes(segment.text, inline.language ?? typography.language).map((item) => {
const index = indices.grapheme++;
- return `<tspan data-svml-text-unit-grapheme="${index}"${styleAttribute(unitAnimationCss(element, "grapheme", index, context), context.escape)}>${context.escape(item)}</tspan>`;
+ return `<tspan data-narratage-text-unit-grapheme="${index}"${styleAttribute(unitAnimationCss(element, "grapheme", index, context), context.escape)}>${context.escape(item)}</tspan>`;
}).join("");
- return `<tspan data-svml-text-unit-word="${word}"${styleAttribute(unitAnimationCss(element, "word", word, context), context.escape)}>${value}</tspan>`;
+ return `<tspan data-narratage-text-unit-word="${word}"${styleAttribute(unitAnimationCss(element, "word", word, context), context.escape)}>${value}</tspan>`;
}).join("");
const style = [...typographyCss(typography, context.exactFontFamily), ...svgGlyphLayerCss(paint, context), ...unitAnimationCss(element, "run", runIndex, context)];
- return `<tspan data-svml-text-unit-run="${runIndex}" ${textLanguageAttributes(typography, context.escape, inline.language, inline.direction)}${styleAttribute(style, context.escape)}>${text}</tspan>`;
+ return `<tspan data-narratage-text-unit-run="${runIndex}" ${textLanguageAttributes(typography, context.escape, inline.language, inline.direction)}${styleAttribute(style, context.escape)}>${text}</tspan>`;
}).join("");
const separator = paragraphPosition === 0 ? "" : " ";
- return `${separator}<tspan data-svml-text-unit-paragraph="${paragraphIndex}"${styleAttribute(unitAnimationCss(element, "paragraph", paragraphIndex, context), context.escape)}>${content}</tspan>`;
+ return `${separator}<tspan data-narratage-text-unit-paragraph="${paragraphIndex}"${styleAttribute(unitAnimationCss(element, "paragraph", paragraphIndex, context), context.escape)}>${content}</tspan>`;
}).join("");
}
export function renderTerminalTextElement(element: TerminalTextElement, context: TextRenderContext): string {
assertTextUnitRanges(element);
- const clockAttributes = `data-svml-text-clock data-svml-text-start-frame="${context.presentStartFrame}" data-svml-text-frame-numerator="${context.programNumerator}" data-svml-text-frame-denominator="${context.programDenominator}"`;
- const sequenceAttributes = element.sequences.length === 0 ? "" : ` data-svml-text-sequences="${context.escape(JSON.stringify(element.sequences))}" data-svml-text-duration-frames="${context.durationFrames}"`;
+ const clockAttributes = `data-narratage-text-clock data-narratage-text-start-frame="${context.presentStartFrame}" data-narratage-text-frame-numerator="${context.programNumerator}" data-narratage-text-frame-denominator="${context.programDenominator}"`;
+ const sequenceAttributes = element.sequences.length === 0 ? "" : ` data-narratage-text-sequences="${context.escape(JSON.stringify(element.sequences))}" data-narratage-text-duration-frames="${context.durationFrames}"`;
if (element.kind === "path-text") {
const pathId = context.stableId([context.trackId, context.presentId, element.id, "path"]);
const anchor = element.align === "start" ? "start" : element.align === "end" ? "end" : "middle";
const offset = element.marginAnimation?.keyframes[0]?.startMarginPx
?? (element.align === "start" ? element.startMarginPx : element.align === "end" ? "100%" : "50%");
const placementData = element.marginAnimation === undefined
- ? ` data-svml-text-path-placement="${context.escape(JSON.stringify({
+ ? ` data-narratage-text-path-placement="${context.escape(JSON.stringify({
align: element.align, startMarginPx: element.startMarginPx, endMarginPx: element.endMarginPx,
}))}"`
- : ` data-svml-text-path-margin="${context.escape(JSON.stringify({
+ : ` data-narratage-text-path-margin="${context.escape(JSON.stringify({
startFrame: context.presentStartFrame,
numerator: context.programNumerator,
denominator: context.programDenominator,
@@ -675,7 +675,7 @@ export function renderTerminalTextElement(element: TerminalTextElement, context:
const layerCount = pathPaintLayerCount(element);
const layers = Array.from({ length: layerCount }, (_, layerIndex) => {
const textCss = [...typographyCss(element.typography, context.exactFontFamily), "fill:transparent", "stroke:none"].join(";");
- return `<text aria-hidden="${layerIndex === layerCount - 1 ? "false" : "true"}" data-svml-text-path-paint-layer="${layerIndex}" style="${context.escape(textCss)}" text-anchor="${anchor}" dominant-baseline="central"><textPath href="#${pathId}" startOffset="${typeof offset === "number" ? number(offset) : offset}" side="${element.side}"${placementData}${element.orientation === "upright" ? ' data-svml-text-path-upright="true"' : ""}>${renderPathDocument(element, context, layerIndex)}</textPath></text>`;
+ return `<text aria-hidden="${layerIndex === layerCount - 1 ? "false" : "true"}" data-narratage-text-path-paint-layer="${layerIndex}" style="${context.escape(textCss)}" text-anchor="${anchor}" dominant-baseline="central"><textPath href="#${pathId}" startOffset="${typeof offset === "number" ? number(offset) : offset}" side="${element.side}"${placementData}${element.orientation === "upright" ? ' data-narratage-text-path-upright="true"' : ""}>${renderPathDocument(element, context, layerIndex)}</textPath></text>`;
}).join("");
return `<svg ${context.commonAttributes} ${clockAttributes}${sequenceAttributes} ${textLanguageAttributes(element.typography, context.escape)} width="100%" height="100%" style="${context.escape(`${context.baseStyle};overflow:${element.overflow === "clip" ? "hidden" : "visible"}`)}"><defs><path id="${pathId}" d="${context.escape(pathData(element.reverse ? reversePath(element.path) : element.path))}"/>${svgPaintDefinitions(element, context)}${glyphFilterDefinitions(element, context)}</defs>${layers}</svg>`;
}
@@ -696,13 +696,13 @@ export function renderTerminalTextElement(element: TerminalTextElement, context:
];
const lineSequences = element.sequences.filter((sequence) => sequence.unit === "line");
const layoutData = [
- `data-svml-text-overflow="${element.flow.overflow}"`,
- `data-svml-text-writing-mode="${element.typography.writingMode}"`,
- ...(element.flow.minimumScale === undefined ? [] : [`data-svml-text-minimum-scale="${number(element.flow.minimumScale)}"`]),
- ...(element.flow.maxLines === undefined ? [] : [`data-svml-text-max-lines="${element.flow.maxLines}"`]),
+ `data-narratage-text-overflow="${element.flow.overflow}"`,
+ `data-narratage-text-writing-mode="${element.typography.writingMode}"`,
+ ...(element.flow.minimumScale === undefined ? [] : [`data-narratage-text-minimum-scale="${number(element.flow.minimumScale)}"`]),
+ ...(element.flow.maxLines === undefined ? [] : [`data-narratage-text-max-lines="${element.flow.maxLines}"`]),
].join(" ");
- const lineData = lineSequences.length === 0 ? "" : ` data-svml-text-line-sequences="${context.escape(JSON.stringify(lineSequences))}"`;
- return `<div ${context.commonAttributes} ${clockAttributes}${sequenceAttributes} ${textLanguageAttributes(element.typography, context.escape)} style="${context.escape(rootStyle.join(";"))}">${glyphPaintDefinitions(element, context)}${tailHtml(element.paints, "frame", context)}<div data-svml-text-flow ${layoutData}${lineData}${styleAttribute(contentStyle, context.escape)}>${tailHtml(element.paints, "content", context)}${renderDocument(element.document, element, context)}</div></div>`;
+ const lineData = lineSequences.length === 0 ? "" : ` data-narratage-text-line-sequences="${context.escape(JSON.stringify(lineSequences))}"`;
+ return `<div ${context.commonAttributes} ${clockAttributes}${sequenceAttributes} ${textLanguageAttributes(element.typography, context.escape)} style="${context.escape(rootStyle.join(";"))}">${glyphPaintDefinitions(element, context)}${tailHtml(element.paints, "frame", context)}<div data-narratage-text-flow ${layoutData}${lineData}${styleAttribute(contentStyle, context.escape)}>${tailHtml(element.paints, "content", context)}${renderDocument(element.document, element, context)}</div></div>`;
}
export function collectTerminalTextFonts(element: TerminalTextElement): FontArtifactRef[] {
@@ -726,8 +726,8 @@ const svmlTextEase = (name, value) => {
return value;
};
const svmlUpdateUprightTextPaths = () => {
- for (const path of document.querySelectorAll('[data-svml-text-path-upright]')) {
- for (const glyph of path.querySelectorAll('[data-svml-text-unit-grapheme]')) {
+ for (const path of document.querySelectorAll('[data-narratage-text-path-upright]')) {
+ for (const glyph of path.querySelectorAll('[data-narratage-text-unit-grapheme]')) {
try {
glyph.removeAttribute('rotate');
const pathRotation = glyph.getRotationOfChar(0);
@@ -739,8 +739,8 @@ const svmlUpdateUprightTextPaths = () => {
}
};
const svmlUpdateStaticTextPathPlacements = () => {
- for (const textPath of document.querySelectorAll('[data-svml-text-path-placement]')) {
- const data = JSON.parse(textPath.getAttribute('data-svml-text-path-placement'));
+ for (const textPath of document.querySelectorAll('[data-narratage-text-path-placement]')) {
+ const data = JSON.parse(textPath.getAttribute('data-narratage-text-path-placement'));
const href = textPath.getAttribute('href');
const path = href && document.getElementById(href.slice(1));
if (!path || typeof path.getTotalLength !== 'function') throw new Error('Path Text cannot resolve its owned vector path.');
@@ -752,8 +752,8 @@ const svmlUpdateStaticTextPathPlacements = () => {
}
};
const svmlUpdateTextPathMargins = (time) => {
- for (const path of document.querySelectorAll('[data-svml-text-path-margin]')) {
- const data = JSON.parse(path.getAttribute('data-svml-text-path-margin'));
+ for (const path of document.querySelectorAll('[data-narratage-text-path-margin]')) {
+ const data = JSON.parse(path.getAttribute('data-narratage-text-path-margin'));
const frames = data.keyframes;
// HyperFrames may reach the same source frame through an incremental seek
// or a fresh worker seek. Quantize the absolute clock back to the authored
@@ -837,17 +837,17 @@ const svmlTextSequenceProgress = (sequence, clock) => {
};
};
const svmlSeekTextUnitAnimations = (time) => {
- const unitSelector = '[data-svml-text-unit-paragraph],[data-svml-text-unit-run],[data-svml-text-unit-word],[data-svml-text-unit-grapheme]';
- for (const root of document.querySelectorAll('[data-svml-text-clock][data-svml-text-sequences]')) {
- const startFrame = Number(root.getAttribute('data-svml-text-start-frame'));
- const numerator = Number(root.getAttribute('data-svml-text-frame-numerator'));
- const denominator = Number(root.getAttribute('data-svml-text-frame-denominator'));
- const durationFrames = Number(root.getAttribute('data-svml-text-duration-frames'));
+ const unitSelector = '[data-narratage-text-unit-paragraph],[data-narratage-text-unit-run],[data-narratage-text-unit-word],[data-narratage-text-unit-grapheme]';
+ for (const root of document.querySelectorAll('[data-narratage-text-clock][data-narratage-text-sequences]')) {
+ const startFrame = Number(root.getAttribute('data-narratage-text-start-frame'));
+ const numerator = Number(root.getAttribute('data-narratage-text-frame-numerator'));
+ const denominator = Number(root.getAttribute('data-narratage-text-frame-denominator'));
+ const durationFrames = Number(root.getAttribute('data-narratage-text-duration-frames'));
if (!Number.isSafeInteger(startFrame) || !Number.isSafeInteger(numerator) || !Number.isSafeInteger(denominator)
|| !Number.isSafeInteger(durationFrames) || numerator <= 0 || denominator <= 0 || durationFrames <= 0) {
throw new Error('Invalid terminal Text animation clock.');
}
- const sequences = JSON.parse(root.getAttribute('data-svml-text-sequences') || '[]');
+ const sequences = JSON.parse(root.getAttribute('data-narratage-text-sequences') || '[]');
const localFrame = Math.max(0, Math.min(durationFrames, Math.round(time * numerator / denominator - startFrame)));
for (const unit of root.querySelectorAll(unitSelector)) {
let base = svmlTextUnitBaseStyles.get(unit);
@@ -860,7 +860,7 @@ const svmlSeekTextUnitAnimations = (time) => {
else unit.style.removeProperty(name);
}
for (const sequence of sequences) {
- const attribute = sequence.unit === 'line' ? 'data-svml-text-physical-line' : 'data-svml-text-unit-' + sequence.unit;
+ const attribute = sequence.unit === 'line' ? 'data-narratage-text-physical-line' : 'data-narratage-text-unit-' + sequence.unit;
if (!unit.hasAttribute(attribute)) continue;
const index = Number(unit.getAttribute(attribute));
const rank = Number.isSafeInteger(index) ? svmlTextSequenceRank(sequence, index) : null;
@@ -927,22 +927,22 @@ const svmlTextLayoutReady = document.fonts.ready.then(() => {
svmlUpdateUprightTextPaths();
const physicalLines = (flow) => {
const values = [];
- const vertical = flow.getAttribute('data-svml-text-writing-mode') !== 'horizontal-tb';
- for (const glyph of flow.querySelectorAll('[data-svml-text-unit-grapheme]')) {
+ const vertical = flow.getAttribute('data-narratage-text-writing-mode') !== 'horizontal-tb';
+ for (const glyph of flow.querySelectorAll('[data-narratage-text-unit-grapheme]')) {
const rect = glyph.getBoundingClientRect();
const axis = vertical ? rect.left : rect.top;
if (!values.some((value) => Math.abs(value - axis) < 0.5)) values.push(axis);
}
return values;
};
- for (const flow of document.querySelectorAll('[data-svml-text-flow][data-svml-text-overflow="ellipsis"]')) {
- if (flow.getAttribute('data-svml-text-max-lines') || getComputedStyle(flow).whiteSpace === 'pre') continue;
+ for (const flow of document.querySelectorAll('[data-narratage-text-flow][data-narratage-text-overflow="ellipsis"]')) {
+ if (flow.getAttribute('data-narratage-text-max-lines') || getComputedStyle(flow).whiteSpace === 'pre') continue;
const parent = flow.parentElement;
if (!parent) throw new Error('Ellipsis Text has no placement frame.');
- const vertical = flow.getAttribute('data-svml-text-writing-mode') !== 'horizontal-tb';
+ const vertical = flow.getAttribute('data-narratage-text-writing-mode') !== 'horizontal-tb';
const boundary = parent.getBoundingClientRect();
const groups = [];
- for (const glyph of flow.querySelectorAll('[data-svml-text-unit-grapheme]')) {
+ for (const glyph of flow.querySelectorAll('[data-narratage-text-unit-grapheme]')) {
const rect = glyph.getBoundingClientRect();
const axis = vertical ? rect.left : rect.top;
let group = groups.find((item) => Math.abs(item.axis - axis) < 0.5);
@@ -954,9 +954,9 @@ const svmlTextLayoutReady = document.fonts.ready.then(() => {
: rect.top >= boundary.top - 0.5 && rect.bottom <= boundary.bottom + 0.5)).length;
flow.style.webkitLineClamp = String(Math.max(1, visible));
}
- for (const flow of document.querySelectorAll('[data-svml-text-flow][data-svml-text-overflow="shrink"]')) {
- const minimum = Number(flow.getAttribute('data-svml-text-minimum-scale'));
- const maximumLines = Number(flow.getAttribute('data-svml-text-max-lines') || '0');
+ for (const flow of document.querySelectorAll('[data-narratage-text-flow][data-narratage-text-overflow="shrink"]')) {
+ const minimum = Number(flow.getAttribute('data-narratage-text-minimum-scale'));
+ const maximumLines = Number(flow.getAttribute('data-narratage-text-max-lines') || '0');
const parent = flow.parentElement;
if (!parent || !Number.isFinite(minimum) || minimum <= 0 || minimum > 1) throw new Error('Invalid bounded Text shrink request.');
const availableWidth = parent.clientWidth;
@@ -975,7 +975,7 @@ const svmlTextLayoutReady = document.fonts.ready.then(() => {
apply(scale);
const lines = physicalLines(flow).length;
const boundary = parent.getBoundingClientRect();
- const glyphRects = [...flow.querySelectorAll('[data-svml-text-unit-grapheme]')]
+ const glyphRects = [...flow.querySelectorAll('[data-narratage-text-unit-grapheme]')]
.map((glyph) => glyph.getBoundingClientRect());
const left = glyphRects.length === 0 ? boundary.left : Math.min(...glyphRects.map((rect) => rect.left));
const right = glyphRects.length === 0 ? boundary.left : Math.max(...glyphRects.map((rect) => rect.right));
@@ -1012,12 +1012,12 @@ const svmlTextLayoutReady = document.fonts.ready.then(() => {
else high = middle;
}
apply(low);
- flow.setAttribute('data-svml-text-shrink-scale', low.toFixed(8));
+ flow.setAttribute('data-narratage-text-shrink-scale', low.toFixed(8));
}
- for (const flow of document.querySelectorAll('[data-svml-text-flow][data-svml-text-line-sequences]')) {
- const sequences = JSON.parse(flow.getAttribute('data-svml-text-line-sequences') || '[]');
- const glyphs = [...flow.querySelectorAll('[data-svml-text-unit-grapheme]')];
- const vertical = flow.getAttribute('data-svml-text-writing-mode') !== 'horizontal-tb';
+ for (const flow of document.querySelectorAll('[data-narratage-text-flow][data-narratage-text-line-sequences]')) {
+ const sequences = JSON.parse(flow.getAttribute('data-narratage-text-line-sequences') || '[]');
+ const glyphs = [...flow.querySelectorAll('[data-narratage-text-unit-grapheme]')];
+ const vertical = flow.getAttribute('data-narratage-text-writing-mode') !== 'horizontal-tb';
const axes = [];
const lineOf = new Map();
for (const glyph of glyphs) {
@@ -1040,7 +1040,7 @@ const svmlTextLayoutReady = document.fonts.ready.then(() => {
for (const [memberIndex, glyph] of members.entries()) {
const rect = rects[memberIndex];
glyph.style.transformOrigin = String((left + right) / 2 - rect.left) + 'px ' + String((top + bottom) / 2 - rect.top) + 'px';
- glyph.setAttribute('data-svml-text-physical-line', String(line));
+ glyph.setAttribute('data-narratage-text-physical-line', String(line));
}
}
}
diff --git a/packages/hyperframes/src/types.ts b/packages/hyperframes/src/types.ts
index 03c5e21b..566c9077 100644
--- a/packages/hyperframes/src/types.ts
+++ b/packages/hyperframes/src/types.ts
@@ -24,7 +24,7 @@ export type HyperframesDocument = HyperframesFrameDomain & {
readonly artifacts: readonly BlobRef[];
/** Typed Surface dependencies that a Runtime must verify before rendering. */
readonly surfaces: readonly CompositableSurfaceRef[];
- /** Media URLs remain svml-artifact:// placeholders until a Runtime materializes them. */
+ /** Media URLs remain narratage-artifact:// placeholders until a Runtime materializes them. */
readonly html: string;
};
diff --git a/packages/hyperframes/test/browser-visual.test.ts b/packages/hyperframes/test/browser-visual.test.ts
index 43715e7e..20a3b2eb 100644
--- a/packages/hyperframes/test/browser-visual.test.ts
+++ b/packages/hyperframes/test/browser-visual.test.ts
@@ -46,8 +46,8 @@ import {
} from "@narratage/typography-track";
import type { TextStyle } from "@narratage/typography-track";
-const enabled = process.env.SVML_BROWSER_TESTS === "1";
-const localFont = process.env.SVML_TEST_FONT_PATH
+const enabled = process.env.NARRATAGE_BROWSER_TESTS === "1";
+const localFont = process.env.NARRATAGE_TEST_FONT_PATH
?? (process.platform === "darwin" ? "/System/Library/Fonts/SFNSMono.ttf" : undefined);
const hyperframesCli = createRequire(path.join(process.cwd(), "packages/provider-hyperframes-local/package.json"))
.resolve("hyperframes/bin/hyperframes.mjs");
@@ -281,7 +281,7 @@ test("locked font and straight-alpha Surface survive one real Hyperframes browse
timeout: 120_000,
}, async () => {
assert(localFont !== undefined);
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-hyperframes-visual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-hyperframes-visual-"));
try {
const fontBytes = await import("node:fs/promises").then(({ readFile }) => readFile(localFont));
const surfaceBytes = rgbaPng(64, 64, [255, 0, 0, 128]);
@@ -297,7 +297,7 @@ test("locked font and straight-alpha Surface survive one real Hyperframes browse
frameRate: { numerator: 30, denominator: 1 },
});
const lower = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "blue",
presents: [{
id: "blue",
@@ -316,7 +316,7 @@ test("locked font and straight-alpha Surface survive one real Hyperframes browse
}],
});
const surface = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "surface",
presents: [{
id: "surface",
@@ -339,7 +339,7 @@ test("locked font and straight-alpha Surface survive one real Hyperframes browse
}],
});
const text = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "text",
presents: [{
id: "text",
@@ -426,7 +426,7 @@ test("Fine Caption exact font, wrapping and all karaoke modes survive real brows
timeout: 120_000,
}, async () => {
assert(localFont !== undefined);
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-caption-fine-visual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-caption-fine-visual-"));
try {
const width = 720;
const height = 240;
@@ -521,7 +521,7 @@ test("Fine Caption joined trail Pill follows real wrapped browser line fragments
timeout: 120_000,
}, async () => {
assert(localFont !== undefined);
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-caption-fine-pill-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-caption-fine-pill-"));
try {
const width = 480;
const height = 280;
@@ -597,7 +597,7 @@ test("installed open fonts render CJK, emoji and independent stroke, shadow and
skip: !enabled,
timeout: 120_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-caption-fine-multilingual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-caption-fine-multilingual-"));
try {
const width = 720;
const height = 320;
@@ -714,7 +714,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
skip: !enabled,
timeout: 180_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-text-complete-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-text-complete-"));
try {
const width = 960;
const height = 720;
@@ -898,8 +898,8 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
id: "complete-text-browser",
canvas: { width, height, clearColor: "#000000" }, tracks: [typographyTrack, maskTrack],
}), space);
- assert.match(document.html, /data-svml-text-shrink-scale/u);
- assert.match(document.html, /data-svml-text-path-upright/u);
+ assert.match(document.html, /data-narratage-text-shrink-scale/u);
+ assert.match(document.html, /data-narratage-text-path-upright/u);
assert.match(document.html, /mask-type:alpha/u);
const paths = new Map<Digest, string>();
await Promise.all([...fontBytes].map(async ([artifactDigest, bytes], index) => {
@@ -974,7 +974,7 @@ test("Text box targets, rich runs and every sequence direction remain stable acr
skip: !enabled,
timeout: 180_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-text-box-sequence-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-text-box-sequence-"));
try {
const width = 960;
const height = 440;
@@ -1102,11 +1102,11 @@ test("Text box targets, rich runs and every sequence direction remain stable acr
id: "text-box-sequence-browser",
canvas: { width, height, clearColor: "#000000" }, tracks: [track],
}), space);
- assert.match(compiled.html, /data-svml-text-line-sequences/u);
+ assert.match(compiled.html, /data-narratage-text-line-sequences/u);
assert.match(compiled.html, /background-image:linear-gradient\(#312e81,#312e81\)/u);
assert.match(compiled.html, /order&quot;:&quot;forward/u);
assert.match(compiled.html, /order&quot;:&quot;reverse/u);
- assert.match(compiled.html, /data-svml-text-run="reverse-grapheme-run"/u);
+ assert.match(compiled.html, /data-narratage-text-run="reverse-grapheme-run"/u);
const paths = new Map<Digest, string>();
let fontIndex = 0;
for (const [artifactDigest, bytes] of installed.bytes) {
@@ -1167,7 +1167,7 @@ test("vertical Text paints in its authored direction and bounded shrink fails cl
skip: !enabled,
timeout: 120_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-text-vertical-shrink-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-text-vertical-shrink-"));
try {
const width = 320;
const height = 320;
@@ -1267,7 +1267,7 @@ test("Media two-frame sampling, alpha, local motion and handoff survive partitio
skip: !enabled,
timeout: 120_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-media-track-visual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-media-track-visual-"));
try {
const width = 160;
const height = 120;
@@ -1404,7 +1404,7 @@ test("DepthStack Deck reflow, exact labels and old-system layout survive partiti
skip: !enabled,
timeout: 120_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-depth-stack-visual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-depth-stack-visual-"));
try {
const width = 240;
const height = 180;
@@ -1585,7 +1585,7 @@ test("all four Ranking components paint frame-pure progressive states under part
skip: !enabled,
timeout: 120_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-ranking-visual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-ranking-visual-"));
try {
const width = 480;
const height = 720;
@@ -1787,7 +1787,7 @@ test("all Spatial fit modes and equal-point alignments reach exact browser pixel
skip: !enabled,
timeout: 120_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-spatial-visual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-spatial-visual-"));
try {
const width = 530;
const height = 280;
@@ -1968,7 +1968,7 @@ test("every official Screen Overlay survives real sequential and parallel browse
skip: !enabled,
timeout: 120_000,
}, async () => {
- const temp = await mkdtemp(path.join(os.tmpdir(), "svml-screen-overlay-visual-"));
+ const temp = await mkdtemp(path.join(os.tmpdir(), "narratage-screen-overlay-visual-"));
try {
const width = 128;
const height = 96;
diff --git a/packages/hyperframes/test/document.test.ts b/packages/hyperframes/test/document.test.ts
index 2277a4ec..200453f5 100644
--- a/packages/hyperframes/test/document.test.ts
+++ b/packages/hyperframes/test/document.test.ts
@@ -39,7 +39,7 @@ function fixture() {
mediaType: "audio/wav",
};
const lower = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "lower",
presents: [{
id: "picture",
@@ -55,7 +55,7 @@ function fixture() {
}],
});
const upper = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "upper",
presents: [{
id: "words",
@@ -103,11 +103,11 @@ test("HyperFrames flattens generic peer visual Track Presents without absorbing
},
fixtureFont.sources[0]!.artifact,
]);
- assert.ok(document.html.indexOf('data-svml-track-id="lower"') < document.html.indexOf('data-svml-track-id="upper"'));
- assert.equal((document.html.match(/class="clip svml-visual-present"/gu) ?? []).length, 2);
+ assert.ok(document.html.indexOf('data-narratage-track-id="lower"') < document.html.indexOf('data-narratage-track-id="upper"'));
+ assert.equal((document.html.match(/class="clip narratage-visual-present"/gu) ?? []).length, 2);
assert.doesNotMatch(document.html, /<audio/u);
assert.doesNotMatch(document.html, new RegExp(sound.digest, "u"));
- assert.doesNotMatch(document.html, /isolation:isolate|svml-visual-track/u);
+ assert.doesNotMatch(document.html, /isolation:isolate|narratage-visual-track/u);
assert.match(document.html, /Hello &lt;world&gt;/u);
assert.doesNotMatch(document.html, /speech-visual-track|caption-track/u);
});
@@ -115,10 +115,10 @@ test("HyperFrames flattens generic peer visual Track Presents without absorbing
test("visual Artifact placeholders are materialized only by the Runtime boundary", () => {
const { composition, picture, sound, programSpace } = fixture();
const document = compileHyperframesDocument(composition, programSpace);
- assert.match(document.html, /svml-artifact:\/\/sha256\//u);
+ assert.match(document.html, /narratage-artifact:\/\/sha256\//u);
const resolved = materializeHyperframesHtml(document,
(artifact) => `https://assets.example/${artifact.digest}?x=1&y=2`);
- assert.doesNotMatch(resolved, /svml-artifact:\/\//u);
+ assert.doesNotMatch(resolved, /narratage-artifact:\/\//u);
assert.match(resolved, new RegExp(`https://assets\\.example/${picture.digest}\\?x=1&amp;y=2`, "u"));
assert.doesNotMatch(resolved, new RegExp(sound.digest, "u"));
assert.equal(document.html.includes("assets.example"), false, "materialization must not mutate the compiled document");
@@ -132,7 +132,7 @@ test("HyperframesDocument carries render facts while its Record binds integrity"
assert.equal(document.frameCount, 30);
assert.deepEqual(document.canvas, { width: 1080, height: 1920 });
assert.match(document.html, /data-fps="30000\/1001"/u);
- assert.match(document.html, /data-svml-frame-count="30"/u);
+ assert.match(document.html, /data-narratage-frame-count="30"/u);
assert.equal(hyperframesTime.frameSeconds(30, 30_000, 1_001), "1.001");
assert.equal(hyperframesTime.fpsDecimal(30_000, 1_001), "29.970029970029");
});
@@ -189,7 +189,7 @@ test("HyperFrames emits frame-bound local animation without creating a Track sta
...composition,
tracks: composition.tracks.map((track) => track.id === "lower" ? animated : track),
}), programSpace);
- assert.match(document.html, /@keyframes svml-/u);
+ assert.match(document.html, /@keyframes narratage-/u);
assert.match(document.html, /33\.333333333%\{opacity:1;transform:translateY\(0%\)/u);
assert.match(document.html, /animation-duration:1\.001s/u);
assert.match(document.html, /100%\{opacity:1;transform:translateY\(0%\)\}/u);
@@ -214,7 +214,7 @@ test("HyperFrames clips a long animation by Present visibility instead of reject
tracks: composition.tracks.map((track) => track.id === "lower" ? animated : track),
}), programSpace);
assert.match(document.html, /animation-duration:1\.5015s/u);
- assert.match(document.html, /data-svml-animation-duration-frames="45" data-svml-animation-sample-frames="30"/u);
+ assert.match(document.html, /data-narratage-animation-duration-frames="45" data-narratage-animation-sample-frames="30"/u);
assert.match(document.html, /100%\{opacity:1\}/u);
});
@@ -235,7 +235,7 @@ test("content-bound fonts and typed compositable Surfaces cross the same Artifac
};
const surfaceDigest = digestOf("hyperframes:alpha-surface");
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "bound-render-dependencies",
presents: [{
id: "bound",
@@ -284,11 +284,11 @@ test("content-bound fonts and typed compositable Surfaces cross the same Artifac
assert.match(document.html, /@font-face\{/u);
assert.match(document.html, /format\("woff2"\)/u);
assert.match(document.html, /font-synthesis:none/u);
- assert.match(document.html, /data-svml-alpha-mode="straight"/u);
- assert.match(document.html, /data-svml-color-space="srgb"/u);
+ assert.match(document.html, /data-narratage-alpha-mode="straight"/u);
+ assert.match(document.html, /data-narratage-color-space="srgb"/u);
const materialized = materializeHyperframesHtml(document,
(artifact) => `https://assets.example/${artifact.digest}?token=1&part=2`);
- assert.doesNotMatch(materialized, /svml-artifact:\/\//u);
+ assert.doesNotMatch(materialized, /narratage-artifact:\/\//u);
assert.match(materialized, new RegExp(font.sources[0]!.artifact.digest, "u"));
assert.match(materialized, new RegExp(surfaceDigest, "u"));
});
@@ -305,7 +305,7 @@ test("exact timed sampling lowers loop boundaries and held frames without zero-r
mediaType: "video/mp4",
};
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "sampled",
presents: [{
id: "sampled",
@@ -343,7 +343,7 @@ test("exact timed sampling lowers loop boundaries and held frames without zero-r
canvas: { width: 100, height: 100, clearColor: "#000000" },
tracks: [track],
}), programSpace);
- assert.equal((document.html.match(/data-svml-sampling-part=/gu) ?? []).length, 4);
+ assert.equal((document.html.match(/data-narratage-sampling-part=/gu) ?? []).length, 4);
assert.match(document.html, /data-media-start="0\.066666666666"/u);
assert.match(document.html, /data-media-start="0"/u);
assert.equal((document.html.match(/data-playback-rate="1"/gu) ?? []).length, 4);
diff --git a/packages/image-compose/package.json b/packages/image-compose/package.json
index 9f7f6b88..c8b30bbf 100644
--- a/packages/image-compose/package.json
+++ b/packages/image-compose/package.json
@@ -5,7 +5,7 @@
"private": true,
"type": "module",
"exports": { ".": "./src/index.ts" },
- "svml": { "activation": "./src/activation.ts" },
+ "narratage": { "activation": "./src/activation.ts" },
"dependencies": {
"@narratage/artifact": "workspace:*",
"@narratage/component-kit": "workspace:*",
diff --git a/packages/image-compose/src/activation.ts b/packages/image-compose/src/activation.ts
index 585aa249..477450e2 100644
--- a/packages/image-compose/src/activation.ts
+++ b/packages/image-compose/src/activation.ts
@@ -8,8 +8,8 @@ import {
imageComposeMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: imageComposeManifest }],
components: [imageComposeComponent],
hostFacets: [{ ...createMarkupSurfaceHostFacet({
@@ -18,4 +18,4 @@ export const svmlPackage = {
}) }],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/image-compose/src/component.ts b/packages/image-compose/src/component.ts
index 5a05758d..b07a7e28 100644
--- a/packages/image-compose/src/component.ts
+++ b/packages/image-compose/src/component.ts
@@ -4,7 +4,7 @@ import { canonicalize } from "@narratage/protocol";
import { rasterComposeRequest } from "@narratage/raster";
import type { CanvasSpace, SpatialFrame } from "@narratage/spatial";
-import { imageComposeImplementationDigests, imageComposeProducers, imageComposeTypes } from "./manifest.js";
+import { imageComposeProducers, imageComposeTypes } from "./manifest.js";
import {
appendImageComposeLayer,
assertImageComposeLayerSet,
@@ -27,11 +27,9 @@ const output = (value: unknown) => ({ kind: "inline" as const, value: canonicali
export const imageComposeComponent = {
producers: [{
producer: imageComposeProducers.createLayers,
- implementationDigest: imageComposeImplementationDigests.createLayers,
handler: () => ({ outputs: { layers: output(createImageComposeLayerSet()) }, needs: {} }),
}, {
producer: imageComposeProducers.appendLayer,
- implementationDigest: imageComposeImplementationDigests.appendLayer,
handler: ({ inputs }: ProducerHandlerContext) => ({
outputs: { layers: output(appendImageComposeLayer(
inline<ImageComposeLayerSet>(inputs.layers?.value, "ImageComposeLayerSet"),
@@ -43,7 +41,6 @@ export const imageComposeComponent = {
}),
}, {
producer: imageComposeProducers.request,
- implementationDigest: imageComposeImplementationDigests.request,
handler: ({ inputs }: ProducerHandlerContext) => {
const canvas = inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace");
const options = inline<ImageComposeOptions>(inputs.options?.value, "ImageComposeOptions");
@@ -59,15 +56,12 @@ export const imageComposeComponent = {
}],
validators: [{
type: imageComposeTypes.options,
- implementationDigest: imageComposeImplementationDigests.validateOptions,
handler: ({ value }) => assertImageComposeOptions(inline<ImageComposeOptions>(value, "ImageComposeOptions")),
}, {
type: imageComposeTypes.layerSpec,
- implementationDigest: imageComposeImplementationDigests.validateLayerSpec,
handler: ({ value }) => assertImageComposeLayerSpec(inline<ImageComposeLayerSpec>(value, "ImageComposeLayerSpec")),
}, {
type: imageComposeTypes.layerSet,
- implementationDigest: imageComposeImplementationDigests.validateLayerSet,
handler: ({ value }) => assertImageComposeLayerSet(inline<ImageComposeLayerSet>(value, "ImageComposeLayerSet")),
}],
} satisfies ComponentPackage;
diff --git a/packages/image-compose/src/index.ts b/packages/image-compose/src/index.ts
index 73ec1783..bfc47d1a 100644
--- a/packages/image-compose/src/index.ts
+++ b/packages/image-compose/src/index.ts
@@ -1,9 +1,6 @@
export { imageComposeComponent } from "./component.js";
export { createImageComposeFragment } from "./fragment.js";
-export {
- imageComposeDependency, imageComposeImplementationDigests,
- imageComposeManifest, imageComposeMarkupSurfaces, imageComposeManifestDigest, imageComposeModuleRef, imageComposeProducers, imageComposeTypes,
-} from "./manifest.js";
+export { imageComposeDependency, imageComposeManifest, imageComposeMarkupSurfaces, imageComposeModuleRef, imageComposeProducers, imageComposeTypes } from "./manifest.js";
export {
appendImageComposeLayer, assertImageComposeLayerSet, assertImageComposeLayerSpec, assertImageComposeOptions,
createImageComposeLayerSet,
diff --git a/packages/image-compose/src/manifest.ts b/packages/image-compose/src/manifest.ts
index cecf2a12..75cdf662 100644
--- a/packages/image-compose/src/manifest.ts
+++ b/packages/image-compose/src/manifest.ts
@@ -15,15 +15,6 @@ export const imageComposeProducers = {
appendLayer: { module: imageComposeModuleRef, name: "append-image-compose-layer" },
request: { module: imageComposeModuleRef, name: "request-image-compose" },
} satisfies Record<string, ProducerRef>;
-export const imageComposeImplementationDigests = {
- createLayers: digestOf("@narratage/image-compose/create-layers@1"),
- appendLayer: digestOf("@narratage/image-compose/append-layer@1"),
- request: digestOf("@narratage/image-compose/request@1/direct-need"),
- validateOptions: digestOf("@narratage/image-compose/validate-options@1"),
- validateLayerSpec: digestOf("@narratage/image-compose/validate-layer-spec@1"),
- validateLayerSet: digestOf("@narratage/image-compose/validate-layer-set@1"),
- surface: digestOf("@narratage/image-compose/image-surface@1"),
-} as const;
const string = { kind: "string", minLength: 1 } as const;
const number = { kind: "number" } as const;
@@ -61,39 +52,31 @@ const validator = (digest: ReturnType<typeof digestOf>) => ({
export const imageComposeMarkupSurfaces = [{
name: "image", tag: "Image", mode: "structured",
outputs: [imageComposeTypes.options, imageComposeTypes.layerSpec, artifactTypes.blob],
- implementation: { digest: imageComposeImplementationDigests.surface },
}] as const;
export const imageComposeManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: imageComposeModuleRef.name,
version: imageComposeModuleRef.version,
dependencies: [artifactDependency, spatialDependency, rasterDependency],
types: [
- { name: imageComposeTypes.options.name, schema: imageComposeOptionsSchema,
- validator: validator(imageComposeImplementationDigests.validateOptions) },
- { name: imageComposeTypes.layerSpec.name, schema: imageComposeLayerSpecSchema,
- validator: validator(imageComposeImplementationDigests.validateLayerSpec) },
- { name: imageComposeTypes.layerSet.name, schema: imageComposeLayerSetSchema,
- validator: validator(imageComposeImplementationDigests.validateLayerSet) },
+ { name: imageComposeTypes.options.name },
+ { name: imageComposeTypes.layerSpec.name },
+ { name: imageComposeTypes.layerSet.name },
],
capabilities: [],
producers: [
- { name: imageComposeProducers.createLayers.name, inputs: [], outputs: [{ name: "layers", type: imageComposeTypes.layerSet }], needs: [],
- implementation: registered(imageComposeImplementationDigests.createLayers) },
+ { name: imageComposeProducers.createLayers.name, inputs: [], outputs: [{ name: "layers", type: imageComposeTypes.layerSet }], needs: [] },
{ name: imageComposeProducers.appendLayer.name, inputs: [
{ name: "layers", type: imageComposeTypes.layerSet }, { name: "source", type: artifactTypes.blob },
{ name: "frame", type: spatialTypes.frame }, { name: "spec", type: imageComposeTypes.layerSpec },
- ], outputs: [{ name: "layers", type: imageComposeTypes.layerSet }], needs: [],
- implementation: registered(imageComposeImplementationDigests.appendLayer) },
+ ], outputs: [{ name: "layers", type: imageComposeTypes.layerSet }], needs: [] },
{ name: imageComposeProducers.request.name, inputs: [
{ name: "canvas", type: spatialTypes.canvas }, { name: "options", type: imageComposeTypes.options },
{ name: "layers", type: imageComposeTypes.layerSet },
- ], outputs: [], needs: [{ name: "image", capability: rasterCapabilities.execute, returns: artifactTypes.blob }],
- implementation: registered(imageComposeImplementationDigests.request) },
+ ], outputs: [], needs: [{ name: "image", capability: rasterCapabilities.execute, returns: artifactTypes.blob }] },
],
};
-export const imageComposeManifestDigest = digestOf(imageComposeManifest);
-export const imageComposeDependency = { module: imageComposeModuleRef, digest: imageComposeManifestDigest } as const;
+export const imageComposeDependency = { module: imageComposeModuleRef } as const;
diff --git a/packages/image-transform/package.json b/packages/image-transform/package.json
index 4ff2fced..c93ef559 100644
--- a/packages/image-transform/package.json
+++ b/packages/image-transform/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/image-transform/src/activation.ts b/packages/image-transform/src/activation.ts
index 719971ef..32f21fe5 100644
--- a/packages/image-transform/src/activation.ts
+++ b/packages/image-transform/src/activation.ts
@@ -9,8 +9,8 @@ import {
imageTransformMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: imageTransformManifest,
}],
@@ -30,4 +30,4 @@ export const svmlPackage = {
}],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/image-transform/src/component.ts b/packages/image-transform/src/component.ts
index f51025ce..de758b8f 100644
--- a/packages/image-transform/src/component.ts
+++ b/packages/image-transform/src/component.ts
@@ -3,11 +3,7 @@ import type { BlobRef, StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
import { rasterTransformRequest } from "@narratage/raster";
-import {
- imageTransformImplementationDigests,
- imageTransformProducers,
- imageTransformTypes,
-} from "./manifest.js";
+import { imageTransformProducers, imageTransformTypes } from "./manifest.js";
import { verifyImageTransformProgram } from "./program.js";
import type { ImageTransformProgram } from "./types.js";
@@ -25,14 +21,12 @@ function blob(value: StoredValue | undefined, subject: string): BlobRef {
export const imageTransformComponent = {
validators: [{
type: imageTransformTypes.program,
- implementationDigest: imageTransformImplementationDigests.validator,
handler: ({ value }) => {
verifyImageTransformProgram(inline(value, "ImageTransformProgram"));
},
}],
producers: [{
producer: imageTransformProducers.request,
- implementationDigest: imageTransformImplementationDigests.request,
handler: ({ inputs }) => {
const source = blob(inputs.source?.value, "ImageTransform source");
const program = inline(inputs.program?.value, "ImageTransformProgram");
diff --git a/packages/image-transform/src/index.ts b/packages/image-transform/src/index.ts
index d0fb8731..7017af4a 100644
--- a/packages/image-transform/src/index.ts
+++ b/packages/image-transform/src/index.ts
@@ -1,14 +1,6 @@
export { imageTransformComponent } from "./component.js";
export { imageTransformFragment } from "./fragment.js";
-export {
- imageTransformImplementationDigests,
- imageTransformManifest, imageTransformMarkupSurfaces,
- imageTransformManifestDigest,
- imageTransformModuleRef,
- imageTransformProducers,
- imageTransformProgramSchema,
- imageTransformTypes,
-} from "./manifest.js";
+export { imageTransformManifest, imageTransformMarkupSurfaces, imageTransformModuleRef, imageTransformProducers, imageTransformProgramSchema, imageTransformTypes } from "./manifest.js";
export {
gptImageDenoiseV1,
sealImageTransformProgram,
diff --git a/packages/image-transform/src/manifest.ts b/packages/image-transform/src/manifest.ts
index 73f82ce8..39df7e8f 100644
--- a/packages/image-transform/src/manifest.ts
+++ b/packages/image-transform/src/manifest.ts
@@ -15,12 +15,6 @@ export const imageTransformTypes = {
export const imageTransformProducers = {
request: { module: imageTransformModuleRef, name: "request-image-transform" },
} satisfies Record<string, ProducerRef>;
-export const imageTransformImplementationDigests = {
- request: digestOf("@narratage/image-transform/request-image-transform@1"),
- validator: digestOf("@narratage/image-transform/validate-program@1"),
- programSurface: digestOf("@narratage/image-transform/program-surface@1"),
- transformSurface: digestOf("@narratage/image-transform/transform-surface@1"),
-} as const;
export const imageTransformProgramSchema: ValueSchema = { kind: "object", fields: {
operations: { schema: { kind: "array", minItems: 1, items: rasterTransformOperationSchema } },
@@ -31,33 +25,21 @@ export const imageTransformMarkupSurfaces = [{
tag: "Program",
mode: "structured",
outputs: [imageTransformTypes.program],
- implementation: {
- digest: imageTransformImplementationDigests.programSurface,
- },
}, {
name: "transform",
tag: "Transform",
mode: "structured",
outputs: [artifactTypes.blob],
- implementation: {
- digest: imageTransformImplementationDigests.transformSurface,
- },
}] as const;
export const imageTransformManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: imageTransformModuleRef.name,
version: imageTransformModuleRef.version,
dependencies: [artifactDependency, rasterDependency],
types: [{
name: imageTransformTypes.program.name,
- schema: imageTransformProgramSchema,
- validator: {
- implementation: {
- digest: imageTransformImplementationDigests.validator,
- },
- },
}],
capabilities: [],
producers: [{
@@ -72,10 +54,5 @@ export const imageTransformManifest: ModuleManifest = {
capability: rasterCapabilities.execute,
returns: artifactTypes.blob,
}],
- implementation: {
- digest: imageTransformImplementationDigests.request,
- },
}],
};
-
-export const imageTransformManifestDigest = digestOf(imageTransformManifest);
diff --git a/packages/local/src/project-components.ts b/packages/local/src/project-components.ts
deleted file mode 100644
index 0bf08d97..00000000
--- a/packages/local/src/project-components.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import {
- assembleRuntimeComponents,
- verifyRuntimeComponentPackage,
-} from "@narratage/runtime";
-import type {
- BuildCatalog,
- RuntimeComponentAssembly,
- RuntimeComponentPackage,
- RuntimeBindings,
-} from "@narratage/runtime";
-
-import type { ProjectLocalRuntimeControlOptions } from "./types.js";
-
-export type ProjectRuntimeBindings = RuntimeBindings;
-export type ProjectRuntimeComponentAssembly = RuntimeComponentAssembly;
-
-export type AssembledProjectRuntimeComponents = {
- readonly assembly: ProjectRuntimeComponentAssembly;
- readonly catalog: BuildCatalog | undefined;
- readonly selection: ProjectRuntimeBindings;
- close(): Promise<void>;
-};
-
-function assert(condition: unknown, message: string): asserts condition {
- if (!condition) throw new Error(message);
-}
-
-export function selectedBuildCatalog(
- packages: readonly RuntimeComponentPackage[],
- buildStore: string,
-): BuildCatalog | undefined {
- const owner = packages.find((item) => item.components.some((component) =>
- component.role === "build-store" && component.instance.id === buildStore));
- if (owner === undefined) return undefined;
- const catalog = owner.buildCatalog;
- if (catalog === undefined) return undefined;
- assert(catalog !== null && typeof catalog === "object"
- && "record" in catalog && typeof catalog.record === "function"
- && "read" in catalog && typeof catalog.read === "function"
- && "list" in catalog && typeof catalog.list === "function",
- `Runtime Component ${buildStore} exposes an invalid Build Catalog`);
- return catalog as BuildCatalog;
-}
-
-/**
- * Assemble only the Components named by the Runtime Profile. This layer never manufactures a
- * Scheduler, Worker, Store, path or credential source on the project's behalf.
- */
-export async function createProjectRuntimeComponents(
- _root: string,
- options: ProjectLocalRuntimeControlOptions,
-): Promise<AssembledProjectRuntimeComponents> {
- const packages = [...options.runtimeComponents];
- try {
- for (const item of packages) verifyRuntimeComponentPackage(item);
- const assembly = assembleRuntimeComponents(packages, options.bindings);
- const catalog = selectedBuildCatalog(packages, options.bindings.stores.build);
- return {
- assembly,
- catalog,
- selection: options.bindings,
- close: () => assembly.close(),
- };
- } catch (error) {
- for (const item of [...packages].reverse()) await item.close?.();
- throw error;
- }
-}
diff --git a/packages/local/src/scheduler-package.ts b/packages/local/src/scheduler-package.ts
deleted file mode 100644
index e49fb66c..00000000
--- a/packages/local/src/scheduler-package.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { digestOf } from "@narratage/protocol";
-import {
- LocalBuildScheduler,
- defineRuntimeComponentPackage,
-} from "@narratage/runtime";
-import type { RuntimeComponentPackage } from "@narratage/runtime";
-
-import { durableLocalWorkerFactory } from "./worker.js";
-
-const localRuntimeModuleRef = {
- name: "@narratage/local",
- version: "1",
-} as const;
-
-const localSchedulerImplementationDigest = digestOf("@narratage/local/scheduler@1");
-const localWorkerImplementationDigest = digestOf("@narratage/local/worker@1/blocked-subject");
-
-export function createLocalExecutionPackage(
- instance: string,
-): RuntimeComponentPackage {
- return defineRuntimeComponentPackage({
- module: localRuntimeModuleRef,
- components: [
- {
- role: "scheduler",
- facet: "scheduler",
- instance: `${instance}.scheduler`,
- implementation: {
- digest: localSchedulerImplementationDigest,
- },
- configuration: { algorithm: "atomic-resources", version: 1 },
- port: {
- create(executor, options) {
- return new LocalBuildScheduler(executor, options);
- },
- },
- },
- {
- role: "worker",
- facet: "worker",
- instance: `${instance}.worker`,
- implementation: {
- digest: localWorkerImplementationDigest,
- },
- configuration: { dispatch: "leased", capacity: "shared", version: 1 },
- port: durableLocalWorkerFactory,
- },
- ],
- });
-}
diff --git a/packages/markup/README.md b/packages/markup/README.md
index 357128da..11bc50a0 100644
--- a/packages/markup/README.md
+++ b/packages/markup/README.md
@@ -41,7 +41,7 @@ Compiler Host, not the Surface, owns containment, read-once behavior and byte tr
that does not request assets remains unchanged apart from being awaitable.
Markup validates source ranges, duplicate identities, Host-facet-declared Record types and complete
-Fragment references. It strips diagnostic ranges before sealing one `svml.author-module@1`, so
+Fragment references. It strips diagnostic ranges before sealing one `narratage.author-module@1`, so
source reflow does not change author semantics. It never expands a Fragment or resolves a component
input while reading the body. After every declaration has been collected, `@narratage/elaborator`
resolves forward references and emits the Core Graph.
diff --git a/packages/markup/src/frontend.ts b/packages/markup/src/frontend.ts
index 0baaf2ff..812780ee 100644
--- a/packages/markup/src/frontend.ts
+++ b/packages/markup/src/frontend.ts
@@ -4,8 +4,6 @@ import {
digestOf,
isDigest,
sealRecord,
- verifyClosure,
- verifyRecordStructure,
} from "@narratage/core";
import type {
CanonicalValue,
@@ -44,8 +42,6 @@ import type {
MarkupAuthorFrontendOptions,
MarkupImportRequest,
} from "./types.js";
-
-export const markupFrontendImplementationDigest = digestOf("@narratage/markup/frontend@1");
export const markupAuthorFrontendId = "@narratage/markup@1";
type BoundSurface = {
@@ -121,7 +117,6 @@ function surfaceScope(
}
export async function decodeMarkup(source: MarkupSource, context: MarkupDecodeContext): Promise<MarkupDecodeResult> {
- verifyClosure(context.closure);
const discovery = discoverMarkup(source);
const sourceImports = context.sourceImports ?? [];
const importedBindings = new Map<string, AuthorSourceExport>();
@@ -308,7 +303,6 @@ export async function decodeMarkup(source: MarkupSource, context: MarkupDecodeCo
value: draft.value,
origin: { kind: "authored" },
});
- verifyRecordStructure(context.closure, record);
records.push(record);
}
for (const draft of output.components) {
@@ -345,7 +339,7 @@ export async function decodeMarkup(source: MarkupSource, context: MarkupDecodeCo
});
}
for (const fragment of output.fragments) {
- if (fragment.format !== "svml.fragment@1" || !isDigest(fragment.id)) {
+ if (fragment.format !== "narratage.fragment@1" || !isDigest(fragment.id)) {
fail(
source,
"MARKUP_FRAGMENT_IDENTITY",
@@ -419,7 +413,6 @@ export async function decodeMarkup(source: MarkupSource, context: MarkupDecodeCo
export function createMarkupAuthorFrontend(options: MarkupAuthorFrontendOptions): MarkupAuthorFrontend {
return {
id: markupAuthorFrontendId,
- implementationDigest: markupFrontendImplementationDigest,
discover(source) {
const discovery = discoverMarkup(source);
return {
diff --git a/packages/markup/src/host-facet.ts b/packages/markup/src/host-facet.ts
index 43953d87..9886352c 100644
--- a/packages/markup/src/host-facet.ts
+++ b/packages/markup/src/host-facet.ts
@@ -1,6 +1,5 @@
import type { HostFacet } from "@narratage/host";
-import { isDigest } from "@narratage/protocol";
-import type { Digest, ModuleRef, TypeRef } from "@narratage/protocol";
+import type { ModuleRef, TypeRef } from "@narratage/protocol";
import type {
RawSurfaceHandler,
@@ -12,7 +11,7 @@ import type {
StructuredSurfaceDeclaration,
} from "./types.js";
-export const markupSurfaceHostFacetAbi = "svml.markup-surface-host@1";
+export const markupSurfaceHostFacetAbi = "narratage.markup-surface-host@1";
type RawMarkupSurfaceHostFacetOptions =
| {
@@ -21,7 +20,6 @@ type RawMarkupSurfaceHostFacetOptions =
readonly tag: string;
readonly outputs: readonly TypeRef[];
readonly mode: "raw";
- readonly implementationDigest: Digest;
readonly handler: RawSurfaceHandler;
}
| {
@@ -37,7 +35,6 @@ type StructuredMarkupSurfaceHostFacetOptions =
readonly tag: string;
readonly outputs: readonly TypeRef[];
readonly mode: "structured";
- readonly implementationDigest: Digest;
readonly handler: StructuredSurfaceHandler;
}
| {
@@ -99,14 +96,12 @@ export function createMarkupSurfaceHostFacet(options: MarkupSurfaceHostFacetOpti
tag: options.declaration.tag,
outputs: options.declaration.outputs,
mode: options.declaration.mode,
- implementationDigest: options.declaration.implementation.digest,
}
: options;
assert(options.module.name.trim().length > 0 && options.module.version.trim().length > 0,
"Markup Surface module identity is invalid");
assert(declaration.surface.trim().length > 0, "Markup Surface name is empty");
assert(declaration.tag.trim().length > 0, "Markup Surface tag is empty");
- assert(isDigest(declaration.implementationDigest), "Markup Surface implementation digest is invalid");
return {
abi: markupSurfaceHostFacetAbi,
identity: {
@@ -115,7 +110,6 @@ export function createMarkupSurfaceHostFacet(options: MarkupSurfaceHostFacetOpti
tag: declaration.tag,
outputs: declaration.outputs,
mode: declaration.mode,
- implementationDigest: declaration.implementationDigest,
},
implementation: options.handler,
};
@@ -129,7 +123,7 @@ export function installMarkupSurfaceHostFacets(
for (const facet of facets) {
if (facet.abi !== markupSurfaceHostFacetAbi) continue;
const identity = object(facet.identity, "Markup Surface Host facet identity");
- exact(identity, ["module", "surface", "tag", "outputs", "mode", "implementationDigest"],
+ exact(identity, ["module", "surface", "tag", "outputs", "mode"],
"Markup Surface Host facet identity");
const module = object(identity.module, "Markup Surface Host facet module");
exact(module, ["name", "version"], "Markup Surface Host facet module");
@@ -141,11 +135,6 @@ export function installMarkupSurfaceHostFacets(
const tag = nonEmptyString(identity.tag, "Markup Surface Host facet tag");
assert(Array.isArray(identity.outputs), "Markup Surface Host facet outputs must be an array");
const outputs = identity.outputs.map((item, index) => typeRef(item, `Markup Surface Host facet outputs[${index}]`));
- const implementationDigest = nonEmptyString(
- identity.implementationDigest,
- "Markup Surface Host facet implementation digest",
- );
- assert(isDigest(implementationDigest), "Markup Surface Host facet implementation digest is invalid");
assert(typeof facet.implementation === "function", "Markup Surface Host facet implementation must be a function");
assert(identity.mode === "raw" || identity.mode === "structured", "Markup Surface Host facet mode is invalid");
if (identity.mode === "raw") {
@@ -154,7 +143,6 @@ export function installMarkupSurfaceHostFacets(
surface,
tag,
outputs,
- implementationDigest,
mode: "raw",
handler: facet.implementation as RawSurfaceHandler,
});
@@ -164,7 +152,6 @@ export function installMarkupSurfaceHostFacets(
surface,
tag,
outputs,
- implementationDigest,
mode: "structured",
handler: facet.implementation as StructuredSurfaceHandler,
});
diff --git a/packages/markup/src/index.ts b/packages/markup/src/index.ts
index 55fc19f8..e1c1eaf1 100644
--- a/packages/markup/src/index.ts
+++ b/packages/markup/src/index.ts
@@ -1,10 +1,5 @@
export { MarkupFrontendError } from "./error.js";
-export {
- decodeMarkup,
- createMarkupAuthorFrontend,
- markupAuthorFrontendId,
- markupFrontendImplementationDigest,
-} from "./frontend.js";
+export { decodeMarkup, createMarkupAuthorFrontend, markupAuthorFrontendId } from "./frontend.js";
export { MarkupSurfaceRegistry } from "./registry.js";
export {
createMarkupSurfaceHostFacet,
diff --git a/packages/markup/src/registry.ts b/packages/markup/src/registry.ts
index 7540e36e..09177180 100644
--- a/packages/markup/src/registry.ts
+++ b/packages/markup/src/registry.ts
@@ -1,4 +1,3 @@
-import { isDigest } from "@narratage/protocol";
import type { ModuleRef } from "@narratage/protocol";
import type {
@@ -18,7 +17,6 @@ export class MarkupSurfaceRegistry implements MarkupSurfaceRegistryLike {
readonly #values = new Map<string, RegisteredSurface>();
register(value: RegisteredSurface): void {
- if (!isDigest(value.implementationDigest)) throw new Error("Surface implementation digest is invalid");
if (value.module.name.trim().length === 0 || value.module.version.trim().length === 0) {
throw new Error("Surface module identity is invalid");
}
@@ -45,7 +43,6 @@ export class MarkupSurfaceRegistry implements MarkupSurfaceRegistryLike {
surface: options.declaration.name,
tag: options.declaration.tag,
outputs: options.declaration.outputs,
- implementationDigest: options.declaration.implementation.digest,
mode: "raw",
handler: options.handler,
});
@@ -61,7 +58,6 @@ export class MarkupSurfaceRegistry implements MarkupSurfaceRegistryLike {
surface: options.declaration.name,
tag: options.declaration.tag,
outputs: options.declaration.outputs,
- implementationDigest: options.declaration.implementation.digest,
mode: "structured",
handler: options.handler,
});
diff --git a/packages/markup/src/types.ts b/packages/markup/src/types.ts
index 5b4745aa..30a4588d 100644
--- a/packages/markup/src/types.ts
+++ b/packages/markup/src/types.ts
@@ -1,6 +1,5 @@
import type {
CanonicalValue,
- Digest,
ModuleRef,
ResolvedModuleClosure,
SourceRange,
@@ -124,7 +123,6 @@ type MarkupSurfaceDeclarationBase = {
readonly name: string;
readonly tag: string;
readonly outputs: readonly TypeRef[];
- readonly implementation: { readonly digest: Digest };
};
export type RawSurfaceDeclaration = MarkupSurfaceDeclarationBase & { readonly mode: "raw" };
@@ -136,7 +134,6 @@ type RegisteredSurfaceBase = {
readonly surface: string;
readonly tag: string;
readonly outputs: readonly TypeRef[];
- readonly implementationDigest: Digest;
};
export type RegisteredRawSurface = RegisteredSurfaceBase & {
diff --git a/packages/markup/test/author-integration.test.ts b/packages/markup/test/author-integration.test.ts
index e3821423..d7a586ee 100644
--- a/packages/markup/test/author-integration.test.ts
+++ b/packages/markup/test/author-integration.test.ts
@@ -39,20 +39,20 @@ const sampleSurfaceDigest = digestOf("example.text-laboratory/sample-surface@1")
const measureSurfaceDigest = digestOf("example.text-laboratory/measure-surface@1");
const reportSurfaceDigest = digestOf("example.text-laboratory/report-surface@1");
const laboratorySurfaces = [
- { name: "sample", tag: "Sample", mode: "structured", outputs: [sampleType], implementation: { digest: sampleSurfaceDigest } },
- { name: "measure", tag: "Measure", mode: "structured", outputs: [], implementation: { digest: measureSurfaceDigest } },
- { name: "report", tag: "Report", mode: "structured", outputs: [], implementation: { digest: reportSurfaceDigest } },
+ { name: "sample", tag: "Sample", mode: "structured", outputs: [sampleType] },
+ { name: "measure", tag: "Measure", mode: "structured", outputs: [] },
+ { name: "report", tag: "Report", mode: "structured", outputs: [] },
] as const;
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: laboratory.name,
version: laboratory.version,
dependencies: [],
types: [
- { name: sampleType.name, schema: { kind: "string", minLength: 1 } },
- { name: measurementType.name, schema: { kind: "number" } },
- { name: reportType.name, schema: { kind: "string", minLength: 1 } },
+ { name: sampleType.name },
+ { name: measurementType.name },
+ { name: reportType.name },
],
capabilities: [],
producers: [
@@ -61,18 +61,12 @@ const manifest: ModuleManifest = {
inputs: [{ name: "sample", type: sampleType }],
outputs: [{ name: "measurement", type: measurementType }],
needs: [],
- implementation: {
- digest: digestOf("example.text-laboratory/measure@1"),
- },
},
{
name: reportProducer.name,
inputs: [{ name: "measurement", type: measurementType }],
outputs: [{ name: "report", type: reportType }],
needs: [],
- implementation: {
- digest: digestOf("example.text-laboratory/write-report@1"),
- },
},
],
};
diff --git a/packages/media-execution/src/execute.ts b/packages/media-execution/src/execute.ts
index f0b95d6c..e1056330 100644
--- a/packages/media-execution/src/execute.ts
+++ b/packages/media-execution/src/execute.ts
@@ -584,7 +584,7 @@ export async function executeInspectMedia(
constraints: CanonicalValue,
): Promise<MediaOperationResult> {
const need = inspectNeed(constraints);
- const work = await mkdtemp(join(tmpdir(), "svml-media-inspect-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-inspect-"));
try {
const input = join(work, "source.bin");
const animationBytes = need.source.mediaType === "image/webp" ? await sourceBytes(env, need.source) : undefined;
@@ -613,7 +613,7 @@ export async function executeNormalizeMedia(
): Promise<MediaOperationResult> {
const need = normalizeNeed(constraints);
const plan = normalizationPlan(need.inspection, need.selection, need.frameRate);
- const work = await mkdtemp(join(tmpdir(), "svml-media-normalize-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-normalize-"));
try {
const input = join(work, "source.bin");
const animationBytes = need.source.mediaType === "image/webp" ? await sourceBytes(env, need.source) : undefined;
@@ -792,7 +792,7 @@ export async function executeTransformMedia(
const need = transformNeed(constraints);
const media = need.media;
const plan = compileTransformPlan(media, need.program.operations);
- const work = await mkdtemp(join(tmpdir(), "svml-media-transform-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-transform-"));
try {
const visualPath = join(work, "visual.mp4");
const audioPath = join(work, "audio.wav");
@@ -855,7 +855,7 @@ export async function executeExtractAudio(
constraints: CanonicalValue,
): Promise<MediaOperationResult> {
const need = extractAudioNeed(constraints);
- const work = await mkdtemp(join(tmpdir(), "svml-media-extract-audio-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-extract-audio-"));
try {
const input = join(work, "source.bin");
const output = join(work, "audio.wav");
@@ -891,7 +891,7 @@ export async function executeExtractFrame(
constraints: CanonicalValue,
): Promise<MediaOperationResult> {
const need = extractFrameNeed(constraints);
- const work = await mkdtemp(join(tmpdir(), "svml-media-extract-frame-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-extract-frame-"));
try {
const input = join(work, "source.bin");
const output = join(work, "frame.png");
@@ -939,7 +939,7 @@ export async function executeProjectSpeechEvidenceAudio(
constraints: CanonicalValue,
): Promise<MediaOperationResult> {
const need = evidenceAudioNeed(constraints);
- const work = await mkdtemp(join(tmpdir(), "svml-media-speech-evidence-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-speech-evidence-"));
try {
const input = join(work, "speech-master.wav");
const output = join(work, "alignment-evidence.wav");
@@ -1003,7 +1003,7 @@ export async function executeRenderTimelineAudio(
): Promise<MediaOperationResult> {
const need = renderAudioNeed(constraints);
const plan: AudioProgramPlan = need.plan;
- const work = await mkdtemp(join(tmpdir(), "svml-media-audio-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-audio-"));
try {
const artifacts = new Map<string, { source: BlobRef; path: string; inputIndex: number; sampleFrames: number }>();
for (const clip of plan.clips) {
@@ -1089,7 +1089,7 @@ export async function executeMuxProgramMedia(
constraints: CanonicalValue,
): Promise<MediaOperationResult> {
const need = muxMediaNeed(constraints);
- const work = await mkdtemp(join(tmpdir(), "svml-media-mux-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-mux-"));
try {
const visualPath = join(work, "visual.mp4");
const audioPath = join(work, "audio.wav");
diff --git a/packages/media-execution/src/surface.ts b/packages/media-execution/src/surface.ts
index 07d151e9..855d1f24 100644
--- a/packages/media-execution/src/surface.ts
+++ b/packages/media-execution/src/surface.ts
@@ -212,7 +212,7 @@ export async function verifyCompositableSurfaceBytes(options: {
const ffprobePath = options.ffprobePath ?? "ffprobe";
const timeoutMs = options.processTimeoutMs ?? 120_000;
const maxOutputBytes = options.maxProbeOutputBytes ?? 8 * 1024 * 1024;
- const directory = await mkdtemp(join(tmpdir(), "svml-surface-verify-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-surface-verify-"));
try {
const path = join(directory, `surface${suffix(options.surface.artifact.mediaType)}`);
await writeFile(path, options.bytes);
diff --git a/packages/media-execution/test/surface.test.ts b/packages/media-execution/test/surface.test.ts
index 3de09402..1a815523 100644
--- a/packages/media-execution/test/surface.test.ts
+++ b/packages/media-execution/test/surface.test.ts
@@ -46,7 +46,7 @@ function surface(bytes: Uint8Array, options: {
test("Surface byte admission accepts matching still/video bytes and rejects contradictions", {
skip: !hasMediaTools,
}, async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-surface-test-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-surface-test-"));
try {
const opaquePath = join(directory, "opaque.png");
const alphaPath = join(directory, "alpha.png");
diff --git a/packages/media-pipeline/package.json b/packages/media-pipeline/package.json
index 935a5340..bd89f7cd 100644
--- a/packages/media-pipeline/package.json
+++ b/packages/media-pipeline/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/media-pipeline/src/activation.ts b/packages/media-pipeline/src/activation.ts
index 81a38fe0..f3e106de 100644
--- a/packages/media-pipeline/src/activation.ts
+++ b/packages/media-pipeline/src/activation.ts
@@ -10,8 +10,8 @@ import {
mediaPipelineMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: mediaPipelineManifest }],
components: [mediaPipelineComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -32,4 +32,4 @@ export const svmlPackage = {
handler: decodeExtractFrameSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/media-pipeline/src/component.ts b/packages/media-pipeline/src/component.ts
index 7eb2f8ca..48400de7 100644
--- a/packages/media-pipeline/src/component.ts
+++ b/packages/media-pipeline/src/component.ts
@@ -14,11 +14,7 @@ import {
compileAudioProgramPlan,
verifyAudioProgramPlan,
} from "./audio-plan.js";
-import {
- mediaPipelineImplementationDigests,
- mediaPipelineProducers,
- mediaPipelineTypes,
-} from "./manifest.js";
+import { mediaPipelineProducers, mediaPipelineTypes } from "./manifest.js";
import {
sealMediaSelectionRequest,
selectMediaStreams,
@@ -74,35 +70,30 @@ export const mediaPipelineComponent = {
validators: [
{
type: mediaPipelineTypes.selectionRequest,
- implementationDigest: mediaPipelineImplementationDigests.requestValidator,
handler: ({ value }) => {
verifyMediaSelectionRequest(inline(value, "MediaSelectionRequest"));
},
},
{
type: mediaPipelineTypes.audioProgramPlan,
- implementationDigest: mediaPipelineImplementationDigests.audioPlanValidator,
handler: ({ value }) => {
verifyAudioProgramPlan(inline(value, "AudioProgramPlan"));
},
},
{
type: mediaPipelineTypes.transformProgram,
- implementationDigest: mediaPipelineImplementationDigests.transformProgramValidator,
handler: ({ value }) => {
verifyMediaTransformProgram(inline(value, "MediaTransformProgram"));
},
},
{
type: mediaPipelineTypes.audioExtractionRequest,
- implementationDigest: mediaPipelineImplementationDigests.audioExtractionValidator,
handler: ({ value }) => {
verifyAudioExtractionRequest(inline(value, "AudioExtractionRequest"));
},
},
{
type: mediaPipelineTypes.frameExtractionRequest,
- implementationDigest: mediaPipelineImplementationDigests.frameExtractionValidator,
handler: ({ value }) => {
verifyFrameExtractionRequest(inline(value, "FrameExtractionRequest"));
},
@@ -111,7 +102,6 @@ export const mediaPipelineComponent = {
producers: [
{
producer: mediaPipelineProducers.bindVisualRequest,
- implementationDigest: mediaPipelineImplementationDigests.bindVisualRequest,
handler: ({ inputs }) => ({
outputs: {
request: {
@@ -127,7 +117,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.bindAvRequest,
- implementationDigest: mediaPipelineImplementationDigests.bindAvRequest,
handler: ({ inputs }) => ({
outputs: {
request: {
@@ -143,7 +132,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.inspect,
- implementationDigest: mediaPipelineImplementationDigests.inspect,
handler: ({ inputs }) => {
const source = blob(inputs.source!.value, "Media inspection source");
const need: InspectMediaNeed = { source };
@@ -152,7 +140,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.select,
- implementationDigest: mediaPipelineImplementationDigests.select,
handler: ({ inputs }) => {
const inspection = inline(inputs.inspection!.value, "MediaInspection");
const request = inline(inputs.request!.value, "MediaSelectionRequest");
@@ -168,7 +155,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.normalize,
- implementationDigest: mediaPipelineImplementationDigests.normalize,
handler: ({ inputs }) => {
const source = blob(inputs.source!.value, "Media normalization source");
const inspection = inline(inputs.inspection!.value, "MediaInspection");
@@ -189,7 +175,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.transform,
- implementationDigest: mediaPipelineImplementationDigests.transform,
handler: ({ inputs }) => {
const media = inline(inputs.media!.value, "SynchronizedMedia");
const program = inline(inputs.program!.value, "MediaTransformProgram");
@@ -205,7 +190,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.extractAudio,
- implementationDigest: mediaPipelineImplementationDigests.extractAudio,
handler: ({ inputs }) => {
const source = blob(inputs.source!.value, "Audio extraction source");
const inspection = inline(inputs.inspection!.value, "MediaInspection");
@@ -223,7 +207,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.extractFrame,
- implementationDigest: mediaPipelineImplementationDigests.extractFrame,
handler: ({ inputs }) => {
const source = blob(inputs.source!.value, "Frame extraction source");
const inspection = inline(inputs.inspection!.value, "MediaInspection");
@@ -246,7 +229,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.projectSpeechEvidenceAudio,
- implementationDigest: mediaPipelineImplementationDigests.projectSpeechEvidenceAudio,
handler: ({ inputs }) => {
const audio = inline(inputs.audio!.value, "SpeechAudioBasis") as unknown as SpeechAudioBasis;
assertSpeechAudioBasisIdentity(audio);
@@ -271,7 +253,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.planAudio,
- implementationDigest: mediaPipelineImplementationDigests.planAudio,
handler: ({ inputs }) => {
const composition = inline(inputs.composition!.value, "Composition") as unknown as Composition;
const space = inline(inputs.space!.value, "ProgramSpace") as unknown as ProgramSpace;
@@ -283,7 +264,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.renderAudio,
- implementationDigest: mediaPipelineImplementationDigests.renderAudio,
handler: ({ inputs }) => {
const plan = inline(inputs.plan!.value, "AudioProgramPlan");
verifyAudioProgramPlan(plan);
@@ -293,7 +273,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.mux,
- implementationDigest: mediaPipelineImplementationDigests.mux,
handler: ({ inputs }) => {
const visual = inline(inputs.visual!.value, "RenderedVisual");
const audio = inline(inputs.audio!.value, "TimelineAudio");
@@ -309,7 +288,6 @@ export const mediaPipelineComponent = {
},
{
producer: mediaPipelineProducers.projectMuxed,
- implementationDigest: mediaPipelineImplementationDigests.projectMuxed,
handler: ({ inputs }) => {
const media = inline(inputs.media!.value, "MuxedMedia");
verifyMuxedMedia(media);
diff --git a/packages/media-pipeline/src/index.ts b/packages/media-pipeline/src/index.ts
index f51b85ad..5c9b50bd 100644
--- a/packages/media-pipeline/src/index.ts
+++ b/packages/media-pipeline/src/index.ts
@@ -13,22 +13,7 @@ export {
sealAudioProgramPlan,
verifyAudioProgramPlan,
} from "./audio-plan.js";
-export {
- mediaPipelineCapabilities,
- mediaPipelineImplementationDigests,
- mediaPipelineManifest, mediaPipelineMarkupSurfaces,
- mediaPipelineManifestDigest,
- mediaPipelineModuleRef,
- mediaPipelineProducers,
- mediaPipelineTypes,
- audioProgramPlanSchema,
- mediaSelectionRequestSchema,
- synchronizedMediaSurfaceImplementationDigest,
- mediaOperationSurfaceImplementationDigests,
- audioExtractionRequestSchema,
- frameExtractionRequestSchema,
- mediaTransformProgramSchema,
-} from "./manifest.js";
+export { mediaPipelineCapabilities, mediaPipelineManifest, mediaPipelineMarkupSurfaces, mediaPipelineModuleRef, mediaPipelineProducers, mediaPipelineTypes, audioProgramPlanSchema, mediaSelectionRequestSchema, audioExtractionRequestSchema, frameExtractionRequestSchema, mediaTransformProgramSchema } from "./manifest.js";
export {
sealMediaSelectionRequest,
selectMediaStreams,
diff --git a/packages/media-pipeline/src/manifest.ts b/packages/media-pipeline/src/manifest.ts
index 125ab4e2..0a47540c 100644
--- a/packages/media-pipeline/src/manifest.ts
+++ b/packages/media-pipeline/src/manifest.ts
@@ -46,32 +46,6 @@ export const mediaPipelineProducers = {
mux: { module: mediaPipelineModuleRef, name: "request-media-mux" },
projectMuxed: { module: mediaPipelineModuleRef, name: "project-muxed-media" },
} satisfies Record<string, ProducerRef>;
-export const mediaPipelineImplementationDigests = {
- bindVisualRequest: digestOf("@narratage/media-pipeline/bind-visual-media-request-to-program@1"),
- bindAvRequest: digestOf("@narratage/media-pipeline/bind-av-media-request-to-program@1"),
- inspect: digestOf("@narratage/media-pipeline/request-media-inspection@1"),
- select: digestOf("@narratage/media-pipeline/select-media-streams@1"),
- normalize: digestOf("@narratage/media-pipeline/request-media-normalization@1"),
- transform: digestOf("@narratage/media-pipeline/request-media-transform@1"),
- extractAudio: digestOf("@narratage/media-pipeline/request-audio-extraction@1"),
- extractFrame: digestOf("@narratage/media-pipeline/request-frame-extraction@1"),
- projectSpeechEvidenceAudio: digestOf("@narratage/media-pipeline/request-speech-evidence-audio@1"),
- requestValidator: digestOf("@narratage/media-pipeline/validate-selection-request@1"),
- planAudio: digestOf("@narratage/media-pipeline/compile-audio-program@1"),
- renderAudio: digestOf("@narratage/media-pipeline/request-audio-render@1"),
- mux: digestOf("@narratage/media-pipeline/request-media-mux@1"),
- projectMuxed: digestOf("@narratage/media-pipeline/project-muxed-media@1"),
- audioPlanValidator: digestOf("@narratage/media-pipeline/validate-audio-program-plan@1"),
- transformProgramValidator: digestOf("@narratage/media-pipeline/validate-media-transform-program@1"),
- audioExtractionValidator: digestOf("@narratage/media-pipeline/validate-audio-extraction-request@1"),
- frameExtractionValidator: digestOf("@narratage/media-pipeline/validate-frame-extraction-request@1"),
-} as const;
-export const synchronizedMediaSurfaceImplementationDigest = digestOf("@narratage/media-pipeline/synchronized-media-surface@1");
-export const mediaOperationSurfaceImplementationDigests = {
- transform: digestOf("@narratage/media-pipeline/transform-media-surface@1"),
- extractAudio: digestOf("@narratage/media-pipeline/extract-audio-surface@1"),
- extractFrame: digestOf("@narratage/media-pipeline/extract-frame-surface@1"),
-} as const;
const integer = { kind: "number", integer: true, minimum: 0 } as const;
const mode = (name: string): ValueSchema => ({
@@ -229,28 +203,24 @@ export const mediaPipelineMarkupSurfaces = [
{
name: "synchronized-media", tag: "Normalize", mode: "structured",
outputs: [mediaPipelineTypes.selectionRequest, mediaTypes.synchronized],
- implementation: { digest: synchronizedMediaSurfaceImplementationDigest },
},
{
name: "transform-media", tag: "Transform", mode: "structured",
outputs: [mediaPipelineTypes.selectionRequest, mediaPipelineTypes.transformProgram, artifactTypes.blob],
- implementation: { digest: mediaOperationSurfaceImplementationDigests.transform },
},
{
name: "extract-audio", tag: "ExtractAudio", mode: "structured",
outputs: [mediaPipelineTypes.audioExtractionRequest, artifactTypes.blob],
- implementation: { digest: mediaOperationSurfaceImplementationDigests.extractAudio },
},
{
name: "extract-frame", tag: "ExtractFrame", mode: "structured",
outputs: [mediaPipelineTypes.frameExtractionRequest, artifactTypes.blob],
- implementation: { digest: mediaOperationSurfaceImplementationDigests.extractFrame },
},
] as const;
export const mediaPipelineManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: mediaPipelineModuleRef.name,
version: mediaPipelineModuleRef.version,
dependencies: [
@@ -263,48 +233,18 @@ export const mediaPipelineManifest: ModuleManifest = {
types: [
{
name: mediaPipelineTypes.selectionRequest.name,
- schema: mediaSelectionRequestSchema,
- validator: {
- implementation: {
- digest: mediaPipelineImplementationDigests.requestValidator,
- },
- },
},
{
name: mediaPipelineTypes.audioProgramPlan.name,
- schema: audioProgramPlanSchema,
- validator: {
- implementation: {
- digest: mediaPipelineImplementationDigests.audioPlanValidator,
- },
- },
},
{
name: mediaPipelineTypes.transformProgram.name,
- schema: mediaTransformProgramSchema,
- validator: {
- implementation: {
- digest: mediaPipelineImplementationDigests.transformProgramValidator,
- },
- },
},
{
name: mediaPipelineTypes.audioExtractionRequest.name,
- schema: audioExtractionRequestSchema,
- validator: {
- implementation: {
- digest: mediaPipelineImplementationDigests.audioExtractionValidator,
- },
- },
},
{
name: mediaPipelineTypes.frameExtractionRequest.name,
- schema: frameExtractionRequestSchema,
- validator: {
- implementation: {
- digest: mediaPipelineImplementationDigests.frameExtractionValidator,
- },
- },
},
],
capabilities: [
@@ -323,18 +263,12 @@ export const mediaPipelineManifest: ModuleManifest = {
inputs: [{ name: "space", type: programSpaceTypes.programSpace }],
outputs: [{ name: "request", type: mediaPipelineTypes.selectionRequest }],
needs: [],
- implementation: {
- digest: mediaPipelineImplementationDigests.bindVisualRequest,
- },
},
{
name: mediaPipelineProducers.bindAvRequest.name,
inputs: [{ name: "space", type: programSpaceTypes.programSpace }],
outputs: [{ name: "request", type: mediaPipelineTypes.selectionRequest }],
needs: [],
- implementation: {
- digest: mediaPipelineImplementationDigests.bindAvRequest,
- },
},
{
name: mediaPipelineProducers.inspect.name,
@@ -345,9 +279,6 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.inspect,
returns: mediaTypes.inspection,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.inspect,
- },
},
{
name: mediaPipelineProducers.select.name,
@@ -360,9 +291,6 @@ export const mediaPipelineManifest: ModuleManifest = {
type: mediaTypes.streamSelection,
}],
needs: [],
- implementation: {
- digest: mediaPipelineImplementationDigests.select,
- },
},
{
name: mediaPipelineProducers.normalize.name,
@@ -378,9 +306,6 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.normalize,
returns: mediaTypes.synchronized,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.normalize,
- },
},
{
name: mediaPipelineProducers.transform.name,
@@ -394,9 +319,6 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.transform,
returns: artifactTypes.blob,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.transform,
- },
},
{
name: mediaPipelineProducers.extractAudio.name,
@@ -411,9 +333,6 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.extractAudio,
returns: artifactTypes.blob,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.extractAudio,
- },
},
{
name: mediaPipelineProducers.extractFrame.name,
@@ -428,9 +347,6 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.extractFrame,
returns: artifactTypes.blob,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.extractFrame,
- },
},
{
name: mediaPipelineProducers.projectSpeechEvidenceAudio.name,
@@ -441,9 +357,6 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.projectSpeechEvidenceAudio,
returns: speechTypes.evidenceAudio,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.projectSpeechEvidenceAudio,
- },
},
{
name: mediaPipelineProducers.planAudio.name,
@@ -453,9 +366,6 @@ export const mediaPipelineManifest: ModuleManifest = {
],
outputs: [{ name: "plan", type: mediaPipelineTypes.audioProgramPlan }],
needs: [],
- implementation: {
- digest: mediaPipelineImplementationDigests.planAudio,
- },
},
{
name: mediaPipelineProducers.renderAudio.name,
@@ -466,9 +376,6 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.renderAudio,
returns: mediaTypes.timelineAudio,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.renderAudio,
- },
},
{
name: mediaPipelineProducers.mux.name,
@@ -482,20 +389,12 @@ export const mediaPipelineManifest: ModuleManifest = {
capability: mediaPipelineCapabilities.mux,
returns: mediaTypes.muxed,
}],
- implementation: {
- digest: mediaPipelineImplementationDigests.mux,
- },
},
{
name: mediaPipelineProducers.projectMuxed.name,
inputs: [{ name: "media", type: mediaTypes.muxed }],
outputs: [{ name: "video", type: artifactTypes.blob }],
needs: [],
- implementation: {
- digest: mediaPipelineImplementationDigests.projectMuxed,
- },
},
],
};
-
-export const mediaPipelineManifestDigest = digestOf(mediaPipelineManifest);
diff --git a/packages/media-track/package.json b/packages/media-track/package.json
index d1a0fd4b..4d8ecee0 100644
--- a/packages/media-track/package.json
+++ b/packages/media-track/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/media-track/src/activation.ts b/packages/media-track/src/activation.ts
index 4eb355c2..a4f2c1b9 100644
--- a/packages/media-track/src/activation.ts
+++ b/packages/media-track/src/activation.ts
@@ -7,8 +7,8 @@ import {
mediaTrackMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: mediaTrackManifest }],
components: [mediaTrackComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -17,4 +17,4 @@ export const svmlPackage = {
handler: decodeMediaTrackSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/media-track/src/component.ts b/packages/media-track/src/component.ts
index a96a1240..e35a6fb5 100644
--- a/packages/media-track/src/component.ts
+++ b/packages/media-track/src/component.ts
@@ -15,24 +15,7 @@ import {
createMediaLayerSet,
} from "./layers.js";
import { mediaTrackProducers, mediaTrackTypes } from "./manifest.js";
-import {
- appendMediaSequenceUntilMoment,
- appendMediaSequenceUntilProgramEnd,
- appendMediaSequenceUntilSelection,
- appendMomentMediaItem,
- appendProgramMediaItem,
- appendSegmentMediaItem,
- appendSelectionMediaItem,
- bindMediaItemClipPath,
- bindMediaSequenceClipPath,
- assertMediaTrackProgram,
- createMediaTrackSet,
- finalizeMediaTrack,
- mediaTrackImplementationDigests,
- mediaTrackValidatorDigests,
- projectMediaAudioTrack,
- projectMediaVisualTrack,
-} from "./program.js";
+import { appendMediaSequenceUntilMoment, appendMediaSequenceUntilProgramEnd, appendMediaSequenceUntilSelection, appendMomentMediaItem, appendProgramMediaItem, appendSegmentMediaItem, appendSelectionMediaItem, bindMediaItemClipPath, bindMediaSequenceClipPath, assertMediaTrackProgram, createMediaTrackSet, finalizeMediaTrack, projectMediaAudioTrack, projectMediaVisualTrack } from "./program.js";
import {
appendMediaSequenceMomentMember,
appendMediaSequenceSelectionMember,
@@ -105,90 +88,90 @@ function sequenceInputs(inputs: ProducerHandlerContext["inputs"]) {
export const mediaTrackComponent = {
producers: [
- { producer: mediaTrackProducers.createLayers, implementationDigest: mediaTrackImplementationDigests.createLayers, handler: () => ({ outputs: { layers: output(createMediaLayerSet()) }, needs: {} }) },
- { producer: mediaTrackProducers.appendPaintLayer, implementationDigest: mediaTrackImplementationDigests.appendPaintLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendMediaPaintLayer(
+ { producer: mediaTrackProducers.createLayers, handler: () => ({ outputs: { layers: output(createMediaLayerSet()) }, needs: {} }) },
+ { producer: mediaTrackProducers.appendPaintLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendMediaPaintLayer(
inline<MediaLayerSet>(inputs.layers?.value, "MediaLayerSet"),
inline<MediaPaintLayerSpec>(inputs.spec?.value, "MediaPaintLayerSpec"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.appendStillLayer, implementationDigest: mediaTrackImplementationDigests.appendStillLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendStillMediaLayer(
+ { producer: mediaTrackProducers.appendStillLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendStillMediaLayer(
inline<MediaLayerSet>(inputs.layers?.value, "MediaLayerSet"), blob(inputs.source?.value),
inline<IntrinsicExtent>(inputs.extent?.value, "IntrinsicExtent"), inline<ContentFit>(inputs.fit?.value, "ContentFit"),
inline<MediaSampleLayerSpec>(inputs.spec?.value, "MediaSampleLayerSpec"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.appendTimedLayer, implementationDigest: mediaTrackImplementationDigests.appendTimedLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendTimedMediaLayer(
+ { producer: mediaTrackProducers.appendTimedLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendTimedMediaLayer(
inline<MediaLayerSet>(inputs.layers?.value, "MediaLayerSet"), inline<SynchronizedMedia>(inputs.source?.value, "SynchronizedMedia"),
inline<ContentFit>(inputs.fit?.value, "ContentFit"), inline<MediaSampleLayerSpec>(inputs.spec?.value, "MediaSampleLayerSpec"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.appendSurfaceLayer, implementationDigest: mediaTrackImplementationDigests.appendSurfaceLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendSurfaceMediaLayer(
+ { producer: mediaTrackProducers.appendSurfaceLayer, handler: ({ inputs }) => ({ outputs: { layers: output(appendSurfaceMediaLayer(
inline<MediaLayerSet>(inputs.layers?.value, "MediaLayerSet"), inline<CompositableSurfaceRef>(inputs.source?.value, "CompositableSurfaceRef"),
inline<ContentFit>(inputs.fit?.value, "ContentFit"), inline<MediaSampleLayerSpec>(inputs.spec?.value, "MediaSampleLayerSpec"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.createSounds, implementationDigest: mediaTrackImplementationDigests.createSounds, handler: () => ({ outputs: { sounds: output(createMediaSoundSet()) }, needs: {} }) },
- { producer: mediaTrackProducers.appendSound, implementationDigest: mediaTrackImplementationDigests.appendSound, handler: ({ inputs }) => ({ outputs: { sounds: output(appendMediaSound(
+ { producer: mediaTrackProducers.createSounds, handler: () => ({ outputs: { sounds: output(createMediaSoundSet()) }, needs: {} }) },
+ { producer: mediaTrackProducers.appendSound, handler: ({ inputs }) => ({ outputs: { sounds: output(appendMediaSound(
inline<MediaSoundSet>(inputs.sounds?.value, "MediaSoundSet"),
inline<SynchronizedMedia>(inputs.source?.value, "SynchronizedMedia"),
inline<MediaSoundSpec>(inputs.spec?.value, "MediaSoundSpec"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.createSet, implementationDigest: mediaTrackImplementationDigests.createSet, handler: () => ({ outputs: { set: output(createMediaTrackSet()) }, needs: {} }) },
- { producer: mediaTrackProducers.appendProgramItem, implementationDigest: mediaTrackImplementationDigests.appendProgramItem, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.createSet, handler: () => ({ outputs: { set: output(createMediaTrackSet()) }, needs: {} }) },
+ { producer: mediaTrackProducers.appendProgramItem, handler: ({ inputs }) => {
const value = itemInputs(inputs);
return { outputs: { set: output(appendProgramMediaItem(value.set, value.header, value.space, value.canvas, value.layers, value.frame, value.spec, value.sounds)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSelectionItem, implementationDigest: mediaTrackImplementationDigests.appendSelectionItem, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSelectionItem, handler: ({ inputs }) => {
const value = itemInputs(inputs);
return { outputs: { set: output(appendSelectionMediaItem(value.set, value.header, value.space, value.canvas, value.layers, value.frame,
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"),
inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelectionRef"), value.spec, value.sounds)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSegmentItem, implementationDigest: mediaTrackImplementationDigests.appendSegmentItem, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSegmentItem, handler: ({ inputs }) => {
const value = itemInputs(inputs);
return { outputs: { set: output(appendSegmentMediaItem(value.set, value.header, value.space, value.canvas, value.layers, value.frame,
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"),
inline<NarrativeExcerpt>(inputs.segment?.value, "NarrativeExcerpt"), value.spec, value.sounds)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendMomentItem, implementationDigest: mediaTrackImplementationDigests.appendMomentItem, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendMomentItem, handler: ({ inputs }) => {
const value = itemInputs(inputs);
return { outputs: { set: output(appendMomentMediaItem(value.set, value.header, value.space, value.canvas, value.layers, value.frame,
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"),
inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMomentRef"), value.spec, value.sounds)) }, needs: {} };
} },
- { producer: mediaTrackProducers.bindItemClipPath, implementationDigest: mediaTrackImplementationDigests.bindItemClipPath, handler: ({ inputs }) => ({ outputs: { spec: output(bindMediaItemClipPath(
+ { producer: mediaTrackProducers.bindItemClipPath, handler: ({ inputs }) => ({ outputs: { spec: output(bindMediaItemClipPath(
inline<MediaItemSpec>(inputs.spec?.value, "MediaItemSpec"),
inline<SpatialPath>(inputs.path?.value, "SpatialPath"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.bindSequenceClipPath, implementationDigest: mediaTrackImplementationDigests.bindSequenceClipPath, handler: ({ inputs }) => ({ outputs: { spec: output(bindMediaSequenceClipPath(
+ { producer: mediaTrackProducers.bindSequenceClipPath, handler: ({ inputs }) => ({ outputs: { spec: output(bindMediaSequenceClipPath(
inline<MediaSequenceSpec>(inputs.spec?.value, "MediaSequenceSpec"),
inline<SpatialPath>(inputs.path?.value, "SpatialPath"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.createMembers, implementationDigest: mediaTrackImplementationDigests.createMembers, handler: () => ({ outputs: { members: output(createMediaSequenceMemberSet()) }, needs: {} }) },
- { producer: mediaTrackProducers.appendMomentMember, implementationDigest: mediaTrackImplementationDigests.appendMomentMember, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.createMembers, handler: () => ({ outputs: { members: output(createMediaSequenceMemberSet()) }, needs: {} }) },
+ { producer: mediaTrackProducers.appendMomentMember, handler: ({ inputs }) => {
const value = memberInputs(inputs);
return { outputs: { members: output(appendMediaSequenceMomentMember(
value.members, value.layers, value.spec, value.map,
inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMomentRef"), value.space,
)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSelectionStartMember, implementationDigest: mediaTrackImplementationDigests.appendSelectionStartMember, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSelectionStartMember, handler: ({ inputs }) => {
const value = memberInputs(inputs);
return { outputs: { members: output(appendMediaSequenceSelectionMember(
value.members, value.layers, value.spec, value.map,
inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelectionRef"), value.space, "start",
)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSelectionEndMember, implementationDigest: mediaTrackImplementationDigests.appendSelectionEndMember, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSelectionEndMember, handler: ({ inputs }) => {
const value = memberInputs(inputs);
return { outputs: { members: output(appendMediaSequenceSelectionMember(
value.members, value.layers, value.spec, value.map,
inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelectionRef"), value.space, "end",
)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSequenceProgramEnd, implementationDigest: mediaTrackImplementationDigests.appendSequenceProgramEnd, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSequenceProgramEnd, handler: ({ inputs }) => {
const value = sequenceInputs(inputs);
return { outputs: { set: output(appendMediaSequenceUntilProgramEnd(
value.set, value.header, value.space, value.canvas, value.members, value.frame, value.spec, value.sounds,
)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSequenceUntilMoment, implementationDigest: mediaTrackImplementationDigests.appendSequenceUntilMoment, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSequenceUntilMoment, handler: ({ inputs }) => {
const value = sequenceInputs(inputs);
return { outputs: { set: output(appendMediaSequenceUntilMoment(
value.set, value.header, value.space, value.canvas, value.members, value.frame, value.spec, value.sounds,
@@ -196,7 +179,7 @@ export const mediaTrackComponent = {
inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMomentRef"),
)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSequenceUntilSelectionStart, implementationDigest: mediaTrackImplementationDigests.appendSequenceUntilSelectionStart, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSequenceUntilSelectionStart, handler: ({ inputs }) => {
const value = sequenceInputs(inputs);
return { outputs: { set: output(appendMediaSequenceUntilSelection(
value.set, value.header, value.space, value.canvas, value.members, value.frame, value.spec, value.sounds,
@@ -204,7 +187,7 @@ export const mediaTrackComponent = {
inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelectionRef"), "start",
)) }, needs: {} };
} },
- { producer: mediaTrackProducers.appendSequenceUntilSelectionEnd, implementationDigest: mediaTrackImplementationDigests.appendSequenceUntilSelectionEnd, handler: ({ inputs }) => {
+ { producer: mediaTrackProducers.appendSequenceUntilSelectionEnd, handler: ({ inputs }) => {
const value = sequenceInputs(inputs);
return { outputs: { set: output(appendMediaSequenceUntilSelection(
value.set, value.header, value.space, value.canvas, value.members, value.frame, value.spec, value.sounds,
@@ -212,20 +195,19 @@ export const mediaTrackComponent = {
inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelectionRef"), "end",
)) }, needs: {} };
} },
- { producer: mediaTrackProducers.finalize, implementationDigest: mediaTrackImplementationDigests.finalize, handler: ({ inputs }) => ({ outputs: { program: output(finalizeMediaTrack(
+ { producer: mediaTrackProducers.finalize, handler: ({ inputs }) => ({ outputs: { program: output(finalizeMediaTrack(
inline<MediaTrackSet>(inputs.set?.value, "MediaTrackSet"), inline<MediaTrackHeader>(inputs.header?.value, "MediaTrackHeader"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.projectVisual, implementationDigest: mediaTrackImplementationDigests.projectVisual, handler: ({ inputs }) => ({ outputs: { track: output(projectMediaVisualTrack(
+ { producer: mediaTrackProducers.projectVisual, handler: ({ inputs }) => ({ outputs: { track: output(projectMediaVisualTrack(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<MediaTrackProgram>(inputs.program?.value, "MediaTrackProgram"),
)) }, needs: {} }) },
- { producer: mediaTrackProducers.projectAudio, implementationDigest: mediaTrackImplementationDigests.projectAudio, handler: ({ inputs }) => ({ outputs: { track: output(projectMediaAudioTrack(
+ { producer: mediaTrackProducers.projectAudio, handler: ({ inputs }) => ({ outputs: { track: output(projectMediaAudioTrack(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<MediaTrackProgram>(inputs.program?.value, "MediaTrackProgram"),
)) }, needs: {} }) },
],
validators: [{
type: mediaTrackTypes.program,
- implementationDigest: mediaTrackValidatorDigests.program,
handler: ({ value }) => assertMediaTrackProgram(inline<MediaTrackProgram>(value, "MediaTrackProgram")),
}],
} satisfies ComponentPackage;
diff --git a/packages/media-track/src/index.ts b/packages/media-track/src/index.ts
index c49574af..44d32afe 100644
--- a/packages/media-track/src/index.ts
+++ b/packages/media-track/src/index.ts
@@ -23,30 +23,7 @@ export {
sealMediaSampleLayerSpec,
} from "./layers.js";
export { lowerMediaItemElements } from "./lower.js";
-export {
- mediaItemSpecSchema,
- mediaFramePresentationSchema,
- mediaLifecycleMotionSchema,
- mediaLayerSetSchema,
- mediaHandoffSpecSchema,
- mediaPaintLayerSpecSchema,
- mediaSampleLayerSpecSchema,
- mediaSoundSetSchema,
- mediaSoundSpecSchema,
- mediaSequenceMemberSetSchema,
- mediaSequenceMemberSpecSchema,
- mediaSequenceSpecSchema,
- mediaTrackDependency,
- mediaTrackHeaderSchema,
- mediaTrackManifest, mediaTrackMarkupSurfaces,
- mediaTrackManifestDigest,
- mediaTrackModuleRef,
- mediaTrackProducers,
- mediaTrackSurfaceImplementationDigest,
- mediaTrackProgramSchema,
- mediaTrackSetSchema,
- mediaTrackTypes,
-} from "./manifest.js";
+export { mediaItemSpecSchema, mediaFramePresentationSchema, mediaLifecycleMotionSchema, mediaLayerSetSchema, mediaHandoffSpecSchema, mediaPaintLayerSpecSchema, mediaSampleLayerSpecSchema, mediaSoundSetSchema, mediaSoundSpecSchema, mediaSequenceMemberSetSchema, mediaSequenceMemberSpecSchema, mediaSequenceSpecSchema, mediaTrackDependency, mediaTrackHeaderSchema, mediaTrackManifest, mediaTrackMarkupSurfaces, mediaTrackModuleRef, mediaTrackProducers, mediaTrackProgramSchema, mediaTrackSetSchema, mediaTrackTypes } from "./manifest.js";
export {
assertMediaEdgeMotion,
assertMediaLifecycleMotion,
@@ -66,32 +43,7 @@ export {
createMediaSoundSet,
sealMediaSoundSpec,
} from "./sounds.js";
-export {
- appendMomentMediaItem,
- appendMediaSequence,
- appendMediaSequenceUntilMoment,
- appendMediaSequenceUntilProgramEnd,
- appendMediaSequenceUntilSelection,
- appendProgramMediaItem,
- appendSegmentMediaItem,
- appendSelectionMediaItem,
- bindMediaItemClipPath,
- bindMediaSequenceClipPath,
- assertMediaItemSpec,
- assertMediaTrackHeader,
- assertMediaTrackProgram,
- assertMediaTrackProgramIdentity,
- assertMediaTrackSet,
- createMediaTrackSet,
- finalizeMediaTrack,
- mediaTrackImplementationDigests,
- mediaTrackValidatorDigests,
- projectMediaAudioTrack,
- projectMediaVisualTrack,
- sealMediaItemSpec,
- sealMediaTrackHeader,
- sealMediaTrackProgram,
-} from "./program.js";
+export { appendMomentMediaItem, appendMediaSequence, appendMediaSequenceUntilMoment, appendMediaSequenceUntilProgramEnd, appendMediaSequenceUntilSelection, appendProgramMediaItem, appendSegmentMediaItem, appendSelectionMediaItem, bindMediaItemClipPath, bindMediaSequenceClipPath, assertMediaItemSpec, assertMediaTrackHeader, assertMediaTrackProgram, assertMediaTrackProgramIdentity, assertMediaTrackSet, createMediaTrackSet, finalizeMediaTrack, projectMediaAudioTrack, projectMediaVisualTrack, sealMediaItemSpec, sealMediaTrackHeader, sealMediaTrackProgram } from "./program.js";
export { resolveVisualSampling } from "./sampling.js";
export { lowerRestrictedSpeechVisualPresents } from "./restricted-speech.js";
export type { RestrictedSpeechVisualClip } from "./restricted-speech.js";
diff --git a/packages/media-track/src/manifest.ts b/packages/media-track/src/manifest.ts
index 6a3827cb..6402e0f6 100644
--- a/packages/media-track/src/manifest.ts
+++ b/packages/media-track/src/manifest.ts
@@ -20,8 +20,6 @@ import {
} from "@narratage/spatial";
import { temporalDependency } from "@narratage/temporal";
-import { mediaTrackImplementationDigests, mediaTrackValidatorDigests } from "./program.js";
-
export const mediaTrackModuleRef = { name: "@narratage/media-track", version: "1" } as const;
export const mediaTrackTypes = {
header: { module: mediaTrackModuleRef, name: "MediaTrackHeader" },
@@ -67,8 +65,6 @@ export const mediaTrackProducers = {
projectAudio: { module: mediaTrackModuleRef, name: "project-media-audio-track" },
} satisfies Record<string, ProducerRef>;
-export const mediaTrackSurfaceImplementationDigest = digestOf("@narratage/media-track/track-surface@1");
-
const string = { kind: "string", minLength: 1 } as const;
const number = { kind: "number" } as const;
const unsigned = { kind: "number", minimum: 0 } as const;
@@ -299,18 +295,17 @@ export const mediaTrackMarkupSurfaces = [{
mediaTrackTypes.itemSpec, mediaTrackTypes.memberSpec, mediaTrackTypes.memberSet,
mediaTrackTypes.handoffSpec, mediaTrackTypes.sequenceSpec, mediaTrackTypes.set, mediaTrackTypes.program,
compositionTypes.visualTrack, compositionTypes.audioTrack],
- implementation: { digest: mediaTrackSurfaceImplementationDigest },
}] as const;
export const mediaTrackManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: mediaTrackModuleRef.name,
version: mediaTrackModuleRef.version,
dependencies: [
artifactDependency,
mediaDependency,
- { module: mediaPipelineModuleRef, digest: digestOf(mediaPipelineManifest) },
+ { module: mediaPipelineModuleRef },
narrativeDependency,
semanticMapDependency,
programSpaceDependency,
@@ -319,49 +314,48 @@ export const mediaTrackManifest: ModuleManifest = {
compositionDependency,
],
types: [
- { name: mediaTrackTypes.header.name, schema: mediaTrackHeaderSchema },
- { name: mediaTrackTypes.paintLayerSpec.name, schema: mediaPaintLayerSpecSchema },
- { name: mediaTrackTypes.sampleLayerSpec.name, schema: mediaSampleLayerSpecSchema },
- { name: mediaTrackTypes.layerSet.name, schema: mediaLayerSetSchema },
- { name: mediaTrackTypes.soundSpec.name, schema: mediaSoundSpecSchema },
- { name: mediaTrackTypes.soundSet.name, schema: mediaSoundSetSchema },
- { name: mediaTrackTypes.itemSpec.name, schema: mediaItemSpecSchema },
- { name: mediaTrackTypes.memberSpec.name, schema: mediaSequenceMemberSpecSchema },
- { name: mediaTrackTypes.memberSet.name, schema: mediaSequenceMemberSetSchema },
- { name: mediaTrackTypes.handoffSpec.name, schema: mediaHandoffSpecSchema },
- { name: mediaTrackTypes.sequenceSpec.name, schema: mediaSequenceSpecSchema },
- { name: mediaTrackTypes.set.name, schema: mediaTrackSetSchema },
- { name: mediaTrackTypes.program.name, schema: mediaTrackProgramSchema, validator: validator(mediaTrackValidatorDigests.program) },
+ { name: mediaTrackTypes.header.name },
+ { name: mediaTrackTypes.paintLayerSpec.name },
+ { name: mediaTrackTypes.sampleLayerSpec.name },
+ { name: mediaTrackTypes.layerSet.name },
+ { name: mediaTrackTypes.soundSpec.name },
+ { name: mediaTrackTypes.soundSet.name },
+ { name: mediaTrackTypes.itemSpec.name },
+ { name: mediaTrackTypes.memberSpec.name },
+ { name: mediaTrackTypes.memberSet.name },
+ { name: mediaTrackTypes.handoffSpec.name },
+ { name: mediaTrackTypes.sequenceSpec.name },
+ { name: mediaTrackTypes.set.name },
+ { name: mediaTrackTypes.program.name },
],
capabilities: [],
producers: [
- { name: mediaTrackProducers.createLayers.name, inputs: [], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.createLayers } },
- { name: mediaTrackProducers.appendPaintLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "spec", type: mediaTrackTypes.paintLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendPaintLayer } },
- { name: mediaTrackProducers.appendStillLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "source", type: artifactTypes.blob }, { name: "extent", type: spatialTypes.extent }, { name: "fit", type: spatialTypes.fit }, { name: "spec", type: mediaTrackTypes.sampleLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendStillLayer } },
- { name: mediaTrackProducers.appendTimedLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "source", type: mediaTypes.synchronized }, { name: "fit", type: spatialTypes.fit }, { name: "spec", type: mediaTrackTypes.sampleLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendTimedLayer } },
- { name: mediaTrackProducers.appendSurfaceLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "source", type: mediaTypes.compositableSurface }, { name: "fit", type: spatialTypes.fit }, { name: "spec", type: mediaTrackTypes.sampleLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSurfaceLayer } },
- { name: mediaTrackProducers.createSounds.name, inputs: [], outputs: [{ name: "sounds", type: mediaTrackTypes.soundSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.createSounds } },
- { name: mediaTrackProducers.appendSound.name, inputs: [{ name: "sounds", type: mediaTrackTypes.soundSet }, { name: "source", type: mediaTypes.synchronized }, { name: "spec", type: mediaTrackTypes.soundSpec }], outputs: [{ name: "sounds", type: mediaTrackTypes.soundSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSound } },
- { name: mediaTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.createSet } },
- { name: mediaTrackProducers.appendProgramItem.name, inputs: [...itemInputs], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendProgramItem } },
- { name: mediaTrackProducers.appendSelectionItem.name, inputs: [...itemInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSelectionItem } },
- { name: mediaTrackProducers.appendSegmentItem.name, inputs: [...itemInputs, { name: "map", type: semanticMapTypes.complete }, { name: "segment", type: narrativeTypes.excerpt }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSegmentItem } },
- { name: mediaTrackProducers.appendMomentItem.name, inputs: [...itemInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendMomentItem } },
- { name: mediaTrackProducers.bindItemClipPath.name, inputs: [{ name: "spec", type: mediaTrackTypes.itemSpec }, { name: "path", type: spatialTypes.path }], outputs: [{ name: "spec", type: mediaTrackTypes.itemSpec }], needs: [], implementation: { digest: mediaTrackImplementationDigests.bindItemClipPath } },
- { name: mediaTrackProducers.bindSequenceClipPath.name, inputs: [{ name: "spec", type: mediaTrackTypes.sequenceSpec }, { name: "path", type: spatialTypes.path }], outputs: [{ name: "spec", type: mediaTrackTypes.sequenceSpec }], needs: [], implementation: { digest: mediaTrackImplementationDigests.bindSequenceClipPath } },
- { name: mediaTrackProducers.createMembers.name, inputs: [], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.createMembers } },
- { name: mediaTrackProducers.appendMomentMember.name, inputs: [...memberInputs, { name: "moment", type: narrativeTypes.moment }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendMomentMember } },
- { name: mediaTrackProducers.appendSelectionStartMember.name, inputs: [...memberInputs, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSelectionStartMember } },
- { name: mediaTrackProducers.appendSelectionEndMember.name, inputs: [...memberInputs, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSelectionEndMember } },
- { name: mediaTrackProducers.appendSequenceProgramEnd.name, inputs: sequenceInputs, outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSequenceProgramEnd } },
- { name: mediaTrackProducers.appendSequenceUntilMoment.name, inputs: [...sequenceInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSequenceUntilMoment } },
- { name: mediaTrackProducers.appendSequenceUntilSelectionStart.name, inputs: [...sequenceInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSequenceUntilSelectionStart } },
- { name: mediaTrackProducers.appendSequenceUntilSelectionEnd.name, inputs: [...sequenceInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { digest: mediaTrackImplementationDigests.appendSequenceUntilSelectionEnd } },
- { name: mediaTrackProducers.finalize.name, inputs: [{ name: "set", type: mediaTrackTypes.set }, { name: "header", type: mediaTrackTypes.header }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "program", type: mediaTrackTypes.program }], needs: [], implementation: { digest: mediaTrackImplementationDigests.finalize } },
- { name: mediaTrackProducers.projectVisual.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: mediaTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: { digest: mediaTrackImplementationDigests.projectVisual } },
- { name: mediaTrackProducers.projectAudio.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: mediaTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.audioTrack }], needs: [], implementation: { digest: mediaTrackImplementationDigests.projectAudio } },
+ { name: mediaTrackProducers.createLayers.name, inputs: [], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [] },
+ { name: mediaTrackProducers.appendPaintLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "spec", type: mediaTrackTypes.paintLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [] },
+ { name: mediaTrackProducers.appendStillLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "source", type: artifactTypes.blob }, { name: "extent", type: spatialTypes.extent }, { name: "fit", type: spatialTypes.fit }, { name: "spec", type: mediaTrackTypes.sampleLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [] },
+ { name: mediaTrackProducers.appendTimedLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "source", type: mediaTypes.synchronized }, { name: "fit", type: spatialTypes.fit }, { name: "spec", type: mediaTrackTypes.sampleLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [] },
+ { name: mediaTrackProducers.appendSurfaceLayer.name, inputs: [{ name: "layers", type: mediaTrackTypes.layerSet }, { name: "source", type: mediaTypes.compositableSurface }, { name: "fit", type: spatialTypes.fit }, { name: "spec", type: mediaTrackTypes.sampleLayerSpec }], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [] },
+ { name: mediaTrackProducers.createSounds.name, inputs: [], outputs: [{ name: "sounds", type: mediaTrackTypes.soundSet }], needs: [] },
+ { name: mediaTrackProducers.appendSound.name, inputs: [{ name: "sounds", type: mediaTrackTypes.soundSet }, { name: "source", type: mediaTypes.synchronized }, { name: "spec", type: mediaTrackTypes.soundSpec }], outputs: [{ name: "sounds", type: mediaTrackTypes.soundSet }], needs: [] },
+ { name: mediaTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.appendProgramItem.name, inputs: [...itemInputs], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.appendSelectionItem.name, inputs: [...itemInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.appendSegmentItem.name, inputs: [...itemInputs, { name: "map", type: semanticMapTypes.complete }, { name: "segment", type: narrativeTypes.excerpt }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.appendMomentItem.name, inputs: [...itemInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.bindItemClipPath.name, inputs: [{ name: "spec", type: mediaTrackTypes.itemSpec }, { name: "path", type: spatialTypes.path }], outputs: [{ name: "spec", type: mediaTrackTypes.itemSpec }], needs: [] },
+ { name: mediaTrackProducers.bindSequenceClipPath.name, inputs: [{ name: "spec", type: mediaTrackTypes.sequenceSpec }, { name: "path", type: spatialTypes.path }], outputs: [{ name: "spec", type: mediaTrackTypes.sequenceSpec }], needs: [] },
+ { name: mediaTrackProducers.createMembers.name, inputs: [], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [] },
+ { name: mediaTrackProducers.appendMomentMember.name, inputs: [...memberInputs, { name: "moment", type: narrativeTypes.moment }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [] },
+ { name: mediaTrackProducers.appendSelectionStartMember.name, inputs: [...memberInputs, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [] },
+ { name: mediaTrackProducers.appendSelectionEndMember.name, inputs: [...memberInputs, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [] },
+ { name: mediaTrackProducers.appendSequenceProgramEnd.name, inputs: sequenceInputs, outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.appendSequenceUntilMoment.name, inputs: [...sequenceInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.appendSequenceUntilSelectionStart.name, inputs: [...sequenceInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.appendSequenceUntilSelectionEnd.name, inputs: [...sequenceInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [] },
+ { name: mediaTrackProducers.finalize.name, inputs: [{ name: "set", type: mediaTrackTypes.set }, { name: "header", type: mediaTrackTypes.header }, { name: "space", type: programSpaceTypes.programSpace }], outputs: [{ name: "program", type: mediaTrackTypes.program }], needs: [] },
+ { name: mediaTrackProducers.projectVisual.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: mediaTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
+ { name: mediaTrackProducers.projectAudio.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: mediaTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.audioTrack }], needs: [] },
],
};
-export const mediaTrackManifestDigest = digestOf(mediaTrackManifest);
-export const mediaTrackDependency = { module: mediaTrackModuleRef, digest: mediaTrackManifestDigest } as const;
+export const mediaTrackDependency = { module: mediaTrackModuleRef } as const;
diff --git a/packages/media-track/src/program.ts b/packages/media-track/src/program.ts
index 723ebb70..3f773abb 100644
--- a/packages/media-track/src/program.ts
+++ b/packages/media-track/src/program.ts
@@ -64,34 +64,6 @@ import type {
MediaTrackSet,
} from "./types.js";
-export const mediaTrackImplementationDigests = {
- createLayers: digestOf("@narratage/media-track/create-layers@1"),
- appendPaintLayer: digestOf("@narratage/media-track/append-paint-layer@1"),
- appendStillLayer: digestOf("@narratage/media-track/append-still-layer@1"),
- appendTimedLayer: digestOf("@narratage/media-track/append-timed-layer@1"),
- appendSurfaceLayer: digestOf("@narratage/media-track/append-surface-layer@1"),
- createSounds: digestOf("@narratage/media-track/create-sounds@1"),
- appendSound: digestOf("@narratage/media-track/append-sound@1"),
- createSet: digestOf("@narratage/media-track/create-set@1"),
- appendProgramItem: digestOf("@narratage/media-track/append-program-item@1"),
- appendSelectionItem: digestOf("@narratage/media-track/append-selection-item@1"),
- appendSegmentItem: digestOf("@narratage/media-track/append-segment-item@1"),
- appendMomentItem: digestOf("@narratage/media-track/append-moment-item@1"),
- bindItemClipPath: digestOf("@narratage/media-track/bind-item-clip-path@1"),
- bindSequenceClipPath: digestOf("@narratage/media-track/bind-sequence-clip-path@1"),
- createMembers: digestOf("@narratage/media-track/create-members@1"),
- appendMomentMember: digestOf("@narratage/media-track/append-moment-member@1"),
- appendSelectionStartMember: digestOf("@narratage/media-track/append-selection-start-member@1"),
- appendSelectionEndMember: digestOf("@narratage/media-track/append-selection-end-member@1"),
- appendSequenceProgramEnd: digestOf("@narratage/media-track/append-sequence-program-end@1"),
- appendSequenceUntilMoment: digestOf("@narratage/media-track/append-sequence-until-moment@1"),
- appendSequenceUntilSelectionStart: digestOf("@narratage/media-track/append-sequence-until-selection-start@1"),
- appendSequenceUntilSelectionEnd: digestOf("@narratage/media-track/append-sequence-until-selection-end@1"),
- finalize: digestOf("@narratage/media-track/finalize@1"),
- projectVisual: digestOf("@narratage/media-track/project-visual@1"),
- projectAudio: digestOf("@narratage/media-track/project-audio@1"),
-} as const;
-
export function bindMediaItemClipPath(spec: MediaItemSpec, path: SpatialPath): MediaItemSpec {
assertMediaItemSpec(spec);
assertSpatialPath(path);
@@ -110,10 +82,6 @@ export function bindMediaSequenceClipPath(spec: MediaSequenceSpec, path: Spatial
});
}
-export const mediaTrackValidatorDigests = {
- program: digestOf("@narratage/media-track/validate-program@1"),
-} as const;
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
@@ -526,7 +494,7 @@ export function assertMediaTrackProgramIdentity(value: MediaTrackProgram, space:
export function projectMediaVisualTrack(space: ProgramSpace, program: MediaTrackProgram): VisualTrack {
assertMediaTrackProgramIdentity(program, space);
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: program.id,
presents: [
...program.items.map((item) => ({
diff --git a/packages/media-track/test/media-track.test.ts b/packages/media-track/test/media-track.test.ts
index 2326a5d6..189e08a5 100644
--- a/packages/media-track/test/media-track.test.ts
+++ b/packages/media-track/test/media-track.test.ts
@@ -279,7 +279,7 @@ test("self-blur is two explicit samples of one Artifact and Artifact collection
assert.equal(document.artifacts.length, 1);
assert.equal((document.html.match(new RegExp(source.digest, "gu")) ?? []).length, 0,
"HTML uses artifact URIs without the digest prefix spelling");
- assert.equal((document.html.match(/svml-artifact:\/\/sha256\//gu) ?? []).length, 2);
+ assert.equal((document.html.match(/narratage-artifact:\/\/sha256\//gu) ?? []).length, 2);
const blurred = track.presents[0]!.elements.find((element) => element.id === "blurred");
assert.equal(blurred?.style.find((entry) => entry.name === "left")?.value, "-48px");
assert.equal(blurred?.style.find((entry) => entry.name === "top")?.value, "-48px");
diff --git a/packages/media/package.json b/packages/media/package.json
index d70f1dbd..8003b62b 100644
--- a/packages/media/package.json
+++ b/packages/media/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/media/src/activation.ts b/packages/media/src/activation.ts
index 8b265320..c8747bc6 100644
--- a/packages/media/src/activation.ts
+++ b/packages/media/src/activation.ts
@@ -7,8 +7,8 @@ import {
mediaMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: mediaManifest }],
components: [mediaComponent],
hostFacets: [
@@ -30,4 +30,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/media/src/component.ts b/packages/media/src/component.ts
index a2e458de..713179e3 100644
--- a/packages/media/src/component.ts
+++ b/packages/media/src/component.ts
@@ -1,14 +1,14 @@
import type { ComponentPackage } from "@narratage/component-kit";
import { verifyMediaInspection, verifyMediaStreamSelection, verifyMuxedMedia, verifyRenderedVisual, verifySynchronizedMedia, verifyTimelineAudio } from "./identity.js";
-import { mediaTypes, mediaValidatorDigests } from "./manifest.js";
+import { mediaTypes } from "./manifest.js";
function inline(value: { readonly kind: string; readonly value?: unknown }, subject: string): unknown { if (value.kind !== "inline") throw new Error(`${subject} must be inline`); return value.value; }
export const mediaComponent = {
validators: [
- { type: mediaTypes.inspection, implementationDigest: mediaValidatorDigests.inspection, handler: ({ value }) => verifyMediaInspection(inline(value, "MediaInspection")) },
- { type: mediaTypes.streamSelection, implementationDigest: mediaValidatorDigests.selection, handler: ({ value }) => verifyMediaStreamSelection(inline(value, "MediaStreamSelection")) },
- { type: mediaTypes.synchronized, implementationDigest: mediaValidatorDigests.synchronized, handler: ({ value }) => verifySynchronizedMedia(inline(value, "SynchronizedMedia")) },
- { type: mediaTypes.renderedVisual, implementationDigest: mediaValidatorDigests.renderedVisual, handler: ({ value }) => verifyRenderedVisual(inline(value, "RenderedVisual")) },
- { type: mediaTypes.timelineAudio, implementationDigest: mediaValidatorDigests.timelineAudio, handler: ({ value }) => verifyTimelineAudio(inline(value, "TimelineAudio")) },
- { type: mediaTypes.muxed, implementationDigest: mediaValidatorDigests.muxed, handler: ({ value }) => verifyMuxedMedia(inline(value, "MuxedMedia")) },
+ { type: mediaTypes.inspection, handler: ({ value }) => verifyMediaInspection(inline(value, "MediaInspection")) },
+ { type: mediaTypes.streamSelection, handler: ({ value }) => verifyMediaStreamSelection(inline(value, "MediaStreamSelection")) },
+ { type: mediaTypes.synchronized, handler: ({ value }) => verifySynchronizedMedia(inline(value, "SynchronizedMedia")) },
+ { type: mediaTypes.renderedVisual, handler: ({ value }) => verifyRenderedVisual(inline(value, "RenderedVisual")) },
+ { type: mediaTypes.timelineAudio, handler: ({ value }) => verifyTimelineAudio(inline(value, "TimelineAudio")) },
+ { type: mediaTypes.muxed, handler: ({ value }) => verifyMuxedMedia(inline(value, "MuxedMedia")) },
],
} satisfies ComponentPackage;
diff --git a/packages/media/src/index.ts b/packages/media/src/index.ts
index 9bdc35d5..108b5dc1 100644
--- a/packages/media/src/index.ts
+++ b/packages/media/src/index.ts
@@ -5,7 +5,7 @@ export {
} from "./surface.js";
export { mediaComponent } from "./component.js";
export { sealMediaInspection, sealMediaStreamSelection, sealMuxedMedia, sealRenderedVisual, sealSynchronizedMedia, sealTimelineAudio, synchronizedMediaSampleFrames, verifyMediaInspection, verifyMediaStreamSelection, verifyMuxedMedia, verifyRenderedVisual, verifySynchronizedMedia, verifyTimelineAudio } from "./identity.js";
-export { mediaDependency, mediaManifest, mediaMarkupSurfaces, mediaManifestDigest, mediaModuleRef, mediaSurfaceImplementationDigests, mediaTypes, mediaValidatorDigests } from "./manifest.js";
+export { mediaDependency, mediaManifest, mediaMarkupSurfaces, mediaModuleRef, mediaTypes } from "./manifest.js";
export { compositableSurfaceSchema, fontArtifactSchema, fontStackSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
export { assertCompositableSurfaceRef, assertFontArtifactRef, assertFontStackRef } from "./render.js";
export type * from "./render.js";
diff --git a/packages/media/src/manifest.ts b/packages/media/src/manifest.ts
index a9ed061d..f2f31467 100644
--- a/packages/media/src/manifest.ts
+++ b/packages/media/src/manifest.ts
@@ -11,36 +11,25 @@ export const mediaTypes = {
fontStack: { module: mediaModuleRef, name: "FontStackRef" },
compositableSurface: { module: mediaModuleRef, name: "CompositableSurfaceRef" }, blobArtifact: artifactTypes.blob,
} satisfies Record<string, TypeRef>;
-export const mediaValidatorDigests = {
- inspection: digestOf("@narratage/media/validate-media-inspection@1"), selection: digestOf("@narratage/media/validate-media-stream-selection@1"),
- synchronized: digestOf("@narratage/media/validate-synchronized-media@1"), renderedVisual: digestOf("@narratage/media/validate-rendered-visual@1"),
- timelineAudio: digestOf("@narratage/media/validate-timeline-audio@1"), muxed: digestOf("@narratage/media/validate-muxed-media@1"),
-} as const;
-export const mediaSurfaceImplementationDigests = {
- image: digestOf("@narratage/media/image-surface@1"),
- audio: digestOf("@narratage/media/audio-surface@1"),
- font: digestOf("@narratage/media/font-surface@1"),
-} as const;
const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: { digest } });
export const mediaMarkupSurfaces = [
- { name: "image", tag: "Image", mode: "structured", outputs: [artifactTypes.blob], implementation: { digest: mediaSurfaceImplementationDigests.image } },
- { name: "audio", tag: "Audio", mode: "structured", outputs: [artifactTypes.blob], implementation: { digest: mediaSurfaceImplementationDigests.audio } },
- { name: "font", tag: "Font", mode: "structured", outputs: [mediaTypes.fontArtifact], implementation: { digest: mediaSurfaceImplementationDigests.font } },
+ { name: "image", tag: "Image", mode: "structured", outputs: [artifactTypes.blob] },
+ { name: "audio", tag: "Audio", mode: "structured", outputs: [artifactTypes.blob] },
+ { name: "font", tag: "Font", mode: "structured", outputs: [mediaTypes.fontArtifact] },
] as const;
export const mediaManifest: ModuleManifest = {
- format: "svml.module@1", name: mediaModuleRef.name, version: mediaModuleRef.version, dependencies: [artifactDependency],
+ format: "narratage.module@1", name: mediaModuleRef.name, version: mediaModuleRef.version, dependencies: [artifactDependency],
types: [
- { name: mediaTypes.inspection.name, schema: mediaInspectionSchema, validator: validator(mediaValidatorDigests.inspection) },
- { name: mediaTypes.streamSelection.name, schema: mediaStreamSelectionSchema, validator: validator(mediaValidatorDigests.selection) },
- { name: mediaTypes.synchronized.name, schema: synchronizedMediaSchema, validator: validator(mediaValidatorDigests.synchronized) },
- { name: mediaTypes.renderedVisual.name, schema: renderedVisualSchema, validator: validator(mediaValidatorDigests.renderedVisual) },
- { name: mediaTypes.timelineAudio.name, schema: timelineAudioSchema, validator: validator(mediaValidatorDigests.timelineAudio) },
- { name: mediaTypes.muxed.name, schema: muxedMediaSchema, validator: validator(mediaValidatorDigests.muxed) },
- { name: mediaTypes.fontArtifact.name, schema: fontArtifactSchema }, { name: mediaTypes.fontStack.name, schema: fontStackSchema },
- { name: mediaTypes.compositableSurface.name, schema: compositableSurfaceSchema },
+ { name: mediaTypes.inspection.name },
+ { name: mediaTypes.streamSelection.name },
+ { name: mediaTypes.synchronized.name },
+ { name: mediaTypes.renderedVisual.name },
+ { name: mediaTypes.timelineAudio.name },
+ { name: mediaTypes.muxed.name },
+ { name: mediaTypes.fontArtifact.name }, { name: mediaTypes.fontStack.name },
+ { name: mediaTypes.compositableSurface.name },
], capabilities: [], producers: [],
};
-export const mediaManifestDigest = digestOf(mediaManifest);
-export const mediaDependency = { module: mediaModuleRef, digest: mediaManifestDigest } as const;
+export const mediaDependency = { module: mediaModuleRef } as const;
diff --git a/packages/media/test/font-surface.test.ts b/packages/media/test/font-surface.test.ts
index b2d4e88d..8736dca7 100644
--- a/packages/media/test/font-surface.test.ts
+++ b/packages/media/test/font-surface.test.ts
@@ -1,11 +1,7 @@
import assert from "node:assert/strict";
import test from "node:test";
-import {
- decodeMediaFontSurface,
- mediaSurfaceImplementationDigests,
- mediaTypes,
-} from "@narratage/media";
+import { decodeMediaFontSurface, mediaTypes } from "@narratage/media";
import { digestOf } from "@narratage/protocol";
const range = { start: 0, end: 80 };
@@ -51,7 +47,6 @@ test("Font Surface turns explicit author bytes and face metadata into one exact
style: "normal",
},
});
- assert.ok(mediaSurfaceImplementationDigests.font.startsWith("sha256:"));
});
test("Font Surface rejects ambiguous files and invalid face metadata before accepting bytes", async () => {
diff --git a/packages/mimo-tts/README.md b/packages/mimo-tts/README.md
index 7d0383b4..831d52cc 100644
--- a/packages/mimo-tts/README.md
+++ b/packages/mimo-tts/README.md
@@ -34,12 +34,5 @@ execution time; the Frontend never copies Script words into a request draft.
Official API reference: <https://mimo.mi.com/docs/zh-CN/quick-start/usage-guide/audio/speech-synthesis-v2.5>
-Add the author package to the project's explicit package lock before compiling:
-
-```sh
-node --run narratage -- lock-packages svml.packages.lock \
- --package @narratage/script \
- --package @narratage/mimo-tts
-```
-
-This selects author syntax and exact model semantics only. It does not select an API service.
+The Source import selects author syntax and exact model semantics only. It does not select an API
+service; the Runtime Profile independently selects a Provider.
diff --git a/packages/mimo-tts/package.json b/packages/mimo-tts/package.json
index 67b5a221..81f2d195 100644
--- a/packages/mimo-tts/package.json
+++ b/packages/mimo-tts/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/mimo-tts/src/activation.ts b/packages/mimo-tts/src/activation.ts
index a33c2be5..1999eef7 100644
--- a/packages/mimo-tts/src/activation.ts
+++ b/packages/mimo-tts/src/activation.ts
@@ -10,8 +10,8 @@ import {
mimoTtsMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: mimoTtsManifest }],
components: [mimoTtsComponent],
hostFacets: [
@@ -30,4 +30,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/mimo-tts/src/index.ts b/packages/mimo-tts/src/index.ts
index b30787f5..79b0a83a 100644
--- a/packages/mimo-tts/src/index.ts
+++ b/packages/mimo-tts/src/index.ts
@@ -100,16 +100,10 @@ export const mimoTtsMarkupSurfaces = [
{
name: "preset", tag: "Preset", mode: "structured",
outputs: [mimoTtsEndpoints.preset.draftType],
- implementation: {
- digest: mimoTtsSurfaceDigests.preset,
- },
},
{
name: "voiceDesign", tag: "VoiceDesign", mode: "structured",
outputs: [mimoTtsEndpoints.voiceDesign.draftType],
- implementation: {
- digest: mimoTtsSurfaceDigests.voiceDesign,
- },
},
{
name: "voiceClone", tag: "VoiceClone", mode: "structured",
@@ -117,9 +111,6 @@ export const mimoTtsMarkupSurfaces = [
mimoTtsEndpoints.voiceClone.draftType,
...Object.values(mimoTtsEndpoints.voiceClone.mediaBindings).map((binding) => binding.type),
],
- implementation: {
- digest: mimoTtsSurfaceDigests.voiceClone,
- },
},
] as const;
@@ -127,7 +118,6 @@ export const mimoTtsManifest = {
...base.manifest,
} as const;
-export const mimoTtsManifestDigest = digestOf(mimoTtsManifest);
export const mimoTtsComponent = base.component;
export { createMimoTtsAudioFragment } from "./fragment.js";
diff --git a/packages/mimo-tts/test/mimo-tts.test.ts b/packages/mimo-tts/test/mimo-tts.test.ts
index 3031ab11..ac174a71 100644
--- a/packages/mimo-tts/test/mimo-tts.test.ts
+++ b/packages/mimo-tts/test/mimo-tts.test.ts
@@ -69,7 +69,7 @@ test("MiMo declares three audio models without Provider facts", () => {
});
test("one installed author package contributes all three Surfaces without a Runtime Provider", () => {
- assert.equal(mimoNodePackage.format, "svml.node-package@1");
+ assert.equal(mimoNodePackage.format, "narratage.node-package@1");
assert.equal(mimoNodePackage.modules[0]?.manifest.version, "1");
assert.deepEqual(mimoTtsMarkupSurfaces.map((surface) => surface.name),
["preset", "voiceDesign", "voiceClone"]);
diff --git a/packages/minimax-h3/package.json b/packages/minimax-h3/package.json
index ef32b944..76fa9829 100644
--- a/packages/minimax-h3/package.json
+++ b/packages/minimax-h3/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/minimax-h3/src/activation.ts b/packages/minimax-h3/src/activation.ts
index 1a8c6dd2..3eef6d79 100644
--- a/packages/minimax-h3/src/activation.ts
+++ b/packages/minimax-h3/src/activation.ts
@@ -2,7 +2,7 @@ import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import { minimaxH3Component, minimaxH3Manifest, minimaxH3ModuleRef,
minimaxH3MarkupSurfaces } from "./index.js";
import { decodeMinimaxFrameVideoSurface, decodeMinimaxReferenceVideoSurface, decodeMinimaxTextVideoSurface } from "./surface.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: minimaxH3Manifest }], components: [minimaxH3Component], hostFacets: [
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: minimaxH3Manifest }], components: [minimaxH3Component], hostFacets: [
createMarkupSurfaceHostFacet({ module: minimaxH3ModuleRef,
declaration: minimaxH3MarkupSurfaces.find((item) => item.name === "text-video")!, handler: decodeMinimaxTextVideoSurface }),
createMarkupSurfaceHostFacet({ module: minimaxH3ModuleRef,
@@ -10,4 +10,4 @@ export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{
createMarkupSurfaceHostFacet({ module: minimaxH3ModuleRef,
declaration: minimaxH3MarkupSurfaces.find((item) => item.name === "reference-video")!, handler: decodeMinimaxReferenceVideoSurface }),
] };
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/minimax-h3/src/index.ts b/packages/minimax-h3/src/index.ts
index 85728b5b..3328d74c 100644
--- a/packages/minimax-h3/src/index.ts
+++ b/packages/minimax-h3/src/index.ts
@@ -68,31 +68,24 @@ const minimaxH3BaseDefinition = defineExactModelModule({
export const minimaxH3Endpoints = minimaxH3BaseDefinition.endpoints;
export const minimaxH3Component = minimaxH3BaseDefinition.component;
-export const minimaxH3SurfaceImplementationDigests = {
- textVideo: digestOf("@narratage/minimax-h3/text-video-surface@1"),
- frameVideo: digestOf("@narratage/minimax-h3/frame-video-surface@1"),
- referenceVideo: digestOf("@narratage/minimax-h3/reference-video-surface@1"),
-} as const;
const endpoint = minimaxH3Endpoints.video!;
const declaration = (
- name: string, tag: string, digest: (typeof minimaxH3SurfaceImplementationDigests)[keyof typeof minimaxH3SurfaceImplementationDigests],
+ name: string, tag: string,
bindings: readonly (keyof typeof endpoint.mediaBindings)[] = [],
) => ({
name, tag, mode: "structured" as const,
outputs: [endpoint.draftType, ...bindings.map((port) => endpoint.mediaBindings[port]!.type)],
- implementation: { digest },
});
export const minimaxH3MarkupSurfaces = [
- declaration("text-video", "TextVideo", minimaxH3SurfaceImplementationDigests.textVideo),
- declaration("frame-video", "FrameVideo", minimaxH3SurfaceImplementationDigests.frameVideo, ["firstFrame", "lastFrame"]),
- declaration("reference-video", "ReferenceVideo", minimaxH3SurfaceImplementationDigests.referenceVideo, ["referenceImage", "referenceVideo", "referenceAudio"]),
+ declaration("text-video", "TextVideo"),
+ declaration("frame-video", "FrameVideo", ["firstFrame", "lastFrame"]),
+ declaration("reference-video", "ReferenceVideo", ["referenceImage", "referenceVideo", "referenceAudio"]),
] as const;
export const minimaxH3Manifest = {
...minimaxH3BaseDefinition.manifest,
};
-export const minimaxH3ManifestDigest = digestOf(minimaxH3Manifest);
export const minimaxH3Definition = {
- ...minimaxH3BaseDefinition, manifest: minimaxH3Manifest, manifestDigest: minimaxH3ManifestDigest,
+ ...minimaxH3BaseDefinition, manifest: minimaxH3Manifest,
};
diff --git a/packages/model-kit/src/index.ts b/packages/model-kit/src/index.ts
index f7f1d22a..96a01bc7 100644
--- a/packages/model-kit/src/index.ts
+++ b/packages/model-kit/src/index.ts
@@ -10,7 +10,6 @@ import {
bindGenerationMedia,
bindGenerationText,
finalizeGenerationRequestDraft,
- generationManifestDigest,
generationModuleRef,
generationProducers,
generationTypes,
@@ -31,12 +30,10 @@ import { textDependency, textTypes } from "@narratage/text";
import type { Text } from "@narratage/text";
import {
canonicalize,
- digestOf,
} from "@narratage/protocol";
import type {
CanonicalValue,
CapabilityRef,
- Digest,
ModuleManifest,
ModuleRef,
ProducerRef,
@@ -62,12 +59,8 @@ export type ExactModelEndpoint = {
readonly capability: CapabilityRef;
readonly producer: ProducerRef;
readonly returns: TypeRef;
- readonly implementationDigest: Digest;
- readonly validatorDigest: Digest;
readonly draftType: TypeRef;
- readonly draftValidatorDigest: Digest;
readonly finalizeProducer: ProducerRef;
- readonly finalizeImplementationDigest: Digest;
readonly mediaBindings: Readonly<Record<string, ExactModelMediaBindingEndpoint>>;
readonly textBindings: Readonly<Record<string, ExactModelTextBindingEndpoint>>;
readonly ports: GenerationPortTable;
@@ -78,13 +71,11 @@ export type ExactModelMediaBindingEndpoint = {
readonly port: string;
readonly type: TypeRef;
readonly producer: ProducerRef;
- readonly implementationDigest: Digest;
};
export type ExactModelTextBindingEndpoint = {
readonly port: string;
readonly producer: ProducerRef;
- readonly implementationDigest: Digest;
};
export type ExactModelMediaInput = {
@@ -104,7 +95,6 @@ export type ExactModelTextInput = {
export type ExactModelModule<Key extends string = string> = {
readonly module: ModuleRef;
readonly manifest: ModuleManifest;
- readonly manifestDigest: Digest;
/** Keyed by the exact endpoint keys the module declared, so a stale key fails to compile. */
readonly endpoints: Readonly<Record<Key, ExactModelEndpoint>>;
readonly component: ComponentPackage & {
@@ -130,25 +120,19 @@ function endpointRef(module: ModuleRef, spec: ExactModelEndpointSpec) {
const returns = spec.ports.result === "audio"
? generationTypes.audioSet
: spec.ports.result === "image" ? generationTypes.imageSet : generationTypes.videoSet;
- const implementationDigest = digestOf(`${module.name}/${spec.producerName}@1`);
- const validatorDigest = digestOf(`${module.name}/validate-${spec.requestTypeName}@1`);
- const draftValidatorDigest = digestOf(`${module.name}/validate-${spec.requestTypeName}-draft@1`);
const finalizeProducer = { module, name: `finalize-${spec.producerName}` };
- const finalizeImplementationDigest = digestOf(`${module.name}/${finalizeProducer.name}@1`);
const mediaBindings = Object.fromEntries(spec.ports.ports
.filter((port): port is GenerationMediaPort => port.value.kind === "media")
.map((port) => [port.name, {
port: port.name,
type: { module, name: `${spec.requestTypeName}${pascal(port.name)}Binding` },
producer: { module, name: `bind-${spec.producerName}-${port.name}` },
- implementationDigest: digestOf(`${module.name}/bind-${spec.producerName}-${port.name}@1`),
} satisfies ExactModelMediaBindingEndpoint]));
const textBindings = Object.fromEntries(spec.ports.ports
.filter((port) => port.value.kind === "text")
.map((port) => [port.name, {
port: port.name,
producer: { module, name: `bind-${spec.producerName}-${port.name}-text` },
- implementationDigest: digestOf(`${module.name}/bind-${spec.producerName}-${port.name}-text@1`),
} satisfies ExactModelTextBindingEndpoint]));
return {
requestType,
@@ -156,11 +140,7 @@ function endpointRef(module: ModuleRef, spec: ExactModelEndpointSpec) {
capability,
producer,
returns,
- implementationDigest,
- validatorDigest,
- draftValidatorDigest,
finalizeProducer,
- finalizeImplementationDigest,
mediaBindings,
textBindings,
};
@@ -203,38 +183,26 @@ export function defineExactModelModule<const Key extends string>(
const endpointData = options.endpoints.map((spec) => ({ spec, ...endpointRef(options.module, spec) }));
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: options.module.name,
version: options.module.version,
dependencies: [
- { module: generationModuleRef, digest: generationManifestDigest },
+ { module: generationModuleRef },
artifactDependency,
textDependency,
],
types: endpointData.flatMap((item) => [
{
name: item.requestType.name,
- schema: requestSchemaFromPorts(item.spec.ports),
- validator: {
- implementation: {
- digest: item.validatorDigest,
- },
- },
},
{
name: item.draftType.name,
- schema: requestDraftSchemaFromPorts(item.spec.ports),
- validator: {
- implementation: {
- digest: item.draftValidatorDigest,
- },
- },
},
...Object.values(item.mediaBindings).map((binding) => {
const port = item.spec.ports.ports.find((candidate): candidate is GenerationMediaPort =>
candidate.name === binding.port && candidate.value.kind === "media");
assert(port !== undefined, `${item.spec.key} media binding ${binding.port} has no port`);
- return { name: binding.type.name, schema: mediaBindingSchemaFromPort(port) };
+ return { name: binding.type.name };
}),
]),
capabilities: endpointData.map((item) => ({
@@ -251,9 +219,6 @@ export function defineExactModelModule<const Key extends string>(
capability: item.capability,
returns: item.returns,
}],
- implementation: {
- digest: item.implementationDigest,
- },
},
...Object.values(item.mediaBindings).map((binding) => ({
name: binding.producer.name,
@@ -264,9 +229,6 @@ export function defineExactModelModule<const Key extends string>(
],
outputs: [{ name: "draft", type: item.draftType }],
needs: [],
- implementation: {
- digest: binding.implementationDigest,
- },
})),
...Object.values(item.textBindings).map((binding) => ({
name: binding.producer.name,
@@ -276,18 +238,12 @@ export function defineExactModelModule<const Key extends string>(
],
outputs: [{ name: "draft", type: item.draftType }],
needs: [],
- implementation: {
- digest: binding.implementationDigest,
- },
})),
{
name: item.finalizeProducer.name,
inputs: [{ name: "draft", type: item.draftType }],
outputs: [{ name: "request", type: item.requestType }],
needs: [],
- implementation: {
- digest: item.finalizeImplementationDigest,
- },
},
]),
};
@@ -313,12 +269,8 @@ export function defineExactModelModule<const Key extends string>(
capability: item.capability,
producer: item.producer,
returns: item.returns,
- implementationDigest: item.implementationDigest,
- validatorDigest: item.validatorDigest,
draftType: item.draftType,
- draftValidatorDigest: item.draftValidatorDigest,
finalizeProducer: item.finalizeProducer,
- finalizeImplementationDigest: item.finalizeImplementationDigest,
mediaBindings: item.mediaBindings,
textBindings: item.textBindings,
ports: item.spec.ports,
@@ -329,18 +281,15 @@ export function defineExactModelModule<const Key extends string>(
return {
module: { ...options.module },
manifest,
- manifestDigest: digestOf(manifest),
endpoints: endpoints as Readonly<Record<Key, ExactModelEndpoint>>,
component: {
validators: endpointData.flatMap((item) => [{
type: item.requestType,
- implementationDigest: item.validatorDigest,
handler({ value }) {
verifyRequestAgainstPorts(item.spec.ports, inlineRequest(value, item.spec.key));
},
}, {
type: item.draftType,
- implementationDigest: item.draftValidatorDigest,
handler({ value }) {
verifyRequestDraftAgainstPorts(item.spec.ports, inlineRequest(value, `${item.spec.key} draft`));
},
@@ -348,7 +297,6 @@ export function defineExactModelModule<const Key extends string>(
producers: endpointData.flatMap((item) => [
{
producer: item.producer,
- implementationDigest: item.implementationDigest,
handler: ({ inputs }: ProducerHandlerContext) => {
const requestRecord = inputs.request;
assert(requestRecord !== undefined, `${item.spec.key} request input is missing`);
@@ -359,7 +307,6 @@ export function defineExactModelModule<const Key extends string>(
},
...Object.values(item.mediaBindings).map((binding) => ({
producer: binding.producer,
- implementationDigest: binding.implementationDigest,
handler: ({ inputs }: ProducerHandlerContext) => {
const draft = inlineValue<GenerationRequestDraft>(inputs.draft!.value, `${item.spec.key} draft`);
const value = inlineValue<GenerationMediaBinding>(inputs.binding!.value, `${binding.port} binding`);
@@ -382,7 +329,6 @@ export function defineExactModelModule<const Key extends string>(
})),
...Object.values(item.textBindings).map((binding) => ({
producer: binding.producer,
- implementationDigest: binding.implementationDigest,
handler: ({ inputs }: ProducerHandlerContext) => {
const draft = inlineValue<GenerationRequestDraft>(inputs.draft!.value, `${item.spec.key} draft`);
const text = inlineValue<Text>(inputs.text!.value, `${binding.port} Text`);
@@ -399,7 +345,6 @@ export function defineExactModelModule<const Key extends string>(
})),
{
producer: item.finalizeProducer,
- implementationDigest: item.finalizeImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
request: {
diff --git a/packages/nano-banana/package.json b/packages/nano-banana/package.json
index a04b5157..9cfca35e 100644
--- a/packages/nano-banana/package.json
+++ b/packages/nano-banana/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/nano-banana/src/activation.ts b/packages/nano-banana/src/activation.ts
index 852189e5..01f513c8 100644
--- a/packages/nano-banana/src/activation.ts
+++ b/packages/nano-banana/src/activation.ts
@@ -4,10 +4,10 @@ import {
nanoBananaMarkupSurfaces,
} from "./index.js";
import { decodeNanoBananaImageSurface, decodeNanoBananaProImageSurface } from "./surface.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: nanoBananaManifest }], components: [nanoBananaComponent], hostFacets: [
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: nanoBananaManifest }], components: [nanoBananaComponent], hostFacets: [
createMarkupSurfaceHostFacet({ module: nanoBananaModuleRef,
declaration: nanoBananaMarkupSurfaces.find((item) => item.name === "image")!, handler: decodeNanoBananaImageSurface }),
createMarkupSurfaceHostFacet({ module: nanoBananaModuleRef,
declaration: nanoBananaMarkupSurfaces.find((item) => item.name === "pro-image")!, handler: decodeNanoBananaProImageSurface }),
] };
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/nano-banana/src/index.ts b/packages/nano-banana/src/index.ts
index 4589d2e9..84428171 100644
--- a/packages/nano-banana/src/index.ts
+++ b/packages/nano-banana/src/index.ts
@@ -55,36 +55,26 @@ const nanoBananaBaseDefinition = defineExactModelModule({
export const nanoBananaEndpoints = nanoBananaBaseDefinition.endpoints;
export const nanoBananaComponent = nanoBananaBaseDefinition.component;
-export const nanoBananaSurfaceImplementationDigests = {
- image: digestOf("@narratage/nano-banana/image-surface@1"),
- proImage: digestOf("@narratage/nano-banana/pro-image-surface@1"),
-} as const;
const surface = (
name: "image" | "pro-image",
tag: "Image" | "ProImage",
endpoint: (typeof nanoBananaEndpoints)["v2" | "pro"],
- digest: (typeof nanoBananaSurfaceImplementationDigests)["image" | "proImage"],
) => ({
name,
tag,
mode: "structured" as const,
outputs: [endpoint!.draftType, endpoint!.mediaBindings.images!.type],
- implementation: {
- digest,
- },
});
export const nanoBananaMarkupSurfaces = [
- surface("image", "Image", nanoBananaEndpoints.v2!, nanoBananaSurfaceImplementationDigests.image),
- surface("pro-image", "ProImage", nanoBananaEndpoints.pro!, nanoBananaSurfaceImplementationDigests.proImage),
+ surface("image", "Image", nanoBananaEndpoints.v2!),
+ surface("pro-image", "ProImage", nanoBananaEndpoints.pro!),
] as const;
export const nanoBananaManifest = {
...nanoBananaBaseDefinition.manifest,
};
-export const nanoBananaManifestDigest = digestOf(nanoBananaManifest);
export const nanoBananaDefinition = {
...nanoBananaBaseDefinition,
manifest: nanoBananaManifest,
- manifestDigest: nanoBananaManifestDigest,
};
diff --git a/packages/narrative/package.json b/packages/narrative/package.json
index 0ba85b25..0f14f995 100644
--- a/packages/narrative/package.json
+++ b/packages/narrative/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/narrative/src/activation.ts b/packages/narrative/src/activation.ts
index 574fca80..1e448e05 100644
--- a/packages/narrative/src/activation.ts
+++ b/packages/narrative/src/activation.ts
@@ -1,6 +1,6 @@
import { narrativeManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: narrativeManifest }],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/narrative/src/index.ts b/packages/narrative/src/index.ts
index 9dafecef..001ed01f 100644
--- a/packages/narrative/src/index.ts
+++ b/packages/narrative/src/index.ts
@@ -1,3 +1,3 @@
-export { narrativeDependency, narrativeManifest, narrativeManifestDigest, narrativeModuleRef, narrativeTypes } from "./manifest.js";
+export { narrativeDependency, narrativeManifest, narrativeModuleRef, narrativeTypes } from "./manifest.js";
export { captionCorrespondenceSchema, captionDisplaySequenceSchema, captionDisplayWordSubsetSchema, narrativeExcerptSchema, narrativeMomentSchema, narrativeSchema, narrativeSelectionSchema } from "./schema.js";
export type * from "./types.js";
diff --git a/packages/narrative/src/manifest.ts b/packages/narrative/src/manifest.ts
index 5976fea0..7a00a093 100644
--- a/packages/narrative/src/manifest.ts
+++ b/packages/narrative/src/manifest.ts
@@ -21,18 +21,17 @@ export const narrativeTypes = {
captionDisplayWordSubset: { module: narrativeModuleRef, name: "CaptionDisplayWordSubset" },
} satisfies Record<string, TypeRef>;
export const narrativeManifest: ModuleManifest = {
- format: "svml.module@1", name: narrativeModuleRef.name, version: narrativeModuleRef.version,
+ format: "narratage.module@1", name: narrativeModuleRef.name, version: narrativeModuleRef.version,
dependencies: [],
types: [
- { name: narrativeTypes.narrative.name, schema: narrativeSchema },
- { name: narrativeTypes.excerpt.name, schema: narrativeExcerptSchema },
- { name: narrativeTypes.selection.name, schema: narrativeSelectionSchema },
- { name: narrativeTypes.moment.name, schema: narrativeMomentSchema },
- { name: narrativeTypes.captionDisplay.name, schema: captionDisplaySequenceSchema },
- { name: narrativeTypes.captionCorrespondence.name, schema: captionCorrespondenceSchema },
- { name: narrativeTypes.captionDisplayWordSubset.name, schema: captionDisplayWordSubsetSchema },
+ { name: narrativeTypes.narrative.name },
+ { name: narrativeTypes.excerpt.name },
+ { name: narrativeTypes.selection.name },
+ { name: narrativeTypes.moment.name },
+ { name: narrativeTypes.captionDisplay.name },
+ { name: narrativeTypes.captionCorrespondence.name },
+ { name: narrativeTypes.captionDisplayWordSubset.name },
],
capabilities: [], producers: [],
};
-export const narrativeManifestDigest = digestOf(narrativeManifest);
-export const narrativeDependency = { module: narrativeModuleRef, digest: narrativeManifestDigest } as const;
+export const narrativeDependency = { module: narrativeModuleRef } as const;
diff --git a/packages/package-loader-node/README.md b/packages/package-loader-node/README.md
index 52cd29e9..08b71d84 100644
--- a/packages/package-loader-node/README.md
+++ b/packages/package-loader-node/README.md
@@ -1,37 +1,22 @@
# `@narratage/package-loader-node`
-Trusted installed-package locking and loading for Node Hosts. One package lock binds every directly selected
-physical package and declared dependency byte plus Module, Host-facet, Producer and Type
-Validator identities. Loading verifies all artifacts and checks deterministic compute facets
-against their static Manifests before returning physical-package/`NodePackageContribution` bindings.
+Installed-package selection for Node Hosts. npm or pnpm owns installation, versions and byte
+integrity. This loader imports only packages selected by Source discovery or a Runtime Profile,
+then validates the contribution boundary Narratage consumes.
-The artifact digest covers the files that ship the package's behavior and assets. Package-root test suites,
-coverage/cache directories and project-only README, license and tool configuration files are excluded, so
-editing documentation or tests does not make an otherwise identical installed implementation unusable.
-Nested runtime assets are not excluded merely because one of their parent directories happens to be named
-`test`.
-
-The caller selects only package roots. During the explicit lock action, the Loader follows exact
-Module Manifest dependencies (`ModuleRef + digest`) and adds the unique installed contribution that
-provides each one. This is a local dependency closure, not a built-in package map or registry.
+Exact Module Manifest dependencies (`ModuleRef + digest`) load from the selected package's installed
+dependencies. The loader neither scans unrelated dependencies for plugins nor maintains a package registry.
This package does not select an author syntax. Syntax-specific executable facets remain inert until
an exact Host ABI installs them. `@narratage/compiler-markup-node` selects the official Markup Surface ABI;
-`@narratage/local` can load the same package's deterministic compute facets without depending on Markup.
-Run Fragment libraries use the ordinary `svml.run-fragment-host@1` Host facet; the Loader has no
+`@narratage/runtime-local` can load the same package's deterministic compute facets without depending on Markup.
+Run Fragment libraries use the ordinary `narratage.run-fragment-host@1` Host facet; the Loader has no
Run-specific fragment field or interpretation branch. Author and Run Frontends likewise use the
-ordinary `svml.source-frontend@1` Host facet; the Loader has no Frontend fields or parser registry.
-
-This package is deliberately not an npm client and does not activate Provider or privileged Runtime
-packages. Source `<import>` can select only an already installed author contribution; trusted
-deployment configuration independently chooses whether to grant author or deterministic compute registries.
-Executable plans bind the package-lock digest as `BuildRequest.implementationClosure`.
+ordinary `narratage.source-frontend@1` Host facet; the Loader has no Frontend fields or parser registry.
-```bash
-narratage lock-packages ./svml.packages.lock --package @example/cards --package-root .
-narratage check ./main.svml --package-lock ./svml.packages.lock --workspace .
-```
+This package is deliberately not an npm client. Source `<import>` can select only an already installed
+author contribution. Provider and privileged Runtime packages are independently selected by a Runtime
+Profile.
If `@example/cards` requires a Module exported by an installed dependency, that dependency does not
-need another `--package`. Missing, digest-mismatched or ambiguous providers fail while creating the
-lock, before compilation.
+need another Source import. Missing or digest-mismatched Module providers fail before compilation.
diff --git a/packages/package-loader-node/package.json b/packages/package-loader-node/package.json
index 570c563d..7bd28ba4 100644
--- a/packages/package-loader-node/package.json
+++ b/packages/package-loader-node/package.json
@@ -13,7 +13,7 @@
"@narratage/protocol": "workspace:*"
},
"devDependencies": {
- "@narratage/runtime-adapter": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
"@narratage/validation": "workspace:*"
}
}
diff --git a/packages/package-loader-node/src/contribution.ts b/packages/package-loader-node/src/contribution.ts
index 8ad2d6fb..b0927f1e 100644
--- a/packages/package-loader-node/src/contribution.ts
+++ b/packages/package-loader-node/src/contribution.ts
@@ -4,7 +4,7 @@ import { canonicalize } from "@narratage/protocol";
import type { NodeModuleContribution, NodePackageContribution } from "./types.js";
function assertPackage(value: NodePackageContribution): void {
- if (value.format !== "svml.node-package@1") {
+ if (value.format !== "narratage.node-package@1") {
throw new Error("Node package contribution has an unsupported format");
}
const hostFacets = new Set<string>();
@@ -71,17 +71,11 @@ export function collectNodePackageComponents(
const manifest = manifests.get(`${facet.producer.module.name}@${facet.producer.module.version}`)?.manifest;
const declaration = manifest?.producers.find((item) => item.name === facet.producer.name);
if (declaration === undefined) throw new Error(`Module ${facet.producer.module.name} implements undeclared Producer ${facetKey(facet.producer)}`);
- if (declaration.implementation.digest !== facet.implementationDigest) {
- throw new Error(`Producer ${facetKey(facet.producer)} differs from its Manifest`);
- }
}
for (const facet of component.validators ?? []) {
const manifest = manifests.get(`${facet.type.module.name}@${facet.type.module.version}`)?.manifest;
const declaration = manifest?.types.find((item) => item.name === facet.type.name);
- if (declaration?.validator === undefined) throw new Error(`Module ${facet.type.module.name} validates undeclared Type ${facetKey(facet.type)}`);
- if (declaration.validator.implementation.digest !== facet.implementationDigest) {
- throw new Error(`Type Validator ${facetKey(facet.type)} differs from its Manifest`);
- }
+ if (declaration === undefined) throw new Error(`Module ${facet.type.module.name} validates undeclared Type ${facetKey(facet.type)}`);
}
}
return components;
diff --git a/packages/package-loader-node/src/index.ts b/packages/package-loader-node/src/index.ts
index b7eeb548..87a3b2e6 100644
--- a/packages/package-loader-node/src/index.ts
+++ b/packages/package-loader-node/src/index.ts
@@ -2,15 +2,7 @@ export {
collectNodePackageComponents,
} from "./contribution.js";
export {
- createNodePackageLock,
- createNodePackageInventory,
- loadNodePackageSet,
loadNodePackageSelection,
- NodePackageLockStaleError,
NodePackageSelectionMissingError,
- readNodePackageLock,
- selectNodePackageSpecifiers,
- writeNodePackageLock,
-} from "./lock.js";
-export type { NodePackageArtifactDifference } from "./lock.js";
+} from "./loader.js";
export type * from "./types.js";
diff --git a/packages/package-loader-node/src/loader.ts b/packages/package-loader-node/src/loader.ts
new file mode 100644
index 00000000..428ac2ca
--- /dev/null
+++ b/packages/package-loader-node/src/loader.ts
@@ -0,0 +1,201 @@
+import { readFile, realpath, stat } from "node:fs/promises";
+import { createRequire } from "node:module";
+import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { pathToFileURL } from "node:url";
+
+import { modulePackageAbi } from "@narratage/protocol";
+
+import type {
+ LoadedPackage,
+ LogicalPackageAddress,
+ NodePackageContribution,
+ NodePackageSelectionRequest,
+} from "./types.js";
+
+type PackageJson = {
+ readonly name: string;
+ readonly version: string;
+ readonly narratage?: { readonly activation?: string };
+};
+
+type ResolvedPackage = { readonly root: string; readonly json: PackageJson };
+
+function assert(condition: unknown, message: string): asserts condition {
+ if (!condition) throw new Error(message);
+}
+
+function object(value: unknown, subject: string): Record<string, unknown> {
+ assert(value !== null && typeof value === "object" && !Array.isArray(value), `${subject} must be an object`);
+ return value as Record<string, unknown>;
+}
+
+function text(value: unknown, subject: string): string {
+ assert(typeof value === "string" && value.length > 0, `${subject} must be a non-empty string`);
+ return value;
+}
+
+function parsePackageJson(value: unknown, subject: string): PackageJson {
+ const item = object(value, subject);
+ const narratage = item.narratage === undefined ? undefined : object(item.narratage, `${subject}.narratage`);
+ return {
+ name: text(item.name, `${subject}.name`),
+ version: text(item.version, `${subject}.version`),
+ ...(narratage?.activation === undefined ? {} : { narratage: { activation: text(narratage.activation, `${subject}.narratage.activation`) } }),
+ };
+}
+
+async function packageJson(root: string): Promise<PackageJson> {
+ const path = join(root, "package.json");
+ return parsePackageJson(JSON.parse(await readFile(path, "utf8")), path);
+}
+
+async function packageRoot(entry: string, expectedName: string): Promise<ResolvedPackage> {
+ let cursor = dirname(await realpath(entry));
+ while (true) {
+ try {
+ const json = await packageJson(cursor);
+ if (json.name === expectedName) return { root: cursor, json };
+ } catch {
+ // Continue to the package that owns the resolved entry.
+ }
+ const parent = dirname(cursor);
+ if (parent === cursor) throw new Error(`resolved entry for ${expectedName} is outside its package`);
+ cursor = parent;
+ }
+}
+
+async function resolvePackage(specifier: string, from: string): Promise<ResolvedPackage> {
+ const resolver = createRequire(join(resolve(from), "__narratage_package_loader__.cjs"));
+ try {
+ return await packageRoot(resolver.resolve(specifier), specifier);
+ } catch (entryError) {
+ try {
+ return await packageRoot(resolver.resolve(`${specifier}/package.json`), specifier);
+ } catch {
+ throw new Error(`cannot resolve installed package ${specifier} from ${from}: ${entryError instanceof Error ? entryError.message : String(entryError)}`);
+ }
+ }
+}
+
+function activationPath(item: ResolvedPackage): string {
+ const declared = item.json.narratage?.activation;
+ assert(declared !== undefined, `${item.json.name} does not declare narratage.activation`);
+ assert(!isAbsolute(declared), `${item.json.name} activation must be package-relative`);
+ const target = resolve(item.root, declared);
+ const relation = relative(item.root, target);
+ assert(relation !== "" && relation !== ".." && !relation.startsWith(`..${sep}`), `${item.json.name} activation escapes its package`);
+ return target;
+}
+
+async function importContribution(item: ResolvedPackage): Promise<NodePackageContribution> {
+ const target = activationPath(item);
+ assert((await stat(target)).isFile(), `${item.json.name} activation is not a file`);
+ const imported = await import(pathToFileURL(target).href) as { readonly default?: unknown };
+ assert(imported.default !== null && typeof imported.default === "object", `${item.json.name} activation has no default package export`);
+ const contribution = imported.default as Partial<NodePackageContribution>;
+ assert(contribution.format === "narratage.node-package@1", `${item.json.name} activation has an unsupported package format`);
+ return contribution as NodePackageContribution;
+}
+
+function addressKey(value: LogicalPackageAddress): string {
+ return `${value.abi}\u0000${value.name}`;
+}
+
+function offers(value: NodePackageContribution): readonly LogicalPackageAddress[] {
+ return [
+ ...(value.modules ?? []).flatMap((item) => [
+ `${item.manifest.name}@${item.manifest.version}`,
+ ...(item.specifiers ?? []),
+ ].map((name) => ({ abi: modulePackageAbi, name }))),
+ ...(value.hostFacets ?? []).flatMap((facet) => (facet.offers ?? []).map((name) => ({ abi: facet.abi, name }))),
+ ];
+}
+
+/** Conventional physical package spelling for a logical @scope/name@version address. */
+function physicalHint(logical: string): string {
+ const slash = logical.startsWith("@") ? logical.indexOf("/", 1) : -1;
+ const version = logical.lastIndexOf("@");
+ const unversioned = version > Math.max(slash, 0) ? logical.slice(0, version) : logical;
+ if (!unversioned.startsWith("@")) return unversioned.split("/", 1)[0]!;
+ const packageSlash = unversioned.indexOf("/", 1);
+ const subpath = unversioned.indexOf("/", packageSlash + 1);
+ return subpath < 0 ? unversioned : unversioned.slice(0, subpath);
+}
+
+export class NodePackageSelectionMissingError extends Error {
+ readonly code = "PACKAGE_SELECTION_MISSING";
+ constructor(readonly address: LogicalPackageAddress) {
+ super(`installed packages do not provide ${address.abi} ${address.name}`);
+ this.name = "NodePackageSelectionMissingError";
+ }
+}
+
+/**
+ * Load the packages explicitly named by Source discovery or a Runtime Profile.
+ * Node's package manager owns installed versions and bytes; Narratage validates only the
+ * contribution boundary it consumes.
+ */
+export async function loadNodePackageSelection(
+ request: readonly string[] | NodePackageSelectionRequest,
+ root: string,
+): Promise<readonly LoadedPackage[]> {
+ const normalized: NodePackageSelectionRequest = Array.isArray(request)
+ ? { selected: request }
+ : request as NodePackageSelectionRequest;
+ const selected = new Set(normalized.selected);
+ for (const address of normalized.logical ?? []) selected.add(physicalHint(address.name));
+ if (selected.size === 0) return [];
+
+ const roots = await Promise.all([...selected].sort().map(async (name) => await resolvePackage(name, root)));
+ type ActivatedPackage = { readonly physical: ResolvedPackage; readonly contribution: NodePackageContribution };
+ const activated = new Map<string, ActivatedPackage>();
+ for (const item of await Promise.all(roots.map(async (physical) => ({
+ physical,
+ contribution: await importContribution(physical),
+ })))) {
+ activated.set(item.physical.json.name, item);
+ }
+ for (const address of normalized.logical ?? []) {
+ const providers = [...activated.values()].filter((item) => offers(item.contribution)
+ .some((offer) => addressKey(offer) === addressKey(address)));
+ if (providers.length === 0) throw new NodePackageSelectionMissingError(address);
+ assert(providers.length === 1, `${address.abi} ${address.name} is provided by more than one selected package`);
+ }
+
+ const moduleKey = (name: string, version: string) => `${name}@${version}`;
+ while (true) {
+ const provided = new Set<string>();
+ const required = new Map<string, { readonly from: string }>();
+ for (const item of activated.values()) {
+ for (const module of item.contribution.modules ?? []) {
+ provided.add(moduleKey(module.manifest.name, module.manifest.version));
+ for (const dependency of module.manifest.dependencies) {
+ required.set(moduleKey(dependency.module.name, dependency.module.version), {
+ from: item.physical.root,
+ });
+ }
+ }
+ }
+ const missing = [...required].filter(([key]) => !provided.has(key));
+ if (missing.length === 0) break;
+ const additions = await Promise.all(missing.map(async ([key, requirement]) => {
+ const providerPackage = physicalHint(key);
+ assert(!activated.has(providerPackage), `selected package ${providerPackage} provides the wrong ${key}`);
+ const physical = await resolvePackage(providerPackage, requirement.from);
+ const provider = { physical, contribution: await importContribution(physical) };
+ const offered = (provider.contribution.modules ?? []).some((module) =>
+ moduleKey(module.manifest.name, module.manifest.version) === key);
+ assert(offered, `${providerPackage} does not provide the required ${key}`);
+ return provider;
+ }));
+ for (const provider of additions) activated.set(provider.physical.json.name, provider);
+ }
+
+ const packages: LoadedPackage[] = [...activated.values()]
+ .sort((left, right) => left.physical.json.name.localeCompare(right.physical.json.name))
+ .map((item) => ({
+ specifier: item.physical.json.name,
+ contribution: item.contribution,
+ }));
+ return packages;
+}
diff --git a/packages/package-loader-node/src/lock.ts b/packages/package-loader-node/src/lock.ts
deleted file mode 100644
index a0e1043d..00000000
--- a/packages/package-loader-node/src/lock.ts
+++ /dev/null
@@ -1,799 +0,0 @@
-import { createHash, randomUUID } from "node:crypto";
-import {
- open,
- readdir,
- readFile,
- realpath,
- rename,
- rm,
- stat,
-} from "node:fs/promises";
-import { createRequire } from "node:module";
-import {
- basename,
- dirname,
- isAbsolute,
- join,
- relative,
- resolve,
- sep,
-} from "node:path";
-import { pathToFileURL } from "node:url";
-
-import { digestOf, isDigest, modulePackageAbi } from "@narratage/protocol";
-
-import { collectNodePackageComponents } from "./contribution.js";
-import type {
- LogicalPackageAddress,
- NodePackageBinding,
- LockedNodePackage,
- LockedPackageArtifact,
- LoadedNodePackageSet,
- NodePackageContribution,
- NodePackageLockCreateOptions,
- NodePackageSelectionRequest,
- NodePackageLock,
-} from "./types.js";
-
-type PackageJson = {
- readonly name: string;
- readonly version: string;
- readonly dependencies?: Readonly<Record<string, string>>;
- readonly optionalDependencies?: Readonly<Record<string, string>>;
- readonly peerDependencies?: Readonly<Record<string, string>>;
- readonly peerDependenciesMeta?: Readonly<Record<string, { readonly optional?: boolean }>>;
- readonly svml?: {
- readonly activation?: string;
- };
-};
-
-type ResolvedPhysicalPackage = {
- readonly root: string;
- readonly json: PackageJson;
-};
-
-type ReachablePhysicalPackage = {
- readonly physical: ResolvedPhysicalPackage;
- /** Direct selection roots that can reach this physical package. Ephemeral; never serialized. */
- readonly roots: ReadonlySet<string>;
-};
-
-function assert(condition: unknown, message: string): asserts condition {
- if (!condition) throw new Error(message);
-}
-
-function object(value: unknown, subject: string): Record<string, unknown> {
- assert(value !== null && typeof value === "object" && !Array.isArray(value), `${subject} must be an object`);
- return value as Record<string, unknown>;
-}
-
-function string(value: unknown, subject: string): string {
- assert(typeof value === "string" && value.length > 0, `${subject} must be a non-empty string`);
- return value;
-}
-
-function parsePackageJson(value: unknown, subject: string): PackageJson {
- const parsed = object(value, subject);
- const svml = parsed.svml === undefined ? undefined : object(parsed.svml, `${subject}.svml`);
- const peerDependenciesMeta = parsed.peerDependenciesMeta === undefined
- ? undefined
- : object(parsed.peerDependenciesMeta, `${subject}.peerDependenciesMeta`);
- return {
- name: string(parsed.name, `${subject}.name`),
- version: string(parsed.version, `${subject}.version`),
- ...(parsed.dependencies === undefined
- ? {}
- : { dependencies: object(parsed.dependencies, `${subject}.dependencies`) as Readonly<Record<string, string>> }),
- ...(parsed.optionalDependencies === undefined
- ? {}
- : { optionalDependencies: object(parsed.optionalDependencies, `${subject}.optionalDependencies`) as Readonly<Record<string, string>> }),
- ...(parsed.peerDependencies === undefined
- ? {}
- : { peerDependencies: object(parsed.peerDependencies, `${subject}.peerDependencies`) as Readonly<Record<string, string>> }),
- ...(peerDependenciesMeta === undefined
- ? {}
- : { peerDependenciesMeta: Object.fromEntries(Object.entries(peerDependenciesMeta).map(([name, raw]) => {
- const value = object(raw, `${subject}.peerDependenciesMeta.${name}`);
- assert(value.optional === undefined || typeof value.optional === "boolean",
- `${subject}.peerDependenciesMeta.${name}.optional must be a boolean`);
- return [name, value.optional === undefined ? {} : { optional: value.optional }];
- })) }),
- ...(svml === undefined ? {} : { svml: {
- ...(svml.activation === undefined
- ? {}
- : { activation: string(svml.activation, `${subject}.svml.activation`) }),
- } }),
- };
-}
-
-async function readPackageJson(root: string): Promise<PackageJson> {
- return parsePackageJson(JSON.parse(await readFile(join(root, "package.json"), "utf8")), join(root, "package.json"));
-}
-
-async function packageRootFromEntry(entry: string, expectedName: string): Promise<ResolvedPhysicalPackage> {
- let cursor = dirname(await realpath(entry));
- while (true) {
- try {
- const json = await readPackageJson(cursor);
- if (json.name === expectedName) return { root: cursor, json };
- } catch {
- // Keep walking until the package that owns the resolved entry is found.
- }
- const parent = dirname(cursor);
- if (parent === cursor) throw new Error(`resolved entry for ${expectedName} is outside its package`);
- cursor = parent;
- }
-}
-
-async function resolvePhysicalPackage(specifier: string, from: string): Promise<ResolvedPhysicalPackage> {
- const resolver = createRequire(join(resolve(from), "__svml_package_loader__.cjs"));
- let entry: string;
- try {
- entry = resolver.resolve(specifier);
- } catch (entryError) {
- try {
- // Type-only and metadata-only packages may intentionally expose no runtime entry.
- entry = resolver.resolve(`${specifier}/package.json`);
- } catch {
- throw new Error(`cannot resolve installed package ${specifier} from ${from}: ${entryError instanceof Error ? entryError.message : String(entryError)}`);
- }
- }
- return await packageRootFromEntry(entry, specifier);
-}
-
-function dependencyNames(json: PackageJson): readonly string[] {
- return [...new Set([
- ...Object.keys(json.dependencies ?? {}),
- ...Object.keys(json.optionalDependencies ?? {}),
- ...Object.keys(json.peerDependencies ?? {}),
- ])].sort();
-}
-
-function optionalDependency(json: PackageJson, name: string): boolean {
- return Object.hasOwn(json.optionalDependencies ?? {}, name)
- || json.peerDependenciesMeta?.[name]?.optional === true;
-}
-
-async function packageClosure(entries: readonly string[], root: string): Promise<readonly ResolvedPhysicalPackage[]> {
- return await packageClosureFromPhysical(
- await Promise.all(entries.map(async (entry) => await resolvePhysicalPackage(entry, root))),
- );
-}
-
-async function packageClosureFromPhysical(
- entries: readonly ResolvedPhysicalPackage[],
-): Promise<readonly ResolvedPhysicalPackage[]> {
- return (await packageClosureFromRoots(entries.map((physical, index) => ({
- root: `anonymous:${index}`,
- physical,
- })))).map((item) => item.physical);
-}
-
-async function packageClosureFromRoots(
- entries: readonly { readonly root: string; readonly physical: ResolvedPhysicalPackage }[],
-): Promise<readonly ReachablePhysicalPackage[]> {
- const resolved = new Map<string, {
- readonly physical: ResolvedPhysicalPackage;
- readonly roots: Set<string>;
- }>();
- const visit = async (item: ResolvedPhysicalPackage, sourceRoot: string): Promise<void> => {
- const key = `${item.json.name}@${item.json.version}`;
- const existing = resolved.get(key);
- if (existing !== undefined) {
- assert(await realpath(existing.physical.root) === await realpath(item.root), `${key} resolves to two physical packages`);
- if (existing.roots.has(sourceRoot)) return;
- existing.roots.add(sourceRoot);
- } else {
- resolved.set(key, { physical: item, roots: new Set([sourceRoot]) });
- }
- for (const dependency of dependencyNames(item.json)) {
- try {
- await visit(await resolvePhysicalPackage(dependency, item.root), sourceRoot);
- } catch (error) {
- if (optionalDependency(item.json, dependency)) continue;
- throw error;
- }
- }
- };
- for (const entry of entries) await visit(entry.physical, entry.root);
- return [...resolved.values()].sort((left, right) =>
- artifactKey(left.physical.json).localeCompare(artifactKey(right.physical.json)),
- );
-}
-
-const ALWAYS_IGNORED_DIRECTORIES = new Set([".git", "node_modules"]);
-const DEVELOPMENT_ROOT_DIRECTORIES = new Set([".cache", "coverage", "test", "tests", "__tests__"]);
-const OPERATING_SYSTEM_METADATA_FILES = new Set([".DS_Store"]);
-
-function developmentRootFile(name: string): boolean {
- return /^(?:readme|changelog|license)(?:\..*)?$/iu.test(name)
- || /^(?:tsconfig|vitest)(?:\..*)?\.json$/u.test(name);
-}
-
-async function filesUnder(root: string, cursor = root): Promise<readonly string[]> {
- const values: string[] = [];
- for (const entry of await readdir(cursor, { withFileTypes: true })) {
- if (entry.isDirectory() && ALWAYS_IGNORED_DIRECTORIES.has(entry.name)) continue;
- if (cursor === root && entry.isDirectory() && DEVELOPMENT_ROOT_DIRECTORIES.has(entry.name)) continue;
- if (cursor === root && entry.isFile() && developmentRootFile(entry.name)) continue;
- // Finder metadata is not part of a package. Other dotfiles remain package bytes: a package may
- // deliberately read one, so excluding every hidden file would let behavior drift past its lock.
- if (entry.isFile() && OPERATING_SYSTEM_METADATA_FILES.has(entry.name)) continue;
- const path = join(cursor, entry.name);
- if (entry.isDirectory()) values.push(...await filesUnder(root, path));
- else if (entry.isFile()) values.push(path);
- else throw new Error(`package artifact contains unsupported entry ${relative(root, path)}`);
- }
- return values.sort((left, right) => relative(root, left).localeCompare(relative(root, right)));
-}
-
-async function artifactDigest(root: string): Promise<LockedPackageArtifact["digest"]> {
- const files = await filesUnder(root);
- const content = [];
- for (const file of files) {
- const bytes = await readFile(file);
- content.push({
- path: relative(root, file).split(sep).join("/"),
- bytes: bytes.byteLength,
- digest: `sha256:${createHash("sha256").update(bytes).digest("hex")}`,
- });
- }
- return digestOf({ format: "svml.package-artifact@1", files: content });
-}
-
-function activationPath(item: ResolvedPhysicalPackage): string {
- const path = item.json.svml?.activation;
- assert(path !== undefined, `${item.json.name} does not declare svml.activation`);
- assert(!isAbsolute(path), `${item.json.name} activation must be package-relative`);
- const target = resolve(item.root, path);
- const within = relative(item.root, target);
- assert(within !== "" && within !== ".." && !within.startsWith(`..${sep}`), `${item.json.name} activation escapes its package`);
- return target;
-}
-
-function contributionMetadata(value: NodePackageContribution): unknown {
- assert(value.format === "svml.node-package@1", "Node package contribution has an unsupported format");
- return {
- format: value.format,
- modules: (value.modules ?? []).map((item) => ({
- manifestDigest: digestOf(item.manifest),
- specifiers: [...(item.specifiers ?? [])].sort(),
- })).sort((left, right) => left.manifestDigest.localeCompare(right.manifestDigest)),
- hostFacets: [...(value.hostFacets ?? [])].map((item) => ({
- abi: item.abi,
- offers: [...(item.offers ?? [])].sort(),
- ...(item.identity === undefined ? {} : { identity: item.identity }),
- })).sort((left, right) => {
- const leftIdentity = "identity" in left ? digestOf(left.identity) : "";
- const rightIdentity = "identity" in right ? digestOf(right.identity) : "";
- return `${left.abi}:${left.offers.join("\u0000")}:${leftIdentity}`
- .localeCompare(`${right.abi}:${right.offers.join("\u0000")}:${rightIdentity}`);
- }),
- components: [...(value.components ?? [])].map((component) => ({
- producers: [...(component.producers ?? [])].map((item) => ({
- producer: item.producer,
- implementationDigest: item.implementationDigest,
- })).sort((left, right) =>
- `${left.producer.module.name}@${left.producer.module.version}#${left.producer.name}`
- .localeCompare(`${right.producer.module.name}@${right.producer.module.version}#${right.producer.name}`),
- ),
- validators: [...(component.validators ?? [])].map((item) => ({
- type: item.type,
- implementationDigest: item.implementationDigest,
- })).sort((left, right) =>
- `${left.type.module.name}@${left.type.module.version}#${left.type.name}`
- .localeCompare(`${right.type.module.name}@${right.type.module.version}#${right.type.name}`),
- ),
- })).sort((left, right) => digestOf(left).localeCompare(digestOf(right))),
- };
-}
-
-function addressKey(value: LogicalPackageAddress): string {
- return `${value.abi}\u0000${value.name}`;
-}
-
-function contributionOffers(value: NodePackageContribution): readonly LogicalPackageAddress[] {
- const offers = [
- ...(value.modules ?? []).flatMap((item) => [
- `${item.manifest.name}@${item.manifest.version}`,
- ...(item.specifiers ?? []),
- ].map((name) => ({ abi: modulePackageAbi, name }))),
- ...(value.hostFacets ?? []).flatMap((facet) => (facet.offers ?? [])
- .map((name) => ({ abi: facet.abi, name }))),
- ];
- return [...new Map(offers.map((item) => [addressKey(item), item])).values()]
- .sort((left, right) => addressKey(left).localeCompare(addressKey(right)));
-}
-
-async function importContribution(item: ResolvedPhysicalPackage): Promise<NodePackageContribution> {
- const target = activationPath(item);
- assert((await stat(target)).isFile(), `${item.json.name} activation is not a file`);
- const imported = await import(pathToFileURL(target).href) as {
- readonly default?: unknown;
- };
- const value = imported.default;
- assert(value !== null && typeof value === "object", `${item.json.name} activation has no default package export`);
- const contribution = value as NodePackageContribution;
- collectNodePackageComponents([contribution]);
- return contribution;
-}
-
-function lockContent(lock: Omit<NodePackageLock, "digest">): Omit<NodePackageLock, "digest"> {
- return {
- format: lock.format,
- selected: [...lock.selected].sort(),
- artifacts: [...lock.artifacts].sort((left, right) =>
- `${left.name}@${left.version}`.localeCompare(`${right.name}@${right.version}`),
- ),
- packages: [...lock.packages].sort((left, right) => left.package.name.localeCompare(right.package.name)),
- };
-}
-
-function sealLock(content: Omit<NodePackageLock, "digest">): NodePackageLock {
- const normalized = lockContent(content);
- return { ...normalized, digest: digestOf(normalized) };
-}
-
-function parseLock(value: unknown): NodePackageLock {
- const parsed = object(value, "$lock");
- assert(parsed.format === "svml.node-package-lock@1", "$lock.format must be svml.node-package-lock@1");
- assert(Array.isArray(parsed.selected), "$lock.selected must be an array");
- assert(Array.isArray(parsed.artifacts), "$lock.artifacts must be an array");
- assert(Array.isArray(parsed.packages), "$lock.packages must be an array");
- const selected = parsed.selected.map((raw, index) => string(raw, `$lock.selected[${index}]`));
- assert(new Set(selected).size === selected.length, "$lock.selected repeats a package");
- const artifacts = parsed.artifacts.map((raw, index) => {
- const item = object(raw, `$lock.artifacts[${index}]`);
- const digest = string(item.digest, `$lock.artifacts[${index}].digest`);
- assert(isDigest(digest), `$lock.artifacts[${index}].digest is invalid`);
- return {
- name: string(item.name, `$lock.artifacts[${index}].name`),
- version: string(item.version, `$lock.artifacts[${index}].version`),
- digest,
- };
- });
- const packages = parsed.packages.map((raw, index) => {
- const item = object(raw, `$lock.packages[${index}]`);
- const physical = object(item.package, `$lock.packages[${index}].package`);
- const facetsDigest = string(item.facetsDigest, `$lock.packages[${index}].facetsDigest`);
- assert(isDigest(facetsDigest), `$lock.packages[${index}].facetsDigest is invalid`);
- const closureDigest = string(item.closureDigest, `$lock.packages[${index}].closureDigest`);
- assert(isDigest(closureDigest), `$lock.packages[${index}].closureDigest is invalid`);
- assert(Array.isArray(item.offers), `$lock.packages[${index}].offers must be an array`);
- const offers = item.offers.map((raw, offerIndex) => {
- const offer = object(raw, `$lock.packages[${index}].offers[${offerIndex}]`);
- return {
- abi: string(offer.abi, `$lock.packages[${index}].offers[${offerIndex}].abi`),
- name: string(offer.name, `$lock.packages[${index}].offers[${offerIndex}].name`),
- };
- });
- assert(new Set(offers.map(addressKey)).size === offers.length,
- `$lock.packages[${index}].offers repeats a logical address`);
- return {
- package: {
- name: string(physical.name, `$lock.packages[${index}].package.name`),
- version: string(physical.version, `$lock.packages[${index}].package.version`),
- },
- offers: [...offers].sort((left, right) => addressKey(left).localeCompare(addressKey(right))),
- facetsDigest,
- closureDigest,
- };
- });
- const digest = string(parsed.digest, "$lock.digest");
- assert(isDigest(digest), "$lock.digest is invalid");
- const lock = sealLock({ format: "svml.node-package-lock@1", selected, artifacts, packages });
- assert(lock.digest === digest, "Node package lock digest is invalid");
- return lock;
-}
-
-/** Parse and authenticate a lock without resolving or executing its packages. */
-export async function readNodePackageLock(path: string): Promise<NodePackageLock> {
- return parseLock(JSON.parse(await readFile(path, "utf8")));
-}
-
-async function resolvedArtifacts(closure: readonly ResolvedPhysicalPackage[]): Promise<readonly LockedPackageArtifact[]> {
- return await Promise.all(closure.map(async (item) => ({
- name: item.json.name,
- version: item.json.version,
- digest: await artifactDigest(item.root),
- })));
-}
-
-function artifactKey(item: { readonly name: string; readonly version: string }): string {
- return `${item.name}@${item.version}`;
-}
-
-/**
- * Select one package closure from a set whose physical bytes were already hashed.
- *
- * A lock load used to call `resolvedArtifacts()` for the complete closure and then
- * call it again for every activated package's dependency closure. Shared packages
- * were therefore read and hashed many times in one command. The complete physical
- * closure has already rejected two locations for the same name/version, so its
- * artifact digest is safe to reuse here without weakening byte verification.
- */
-function artifactsForClosure(
- closure: readonly ResolvedPhysicalPackage[],
- verified: ReadonlyMap<string, LockedPackageArtifact>,
-): readonly LockedPackageArtifact[] {
- return closure.map((item) => {
- const artifact = verified.get(artifactKey(item.json));
- assert(artifact !== undefined, `verified Artifact for ${artifactKey(item.json)} is missing`);
- return artifact;
- });
-}
-
-function sameArtifacts(left: readonly LockedPackageArtifact[], right: readonly LockedPackageArtifact[]): boolean {
- return JSON.stringify([...left].sort((a, b) => `${a.name}@${a.version}`.localeCompare(`${b.name}@${b.version}`)))
- === JSON.stringify([...right].sort((a, b) => `${a.name}@${a.version}`.localeCompare(`${b.name}@${b.version}`)));
-}
-
-export type NodePackageArtifactDifference = {
- readonly added: readonly string[];
- readonly removed: readonly string[];
- readonly changed: readonly string[];
-};
-
-export class NodePackageLockStaleError extends Error {
- readonly code = "PACKAGE_LOCK_STALE";
- readonly lock: string;
- readonly packageRoot: string;
- readonly difference: NodePackageArtifactDifference;
-
- constructor(options: {
- readonly lock: string;
- readonly packageRoot: string;
- readonly difference: NodePackageArtifactDifference;
- }) {
- const lines = [
- `installed Node package bytes do not match the lock: ${options.lock}`,
- ...(options.difference.added.length === 0
- ? [] : [`Added: ${options.difference.added.join(", ")}`]),
- ...(options.difference.removed.length === 0
- ? [] : [`Removed: ${options.difference.removed.join(", ")}`]),
- ...(options.difference.changed.length === 0
- ? [] : [`Changed: ${options.difference.changed.join(", ")}`]),
- "Review and accept these installed bytes explicitly with:",
- ` narratage lock-packages ${options.lock} --refresh --package-root ${options.packageRoot}`,
- "For a project, prefer `narratage packages sync <run-source> --runtime <profile>` to derive both locks.",
- ];
- super(lines.join("\n"));
- this.name = "NodePackageLockStaleError";
- this.lock = options.lock;
- this.packageRoot = options.packageRoot;
- this.difference = options.difference;
- }
-}
-
-export class NodePackageSelectionMissingError extends Error {
- readonly code = "PACKAGE_SELECTION_MISSING";
- readonly subject: string;
- readonly address: LogicalPackageAddress;
-
- constructor(subject: string, address: LogicalPackageAddress) {
- super([
- `${subject} does not contain a package for the Source language selection:`,
- ` ${address.abi} ${address.name}`,
- "Synchronize the project package inventory after changing Source imports:",
- " narratage packages sync <run-source> --runtime <profile>",
- ].join("\n"));
- this.name = "NodePackageSelectionMissingError";
- this.subject = subject;
- this.address = address;
- }
-}
-
-function artifactDifference(
- installed: readonly LockedPackageArtifact[],
- locked: readonly LockedPackageArtifact[],
-): NodePackageArtifactDifference {
- const current = new Map(installed.map((item) => [artifactKey(item), item.digest]));
- const expected = new Map(locked.map((item) => [artifactKey(item), item.digest]));
- return {
- added: [...current.keys()].filter((key) => !expected.has(key)).sort(),
- removed: [...expected.keys()].filter((key) => !current.has(key)).sort(),
- changed: [...current.entries()]
- .filter(([key, digest]) => expected.has(key) && expected.get(key) !== digest)
- .map(([key]) => key)
- .sort(),
- };
-}
-
-/** The explicit trust action may inspect activation metadata inside the selected physical closure. */
-export async function createNodePackageLock(
- specifiers: readonly string[],
- root: string,
- options: NodePackageLockCreateOptions = {},
-): Promise<NodePackageLock> {
- return (await createNodePackageSet(specifiers, root, options)).lock;
-}
-
-/** Trust selected physical roots and return the exact executable inventory assembled from them. */
-export async function createNodePackageInventory(
- specifiers: readonly string[],
- root: string,
- options: NodePackageLockCreateOptions = {},
-): Promise<LoadedNodePackageSet> {
- return await createNodePackageSet(specifiers, root, options);
-}
-
-async function createNodePackageSet(
- specifiers: readonly string[],
- root: string,
- options: NodePackageLockCreateOptions = {},
- inventory?: { readonly path: string; readonly lock: NodePackageLock },
-): Promise<LoadedNodePackageSet> {
- const unique = [...new Set(specifiers)].sort();
- const selectedPhysical = await Promise.all(unique.map(async (specifier) => ({
- root: specifier,
- physical: await resolvePhysicalPackage(specifier, root),
- })));
- const reachable = await packageClosureFromRoots(selectedPhysical);
- const closure = reachable.map((item) => item.physical);
-
- // Hash this candidate physical closure once, before any activation code executes. A selection
- // mutation may admit new roots, but every package still reachable from a retained root must be
- // byte-identical to the old authenticated lock.
- const artifacts = await resolvedArtifacts(closure);
- const artifactsByPackage = new Map(artifacts.map((item) => [artifactKey(item), item]));
- if (inventory !== undefined) {
- const trusted = new Map(inventory.lock.artifacts.map((item) => [artifactKey(item), item.digest]));
- const untrusted = artifacts.filter((item) => trusted.get(artifactKey(item)) !== item.digest);
- if (untrusted.length > 0) {
- throw new NodePackageLockStaleError({
- lock: inventory.path,
- packageRoot: resolve(root),
- difference: {
- added: untrusted.filter((item) => !trusted.has(artifactKey(item))).map(artifactKey).sort(),
- removed: [],
- changed: untrusted.filter((item) => trusted.has(artifactKey(item))).map(artifactKey).sort(),
- },
- });
- }
- }
- if (options.retain !== undefined) {
- const oldSelected = new Set(options.retain.from.selected);
- const newSelected = new Set(unique);
- const retained = new Set(options.retain.selected);
- for (const specifier of retained) {
- assert(oldSelected.has(specifier), `${specifier} is not a selected root in the existing package lock`);
- assert(newSelected.has(specifier), `${specifier} is not retained by the new package selection`);
- }
- const locked = new Map(options.retain.from.artifacts.map((artifact) => [artifactKey(artifact), artifact.digest]));
- for (const item of reachable) {
- if (![...item.roots].some((specifier) => retained.has(specifier))) continue;
- const artifact = artifactsByPackage.get(artifactKey(item.physical.json))!;
- const expected = locked.get(artifactKey(item.physical.json));
- assert(expected !== undefined,
- `retained package closure introduced ${artifactKey(item.physical.json)}; use --refresh or an exact --package selection`);
- assert(expected === artifact.digest,
- `retained package bytes changed for ${artifactKey(item.physical.json)}; use --refresh or an exact --package selection`);
- }
- }
-
- const candidates = new Map<string, {
- readonly physical: ResolvedPhysicalPackage;
- readonly contribution: NodePackageContribution;
- }>();
- for (const physical of closure) {
- if (physical.json.svml?.activation === undefined) continue;
- candidates.set(`${physical.json.name}@${physical.json.version}`, {
- physical,
- contribution: await importContribution(physical),
- });
- }
-
- const selectedKeys = new Set(selectedPhysical.map((item) => artifactKey(item.physical.json)));
- const activated = new Map<string, {
- readonly physical: ResolvedPhysicalPackage;
- readonly contribution: NodePackageContribution;
- }>();
- for (const key of selectedKeys) {
- const candidate = candidates.get(key);
- assert(candidate !== undefined, `${key} does not declare svml.activation`);
- activated.set(key, candidate);
- }
-
- const moduleKey = (name: string, version: string): string => `${name}@${version}`;
- const required = new Map<string, string>();
- const visitContribution = (candidate: {
- readonly physical: ResolvedPhysicalPackage;
- readonly contribution: NodePackageContribution;
- }): void => {
- for (const module of candidate.contribution.modules ?? []) {
- for (const dependency of module.manifest.dependencies) {
- const key = moduleKey(dependency.module.name, dependency.module.version);
- const existing = required.get(key);
- assert(existing === undefined || existing === dependency.digest,
- `Module dependency ${key} is required with two different digests`);
- required.set(key, dependency.digest);
- }
- }
- };
- for (const candidate of activated.values()) visitContribution(candidate);
-
- const satisfied = (): Map<string, string> => {
- const modules = new Map<string, string>();
- for (const candidate of activated.values()) {
- for (const module of candidate.contribution.modules ?? []) {
- const key = moduleKey(module.manifest.name, module.manifest.version);
- const digest = digestOf(module.manifest);
- const existing = modules.get(key);
- assert(existing === undefined || existing === digest,
- `activated packages repeat Module ${key} with different digests`);
- modules.set(key, digest);
- }
- }
- return modules;
- };
-
- while (true) {
- const modules = satisfied();
- const unresolved = [...required.entries()].find(([key, digest]) => modules.get(key) !== digest);
- if (unresolved === undefined) break;
- const [key, digest] = unresolved;
- const providers = [...candidates.values()].filter((candidate) =>
- (candidate.contribution.modules ?? []).some((module) =>
- moduleKey(module.manifest.name, module.manifest.version) === key
- && digestOf(module.manifest) === digest),
- );
- assert(providers.length > 0,
- `no installed package in the selected physical closure provides required Module ${key} (${digest})`);
- assert(providers.length === 1,
- `multiple installed packages in the selected physical closure provide required Module ${key} (${digest})`);
- const provider = providers[0]!;
- const providerKey = `${provider.physical.json.name}@${provider.physical.json.version}`;
- assert(!activated.has(providerKey), `Module dependency ${key} cannot be resolved`);
- activated.set(providerKey, provider);
- visitContribution(provider);
- }
- collectNodePackageComponents([...activated.values()].map((item) => item.contribution));
-
- const packages: LockedNodePackage[] = [];
- for (const { physical, contribution } of activated.values()) {
- const ownArtifacts = artifactsForClosure(
- await packageClosureFromPhysical([physical]),
- artifactsByPackage,
- );
- packages.push({
- package: { name: physical.json.name, version: physical.json.version },
- offers: contributionOffers(contribution),
- facetsDigest: digestOf(contributionMetadata(contribution)),
- closureDigest: digestOf({ format: "svml.package-closure@1", artifacts: ownArtifacts }),
- });
- }
- const lock = sealLock({
- format: "svml.node-package-lock@1",
- selected: unique,
- artifacts,
- packages,
- });
- if (inventory !== undefined) {
- const trusted = new Map(inventory.lock.packages.map((item) => [item.package.name, item]));
- for (const item of lock.packages) {
- const expected = trusted.get(item.package.name);
- assert(expected !== undefined, `${item.package.name} is absent from package inventory ${inventory.path}`);
- assert(JSON.stringify(expected) === JSON.stringify(item),
- `${item.package.name} activation differs from package inventory ${inventory.path}`);
- }
- }
- return {
- lock,
- inventoryDigest: inventory?.lock.digest ?? lock.digest,
- packages: [...activated.values()].map((item) => ({
- specifier: item.physical.json.name,
- contribution: item.contribution,
- })),
- };
-}
-
-export async function writeNodePackageLock(path: string, lock: NodePackageLock): Promise<void> {
- const target = resolve(path);
- const temporary = join(dirname(target), `.${basename(target)}.${process.pid}.${randomUUID()}.tmp`);
- let handle: Awaited<ReturnType<typeof open>> | undefined;
- try {
- handle = await open(temporary, "wx");
- await handle.writeFile(`${JSON.stringify(lock, null, 2)}\n`, { encoding: "utf8" });
- await handle.sync();
- await handle.close();
- handle = undefined;
- await rename(temporary, target);
- } catch (error) {
- await handle?.close().catch(() => undefined);
- await rm(temporary, { force: true }).catch(() => undefined);
- throw error;
- }
-}
-
-/** Verify every selected physical artifact before executing any package activation code. */
-export async function loadNodePackageSet(
- path: string,
- root = dirname(resolve(path)),
-): Promise<LoadedNodePackageSet> {
- const lockPath = resolve(path);
- const packageRoot = resolve(root);
- const lock = await readNodePackageLock(lockPath);
- const closure = await packageClosure(lock.selected, packageRoot);
- const artifacts = await resolvedArtifacts(closure);
- if (!sameArtifacts(artifacts, lock.artifacts)) {
- throw new NodePackageLockStaleError({
- lock: lockPath,
- packageRoot,
- difference: artifactDifference(artifacts, lock.artifacts),
- });
- }
- const artifactsByPackage = new Map(artifacts.map((item) => [artifactKey(item), item]));
- const byName = new Map(closure.map((item) => [`${item.json.name}@${item.json.version}`, item]));
- const values: NodePackageBinding[] = [];
- for (const expected of lock.packages) {
- const physical = byName.get(`${expected.package.name}@${expected.package.version}`);
- assert(physical !== undefined, `${expected.package.name}@${expected.package.version} is not installed`);
- const contribution = await importContribution(physical);
- assert(digestOf(contributionMetadata(contribution)) === expected.facetsDigest,
- `${expected.package.name} facets do not match the lock`);
- const ownArtifacts = artifactsForClosure(
- await packageClosureFromPhysical([physical]),
- artifactsByPackage,
- );
- assert(digestOf({ format: "svml.package-closure@1", artifacts: ownArtifacts }) === expected.closureDigest,
- `${expected.package.name} dependency closure does not match the lock`);
- values.push({ specifier: expected.package.name, contribution });
- }
- collectNodePackageComponents(values.map((item) => item.contribution));
- return { lock, inventoryDigest: lock.digest, packages: values };
-}
-
-function selectedNodePackageSpecifiers(
- inventory: NodePackageLock,
- request: readonly string[] | NodePackageSelectionRequest,
- subject: string,
-): readonly string[] {
- const requested: NodePackageSelectionRequest = Array.isArray(request)
- ? { selected: request }
- : request as NodePackageSelectionRequest;
- const logical = new Map((requested.logical ?? []).map((item) => [addressKey(item), item]));
- // Physical spellings are enrollment hints only. Once a Source has logical addresses, the
- // authenticated inventory binding is the sole authority for exact compilation selection.
- const selected = new Set(logical.size === 0 ? requested.selected : []);
- for (const address of logical.values()) {
- const providers = inventory.packages.filter((item) =>
- item.offers.some((offer) => addressKey(offer) === addressKey(address)));
- if (providers.length === 0) throw new NodePackageSelectionMissingError(subject, address);
- assert(providers.length === 1, [
- `${subject} ambiguously provides this Source language selection:`,
- ` ${address.abi} ${address.name}`,
- ...providers.map((item) => ` ${item.package.name}`),
- ].join("\n"));
- selected.add(providers[0]!.package.name);
- }
- const available = new Set(inventory.selected);
- const missing = [...selected].filter((item) => !available.has(item)).sort();
- assert(missing.length === 0, [
- `${subject} does not authorize this physical selection:`,
- ...missing.map((item) => ` ${item}`),
- ].join("\n"));
- return [...selected].sort();
-}
-
-/** Resolve one logical Source selection against authenticated inventory metadata without execution. */
-export function selectNodePackageSpecifiers(
- inventory: NodePackageLock,
- request: readonly string[] | NodePackageSelectionRequest,
-): readonly string[] {
- return selectedNodePackageSpecifiers(inventory, request, `package inventory ${inventory.digest}`);
-}
-
-/**
- * Activate only the exact roots required by one compilation from a trusted package inventory.
- * Unrelated inventory entries are neither verified nor executed by this invocation.
- */
-export async function loadNodePackageSelection(
- path: string,
- request: readonly string[] | NodePackageSelectionRequest,
- root = dirname(resolve(path)),
-): Promise<LoadedNodePackageSet> {
- const lockPath = resolve(path);
- const inventory = await readNodePackageLock(lockPath);
- const selected = selectedNodePackageSpecifiers(inventory, request, `package inventory ${lockPath}`);
- return await createNodePackageSet(selected, resolve(root), {}, { path: lockPath, lock: inventory });
-}
diff --git a/packages/package-loader-node/src/types.ts b/packages/package-loader-node/src/types.ts
index 78275ce9..2d21cb11 100644
--- a/packages/package-loader-node/src/types.ts
+++ b/packages/package-loader-node/src/types.ts
@@ -1,6 +1,6 @@
import type { ComponentPackage } from "@narratage/component-kit";
import type { HostFacet } from "@narratage/host";
-import type { Digest, ModuleManifest } from "@narratage/protocol";
+import type { ModuleManifest } from "@narratage/protocol";
/** Semantic Module declaration carried by one physical Node package. */
export type NodeModuleContribution = {
@@ -9,19 +9,18 @@ export type NodeModuleContribution = {
readonly specifiers?: readonly string[];
};
-/** Opaque logical address resolved by package inventory without interpreting the owning ABI. */
+/** Opaque logical address resolved to an explicitly selected installed package. */
export type LogicalPackageAddress = {
readonly abi: string;
readonly name: string;
};
/**
- * Trusted executable facets exported by one installed physical package. The Host independently
- * grants each exact Host ABI separately. Runtime Adapter Host facets remain inert unless a Runtime
- * Profile explicitly selects the physical package through its own lock.
+ * Executable facets exported by one installed physical package. The Host independently grants
+ * each exact Host ABI. Runtime facets remain inert unless a Runtime Profile selects the package.
*/
export type NodePackageContribution = {
- readonly format: "svml.node-package@1";
+ readonly format: "narratage.node-package@1";
readonly modules?: readonly NodeModuleContribution[];
/** Syntax- or Host-specific executable facets, inert until their exact Host ABI selects them. */
readonly hostFacets?: readonly HostFacet[];
@@ -29,59 +28,14 @@ export type NodePackageContribution = {
};
/** Physical owner established by the Host; executable code never self-asserts this identity. */
-export type NodePackageBinding = {
+export type LoadedPackage = {
readonly specifier: string;
readonly contribution: NodePackageContribution;
};
-export type LockedPackageArtifact = {
- readonly name: string;
- readonly version: string;
- readonly digest: Digest;
-};
-
-export type LockedNodePackage = {
- readonly package: {
- readonly name: string;
- readonly version: string;
- };
- /** ABI-qualified logical requests this physical package can satisfy. */
- readonly offers: readonly LogicalPackageAddress[];
- /** Digest of declared Module, author and compute facet identities, excluding function objects. */
- readonly facetsDigest: Digest;
- /** Digest of this package's own transitive physical Artifact closure, excluding unrelated selections. */
- readonly closureDigest: Digest;
-};
-
-export type NodePackageLock = {
- readonly format: "svml.node-package-lock@1";
- readonly digest: Digest;
- /** Physical packages selected explicitly by the lock author. */
- readonly selected: readonly string[];
- readonly artifacts: readonly LockedPackageArtifact[];
- /** Selected contributions plus the exact Module providers required by their Manifests. */
- readonly packages: readonly LockedNodePackage[];
-};
-
-/** Guard used by a direct-selection edit: retained roots may not acquire different bytes. */
-export type NodePackageLockCreateOptions = {
- readonly retain?: {
- readonly from: NodePackageLock;
- readonly selected: readonly string[];
- };
-};
-
export type NodePackageSelectionRequest = {
- /** Physical enrollment hints; logical addresses become the sole exact-selection authority. */
+ /** Physical packages selected by Source discovery or a Runtime Profile. */
readonly selected: readonly string[];
- /** Logical requests that may be supplied by any trusted inventory package. */
+ /** Logical capabilities that the selected packages must provide. */
readonly logical?: readonly LogicalPackageAddress[];
};
-
-export type LoadedNodePackageSet = {
- /** Exact package closure activated for this compilation. */
- readonly lock: NodePackageLock;
- /** Trusted inventory from which the exact closure was selected. */
- readonly inventoryDigest: Digest;
- readonly packages: readonly NodePackageBinding[];
-};
diff --git a/packages/package-loader-node/test/loader.test.ts b/packages/package-loader-node/test/loader.test.ts
index 5d1fbb07..0a9b3ccf 100644
--- a/packages/package-loader-node/test/loader.test.ts
+++ b/packages/package-loader-node/test/loader.test.ts
@@ -1,522 +1,55 @@
import assert from "node:assert/strict";
-import {
- mkdir,
- mkdtemp,
- readFile,
- writeFile,
-} from "node:fs/promises";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import test from "node:test";
-import {
- collectNodePackageComponents,
- createNodePackageLock,
- loadNodePackageSelection,
- loadNodePackageSet,
- writeNodePackageLock,
-} from "@narratage/package-loader-node";
-import { modulePackageAbi } from "@narratage/protocol";
-import { runtimeEndpointAdapterHostAbi, RuntimeAdapterRegistry } from "@narratage/runtime-adapter";
-import { digestOf } from "@narratage/protocol";
-
-const implementationDigest = `sha256:${"1".repeat(64)}`;
-const producerDigest = `sha256:${"3".repeat(64)}`;
-
-async function fixture(): Promise<{
- readonly dataRoot: string;
- readonly activation: string;
- readonly dependency: string;
- readonly helperDigest: string;
- readonly source: string;
- readonly lock: string;
-}> {
- const root = await mkdtemp(join(tmpdir(), "svml-package-loader-"));
- const packageRoot = join(root, "node_modules", "example-card");
- // Keep the logical Module provider nested: normal loading must rediscover it from the selected
- // root's physical closure, not assume every activated dependency is resolvable from Workspace root.
- const dependencyRoot = join(packageRoot, "node_modules", "example-helper");
- const typesRoot = join(root, "node_modules", "example-types");
- const extraRoot = join(root, "node_modules", "example-extra");
- await mkdir(packageRoot, { recursive: true });
- await mkdir(dependencyRoot, { recursive: true });
- await mkdir(typesRoot, { recursive: true });
- await mkdir(extraRoot, { recursive: true });
- const activation = join(packageRoot, "activation.mjs");
- const dependency = join(dependencyRoot, "index.mjs");
- const helperManifest = {
- format: "svml.module@1" as const,
- name: "example.helper",
- version: "1",
- dependencies: [],
- types: [],
- capabilities: [],
- producers: [],
- };
- await writeFile(join(dependencyRoot, "package.json"), JSON.stringify({
- name: "example-helper",
- version: "1.0.0",
- type: "module",
- exports: "./index.mjs",
- svml: { activation: "./index.mjs" },
- }, null, 2), "utf8");
- await writeFile(dependency, `export default {
- format: "svml.node-package@1",
- modules: [{ manifest: ${JSON.stringify(helperManifest)} }],
- };\n`, "utf8");
- await writeFile(join(typesRoot, "package.json"), JSON.stringify({
- name: "example-types",
- version: "1.0.0",
- main: "",
- types: "index.d.ts",
- }, null, 2), "utf8");
- await writeFile(join(typesRoot, "index.d.ts"), "export type Marker = true;\n", "utf8");
- await writeFile(join(extraRoot, "package.json"), JSON.stringify({
- name: "example-extra",
- version: "1.0.0",
- type: "module",
- exports: "./activation.mjs",
- dependencies: { "example-types": "1.0.0" },
- svml: { activation: "./activation.mjs" },
- }, null, 2), "utf8");
- await writeFile(join(extraRoot, "activation.mjs"), `export default {
- format: "svml.node-package@1",
- };\n`, "utf8");
- await writeFile(join(packageRoot, "package.json"), JSON.stringify({
- name: "example-card",
- version: "1.0.0",
- type: "module",
- exports: "./activation.mjs",
- dependencies: { "example-helper": "1.0.0", "example-types": "1.0.0" },
- peerDependencies: { "example-optional-peer": "1.0.0" },
- peerDependenciesMeta: { "example-optional-peer": { optional: true } },
- svml: { activation: "./activation.mjs" },
- }, null, 2), "utf8");
- await writeFile(activation, `
- const module = { name: "example.card", version: "1" };
- const digest = ${JSON.stringify(implementationDigest)};
- const producerDigest = ${JSON.stringify(producerDigest)};
- const resultType = { module, name: "CardResult" };
- const producer = { module, name: "make-card" };
- export default {
- format: "svml.node-package@1",
- modules: [{
- manifest: {
- format: "svml.module@1",
- name: module.name,
- version: module.version,
- dependencies: [{
- module: { name: "example.helper", version: "1" },
- digest: ${JSON.stringify(digestOf(helperManifest))},
- }],
- types: [{
- name: resultType.name,
- schema: { kind: "string", minLength: 1 },
- validator: {
- implementation: {
- digest,
- },
- },
- }],
- capabilities: [],
- producers: [{
- name: producer.name,
- inputs: [],
- outputs: [{ name: "result", type: resultType }],
- needs: [],
- implementation: {
- digest: producerDigest,
- },
- }],
- },
- specifiers: ["example.card@1"],
- }],
- hostFacets: [{
- abi: "svml.markup-surface-host@1",
- identity: {
- module,
- surface: "card",
- tag: "Card",
- outputs: [resultType],
- mode: "structured",
- implementationDigest: digest,
- },
- implementation({ element }) {
- return {
- records: [{
- id: "card-result",
- type: resultType,
- value: { kind: "inline", value: "accepted" },
- range: element.range,
- }],
- components: [],
- fragments: [],
- };
- },
- }],
- components: [
- {
- name: "example-card/contracts",
- validators: [{
- type: resultType,
- implementationDigest: digest,
- handler({ value }) {
- if (value.kind !== "inline" || value.value !== "accepted") {
- throw new Error("CardResult is not accepted");
- }
- },
- }],
- },
- {
- name: "example-card/compute",
- producers: [{
- producer,
- implementationDigest: producerDigest,
- handler() {
- return { outputs: { result: { kind: "inline", value: "accepted" } }, needs: {} };
- },
- }],
- },
- ],
- };
- `, "utf8");
- const source = join(root, "main.svml");
- await writeFile(source, `<?svml using="@narratage/markup@1"?>
-<svml>
- <import as="example" from="example.card@1"/>
- <example:Card/>
- </svml>`, "utf8");
- return {
- dataRoot: root,
- activation,
- dependency,
- helperDigest: digestOf(helperManifest),
- source,
- lock: join(root, "svml.packages.lock"),
- };
-}
-
-test("an installed locked package carries inert Host facets and activatable compute", async () => {
- const item = await fixture();
- const lock = await createNodePackageLock(["example-card"], item.dataRoot);
- assert.deepEqual(lock.artifacts.map((artifact) => artifact.name), ["example-card", "example-helper", "example-types"]);
- assert.deepEqual(lock.selected, ["example-card"]);
- assert.deepEqual(lock.packages.map((value) => value.package.name), ["example-card", "example-helper"]);
- await writeNodePackageLock(item.lock, lock);
- const packages = (await loadNodePackageSet(item.lock, item.dataRoot)).packages.map((value) => value.contribution);
-
- assert.equal(packages[0]?.modules?.[0]?.manifest.name, "example.card");
- assert.equal(packages[1]?.modules?.[0]?.manifest.name, "example.helper");
- assert.equal(packages[0]?.hostFacets?.[0]?.abi, "svml.markup-surface-host@1");
-
- assert.deepEqual(collectNodePackageComponents(packages).flatMap((component) => component.producers ?? [])
- .map((facet) => ({ producer: facet.producer, digest: facet.implementationDigest })), [{
- producer: { module: { name: "example.card", version: "1" }, name: "make-card" },
- digest: producerDigest,
- }]);
-});
-
-test("an empty local trust selection is a valid authenticated package lock", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-empty-package-lock-"));
- const path = join(root, "svml.packages.lock");
- const lock = await createNodePackageLock([], root);
- assert.deepEqual(lock.selected, []);
- assert.deepEqual(lock.artifacts, []);
- assert.deepEqual(lock.packages, []);
- await writeNodePackageLock(path, lock);
- assert.deepEqual((await loadNodePackageSet(path, root)).packages, []);
-});
-
-test("dependency bytes are rejected before a locked contribution entry is reused", async () => {
- const item = await fixture();
- const lock = await createNodePackageLock(["example-card"], item.dataRoot);
- await writeNodePackageLock(item.lock, lock);
- await writeFile(item.dependency, `${await readFile(item.dependency, "utf8")}\n// changed bytes\n`, "utf8");
-
- await assert.rejects(
- async () => await loadNodePackageSet(item.lock, item.dataRoot),
- /installed Node package bytes do not match the lock/,
- );
-});
-
-test("a missing exact Module provider is rejected while the lock is created", async () => {
- const item = await fixture();
- await writeFile(
- item.activation,
- (await readFile(item.activation, "utf8")).replace(item.helperDigest, `sha256:${"9".repeat(64)}`),
- "utf8",
- );
-
- await assert.rejects(
- async () => await createNodePackageLock(["example-card"], item.dataRoot),
- /no installed package .* provides required Module example\.helper@1/u,
- );
-});
-
-test("two physical packages cannot ambiguously provide one required Module", async () => {
- const item = await fixture();
- const copyRoot = join(item.dataRoot, "node_modules", "example-helper-copy");
- await mkdir(copyRoot, { recursive: true });
- await writeFile(join(copyRoot, "package.json"), JSON.stringify({
- name: "example-helper-copy",
- version: "1.0.0",
- type: "module",
- exports: "./index.mjs",
- svml: { activation: "./index.mjs" },
- }, null, 2), "utf8");
- await writeFile(
- join(copyRoot, "index.mjs"),
- await readFile(item.dependency, "utf8"),
- "utf8",
- );
- const cardPackagePath = join(item.dataRoot, "node_modules", "example-card", "package.json");
- const cardPackage = JSON.parse(await readFile(cardPackagePath, "utf8")) as {
- dependencies: Record<string, string>;
- };
- cardPackage.dependencies["example-helper-copy"] = "1.0.0";
- await writeFile(cardPackagePath, JSON.stringify(cardPackage, null, 2), "utf8");
-
- await assert.rejects(
- async () => await createNodePackageLock(["example-card"], item.dataRoot),
- /multiple installed packages .* provide required Module example\.helper@1/u,
- );
-});
-
-test("an unrelated selected package does not contaminate another package's implementation closure", async () => {
- const item = await fixture();
- const alone = await createNodePackageLock(["example-card"], item.dataRoot);
- const together = await createNodePackageLock(["example-card", "example-extra"], item.dataRoot);
- const left = alone.packages.find((value) => value.package.name === "example-card")!;
- const right = together.packages.find((value) => value.package.name === "example-card")!;
- assert.equal(left.closureDigest, right.closureDigest);
- assert.notEqual(alone.digest, together.digest);
-});
-
-test("selection mutation keeps a shared dependency only through its retained root", async () => {
- const item = await fixture();
- const old = await createNodePackageLock(["example-card", "example-extra"], item.dataRoot);
- const next = await createNodePackageLock(["example-extra"], item.dataRoot, {
- retain: { from: old, selected: ["example-extra"] },
- });
- assert.deepEqual(next.selected, ["example-extra"]);
- assert.deepEqual(next.artifacts.map((artifact) => artifact.name), ["example-extra", "example-types"]);
- assert.deepEqual(next.packages.map((value) => value.package.name), ["example-extra"]);
-});
-
-test("a compute facet cannot claim another implementation than its static Manifest", async () => {
- const item = await fixture();
- const source = await readFile(item.activation, "utf8");
- await writeFile(
- item.activation,
- source.replace(
- "implementationDigest: producerDigest,\n handler()",
- `implementationDigest: ${JSON.stringify(`sha256:${"4".repeat(64)}`)},\n handler()`,
- ),
- "utf8",
- );
-
- await assert.rejects(
- async () => await createNodePackageLock(["example-card"], item.dataRoot),
- /Producer .* differs from its Manifest/u,
- );
-});
-
-async function runtimeAdapterFixture(marker: string): Promise<{
- readonly dataRoot: string;
- readonly lock: string;
-}> {
- const root = await mkdtemp(join(tmpdir(), "svml-external-runtime-adapter-"));
- const packageRoot = join(root, "node_modules", "example-runtime-adapter");
- await mkdir(packageRoot, { recursive: true });
- await writeFile(join(packageRoot, "package.json"), JSON.stringify({
- name: "example-runtime-adapter",
+import { loadNodePackageSelection } from "@narratage/package-loader-node";
+
+async function installedPackage(
+ root: string,
+ name: string,
+ contribution: string,
+): Promise<void> {
+ const directory = join(root, "node_modules", name);
+ await mkdir(directory, { recursive: true });
+ await writeFile(join(directory, "package.json"), JSON.stringify({
+ name,
version: "1.0.0",
type: "module",
exports: "./activation.mjs",
- svml: { activation: "./activation.mjs" },
- }, null, 2), "utf8");
- await writeFile(join(packageRoot, "activation.mjs"), `
- // Physical implementation marker: ${marker}
- const declared = "sha256:${"7".repeat(64)}";
- const configuration = "sha256:${"8".repeat(64)}";
- const module = { name: "example.runtime", version: "1" };
- const capability = { module, name: "Generate" };
- const returns = { module, name: "Result" };
- const runtimeFacet = {
- abi: "svml.runtime-endpoint-adapter-host@1",
- offers: ["example.logical-endpoint"],
- implementation: {
- activate(context) {
- const facet = { module, name: "endpoint" };
- return { endpoint: {
- name: context.instance,
- manifest: {
- format: "svml.runtime-module@1",
- name: module.name,
- version: module.version,
- facets: [{
- name: facet.name,
- role: "capability-endpoint",
- implementation: { digest: declared },
- fulfills: [{ capability, returns }],
- lifecycle: "immediate",
- defaultConcurrency: 1,
- credentialSlots: [],
- }],
- },
- instance: { id: context.instance, facet, configurationDigest: configuration },
- bindings: [{ capability, returns, endpoint: context.instance }],
- credentials: [],
- install(registry) {
- registry.registerImmediateEndpoint(
- context.instance,
- capability,
- returns,
- () => ({
- value: { kind: "inline", value: "external" },
- }),
- { runtimeImplementation: { facet, digest: declared, configurationDigest: configuration } },
- );
- },
- },
- };
- },
- },
- };
- export default {
- format: "svml.node-package@1",
- hostFacets: [runtimeFacet],
- };
- `, "utf8");
- return { dataRoot: root, lock: join(root, "runtime.packages.lock") };
-}
-
-async function loadedExternalEndpointDigest(marker: string): Promise<string> {
- const item = await runtimeAdapterFixture(marker);
- await writeNodePackageLock(
- item.lock,
- await createNodePackageLock(["example-runtime-adapter"], item.dataRoot),
- );
- const loaded = await loadNodePackageSelection(item.lock, {
- selected: [],
- logical: [{ abi: runtimeEndpointAdapterHostAbi, name: "example.logical-endpoint" }],
- }, item.dataRoot);
- const loadedPackage = loaded.packages[0]!;
- const contribution = loadedPackage.contribution;
- const locked = loaded.lock.packages[0]!;
- const registry = new RuntimeAdapterRegistry();
- registry.registerFacet(contribution.hostFacets![0]!, {
- closureDigest: locked.closureDigest,
- });
- const endpoint = await registry.createEndpoint("example.logical-endpoint", {
- dataRoot: item.dataRoot,
- instance: "external.fixture",
- config: {},
- });
- return endpoint.manifest.facets[0]!.implementation.digest;
+ narratage: { activation: "./activation.mjs" },
+ }), "utf8");
+ await writeFile(join(directory, "activation.mjs"), `export default ${contribution};\n`, "utf8");
}
-test("a third-party Runtime Adapter stays outside the Host and is identified by its actual package bytes", async () => {
- const first = await loadedExternalEndpointDigest("first-build");
- const second = await loadedExternalEndpointDigest("second-build");
- assert.notEqual(first, `sha256:${"7".repeat(64)}`);
- assert.notEqual(first, second);
-});
-
-test("a package digest ignores Finder metadata but still binds authored hidden files", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-package-dotfile-"));
- const packageRoot = join(root, "node_modules", "example-dotfile");
- await mkdir(packageRoot, { recursive: true });
- await writeFile(join(packageRoot, "package.json"), JSON.stringify({
- name: "example-dotfile",
- version: "1.0.0",
- type: "module",
- exports: "./index.mjs",
- svml: { activation: "./index.mjs" },
- }, null, 2), "utf8");
- await writeFile(join(packageRoot, "index.mjs"), `export default {
- format: "svml.node-package@1",
- };\n`, "utf8");
-
- const before = await createNodePackageLock(["example-dotfile"], root);
- // A Finder dropping is not part of the package. Hashing one made a lock written on macOS
- // report every other machine as stale, and the failure read as an unrelated stale-lock error.
- await writeFile(join(packageRoot, ".DS_Store"), "finder", "utf8");
- const after = await createNodePackageLock(["example-dotfile"], root);
-
- assert.equal(after.digest, before.digest);
- assert.deepEqual(
- after.artifacts.map((artifact) => artifact.digest),
- before.artifacts.map((artifact) => artifact.digest),
- );
-
- await writeFile(join(packageRoot, ".runtime-config"), "behavior", "utf8");
- const withAuthoredHiddenFile = await createNodePackageLock(["example-dotfile"], root);
- assert.notEqual(withAuthoredHiddenFile.digest, after.digest);
- assert.notDeepEqual(
- withAuthoredHiddenFile.artifacts.map((artifact) => artifact.digest),
- after.artifacts.map((artifact) => artifact.digest),
- );
-});
-
-test("one inventory activates only the exact package subset selected by a Source", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-package-inventory-"));
- for (const [name, specifier] of [["example-first", "example.first@1"], ["example-second", "example.second@1"]]) {
- const packageRoot = join(root, "node_modules", name!);
- await mkdir(packageRoot, { recursive: true });
- await writeFile(join(packageRoot, "package.json"), JSON.stringify({
- name,
- version: "1.0.0",
- type: "module",
- exports: "./index.mjs",
- svml: { activation: "./index.mjs" },
- }), "utf8");
- await writeFile(join(packageRoot, "index.mjs"), `export default {
- format: "svml.node-package@1",
- modules: [{ manifest: { format: "svml.module@1", name: ${JSON.stringify(specifier!.slice(0, -2))},
- version: "1", dependencies: [], types: [], capabilities: [], producers: [] },
- specifiers: [${JSON.stringify(specifier)}] }],
- };\n`, "utf8");
+test("loads an explicitly selected installed package", async () => {
+ const root = await mkdtemp(join(tmpdir(), "narratage-package-loader-"));
+ try {
+ await installedPackage(root, "example-cards", `{
+ format: "narratage.node-package@1",
+ hostFacets: [{ abi: "example.cards@1", offers: ["cards"] }]
+ }`);
+ const loaded = await loadNodePackageSelection(["example-cards"], root);
+ assert.deepEqual(loaded.map((item) => item.specifier), ["example-cards"]);
+ } finally {
+ await rm(root, { recursive: true, force: true });
}
- const path = join(root, "svml.packages.lock");
- await writeNodePackageLock(path, await createNodePackageLock(["example-first", "example-second"], root));
- const loaded = await loadNodePackageSelection(path, {
- selected: [],
- logical: [{ abi: modulePackageAbi, name: "example.first@1" }],
- }, root);
- assert.deepEqual(loaded.lock.selected, ["example-first"]);
- assert.deepEqual(loaded.packages.map((item) => item.specifier), ["example-first"]);
- assert.notEqual(loaded.lock.digest, loaded.inventoryDigest);
});
-test("inventory selection distinguishes the same logical name across opaque Host ABIs", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-package-abi-address-"));
- const logical = "example.shared@1";
- const facetAbi = "example.fragment-host@1";
- for (const [name, activation] of [
- ["example-module", `modules: [{ manifest: { format: "svml.module@1", name: "example.shared",
- version: "1", dependencies: [], types: [], capabilities: [], producers: [] },
- specifiers: [${JSON.stringify(logical)}] }]`],
- ["example-fragment", `hostFacets: [{ abi: ${JSON.stringify(facetAbi)},
- offers: [${JSON.stringify(logical)}], identity: { package: "example-fragment" }, implementation: {} }]`],
- ] as const) {
- const packageRoot = join(root, "node_modules", name);
- await mkdir(packageRoot, { recursive: true });
- await writeFile(join(packageRoot, "package.json"), JSON.stringify({
- name, version: "1.0.0", type: "module", exports: "./index.mjs", svml: { activation: "./index.mjs" },
- }), "utf8");
- await writeFile(join(packageRoot, "index.mjs"), `export default {
- format: "svml.node-package@1", ${activation}
- };\n`, "utf8");
+test("resolves a logical request to its conventional installed package", async () => {
+ const root = await mkdtemp(join(tmpdir(), "narratage-package-selection-"));
+ try {
+ await installedPackage(root, "example-provider", `{
+ format: "narratage.node-package@1",
+ hostFacets: [{ abi: "example.endpoint@1", offers: ["example-provider"] }]
+ }`);
+ const loaded = await loadNodePackageSelection({
+ selected: [],
+ logical: [{ abi: "example.endpoint@1", name: "example-provider" }],
+ }, root);
+ assert.deepEqual(loaded.map((item) => item.specifier), ["example-provider"]);
+ } finally {
+ await rm(root, { recursive: true, force: true });
}
- const path = join(root, "svml.packages.lock");
- await writeNodePackageLock(path, await createNodePackageLock(["example-module", "example-fragment"], root));
- const module = await loadNodePackageSelection(path, {
- selected: [], logical: [{ abi: modulePackageAbi, name: logical }],
- }, root);
- const fragment = await loadNodePackageSelection(path, {
- selected: [], logical: [{ abi: facetAbi, name: logical }],
- }, root);
- assert.deepEqual(module.lock.selected, ["example-module"]);
- assert.deepEqual(fragment.lock.selected, ["example-fragment"]);
});
diff --git a/packages/program-space/package.json b/packages/program-space/package.json
index 6f611f97..50fb911f 100644
--- a/packages/program-space/package.json
+++ b/packages/program-space/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/program-space/src/activation.ts b/packages/program-space/src/activation.ts
index 9ebe8eb7..8ba6444a 100644
--- a/packages/program-space/src/activation.ts
+++ b/packages/program-space/src/activation.ts
@@ -1,3 +1,3 @@
import { programSpaceManifest } from "./index.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: programSpaceManifest }] };
-export default svmlPackage;
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: programSpaceManifest }] };
+export default narratagePackage;
diff --git a/packages/program-space/src/index.ts b/packages/program-space/src/index.ts
index 904cc5a5..9186a588 100644
--- a/packages/program-space/src/index.ts
+++ b/packages/program-space/src/index.ts
@@ -22,15 +22,13 @@ export const programSpaceSchema: ValueSchema = {
},
};
export const programSpaceManifest: ModuleManifest = {
- format: "svml.module@1", name: programSpaceModuleRef.name, version: programSpaceModuleRef.version,
+ format: "narratage.module@1", name: programSpaceModuleRef.name, version: programSpaceModuleRef.version,
dependencies: [], types: [{
name: programSpaceTypes.programSpace.name,
- schema: programSpaceSchema,
}],
capabilities: [], producers: [],
};
-export const programSpaceManifestDigest = digestOf(programSpaceManifest);
-export const programSpaceDependency = { module: programSpaceModuleRef, digest: programSpaceManifestDigest } as const;
+export const programSpaceDependency = { module: programSpaceModuleRef } as const;
export function sealProgramSpace(value: ProgramSpace): ProgramSpace { return structuredClone(value); }
diff --git a/packages/protocol/README.md b/packages/protocol/README.md
index 08e8afba..b18626e3 100644
--- a/packages/protocol/README.md
+++ b/packages/protocol/README.md
@@ -7,13 +7,10 @@ JSON representation of a Module Manifest without reading files or executing pack
contains no author-source parser, Surface, runtime or video vocabulary. Source syntax belongs to the
Frontend Host that executes it, not to the semantic Module protocol.
-A Type declaration may lock an optional validator implementation digest. This is still data-only:
-Protocol describes the validator and its content-bound receipt but never loads or runs code.
-Structural Schema, semantic refinement execution and receipt verification remain separate
-responsibilities. Producer and validator implementations are already named by their owning
-`ProducerRef` or `TypeRef`; Manifests do not carry a second locator or implementation-kind label.
+Types and Producers are named by their owning `TypeRef` and `ProducerRef`. Manifests declare that
+shared vocabulary; executable validators and handlers stay in the package that owns it. Protocol
+does not assign hashes or second identities to JavaScript functions.
-A Need fulfillment may carry one Host-attested binding to the selected Endpoint implementation and
-its non-secret configuration. The Endpoint does not supply this value, and the Receipt carries no
-Runtime snapshot, domain lineage or renderer-specific metadata. Graph edges and Derivations retain
-those facts at their actual source.
+A Need Receipt records the exact request, selected Endpoint name and returned Record. It carries no
+Runtime snapshot, package inventory, domain lineage or renderer-specific metadata. Graph edges and
+Derivations retain facts at their actual source.
diff --git a/packages/protocol/src/build.ts b/packages/protocol/src/build.ts
index 7737c64e..b40a284e 100644
--- a/packages/protocol/src/build.ts
+++ b/packages/protocol/src/build.ts
@@ -61,24 +61,12 @@ export type Need = {
readonly requestDigest: Digest;
};
-/**
- * Host-attested identity of the configured Runtime implementation that fulfilled a Need.
- *
- * The Endpoint never supplies this value itself. A trusted Driver derives it from the locked
- * Endpoint registration. Whole-Runtime identity stays in the execution layer rather than
- * contaminating one independent Need Receipt with unrelated services and Providers.
- */
-export type FulfillerImplementation = {
- readonly digest: Digest;
- readonly configurationDigest: Digest;
-};
-
+/** Exact request, selected Endpoint and returned value for one fulfilled Need. */
export type Receipt = {
readonly id: ReceiptId;
readonly need: NeedId;
readonly requestDigest: Digest;
readonly fulfiller: string;
- readonly implementation?: FulfillerImplementation;
readonly output: RecordId;
readonly outputDigest: Digest;
readonly event: {
@@ -101,7 +89,6 @@ export type Derivation = {
readonly id: DerivationId;
readonly step: StepId;
readonly producer: ProducerRef;
- readonly implementationDigest: Digest;
readonly inputs: readonly RecordDigestBinding[];
readonly outputs: readonly RecordDigestBinding[];
readonly needs: readonly NeedDigestBinding[];
@@ -176,7 +163,7 @@ export type Candidate = {
};
export type CompiledGraph = {
- readonly format: "svml.graph@1";
+ readonly format: "narratage.graph@1";
readonly id: Digest;
readonly program: Digest;
readonly outputs: readonly LogicalOutput[];
@@ -194,10 +181,8 @@ export type Satisfaction = {
};
export type BuildRequest = {
- readonly format: "svml.build-request@1";
+ readonly format: "narratage.build-request@1";
readonly graph: Digest;
- /** Exact trusted implementation-package closure selected outside author source. */
- readonly implementationClosure?: Digest;
readonly targets: readonly BuildTarget[];
readonly digest: Digest;
};
@@ -222,7 +207,7 @@ export type BuildGoal = {
};
export type BuildPlan = {
- readonly format: "svml.plan@1";
+ readonly format: "narratage.plan@1";
readonly id: Digest;
readonly graph: Digest;
readonly request: Digest;
@@ -274,7 +259,6 @@ export type NeedFulfilledEvent = {
readonly value: StoredValue;
readonly requestDigest: Digest;
readonly fulfiller: string;
- readonly implementation?: FulfillerImplementation;
};
export type CommandFailedEvent = {
@@ -299,7 +283,7 @@ export type BuildDiagnostic = {
};
export type BuildState = {
- readonly format: "svml.build@1";
+ readonly format: "narratage.build@1";
readonly id: Digest;
readonly program: LinkedProgram;
readonly graph: CompiledGraph;
diff --git a/packages/protocol/src/manifest.ts b/packages/protocol/src/manifest.ts
index 9229529f..3b148793 100644
--- a/packages/protocol/src/manifest.ts
+++ b/packages/protocol/src/manifest.ts
@@ -1,7 +1,6 @@
import { canonicalize, isDigest } from "./canonical.js";
import type {
CapabilityDeclaration,
- ImplementationRef,
ModuleDependency,
ModuleManifest,
NeedPortDeclaration,
@@ -167,7 +166,6 @@ function dependency(value: unknown, path: string): ModuleDependency {
const parsed = object(value, path);
return {
module: moduleRef(parsed.module, `${path}.module`),
- digest: digest(parsed.digest, `${path}.digest`),
};
}
@@ -175,17 +173,6 @@ function typeDeclaration(value: unknown, path: string): TypeDeclaration {
const parsed = object(value, path);
return {
name: string(parsed.name, `${path}.name`),
- schema: valueSchema(parsed.schema, `${path}.schema`),
- ...(parsed.validator === undefined
- ? {}
- : { validator: typeValidator(parsed.validator, `${path}.validator`) }),
- };
-}
-
-function typeValidator(value: unknown, path: string): NonNullable<TypeDeclaration["validator"]> {
- const parsed = object(value, path);
- return {
- implementation: implementation(parsed.implementation, `${path}.implementation`),
};
}
@@ -214,13 +201,6 @@ function needPort(value: unknown, path: string): NeedPortDeclaration {
};
}
-function implementation(value: unknown, path: string): ImplementationRef {
- const parsed = object(value, path);
- return {
- digest: digest(parsed.digest, `${path}.digest`),
- };
-}
-
function producer(value: unknown, path: string): ProducerDeclaration {
const parsed = object(value, path);
return {
@@ -234,15 +214,14 @@ function producer(value: unknown, path: string): ProducerDeclaration {
needs: array(parsed.needs, `${path}.needs`).map((item, index) =>
needPort(item, `${path}.needs[${index}]`),
),
- implementation: implementation(parsed.implementation, `${path}.implementation`),
};
}
export function parseModuleManifest(value: unknown): ModuleManifest {
const parsed = object(canonicalize(value), "$manifest");
- if (parsed.format !== "svml.module@1") throw new Error("$manifest.format must be svml.module@1");
+ if (parsed.format !== "narratage.module@1") throw new Error("$manifest.format must be narratage.module@1");
return {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: string(parsed.name, "$manifest.name"),
version: string(parsed.version, "$manifest.version"),
dependencies: array(parsed.dependencies, "$manifest.dependencies").map((item, index) =>
diff --git a/packages/protocol/src/module.ts b/packages/protocol/src/module.ts
index f5871339..2c6bc8ea 100644
--- a/packages/protocol/src/module.ts
+++ b/packages/protocol/src/module.ts
@@ -1,23 +1,14 @@
import type { CapabilityRef, Digest, ModuleRef, ProducerRef, TypeRef } from "./identity.js";
-import type { ValueSchema } from "./value.js";
/** Logical package address for immutable semantic Modules. */
-export const modulePackageAbi = "svml.module@1";
+export const modulePackageAbi = "narratage.module@1";
export type ModuleDependency = {
readonly module: ModuleRef;
- readonly digest: Digest;
};
export type TypeDeclaration = {
readonly name: string;
- readonly schema: ValueSchema;
- /** Optional package-owned semantic refinement beyond the structural Schema. */
- readonly validator?: TypeValidatorDeclaration;
-};
-
-export type TypeValidatorDeclaration = {
- readonly implementation: ImplementationRef;
};
export type PortDeclaration = {
@@ -36,20 +27,15 @@ export type CapabilityDeclaration = {
readonly returns: TypeRef;
};
-export type ImplementationRef = {
- readonly digest: Digest;
-};
-
export type ProducerDeclaration = {
readonly name: string;
readonly inputs: readonly PortDeclaration[];
readonly outputs: readonly PortDeclaration[];
readonly needs: readonly NeedPortDeclaration[];
- readonly implementation: ImplementationRef;
};
export type ModuleManifest = {
- readonly format: "svml.module@1";
+ readonly format: "narratage.module@1";
readonly name: string;
readonly version: string;
readonly dependencies: readonly ModuleDependency[];
@@ -58,18 +44,24 @@ export type ModuleManifest = {
readonly producers: readonly ProducerDeclaration[];
};
+/** Domain-neutral interface resolved into Core; package-owned value schemas stay outside it. */
+export type ResolvedModuleManifest = Omit<ModuleManifest, "types"> & {
+ readonly types: readonly { readonly name: string }[];
+};
+
export type ResolvedModule = {
readonly digest: Digest;
- readonly manifest: ModuleManifest;
+ readonly manifest: ResolvedModuleManifest;
};
export type ResolvedModuleClosure = {
- readonly format: "svml.closure@1";
+ readonly format: "narratage.closure@1";
readonly modules: readonly ResolvedModule[];
readonly digest: Digest;
};
-export type ResolvedTypeDeclaration = TypeDeclaration & {
+export type ResolvedTypeDeclaration = {
+ readonly name: string;
readonly ref: TypeRef;
};
diff --git a/packages/protocol/test/canonical.test.ts b/packages/protocol/test/canonical.test.ts
index 87a527d6..d2549975 100644
--- a/packages/protocol/test/canonical.test.ts
+++ b/packages/protocol/test/canonical.test.ts
@@ -12,7 +12,7 @@ import {
/**
* Every identity in the system is a digest of a canonical value: Record
- * identity, Operation identity, configuration identity, package locks. So these
+ * identity, Operation identity and configuration identity. So these
* tests are about one property — two values that mean the same thing must
* digest the same, and two that mean different things must not.
*/
@@ -105,8 +105,8 @@ test("a Record's identity includes its Type, and a set of Records is order-free"
* Pins.
*
* These are not testing that sha256 works. They exist so that changing how a
- * value is canonicalized cannot be a quiet change: every archived Build, every
- * package lock and every recorded Runtime Profile is addressed by these bytes.
+ * value is canonicalized cannot be a quiet change: every archived Build and
+ * recorded Runtime Profile is addressed by these bytes.
* Editing a constant here is a deliberate act that a reviewer can see; a
* silently different digest is not.
*/
@@ -115,8 +115,8 @@ test("the canonical form of these values is fixed, and changing it is a visible
"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a");
assert.equal(digestOf([]),
"sha256:4f53cda18c2baa0c0354bb5f9a3ecbe5ed12ab4d8e11ba873c2f11161202b945");
- assert.equal(digestOf({ contract: "svml.example@1", count: 1, ok: true, none: null }),
- "sha256:2b702b25c218cdbc1f242c1125cee07f648f503af78b0dd48d5f9743f22934c9");
+ assert.equal(digestOf({ contract: "narratage.example@1", count: 1, ok: true, none: null }),
+ "sha256:4067a46c456f9d497e2f5ddf050d448c0965fa4596d403d72bde387fbce8d750");
// Non-ASCII must not depend on an escaping choice.
assert.equal(digestOf({ zh: "口播稿", nested: { a: [1, "1", false] } }),
"sha256:96519d6160460ea2b76578b1303fec47e9c3d53b012dce8738a3129126baea59");
diff --git a/packages/provider-google-vertex/package.json b/packages/provider-google-vertex/package.json
index ffd60eb2..cf54f3f9 100644
--- a/packages/provider-google-vertex/package.json
+++ b/packages/provider-google-vertex/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -17,8 +17,8 @@
"@narratage/endpoint-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*"
},
"devDependencies": {
"@narratage/driver-node": "workspace:*",
diff --git a/packages/provider-google-vertex/src/activation.ts b/packages/provider-google-vertex/src/activation.ts
index 8230b7cc..c246f07b 100644
--- a/packages/provider-google-vertex/src/activation.ts
+++ b/packages/provider-google-vertex/src/activation.ts
@@ -5,15 +5,15 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
-import { diagnoseRuntimeEnvironmentCredential } from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-kit";
+import { diagnoseRuntimeEnvironmentCredential } from "@narratage/runtime-host-node";
import { createGoogleVertexCaptionProvider } from "./provider.js";
const googleVertexRuntimeAdapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-google-vertex",
activate(context) {
- if (context.authority === undefined) throw new Error("Google Vertex Provider Authority is required");
+ if (context.pool === undefined) throw new Error("Google Vertex Provider Pool is required");
const config = runtimeConfigObject(context.config, "Google Vertex");
runtimeConfigExact(config, [
"project", "projectEnv", "location", "credentials", "defaultConcurrency",
@@ -34,7 +34,7 @@ const googleVertexRuntimeAdapter = createRuntimeEndpointAdapterFacet({
endpoint: createGoogleVertexCaptionProvider({
...(projectValue === undefined ? { projectEnv: projectEnv! } : { project: projectValue }),
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
...(location === undefined ? {} : { location }),
credentialsJson: credentials,
...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),
@@ -48,9 +48,9 @@ const googleVertexRuntimeAdapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [googleVertexRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-google-vertex/src/index.ts b/packages/provider-google-vertex/src/index.ts
index 5916a153..1667aff5 100644
--- a/packages/provider-google-vertex/src/index.ts
+++ b/packages/provider-google-vertex/src/index.ts
@@ -1,6 +1,5 @@
export {
createGoogleVertexCaptionProvider,
- googleVertexProviderImplementationDigest,
googleVertexProviderModuleRef,
} from "./provider.js";
export type {
diff --git a/packages/provider-google-vertex/src/provider.ts b/packages/provider-google-vertex/src/provider.ts
index 9d135afe..c2a124de 100644
--- a/packages/provider-google-vertex/src/provider.ts
+++ b/packages/provider-google-vertex/src/provider.ts
@@ -9,8 +9,8 @@ import {
import type { CaptionGeminiRequest } from "@narratage/caption-gemini";
import { defineEndpointPackage } from "@narratage/endpoint-kit";
import type { EndpointFulfillment, EndpointInvocationContext } from "@narratage/endpoint-kit";
-import { canonicalize, digestOf, isDigest } from "@narratage/protocol";
-import type { CanonicalValue, Digest } from "@narratage/protocol";
+import { canonicalize } from "@narratage/protocol";
+import type { CanonicalValue } from "@narratage/protocol";
import { credentialRef } from "@narratage/runtime";
import type { CredentialRef } from "@narratage/runtime";
@@ -18,10 +18,6 @@ export const googleVertexProviderModuleRef = {
name: "@narratage/provider-google-vertex",
version: "1",
} as const;
-export const googleVertexProviderImplementationDigest = digestOf(
- "@narratage/provider-google-vertex/caption-atom-word-coordinates@1:@google/[email protected]",
-);
-
type GenerateCaptionContentInput = {
readonly model: string;
readonly systemInstruction: string;
@@ -45,15 +41,14 @@ export type CreateGoogleVertexCaptionProviderOptions = {
readonly projectEnv?: string;
readonly location?: string;
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
/** JSON contents, not a filesystem path. A CredentialStore decides where these bytes live. */
readonly credentialsJson?: CredentialRef;
readonly defaultConcurrency?: number;
readonly requestTimeoutMs?: number;
readonly maxResponseBytes?: number;
- /** Test/private transport injection; its identity must be locked into Runtime configuration. */
+ /** Test/private transport injection. */
readonly generateContent?: GenerateCaptionContent;
- readonly generateContentImplementationDigest?: Digest;
};
const captionResponseSchema: Schema = {
@@ -197,33 +192,13 @@ export function createGoogleVertexCaptionProvider(options: CreateGoogleVertexCap
assert(location.length > 0, "Google Vertex location is empty");
const requestTimeoutMs = positiveInteger(options.requestTimeoutMs ?? 120_000, "requestTimeoutMs");
const maxResponseBytes = positiveInteger(options.maxResponseBytes ?? 2_000_000, "maxResponseBytes");
- if (options.generateContent !== undefined && options.generateContentImplementationDigest === undefined) {
- throw new Error("custom Google Vertex generateContent requires generateContentImplementationDigest");
- }
- if (options.generateContentImplementationDigest !== undefined && !isDigest(options.generateContentImplementationDigest)) {
- throw new Error("generateContentImplementationDigest is invalid");
- }
const generateContent = options.generateContent ?? sdkGenerateContent();
- const transportDigest = options.generateContentImplementationDigest
- ?? digestOf("@narratage/provider-google-vertex/@google-genai-1.52.0@1");
return defineEndpointPackage({
module: googleVertexProviderModuleRef,
facet: "caption-gemini",
instance: options.instance ?? "google-vertex.caption",
- authority: options.authority ?? options.instance ?? "google-vertex.caption",
- implementation: {
- digest: googleVertexProviderImplementationDigest,
- },
- configuration: canonicalize({
- project: projectValue === undefined
- ? { source: "environment", name: projectEnv! }
- : { source: "literal", value: projectValue },
- location,
- requestTimeoutMs,
- maxResponseBytes,
- transportDigest,
- }),
+ pool: options.pool ?? options.instance ?? "google-vertex.caption",
credentials: {
googleCredentials: options.credentialsJson ?? credentialRef("env", "GOOGLE_APPLICATION_CREDENTIALS_JSON"),
},
diff --git a/packages/provider-google-vertex/test/provider.test.ts b/packages/provider-google-vertex/test/provider.test.ts
index f717a84b..06808723 100644
--- a/packages/provider-google-vertex/test/provider.test.ts
+++ b/packages/provider-google-vertex/test/provider.test.ts
@@ -16,10 +16,7 @@ import { EndpointRegistry, MemoryArtifactStore } from "@narratage/driver-node";
import type { ImmediateEndpointHandler } from "@narratage/endpoint-kit";
import { digestOf } from "@narratage/protocol";
import type { CanonicalValue, Need } from "@narratage/protocol";
-import {
- createGoogleVertexCaptionProvider,
- googleVertexProviderImplementationDigest,
-} from "@narratage/provider-google-vertex";
+import { createGoogleVertexCaptionProvider } from "@narratage/provider-google-vertex";
import type { GenerateCaptionContent } from "@narratage/provider-google-vertex";
import { captionDisplaySequence, parseScript } from "@narratage/script";
@@ -74,9 +71,8 @@ test("Vertex transports the exact model request while the model package validate
const requestValue = request();
let captured: Parameters<GenerateCaptionContent>[0] | undefined;
const provider = createGoogleVertexCaptionProvider({
- project: "svml-test-project",
+ project: "narratage-test-project",
location: "global",
- generateContentImplementationDigest: digestOf("caption-gemini:test-transport"),
generateContent: async (input) => {
captured = input;
return {
@@ -105,19 +101,18 @@ test("Vertex transports the exact model request while the model package validate
});
test("Vertex configuration exposes credential/queue policy without changing the model request", () => {
- const provider = createGoogleVertexCaptionProvider({ project: "svml-test-project", defaultConcurrency: 3 });
+ const provider = createGoogleVertexCaptionProvider({ project: "narratage-test-project", defaultConcurrency: 3 });
assert.equal(provider.instance.id, "google-vertex.caption");
const facet = provider.manifest.facets[0];
assert.equal(facet?.role, "capability-endpoint");
assert(facet?.role === "capability-endpoint");
assert.equal(facet.defaultConcurrency, 3);
assert.deepEqual(facet.credentialSlots, ["googleCredentials"]);
- assert.deepEqual(provider.bindings, [{
+ assert.deepEqual(provider.offers, [{
capability: captionGeminiCapabilities.plan,
returns: captionTypes.plan,
endpoint: "google-vertex.caption",
}]);
- assert.equal(facet.implementation.digest, googleVertexProviderImplementationDigest);
});
test("Vertex defers projectEnv resolution until the Endpoint handles a Need", async () => {
@@ -127,7 +122,6 @@ test("Vertex defers projectEnv resolution until the Endpoint handles a Need", as
try {
const provider = createGoogleVertexCaptionProvider({
projectEnv: variable,
- generateContentImplementationDigest: digestOf("caption-gemini:unreached-transport"),
generateContent: async () => {
throw new Error("transport must not be reached");
},
diff --git a/packages/provider-hyperframes-aws-lambda/README.md b/packages/provider-hyperframes-aws-lambda/README.md
index 165ea30d..ede41aa2 100644
--- a/packages/provider-hyperframes-aws-lambda/README.md
+++ b/packages/provider-hyperframes-aws-lambda/README.md
@@ -19,15 +19,14 @@ configuration.
On success the Endpoint requires HyperFrames' plan and completed-frame counts to equal the source
document, then streams the returned S3 object into the selected content-addressed ArtifactStore.
-Configuration must include the reviewed deployed renderer's content digest; a mutable state-machine
-ARN is not implementation identity. The Driver binds the locked Endpoint, configuration, Runtime
-closure, request and returned value in the generic Need Receipt; the Provider does not repeat those
-facts as vendor metadata. Container and stream conformance stays in the explicit media
+The Runtime Profile selects the state machine and deployment settings. The generic Need Receipt
+records the selected Endpoint, request and returned value; the Provider does not repeat those facts
+as vendor metadata. Container and stream conformance stays in the explicit media
inspection/mux capabilities, so the orchestrating machine does not acquire a hidden FFmpeg
dependency.
The production client uses the AWS SDK default credential chain. No access key is accepted by the
-package configuration or written into Runtime identity.
+package configuration or written into Build state.
The opt-in live canary uses a fresh operation identity on every run and cleans its exact
render/site prefixes by default.
diff --git a/packages/provider-hyperframes-aws-lambda/package.json b/packages/provider-hyperframes-aws-lambda/package.json
index 13a324e1..debf93bd 100644
--- a/packages/provider-hyperframes-aws-lambda/package.json
+++ b/packages/provider-hyperframes-aws-lambda/package.json
@@ -10,7 +10,7 @@
"scripts": {
"canary": "node --import tsx test/live-canary.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -23,7 +23,7 @@
"@narratage/protocol": "workspace:*",
"@narratage/render-hyperframes": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
},
"devDependencies": {
"@narratage/composition": "workspace:*",
diff --git a/packages/provider-hyperframes-aws-lambda/src/activation.ts b/packages/provider-hyperframes-aws-lambda/src/activation.ts
index 857fbe90..a0cf57e8 100644
--- a/packages/provider-hyperframes-aws-lambda/src/activation.ts
+++ b/packages/provider-hyperframes-aws-lambda/src/activation.ts
@@ -1,12 +1,12 @@
-import type { CanonicalValue, Digest } from "@narratage/protocol";
+import type { CanonicalValue } from "@narratage/protocol";
import {
createRuntimeEndpointAdapterFacet,
runtimeConfigExact,
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-kit";
import { createAwsLambdaHyperframesProvider } from "./provider.js";
import type {
@@ -15,14 +15,14 @@ import type {
} from "./provider.js";
const CONFIG_KEYS = [
- "stateMachineArn", "bucketName", "rendererImplementationDigest", "region", "quality", "chunkSize", "maxParallelChunks",
+ "stateMachineArn", "bucketName", "region", "quality", "chunkSize", "maxParallelChunks",
"targetChunkFrames", "defaultMemorySizeMb", "defaultConcurrency", "pollIntervalMs",
"maxOperationMs", "maxRenderedBytes", "maxPollFailures", "maxAttempts",
] as const;
type RuntimeProviderOptions = Omit<
CreateAwsLambdaHyperframesProviderOptions,
- "client" | "clientImplementationDigest" | "now"
+ "client" | "now"
>;
function optionalInteger(
@@ -33,7 +33,7 @@ function optionalInteger(
}
function providerOptions(context: RuntimeAdapterFactoryContext): RuntimeProviderOptions {
- if (context.authority === undefined) throw new Error("AWS Lambda HyperFrames Provider Authority is required");
+ if (context.pool === undefined) throw new Error("AWS Lambda HyperFrames Provider Pool is required");
const config = runtimeConfigObject(context.config, "AWS Lambda HyperFrames");
runtimeConfigExact(config, CONFIG_KEYS, "AWS Lambda HyperFrames");
const stateMachineArn = runtimeConfigString(config.stateMachineArn, "HyperFrames stateMachineArn");
@@ -50,13 +50,6 @@ function providerOptions(context: RuntimeAdapterFactoryContext): RuntimeProvider
|| /^\d{1,3}(?:\.\d{1,3}){3}$/u.test(bucketName)) {
throw new Error("HyperFrames bucketName is invalid");
}
- const rendererImplementationDigest = runtimeConfigString(
- config.rendererImplementationDigest,
- "HyperFrames rendererImplementationDigest",
- );
- if (rendererImplementationDigest === undefined || !/^sha256:[0-9a-f]{64}$/u.test(rendererImplementationDigest)) {
- throw new Error("AWS Lambda HyperFrames rendererImplementationDigest is required and must be a digest");
- }
const region = runtimeConfigString(config.region, "HyperFrames region");
if (region !== undefined && region !== machine[2]) {
throw new Error(`HyperFrames region ${region} differs from state machine region ${machine[2]}`);
@@ -80,10 +73,9 @@ function providerOptions(context: RuntimeAdapterFactoryContext): RuntimeProvider
const maxAttempts = optionalInteger(config, "maxAttempts");
return {
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
stateMachineArn,
bucketName,
- rendererImplementationDigest: rendererImplementationDigest as Digest,
...(region === undefined ? {} : { region }),
...(quality === undefined ? {} : { quality: quality as HyperframesLambdaQuality }),
...(chunkSize === undefined ? {} : { chunkSize }),
@@ -106,9 +98,9 @@ const awsLambdaHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [awsLambdaHyperframesRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-hyperframes-aws-lambda/src/index.ts b/packages/provider-hyperframes-aws-lambda/src/index.ts
index 4702a6f1..9cf9a303 100644
--- a/packages/provider-hyperframes-aws-lambda/src/index.ts
+++ b/packages/provider-hyperframes-aws-lambda/src/index.ts
@@ -11,7 +11,6 @@ export type {
HyperframesLambdaSite,
} from "./client.js";
export {
- awsLambdaHyperframesProviderImplementationDigest,
awsLambdaHyperframesProviderModuleRef,
createAwsLambdaHyperframesProvider,
supportsAwsLambdaHyperframes,
diff --git a/packages/provider-hyperframes-aws-lambda/src/provider.ts b/packages/provider-hyperframes-aws-lambda/src/provider.ts
index 4f3b3b8d..9957024c 100644
--- a/packages/provider-hyperframes-aws-lambda/src/provider.ts
+++ b/packages/provider-hyperframes-aws-lambda/src/provider.ts
@@ -48,27 +48,20 @@ import type {
HyperframesLambdaSite,
} from "./client.js";
-const HYPERFRAMES_VERSION = "0.7.101";
-const CHECKPOINT_CONTRACT = "svml.hyperframes-aws-lambda-operation@1";
+const CHECKPOINT_CONTRACT = "narratage.hyperframes-aws-lambda-operation@1";
const SUPPORTED_FPS = new Set([24, 30, 60]);
export const awsLambdaHyperframesProviderModuleRef = {
name: "@narratage/provider-hyperframes-aws-lambda",
version: "1",
} as const;
-export const awsLambdaHyperframesProviderImplementationDigest = digestOf(
- `@narratage/provider-hyperframes-aws-lambda/render@1+hyperframes@${HYPERFRAMES_VERSION}`,
-);
-
export type HyperframesLambdaQuality = "draft" | "standard" | "high";
export type CreateAwsLambdaHyperframesProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
readonly stateMachineArn: string;
readonly bucketName: string;
- /** Content identity of the deployed remote renderer, not merely its mutable ARN. */
- readonly rendererImplementationDigest: Digest;
readonly region?: string;
readonly quality?: HyperframesLambdaQuality;
readonly chunkSize?: number;
@@ -81,8 +74,6 @@ export type CreateAwsLambdaHyperframesProviderOptions = {
readonly maxRenderedBytes?: number;
readonly maxPollFailures?: number;
readonly maxAttempts?: number;
- /** Required when injecting anything other than the locked official SDK client. */
- readonly clientImplementationDigest?: Digest;
readonly client?: HyperframesAwsLambdaClient;
readonly now?: () => number;
};
@@ -419,8 +410,6 @@ export function createAwsLambdaHyperframesProvider(config: CreateAwsLambdaHyperf
&& !config.bucketName.includes("-.")
&& !/^\d{1,3}(?:\.\d{1,3}){3}$/u.test(config.bucketName),
"HyperFrames bucketName is invalid");
- assert(isDigest(config.rendererImplementationDigest),
- "HyperFrames rendererImplementationDigest is invalid");
const quality = config.quality ?? "standard";
assert(["draft", "standard", "high"].includes(quality), "HyperFrames quality is invalid");
const chunkSize = config.chunkSize === undefined ? undefined : positiveInteger(config.chunkSize, "chunkSize");
@@ -436,14 +425,6 @@ export function createAwsLambdaHyperframesProvider(config: CreateAwsLambdaHyperf
"maxRenderedBytes");
const maxPollFailures = positiveInteger(config.maxPollFailures ?? 5, "maxPollFailures");
const maxAttempts = positiveInteger(config.maxAttempts ?? 1, "maxAttempts");
- if (config.client !== undefined && config.clientImplementationDigest === undefined) {
- throw new Error("custom HyperFrames AWS client requires clientImplementationDigest");
- }
- if (config.clientImplementationDigest !== undefined && !isDigest(config.clientImplementationDigest)) {
- throw new Error("HyperFrames AWS clientImplementationDigest is invalid");
- }
- const clientImplementationDigest = config.clientImplementationDigest
- ?? digestOf(`@narratage/provider-hyperframes-aws-lambda/official-sdk@${HYPERFRAMES_VERSION}`);
const client = config.client ?? createHyperframesAwsLambdaClient(region);
const now = config.now ?? Date.now;
@@ -489,7 +470,7 @@ export function createAwsLambdaHyperframesProvider(config: CreateAwsLambdaHyperf
});
let site = existingSite;
if (site === undefined) {
- const work = await mkdtemp(join(tmpdir(), "svml-hyperframes-aws-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-hyperframes-aws-"));
try {
await stageHyperframesProject({
document,
@@ -659,28 +640,7 @@ export function createAwsLambdaHyperframesProvider(config: CreateAwsLambdaHyperf
module: awsLambdaHyperframesProviderModuleRef,
facet: "render",
instance: config.instance ?? "hyperframes.aws-lambda",
- authority: config.authority ?? config.instance ?? "hyperframes.aws-lambda",
- implementation: {
- digest: awsLambdaHyperframesProviderImplementationDigest,
- },
- configuration: canonicalize({
- stateMachineArn: machine.arn,
- bucketName: config.bucketName,
- rendererImplementationDigest: config.rendererImplementationDigest,
- region,
- hyperframesVersion: HYPERFRAMES_VERSION,
- planProtocol: "v2",
- quality,
- ...(chunkSize === undefined ? {} : { chunkSize }),
- maxParallelChunks,
- ...(targetChunkFrames === undefined ? {} : { targetChunkFrames }),
- defaultMemorySizeMb,
- pollIntervalMs,
- maxOperationMs,
- maxRenderedBytes,
- maxPollFailures,
- clientImplementationDigest,
- }),
+ pool: config.pool ?? config.instance ?? "hyperframes.aws-lambda",
defaultConcurrency: config.defaultConcurrency ?? 2,
capabilities: [{
lifecycle: "recoverable" as const,
diff --git a/packages/provider-hyperframes-aws-lambda/test/live-canary.ts b/packages/provider-hyperframes-aws-lambda/test/live-canary.ts
index 26b90fef..4f018fff 100644
--- a/packages/provider-hyperframes-aws-lambda/test/live-canary.ts
+++ b/packages/provider-hyperframes-aws-lambda/test/live-canary.ts
@@ -41,7 +41,6 @@ import {
} from "@narratage/protocol";
import type {
CanonicalValue,
- Digest,
Need,
} from "@narratage/protocol";
import {
@@ -58,9 +57,6 @@ function requiredEnvironment(name: string): string {
const stateMachineArn = requiredEnvironment("NARRATAGE_HYPERFRAMES_STATE_MACHINE_ARN");
const bucketName = requiredEnvironment("NARRATAGE_HYPERFRAMES_BUCKET");
-const rendererImplementationDigest = requiredEnvironment("NARRATAGE_HYPERFRAMES_RENDERER_DIGEST") as Digest;
-assert(/^sha256:[0-9a-f]{64}$/u.test(rendererImplementationDigest),
- "invalid NARRATAGE_HYPERFRAMES_RENDERER_DIGEST");
const region = requiredEnvironment("AWS_REGION");
const run = promisify(execFile);
@@ -75,7 +71,7 @@ function documentFixture(canaryId: string): HyperframesDocument {
frameRate,
});
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: `hyperframes-aws-canary-${canaryId}`,
presents: [{
id: "card",
@@ -130,7 +126,6 @@ async function endpointFor(request: Need): Promise<RecoverableEndpoint> {
instance: "hyperframes.aws-lambda.canary",
stateMachineArn,
bucketName,
- rendererImplementationDigest,
region,
quality: "draft",
targetChunkFrames: 12,
@@ -174,9 +169,8 @@ async function main(): Promise<void> {
build: `build:hyperframes-aws-canary:${canaryId}`,
command: commandId,
endpoint: "hyperframes.aws-lambda.canary",
- authority: "hyperframes.aws-lambda.canary",
- route: "fixture.render",
- runtimeClosure: digestOf("hyperframes-aws-canary:runtime"),
+ pool: "hyperframes.aws-lambda.canary",
+ lane: "fixture.render",
attempt: 1,
});
const context = {
diff --git a/packages/provider-hyperframes-aws-lambda/test/provider.test.ts b/packages/provider-hyperframes-aws-lambda/test/provider.test.ts
index 74c9c9df..bb7207ce 100644
--- a/packages/provider-hyperframes-aws-lambda/test/provider.test.ts
+++ b/packages/provider-hyperframes-aws-lambda/test/provider.test.ts
@@ -22,7 +22,7 @@ import type {
} from "@narratage/provider-hyperframes-aws-lambda";
import { canonicalize, digestOf } from "@narratage/protocol";
import type { CanonicalValue, Need } from "@narratage/protocol";
-import type { RuntimeEndpointAdapterImplementation } from "@narratage/runtime-adapter";
+import type { RuntimeEndpointAdapterImplementation } from "@narratage/runtime-kit";
import {
hyperframesVisualRequest,
renderHyperframesCapabilities,
@@ -30,18 +30,16 @@ import {
import type { ArtifactStore, StreamingArtifactStore } from "@narratage/runtime";
import { sealOperationIdentity } from "@narratage/runtime";
-import { svmlPackage as awsLambdaActivation } from "../src/activation.js";
+import { narratagePackage as awsLambdaActivation } from "../src/activation.js";
const ACCOUNT = "123456789012";
const REGION = "us-east-1";
const BUCKET = "narratage-render-test";
const STATE_MACHINE = `arn:aws:states:${REGION}:${ACCOUNT}:stateMachine:narratage-hyperframes`;
const EXECUTION_PREFIX = `arn:aws:states:${REGION}:${ACCOUNT}:execution:narratage-hyperframes:`;
-const RENDERER_IMPLEMENTATION = digestOf("hyperframes-lambda:test-renderer-deployment");
-
function documentFixture(fps = 30, denominator = 1): HyperframesDocument {
return {
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
frameRate: { numerator: fps, denominator },
frameCount: 60,
canvas: { width: 720, height: 1280 },
@@ -73,9 +71,8 @@ function operation(request: Need) {
build: "build:hyperframes-lambda-test",
command: "command:hyperframes-lambda-test",
endpoint: "hyperframes.aws-lambda.test",
- authority: "hyperframes.aws-lambda.test",
- route: "fixture.render",
- runtimeClosure: digestOf("hyperframes-lambda:test-runtime"),
+ pool: "hyperframes.aws-lambda.test",
+ lane: "fixture.render",
attempt: 1,
});
}
@@ -208,9 +205,7 @@ async function endpointFor(
instance: "hyperframes.aws-lambda.test",
stateMachineArn: STATE_MACHINE,
bucketName: BUCKET,
- rendererImplementationDigest: RENDERER_IMPLEMENTATION,
client,
- clientImplementationDigest: digestOf("hyperframes-lambda:test-client"),
pollIntervalMs: 1,
maxOperationMs: 60_000,
maxPollFailures: 2,
@@ -260,7 +255,7 @@ test("the Lambda Endpoint declines frame domains and requirements it cannot pres
alphaMode: "straight",
timing: { kind: "still" },
}],
- html: `<!doctype html><img data-svml-surface-artifact="${artifact.digest}" src="svml-artifact://sha256/${artifact.digest.slice("sha256:".length)}"/>`,
+ html: `<!doctype html><img data-narratage-surface-artifact="${artifact.digest}" src="narratage-artifact://sha256/${artifact.digest.slice("sha256:".length)}"/>`,
};
assert.equal(supportsAwsLambdaHyperframes(hyperframesVisualRequest(withSurface)), false,
"a deployment without a Surface verifier must fail closed");
@@ -272,7 +267,7 @@ test("the Runtime adapter refuses a hardware-GPU deployment wish instead of igno
assert.throws(() => implementation.activate({
dataRoot: "/tmp",
instance: "hyperframes.lambda.test",
- authority: "hyperframes.lambda.test",
+ pool: "hyperframes.lambda.test",
config: canonicalize({
stateMachineArn: STATE_MACHINE,
bucketName: BUCKET,
@@ -287,7 +282,7 @@ test("one deterministic submission resumes and streams the exact output into the
const { endpoint, registration } = await endpointFor(request, client);
assert.equal(registration.retry?.maxAttempts, 1);
assert.equal(registration.scheduling?.resources.find((item) =>
- item.id.startsWith("authority:"))?.maxActive, 2);
+ item.id.startsWith("pool:"))?.maxActive, 2);
const memory = new MemoryArtifactStore();
let streamed = 0;
@@ -507,30 +502,19 @@ test("the deployment identity is validated before any AWS client is constructed"
assert.throws(() => createAwsLambdaHyperframesProvider({
stateMachineArn: `${STATE_MACHINE}:mutable-alias`,
bucketName: BUCKET,
- rendererImplementationDigest: RENDERER_IMPLEMENTATION,
}), /unqualified AWS Step Functions state-machine ARN/u);
assert.throws(() => createAwsLambdaHyperframesProvider({
stateMachineArn: STATE_MACHINE,
bucketName: BUCKET,
- rendererImplementationDigest: RENDERER_IMPLEMENTATION,
region: "eu-west-1",
}), /differs from state machine region/u);
- assert.throws(() => createAwsLambdaHyperframesProvider({
- stateMachineArn: STATE_MACHINE,
- bucketName: BUCKET,
- rendererImplementationDigest: RENDERER_IMPLEMENTATION,
- client: fakeClient().client,
- }), /requires clientImplementationDigest/u);
assert.throws(() => createAwsLambdaHyperframesProvider({
stateMachineArn: STATE_MACHINE,
bucketName: "192.168.0.1",
- rendererImplementationDigest: RENDERER_IMPLEMENTATION,
}), /bucketName is invalid/u);
assert.doesNotThrow(() => createAwsLambdaHyperframesProvider({
stateMachineArn: "arn:aws-us-gov:states:us-gov-west-1:123456789012:stateMachine:narratage-hyperframes",
bucketName: BUCKET,
- rendererImplementationDigest: RENDERER_IMPLEMENTATION,
client: fakeClient().client,
- clientImplementationDigest: digestOf("hyperframes-lambda:test-gov-client"),
}));
});
diff --git a/packages/provider-hyperframes-local/README.md b/packages/provider-hyperframes-local/README.md
index 75062542..f529a58a 100644
--- a/packages/provider-hyperframes-local/README.md
+++ b/packages/provider-hyperframes-local/README.md
@@ -5,12 +5,12 @@ content-addressed dependencies declared by a `HyperframesDocument`, renders a si
HyperFrames CLI, probes the bytes, and returns a verified `RenderedVisual`. Before staging a typed
Surface it decodes the exact bytes and checks declared dimensions, still/frame timing, SDR/sRGB and
opaque/straight-alpha facts. Artifact size and SHA-256 are checked for every dependency. These are
-admission gates, not hidden output metadata. The Driver binds the locked Endpoint implementation,
-configuration, request and returned value in the ordinary Need Receipt.
+admission gates, not hidden output metadata. The ordinary Need Receipt records the selected Endpoint,
+request and returned value.
There are deliberately two concurrency controls:
-- `defaultConcurrency` limits whole render requests admitted by Runtime Authority/Route resources.
+- `defaultConcurrency` limits whole render requests admitted by Runtime pool/lane resources.
- `workers` controls HyperFrames' parallel Chrome frame workers inside one admitted render.
The Provider owns both controls because they are deployment policy, not author intent. It never
diff --git a/packages/provider-hyperframes-local/package.json b/packages/provider-hyperframes-local/package.json
index cec25e13..9d007c1f 100644
--- a/packages/provider-hyperframes-local/package.json
+++ b/packages/provider-hyperframes-local/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -18,8 +18,8 @@
"@narratage/protocol": "workspace:*",
"@narratage/render-hyperframes": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"hyperframes": "0.7.101"
},
"devDependencies": {
diff --git a/packages/provider-hyperframes-local/src/activation.ts b/packages/provider-hyperframes-local/src/activation.ts
index 28f5a242..a81aad60 100644
--- a/packages/provider-hyperframes-local/src/activation.ts
+++ b/packages/provider-hyperframes-local/src/activation.ts
@@ -4,11 +4,11 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import {
diagnoseRuntimeExecutable,
resolveRuntimeExecutable,
-} from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-host-node";
import { createLocalHyperframesProvider } from "./provider.js";
import type { HyperframesBrowserGpu, HyperframesQuality, HyperframesWorkers } from "./provider.js";
@@ -17,7 +17,7 @@ import { localHyperframesBrowserProgram } from "./program.js";
const localHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-hyperframes-local",
activate(context) {
- if (context.authority === undefined) throw new Error("local HyperFrames Provider Authority is required");
+ if (context.pool === undefined) throw new Error("local HyperFrames Provider Pool is required");
const config = runtimeConfigObject(context.config, "local HyperFrames");
runtimeConfigExact(config, [
"nodePath", "hyperframesCliPath", "ffprobePath", "workers", "quality", "browserGpu",
@@ -52,7 +52,7 @@ const localHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createLocalHyperframesProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
...(nodePath === undefined ? {} : { nodePath }),
...(hyperframesCliPath === undefined ? {} : { hyperframesCliPath }),
...(ffprobePath === undefined ? {} : { ffprobePath }),
@@ -83,9 +83,9 @@ const localHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [localHyperframesRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-hyperframes-local/src/index.ts b/packages/provider-hyperframes-local/src/index.ts
index 799afcda..bce74fb1 100644
--- a/packages/provider-hyperframes-local/src/index.ts
+++ b/packages/provider-hyperframes-local/src/index.ts
@@ -1,8 +1,4 @@
-export {
- createLocalHyperframesProvider,
- localHyperframesProviderImplementationDigest,
- localHyperframesProviderModuleRef,
-} from "./provider.js";
+export { createLocalHyperframesProvider, localHyperframesProviderModuleRef } from "./provider.js";
export type {
CreateLocalHyperframesProviderOptions,
HyperframesBrowserGpu,
diff --git a/packages/provider-hyperframes-local/src/program.ts b/packages/provider-hyperframes-local/src/program.ts
index 8d19e3d7..392422d7 100644
--- a/packages/provider-hyperframes-local/src/program.ts
+++ b/packages/provider-hyperframes-local/src/program.ts
@@ -1,9 +1,9 @@
import { execFile } from "node:child_process";
import { probeMediaToolchain } from "@narratage/media-execution";
-import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext, ManagedProgram, ManagedProgramState } from "@narratage/runtime-adapter";
-import { resolveRuntimeExecutable } from "@narratage/runtime-adapter-node";
+import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext, ManagedProgram, ManagedProgramState } from "@narratage/runtime-kit";
+import { resolveRuntimeExecutable } from "@narratage/runtime-host-node";
import { defaultHyperframesCliPath } from "./provider.js";
@@ -19,7 +19,7 @@ function run(executable: string, args: readonly string[]): Promise<{ ok: boolean
/**
* HyperFrames owns the browser cache behind its CLI. It is deployment state,
- * not an author dependency, so the Runtime Component lifecycle prepares it only
+ * not an author dependency, so the Endpoint lifecycle prepares it only
* when this Provider is selected.
*/
export function localHyperframesBrowserProgram(
diff --git a/packages/provider-hyperframes-local/src/provider.ts b/packages/provider-hyperframes-local/src/provider.ts
index 26d3d21c..4a7cdd39 100644
--- a/packages/provider-hyperframes-local/src/provider.ts
+++ b/packages/provider-hyperframes-local/src/provider.ts
@@ -23,9 +23,6 @@ export const localHyperframesProviderModuleRef = {
name: "@narratage/provider-hyperframes-local",
version: "1",
} as const;
-export const localHyperframesProviderImplementationDigest = digestOf(
- `@narratage/provider-hyperframes-local/render@1+hyperframes@${HYPERFRAMES_VERSION}`,
-);
export type HyperframesWorkers = number | "auto";
export type HyperframesQuality = "draft" | "standard" | "high";
@@ -33,7 +30,7 @@ export type HyperframesBrowserGpu = "auto" | "software" | "hardware";
export type CreateLocalHyperframesProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
readonly nodePath?: string;
readonly hyperframesCliPath?: string;
readonly ffprobePath?: string;
@@ -254,11 +251,7 @@ export function createLocalHyperframesProvider(config: CreateLocalHyperframesPro
module: localHyperframesProviderModuleRef,
facet: "render",
instance: config.instance ?? "hyperframes.local",
- authority: config.authority ?? config.instance ?? "hyperframes.local",
- implementation: {
- digest: localHyperframesProviderImplementationDigest,
- },
- configuration,
+ pool: config.pool ?? config.instance ?? "hyperframes.local",
defaultConcurrency: config.defaultConcurrency ?? 1,
capabilities: [{
lifecycle: "immediate" as const,
@@ -266,7 +259,7 @@ export function createLocalHyperframesProvider(config: CreateLocalHyperframesPro
returns: mediaTypes.renderedVisual,
handler: async (context) => {
const document = visualRequest(context.need.constraints);
- const work = await mkdtemp(join(tmpdir(), "svml-hyperframes-local-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-hyperframes-local-"));
try {
await stageHyperframesProject({
document,
diff --git a/packages/provider-hyperframes-local/test/provider.test.ts b/packages/provider-hyperframes-local/test/provider.test.ts
index 41446980..6c701c10 100644
--- a/packages/provider-hyperframes-local/test/provider.test.ts
+++ b/packages/provider-hyperframes-local/test/provider.test.ts
@@ -16,7 +16,7 @@ import type { CanonicalValue, Need } from "@narratage/protocol";
import { createLocalHyperframesProvider } from "../src/index.js";
import { localHyperframesBrowserProgram } from "../src/program.js";
-const liveEnabled = process.env.SVML_BROWSER_TESTS === "1";
+const liveEnabled = process.env.NARRATAGE_BROWSER_TESTS === "1";
const hasFfprobe = spawnSync("ffprobe", ["-version"], { stdio: "ignore" }).status === 0;
function documentFixture(surface?: CompositableSurfaceRef) {
@@ -25,7 +25,7 @@ function documentFixture(surface?: CompositableSurfaceRef) {
frameRate: { numerator: 12, denominator: 1 },
});
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "provider-proof",
presents: [{
id: "card",
@@ -106,14 +106,14 @@ test("local HyperFrames Provider exposes one exact visual capability and two sep
assert.equal(facet?.role, "capability-endpoint");
assert(facet?.role === "capability-endpoint");
assert.equal(facet.defaultConcurrency, 2);
- assert.deepEqual(provider.bindings, [{
+ assert.deepEqual(provider.offers, [{
capability: renderHyperframesCapabilities.renderVisual,
returns: mediaTypes.renderedVisual,
endpoint: "hyperframes.local",
}]);
const resolved = await handlerFor(requestNeed());
assert.equal(resolved.registration.scheduling?.resources.find((item) =>
- item.id.startsWith("authority:"))?.maxActive, 1,
+ item.id.startsWith("pool:"))?.maxActive, 1,
"Runtime request admission must remain separate from HyperFrames frame workers");
});
diff --git a/packages/provider-image-opencv-local/README.md b/packages/provider-image-opencv-local/README.md
index a291f959..4d46aa7c 100644
--- a/packages/provider-image-opencv-local/README.md
+++ b/packages/provider-image-opencv-local/README.md
@@ -12,4 +12,4 @@ The repository ships the frozen deployment environment in `services/image-opencv
Adapter's declared configuration, `programs up` runs `uv sync --frozen`; the Endpoint and program probe
and doctor all resolve the resulting `.venv` interpreter. An explicit `pythonExecutable` selects an
operator-managed compatible environment and suppresses that managed prepare. Runtime admission and
-inner image work share the configured Endpoint Authority/Route resources; no separate queue is hidden in this package.
+inner image work share the configured Endpoint pool/lane resources; no separate queue is hidden in this package.
diff --git a/packages/provider-image-opencv-local/package.json b/packages/provider-image-opencv-local/package.json
index 4bf4e909..9135a3f9 100644
--- a/packages/provider-image-opencv-local/package.json
+++ b/packages/provider-image-opencv-local/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -15,8 +15,8 @@
"@narratage/endpoint-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/raster": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*"
},
"devDependencies": {
"@narratage/driver-node": "workspace:*",
diff --git a/packages/provider-image-opencv-local/src/activation.ts b/packages/provider-image-opencv-local/src/activation.ts
index 8fa3b8d6..c5affe7c 100644
--- a/packages/provider-image-opencv-local/src/activation.ts
+++ b/packages/provider-image-opencv-local/src/activation.ts
@@ -4,10 +4,10 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import {
diagnoseRuntimeExecutable,
-} from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-host-node";
import { resolveLocalOpenCvDeployment } from "./deployment.js";
import { createLocalOpenCvImageProvider } from "./provider.js";
@@ -16,7 +16,7 @@ import { localOpenCvProgram } from "./program.js";
const localOpenCvRuntimeAdapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-image-opencv-local",
activate(context) {
- if (context.authority === undefined) throw new Error("local OpenCV Provider Authority is required");
+ if (context.pool === undefined) throw new Error("local OpenCV Provider Pool is required");
const config = runtimeConfigObject(context.config, "local OpenCV image");
runtimeConfigExact(config, [
"pythonExecutable", "defaultConcurrency", "processTimeoutMs", "maxInputBytes", "maxOutputBytes",
@@ -30,7 +30,7 @@ const localOpenCvRuntimeAdapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createLocalOpenCvImageProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
pythonExecutable: deployment.pythonExecutable,
...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),
...(processTimeoutMs === undefined ? {} : { processTimeoutMs }),
@@ -48,9 +48,9 @@ const localOpenCvRuntimeAdapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [localOpenCvRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-image-opencv-local/src/deployment.ts b/packages/provider-image-opencv-local/src/deployment.ts
index 871f31d8..e0cd68e1 100644
--- a/packages/provider-image-opencv-local/src/deployment.ts
+++ b/packages/provider-image-opencv-local/src/deployment.ts
@@ -2,9 +2,9 @@ import { existsSync } from "node:fs";
import { join } from "node:path";
import { fileURLToPath } from "node:url";
-import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext, ManagedProgramCommand } from "@narratage/runtime-adapter";
-import { resolveRuntimeExecutable } from "@narratage/runtime-adapter-node";
+import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext, ManagedProgramCommand } from "@narratage/runtime-kit";
+import { resolveRuntimeExecutable } from "@narratage/runtime-host-node";
/**
* Repository deployment bundled beside this Provider during development. A
diff --git a/packages/provider-image-opencv-local/src/index.ts b/packages/provider-image-opencv-local/src/index.ts
index c110d994..7f470bf1 100644
--- a/packages/provider-image-opencv-local/src/index.ts
+++ b/packages/provider-image-opencv-local/src/index.ts
@@ -1,6 +1,2 @@
-export {
- createLocalOpenCvImageProvider,
- localOpenCvImageProviderImplementationDigest,
- localOpenCvImageProviderModuleRef,
-} from "./provider.js";
+export { createLocalOpenCvImageProvider, localOpenCvImageProviderModuleRef } from "./provider.js";
export type { CreateLocalOpenCvImageProviderOptions } from "./provider.js";
diff --git a/packages/provider-image-opencv-local/src/program.ts b/packages/provider-image-opencv-local/src/program.ts
index 770e4d57..694a2314 100644
--- a/packages/provider-image-opencv-local/src/program.ts
+++ b/packages/provider-image-opencv-local/src/program.ts
@@ -1,6 +1,6 @@
import { execFile } from "node:child_process";
-import type { RuntimeAdapterFactoryContext, ManagedProgram, ManagedProgramState } from "@narratage/runtime-adapter";
+import type { RuntimeAdapterFactoryContext, ManagedProgram, ManagedProgramState } from "@narratage/runtime-kit";
import { resolveLocalOpenCvDeployment } from "./deployment.js";
diff --git a/packages/provider-image-opencv-local/src/provider.ts b/packages/provider-image-opencv-local/src/provider.ts
index d39f86c4..9319e5e6 100644
--- a/packages/provider-image-opencv-local/src/provider.ts
+++ b/packages/provider-image-opencv-local/src/provider.ts
@@ -21,13 +21,10 @@ export const localOpenCvImageProviderModuleRef = {
name: "@narratage/provider-image-opencv-local",
version: "1",
} as const;
-export const localOpenCvImageProviderImplementationDigest = digestOf(
- "@narratage/provider-image-opencv-local/raster-opencv@1",
-);
export type CreateLocalOpenCvImageProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
readonly pythonExecutable?: string;
readonly processTimeoutMs?: number;
readonly maxInputBytes?: number;
@@ -100,11 +97,7 @@ export function createLocalOpenCvImageProvider(config: CreateLocalOpenCvImagePro
module: localOpenCvImageProviderModuleRef,
facet: "raster",
instance: config.instance ?? "image.opencv.local",
- authority: config.authority ?? config.instance ?? "image.opencv.local",
- implementation: {
- digest: localOpenCvImageProviderImplementationDigest,
- },
- configuration: canonicalize({ pythonExecutable, processTimeoutMs, maxInputBytes, maxOutputBytes }),
+ pool: config.pool ?? config.instance ?? "image.opencv.local",
defaultConcurrency: config.defaultConcurrency ?? 1,
capabilities: [{
lifecycle: "immediate" as const,
@@ -115,7 +108,7 @@ export function createLocalOpenCvImageProvider(config: CreateLocalOpenCvImagePro
const sources = [...new Map(rasterSources(need).map((source) => [source.digest, source])).values()];
const totalInputBytes = sources.reduce((sum, source) => sum + source.size, 0);
assert(totalInputBytes <= maxInputBytes, "Raster inputs exceed their configured byte limit");
- const work = await mkdtemp(join(tmpdir(), "svml-raster-opencv-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-raster-opencv-"));
try {
const paths = new Map<string, string>();
for (const [index, source] of sources.entries()) {
diff --git a/packages/provider-image-opencv-local/test/program.test.ts b/packages/provider-image-opencv-local/test/program.test.ts
index 7297795f..6ad29085 100644
--- a/packages/provider-image-opencv-local/test/program.test.ts
+++ b/packages/provider-image-opencv-local/test/program.test.ts
@@ -34,7 +34,7 @@ test("an interpreter without cv2 is reported here, not mid-Build", async () => {
test("an interpreter carrying another OpenCV major is a mismatch, not a failure", async () => {
// A stand-in interpreter that answers truthfully about an environment this
// Provider cannot drive: cv2 3.x predates the APIs it calls.
- const directory = await mkdtemp(join(tmpdir(), "svml-opencv-probe-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-opencv-probe-"));
const fake = join(directory, "python");
await writeFile(fake, "#!/bin/sh\necho '{\"cv2\": \"3.4.18\", \"numpy\": \"2.1.0\"}'\n", { mode: 0o755 });
try {
diff --git a/packages/provider-image-opencv-local/test/provider.test.ts b/packages/provider-image-opencv-local/test/provider.test.ts
index d09a7387..9abeeadf 100644
--- a/packages/provider-image-opencv-local/test/provider.test.ts
+++ b/packages/provider-image-opencv-local/test/provider.test.ts
@@ -68,7 +68,7 @@ test("the OpenCV package is one replaceable Endpoint with no second queue", asyn
const facet = provider.manifest.facets[0];
assert(facet?.role === "capability-endpoint");
assert.equal(facet.defaultConcurrency, 3);
- assert.deepEqual(provider.bindings, [{
+ assert.deepEqual(provider.offers, [{
capability: rasterCapabilities.execute,
returns: artifactTypes.blob,
endpoint: "image.opencv.local",
@@ -97,8 +97,8 @@ test("managed and external OpenCV deployments never mix their interpreters", ()
assert.equal(localOpenCvProgram(externalContext).prepare, undefined);
});
-const liveEnabled = process.env.SVML_OPENCV_TESTS === "1";
-const openCvPython = process.env.SVML_OPENCV_PYTHON ?? "python3";
+const liveEnabled = process.env.NARRATAGE_OPENCV_TESTS === "1";
+const openCvPython = process.env.NARRATAGE_OPENCV_PYTHON ?? "python3";
const hasOpenCv = spawnSync(openCvPython, ["-c", "import cv2, numpy"], { stdio: "ignore" }).status === 0;
test("the local Provider returns only a new image BlobArtifact", {
diff --git a/packages/provider-kie/README.md b/packages/provider-kie/README.md
index 97eb9276..7701169a 100644
--- a/packages/provider-kie/README.md
+++ b/packages/provider-kie/README.md
@@ -45,7 +45,7 @@ Declarative activation names an ordinary CredentialRef, not an environment-speci
"config": {
"apiKey": { "store": "keychain", "key": "kie.api-key" },
"defaultConcurrency": 8,
- "routeConcurrency": {
+ "laneConcurrency": {
"seedance-2.5": 4,
"gpt-image-2": 3
}
@@ -54,7 +54,7 @@ Declarative activation names an ordinary CredentialRef, not an environment-speci
```
The selected writable CredentialStore then enables `narratage auth login kie.personal --runtime
-svml.runtime.json`; KIE contributes the credential description and the generic CLI contains no KIE
+narratage.runtime.json`; KIE contributes the credential description and the generic CLI contains no KIE
branch.
```ts
@@ -65,22 +65,21 @@ const kie = createKieProvider({
instance: "kie.personal",
apiKey: credentialRef("env", "KIE_API_KEY"),
defaultConcurrency: 8,
- routeConcurrency: {
+ laneConcurrency: {
"seedance-2.5": 4,
"gpt-image-2": 3,
},
});
```
-`defaultConcurrency` is the total KIE authority capacity shared by all Builds. Each optional
-`routeConcurrency` entry limits one exact KIE model route inside that total. There is no cross-Provider
-`seedance` family queue: another Provider owns another authority and its own independently named
-routes. A task acquires its Provider and route capacity together, so it is queued once rather than
+`defaultConcurrency` is the total KIE pool capacity shared by all Builds. Each optional
+`laneConcurrency` entry limits one exact KIE model lane inside that total. There is no cross-Provider
+`seedance` family queue: another Provider owns another pool and its own independently named
+lanes. A task acquires its pool and lane capacity together, so it is queued once rather than
copied between parent and child queues.
An advanced embedding adds `kie` to its Endpoint list beside a complete, explicit set of Runtime
-service packages and selections. A reproducible project normally activates deterministic model
-components through `packageLock`. The `.svml` Module Closure separately contains only the model
+service packages and selections. The `.svml` Module Closure separately contains only the model
Manifests actually imported by the author document; installing KIE does not add author intent.
## Paid-operation law
@@ -95,7 +94,7 @@ Manifests actually imported by the author document; installing KIE does not add
immediately written to the configured content-addressed ArtifactStore, and removed from durable
result metadata.
5. The selected `BuildDispatchStore` owns shared Build capacity. This Provider contributes one KIE
- Authority plus exact capability Routes and a conservative create-task interval; it does not introduce Redis or another source of
+ pool plus exact capability lanes and a conservative create-task interval; it does not introduce Redis or another source of
Build truth.
The automated suite uses an adversarial fake KIE service. The credentialed smoke command is a paid
@@ -104,15 +103,15 @@ explicitly and keeps a stable Runtime directory under the operating system tempo
an interrupted paid task can resume from its SQLite checkpoint:
```sh
-SVML_KIE_LIVE=1 KIE_API_KEY=... pnpm smoke:kie
+NARRATAGE_KIE_LIVE=1 KIE_API_KEY=... pnpm smoke:kie
```
-The default case is `gpt-image-2`. Set `SVML_KIE_SMOKE_CASES=all` or a comma-separated subset of
+The default case is `gpt-image-2`. Set `NARRATAGE_KIE_SMOKE_CASES=all` or a comma-separated subset of
`gpt-image-2,nano-banana-2,seedream-5-lite,seedance-2-mini,minimax-h3,gemini-omni,grok-imagine`.
-Set `SVML_KIE_SMOKE_REFERENCE` to add the optional `gpt-image-2-edit` upload case; only use an asset
+Set `NARRATAGE_KIE_SMOKE_REFERENCE` to add the optional `gpt-image-2-edit` upload case; only use an asset
that is explicitly approved for external upload.
-`KIE_BASE_URL` and `SVML_KIE_SMOKE_ROOT` are optional deployment overrides. The command prints
+`KIE_BASE_URL` and `NARRATAGE_KIE_SMOKE_ROOT` are optional deployment overrides. The command prints
credit usage, the content digest and a local inspection copy, but never prints or persists the key.
A representative run of all seven families and the optional upload case has passed. Generated
results are deployment evidence and are intentionally not committed as a dated transcript.
diff --git a/packages/provider-kie/package.json b/packages/provider-kie/package.json
index 844261cb..93587ecf 100644
--- a/packages/provider-kie/package.json
+++ b/packages/provider-kie/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -17,7 +17,7 @@
"@narratage/generation": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
},
"devDependencies": {
"@narratage/artifact-store-fs": "workspace:*",
@@ -29,7 +29,7 @@
"@narratage/gemini-omni": "workspace:*",
"@narratage/gpt-image": "workspace:*",
"@narratage/grok-imagine": "workspace:*",
- "@narratage/local": "workspace:*",
+ "@narratage/runtime-local": "workspace:*",
"@narratage/media": "workspace:*",
"@narratage/minimax-h3": "workspace:*",
"@narratage/model-kit": "workspace:*",
diff --git a/packages/provider-kie/src/activation.ts b/packages/provider-kie/src/activation.ts
index 8cddfd81..8edf1131 100644
--- a/packages/provider-kie/src/activation.ts
+++ b/packages/provider-kie/src/activation.ts
@@ -5,18 +5,18 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createKieProvider } from "./provider.js";
const kieRuntimeAdapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-kie",
activate(context) {
- if (context.authority === undefined) throw new Error("KIE Provider Authority is required");
+ if (context.pool === undefined) throw new Error("KIE Provider Pool is required");
const config = runtimeConfigObject(context.config, "KIE");
runtimeConfigExact(config, [
"apiBaseUrl", "uploadBaseUrl", "apiKey", "defaultConcurrency", "pollIntervalMs",
- "routeConcurrency", "submissionIntervalMs", "requestTimeoutMs", "maxOperationMs", "maxArtifactBytes",
+ "laneConcurrency", "submissionIntervalMs", "requestTimeoutMs", "maxOperationMs", "maxArtifactBytes",
], "KIE");
const apiBaseUrl = runtimeConfigString(config.apiBaseUrl, "KIE apiBaseUrl");
const uploadBaseUrl = runtimeConfigString(config.uploadBaseUrl, "KIE uploadBaseUrl");
@@ -30,13 +30,13 @@ const kieRuntimeAdapter = createRuntimeEndpointAdapterFacet({
const apiKey = runtimeConfigCredentialRef(config.apiKey, "KIE apiKey");
if (apiKey === undefined) throw new Error("KIE apiKey CredentialRef is required");
const defaultConcurrency = runtimeConfigPositiveInteger(config.defaultConcurrency, "KIE defaultConcurrency");
- const routeConcurrency = config.routeConcurrency === undefined
+ const laneConcurrency = config.laneConcurrency === undefined
? undefined
- : Object.fromEntries(Object.entries(runtimeConfigObject(config.routeConcurrency, "KIE routeConcurrency"))
- .map(([route, value]) => {
- const concurrency = runtimeConfigPositiveInteger(value, `KIE routeConcurrency.${route}`);
- if (concurrency === undefined) throw new Error(`KIE routeConcurrency.${route} is required`);
- return [route, concurrency];
+ : Object.fromEntries(Object.entries(runtimeConfigObject(config.laneConcurrency, "KIE laneConcurrency"))
+ .map(([lane, value]) => {
+ const concurrency = runtimeConfigPositiveInteger(value, `KIE laneConcurrency.${lane}`);
+ if (concurrency === undefined) throw new Error(`KIE laneConcurrency.${lane} is required`);
+ return [lane, concurrency];
}));
const pollIntervalMs = runtimeConfigPositiveInteger(config.pollIntervalMs, "KIE pollIntervalMs");
const submissionIntervalMs = runtimeConfigPositiveInteger(config.submissionIntervalMs, "KIE submissionIntervalMs");
@@ -46,12 +46,12 @@ const kieRuntimeAdapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createKieProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
...(apiBaseUrl === undefined ? {} : { apiBaseUrl }),
...(uploadBaseUrl === undefined ? {} : { uploadBaseUrl }),
apiKey,
...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),
- ...(routeConcurrency === undefined ? {} : { routeConcurrency }),
+ ...(laneConcurrency === undefined ? {} : { laneConcurrency }),
...(pollIntervalMs === undefined ? {} : { pollIntervalMs }),
...(submissionIntervalMs === undefined ? {} : { submissionIntervalMs }),
...(requestTimeoutMs === undefined ? {} : { requestTimeoutMs }),
@@ -62,9 +62,9 @@ const kieRuntimeAdapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [kieRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-kie/src/index.ts b/packages/provider-kie/src/index.ts
index 0dae990a..ab243814 100644
--- a/packages/provider-kie/src/index.ts
+++ b/packages/provider-kie/src/index.ts
@@ -5,7 +5,6 @@ export {
} from "./mapping.js";
export {
createKieProvider,
- kieProviderImplementationDigest,
kieProviderModuleRef,
} from "./provider.js";
export type { CreateKieProviderOptions } from "./provider.js";
diff --git a/packages/provider-kie/src/provider.ts b/packages/provider-kie/src/provider.ts
index 4f4c37f4..5980fa45 100644
--- a/packages/provider-kie/src/provider.ts
+++ b/packages/provider-kie/src/provider.ts
@@ -29,33 +29,30 @@ import {
import type { KieTaskRequest } from "./routes.js";
export const kieProviderModuleRef = { name: "@narratage/provider-kie", version: "1" } as const;
-export const kieProviderImplementationDigest = digestOf("@narratage/provider-kie/market-endpoint@1");
type Fetch = typeof globalThis.fetch;
export type CreateKieProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
readonly apiBaseUrl?: string;
readonly uploadBaseUrl?: string;
readonly apiKey?: CredentialRef;
- /** Total in-flight capacity shared by every KIE route. */
+ /** Total in-flight capacity shared by every KIE lane. */
readonly defaultConcurrency?: number;
- /** Optional KIE route limits keyed by capability name, for example seedance-2.5. */
- readonly routeConcurrency?: Readonly<Record<string, number>>;
+ /** Optional KIE lane limits keyed by capability name, for example seedance-2.5. */
+ readonly laneConcurrency?: Readonly<Record<string, number>>;
readonly pollIntervalMs?: number;
readonly submissionIntervalMs?: number;
readonly requestTimeoutMs?: number;
readonly maxOperationMs?: number;
readonly maxArtifactBytes?: number;
- /** Required when replacing global fetch so the configured transport changes Runtime identity. */
- readonly fetchImplementationDigest?: Digest;
readonly fetch?: Fetch;
readonly now?: () => number;
};
type KieCheckpoint = {
- readonly contract: "svml.kie-operation@1";
+ readonly contract: "narratage.kie-operation@1";
readonly taskId: string;
readonly routeKey: string;
readonly model: string;
@@ -434,7 +431,7 @@ function verifyCheckpoint(value: CanonicalValue | undefined, context: EndpointRe
}
const checkpoint = object(value, "KIE checkpoint") as unknown as KieCheckpoint;
const route = kieRouteForCapability(context.need.capability);
- if (checkpoint.contract !== "svml.kie-operation@1"
+ if (checkpoint.contract !== "narratage.kie-operation@1"
|| typeof checkpoint.taskId !== "string"
|| route === undefined
|| checkpoint.routeKey !== route.key
@@ -495,7 +492,7 @@ function endpoint(options: {
await options.gate.enter();
const taskId = await options.client.createTask(task, key);
const checkpoint: KieCheckpoint = {
- contract: "svml.kie-operation@1",
+ contract: "narratage.kie-operation@1",
taskId,
routeKey: route.key,
model: task.model,
@@ -600,10 +597,10 @@ function endpoint(options: {
export function createKieProvider(config: CreateKieProviderOptions) {
verifyKieRoutes();
- const routeNames = new Set(kieRoutes.map((route) => route.capability.name));
- const routeConcurrency = Object.fromEntries(Object.entries(config.routeConcurrency ?? {}).map(([route, limit]) => {
- if (!routeNames.has(route)) throw new Error(`unknown KIE concurrency route ${route}`);
- return [route, positiveInteger(limit, `${route} routeConcurrency`)];
+ const laneNames = new Set(kieRoutes.map((route) => route.capability.name));
+ const laneConcurrency = Object.fromEntries(Object.entries(config.laneConcurrency ?? {}).map(([lane, limit]) => {
+ if (!laneNames.has(lane)) throw new Error(`unknown KIE concurrency lane ${lane}`);
+ return [lane, positiveInteger(limit, `${lane} laneConcurrency`)];
}));
const apiBaseUrl = baseUrl(config.apiBaseUrl ?? "https://api.kie.ai", "apiBaseUrl");
const uploadBaseUrl = baseUrl(config.uploadBaseUrl ?? "https://kieai.redpandaai.co", "uploadBaseUrl");
@@ -612,14 +609,6 @@ export function createKieProvider(config: CreateKieProviderOptions) {
const requestTimeoutMs = positiveInteger(config.requestTimeoutMs ?? 30_000, "requestTimeoutMs");
const maxOperationMs = positiveInteger(config.maxOperationMs ?? 20 * 60_000, "maxOperationMs");
const maxArtifactBytes = positiveInteger(config.maxArtifactBytes ?? 512 * 1024 * 1024, "maxArtifactBytes");
- if (config.fetch !== undefined && config.fetchImplementationDigest === undefined) {
- throw new Error("custom KIE fetch requires fetchImplementationDigest");
- }
- if (config.fetchImplementationDigest !== undefined && !isDigest(config.fetchImplementationDigest)) {
- throw new Error("fetchImplementationDigest is invalid");
- }
- const fetchImplementationDigest = config.fetchImplementationDigest
- ?? digestOf("@narratage/provider-kie/node-global-fetch@1");
const now = config.now ?? Date.now;
const client = new KieClient({
apiBaseUrl,
@@ -639,30 +628,17 @@ export function createKieProvider(config: CreateKieProviderOptions) {
module: kieProviderModuleRef,
facet: "market",
instance: config.instance ?? "kie.default",
- authority: config.authority ?? config.instance ?? "kie.default",
- implementation: {
- digest: kieProviderImplementationDigest,
- },
- configuration: canonicalize({
- apiBaseUrl,
- uploadBaseUrl,
- pollIntervalMs,
- submissionIntervalMs,
- requestTimeoutMs,
- maxOperationMs,
- maxArtifactBytes,
- fetchImplementationDigest,
- }),
+ pool: config.pool ?? config.instance ?? "kie.default",
credentials: { apiKey: config.apiKey ?? credentialRef("env", "KIE_API_KEY") },
credentialInputs: { apiKey: { label: "KIE API key" } },
defaultConcurrency: config.defaultConcurrency ?? 2,
capabilities: kieRoutes.map((route) => ({
capability: route.capability,
returns: route.returns,
- route: route.capability.name,
- ...(routeConcurrency[route.capability.name] === undefined
+ lane: route.capability.name,
+ ...(laneConcurrency[route.capability.name] === undefined
? {}
- : { maxConcurrency: routeConcurrency[route.capability.name] }),
+ : { maxConcurrency: laneConcurrency[route.capability.name] }),
lifecycle: "recoverable" as const,
endpoint: providerEndpoint,
retry: { maxAttempts: 3 },
diff --git a/packages/provider-kie/test/live-smoke.ts b/packages/provider-kie/test/live-smoke.ts
index e98c2bb8..425f977a 100644
--- a/packages/provider-kie/test/live-smoke.ts
+++ b/packages/provider-kie/test/live-smoke.ts
@@ -40,8 +40,8 @@ import {
grokImagineManifest,
sealGrokImagineRequest,
} from "@narratage/grok-imagine";
-import { createLocalExecutionPackage, createProjectLocalRuntime } from "@narratage/local";
-import type { LocalBuildSubmission } from "@narratage/local";
+import { createLocalExecutionPackage, createProjectLocalRuntime } from "@narratage/runtime-local";
+import type { LocalBuildSubmission } from "@narratage/runtime-local";
import {
minimaxH3Component,
minimaxH3Endpoints,
@@ -63,7 +63,7 @@ import type {
TypedRecord,
} from "@narratage/protocol";
import { credentialRef } from "@narratage/runtime";
-import { createSqliteRuntimeComponentPackage } from "@narratage/store-sqlite";
+import { createSqliteRuntimeInfrastructurePackage } from "@narratage/store-sqlite";
import {
sealSeedanceRequest,
seedanceComponent,
@@ -185,7 +185,7 @@ function referenceMediaType(path: string): string {
if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
if (lower.endsWith(".webp")) return "image/webp";
if (lower.endsWith(".png")) return "image/png";
- throw new Error("SVML_KIE_SMOKE_REFERENCE must be a PNG, JPEG or WebP image");
+ throw new Error("NARRATAGE_KIE_SMOKE_REFERENCE must be a PNG, JPEG or WebP image");
}
async function smokeCases(root: string): Promise<readonly SmokeCase[]> {
@@ -284,7 +284,7 @@ async function smokeCases(root: string): Promise<readonly SmokeCase[]> {
}) as unknown as CanonicalValue,
},
];
- const referencePath = process.env.SVML_KIE_SMOKE_REFERENCE;
+ const referencePath = process.env.NARRATAGE_KIE_SMOKE_REFERENCE;
if (referencePath !== undefined) {
const absolute = resolve(referencePath);
const store = new FileArtifactStore(join(root, ".svml", "artifacts"));
@@ -306,10 +306,10 @@ async function smokeCases(root: string): Promise<readonly SmokeCase[]> {
}
function selectCases(cases: readonly SmokeCase[]): readonly SmokeCase[] {
- const requested = process.env.SVML_KIE_SMOKE_CASES ?? "gpt-image-2";
+ const requested = process.env.NARRATAGE_KIE_SMOKE_CASES ?? "gpt-image-2";
if (requested === "all") return cases;
const keys = requested.split(",").map((item) => item.trim()).filter((item) => item.length > 0);
- assert(keys.length > 0, "SVML_KIE_SMOKE_CASES selected no cases");
+ assert(keys.length > 0, "NARRATAGE_KIE_SMOKE_CASES selected no cases");
const available = new Map(cases.map((item) => [item.key, item]));
return keys.map((key) => {
const item = available.get(key);
@@ -390,12 +390,12 @@ function failureMessage(item: SmokeCase, build: LocalBuildSubmission): string {
}
async function main(): Promise<void> {
- assert(process.env.SVML_KIE_LIVE === "1",
- "KIE live smoke is paid and opt-in; set SVML_KIE_LIVE=1 explicitly");
+ assert(process.env.NARRATAGE_KIE_LIVE === "1",
+ "KIE live smoke is paid and opt-in; set NARRATAGE_KIE_LIVE=1 explicitly");
const key = process.env.KIE_API_KEY;
assert(key !== undefined && key.length > 0, "KIE_API_KEY is required");
const baseUrl = apiBaseUrl(process.env.KIE_BASE_URL ?? "https://api.kie.ai");
- const root = resolve(process.env.SVML_KIE_SMOKE_ROOT ?? join(tmpdir(), "svml-kie-live"));
+ const root = resolve(process.env.NARRATAGE_KIE_SMOKE_ROOT ?? join(tmpdir(), "narratage-kie-live"));
await mkdir(root, { recursive: true });
const selected = selectCases(await smokeCases(root));
console.log(`KIE smoke cases: ${selected.map((item) => item.key).join(", ")}`);
@@ -408,28 +408,24 @@ async function main(): Promise<void> {
defaultConcurrency: 1,
pollIntervalMs: 3_000,
});
- const execution = createLocalExecutionPackage("execution.local");
- const state = createSqliteRuntimeComponentPackage({
+ const execution = createLocalExecutionPackage("execution");
+ const state = createSqliteRuntimeInfrastructurePackage({
path: join(root, ".narratage", "runtime.sqlite"),
- buildInstance: "state.builds",
- operationInstance: "state.operations",
- dispatchInstance: "state.dispatch",
+ instance: "state",
});
- const artifacts = createFileArtifactStorePackage({ root: join(root, ".narratage", "artifacts"), instance: "artifacts.fs" });
- const credentials = createEnvironmentCredentialStorePackage({ instance: "credentials.env" });
+ const artifacts = createFileArtifactStorePackage({ root: join(root, ".narratage", "artifacts"), instance: "artifacts" });
+ const credentials = createEnvironmentCredentialStorePackage({ instance: "credentials" });
const runtime = await createProjectLocalRuntime({
dataRoot: root,
- runtimeComponents: [execution, state, artifacts, credentials],
- bindings: {
- scheduler: "execution.local.scheduler",
- worker: "execution.local.worker",
- stores: {
- build: "state.builds",
- operations: "state.operations",
- dispatch: "state.dispatch",
- artifacts: "artifacts.fs",
- credentials: ["credentials.env"],
- },
+ infrastructure: [execution, state, artifacts, credentials],
+ roles: {
+ scheduler: { from: "execution", part: "scheduler" },
+ worker: { from: "execution", part: "worker" },
+ buildStore: { from: "state", part: "builds" },
+ operationStore: { from: "state", part: "operations" },
+ dispatchStore: { from: "state", part: "dispatch" },
+ artifactStore: { from: "artifacts", part: "store" },
+ credentialStores: [{ from: "credentials", part: "store" }],
},
components: [
generationComponent,
diff --git a/packages/provider-kie/test/provider.test.ts b/packages/provider-kie/test/provider.test.ts
index 8b54e7d9..0546afb6 100644
--- a/packages/provider-kie/test/provider.test.ts
+++ b/packages/provider-kie/test/provider.test.ts
@@ -12,10 +12,7 @@ import { backgroundRemovalCapabilities, backgroundRemovalRequest } from "@narrat
import { seedanceEndpoints, sealSeedanceRequest } from "@narratage/seedance";
import { digestOf } from "@narratage/protocol";
import type { CanonicalValue, Need } from "@narratage/protocol";
-import {
- createKieProvider,
- kieProviderImplementationDigest,
-} from "@narratage/provider-kie";
+import { createKieProvider } from "@narratage/provider-kie";
import { sealOperationIdentity } from "@narratage/runtime";
function need(constraints: CanonicalValue): Need {
@@ -46,7 +43,6 @@ async function endpointFor(
const registry = new EndpointRegistry();
const provider = createKieProvider({
fetch,
- fetchImplementationDigest: digestOf("provider-kie:test-fetch"),
now,
pollIntervalMs: 0,
submissionIntervalMs: 0,
@@ -65,28 +61,26 @@ function operation(request: Need) {
build: "build:kie-test",
command: "command:kie-test",
endpoint: "kie.default",
- authority: "kie.default",
- route: "fixture.video",
- runtimeClosure: digestOf("runtime:kie-test"),
+ pool: "kie.default",
+ lane: "fixture.video",
attempt: 1,
});
}
-test("all KIE capabilities share one recoverable task engine and differ only by Route", async () => {
+test("all KIE capabilities share one recoverable task engine and differ only by Lane", async () => {
const provider = createKieProvider({
fetch: async () => { throw new Error("no request expected"); },
- fetchImplementationDigest: digestOf("provider-kie:route-registry-test"),
defaultConcurrency: 8,
- routeConcurrency: { "seedance-2-mini": 4 },
+ laneConcurrency: { "seedance-2-mini": 4 },
});
- assert.equal(provider.bindings.length, 13);
+ assert.equal(provider.offers.length, 13);
const registry = new EndpointRegistry();
await provider.install(registry);
const seed = need(sealSeedanceRequest("seedance-2-mini", {
prompt: ["A clean studio shot."], resolution: ["720p"], aspectRatio: ["16:9"],
duration: [5], generateAudio: [false], webSearch: [false],
}) as unknown as CanonicalValue);
- const source = { kind: "blob" as const, digest: digestOf("route-source"), size: 1, mediaType: "image/png" };
+ const source = { kind: "blob" as const, digest: digestOf("lane-source"), size: 1, mediaType: "image/png" };
const removal = removeBackgroundNeed(backgroundRemovalRequest(source) as unknown as CanonicalValue);
const seedResolution = registry.resolve(seed);
const removalResolution = registry.resolve(removal);
@@ -96,10 +90,10 @@ test("all KIE capabilities share one recoverable task engine and differ only by
assert.equal(removalResolution.registration.kind, "recoverable");
assert.equal(seedResolution.registration.endpoint, removalResolution.registration.endpoint);
assert.deepEqual(seedResolution.registration.scheduling, {
- queue: { authority: "kie.default", route: "seedance-2-mini" },
+ queue: { pool: "kie.default", lane: "seedance-2-mini" },
resources: [
- { id: "authority:kie.default", maxActive: 8, maxInFlight: 8 },
- { id: "route:kie.default/seedance-2-mini", maxActive: 4, maxInFlight: 4 },
+ { id: "pool:kie.default", maxActive: 8, maxInFlight: 8 },
+ { id: "lane:kie.default/seedance-2-mini", maxActive: 4, maxInFlight: 4 },
],
});
});
diff --git a/packages/provider-media-aws-lambda/package.json b/packages/provider-media-aws-lambda/package.json
index 671c117e..2d2abefe 100644
--- a/packages/provider-media-aws-lambda/package.json
+++ b/packages/provider-media-aws-lambda/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -17,7 +17,7 @@
"@narratage/media-execution": "workspace:*",
"@narratage/media-pipeline": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
"@narratage/speech": "workspace:*",
"@narratage/transport": "workspace:*",
"@narratage/transport-aws-lambda": "workspace:*"
diff --git a/packages/provider-media-aws-lambda/src/activation.ts b/packages/provider-media-aws-lambda/src/activation.ts
index f558024b..b552b182 100644
--- a/packages/provider-media-aws-lambda/src/activation.ts
+++ b/packages/provider-media-aws-lambda/src/activation.ts
@@ -4,8 +4,8 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-kit";
import { createAwsLambdaMediaProvider } from "./provider.js";
import type { CreateAwsLambdaMediaProviderOptions } from "./provider.js";
@@ -13,7 +13,7 @@ import type { CreateAwsLambdaMediaProviderOptions } from "./provider.js";
const QUALIFIED_ARN = /^arn:aws(?:-[a-z]+)*:lambda:([a-z0-9-]+):\d{12}:function:[A-Za-z0-9-_]+:([A-Za-z0-9-_]+)$/u;
function providerOptions(context: RuntimeAdapterFactoryContext): CreateAwsLambdaMediaProviderOptions {
- if (context.authority === undefined) throw new Error("AWS Lambda media Provider Authority is required");
+ if (context.pool === undefined) throw new Error("AWS Lambda media Provider Pool is required");
const config = runtimeConfigObject(context.config, "AWS Lambda media");
runtimeConfigExact(config, [
"functionArn", "bucket", "prefix", "region", "defaultConcurrency",
@@ -41,7 +41,7 @@ function providerOptions(context: RuntimeAdapterFactoryContext): CreateAwsLambda
const defaultConcurrency = runtimeConfigPositiveInteger(config.defaultConcurrency, "AWS Lambda defaultConcurrency");
return {
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
functionArn,
bucket,
...(prefix === undefined ? {} : { prefix }),
@@ -60,9 +60,9 @@ const awsLambdaMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({
// read-only deployment probe is added.
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [awsLambdaMediaRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-media-aws-lambda/src/contract.ts b/packages/provider-media-aws-lambda/src/contract.ts
index 1c980826..c1cf2c67 100644
--- a/packages/provider-media-aws-lambda/src/contract.ts
+++ b/packages/provider-media-aws-lambda/src/contract.ts
@@ -9,8 +9,8 @@ import type { CanonicalValue, StoredValue } from "@narratage/protocol";
* invocation is an untrusted input even when the account is trusted. Neither
* side treats the other's output as already valid.
*/
-export const MEDIA_LAMBDA_REQUEST = "svml.media-lambda-request@1";
-export const MEDIA_LAMBDA_RESPONSE = "svml.media-lambda-response@1";
+export const MEDIA_LAMBDA_REQUEST = "narratage.media-lambda-request@1";
+export const MEDIA_LAMBDA_RESPONSE = "narratage.media-lambda-response@1";
export const mediaLambdaOperations = [
"inspect",
diff --git a/packages/provider-media-aws-lambda/src/index.ts b/packages/provider-media-aws-lambda/src/index.ts
index a9274244..617b53b1 100644
--- a/packages/provider-media-aws-lambda/src/index.ts
+++ b/packages/provider-media-aws-lambda/src/index.ts
@@ -1,8 +1,4 @@
-export {
- awsLambdaMediaProviderImplementationDigest,
- awsLambdaMediaProviderModuleRef,
- createAwsLambdaMediaProvider,
-} from "./provider.js";
+export { awsLambdaMediaProviderModuleRef, createAwsLambdaMediaProvider } from "./provider.js";
export {
MEDIA_LAMBDA_REQUEST,
MEDIA_LAMBDA_RESPONSE,
diff --git a/packages/provider-media-aws-lambda/src/provider.ts b/packages/provider-media-aws-lambda/src/provider.ts
index 39d09472..bd99e43f 100644
--- a/packages/provider-media-aws-lambda/src/provider.ts
+++ b/packages/provider-media-aws-lambda/src/provider.ts
@@ -20,8 +20,6 @@ export const awsLambdaMediaProviderModuleRef = {
name: "@narratage/provider-media-aws-lambda",
version: "1",
} as const;
-export const awsLambdaMediaProviderImplementationDigest =
- digestOf("@narratage/provider-media-aws-lambda/media@1");
/** `arn:aws:lambda:<region>:<account>:function:<name>:<version|alias>` */
const QUALIFIED_ARN =
@@ -29,7 +27,7 @@ const QUALIFIED_ARN =
export type CreateAwsLambdaMediaProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
/** Must name a version or alias. See the assertion below for why. */
readonly functionArn: string;
readonly bucket: string;
@@ -114,11 +112,7 @@ export function createAwsLambdaMediaProvider(config: CreateAwsLambdaMediaProvide
module: awsLambdaMediaProviderModuleRef,
facet: "media",
instance: config.instance ?? "media.aws-lambda",
- authority: config.authority ?? config.instance ?? "media.aws-lambda",
- implementation: {
- digest: awsLambdaMediaProviderImplementationDigest,
- },
- configuration: canonicalize(configuration as unknown as CanonicalValue),
+ pool: config.pool ?? config.instance ?? "media.aws-lambda",
defaultConcurrency: config.defaultConcurrency ?? 8,
capabilities: [
{
diff --git a/packages/provider-media-aws-lambda/test/provider.test.ts b/packages/provider-media-aws-lambda/test/provider.test.ts
index 0e425daa..e32d535e 100644
--- a/packages/provider-media-aws-lambda/test/provider.test.ts
+++ b/packages/provider-media-aws-lambda/test/provider.test.ts
@@ -76,7 +76,7 @@ test("the Provider sends the Need verbatim with the bucket the function should u
const store = new MemoryArtifactStore();
const artifact = await store.put(new TextEncoder().encode("out!"), "video/mp4");
const { invoker, seen } = recordingInvoker(() => canonicalize({
- contract: "svml.media-lambda-response@1",
+ contract: "narratage.media-lambda-response@1",
operation: "inspect",
ok: true,
value: { kind: "inline", value: { artifact } },
@@ -125,7 +125,7 @@ test("the remote Provider receives the exact AudioProgramPlan compiled for local
plan,
} as unknown as CanonicalValue);
const { invoker, seen } = recordingInvoker(() => canonicalize({
- contract: "svml.media-lambda-response@1",
+ contract: "narratage.media-lambda-response@1",
operation: "render-audio",
ok: true,
value: { kind: "inline", value: {
@@ -143,7 +143,7 @@ test("a Provider aimed at another bucket fails naming the Artifact, not later wi
const store = new MemoryArtifactStore();
const stranger = digestOf("an artifact this Build's store never received");
const { invoker } = recordingInvoker(() => canonicalize({
- contract: "svml.media-lambda-response@1",
+ contract: "narratage.media-lambda-response@1",
operation: "inspect",
ok: true,
value: { kind: "inline", value: {
@@ -165,7 +165,7 @@ test("a Provider aimed at another bucket fails naming the Artifact, not later wi
test("a typed failure reaches the Build with its code, since the transport withholds the payload", async () => {
const { invoker } = recordingInvoker(() => canonicalize({
- contract: "svml.media-lambda-response@1",
+ contract: "narratage.media-lambda-response@1",
operation: "inspect",
ok: false,
code: "MEDIA_SOURCE_UNAVAILABLE",
@@ -181,11 +181,11 @@ test("a typed failure reaches the Build with its code, since the transport withh
});
test("a reply that is not this contract is refused rather than half-read", () => {
- assert.throws(() => parseMediaLambdaResponse({ contract: "svml.media-lambda-response@invalid", operation: "inspect" }),
- /contract must be svml\.media-lambda-response@1/u);
- assert.throws(() => parseMediaLambdaResponse({ contract: "svml.media-lambda-response@1", operation: "transcode" }),
+ assert.throws(() => parseMediaLambdaResponse({ contract: "narratage.media-lambda-response@invalid", operation: "inspect" }),
+ /contract must be narratage\.media-lambda-response@1/u);
+ assert.throws(() => parseMediaLambdaResponse({ contract: "narratage.media-lambda-response@1", operation: "transcode" }),
/operation must be one of/u);
assert.throws(() => parseMediaLambdaRequest({
- contract: "svml.media-lambda-request@1", operation: "mux", artifacts: {}, constraints: {},
+ contract: "narratage.media-lambda-request@1", operation: "mux", artifacts: {}, constraints: {},
}), /artifacts\.bucket must be a non-empty string/u);
});
diff --git a/packages/provider-media-local/README.md b/packages/provider-media-local/README.md
index fe2915fe..3bf13089 100644
--- a/packages/provider-media-local/README.md
+++ b/packages/provider-media-local/README.md
@@ -10,7 +10,7 @@ const media = createLocalMediaProvider({ instance: "media.local", defaultConcurr
```
An embedding adds `media` to a complete explicit Runtime assembly and grants `process:media`; the
-declarative form selects this package from `runtimePackageLock`.
+declarative form selects this package through the Runtime Profile.
The Endpoint:
diff --git a/packages/provider-media-local/package.json b/packages/provider-media-local/package.json
index 50af9d35..7b56d850 100644
--- a/packages/provider-media-local/package.json
+++ b/packages/provider-media-local/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -18,8 +18,8 @@
"@narratage/media-pipeline": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"@narratage/speech": "workspace:*"
},
"devDependencies": {
diff --git a/packages/provider-media-local/src/activation.ts b/packages/provider-media-local/src/activation.ts
index c9c2c67d..318d035f 100644
--- a/packages/provider-media-local/src/activation.ts
+++ b/packages/provider-media-local/src/activation.ts
@@ -4,11 +4,11 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import {
diagnoseRuntimeExecutable,
resolveRuntimeExecutable,
-} from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-host-node";
import { createLocalMediaProvider } from "./provider.js";
import { localMediaToolchainProgram } from "./program.js";
@@ -16,7 +16,7 @@ import { localMediaToolchainProgram } from "./program.js";
const localMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-media-local",
activate(context) {
- if (context.authority === undefined) throw new Error("local media Provider Authority is required");
+ if (context.pool === undefined) throw new Error("local media Provider Pool is required");
const config = runtimeConfigObject(context.config, "local media");
runtimeConfigExact(config, [
"ffmpegPath", "ffprobePath", "defaultConcurrency", "processTimeoutMs", "maxProbeOutputBytes",
@@ -31,7 +31,7 @@ const localMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createLocalMediaProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
...(ffmpegPath === undefined ? {} : { ffmpegPath }),
...(ffprobePath === undefined ? {} : { ffprobePath }),
...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),
@@ -57,9 +57,9 @@ const localMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [localMediaRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-media-local/src/index.ts b/packages/provider-media-local/src/index.ts
index 66994720..00013723 100644
--- a/packages/provider-media-local/src/index.ts
+++ b/packages/provider-media-local/src/index.ts
@@ -1,6 +1,2 @@
-export {
- createLocalMediaProvider,
- localMediaProviderImplementationDigest,
- localMediaProviderModuleRef,
-} from "./provider.js";
+export { createLocalMediaProvider, localMediaProviderModuleRef } from "./provider.js";
export type { CreateLocalMediaProviderOptions } from "./provider.js";
diff --git a/packages/provider-media-local/src/program.ts b/packages/provider-media-local/src/program.ts
index c285c6b9..a55f5516 100644
--- a/packages/provider-media-local/src/program.ts
+++ b/packages/provider-media-local/src/program.ts
@@ -1,7 +1,7 @@
import { probeMediaToolchain } from "@narratage/media-execution";
-import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext, ManagedProgram } from "@narratage/runtime-adapter";
-import { resolveRuntimeExecutable } from "@narratage/runtime-adapter-node";
+import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext, ManagedProgram } from "@narratage/runtime-kit";
+import { resolveRuntimeExecutable } from "@narratage/runtime-host-node";
/** A system/custom FFmpeg deployment is external: programs up probes it but never mutates a package manager. */
export function localMediaToolchainProgram(context: RuntimeAdapterFactoryContext): ManagedProgram {
diff --git a/packages/provider-media-local/src/provider.ts b/packages/provider-media-local/src/provider.ts
index dfbad0f3..c4f34a94 100644
--- a/packages/provider-media-local/src/provider.ts
+++ b/packages/provider-media-local/src/provider.ts
@@ -19,11 +19,10 @@ import { defineEndpointPackage } from "@narratage/endpoint-kit";
import type { EndpointFulfillment, EndpointInvocationContext } from "@narratage/endpoint-kit";
export const localMediaProviderModuleRef = { name: "@narratage/provider-media-local", version: "1" } as const;
-export const localMediaProviderImplementationDigest = digestOf("@narratage/provider-media-local/ffmpeg@1");
export type CreateLocalMediaProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
readonly ffmpegPath?: string;
readonly ffprobePath?: string;
readonly defaultConcurrency?: number;
@@ -80,11 +79,7 @@ export function createLocalMediaProvider(config: CreateLocalMediaProviderOptions
module: localMediaProviderModuleRef,
facet: "media",
instance: config.instance ?? "media.local",
- authority: config.authority ?? config.instance ?? "media.local",
- implementation: {
- digest: localMediaProviderImplementationDigest,
- },
- configuration: canonicalize(common),
+ pool: config.pool ?? config.instance ?? "media.local",
defaultConcurrency: config.defaultConcurrency ?? 1,
capabilities: [
{
diff --git a/packages/provider-media-local/test/provider.test.ts b/packages/provider-media-local/test/provider.test.ts
index 971344f4..17da4165 100644
--- a/packages/provider-media-local/test/provider.test.ts
+++ b/packages/provider-media-local/test/provider.test.ts
@@ -233,7 +233,7 @@ async function normalizeArtifact(args: {
test("local media Provider enumerates attached pictures and jointly normalizes 32k AAC without inventing speech", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-local-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-local-"));
try {
const sourcePath = await fixture(root);
const artifacts = new MemoryArtifactStore();
@@ -306,7 +306,7 @@ test("local media Provider enumerates attached pictures and jointly normalizes 3
test("local media normalization materializes rotation and sample aspect before Spatial", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-display-geometry-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-display-geometry-"));
try {
const base = join(root, "base.mp4");
const sourcePath = join(root, "rotated.mp4");
@@ -375,7 +375,7 @@ test("animated WebP keeps its authored frame timing before fixed-rate normalizat
test("animated GIF keeps its authored frame timing before fixed-rate normalization", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-gif-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-gif-"));
try {
const path = join(root, "animated.gif");
await run("ffmpeg", [
@@ -406,7 +406,7 @@ test("animated GIF keeps its authored frame timing before fixed-rate normalizati
test("local media Provider derives one exact 16 kHz mono WhisperX evidence artifact without a hidden second transcode", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-evidence-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-evidence-"));
try {
const sourcePath = join(root, "speech-master.wav");
await run("ffmpeg", [
@@ -447,7 +447,7 @@ test("local media Provider derives one exact 16 kHz mono WhisperX evidence artif
test("local media Provider preserves one source A/V origin when audio starts later than picture", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-offset-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-offset-"));
try {
const sourcePath = join(root, "offset.mkv");
await run("ffmpeg", [
@@ -496,7 +496,7 @@ test("local media Provider preserves one source A/V origin when audio starts lat
test("a silent generated MP4 remains a visual-only product and cannot satisfy a requested audio stream", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-silent-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-silent-"));
try {
const sourcePath = join(root, "silent.mp4");
await run("ffmpeg", [
@@ -533,7 +533,7 @@ test("a silent generated MP4 remains a visual-only product and cannot satisfy a
test("local media Provider transforms A/V and extracts ordinary audio and frame Artifacts", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-ordinary-ops-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-ordinary-ops-"));
try {
const sourcePath = await fixture(root);
const artifacts = new MemoryArtifactStore();
@@ -618,7 +618,7 @@ test("local media Provider transforms A/V and extracts ordinary audio and frame
test("local media Provider renders one frame-domain audio plan and muxes exactly one silent visual with it", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-program-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-program-"));
try {
const firstPath = join(root, "first.wav");
const secondPath = join(root, "second.wav");
@@ -738,7 +738,7 @@ test("local media Provider renders one frame-domain audio plan and muxes exactly
test("local media Provider executes an end-aligned loop from the exact authored sample phase", {
skip: !hasMediaBinaries,
}, async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-provider-media-loop-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-provider-media-loop-"));
try {
const artifacts = new MemoryArtifactStore();
const source = await artifacts.put(rampWav(100), "audio/wav");
diff --git a/packages/provider-whisperx-local/README.md b/packages/provider-whisperx-local/README.md
index 27e7201e..33add958 100644
--- a/packages/provider-whisperx-local/README.md
+++ b/packages/provider-whisperx-local/README.md
@@ -27,10 +27,8 @@ future persistent remote Provider should use an Artifact URL or request payload
Provider; it is a different deployment package but must return the same
`AlignedTranscriptEvidence` type. Lambda is deliberately not the target for this warm model.
-The configured model, device, compute mode, batch size, service version, WhisperX version and
-sentence-tokenizer data digest are checked through `/health` and contribute to Provider identity.
-This prevents a warm process with a different inference configuration from silently fulfilling the
-same locked Runtime Closure.
+The configured model, device, compute mode and batch size are checked through `/health` before use.
+This prevents a warm process with an incompatible inference configuration from accepting work.
Install and run the service with the commands in `services/whisperx/README.md`. The current local
package and service are trusted code; this is not a community-plugin sandbox.
diff --git a/packages/provider-whisperx-local/package.json b/packages/provider-whisperx-local/package.json
index 7c3a7576..bf2dce30 100644
--- a/packages/provider-whisperx-local/package.json
+++ b/packages/provider-whisperx-local/package.json
@@ -7,13 +7,13 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
"@narratage/endpoint-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
"@narratage/speech-evidence": "workspace:*",
"@narratage/whisperx": "workspace:*"
},
diff --git a/packages/provider-whisperx-local/src/activation.ts b/packages/provider-whisperx-local/src/activation.ts
index cbb5f73c..28a4c691 100644
--- a/packages/provider-whisperx-local/src/activation.ts
+++ b/packages/provider-whisperx-local/src/activation.ts
@@ -4,7 +4,7 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createLocalWhisperXProvider } from "./provider.js";
import { localWhisperXProgram } from "./program.js";
@@ -12,7 +12,7 @@ import { localWhisperXProgram } from "./program.js";
const localWhisperXRuntimeAdapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-whisperx-local",
activate(context) {
- if (context.authority === undefined) throw new Error("WhisperX Provider Authority is required");
+ if (context.pool === undefined) throw new Error("WhisperX Provider Pool is required");
const config = runtimeConfigObject(context.config, "local WhisperX");
runtimeConfigExact(config, [
"baseUrl", "expectedModel", "expectedDevice", "expectedCompute", "expectedBatchSize",
@@ -52,7 +52,7 @@ const localWhisperXRuntimeAdapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createLocalWhisperXProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
...(baseUrl === undefined ? {} : { baseUrl }),
...(expectedModel === undefined ? {} : { expectedModel }),
...(expectedDevice === undefined ? {} : { expectedDevice }),
@@ -70,9 +70,9 @@ const localWhisperXRuntimeAdapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [localWhisperXRuntimeAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-whisperx-local/src/index.ts b/packages/provider-whisperx-local/src/index.ts
index 50c2e72f..51aebe72 100644
--- a/packages/provider-whisperx-local/src/index.ts
+++ b/packages/provider-whisperx-local/src/index.ts
@@ -1,9 +1,4 @@
-export {
- createLocalWhisperXProvider,
- interpretWhisperXResponse,
- localWhisperXProviderImplementationDigest,
- localWhisperXProviderModuleRef,
-} from "./provider.js";
+export { createLocalWhisperXProvider, interpretWhisperXResponse, localWhisperXProviderModuleRef } from "./provider.js";
export type {
CreateLocalWhisperXProviderOptions,
WhisperXServiceResponse,
diff --git a/packages/provider-whisperx-local/src/program.ts b/packages/provider-whisperx-local/src/program.ts
index 4c66411c..090b9d1f 100644
--- a/packages/provider-whisperx-local/src/program.ts
+++ b/packages/provider-whisperx-local/src/program.ts
@@ -1,8 +1,8 @@
import { existsSync } from "node:fs";
import { fileURLToPath } from "node:url";
-import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext, ManagedProgram, ManagedProgramState } from "@narratage/runtime-adapter";
+import { runtimeConfigObject, runtimeConfigString } from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext, ManagedProgram, ManagedProgramState } from "@narratage/runtime-kit";
import { localWhisperXPunktTabDigest } from "./provider.js";
@@ -38,7 +38,7 @@ export function localWhisperXProgram(context: RuntimeAdapterFactoryContext): Man
const baseUrl = (runtimeConfigString(config.baseUrl, "WhisperX baseUrl") ?? "http://127.0.0.1:8765")
.replace(/\/+$/u, "");
const expected = {
- protocol: "svml.whisperx-service@1",
+ protocol: "narratage.whisperx-service@1",
serviceVersion: runtimeConfigString(config.expectedServiceVersion, "WhisperX expectedServiceVersion") ?? "0.1.0",
whisperxVersion: runtimeConfigString(config.expectedWhisperXVersion, "WhisperX expectedWhisperXVersion") ?? "3.8.6",
model: runtimeConfigString(config.expectedModel, "WhisperX expectedModel") ?? "small",
@@ -53,8 +53,8 @@ export function localWhisperXProgram(context: RuntimeAdapterFactoryContext): Man
// systemd or container command. With no override the bundled project is the
// managed default; when it is not present this becomes probe-only.
const managed = customStart === undefined && customPrepare === undefined;
- const prepare = customPrepare ?? (managed ? workspaceCommand("svml-whisperx-prepare") : undefined);
- const start = customStart ?? (managed ? workspaceCommand("svml-whisperx-service") : undefined);
+ const prepare = customPrepare ?? (managed ? workspaceCommand("narratage-whisperx-prepare") : undefined);
+ const start = customStart ?? (managed ? workspaceCommand("narratage-whisperx-service") : undefined);
return {
id: "whisperx",
...(prepare === undefined ? {} : { prepare }),
diff --git a/packages/provider-whisperx-local/src/provider.ts b/packages/provider-whisperx-local/src/provider.ts
index b897107b..9af21499 100644
--- a/packages/provider-whisperx-local/src/provider.ts
+++ b/packages/provider-whisperx-local/src/provider.ts
@@ -16,15 +16,12 @@ export const localWhisperXProviderModuleRef = {
name: "@narratage/provider-whisperx-local",
version: "1",
} as const;
-export const localWhisperXProviderImplementationDigest = digestOf(
- "@narratage/provider-whisperx-local/svml-service@1",
-);
export const localWhisperXPunktTabDigest =
"e57f64187974277726a3417ca6f181ec5403676c717672eef6a748a7b20e0106";
export type CreateLocalWhisperXProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
/** Must resolve to the same machine because the protocol passes a staged local path. */
readonly baseUrl?: string;
readonly expectedModel?: string;
@@ -241,22 +238,7 @@ export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderO
module: localWhisperXProviderModuleRef,
facet: "alignment",
instance: config.instance ?? "whisperx.local",
- authority: config.authority ?? config.instance ?? "whisperx.local",
- implementation: {
- digest: localWhisperXProviderImplementationDigest,
- },
- configuration: canonicalize({
- baseUrl: normalizedBaseUrl,
- expectedModel,
- expectedDevice,
- expectedCompute,
- expectedBatchSize,
- expectedServiceVersion,
- expectedWhisperXVersion,
- expectedPunktTabDigest,
- requestTimeoutMs,
- maxResponseBytes,
- }),
+ pool: config.pool ?? config.instance ?? "whisperx.local",
defaultConcurrency: config.defaultConcurrency ?? 1,
capabilities: [{
lifecycle: "immediate" as const,
@@ -268,7 +250,7 @@ export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderO
assert(audio !== undefined && audio.byteLength === request.audio.size,
`WhisperX evidence Artifact ${request.audio.digest} is unavailable or has changed`);
assertCanonicalEvidenceWav(audio, request.sampleFrames);
- const work = await mkdtemp(join(tmpdir(), "svml-whisperx-local-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-whisperx-local-"));
try {
const audioPath = join(work, "alignment-evidence.wav");
await writeFile(audioPath, audio);
@@ -289,7 +271,7 @@ export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderO
readonly punktTabDigest?: unknown;
};
assert(healthValue.ok === true
- && healthValue.protocol === "svml.whisperx-service@1"
+ && healthValue.protocol === "narratage.whisperx-service@1"
&& healthValue.serviceVersion === expectedServiceVersion
&& healthValue.whisperxVersion === expectedWhisperXVersion
&& healthValue.model === expectedModel
diff --git a/packages/provider-whisperx-local/test/program.test.ts b/packages/provider-whisperx-local/test/program.test.ts
index f2e46ecc..114e95c7 100644
--- a/packages/provider-whisperx-local/test/program.test.ts
+++ b/packages/provider-whisperx-local/test/program.test.ts
@@ -13,8 +13,8 @@ test("the Provider declares how to bring WhisperX up and how to recognise it", (
const program = localWhisperXProgram(context());
assert.equal(program.id, "whisperx");
assert.equal(program.start?.command, "uv");
- assert.equal(program.start?.args.at(-1), "svml-whisperx-service");
- assert.equal(program.prepare?.args.at(-1), "svml-whisperx-prepare");
+ assert.equal(program.start?.args.at(-1), "narratage-whisperx-service");
+ assert.equal(program.prepare?.args.at(-1), "narratage-whisperx-prepare");
// Absolute: a Runtime root is wherever the Profile lives, not where the
// pinned uv project lives.
const project = program.start?.args.at(-3) ?? "";
@@ -38,7 +38,7 @@ test("a program answering with another identity is reported, never used", async
const original = globalThis.fetch;
globalThis.fetch = (async () => new Response(JSON.stringify({
ok: true,
- protocol: "svml.whisperx-service@1",
+ protocol: "narratage.whisperx-service@1",
serviceVersion: "0.1.0",
whisperxVersion: "3.8.6",
model: "large-v3",
diff --git a/packages/provider-whisperx-local/test/provider.test.ts b/packages/provider-whisperx-local/test/provider.test.ts
index c5ef9054..e9932f42 100644
--- a/packages/provider-whisperx-local/test/provider.test.ts
+++ b/packages/provider-whisperx-local/test/provider.test.ts
@@ -85,7 +85,7 @@ test("local Provider stages canonical evidence bytes unchanged and returns seale
if (url.endsWith("/health")) {
return new Response(JSON.stringify({
ok: true,
- protocol: "svml.whisperx-service@1",
+ protocol: "narratage.whisperx-service@1",
serviceVersion: "0.1.0",
whisperxVersion: "3.8.6",
model: "small",
diff --git a/packages/provider-xiaomi-mimo/README.md b/packages/provider-xiaomi-mimo/README.md
index 99c8b12e..84f8586d 100644
--- a/packages/provider-xiaomi-mimo/README.md
+++ b/packages/provider-xiaomi-mimo/README.md
@@ -11,12 +11,15 @@ Runtime Profile example:
```json
{
- "use": "@narratage/provider-xiaomi-mimo",
- "instance": "mimo.official",
- "authority": "mimo.official",
- "config": {
- "apiKey": { "store": "keychain", "key": "xiaomi-mimo.api-key" },
- "defaultConcurrency": 2
+ "endpoints": {
+ "mimo.official": {
+ "use": "@narratage/provider-xiaomi-mimo",
+ "pool": "mimo.official",
+ "config": {
+ "apiKey": { "store": "keychain", "key": "xiaomi-mimo.api-key" },
+ "defaultConcurrency": 2
+ }
+ }
}
}
```
@@ -24,13 +27,6 @@ Runtime Profile example:
The Provider always requests final WAV bytes. Streaming is a service transport optimization and is
not part of the author model.
-Add the Provider independently to the Runtime package lock:
-
-```sh
-node --run narratage -- lock-packages svml.runtime-packages.lock \
- --package @narratage/provider-xiaomi-mimo \
- --package-root .
-```
-
-The Provider declares default concurrency on its Authority and exact capability Routes. The shared
+Selecting the Provider in the Runtime Profile activates it independently from author model syntax.
+It declares default concurrency on its pool and exact capability lanes. The shared
Scheduler owns queuing across Builds; this package does not create a private queue.
diff --git a/packages/provider-xiaomi-mimo/package.json b/packages/provider-xiaomi-mimo/package.json
index a0527c43..47dbb1ab 100644
--- a/packages/provider-xiaomi-mimo/package.json
+++ b/packages/provider-xiaomi-mimo/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -15,7 +15,7 @@
"@narratage/generation": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
},
"devDependencies": {
"@narratage/driver-node": "workspace:*",
diff --git a/packages/provider-xiaomi-mimo/src/activation.ts b/packages/provider-xiaomi-mimo/src/activation.ts
index 15f0e31c..193342b7 100644
--- a/packages/provider-xiaomi-mimo/src/activation.ts
+++ b/packages/provider-xiaomi-mimo/src/activation.ts
@@ -5,14 +5,14 @@ import {
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createXiaomiMimoProvider } from "./provider.js";
const adapter = createRuntimeEndpointAdapterFacet({
use: "@narratage/provider-xiaomi-mimo",
activate(context) {
- if (context.authority === undefined) throw new Error("Xiaomi MiMo Provider Authority is required");
+ if (context.pool === undefined) throw new Error("Xiaomi MiMo Provider Pool is required");
const config = runtimeConfigObject(context.config, "Xiaomi MiMo");
runtimeConfigExact(config, [
"apiBaseUrl", "apiKey", "defaultConcurrency", "requestTimeoutMs",
@@ -37,7 +37,7 @@ const adapter = createRuntimeEndpointAdapterFacet({
return {
endpoint: createXiaomiMimoProvider({
instance: context.instance,
- authority: context.authority,
+ pool: context.pool,
...(apiBaseUrl === undefined ? {} : { apiBaseUrl }),
apiKey,
...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),
@@ -49,9 +49,9 @@ const adapter = createRuntimeEndpointAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [adapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/provider-xiaomi-mimo/src/index.ts b/packages/provider-xiaomi-mimo/src/index.ts
index 20268e1f..eb38d881 100644
--- a/packages/provider-xiaomi-mimo/src/index.ts
+++ b/packages/provider-xiaomi-mimo/src/index.ts
@@ -1,6 +1,5 @@
export {
createXiaomiMimoProvider,
- xiaomiMimoProviderImplementationDigest,
xiaomiMimoProviderModuleRef,
} from "./provider.js";
export type { CreateXiaomiMimoProviderOptions } from "./provider.js";
diff --git a/packages/provider-xiaomi-mimo/src/provider.ts b/packages/provider-xiaomi-mimo/src/provider.ts
index e45e740e..8d376de3 100644
--- a/packages/provider-xiaomi-mimo/src/provider.ts
+++ b/packages/provider-xiaomi-mimo/src/provider.ts
@@ -5,16 +5,12 @@ import {
sealGeneratedAudioSet,
} from "@narratage/generation";
import type { GenerationMediaValue, GenerationRequest } from "@narratage/generation";
-import { canonicalize, digestOf, isDigest } from "@narratage/protocol";
-import type { CanonicalValue, CapabilityRef, Digest } from "@narratage/protocol";
+import { canonicalize } from "@narratage/protocol";
+import type { CanonicalValue, CapabilityRef } from "@narratage/protocol";
import { credentialRef } from "@narratage/runtime";
import type { CredentialRef } from "@narratage/runtime";
export const xiaomiMimoProviderModuleRef = { name: "@narratage/provider-xiaomi-mimo", version: "1" } as const;
-export const xiaomiMimoProviderImplementationDigest = digestOf(
- "@narratage/provider-xiaomi-mimo/chat-completions-tts@1",
-);
-
const mimoModelModule = { name: "@narratage/mimo-tts", version: "1" } as const;
const modelNames = [
"mimo-v2.5-tts",
@@ -32,7 +28,7 @@ type Fetch = typeof globalThis.fetch;
export type CreateXiaomiMimoProviderOptions = {
readonly instance?: string;
- readonly authority?: string;
+ readonly pool?: string;
readonly apiBaseUrl?: string;
readonly apiKey?: CredentialRef;
readonly defaultConcurrency?: number;
@@ -40,7 +36,6 @@ export type CreateXiaomiMimoProviderOptions = {
readonly maxResponseBytes?: number;
readonly maxVoiceSampleBase64Bytes?: number;
readonly fetch?: Fetch;
- readonly fetchImplementationDigest?: Digest;
};
function assert(condition: unknown, message: string): asserts condition {
@@ -171,14 +166,7 @@ export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOption
options.maxVoiceSampleBase64Bytes ?? 10_000_000,
"maxVoiceSampleBase64Bytes",
);
- if (options.fetch !== undefined && options.fetchImplementationDigest === undefined) {
- throw new Error("custom Xiaomi MiMo fetch requires fetchImplementationDigest");
- }
- if (options.fetchImplementationDigest !== undefined && !isDigest(options.fetchImplementationDigest)) {
- throw new Error("Xiaomi MiMo fetchImplementationDigest is invalid");
- }
const fetcher = options.fetch ?? globalThis.fetch;
- const transportDigest = options.fetchImplementationDigest ?? digestOf("@narratage/provider-xiaomi-mimo/global-fetch@1");
const endpointCapabilities = modelNames.map((model) => ({
capability: capabilities[model],
returns: generationTypes.audioSet,
@@ -227,13 +215,7 @@ export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOption
module: xiaomiMimoProviderModuleRef,
facet: "tts",
instance: options.instance ?? "xiaomi-mimo.default",
- authority: options.authority ?? options.instance ?? "xiaomi-mimo.default",
- implementation: {
- digest: xiaomiMimoProviderImplementationDigest,
- },
- configuration: canonicalize({
- apiBaseUrl, requestTimeoutMs, maxResponseBytes, maxVoiceSampleBase64Bytes, transportDigest,
- }),
+ pool: options.pool ?? options.instance ?? "xiaomi-mimo.default",
credentials: { apiKey: options.apiKey ?? credentialRef("env", "MIMO_API_KEY") },
credentialInputs: { apiKey: { label: "Xiaomi MiMo API key" } },
defaultConcurrency: options.defaultConcurrency ?? 2,
diff --git a/packages/provider-xiaomi-mimo/test/provider.test.ts b/packages/provider-xiaomi-mimo/test/provider.test.ts
index d94f68e4..4cc4989a 100644
--- a/packages/provider-xiaomi-mimo/test/provider.test.ts
+++ b/packages/provider-xiaomi-mimo/test/provider.test.ts
@@ -6,10 +6,7 @@ import { generationTypes } from "@narratage/generation";
import { mimoTtsEndpoints, sealMimoTtsRequest } from "@narratage/mimo-tts";
import { digestOf } from "@narratage/protocol";
import type { CanonicalValue, Need } from "@narratage/protocol";
-import {
- createXiaomiMimoProvider,
- xiaomiMimoProviderImplementationDigest,
-} from "@narratage/provider-xiaomi-mimo";
+import { createXiaomiMimoProvider } from "@narratage/provider-xiaomi-mimo";
function need(
endpoint: (typeof mimoTtsEndpoints)[keyof typeof mimoTtsEndpoints],
@@ -30,7 +27,6 @@ function need(
async function invoke(request: Need, artifacts: MemoryArtifactStore, fetch: typeof globalThis.fetch) {
const provider = createXiaomiMimoProvider({
fetch,
- fetchImplementationDigest: digestOf("xiaomi-mimo:test-fetch"),
});
const registry = new EndpointRegistry();
await provider.install(registry);
@@ -117,8 +113,7 @@ test("Provider configuration owns credentials and queue policy, not model semant
assert(facet?.role === "capability-endpoint");
assert.equal(facet.defaultConcurrency, 3);
assert.deepEqual(facet.credentialSlots, ["apiKey"]);
- assert.equal(facet.implementation.digest, xiaomiMimoProviderImplementationDigest);
- assert.equal(provider.bindings.length, 3);
- assert.ok(provider.bindings.every((binding) => binding.returns.name === generationTypes.audioSet.name));
+ assert.equal(provider.offers.length, 3);
+ assert.ok(provider.offers.every((binding) => binding.returns.name === generationTypes.audioSet.name));
assert.equal(JSON.stringify(provider.manifest).includes("voiceDescription"), false);
});
diff --git a/packages/ranking/package.json b/packages/ranking/package.json
index 04ff72bc..51adc25d 100644
--- a/packages/ranking/package.json
+++ b/packages/ranking/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/ranking/src/activation.ts b/packages/ranking/src/activation.ts
index 6a8c3cf6..f128ba2f 100644
--- a/packages/ranking/src/activation.ts
+++ b/packages/ranking/src/activation.ts
@@ -26,8 +26,8 @@ const facets = [
["typewriter", decodeTypewriterListSurface],
] as const;
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: rankingManifest,
}],
@@ -39,4 +39,4 @@ export const svmlPackage = {
})),
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/ranking/src/component.ts b/packages/ranking/src/component.ts
index 36ffa6f8..ef09cbaf 100644
--- a/packages/ranking/src/component.ts
+++ b/packages/ranking/src/component.ts
@@ -9,38 +9,7 @@ import type { SpatialFrame } from "@narratage/spatial";
import type { Text } from "@narratage/text";
import { rankingProducers, rankingTypes } from "./manifest.js";
-import {
- appendColumnItem,
- appendRankingItemSpec,
- appendRankingSound,
- appendTierBoardItem,
- appendTopThreeItem,
- appendTypewriterItem,
- assertColumnProgram,
- assertRankingSchedule,
- assertRankingSoundEventPlan,
- assertTierBoardProgram,
- assertTopThreeProgram,
- assertTypewriterListProgram,
- buildColumnProgram,
- buildColumnSoundEvents,
- buildRankingSchedule,
- buildTierBoardProgram,
- buildTierBoardSoundEvents,
- buildTopThreeProgram,
- buildTopThreeSoundEvents,
- buildTypewriterListProgram,
- buildTypewriterSoundEvents,
- createColumnItemSet,
- createRankingItemSpecSet,
- createRankingSoundSet,
- createTierBoardItemSet,
- createTopThreeItemSet,
- createTypewriterItemSet,
- rankingImplementationDigests,
- rankingValidatorDigests,
- materializeRankingTextItem,
-} from "./schedule.js";
+import { appendColumnItem, appendRankingItemSpec, appendRankingSound, appendTierBoardItem, appendTopThreeItem, appendTypewriterItem, assertColumnProgram, assertRankingSchedule, assertRankingSoundEventPlan, assertTierBoardProgram, assertTopThreeProgram, assertTypewriterListProgram, buildColumnProgram, buildColumnSoundEvents, buildRankingSchedule, buildTierBoardProgram, buildTierBoardSoundEvents, buildTopThreeProgram, buildTopThreeSoundEvents, buildTypewriterListProgram, buildTypewriterSoundEvents, createColumnItemSet, createRankingItemSpecSet, createRankingSoundSet, createTierBoardItemSet, createTopThreeItemSet, createTypewriterItemSet, materializeRankingTextItem } from "./schedule.js";
import {
renderColumn,
renderRankingAudio,
@@ -99,7 +68,6 @@ export const rankingComponent = {
producers: [
{
producer: rankingProducers.materializeTextItem,
- implementationDigest: rankingImplementationDigests.materializeTextItem,
handler: ({ inputs }) => ({ outputs: { spec: output(materializeRankingTextItem(
inline<RankingTextItemShell>(inputs.shell?.value, "RankingTextItemShell"),
inline<Text>(inputs.content?.value, "Text"),
@@ -107,19 +75,16 @@ export const rankingComponent = {
},
{
producer: rankingProducers.createSpecs,
- implementationDigest: rankingImplementationDigests.createSpecs,
handler: ({ inputs }) => ({ outputs: { set: output(createRankingItemSpecSet(inline(inputs.header?.value, "RankingHeader"))) }, needs: {} }),
},
{
producer: rankingProducers.appendSpec,
- implementationDigest: rankingImplementationDigests.appendSpec,
handler: ({ inputs }) => ({ outputs: { set: output(appendRankingItemSpec(
inline(inputs.set?.value, "RankingItemSpecSet"), inline(inputs.spec?.value, "RankingItemSpec"),
)) }, needs: {} }),
},
{
producer: rankingProducers.schedule,
- implementationDigest: rankingImplementationDigests.schedule,
handler: ({ inputs }) => ({ outputs: { schedule: output(buildRankingSchedule({
header: inline(inputs.header?.value, "RankingHeader"), items: inline(inputs.items?.value, "RankingItemSpecSet"),
map: inline(inputs.map?.value, "CompleteSemanticMap"), space: inline(inputs.space?.value, "ProgramSpace"),
@@ -128,17 +93,16 @@ export const rankingComponent = {
})) }, needs: {} }),
},
...([
- [rankingProducers.createTierItems, rankingImplementationDigests.createTierItems, createTierBoardItemSet],
- [rankingProducers.createColumnItems, rankingImplementationDigests.createColumnItems, createColumnItemSet],
- [rankingProducers.createTopThreeItems, rankingImplementationDigests.createTopThreeItems, createTopThreeItemSet],
- [rankingProducers.createTypewriterItems, rankingImplementationDigests.createTypewriterItems, createTypewriterItemSet],
- ] as const).map(([producer, implementationDigest, create]) => ({
- producer, implementationDigest,
+ [rankingProducers.createTierItems, createTierBoardItemSet],
+ [rankingProducers.createColumnItems, createColumnItemSet],
+ [rankingProducers.createTopThreeItems, createTopThreeItemSet],
+ [rankingProducers.createTypewriterItems, createTypewriterItemSet],
+ ] as const).map(([producer, create]) => ({
+ producer,
handler: () => ({ outputs: { set: output(create()) }, needs: {} }),
})),
{
producer: rankingProducers.appendTierItem,
- implementationDigest: rankingImplementationDigests.appendTierItem,
handler: ({ inputs }) => ({ outputs: { set: output(appendTierBoardItem(
inline<TierBoardItemSet>(inputs.set?.value, "TierBoardItemSet"),
inline<TierBoardItemSpec>(inputs.spec?.value, "TierBoardItemSpec"),
@@ -146,10 +110,10 @@ export const rankingComponent = {
)) }, needs: {} }),
},
...([
- [rankingProducers.appendColumnItem, rankingImplementationDigests.appendColumnItem, false],
- [rankingProducers.appendColumnIconItem, rankingImplementationDigests.appendColumnIconItem, true],
- ] as const).map(([producer, implementationDigest, hasIcon]) => ({
- producer, implementationDigest,
+ [rankingProducers.appendColumnItem, false],
+ [rankingProducers.appendColumnIconItem, true],
+ ] as const).map(([producer, hasIcon]) => ({
+ producer,
handler: ({ inputs }: ProducerHandlerContext) => ({ outputs: { set: output(appendColumnItem(
inline<ColumnItemSet>(inputs.set?.value, "ColumnItemSet"),
inline<ColumnItemSpec>(inputs.spec?.value, "ColumnItemSpec"),
@@ -157,10 +121,10 @@ export const rankingComponent = {
)) }, needs: {} }),
})),
...([
- [rankingProducers.appendTopThreeItem, rankingImplementationDigests.appendTopThreeItem, false],
- [rankingProducers.appendTopThreeIconItem, rankingImplementationDigests.appendTopThreeIconItem, true],
- ] as const).map(([producer, implementationDigest, hasIcon]) => ({
- producer, implementationDigest,
+ [rankingProducers.appendTopThreeItem, false],
+ [rankingProducers.appendTopThreeIconItem, true],
+ ] as const).map(([producer, hasIcon]) => ({
+ producer,
handler: ({ inputs }: ProducerHandlerContext) => ({ outputs: { set: output(appendTopThreeItem(
inline<TopThreeItemSet>(inputs.set?.value, "TopThreeItemSet"),
inline<TopThreeItemSpec>(inputs.spec?.value, "TopThreeItemSpec"),
@@ -169,7 +133,6 @@ export const rankingComponent = {
})),
{
producer: rankingProducers.appendTypewriterItem,
- implementationDigest: rankingImplementationDigests.appendTypewriterItem,
handler: ({ inputs }) => ({ outputs: { set: output(appendTypewriterItem(
inline<TypewriterItemSet>(inputs.set?.value, "TypewriterItemSet"),
inline<TypewriterItemSpec>(inputs.spec?.value, "TypewriterItemSpec"),
@@ -177,7 +140,6 @@ export const rankingComponent = {
},
{
producer: rankingProducers.tierProgram,
- implementationDigest: rankingImplementationDigests.tierProgram,
handler: ({ inputs }) => {
const common = programInputs(inputs);
return { outputs: { program: output(buildTierBoardProgram(common.header, common.frame, common.schedule,
@@ -186,7 +148,6 @@ export const rankingComponent = {
},
{
producer: rankingProducers.columnProgram,
- implementationDigest: rankingImplementationDigests.columnProgram,
handler: ({ inputs }) => {
const common = programInputs(inputs);
return { outputs: { program: output(buildColumnProgram(common.header, common.frame, common.schedule,
@@ -195,7 +156,6 @@ export const rankingComponent = {
},
{
producer: rankingProducers.topThreeProgram,
- implementationDigest: rankingImplementationDigests.topThreeProgram,
handler: ({ inputs }) => {
const common = programInputs(inputs);
return { outputs: { program: output(buildTopThreeProgram(common.header, common.frame, common.schedule,
@@ -204,7 +164,6 @@ export const rankingComponent = {
},
{
producer: rankingProducers.typewriterProgram,
- implementationDigest: rankingImplementationDigests.typewriterProgram,
handler: ({ inputs }) => {
const common = programInputs(inputs);
const title = inline<Text>(inputs.title?.value, "Text");
@@ -213,12 +172,12 @@ export const rankingComponent = {
},
},
...([
- [rankingProducers.tierEvents, rankingImplementationDigests.tierEvents, buildTierBoardSoundEvents, "TierBoardStyle"],
- [rankingProducers.columnEvents, rankingImplementationDigests.columnEvents, buildColumnSoundEvents, "ColumnStyle"],
- [rankingProducers.topThreeEvents, rankingImplementationDigests.topThreeEvents, buildTopThreeSoundEvents, "TopThreeStyle"],
- [rankingProducers.typewriterEvents, rankingImplementationDigests.typewriterEvents, buildTypewriterSoundEvents, "TypewriterListStyle"],
- ] as const).map(([producer, implementationDigest, build, styleLabel]) => ({
- producer, implementationDigest,
+ [rankingProducers.tierEvents, buildTierBoardSoundEvents, "TierBoardStyle"],
+ [rankingProducers.columnEvents, buildColumnSoundEvents, "ColumnStyle"],
+ [rankingProducers.topThreeEvents, buildTopThreeSoundEvents, "TopThreeStyle"],
+ [rankingProducers.typewriterEvents, buildTypewriterSoundEvents, "TypewriterListStyle"],
+ ] as const).map(([producer, build, styleLabel]) => ({
+ producer,
handler: ({ inputs }: ProducerHandlerContext) => ({ outputs: { events: output(build(
inline(inputs.schedule?.value, "RankingSchedule"),
inline(inputs.style?.value, styleLabel) as never,
@@ -227,14 +186,13 @@ export const rankingComponent = {
})),
{
producer: rankingProducers.createSounds,
- implementationDigest: rankingImplementationDigests.createSounds,
handler: () => ({ outputs: { sounds: output(createRankingSoundSet()) }, needs: {} }),
},
...([
- [rankingProducers.appendAppearSound, rankingImplementationDigests.appendAppearSound, "appear"],
- [rankingProducers.appendMoveSound, rankingImplementationDigests.appendMoveSound, "move"],
- ] as const).map(([producer, implementationDigest, kind]) => ({
- producer, implementationDigest,
+ [rankingProducers.appendAppearSound, "appear"],
+ [rankingProducers.appendMoveSound, "move"],
+ ] as const).map(([producer, kind]) => ({
+ producer,
handler: ({ inputs }: ProducerHandlerContext) => ({ outputs: { sounds: output(appendRankingSound(
inline<RankingSoundSet>(inputs.sounds?.value, "RankingSoundSet"), kind,
inline<SynchronizedMedia>(inputs.media?.value, `Ranking ${kind} sound`),
@@ -242,7 +200,6 @@ export const rankingComponent = {
})),
{
producer: rankingProducers.renderAudio,
- implementationDigest: rankingImplementationDigests.renderAudio,
handler: ({ inputs }) => ({ outputs: { track: output(renderRankingAudio(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
inline<RankingSoundEventPlan>(inputs.events?.value, "RankingSoundEventPlan"),
@@ -251,29 +208,29 @@ export const rankingComponent = {
)) }, needs: {} }),
},
...([
- [rankingProducers.renderTier, rankingImplementationDigests.renderTier, renderTierBoard, "TierBoardProgram"],
- [rankingProducers.renderColumn, rankingImplementationDigests.renderColumn, renderColumn, "ColumnProgram"],
- [rankingProducers.renderTopThree, rankingImplementationDigests.renderTopThree, renderTopThree, "TopThreeProgram"],
- [rankingProducers.renderTypewriter, rankingImplementationDigests.renderTypewriter, renderTypewriterList, "TypewriterListProgram"],
- ] as const).map(([producer, implementationDigest, render, label]) => ({
- producer, implementationDigest,
+ [rankingProducers.renderTier, renderTierBoard, "TierBoardProgram"],
+ [rankingProducers.renderColumn, renderColumn, "ColumnProgram"],
+ [rankingProducers.renderTopThree, renderTopThree, "TopThreeProgram"],
+ [rankingProducers.renderTypewriter, renderTypewriterList, "TypewriterListProgram"],
+ ] as const).map(([producer, render, label]) => ({
+ producer,
handler: ({ inputs }: ProducerHandlerContext) => ({ outputs: { track: output(render(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline(inputs.program?.value, label) as never,
)) }, needs: {} }),
})),
],
validators: [
- { type: rankingTypes.schedule, implementationDigest: rankingValidatorDigests.schedule,
+ { type: rankingTypes.schedule,
handler: ({ value }) => assertRankingSchedule(inline<RankingSchedule>(value, "RankingSchedule")) },
- { type: rankingTypes.tierProgram, implementationDigest: rankingValidatorDigests.tierProgram,
+ { type: rankingTypes.tierProgram,
handler: ({ value }) => assertTierBoardProgram(inline<TierBoardProgram>(value, "TierBoardProgram")) },
- { type: rankingTypes.columnProgram, implementationDigest: rankingValidatorDigests.columnProgram,
+ { type: rankingTypes.columnProgram,
handler: ({ value }) => assertColumnProgram(inline<ColumnProgram>(value, "ColumnProgram")) },
- { type: rankingTypes.topThreeProgram, implementationDigest: rankingValidatorDigests.topThreeProgram,
+ { type: rankingTypes.topThreeProgram,
handler: ({ value }) => assertTopThreeProgram(inline<TopThreeProgram>(value, "TopThreeProgram")) },
- { type: rankingTypes.typewriterProgram, implementationDigest: rankingValidatorDigests.typewriterProgram,
+ { type: rankingTypes.typewriterProgram,
handler: ({ value }) => assertTypewriterListProgram(inline<TypewriterListProgram>(value, "TypewriterListProgram")) },
- { type: rankingTypes.soundEvents, implementationDigest: rankingValidatorDigests.events,
+ { type: rankingTypes.soundEvents,
handler: ({ value }) => assertRankingSoundEventPlan(inline<RankingSoundEventPlan>(value, "RankingSoundEventPlan")) },
],
} satisfies ComponentPackage;
diff --git a/packages/ranking/src/index.ts b/packages/ranking/src/index.ts
index a880ed96..d90d95ba 100644
--- a/packages/ranking/src/index.ts
+++ b/packages/ranking/src/index.ts
@@ -1,47 +1,4 @@
-export {
- appendRankingItemSpec,
- appendRankingSound,
- appendColumnItem,
- appendTierBoardItem,
- appendTopThreeItem,
- appendTypewriterItem,
- assertColumnProgram,
- assertColumnStyle,
- assertRankingHeader,
- assertRankingItemSpec,
- assertRankingItemSpecSet,
- assertRankingTextItemShell,
- assertRankingSchedule,
- assertRankingSoundEventPlan,
- assertRankingSoundStyle,
- assertTierBoardProgram,
- assertTierBoardStyle,
- assertTopThreeProgram,
- assertTopThreeStyle,
- assertTypewriterListProgram,
- assertTypewriterListStyle,
- buildColumnProgram,
- buildColumnSoundEvents,
- buildRankingSchedule,
- buildTierBoardProgram,
- buildTierBoardSoundEvents,
- buildTopThreeProgram,
- buildTopThreeSoundEvents,
- buildTypewriterListProgram,
- buildTypewriterSoundEvents,
- createColumnItemSet,
- createRankingItemSpecSet,
- createRankingSoundSet,
- createTierBoardItemSet,
- createTopThreeItemSet,
- createTypewriterItemSet,
- graphemes,
- rankingImplementationDigests,
- rankingValidatorDigests,
- sealRankingHeader,
- sealRankingTextItemShell,
- materializeRankingTextItem,
-} from "./schedule.js";
+export { appendRankingItemSpec, appendRankingSound, appendColumnItem, appendTierBoardItem, appendTopThreeItem, appendTypewriterItem, assertColumnProgram, assertColumnStyle, assertRankingHeader, assertRankingItemSpec, assertRankingItemSpecSet, assertRankingTextItemShell, assertRankingSchedule, assertRankingSoundEventPlan, assertRankingSoundStyle, assertTierBoardProgram, assertTierBoardStyle, assertTopThreeProgram, assertTopThreeStyle, assertTypewriterListProgram, assertTypewriterListStyle, buildColumnProgram, buildColumnSoundEvents, buildRankingSchedule, buildTierBoardProgram, buildTierBoardSoundEvents, buildTopThreeProgram, buildTopThreeSoundEvents, buildTypewriterListProgram, buildTypewriterSoundEvents, createColumnItemSet, createRankingItemSpecSet, createRankingSoundSet, createTierBoardItemSet, createTopThreeItemSet, createTypewriterItemSet, graphemes, sealRankingHeader, sealRankingTextItemShell, materializeRankingTextItem } from "./schedule.js";
export {
decodeColumnStyle,
decodeTierBoardStyle,
@@ -58,23 +15,7 @@ export {
export { rankingComponent } from "./component.js";
export { createRankingFragment } from "./fragment.js";
export type { RankingFragmentItem, RankingFragmentSound } from "./fragment.js";
-export {
- rankingDependency,
- rankingHeaderSchema,
- rankingItemSpecSchema,
- rankingTextItemShellSchema,
- rankingItemSpecSetSchema,
- rankingManifest, rankingMarkupSurfaces,
- rankingManifestDigest,
- rankingModuleRef,
- rankingProducers,
- rankingScheduleSchema,
- rankingSoundEventsSchema,
- rankingSoundSetSchema,
- rankingSoundStyleSchema,
- rankingSurfaceImplementationDigests,
- rankingTypes,
-} from "./manifest.js";
+export { rankingDependency, rankingHeaderSchema, rankingItemSpecSchema, rankingTextItemShellSchema, rankingItemSpecSetSchema, rankingManifest, rankingMarkupSurfaces, rankingModuleRef, rankingProducers, rankingScheduleSchema, rankingSoundEventsSchema, rankingSoundSetSchema, rankingSoundStyleSchema, rankingTypes } from "./manifest.js";
export {
decodeColumnStyleSurface,
decodeColumnSurface,
diff --git a/packages/ranking/src/manifest.ts b/packages/ranking/src/manifest.ts
index 53bfcec7..b0f122eb 100644
--- a/packages/ranking/src/manifest.ts
+++ b/packages/ranking/src/manifest.ts
@@ -10,8 +10,6 @@ import { spatialDependency, spatialFrameSchema, spatialTypes } from "@narratage/
import { temporalDependency } from "@narratage/temporal";
import { textDependency, textTypes } from "@narratage/text";
-import { rankingImplementationDigests, rankingValidatorDigests } from "./schedule.js";
-
export const rankingModuleRef = { name: "@narratage/ranking", version: "1" } as const;
export const rankingTypes = {
header: { module: rankingModuleRef, name: "RankingHeader" },
@@ -130,120 +128,106 @@ export const rankingSoundSetSchema: ValueSchema = object({
appear: { schema: object({}, true), optional: true }, move: { schema: object({}, true), optional: true },
});
-export const rankingSurfaceImplementationDigests = {
- tierStyle: digestOf("@narratage/ranking/tier-board-style-surface@1"),
- columnStyle: digestOf("@narratage/ranking/column-style-surface@1"),
- topThreeStyle: digestOf("@narratage/ranking/top-three-style-surface@1"),
- typewriterStyle: digestOf("@narratage/ranking/typewriter-list-style-surface@1"),
- tier: digestOf("@narratage/ranking/tier-board-surface@1"),
- column: digestOf("@narratage/ranking/column-surface@1"),
- topThree: digestOf("@narratage/ranking/top-three-surface@1"),
- typewriter: digestOf("@narratage/ranking/typewriter-list-surface@1"),
-} as const;
-const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
-const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: registered(digest) });
-
const programDefinitions = [
- ["tier", rankingTypes.tierProgram, rankingTypes.tierStyle, rankingTypes.tierItems, rankingProducers.tierProgram, rankingProducers.tierEvents, rankingProducers.renderTier, rankingImplementationDigests.tierProgram, rankingImplementationDigests.tierEvents, rankingImplementationDigests.renderTier],
- ["column", rankingTypes.columnProgram, rankingTypes.columnStyle, rankingTypes.columnItems, rankingProducers.columnProgram, rankingProducers.columnEvents, rankingProducers.renderColumn, rankingImplementationDigests.columnProgram, rankingImplementationDigests.columnEvents, rankingImplementationDigests.renderColumn],
- ["top-three", rankingTypes.topThreeProgram, rankingTypes.topThreeStyle, rankingTypes.topThreeItems, rankingProducers.topThreeProgram, rankingProducers.topThreeEvents, rankingProducers.renderTopThree, rankingImplementationDigests.topThreeProgram, rankingImplementationDigests.topThreeEvents, rankingImplementationDigests.renderTopThree],
- ["typewriter", rankingTypes.typewriterProgram, rankingTypes.typewriterStyle, rankingTypes.typewriterItems, rankingProducers.typewriterProgram, rankingProducers.typewriterEvents, rankingProducers.renderTypewriter, rankingImplementationDigests.typewriterProgram, rankingImplementationDigests.typewriterEvents, rankingImplementationDigests.renderTypewriter],
+ ["tier", rankingTypes.tierProgram, rankingTypes.tierStyle, rankingTypes.tierItems, rankingProducers.tierProgram, rankingProducers.tierEvents, rankingProducers.renderTier],
+ ["column", rankingTypes.columnProgram, rankingTypes.columnStyle, rankingTypes.columnItems, rankingProducers.columnProgram, rankingProducers.columnEvents, rankingProducers.renderColumn],
+ ["top-three", rankingTypes.topThreeProgram, rankingTypes.topThreeStyle, rankingTypes.topThreeItems, rankingProducers.topThreeProgram, rankingProducers.topThreeEvents, rankingProducers.renderTopThree],
+ ["typewriter", rankingTypes.typewriterProgram, rankingTypes.typewriterStyle, rankingTypes.typewriterItems, rankingProducers.typewriterProgram, rankingProducers.typewriterEvents, rankingProducers.renderTypewriter],
] as const;
export const rankingMarkupSurfaces = [
- { name: "tier-style", tag: "TierBoardStyle", mode: "structured", outputs: [rankingTypes.tierStyle, rankingTypes.soundStyle], implementation: { digest: rankingSurfaceImplementationDigests.tierStyle } },
- { name: "column-style", tag: "ColumnStyle", mode: "structured", outputs: [rankingTypes.columnStyle, rankingTypes.soundStyle], implementation: { digest: rankingSurfaceImplementationDigests.columnStyle } },
- { name: "top-three-style", tag: "TopThreeStyle", mode: "structured", outputs: [rankingTypes.topThreeStyle, rankingTypes.soundStyle], implementation: { digest: rankingSurfaceImplementationDigests.topThreeStyle } },
- { name: "typewriter-style", tag: "TypewriterListStyle", mode: "structured", outputs: [rankingTypes.typewriterStyle, rankingTypes.soundStyle], implementation: { digest: rankingSurfaceImplementationDigests.typewriterStyle } },
- { name: "tier", tag: "TierBoard", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.schedule, rankingTypes.tierProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.tier } },
- { name: "column", tag: "Column", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.columnProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.column } },
- { name: "top-three", tag: "TopThree", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.topThreeProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.topThree } },
- { name: "typewriter", tag: "TypewriterList", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.textItemShell, textTypes.text, rankingTypes.schedule, rankingTypes.typewriterProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.typewriter } },
+ { name: "tier-style", tag: "TierBoardStyle", mode: "structured", outputs: [rankingTypes.tierStyle, rankingTypes.soundStyle] },
+ { name: "column-style", tag: "ColumnStyle", mode: "structured", outputs: [rankingTypes.columnStyle, rankingTypes.soundStyle] },
+ { name: "top-three-style", tag: "TopThreeStyle", mode: "structured", outputs: [rankingTypes.topThreeStyle, rankingTypes.soundStyle] },
+ { name: "typewriter-style", tag: "TypewriterListStyle", mode: "structured", outputs: [rankingTypes.typewriterStyle, rankingTypes.soundStyle] },
+ { name: "tier", tag: "TierBoard", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.schedule, rankingTypes.tierProgram, compositionTypes.visualTrack, compositionTypes.audioTrack] },
+ { name: "column", tag: "Column", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.columnProgram, compositionTypes.visualTrack, compositionTypes.audioTrack] },
+ { name: "top-three", tag: "TopThree", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.topThreeProgram, compositionTypes.visualTrack, compositionTypes.audioTrack] },
+ { name: "typewriter", tag: "TypewriterList", mode: "structured", outputs: [rankingTypes.header, rankingTypes.itemSpec, rankingTypes.textItemShell, textTypes.text, rankingTypes.schedule, rankingTypes.typewriterProgram, compositionTypes.visualTrack, compositionTypes.audioTrack] },
] as const;
export const rankingManifest: ModuleManifest = {
- format: "svml.module@1", name: rankingModuleRef.name, version: rankingModuleRef.version,
+ format: "narratage.module@1", name: rankingModuleRef.name, version: rankingModuleRef.version,
dependencies: [artifactDependency, mediaDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, compositionDependency, textDependency],
types: [
- { name: rankingTypes.header.name, schema: rankingHeaderSchema },
- { name: rankingTypes.itemSpec.name, schema: rankingItemSpecSchema },
- { name: rankingTypes.textItemShell.name, schema: rankingTextItemShellSchema },
- { name: rankingTypes.itemSpecs.name, schema: rankingItemSpecSetSchema },
- { name: rankingTypes.schedule.name, schema: rankingScheduleSchema, validator: validator(rankingValidatorDigests.schedule) },
- { name: rankingTypes.soundStyle.name, schema: rankingSoundStyleSchema },
- { name: rankingTypes.soundEvents.name, schema: rankingSoundEventsSchema, validator: validator(rankingValidatorDigests.events) },
- { name: rankingTypes.sounds.name, schema: rankingSoundSetSchema },
- { name: rankingTypes.tierStyle.name, schema: styleSchema() },
- { name: rankingTypes.columnStyle.name, schema: styleSchema() },
- { name: rankingTypes.topThreeStyle.name, schema: styleSchema() },
- { name: rankingTypes.typewriterStyle.name, schema: styleSchema() },
- { name: rankingTypes.tierItems.name, schema: setSchema() },
- { name: rankingTypes.columnItems.name, schema: setSchema() },
- { name: rankingTypes.topThreeItems.name, schema: setSchema() },
- { name: rankingTypes.typewriterItems.name, schema: setSchema() },
- { name: rankingTypes.tierProgram.name, schema: programSchema(), validator: validator(rankingValidatorDigests.tierProgram) },
- { name: rankingTypes.columnProgram.name, schema: programSchema(), validator: validator(rankingValidatorDigests.columnProgram) },
- { name: rankingTypes.topThreeProgram.name, schema: programSchema(), validator: validator(rankingValidatorDigests.topThreeProgram) },
- { name: rankingTypes.typewriterProgram.name, schema: programSchema(), validator: validator(rankingValidatorDigests.typewriterProgram) },
+ { name: rankingTypes.header.name },
+ { name: rankingTypes.itemSpec.name },
+ { name: rankingTypes.textItemShell.name },
+ { name: rankingTypes.itemSpecs.name },
+ { name: rankingTypes.schedule.name },
+ { name: rankingTypes.soundStyle.name },
+ { name: rankingTypes.soundEvents.name },
+ { name: rankingTypes.sounds.name },
+ { name: rankingTypes.tierStyle.name },
+ { name: rankingTypes.columnStyle.name },
+ { name: rankingTypes.topThreeStyle.name },
+ { name: rankingTypes.typewriterStyle.name },
+ { name: rankingTypes.tierItems.name },
+ { name: rankingTypes.columnItems.name },
+ { name: rankingTypes.topThreeItems.name },
+ { name: rankingTypes.typewriterItems.name },
+ { name: rankingTypes.tierProgram.name },
+ { name: rankingTypes.columnProgram.name },
+ { name: rankingTypes.topThreeProgram.name },
+ { name: rankingTypes.typewriterProgram.name },
],
capabilities: [],
producers: [
- { name: rankingProducers.materializeTextItem.name, inputs: [{ name: "shell", type: rankingTypes.textItemShell }, { name: "content", type: textTypes.text }], outputs: [{ name: "spec", type: rankingTypes.itemSpec }], needs: [], implementation: registered(rankingImplementationDigests.materializeTextItem) },
- { name: rankingProducers.createSpecs.name, inputs: [{ name: "header", type: rankingTypes.header }], outputs: [{ name: "set", type: rankingTypes.itemSpecs }], needs: [], implementation: registered(rankingImplementationDigests.createSpecs) },
- { name: rankingProducers.appendSpec.name, inputs: [{ name: "set", type: rankingTypes.itemSpecs }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type: rankingTypes.itemSpecs }], needs: [], implementation: registered(rankingImplementationDigests.appendSpec) },
+ { name: rankingProducers.materializeTextItem.name, inputs: [{ name: "shell", type: rankingTypes.textItemShell }, { name: "content", type: textTypes.text }], outputs: [{ name: "spec", type: rankingTypes.itemSpec }], needs: [] },
+ { name: rankingProducers.createSpecs.name, inputs: [{ name: "header", type: rankingTypes.header }], outputs: [{ name: "set", type: rankingTypes.itemSpecs }], needs: [] },
+ { name: rankingProducers.appendSpec.name, inputs: [{ name: "set", type: rankingTypes.itemSpecs }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type: rankingTypes.itemSpecs }], needs: [] },
{ name: rankingProducers.schedule.name, inputs: [
{ name: "header", type: rankingTypes.header }, { name: "items", type: rankingTypes.itemSpecs },
{ name: "map", type: semanticMapTypes.complete }, { name: "space", type: programSpaceTypes.programSpace },
{ name: "outer", type: narrativeTypes.selection }, { name: "triggers", type: narrativeTypes.moment }, { name: "terminal", type: narrativeTypes.moment },
- ], outputs: [{ name: "schedule", type: rankingTypes.schedule }], needs: [], implementation: registered(rankingImplementationDigests.schedule) },
+ ], outputs: [{ name: "schedule", type: rankingTypes.schedule }], needs: [] },
...([
- [rankingProducers.createTierItems, rankingTypes.tierItems, rankingImplementationDigests.createTierItems],
- [rankingProducers.createColumnItems, rankingTypes.columnItems, rankingImplementationDigests.createColumnItems],
- [rankingProducers.createTopThreeItems, rankingTypes.topThreeItems, rankingImplementationDigests.createTopThreeItems],
- [rankingProducers.createTypewriterItems, rankingTypes.typewriterItems, rankingImplementationDigests.createTypewriterItems],
- ] as const).map(([producer, type, implementationDigest]) => ({
- name: producer.name, inputs: [], outputs: [{ name: "set", type }], needs: [], implementation: registered(implementationDigest),
+ [rankingProducers.createTierItems, rankingTypes.tierItems],
+ [rankingProducers.createColumnItems, rankingTypes.columnItems],
+ [rankingProducers.createTopThreeItems, rankingTypes.topThreeItems],
+ [rankingProducers.createTypewriterItems, rankingTypes.typewriterItems],
+ ] as const).map(([producer, type]) => ({
+ name: producer.name, inputs: [], outputs: [{ name: "set", type }], needs: [],
})),
- { name: rankingProducers.appendTierItem.name, inputs: [{ name: "set", type: rankingTypes.tierItems }, { name: "spec", type: rankingTypes.itemSpec }, { name: "icon", type: mediaTypes.blobArtifact }], outputs: [{ name: "set", type: rankingTypes.tierItems }], needs: [], implementation: registered(rankingImplementationDigests.appendTierItem) },
+ { name: rankingProducers.appendTierItem.name, inputs: [{ name: "set", type: rankingTypes.tierItems }, { name: "spec", type: rankingTypes.itemSpec }, { name: "icon", type: mediaTypes.blobArtifact }], outputs: [{ name: "set", type: rankingTypes.tierItems }], needs: [] },
...([
- [rankingProducers.appendColumnItem, rankingTypes.columnItems, rankingImplementationDigests.appendColumnItem],
- [rankingProducers.appendTopThreeItem, rankingTypes.topThreeItems, rankingImplementationDigests.appendTopThreeItem],
- ] as const).map(([producer, type, implementationDigest]) => ({
- name: producer.name, inputs: [{ name: "set", type }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type }], needs: [], implementation: registered(implementationDigest),
+ [rankingProducers.appendColumnItem, rankingTypes.columnItems],
+ [rankingProducers.appendTopThreeItem, rankingTypes.topThreeItems],
+ ] as const).map(([producer, type]) => ({
+ name: producer.name, inputs: [{ name: "set", type }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type }], needs: [],
})),
...([
- [rankingProducers.appendColumnIconItem, rankingTypes.columnItems, rankingImplementationDigests.appendColumnIconItem],
- [rankingProducers.appendTopThreeIconItem, rankingTypes.topThreeItems, rankingImplementationDigests.appendTopThreeIconItem],
- ] as const).map(([producer, type, implementationDigest]) => ({
- name: producer.name, inputs: [{ name: "set", type }, { name: "spec", type: rankingTypes.itemSpec }, { name: "icon", type: mediaTypes.blobArtifact }], outputs: [{ name: "set", type }], needs: [], implementation: registered(implementationDigest),
+ [rankingProducers.appendColumnIconItem, rankingTypes.columnItems],
+ [rankingProducers.appendTopThreeIconItem, rankingTypes.topThreeItems],
+ ] as const).map(([producer, type]) => ({
+ name: producer.name, inputs: [{ name: "set", type }, { name: "spec", type: rankingTypes.itemSpec }, { name: "icon", type: mediaTypes.blobArtifact }], outputs: [{ name: "set", type }], needs: [],
})),
- { name: rankingProducers.appendTypewriterItem.name, inputs: [{ name: "set", type: rankingTypes.typewriterItems }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type: rankingTypes.typewriterItems }], needs: [], implementation: registered(rankingImplementationDigests.appendTypewriterItem) },
- ...programDefinitions.flatMap(([name, programType, styleType, setType, programProducer, eventProducer, renderProducer, programDigest, eventDigest, renderDigest]) => [
+ { name: rankingProducers.appendTypewriterItem.name, inputs: [{ name: "set", type: rankingTypes.typewriterItems }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type: rankingTypes.typewriterItems }], needs: [] },
+ ...programDefinitions.flatMap(([name, programType, styleType, setType, programProducer, eventProducer, renderProducer]) => [
{ name: programProducer.name, inputs: [
{ name: "header", type: rankingTypes.header },
...(name === "typewriter" ? [{ name: "title", type: textTypes.text }] : []),
{ name: "frame", type: spatialTypes.frame }, { name: "schedule", type: rankingTypes.schedule },
{ name: "style", type: styleType }, { name: "set", type: setType },
- ], outputs: [{ name: "program", type: programType }], needs: [], implementation: registered(programDigest) },
+ ], outputs: [{ name: "program", type: programType }], needs: [] },
{ name: eventProducer.name, inputs: [
{ name: "schedule", type: rankingTypes.schedule }, { name: "style", type: styleType }, { name: "specs", type: rankingTypes.itemSpecs },
- ], outputs: [{ name: "events", type: rankingTypes.soundEvents }], needs: [], implementation: registered(eventDigest) },
- { name: renderProducer.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: programType }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered(renderDigest) },
+ ], outputs: [{ name: "events", type: rankingTypes.soundEvents }], needs: [] },
+ { name: renderProducer.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: programType }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
]),
- { name: rankingProducers.createSounds.name, inputs: [], outputs: [{ name: "sounds", type: rankingTypes.sounds }], needs: [], implementation: registered(rankingImplementationDigests.createSounds) },
+ { name: rankingProducers.createSounds.name, inputs: [], outputs: [{ name: "sounds", type: rankingTypes.sounds }], needs: [] },
...([
- [rankingProducers.appendAppearSound, rankingImplementationDigests.appendAppearSound],
- [rankingProducers.appendMoveSound, rankingImplementationDigests.appendMoveSound],
- ] as const).map(([producer, implementationDigest]) => ({
- name: producer.name, inputs: [{ name: "sounds", type: rankingTypes.sounds }, { name: "media", type: mediaTypes.synchronized }], outputs: [{ name: "sounds", type: rankingTypes.sounds }], needs: [], implementation: registered(implementationDigest),
+ rankingProducers.appendAppearSound,
+ rankingProducers.appendMoveSound,
+ ] as const).map((producer) => ({
+ name: producer.name, inputs: [{ name: "sounds", type: rankingTypes.sounds }, { name: "media", type: mediaTypes.synchronized }], outputs: [{ name: "sounds", type: rankingTypes.sounds }], needs: [],
})),
{ name: rankingProducers.renderAudio.name, inputs: [
{ name: "space", type: programSpaceTypes.programSpace }, { name: "events", type: rankingTypes.soundEvents },
{ name: "style", type: rankingTypes.soundStyle }, { name: "sounds", type: rankingTypes.sounds },
- ], outputs: [{ name: "track", type: compositionTypes.audioTrack }], needs: [], implementation: registered(rankingImplementationDigests.renderAudio) },
+ ], outputs: [{ name: "track", type: compositionTypes.audioTrack }], needs: [] },
],
};
-export const rankingManifestDigest = digestOf(rankingManifest);
-export const rankingDependency = { module: rankingModuleRef, digest: rankingManifestDigest } as const;
+export const rankingDependency = { module: rankingModuleRef } as const;
diff --git a/packages/ranking/src/render.ts b/packages/ranking/src/render.ts
index 41cc467f..c53a73d5 100644
--- a/packages/ranking/src/render.ts
+++ b/packages/ranking/src/render.ts
@@ -248,7 +248,7 @@ function directItemAnimation(duration: number, appearFrames: number): VisualAnim
}
function sealTrack(space: ProgramSpace, id: string, presents: readonly VisualPresent[]): VisualTrack {
- const value = sealVisualTrack({ visualIr: "svml.visual-ir@1", id, presents });
+ const value = sealVisualTrack({ visualIr: "narratage.visual-ir@1", id, presents });
assertVisualTrackIdentity(value, space);
return value;
}
diff --git a/packages/ranking/src/schedule.ts b/packages/ranking/src/schedule.ts
index 0c349412..fdd3f083 100644
--- a/packages/ranking/src/schedule.ts
+++ b/packages/ranking/src/schedule.ts
@@ -59,48 +59,6 @@ import type {
TypewriterListStyle,
} from "./types.js";
-export const rankingImplementationDigests = {
- createSpecs: digestOf("@narratage/ranking/create-item-specs@1"),
- appendSpec: digestOf("@narratage/ranking/append-item-spec@1"),
- schedule: digestOf("@narratage/ranking/build-schedule@1"),
- createTierItems: digestOf("@narratage/ranking/create-tier-items@1"),
- appendTierItem: digestOf("@narratage/ranking/append-tier-item@1"),
- createColumnItems: digestOf("@narratage/ranking/create-column-items@1"),
- appendColumnItem: digestOf("@narratage/ranking/append-column-item@1"),
- appendColumnIconItem: digestOf("@narratage/ranking/append-column-icon-item@1"),
- createTopThreeItems: digestOf("@narratage/ranking/create-top-three-items@1"),
- appendTopThreeItem: digestOf("@narratage/ranking/append-top-three-item@1"),
- appendTopThreeIconItem: digestOf("@narratage/ranking/append-top-three-icon-item@1"),
- createTypewriterItems: digestOf("@narratage/ranking/create-typewriter-items@1"),
- appendTypewriterItem: digestOf("@narratage/ranking/append-typewriter-item@1"),
- tierProgram: digestOf("@narratage/ranking/build-tier-board-program@1"),
- columnProgram: digestOf("@narratage/ranking/build-column-program@1"),
- topThreeProgram: digestOf("@narratage/ranking/build-top-three-program@1"),
- typewriterProgram: digestOf("@narratage/ranking/build-typewriter-list-program@1"),
- tierEvents: digestOf("@narratage/ranking/build-tier-board-sound-events@1"),
- columnEvents: digestOf("@narratage/ranking/build-column-sound-events@1"),
- topThreeEvents: digestOf("@narratage/ranking/build-top-three-sound-events@1"),
- typewriterEvents: digestOf("@narratage/ranking/build-typewriter-list-sound-events@1"),
- createSounds: digestOf("@narratage/ranking/create-sounds@1"),
- appendAppearSound: digestOf("@narratage/ranking/append-appear-sound@1"),
- appendMoveSound: digestOf("@narratage/ranking/append-move-sound@1"),
- renderAudio: digestOf("@narratage/ranking/render-audio@1"),
- renderTier: digestOf("@narratage/ranking/render-tier-board@1"),
- renderColumn: digestOf("@narratage/ranking/render-column@1"),
- renderTopThree: digestOf("@narratage/ranking/render-top-three@1"),
- renderTypewriter: digestOf("@narratage/ranking/render-typewriter-list@1"),
- materializeTextItem: digestOf("@narratage/ranking/materialize-text-item@1"),
-} as const;
-
-export const rankingValidatorDigests = {
- schedule: digestOf("@narratage/ranking/validate-schedule@1"),
- tierProgram: digestOf("@narratage/ranking/validate-tier-board-program@1"),
- columnProgram: digestOf("@narratage/ranking/validate-column-program@1"),
- topThreeProgram: digestOf("@narratage/ranking/validate-top-three-program@1"),
- typewriterProgram: digestOf("@narratage/ranking/validate-typewriter-list-program@1"),
- events: digestOf("@narratage/ranking/validate-sound-events@1"),
-} as const;
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
diff --git a/packages/raster/package.json b/packages/raster/package.json
index f0baefb8..2319b0b3 100644
--- a/packages/raster/package.json
+++ b/packages/raster/package.json
@@ -5,7 +5,7 @@
"private": true,
"type": "module",
"exports": { ".": "./src/index.ts" },
- "svml": { "activation": "./src/activation.ts" },
+ "narratage": { "activation": "./src/activation.ts" },
"dependencies": {
"@narratage/artifact": "workspace:*",
"@narratage/protocol": "workspace:*",
diff --git a/packages/raster/src/activation.ts b/packages/raster/src/activation.ts
index c02009e4..e41eb526 100644
--- a/packages/raster/src/activation.ts
+++ b/packages/raster/src/activation.ts
@@ -1,7 +1,7 @@
import { rasterManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: rasterManifest }],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/raster/src/index.ts b/packages/raster/src/index.ts
index 3e38e161..6161ba0f 100644
--- a/packages/raster/src/index.ts
+++ b/packages/raster/src/index.ts
@@ -1,4 +1,4 @@
-export { rasterCapabilities, rasterDependency, rasterManifest, rasterManifestDigest, rasterModuleRef } from "./manifest.js";
+export { rasterCapabilities, rasterDependency, rasterManifest, rasterModuleRef } from "./manifest.js";
export { rasterTransformOperationSchema } from "./schema.js";
export {
assertRasterRequest, assertRasterTransformOperations, rasterComposeRequest,
diff --git a/packages/raster/src/manifest.ts b/packages/raster/src/manifest.ts
index e7b02284..f40d2271 100644
--- a/packages/raster/src/manifest.ts
+++ b/packages/raster/src/manifest.ts
@@ -7,10 +7,9 @@ export const rasterCapabilities = {
execute: { module: rasterModuleRef, name: "execute-raster" },
} satisfies Record<string, CapabilityRef>;
export const rasterManifest: ModuleManifest = {
- format: "svml.module@1", name: rasterModuleRef.name, version: rasterModuleRef.version,
+ format: "narratage.module@1", name: rasterModuleRef.name, version: rasterModuleRef.version,
dependencies: [artifactDependency], types: [],
capabilities: [{ name: rasterCapabilities.execute.name, returns: artifactTypes.blob }],
producers: [],
};
-export const rasterManifestDigest = digestOf(rasterManifest);
-export const rasterDependency = { module: rasterModuleRef, digest: rasterManifestDigest } as const;
+export const rasterDependency = { module: rasterModuleRef } as const;
diff --git a/packages/render-hyperframes/package.json b/packages/render-hyperframes/package.json
index 6285a306..cf81be77 100644
--- a/packages/render-hyperframes/package.json
+++ b/packages/render-hyperframes/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/render-hyperframes/src/activation.ts b/packages/render-hyperframes/src/activation.ts
index f0073b82..c467c5f1 100644
--- a/packages/render-hyperframes/src/activation.ts
+++ b/packages/render-hyperframes/src/activation.ts
@@ -5,8 +5,8 @@ import {
renderHyperframesMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: renderHyperframesManifest }],
components: [renderHyperframesComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -15,4 +15,4 @@ export const svmlPackage = {
handler: decodeHyperframesRenderSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/render-hyperframes/src/component.ts b/packages/render-hyperframes/src/component.ts
index 75774a17..15b30e25 100644
--- a/packages/render-hyperframes/src/component.ts
+++ b/packages/render-hyperframes/src/component.ts
@@ -1,17 +1,13 @@
import type { ComponentPackage } from "@narratage/component-kit";
import type { StoredValue } from "@narratage/protocol";
-import {
- hyperframesVisualRequest,
- requestHyperframesVisualImplementationDigest,
-} from "./product.js";
+import { hyperframesVisualRequest } from "./product.js";
import { renderHyperframesProducers } from "./manifest.js";
/** Declares the visual Need. It contains no renderer, queue, credentials or deployment choice. */
export const renderHyperframesComponent = {
producers: [{
producer: renderHyperframesProducers.requestVisual,
- implementationDigest: requestHyperframesVisualImplementationDigest,
handler: ({ inputs }) => ({
outputs: {},
needs: {
diff --git a/packages/render-hyperframes/src/index.ts b/packages/render-hyperframes/src/index.ts
index 05780acc..55717a9a 100644
--- a/packages/render-hyperframes/src/index.ts
+++ b/packages/render-hyperframes/src/index.ts
@@ -1,15 +1,5 @@
export { renderHyperframesFragment } from "./fragment.js";
export { renderHyperframesComponent } from "./component.js";
-export {
- renderHyperframesCapabilities,
- renderHyperframesManifest, renderHyperframesMarkupSurfaces,
- renderHyperframesManifestDigest,
- renderHyperframesModuleRef,
- renderHyperframesProducers,
- renderHyperframesSurfaceImplementationDigest,
-} from "./manifest.js";
-export {
- hyperframesVisualRequest,
- requestHyperframesVisualImplementationDigest,
-} from "./product.js";
+export { renderHyperframesCapabilities, renderHyperframesManifest, renderHyperframesMarkupSurfaces, renderHyperframesModuleRef, renderHyperframesProducers } from "./manifest.js";
+export { hyperframesVisualRequest } from "./product.js";
export { decodeHyperframesRenderSurface } from "./surface.js";
diff --git a/packages/render-hyperframes/src/manifest.ts b/packages/render-hyperframes/src/manifest.ts
index 85513d6e..fea3e6e3 100644
--- a/packages/render-hyperframes/src/manifest.ts
+++ b/packages/render-hyperframes/src/manifest.ts
@@ -3,7 +3,6 @@ import { mediaDependency, mediaTypes } from "@narratage/media";
import { compositionDependency } from "@narratage/composition";
import {
hyperframesManifest,
- hyperframesManifestDigest,
hyperframesModuleRef,
hyperframesTypes,
} from "@narratage/hyperframes";
@@ -14,16 +13,10 @@ import type {
ProducerRef,
} from "@narratage/protocol";
import {
- mediaPipelineManifestDigest,
mediaPipelineModuleRef,
} from "@narratage/media-pipeline";
-import {
- requestHyperframesVisualImplementationDigest,
-} from "./product.js";
-
export const renderHyperframesModuleRef = { name: "@narratage/render-hyperframes", version: "1" } as const;
-export const renderHyperframesSurfaceImplementationDigest = digestOf("@narratage/render-hyperframes/surface@1");
export const renderHyperframesCapabilities = {
renderVisual: { module: renderHyperframesModuleRef, name: "render-visual" },
} satisfies Record<string, CapabilityRef>;
@@ -36,22 +29,19 @@ export const renderHyperframesMarkupSurfaces = [{
tag: "Video",
mode: "structured",
outputs: [],
- implementation: {
- digest: renderHyperframesSurfaceImplementationDigest,
- },
}] as const;
export const renderHyperframesManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: renderHyperframesModuleRef.name,
version: renderHyperframesModuleRef.version,
dependencies: [
artifactDependency,
mediaDependency,
compositionDependency,
- { module: hyperframesModuleRef, digest: hyperframesManifestDigest },
- { module: mediaPipelineModuleRef, digest: mediaPipelineManifestDigest },
+ { module: hyperframesModuleRef },
+ { module: mediaPipelineModuleRef },
],
types: [],
capabilities: [{
@@ -68,11 +58,6 @@ export const renderHyperframesManifest: ModuleManifest = {
capability: renderHyperframesCapabilities.renderVisual,
returns: mediaTypes.renderedVisual,
}],
- implementation: {
- digest: requestHyperframesVisualImplementationDigest,
- },
},
],
};
-
-export const renderHyperframesManifestDigest = digestOf(renderHyperframesManifest);
diff --git a/packages/render-hyperframes/src/product.ts b/packages/render-hyperframes/src/product.ts
index fa479841..6eb70d86 100644
--- a/packages/render-hyperframes/src/product.ts
+++ b/packages/render-hyperframes/src/product.ts
@@ -3,8 +3,6 @@ import type { CanonicalValue } from "@narratage/protocol";
import { assertHyperframesDocument } from "@narratage/hyperframes";
import type { HyperframesDocument } from "@narratage/hyperframes";
-export const requestHyperframesVisualImplementationDigest = digestOf("@narratage/render-hyperframes/request-visual@1");
-
export function hyperframesVisualRequest(document: HyperframesDocument): CanonicalValue {
assertHyperframesDocument(document);
return {
diff --git a/packages/render-hyperframes/test/render.test.ts b/packages/render-hyperframes/test/render.test.ts
index d336faab..b1a625b0 100644
--- a/packages/render-hyperframes/test/render.test.ts
+++ b/packages/render-hyperframes/test/render.test.ts
@@ -311,10 +311,9 @@ const fixtureSurfaceDigest = digestOf("example.composition-fixture/surface@1");
const fixtureSurface = {
name: "composition", tag: "Composition", mode: "structured",
outputs: [compositionTypes.composition, programSpaceTypes.programSpace],
- implementation: { digest: fixtureSurfaceDigest },
} as const;
const fixtureManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: fixtureModule.name,
version: fixtureModule.version,
dependencies: [compositionDependency, programSpaceDependency],
diff --git a/packages/run-markup/package.json b/packages/run-markup/package.json
index 9e75687c..6a59da1c 100644
--- a/packages/run-markup/package.json
+++ b/packages/run-markup/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/run-markup/src/activation.ts b/packages/run-markup/src/activation.ts
index 89539abd..4b509f79 100644
--- a/packages/run-markup/src/activation.ts
+++ b/packages/run-markup/src/activation.ts
@@ -2,9 +2,9 @@ import { createRunFrontendHostFacet } from "@narratage/run";
import { runMarkupFrontend } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [createRunFrontendHostFacet(runMarkupFrontend)],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/run-markup/src/frontend.ts b/packages/run-markup/src/frontend.ts
index b9cb28a7..4a2becca 100644
--- a/packages/run-markup/src/frontend.ts
+++ b/packages/run-markup/src/frontend.ts
@@ -4,11 +4,9 @@ import type { RunFrontend } from "@narratage/run";
import { parseRunDocument } from "./syntax.js";
export const runMarkupFrontendId = "@narratage/run-markup@1";
-export const runMarkupFrontendImplementationDigest = digestOf("@narratage/run-markup/frontend@1");
export const runMarkupFrontend: RunFrontend = {
id: runMarkupFrontendId,
- implementationDigest: runMarkupFrontendImplementationDigest,
discover(source) {
const document = parseRunDocument(source.name, source.text);
return { author: document.author, imports: document.imports };
diff --git a/packages/run-markup/src/index.ts b/packages/run-markup/src/index.ts
index c2afaeac..d1cf6b57 100644
--- a/packages/run-markup/src/index.ts
+++ b/packages/run-markup/src/index.ts
@@ -1,8 +1,4 @@
-export {
- runMarkupFrontend,
- runMarkupFrontendId,
- runMarkupFrontendImplementationDigest,
-} from "./frontend.js";
+export { runMarkupFrontend, runMarkupFrontendId } from "./frontend.js";
export {
parseRunDocument,
RunSyntaxError,
diff --git a/packages/run-markup/src/syntax.ts b/packages/run-markup/src/syntax.ts
index cab3ff9c..f70ad809 100644
--- a/packages/run-markup/src/syntax.ts
+++ b/packages/run-markup/src/syntax.ts
@@ -266,7 +266,7 @@ function parseRunDocumentBody(name: string, text: string): RunDocument {
unique(targets.map((item) => item.output), "Run target", root);
if (targets.length === 0) fail(root, "RUN_TARGETS", "<svrun> requires at least one <target>");
return {
- format: "svml.run-document@1",
+ format: "narratage.run-document@1",
author,
imports,
targets,
diff --git a/packages/run-markup/test/run.test.ts b/packages/run-markup/test/run.test.ts
index c537377a..783c6edb 100644
--- a/packages/run-markup/test/run.test.ts
+++ b/packages/run-markup/test/run.test.ts
@@ -33,13 +33,13 @@ const defaultProducer = { module: moduleRef, name: "default" } satisfies Produce
const previewProducer = { module: moduleRef, name: "preview" } satisfies ProducerRef;
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: moduleRef.name,
version: moduleRef.version,
dependencies: [],
types: [
- { name: promptType.name, schema: { kind: "string" } },
- { name: mediaType.name, schema: { kind: "string" } },
+ { name: promptType.name },
+ { name: mediaType.name },
],
capabilities: [],
producers: [defaultProducer, previewProducer].map((producer) => ({
@@ -47,9 +47,6 @@ const manifest: ModuleManifest = {
inputs: [{ name: "prompt", type: promptType }],
outputs: [{ name: "media", type: mediaType }],
needs: [],
- implementation: {
- digest: digestOf(`example.run/${producer.name}@1`),
- },
})),
};
diff --git a/packages/run/README.md b/packages/run/README.md
index 50d6b489..35ffc6dc 100644
--- a/packages/run/README.md
+++ b/packages/run/README.md
@@ -17,7 +17,7 @@ CLI flags.
`RunSourceClosure` separately binds original source bytes, Frontend id/implementation and decoded
semantic meaning. `RunFragmentRegistry` accepts trusted Fragment packages only through the
-`svml.run-fragment-host@1` Host-facet installer. Package loading does not interpret Fragment code.
+`narratage.run-fragment-host@1` Host-facet installer. Package loading does not interpret Fragment code.
The optional official XML-like syntax lives in `@narratage/run-markup`. Another trusted Frontend can emit
the same `RunDocument` without changing this package or Core.
diff --git a/packages/run/src/facet.ts b/packages/run/src/facet.ts
index 7682402d..671cd464 100644
--- a/packages/run/src/facet.ts
+++ b/packages/run/src/facet.ts
@@ -6,7 +6,7 @@ import type {
RunFragmentPackage,
} from "./types.js";
-export const runFragmentHostAbi = "svml.run-fragment-host@1";
+export const runFragmentHostAbi = "narratage.run-fragment-host@1";
export type RunFragmentHostFacetIdentity = {
readonly exports: readonly {
diff --git a/packages/run/src/frontend.ts b/packages/run/src/frontend.ts
index b44dd8e9..9bedad04 100644
--- a/packages/run/src/frontend.ts
+++ b/packages/run/src/frontend.ts
@@ -1,6 +1,5 @@
import {
digestOf,
- isDigest,
} from "@narratage/protocol";
import {
compiledSourceIdentity,
@@ -39,7 +38,6 @@ export class RunFrontendRegistry implements RunFrontendRegistryLike {
register(frontend: RunFrontend): void {
assert(frontend.id.trim().length > 0, "EMPTY_RUN_FRONTEND", "Run Frontend id is empty");
- assert(isDigest(frontend.implementationDigest), "INVALID_RUN_FRONTEND_DIGEST", `${frontend.id} digest is invalid`);
assert(!this.#frontends.has(frontend.id), "DUPLICATE_RUN_FRONTEND", `${frontend.id} is already registered`, frontend.id);
this.#frontends.set(frontend.id, frontend);
}
@@ -60,7 +58,7 @@ export function prepareRunSource(source: RunSourceUnit): RunFrontendSourceUnit {
function closureContent(closure: RunSourceClosure): Omit<RunSourceClosure, "id"> {
return {
- format: "svml.run-source-closure@1",
+ format: "narratage.run-source-closure@1",
...compiledSourceIdentity(closure),
};
}
@@ -72,12 +70,10 @@ export async function compileRunSource(
const prepared = prepareRunSource(source);
const frontend = frontends.resolve(prepared.header.using);
assert(frontend !== undefined, "UNKNOWN_RUN_FRONTEND", `Run Frontend ${prepared.header.using} is not registered`, prepared.header.using);
- assert(isDigest(frontend.implementationDigest), "INVALID_RUN_FRONTEND_DIGEST", `${frontend.id} digest is invalid`);
const decoded = await frontend.decode(prepared);
const closureWithoutId = {
- format: "svml.run-source-closure@1" as const,
+ format: "narratage.run-source-closure@1" as const,
frontend: frontend.id,
- frontendDigest: frontend.implementationDigest,
sourceDigest: digestOf(source.text),
semanticDigest: digestOf(decoded.document),
};
@@ -87,7 +83,7 @@ export async function compileRunSource(
}
export function verifyRunSourceClosure(closure: RunSourceClosure): void {
- assert(closure.format === "svml.run-source-closure@1", "UNSUPPORTED_RUN_SOURCE_CLOSURE", "unsupported Run Source Closure");
+ assert(closure.format === "narratage.run-source-closure@1", "UNSUPPORTED_RUN_SOURCE_CLOSURE", "unsupported Run Source Closure");
verifyCompiledSourceIdentity(closure);
assert(closure.id === digestOf(closureContent(closure)), "RUN_SOURCE_CLOSURE_DIGEST_MISMATCH", "Run Source Closure digest differs");
}
diff --git a/packages/run/src/graph.ts b/packages/run/src/graph.ts
index b479c610..ccbfa0b1 100644
--- a/packages/run/src/graph.ts
+++ b/packages/run/src/graph.ts
@@ -21,7 +21,7 @@ function assert(condition: unknown, code: string, message: string): asserts cond
function content(graph: Omit<RunGraph, "id">): Omit<RunGraph, "id"> {
return {
- format: "svml.run-graph@1",
+ format: "narratage.run-graph@1",
candidates: [...graph.candidates].sort((left, right) => left.id.localeCompare(right.id)),
operations: [...graph.operations].sort((left, right) => left.id.localeCompare(right.id)),
satisfactions: [...graph.satisfactions].sort((left, right) => left.output.localeCompare(right.output)),
@@ -30,14 +30,14 @@ function content(graph: Omit<RunGraph, "id">): Omit<RunGraph, "id"> {
}
export function sealRunGraph(input: Omit<RunGraph, "format" | "id">): RunGraph {
- const normalized = content({ format: "svml.run-graph@1", ...input });
+ const normalized = content({ format: "narratage.run-graph@1", ...input });
const graph: RunGraph = { ...normalized, id: digestOf(normalized) };
verifyRunGraph(graph);
return graph;
}
export function verifyRunGraph(graph: RunGraph): void {
- assert(graph.format === "svml.run-graph@1", "UNSUPPORTED_RUN_GRAPH", "unsupported Run Graph");
+ assert(graph.format === "narratage.run-graph@1", "UNSUPPORTED_RUN_GRAPH", "unsupported Run Graph");
assert(isDigest(graph.id), "INVALID_RUN_GRAPH_DIGEST", "Run Graph digest is invalid");
const candidateIds = new Set<string>();
for (const candidate of graph.candidates) {
diff --git a/packages/run/src/types.ts b/packages/run/src/types.ts
index 8d109f2f..3dccb361 100644
--- a/packages/run/src/types.ts
+++ b/packages/run/src/types.ts
@@ -84,7 +84,7 @@ export type RunSatisfaction = {
};
export type RunDocument = {
- readonly format: "svml.run-document@1";
+ readonly format: "narratage.run-document@1";
readonly author: RunAuthorSourceRequest;
readonly imports: readonly RunImport[];
readonly targets: readonly RunTarget[];
@@ -103,7 +103,6 @@ export type DecodedRunSource = {
export type RunFrontend = {
readonly id: string;
- readonly implementationDigest: Digest;
discover(source: RunFrontendSourceUnit): RunSourceDiscovery | Promise<RunSourceDiscovery>;
decode(source: RunFrontendSourceUnit): DecodedRunSource | Promise<DecodedRunSource>;
};
@@ -114,7 +113,7 @@ export interface RunFrontendRegistryLike {
/** One self-contained Run Source identity. Run Sources do not recursively import other Run Sources. */
export type RunSourceClosure = CompiledSourceIdentity & {
- readonly format: "svml.run-source-closure@1";
+ readonly format: "narratage.run-source-closure@1";
readonly id: Digest;
};
@@ -129,7 +128,7 @@ export interface RunFragmentRegistryLike {
/** Complete, mandatory execution-intent graph. Empty alternate Candidate sets are still a Run Graph. */
export type RunGraph = {
- readonly format: "svml.run-graph@1";
+ readonly format: "narratage.run-graph@1";
readonly id: Digest;
readonly candidates: readonly Candidate[];
readonly operations: readonly OperationNode[];
diff --git a/packages/runtime-adapter-node/README.md b/packages/runtime-host-node/README.md
similarity index 50%
rename from packages/runtime-adapter-node/README.md
rename to packages/runtime-host-node/README.md
index 18a8e6df..ca404c28 100644
--- a/packages/runtime-adapter-node/README.md
+++ b/packages/runtime-host-node/README.md
@@ -1,8 +1,9 @@
-# `@narratage/runtime-adapter-node`
+# `@narratage/runtime-host-node`
-Node.js environment helpers for Runtime Adapter implementations.
+Node.js Host for Runtime packages selected by a Runtime Profile, plus environment helpers for adapter
+implementations.
-The package keeps Node-specific hosting out of the host-neutral `@narratage/runtime-adapter` ABI. It
+The package keeps Node-specific hosting out of the host-neutral `@narratage/runtime-kit` ABI. It
defines the Node Runtime Host port loaded by the CLI and also provides:
- project-root resolution for configured relative executable paths;
@@ -12,6 +13,6 @@ defines the Node Runtime Host port loaded by the CLI and also provides:
These functions produce `RuntimeDoctorDiagnostic` values only. They do not construct Endpoints,
read secret values, execute commands or choose fallback Providers.
-`loadNodeRuntimeHost()` reads only the Runtime Profile header, verifies the separately locked package
-selected by `runtime.use`, and opens its Host facet. The selected package then owns Runtime assembly,
-lifecycle and storage. The generic CLI never imports `@narratage/local` or assumes a local Worker.
+`loadNodeRuntimeHost()` reads only the Runtime Profile header, resolves the installed package selected
+by `runtime.use`, and opens its Host facet. The selected package then owns Runtime assembly, lifecycle
+and storage. The generic CLI never imports `@narratage/runtime-local` or assumes a local Worker.
diff --git a/packages/runtime-adapter-node/package.json b/packages/runtime-host-node/package.json
similarity index 80%
rename from packages/runtime-adapter-node/package.json
rename to packages/runtime-host-node/package.json
index c94fbaf7..c0875883 100644
--- a/packages/runtime-adapter-node/package.json
+++ b/packages/runtime-host-node/package.json
@@ -1,5 +1,5 @@
{
- "name": "@narratage/runtime-adapter-node",
+ "name": "@narratage/runtime-host-node",
"version": "0.0.0-dev",
"license": "SEE LICENSE IN LICENSE",
"private": true,
@@ -12,7 +12,7 @@
"@narratage/package-loader-node": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
"@narratage/workspace": "workspace:*"
}
}
diff --git a/packages/runtime-adapter-node/src/index.ts b/packages/runtime-host-node/src/index.ts
similarity index 92%
rename from packages/runtime-adapter-node/src/index.ts
rename to packages/runtime-host-node/src/index.ts
index 6b4c1a43..dd361b0b 100644
--- a/packages/runtime-adapter-node/src/index.ts
+++ b/packages/runtime-host-node/src/index.ts
@@ -6,10 +6,7 @@ import type { HostFacet } from "@narratage/host";
import {
loadNodePackageSelection,
} from "@narratage/package-loader-node";
-import type {
- LoadedNodePackageSet,
- NodePackageSelectionRequest,
-} from "@narratage/package-loader-node";
+import type { LoadedPackage } from "@narratage/package-loader-node";
import type { ArtifactAttachment } from "@narratage/workspace";
import type { BuildState, CanonicalValue, CapabilityRef, Digest } from "@narratage/protocol";
import type {
@@ -22,9 +19,9 @@ import type {
OperationSnapshot,
RuntimeWorkerRunOptions,
} from "@narratage/runtime";
-import type { RuntimeDoctorDiagnostic } from "@narratage/runtime-adapter";
+import type { RuntimeDoctorDiagnostic } from "@narratage/runtime-kit";
-export const nodeRuntimeHostAdapterAbi = "svml.node-runtime-host-adapter@1";
+export const nodeRuntimeHostAdapterAbi = "narratage.node-runtime-host-adapter@1";
export type RuntimeHostBuildSubmission = {
readonly id: string;
@@ -96,6 +93,7 @@ export type RuntimeHostExecution = RuntimeHostMaintenance & RuntimeHostCredentia
build(request: {
readonly id: string;
readonly state: BuildState;
+ readonly implementationPackages?: readonly string[];
readonly catalog?: BuildCatalogDescriptor;
readonly attachments?: readonly ArtifactAttachment[];
}, options?: {
@@ -168,28 +166,26 @@ export type RuntimeWorkerLaunch = {
export type NodeRuntimeHost = {
readonly profile: string;
- resolvePackages(): Promise<{
- readonly runtimePackageLock?: string;
+ resolvePaths(): Promise<{
readonly packageRoot?: string;
readonly runtimeDataRoot?: string;
- readonly runtimeSelection?: NodePackageSelectionRequest;
}>;
controller(options?: {
readonly workspaceRoot?: string;
- readonly packageLock?: string;
+ readonly implementationPackages?: readonly string[];
readonly packageRoot?: string;
}): Promise<RuntimeController>;
- createRuntime(options?: { readonly implementationPackages?: LoadedNodePackageSet }): Promise<RuntimeHostExecution>;
+ createRuntime(options?: { readonly implementationPackages?: readonly LoadedPackage[] }): Promise<RuntimeHostExecution>;
openArchive(options?: { readonly readOnly?: boolean }): Promise<RuntimeHostArchive>;
openArtifacts(options?: { readonly readOnly?: boolean }): Promise<RuntimeHostArtifactAccess>;
openMaintenance(options?: { readonly readOnly?: boolean }): Promise<RuntimeHostMaintenance>;
openCredentials(endpoint: string): Promise<RuntimeHostCredentialControl>;
doctor(options?: {
readonly capabilities?: readonly CapabilityRef[];
- readonly implementationPackages?: LoadedNodePackageSet;
+ readonly implementationPackages?: readonly LoadedPackage[];
}): Promise<RuntimeHostDoctorResult>;
runWorker(readyFile: string, options?: {
- readonly implementationPackages?: LoadedNodePackageSet;
+ readonly implementationPackages?: readonly LoadedPackage[];
}): Promise<void>;
};
@@ -197,7 +193,6 @@ export type NodeRuntimeHostAdapterContext = {
readonly profile: string;
readonly profileRoot: string;
readonly packageRoot: string;
- readonly runtimePackageLock: string;
readonly config: CanonicalValue;
readonly workerLaunch: RuntimeWorkerLaunch;
};
@@ -237,7 +232,6 @@ export async function loadNodeRuntimeHost(
if (value.format !== "narratage.runtime-profile@1") {
throw new Error("Runtime Profile format must be narratage.runtime-profile@1");
}
- const runtimePackageLock = resolve(profileRoot, nonEmpty(value.runtimePackageLock, "Runtime Profile runtimePackageLock"));
const runtime = value.runtime;
if (runtime === null || typeof runtime !== "object" || Array.isArray(runtime)) {
throw new Error("Runtime Profile runtime must be an object");
@@ -245,11 +239,11 @@ export async function loadNodeRuntimeHost(
const record = runtime as Record<string, unknown>;
const use = nonEmpty(record.use, "Runtime Profile runtime.use");
const config = (record.config ?? {}) as CanonicalValue;
- const loaded = await loadNodePackageSelection(runtimePackageLock, {
+ const loaded = await loadNodePackageSelection({
selected: [],
logical: [{ abi: nodeRuntimeHostAdapterAbi, name: use }],
}, options.packageRoot);
- const matches = loaded.packages.flatMap((item) => item.contribution.hostFacets ?? [])
+ const matches = loaded.flatMap((item) => item.contribution.hostFacets ?? [])
.filter((facet): facet is NodeRuntimeHostAdapterFacet => facet.abi === nodeRuntimeHostAdapterAbi
&& facet.offers?.includes(use) === true);
if (matches.length !== 1) throw new Error(`Runtime Host Adapter ${use} must have exactly one implementation`);
@@ -262,7 +256,6 @@ export async function loadNodeRuntimeHost(
profile,
profileRoot,
packageRoot: resolve(options.packageRoot),
- runtimePackageLock,
config,
workerLaunch: options.workerLaunch,
});
diff --git a/packages/runtime-adapter-node/test/runtime-adapter-node.test.ts b/packages/runtime-host-node/test/runtime-host-node.test.ts
similarity index 88%
rename from packages/runtime-adapter-node/test/runtime-adapter-node.test.ts
rename to packages/runtime-host-node/test/runtime-host-node.test.ts
index be919118..85c09aef 100644
--- a/packages/runtime-adapter-node/test/runtime-adapter-node.test.ts
+++ b/packages/runtime-host-node/test/runtime-host-node.test.ts
@@ -7,10 +7,10 @@ import test from "node:test";
import {
diagnoseRuntimeExecutable,
resolveRuntimeExecutable,
-} from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-host-node";
test("configured executable paths are rooted at the Runtime Profile project", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-runtime-adapter-node-"));
+ const root = await mkdtemp(join(tmpdir(), "narratage-runtime-host-node-"));
try {
const path = join(root, "tools", "fixture");
await mkdir(join(root, "tools"), { recursive: true });
diff --git a/packages/runtime-adapter/README.md b/packages/runtime-kit/README.md
similarity index 55%
rename from packages/runtime-adapter/README.md
rename to packages/runtime-kit/README.md
index 37b9ad37..46ea3c16 100644
--- a/packages/runtime-adapter/README.md
+++ b/packages/runtime-kit/README.md
@@ -1,16 +1,15 @@
-# `@narratage/runtime-adapter`
+# `@narratage/runtime-kit`
-Host ABI for turning locked Runtime Profile data into explicitly selected Endpoint and Runtime
-Component packages.
+Host ABI for turning a Runtime Profile into explicitly selected Endpoints and Runtime infrastructure.
One adapter is addressed by `(kind, use)`:
- `endpoint` constructs an external capability Endpoint;
-- `runtime-component` constructs a Scheduler, Store or Credential Component package.
+- `infrastructure` constructs a package instance exposing Scheduler, Worker, Store or Credential parts.
-The two kinds have separate Host ABIs, so an Endpoint and Runtime Component may intentionally share
-one `use` spelling. A physical package advertises the logical name through its Host-facet `offers`;
-the Runtime Profile never has to name that package once the inventory binds the offer.
+The two kinds have separate Host ABIs, so an Endpoint and Runtime infrastructure may intentionally share
+one `use` spelling. A physical package advertises the logical name through its Host-facet `offers`,
+and the Runtime Profile selects that package by name.
An Endpoint adapter has one pure `activate()` declaration. It parses the selected configuration once
and returns the Endpoint package, optional diagnostics and an optional Managed Program. The
@@ -19,9 +18,8 @@ Activation must not resolve credentials or environment-sourced deployment values
start a process or mutate durable state. Environment references are resolved only when the Endpoint
actually handles a Need; `doctor` may diagnose them explicitly.
-Runtime Component adapters retain a separate pure `validate()` gate because constructing SQLite or a
+Runtime infrastructure adapters retain a separate pure `validate()` gate because constructing SQLite or a
Store can itself mutate deployment state; `doctor()` may diagnose them without calling `create()`.
-The registry binds adapter implementations to the actual locked package and dependency-closure
-digests. Source imports cannot select these facets; only the Runtime
-Profile and Host allowlist can do so.
+The registry binds adapter implementations to the selected package contribution. Source imports cannot
+select these facets; only the Runtime Profile may do so.
diff --git a/packages/runtime-adapter/package.json b/packages/runtime-kit/package.json
similarity index 89%
rename from packages/runtime-adapter/package.json
rename to packages/runtime-kit/package.json
index b9d4a569..e48004ad 100644
--- a/packages/runtime-adapter/package.json
+++ b/packages/runtime-kit/package.json
@@ -1,5 +1,5 @@
{
- "name": "@narratage/runtime-adapter",
+ "name": "@narratage/runtime-kit",
"version": "0.0.0-dev",
"license": "SEE LICENSE IN LICENSE",
"private": true,
diff --git a/packages/runtime-adapter/src/index.ts b/packages/runtime-kit/src/index.ts
similarity index 65%
rename from packages/runtime-adapter/src/index.ts
rename to packages/runtime-kit/src/index.ts
index 1db77f3b..14d8e44c 100644
--- a/packages/runtime-adapter/src/index.ts
+++ b/packages/runtime-kit/src/index.ts
@@ -1,24 +1,20 @@
-import type {
- EndpointPackage,
- EndpointRegistrar,
- EndpointRegistrationOptions,
-} from "@narratage/endpoint-kit";
+import type { EndpointPackage } from "@narratage/endpoint-kit";
import type { HostFacet } from "@narratage/host";
-import { canonicalize, digestOf, isDigest } from "@narratage/protocol";
-import type { CanonicalValue, Digest } from "@narratage/protocol";
-import type { RuntimeComponentPackage } from "@narratage/runtime";
+import { canonicalize } from "@narratage/protocol";
+import type { CanonicalValue } from "@narratage/protocol";
+import type { RuntimeInfrastructurePackage } from "@narratage/runtime";
import { credentialRef } from "@narratage/runtime";
import type { CredentialRef } from "@narratage/runtime";
-export const runtimeEndpointAdapterHostAbi = "svml.runtime-endpoint-adapter-host@1";
-export const runtimeComponentAdapterHostAbi = "svml.runtime-component-adapter-host@1";
+export const runtimeEndpointAdapterHostAbi = "narratage.runtime-endpoint-adapter-host@1";
+export const runtimeInfrastructureHostAbi = "narratage.runtime-infrastructure-adapter-host@1";
-export type RuntimeAdapterKind = "endpoint" | "runtime-component";
+export type RuntimeAdapterKind = "endpoint" | "infrastructure";
function runtimeAdapterHostAbi(kind: RuntimeAdapterKind):
| typeof runtimeEndpointAdapterHostAbi
- | typeof runtimeComponentAdapterHostAbi {
- return kind === "endpoint" ? runtimeEndpointAdapterHostAbi : runtimeComponentAdapterHostAbi;
+ | typeof runtimeInfrastructureHostAbi {
+ return kind === "endpoint" ? runtimeEndpointAdapterHostAbi : runtimeInfrastructureHostAbi;
}
type RuntimeAdapterAddress = {
@@ -30,8 +26,8 @@ export type RuntimeAdapterFactoryContext = {
/** Absolute private data root selected by the Runtime adapter. Never a source boundary. */
readonly dataRoot: string;
readonly instance: string;
- /** Required for Endpoint adapters; absent for Runtime Component adapters. */
- readonly authority?: string;
+ /** Required for Endpoint adapters; absent for Runtime infrastructure adapters. */
+ readonly pool?: string;
readonly config: CanonicalValue;
/** Observation commands may request adapters to avoid creating durable state. */
readonly access?: "read-write" | "read-only";
@@ -90,27 +86,21 @@ export type RuntimeEndpointAdapterImplementation = {
activate(context: RuntimeAdapterFactoryContext): RuntimeEndpointActivation | Promise<RuntimeEndpointActivation>;
};
-export type RuntimeComponentAdapterImplementation = {
+export type RuntimeInfrastructureImplementation = {
/** Pure, closed-data validation. Must not construct a service or touch the environment. */
validate(context: RuntimeAdapterFactoryContext): void;
- create(context: RuntimeAdapterFactoryContext): RuntimeComponentPackage | Promise<RuntimeComponentPackage>;
+ create(context: RuntimeAdapterFactoryContext): RuntimeInfrastructurePackage | Promise<RuntimeInfrastructurePackage>;
doctor?(context: RuntimeAdapterFactoryContext): readonly RuntimeDoctorDiagnostic[] | Promise<readonly RuntimeDoctorDiagnostic[]>;
};
export type RuntimeAdapterHostFacet = HostFacet & {
readonly abi: ReturnType<typeof runtimeAdapterHostAbi>;
readonly identity?: never;
- readonly implementation: RuntimeEndpointAdapterImplementation | RuntimeComponentAdapterImplementation;
-};
-
-export type RuntimeAdapterPackageBinding = {
- /** Verified digest of the physical package and its complete dependency closure. */
- readonly closureDigest: Digest;
+ readonly implementation: RuntimeEndpointAdapterImplementation | RuntimeInfrastructureImplementation;
};
type RuntimeAdapterRegistration = {
readonly implementation: RuntimeAdapterHostFacet["implementation"];
- readonly binding?: RuntimeAdapterPackageBinding;
};
function assert(condition: unknown, message: string): asserts condition {
@@ -120,7 +110,7 @@ function assert(condition: unknown, message: string): asserts condition {
function address(facet: RuntimeAdapterHostFacet): RuntimeAdapterAddress {
const kind = facet.abi === runtimeEndpointAdapterHostAbi
? "endpoint"
- : facet.abi === runtimeComponentAdapterHostAbi ? "runtime-component" : undefined;
+ : facet.abi === runtimeInfrastructureHostAbi ? "infrastructure" : undefined;
assert(kind !== undefined, `Runtime Adapter ${facet.abi} ABI is unsupported`);
assert(facet.offers?.length === 1 && facet.offers[0]!.trim().length > 0,
"Runtime Adapter must offer exactly one non-empty use name");
@@ -142,7 +132,7 @@ function implementation(
assert(typeof (value as { validate?: unknown }).validate === "function", `${subject} does not implement validate()`);
const doctor = (value as { doctor?: unknown }).doctor;
assert(doctor === undefined || typeof doctor === "function", `${subject}.doctor must be a function`);
- return value as RuntimeComponentAdapterImplementation;
+ return value as RuntimeInfrastructureImplementation;
}
export function createRuntimeEndpointAdapterFacet(options: {
@@ -158,21 +148,21 @@ export function createRuntimeEndpointAdapterFacet(options: {
return facet;
}
-export function createRuntimeComponentAdapterFacet(options: {
+export function createRuntimeInfrastructureAdapterFacet(options: {
readonly use: string;
- readonly validate: RuntimeComponentAdapterImplementation["validate"];
- readonly create: RuntimeComponentAdapterImplementation["create"];
- readonly doctor?: RuntimeComponentAdapterImplementation["doctor"];
+ readonly validate: RuntimeInfrastructureImplementation["validate"];
+ readonly create: RuntimeInfrastructureImplementation["create"];
+ readonly doctor?: RuntimeInfrastructureImplementation["doctor"];
}): RuntimeAdapterHostFacet {
assert(options.use.trim().length > 0, "Runtime Adapter use name is empty");
return {
- abi: runtimeComponentAdapterHostAbi,
+ abi: runtimeInfrastructureHostAbi,
offers: [options.use],
implementation: implementation({
validate: options.validate,
create: options.create,
...(options.doctor === undefined ? {} : { doctor: options.doctor }),
- }, `Runtime Adapter ${options.use}`, "runtime-component"),
+ }, `Runtime Adapter ${options.use}`, "infrastructure"),
};
}
@@ -187,89 +177,6 @@ export function isRuntimeAdapterHostFacet(value: HostFacet): value is RuntimeAda
}
}
-function boundImplementationDigest(
- binding: RuntimeAdapterPackageBinding,
- adapter: RuntimeAdapterAddress,
- facet: string,
- declared: Digest,
-): Digest {
- assert(isDigest(binding.closureDigest), "Runtime Adapter package Closure digest is invalid");
- return digestOf({
- contract: "svml.loaded-runtime-implementation@1",
- closure: binding.closureDigest,
- adapter,
- facet,
- declared,
- });
-}
-
-function proxyRegistrar(
- registry: EndpointRegistrar,
- digests: ReadonlyMap<string, Digest>,
-): EndpointRegistrar {
- const options = (value: EndpointRegistrationOptions | undefined): EndpointRegistrationOptions | undefined => {
- const implementation = value?.runtimeImplementation;
- if (implementation === undefined) return value;
- const digest = digests.get(implementation.facet.name);
- assert(digest !== undefined, `Endpoint registration uses undeclared Runtime facet ${implementation.facet.name}`);
- return { ...value, runtimeImplementation: { ...implementation, digest } };
- };
- return {
- registerImmediateEndpoint(id, capability, returns, handler, value) {
- registry.registerImmediateEndpoint(id, capability, returns, handler, options(value));
- },
- registerRecoverableEndpoint(id, capability, returns, endpoint, value) {
- registry.registerRecoverableEndpoint(id, capability, returns, endpoint, options(value));
- },
- };
-}
-
-function bindEndpointPackage(
- value: EndpointPackage,
- adapter: RuntimeAdapterAddress,
- binding: RuntimeAdapterPackageBinding | undefined,
-): EndpointPackage {
- if (binding === undefined) return value;
- const digests = new Map(value.manifest.facets.map((facet) => [
- facet.name,
- boundImplementationDigest(binding, adapter, facet.name, facet.implementation.digest),
- ]));
- return {
- ...value,
- manifest: {
- ...value.manifest,
- facets: value.manifest.facets.map((facet) => ({
- ...facet,
- implementation: { ...facet.implementation, digest: digests.get(facet.name)! },
- })),
- },
- install(registry) {
- return value.install(proxyRegistrar(registry, digests));
- },
- };
-}
-
-function bindComponentPackage(
- value: RuntimeComponentPackage,
- adapter: RuntimeAdapterAddress,
- binding: RuntimeAdapterPackageBinding | undefined,
-): RuntimeComponentPackage {
- if (binding === undefined) return value;
- return {
- ...value,
- manifest: {
- ...value.manifest,
- facets: value.manifest.facets.map((facet) => ({
- ...facet,
- implementation: {
- ...facet.implementation,
- digest: boundImplementationDigest(binding, adapter, facet.name, facet.implementation.digest),
- },
- })),
- },
- };
-}
-
export class RuntimeAdapterRegistry {
readonly #registrations = new Map<string, RuntimeAdapterRegistration>();
@@ -277,28 +184,22 @@ export class RuntimeAdapterRegistry {
return `${kind}\u0000${use}`;
}
- #register(facet: RuntimeAdapterHostFacet, binding?: RuntimeAdapterPackageBinding): void {
+ #register(facet: RuntimeAdapterHostFacet): void {
const resolved = address(facet);
implementation(facet.implementation, `Runtime Adapter ${resolved.use}`, resolved.kind);
const key = this.#key(resolved.use, resolved.kind);
assert(!this.#registrations.has(key), `Runtime ${resolved.kind} Adapter ${resolved.use} is already registered`);
- if (binding !== undefined) {
- assert(isDigest(binding.closureDigest), "Runtime Adapter package Closure digest is invalid");
- }
- this.#registrations.set(key, {
- implementation: facet.implementation,
- ...(binding === undefined ? {} : { binding }),
- });
+ this.#registrations.set(key, { implementation: facet.implementation });
}
- registerFacet(facet: HostFacet, binding?: RuntimeAdapterPackageBinding): void {
+ registerFacet(facet: HostFacet): void {
assert(isRuntimeAdapterHostFacet(facet), `Host facet ${facet.abi} is not a valid Runtime Adapter`);
- this.#register(facet, binding);
+ this.#register(facet);
}
has(use: string, kind?: RuntimeAdapterKind): boolean {
return kind === undefined
- ? this.#registrations.has(this.#key(use, "endpoint")) || this.#registrations.has(this.#key(use, "runtime-component"))
+ ? this.#registrations.has(this.#key(use, "endpoint")) || this.#registrations.has(this.#key(use, "infrastructure"))
: this.#registrations.has(this.#key(use, kind));
}
@@ -319,8 +220,8 @@ export class RuntimeAdapterRegistry {
message: `Runtime Adapter ${use} is not registered`,
subject: use,
}];
- assert(kind === "runtime-component", "Endpoint configuration is validated by its activation");
- (value.implementation as RuntimeComponentAdapterImplementation).validate(context);
+ assert(kind === "infrastructure", "Endpoint configuration is validated by its activation");
+ (value.implementation as RuntimeInfrastructureImplementation).validate(context);
return [];
}
@@ -341,34 +242,31 @@ export class RuntimeAdapterRegistry {
`Runtime Endpoint adapter ${use} Managed Program id is empty`);
assert(activation.diagnose === undefined || typeof activation.diagnose === "function",
`Runtime Endpoint adapter ${use} activation diagnose must be a function`);
- return {
- ...activation,
- endpoint: bindEndpointPackage(activation.endpoint, { use, kind: "endpoint" }, value.binding),
- };
+ return activation;
}
async createEndpoint(use: string, context: RuntimeAdapterFactoryContext): Promise<EndpointPackage> {
return (await this.activateEndpoint(use, context)).endpoint;
}
- async createComponent(use: string, context: RuntimeAdapterFactoryContext): Promise<RuntimeComponentPackage> {
- const value = this.#registrations.get(this.#key(use, "runtime-component"));
- assert(value !== undefined, `Runtime Component adapter ${use} is not registered`);
- const implementation = value.implementation as RuntimeComponentAdapterImplementation;
+ async createInfrastructure(use: string, context: RuntimeAdapterFactoryContext): Promise<RuntimeInfrastructurePackage> {
+ const value = this.#registrations.get(this.#key(use, "infrastructure"));
+ assert(value !== undefined, `Runtime infrastructure adapter ${use} is not registered`);
+ const implementation = value.implementation as RuntimeInfrastructureImplementation;
implementation.validate(context);
const created = await implementation.create(context);
- for (const service of created.components) {
- assert(service.instance.id === context.instance || service.instance.id.startsWith(`${context.instance}.`),
- `Runtime Adapter ${use} created Component ${service.instance.id} outside configured namespace ${context.instance}`);
+ for (const part of created.parts) {
+ assert(part.instance.id === `${context.instance}.${part.part}`,
+ `Runtime Adapter ${use} created part ${part.instance.id} outside configured instance ${context.instance}`);
}
- return bindComponentPackage(created, { use, kind: "runtime-component" }, value.binding);
+ return created;
}
async doctor(use: string, kind: RuntimeAdapterKind, context: RuntimeAdapterFactoryContext): Promise<readonly RuntimeDoctorDiagnostic[]> {
const value = this.#registrations.get(this.#key(use, kind));
if (value === undefined) return [{ severity: "error", code: "RUNTIME_ADAPTER_MISSING", message: `Runtime Adapter ${use} is not registered`, subject: use }];
- assert(kind === "runtime-component", "Endpoint diagnostics belong to its activation");
- const diagnose = (value.implementation as RuntimeComponentAdapterImplementation).doctor;
+ assert(kind === "infrastructure", "Endpoint diagnostics belong to its activation");
+ const diagnose = (value.implementation as RuntimeInfrastructureImplementation).doctor;
return diagnose === undefined ? [] : await diagnose(context);
}
}
diff --git a/packages/runtime-adapter/test/registry.test.ts b/packages/runtime-kit/test/registry.test.ts
similarity index 80%
rename from packages/runtime-adapter/test/registry.test.ts
rename to packages/runtime-kit/test/registry.test.ts
index 1e124540..57081514 100644
--- a/packages/runtime-adapter/test/registry.test.ts
+++ b/packages/runtime-kit/test/registry.test.ts
@@ -3,7 +3,7 @@ import test from "node:test";
import {
createRuntimeEndpointAdapterFacet,
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
isRuntimeAdapterHostFacet,
runtimeConfigBoolean,
runtimeConfigExact,
@@ -11,15 +11,15 @@ import {
runtimeConfigPositiveInteger,
runtimeConfigString,
RuntimeAdapterRegistry,
-} from "@narratage/runtime-adapter";
-import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
+import type { RuntimeAdapterFactoryContext } from "@narratage/runtime-kit";
const context = { dataRoot: "/tmp", instance: "one", config: {} };
const endpointPackage = (instance: string) => ({
name: instance,
manifest: { facets: [] },
instance: { id: instance },
- bindings: [],
+ offers: [],
credentials: [],
install() {},
}) as never;
@@ -32,48 +32,48 @@ const endpoint = (use: string, extra: Record<string, unknown> = {}) =>
test("a facet declares which kind it is, and the registry keeps the two apart", () => {
const registry = new RuntimeAdapterRegistry();
registry.registerFacet(endpoint("example.endpoint"));
- registry.registerFacet(createRuntimeComponentAdapterFacet({
+ registry.registerFacet(createRuntimeInfrastructureAdapterFacet({
use: "example.service",
validate() {},
create: () => ({}) as never,
}));
assert.ok(registry.has("example.endpoint", "endpoint"));
- assert.equal(registry.has("example.endpoint", "runtime-component"), false);
- assert.ok(registry.has("example.service", "runtime-component"));
+ assert.equal(registry.has("example.endpoint", "infrastructure"), false);
+ assert.ok(registry.has("example.service", "infrastructure"));
assert.equal(registry.has("example.service", "endpoint"), false);
assert.equal(registry.has("example.absent"), false);
});
-test("Endpoint and Runtime Component may intentionally share one logical spelling", () => {
+test("Endpoint and Runtime infrastructure may intentionally share one logical spelling", () => {
const registry = new RuntimeAdapterRegistry();
registry.registerFacet(endpoint("example.shared"));
- registry.registerFacet(createRuntimeComponentAdapterFacet({
+ registry.registerFacet(createRuntimeInfrastructureAdapterFacet({
use: "example.shared",
validate() {},
- create: () => ({ components: [] }) as never,
+ create: () => ({ parts: [] }) as never,
}));
assert.ok(registry.has("example.shared", "endpoint"));
- assert.ok(registry.has("example.shared", "runtime-component"));
+ assert.ok(registry.has("example.shared", "infrastructure"));
});
-test("asking an Endpoint adapter for a Runtime Component is refused, not coerced", async () => {
+test("asking an Endpoint adapter for a Runtime infrastructure is refused, not coerced", async () => {
const registry = new RuntimeAdapterRegistry();
registry.registerFacet(endpoint("example.endpoint"));
- await assert.rejects(async () => await registry.createComponent("example.endpoint", context));
+ await assert.rejects(async () => await registry.createInfrastructure("example.endpoint", context));
await assert.rejects(async () => await registry.createEndpoint("example.absent", context));
});
-test("a Runtime Component adapter cannot escape its configured instance namespace", async () => {
+test("a Runtime infrastructure adapter cannot escape its configured instance namespace", async () => {
const registry = new RuntimeAdapterRegistry();
- registry.registerFacet(createRuntimeComponentAdapterFacet({
+ registry.registerFacet(createRuntimeInfrastructureAdapterFacet({
use: "example.escaping-service",
validate() {},
- create: () => ({ components: [{ instance: { id: "someone-else" } }] }) as never,
+ create: () => ({ parts: [{ part: "escape", instance: { id: "someone-else" } }] }) as never,
}));
await assert.rejects(
- async () => await registry.createComponent("example.escaping-service", context),
- /outside configured namespace one/u,
+ async () => await registry.createInfrastructure("example.escaping-service", context),
+ /outside configured instance one/u,
);
});
@@ -155,5 +155,5 @@ test("an adapter stores its address once", () => {
const facet = endpoint("@narratage/example-provider");
assert.equal("identity" in facet, false);
assert.deepEqual(facet.offers, ["@narratage/example-provider"]);
- assert.equal(facet.abi, "svml.runtime-endpoint-adapter-host@1");
+ assert.equal(facet.abi, "narratage.runtime-endpoint-adapter-host@1");
});
diff --git a/packages/local/README.md b/packages/runtime-local/README.md
similarity index 55%
rename from packages/local/README.md
rename to packages/runtime-local/README.md
index 44dfcb9a..25fb583c 100644
--- a/packages/local/README.md
+++ b/packages/runtime-local/README.md
@@ -1,7 +1,7 @@
-# `@narratage/local`
+# `@narratage/runtime-local`
Local Runtime Host for Narratage. The package owns local process lifecycle, durable dispatch and
-assembly of explicitly selected Runtime Components. It contains no authoring, video or Provider
+assembly of explicitly selected Runtime infrastructures. It contains no authoring, video or Provider
routing policy.
The Runtime Profile selects this Host at the top level, then configures its private deployment:
@@ -9,37 +9,34 @@ The Runtime Profile selects this Host at the top level, then configures its priv
```json
{
"format": "narratage.runtime-profile@1",
- "runtimePackageLock": "./svml.runtime-packages.lock",
"runtime": {
- "use": "@narratage/local",
+ "use": "@narratage/runtime-local",
"config": {
"dataRoot": ".narratage/runtimes/local",
- "components": {
- "execution": { "use": "@narratage/local" },
+ "infrastructure": {
+ "execution": { "use": "@narratage/runtime-local" },
"state": { "use": "@narratage/store-sqlite", "config": { "path": "state.sqlite" } },
"artifacts": { "use": "@narratage/artifact-store-fs", "config": { "path": "artifacts" } }
},
- "bindings": {
- "scheduler": "execution.scheduler",
- "worker": "execution.worker",
- "stores": {
- "build": "state.builds",
- "operations": "state.operations",
- "dispatch": "state.dispatch",
- "artifacts": "artifacts",
- "credentials": []
- }
+ "roles": {
+ "scheduler": { "from": "execution", "part": "scheduler" },
+ "worker": { "from": "execution", "part": "worker" },
+ "buildStore": { "from": "state", "part": "builds" },
+ "operationStore": { "from": "state", "part": "operations" },
+ "dispatchStore": { "from": "state", "part": "dispatch" },
+ "artifactStore": { "from": "artifacts", "part": "store" },
+ "credentialStores": []
},
"endpoints": {},
- "limits": { "maxOperations": 4 }
+ "capacity": { "maxActiveOperations": 4 }
}
}
}
```
-`components` declares available infrastructure instances; `bindings` selects exact role facets.
+`infrastructure` declares configured package instances; `roles` selects exact package parts.
Nothing is selected by presence or uniqueness. `endpoints` declares capability implementations and
-their Managed Programs. `limits` belongs to this Runtime deployment, not to Core or Author Source.
+their Managed Programs. `capacity` belongs to this Runtime deployment, not to Core or Author Source.
## Execution
@@ -52,11 +49,10 @@ that Controller and has no PID, signal, log path or Python/Node process policy o
## Boundaries
-* The Runtime Profile contains no Source Workspace or Source package lock.
+* The Runtime Profile contains no Source Workspace or author package selection.
* `dataRoot` contains deployment state, never author source or credentials.
-* `svml.runtime-packages.lock` closes privileged Runtime packages.
-* `svml.packages.lock` independently closes source and compute implementations for one project.
-* Components and Endpoints communicate through their declared facets and capabilities; this Host
+* Source imports select author packages; Profile `use` fields select Runtime packages.
+* Infrastructure parts and Endpoints communicate through declared ports and capabilities; this Host
keeps no central list of video packages.
The local Host is one possible implementation. Another package may expose the same Node Runtime Host
diff --git a/packages/local/package.json b/packages/runtime-local/package.json
similarity index 85%
rename from packages/local/package.json
rename to packages/runtime-local/package.json
index 0240702f..32e75a20 100644
--- a/packages/local/package.json
+++ b/packages/runtime-local/package.json
@@ -1,5 +1,5 @@
{
- "name": "@narratage/local",
+ "name": "@narratage/runtime-local",
"version": "0.0.0-dev",
"license": "SEE LICENSE IN LICENSE",
"private": true,
@@ -10,7 +10,7 @@
"./programs": "./src/programs.ts",
"./worker-process": "./src/worker-process.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
@@ -21,8 +21,8 @@
"@narratage/package-loader-node": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-kit": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"@narratage/validation": "workspace:*"
},
"devDependencies": {
diff --git a/packages/local/src/activation.ts b/packages/runtime-local/src/activation.ts
similarity index 62%
rename from packages/local/src/activation.ts
rename to packages/runtime-local/src/activation.ts
index 6ede09cc..557125f1 100644
--- a/packages/local/src/activation.ts
+++ b/packages/runtime-local/src/activation.ts
@@ -1,14 +1,14 @@
import {
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
runtimeConfigExact,
runtimeConfigObject,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { createLocalExecutionPackage } from "./scheduler-package.js";
import { localRuntimeHostAdapter } from "./host.js";
-const localExecutionAdapter = createRuntimeComponentAdapterFacet({
- use: "@narratage/local",
+const localExecutionAdapter = createRuntimeInfrastructureAdapterFacet({
+ use: "@narratage/runtime-local",
validate(context) {
const config = runtimeConfigObject(context.config, "local execution");
runtimeConfigExact(config, [], "local execution");
@@ -18,9 +18,9 @@ const localExecutionAdapter = createRuntimeComponentAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [localRuntimeHostAdapter, localExecutionAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/local/src/config.ts b/packages/runtime-local/src/config.ts
similarity index 63%
rename from packages/local/src/config.ts
rename to packages/runtime-local/src/config.ts
index 50fbd9d2..3be4a210 100644
--- a/packages/local/src/config.ts
+++ b/packages/runtime-local/src/config.ts
@@ -5,29 +5,31 @@ import type { ComponentPackage } from "@narratage/component-kit";
import {
collectNodePackageComponents,
loadNodePackageSelection,
- loadNodePackageSet,
- readNodePackageLock,
} from "@narratage/package-loader-node";
-import type { LoadedNodePackageSet, NodePackageSelectionRequest } from "@narratage/package-loader-node";
+import type { LoadedPackage, NodePackageSelectionRequest } from "@narratage/package-loader-node";
import { canonicalize, digestOf } from "@narratage/protocol";
import type { CanonicalValue, CapabilityRef } from "@narratage/protocol";
import {
isRuntimeAdapterHostFacet,
runtimeEndpointAdapterHostAbi,
- runtimeComponentAdapterHostAbi,
+ runtimeInfrastructureHostAbi,
RuntimeAdapterRegistry,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import type {
RuntimeDoctorDiagnostic,
RuntimeEndpointActivation,
ManagedProgram,
ManagedProgramState,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import {
CompositeCredentialStore,
- verifyRuntimeComponentPackage,
+ verifyRuntimeInfrastructurePackage,
+} from "@narratage/runtime";
+import type {
+ RuntimeInfrastructurePackage,
+ RuntimePartReference,
+ RuntimeRoleSelection,
} from "@narratage/runtime";
-import type { RuntimeComponentPackage, RuntimeBindings } from "@narratage/runtime";
import type { LocalRuntime } from "./types.js";
import type { LocalCredentialControl } from "./types.js";
@@ -40,7 +42,7 @@ import type {
export type RuntimeConfigEntry = {
readonly use: string;
readonly instance: string;
- readonly authority?: string;
+ readonly pool?: string;
readonly config?: CanonicalValue;
};
@@ -49,13 +51,11 @@ export type RuntimeConfigDocument = {
readonly runtimeUse: string;
/** Private deployment state, resolved relative to the Profile. */
readonly dataRoot: string;
- /** Locked physical packages allowed to configure privileged Runtime adapters. */
- readonly runtimePackageLock?: string;
/** Replaceable parts of the Runtime itself. One package may fill several roles. */
- readonly components: readonly RuntimeConfigEntry[];
- readonly bindings: RuntimeBindings;
+ readonly infrastructure: readonly RuntimeConfigEntry[];
+ readonly roles: RuntimeRoleSelection;
readonly endpoints: readonly RuntimeConfigEntry[];
- readonly limits: {
+ readonly capacity: {
readonly maxConcurrency: number;
readonly resources?: Readonly<Record<string, number>>;
};
@@ -97,104 +97,119 @@ function stringList(value: unknown, subject: string): readonly string[] {
return items;
}
-function entry(value: unknown, instance: string, subject: string, authorityRequired: boolean): RuntimeConfigEntry {
+function entry(value: unknown, instance: string, subject: string, poolAllowed: boolean): RuntimeConfigEntry {
const item = object(value, subject);
- exactKeys(item, authorityRequired ? ["use", "authority", "config"] : ["use", "config"], subject);
- const authority = authorityRequired ? optionalString(item.authority, `${subject}.authority`) : undefined;
+ exactKeys(item, poolAllowed ? ["use", "pool", "config"] : ["use", "config"], subject);
+ const pool = poolAllowed ? optionalString(item.pool, `${subject}.pool`) : undefined;
return {
use: requiredString(item.use, `${subject}.use`),
instance,
- ...(authority === undefined ? {} : { authority }),
+ ...(pool === undefined ? {} : { pool }),
...(item.config === undefined ? {} : { config: canonicalize(item.config) }),
};
}
-function limits(value: unknown): RuntimeConfigDocument["limits"] {
- if (value === undefined) throw new Error("$runtime.runtime.config.limits is required");
- const item = object(value, "$runtime.runtime.config.limits");
- exactKeys(item, ["maxOperations", "resources"], "$runtime.runtime.config.limits");
- const resources = item.resources === undefined ? undefined : object(item.resources, "$runtime.runtime.config.limits.resources");
+function capacity(value: unknown): RuntimeConfigDocument["capacity"] {
+ if (value === undefined) throw new Error("$runtime.runtime.config.capacity is required");
+ const item = object(value, "$runtime.runtime.config.capacity");
+ exactKeys(item, ["maxActiveOperations", "resources"], "$runtime.runtime.config.capacity");
+ const resources = item.resources === undefined ? undefined : object(item.resources, "$runtime.runtime.config.capacity.resources");
const normalizedResources = resources === undefined ? undefined : Object.fromEntries(Object.entries(resources).map(([name, limit]) => {
if (name.trim().length === 0) throw new Error("Runtime resource id must not be empty");
- return [name, positiveInteger(limit, `$runtime.runtime.config.limits.resources.${name}`)!];
+ return [name, positiveInteger(limit, `$runtime.runtime.config.capacity.resources.${name}`)!];
}));
- const maxConcurrency = positiveInteger(item.maxOperations, "$runtime.runtime.config.limits.maxOperations");
- if (maxConcurrency === undefined) throw new Error("$runtime.runtime.config.limits.maxOperations is required");
+ const maxConcurrency = positiveInteger(item.maxActiveOperations,
+ "$runtime.runtime.config.capacity.maxActiveOperations");
+ if (maxConcurrency === undefined) {
+ throw new Error("$runtime.runtime.config.capacity.maxActiveOperations is required");
+ }
return {
maxConcurrency,
...(normalizedResources === undefined ? {} : { resources: normalizedResources }),
};
}
-function serviceSelection(value: unknown): RuntimeBindings {
- const item = object(value, "$runtime.runtime.config.bindings");
- exactKeys(item, ["scheduler", "worker", "stores"], "$runtime.runtime.config.bindings");
- const stores = object(item.stores, "$runtime.runtime.config.bindings.stores");
- exactKeys(stores, ["build", "operations", "dispatch", "artifacts", "credentials"],
- "$runtime.runtime.config.bindings.stores");
- const credentials = stringList(stores.credentials, "$runtime.runtime.config.bindings.stores.credentials");
+function partReference(value: unknown, subject: string): RuntimePartReference {
+ const item = object(value, subject);
+ exactKeys(item, ["from", "part"], subject);
+ return {
+ from: requiredString(item.from, `${subject}.from`),
+ part: requiredString(item.part, `${subject}.part`),
+ };
+}
+
+function partReferences(value: unknown, subject: string): readonly RuntimePartReference[] {
+ if (value === undefined) return [];
+ if (!Array.isArray(value)) throw new Error(`${subject} must be an array`);
+ const references = value.map((item, index) => partReference(item, `${subject}[${index}]`));
+ const keys = references.map((item) => `${item.from}\u0000${item.part}`);
+ if (new Set(keys).size !== keys.length) throw new Error(`${subject} contains duplicates`);
+ return references;
+}
+
+function roleSelection(value: unknown): RuntimeRoleSelection {
+ const subject = "$runtime.runtime.config.roles";
+ const item = object(value, subject);
+ exactKeys(item, [
+ "scheduler", "worker", "buildStore", "operationStore", "dispatchStore", "artifactStore", "credentialStores",
+ ], subject);
return {
- scheduler: requiredString(item.scheduler, "$runtime.runtime.config.bindings.scheduler"),
- worker: requiredString(item.worker, "$runtime.runtime.config.bindings.worker"),
- stores: {
- build: requiredString(stores.build, "$runtime.runtime.config.bindings.stores.build"),
- operations: requiredString(stores.operations, "$runtime.runtime.config.bindings.stores.operations"),
- dispatch: requiredString(stores.dispatch, "$runtime.runtime.config.bindings.stores.dispatch"),
- artifacts: requiredString(stores.artifacts, "$runtime.runtime.config.bindings.stores.artifacts"),
- credentials,
- },
+ scheduler: partReference(item.scheduler, `${subject}.scheduler`),
+ worker: partReference(item.worker, `${subject}.worker`),
+ buildStore: partReference(item.buildStore, `${subject}.buildStore`),
+ operationStore: partReference(item.operationStore, `${subject}.operationStore`),
+ dispatchStore: partReference(item.dispatchStore, `${subject}.dispatchStore`),
+ artifactStore: partReference(item.artifactStore, `${subject}.artifactStore`),
+ credentialStores: partReferences(item.credentialStores, `${subject}.credentialStores`),
};
}
-function entries(value: unknown, subject: string, authorityRequired: boolean): readonly RuntimeConfigEntry[] {
+function entries(value: unknown, subject: string, poolAllowed: boolean): readonly RuntimeConfigEntry[] {
const configured = object(value, subject);
return Object.entries(configured).map(([instance, item]) => {
if (instance.trim().length === 0) throw new Error(`${subject} contains an empty instance name`);
- return entry(item, instance, `${subject}.${instance}`, authorityRequired);
+ return entry(item, instance, `${subject}.${instance}`, poolAllowed);
});
}
export function parseRuntimeConfig(value: unknown): RuntimeConfigDocument {
const item = object(value, "$runtime");
- exactKeys(item, ["format", "runtimePackageLock", "runtime"], "$runtime");
+ exactKeys(item, ["format", "runtime"], "$runtime");
if (item.format !== "narratage.runtime-profile@1") {
throw new Error("$runtime.format must be narratage.runtime-profile@1");
}
const runtime = object(item.runtime, "$runtime.runtime");
exactKeys(runtime, ["use", "config"], "$runtime.runtime");
const runtimeUse = requiredString(runtime.use, "$runtime.runtime.use");
- if (runtimeUse !== "@narratage/local") throw new Error(`Local Runtime loader cannot activate ${runtimeUse}`);
+ if (runtimeUse !== "@narratage/runtime-local") throw new Error(`Local Runtime loader cannot activate ${runtimeUse}`);
const config = object(runtime.config, "$runtime.runtime.config");
- exactKeys(config, ["dataRoot", "components", "bindings", "endpoints", "limits"], "$runtime.runtime.config");
- const components = entries(config.components, "$runtime.runtime.config.components", false);
+ exactKeys(config, ["dataRoot", "infrastructure", "roles", "endpoints", "capacity"], "$runtime.runtime.config");
+ const infrastructure = entries(config.infrastructure, "$runtime.runtime.config.infrastructure", false);
const endpoints = config.endpoints === undefined
? []
: entries(config.endpoints, "$runtime.runtime.config.endpoints", true);
- const instances = [...components, ...endpoints].map((value) => value.instance);
+ const instances = [...infrastructure, ...endpoints].map((value) => value.instance);
if (new Set(instances).size !== instances.length) throw new Error("$runtime repeats a Runtime instance id");
return {
format: "narratage.runtime-profile@1",
runtimeUse,
dataRoot: requiredString(config.dataRoot, "$runtime.runtime.config.dataRoot"),
- ...(optionalString(item.runtimePackageLock, "$runtime.runtimePackageLock") === undefined
- ? {}
- : { runtimePackageLock: item.runtimePackageLock as string }),
- components,
- bindings: serviceSelection(config.bindings),
+ infrastructure,
+ roles: roleSelection(config.roles),
endpoints,
- limits: limits(config.limits),
+ capacity: capacity(config.capacity),
};
}
export type LoadRuntimeConfigOptions = {
- /** Trusted embedding adapters. Locked installed adapters are normally selected by runtimePackageLock. */
+ /** Trusted embedding adapters supplied directly by an embedding application. */
readonly registry?: RuntimeAdapterRegistry;
readonly components?: readonly ComponentPackage[];
/** Host package installation used when the Profile does not explicitly select packageRoot. */
readonly packageRoot?: string;
/** Package set already verified by this same Host command. */
- readonly implementationPackages?: LoadedNodePackageSet;
+ readonly implementationPackages?: readonly LoadedPackage[];
/** Observation-only assembly must not initialize absent durable state. */
readonly readOnly?: boolean;
};
@@ -204,12 +219,9 @@ export type RuntimeConfigDoctorResult = {
readonly diagnostics: readonly RuntimeDoctorDiagnostic[];
};
-export type RuntimeConfigPackageSelection = {
+export type ResolvedRuntimeConfigPaths = {
readonly packageRoot: string;
readonly dataRoot: string;
- readonly runtimePackageLock?: string;
- /** Logical Runtime adapters selected by kind and use name. */
- readonly runtimeSelection: NodePackageSelectionRequest;
};
type OpenedRuntimeConfig = {
@@ -240,70 +252,55 @@ function runtimePackageSelection(document: RuntimeConfigDocument): NodePackageSe
return {
selected: [],
logical: [
- ...document.components.map((item) => ({ abi: runtimeComponentAdapterHostAbi, name: item.use })),
+ ...document.infrastructure.map((item) => ({ abi: runtimeInfrastructureHostAbi, name: item.use })),
...document.endpoints.map((item) => ({ abi: runtimeEndpointAdapterHostAbi, name: item.use })),
],
};
}
/**
- * Resolve the deterministic implementation lock selected by a Runtime Profile
- * without constructing the Runtime or executing any adapter code.
- *
- * The CLI uses this to keep `build --runtime <profile>` single-sourced: the
- * same author package lock drives compilation and later Worker execution.
+ * Resolve Runtime-owned paths without constructing infrastructure or Endpoints.
*/
-export async function runtimeConfigPackageSelection(
+export async function resolveRuntimeConfigPaths(
path: string,
options: LoadRuntimeConfigOptions = {},
-): Promise<RuntimeConfigPackageSelection> {
- const { document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+): Promise<ResolvedRuntimeConfigPaths> {
+ const { root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
return {
packageRoot,
dataRoot: root,
- runtimeSelection: runtimePackageSelection(document),
- ...(document.runtimePackageLock === undefined
- ? {}
- : { runtimePackageLock: resolve(profileRoot, document.runtimePackageLock) }),
};
}
/** Deployment revision understood only by this Runtime Profile implementation. */
export async function runtimeConfigRevision(path: string): Promise<string> {
- const { document, profileRoot } = await openRuntimeConfig(path);
- const locks: Record<string, string> = {};
- for (const [name, value] of [["runtimePackageLock", document.runtimePackageLock]] as const) {
- if (value === undefined) continue;
- locks[name] = (await readNodePackageLock(resolve(profileRoot, value))).digest;
- }
+ const { document } = await openRuntimeConfig(path);
return digestOf(canonicalize({
format: "narratage.runtime-profile-revision@1",
document,
- locks,
}));
}
-async function installLockedRuntimeAdapters(
+async function installRuntimeAdapters(
registry: RuntimeAdapterRegistry,
- path: string | undefined,
- lockRoot: string,
packageRoot: string,
- selected?: readonly string[] | NodePackageSelectionRequest,
+ selected: readonly string[] | NodePackageSelectionRequest,
): Promise<void> {
- if (path === undefined) return;
- const loaded = selected === undefined
- ? await loadNodePackageSet(resolve(lockRoot, path), packageRoot)
- : await loadNodePackageSelection(resolve(lockRoot, path), selected, packageRoot);
- const lockedPackages = new Map(loaded.lock.packages.map((item) => [item.package.name, item]));
- for (const loadedPackage of loaded.packages) {
+ const request: NodePackageSelectionRequest = Array.isArray(selected)
+ ? { selected }
+ : selected as NodePackageSelectionRequest;
+ const logical = (request.logical ?? []).filter((address) => {
+ if (address.abi === runtimeEndpointAdapterHostAbi) return !registry.has(address.name, "endpoint");
+ if (address.abi === runtimeInfrastructureHostAbi) return !registry.has(address.name, "infrastructure");
+ return true;
+ });
+ if (request.selected.length === 0 && logical.length === 0) return;
+ const loaded = await loadNodePackageSelection({ selected: request.selected, logical }, packageRoot);
+ for (const loadedPackage of loaded) {
const contribution = loadedPackage.contribution;
- const locked = lockedPackages.get(loadedPackage.specifier);
- if (locked === undefined) throw new Error(`Runtime package ${loadedPackage.specifier} is absent from its verified lock`);
for (const facet of contribution.hostFacets ?? []) {
if (!isRuntimeAdapterHostFacet(facet)) continue;
- registry.registerFacet(facet, {
- closureDigest: locked.closureDigest,
- });
+ registry.registerFacet(facet);
}
}
}
@@ -330,7 +327,7 @@ export async function declaredManagedPrograms(
path: string,
options: LoadRuntimeConfigOptions & { readonly capabilities?: readonly CapabilityRef[] } = {},
): Promise<{ readonly dataRoot: string; readonly programs: readonly DeclaredManagedProgram[] }> {
- const { document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+ const { document, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
// A Build with no demanded external capability has no program to discover.
// Keep validating the Profile document and its root, but do not load the
// privileged Runtime package closure merely to prove that the empty set is
@@ -338,10 +335,8 @@ export async function declaredManagedPrograms(
// declared program.
if (options.capabilities?.length === 0) return { dataRoot: root, programs: [] };
const registry = options.registry ?? new RuntimeAdapterRegistry();
- await installLockedRuntimeAdapters(
+ await installRuntimeAdapters(
registry,
- document.runtimePackageLock,
- profileRoot,
packageRoot,
runtimePackageSelection(document),
);
@@ -353,11 +348,11 @@ export async function declaredManagedPrograms(
const activation = await registry.activateEndpoint(item.use, {
dataRoot: root,
instance: item.instance,
- authority: item.authority ?? item.instance,
+ pool: item.pool ?? item.instance,
config: item.config ?? {},
});
- if (options.capabilities !== undefined && !activation.endpoint.bindings.some((binding) =>
- options.capabilities!.some((capability) => sameCapability(binding.capability, capability)))) {
+ if (options.capabilities !== undefined && !activation.endpoint.offers.some((offer) =>
+ options.capabilities!.some((capability) => sameCapability(offer.capability, capability)))) {
continue;
}
const program = activation.program;
@@ -380,7 +375,7 @@ export async function doctorRuntimeConfig(
path: string,
options: LoadRuntimeConfigOptions & { readonly capabilities?: readonly CapabilityRef[] } = {},
): Promise<RuntimeConfigDoctorResult> {
- const { absolute, document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+ const { absolute, document, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
const diagnostics: RuntimeDoctorDiagnostic[] = [];
const credentialEndpoints: Array<{
readonly entry: RuntimeConfigEntry;
@@ -400,22 +395,20 @@ export async function doctorRuntimeConfig(
}
}
const registry = options.registry ?? new RuntimeAdapterRegistry();
- const runtimeLock = installLockedRuntimeAdapters(
+ const runtimePackages = installRuntimeAdapters(
registry,
- document.runtimePackageLock,
- profileRoot,
packageRoot,
runtimePackageSelection(document),
);
- const [runtimeResult] = await Promise.allSettled([runtimeLock]);
+ const [runtimeResult] = await Promise.allSettled([runtimePackages]);
if (runtimeResult.status === "rejected") {
- diagnostics.push(diagnostic(runtimeResult.reason, "RUNTIME_PACKAGE_LOCK_INVALID", document.runtimePackageLock));
+ diagnostics.push(diagnostic(runtimeResult.reason, "RUNTIME_PACKAGE_SELECTION_INVALID"));
return { dataRoot: root, diagnostics };
}
- for (const item of document.components) {
+ for (const item of document.infrastructure) {
const context = { dataRoot: root, instance: item.instance, config: item.config ?? {} };
try {
- const selection = registry.validate(item.use, "runtime-component", context);
+ const selection = registry.validate(item.use, "infrastructure", context);
diagnostics.push(...selection);
if (selection.some((entry) => entry.severity === "error")) continue;
} catch (error) {
@@ -423,7 +416,7 @@ export async function doctorRuntimeConfig(
continue;
}
try {
- diagnostics.push(...await registry.doctor(item.use, "runtime-component", context));
+ diagnostics.push(...await registry.doctor(item.use, "infrastructure", context));
} catch (error) {
diagnostics.push(diagnostic(error, "RUNTIME_ADAPTER_DOCTOR_FAILED", item.instance));
}
@@ -432,7 +425,7 @@ export async function doctorRuntimeConfig(
const context = {
dataRoot: root,
instance: item.instance,
- authority: item.authority ?? item.instance,
+ pool: item.pool ?? item.instance,
config: item.config ?? {},
};
let activation: RuntimeEndpointActivation;
@@ -442,13 +435,13 @@ export async function doctorRuntimeConfig(
diagnostics.push(diagnostic(error, "RUNTIME_ENDPOINT_CONFIG_INVALID", item.instance));
continue;
}
- if (options.capabilities !== undefined && !activation.endpoint.bindings.some((binding) =>
- options.capabilities!.some((capability) => sameCapability(binding.capability, capability)))) {
+ if (options.capabilities !== undefined && !activation.endpoint.offers.some((offer) =>
+ options.capabilities!.some((capability) => sameCapability(offer.capability, capability)))) {
continue;
}
- for (const binding of activation.endpoint.bindings) {
- if (options.capabilities?.some((capability) => sameCapability(binding.capability, capability))) {
- coveredCapabilities.add(capabilityKey(binding.capability));
+ for (const offer of activation.endpoint.offers) {
+ if (options.capabilities?.some((capability) => sameCapability(offer.capability, capability))) {
+ coveredCapabilities.add(capabilityKey(offer.capability));
}
}
let adapterHasError = false;
@@ -508,30 +501,32 @@ export async function doctorRuntimeConfig(
});
}
if (credentialEndpoints.length > 0) {
- let packages: readonly RuntimeComponentPackage[] = [];
+ let packages: readonly RuntimeInfrastructurePackage[] = [];
try {
const endpoints = credentialEndpoints.map(({ entry, activation }) => ({
entry,
credentials: activation.endpoint.credentials,
}));
if (endpoints.every((item) => item.credentials.length === 0)) return { dataRoot: root, diagnostics };
- const serviceEntries = runtimeEntriesForComponents(
- document.components,
- document.bindings.stores.credentials,
+ const serviceEntries = runtimeEntriesForParts(
+ document.infrastructure,
+ document.roles.credentialStores,
);
- packages = await Promise.all(serviceEntries.map(async (item) => await registry.createComponent(item.use, {
+ packages = await Promise.all(serviceEntries.map(async (item) => await registry.createInfrastructure(item.use, {
dataRoot: root,
instance: item.instance,
config: item.config ?? {},
})));
- for (const item of packages) verifyRuntimeComponentPackage(item);
- const byId = new Map(packages.flatMap((item) =>
- item.components.map((component) => [component.instance.id, component] as const)));
- const stores = document.bindings.stores.credentials.map((id) => {
- const component = byId.get(id);
- if (component === undefined) throw new Error(`CredentialStore selection refers to unknown instance ${id}`);
+ for (const item of packages) verifyRuntimeInfrastructurePackage(item);
+ const byPart = new Map(packages.flatMap((item) =>
+ item.parts.map((component) => [`${component.owner}\u0000${component.part}`, component] as const)));
+ const stores = document.roles.credentialStores.map((reference) => {
+ const component = byPart.get(`${reference.from}\u0000${reference.part}`);
+ if (component === undefined) {
+ throw new Error(`CredentialStore role refers to unknown part ${reference.from}.${reference.part}`);
+ }
if (component.role !== "credential-store") {
- throw new Error(`Runtime Component ${id} is ${component.role}, not credential-store`);
+ throw new Error(`Runtime part ${reference.from}.${reference.part} is ${component.role}, not credential-store`);
}
return component.port;
});
@@ -553,7 +548,7 @@ export async function doctorRuntimeConfig(
} catch (error) {
diagnostics.push(diagnostic(error, "RUNTIME_CREDENTIAL_CHECK_FAILED"));
} finally {
- await closeRuntimeComponentPackages(packages);
+ await closeRuntimeInfrastructurePackages(packages);
}
}
return { dataRoot: root, diagnostics };
@@ -566,19 +561,17 @@ export async function createRuntimeFromConfig(
// Diagnostics and lifecycle discovery must not initialize SQLite, Drivers or Endpoints.
// Load the executable Runtime assembly only on the command that actually constructs it.
const { createProjectLocalRuntime } = await import("./runtime.js");
- const { document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+ const { document, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
const registry = options.registry ?? new RuntimeAdapterRegistry();
await Promise.all([
- installLockedRuntimeAdapters(
+ installRuntimeAdapters(
registry,
- document.runtimePackageLock,
- profileRoot,
packageRoot,
runtimePackageSelection(document),
),
]);
- const runtimeComponents = await Promise.all(document.components.map(async (item) => {
- return await registry.createComponent(item.use, {
+ const infrastructure = await Promise.all(document.infrastructure.map(async (item) => {
+ return await registry.createInfrastructure(item.use, {
dataRoot: root,
instance: item.instance,
config: item.config ?? {},
@@ -588,42 +581,41 @@ export async function createRuntimeFromConfig(
return await registry.createEndpoint(item.use, {
dataRoot: root,
instance: item.instance,
- authority: item.authority ?? item.instance,
+ pool: item.pool ?? item.instance,
config: item.config ?? {},
});
}));
return await createProjectLocalRuntime({
dataRoot: root,
packageRoot,
- runtimeComponents,
- bindings: document.bindings,
+ infrastructure,
+ roles: document.roles,
components: [
- ...collectNodePackageComponents((options.implementationPackages?.packages ?? []).map((item) => item.contribution)),
+ ...collectNodePackageComponents((options.implementationPackages ?? []).map((item) => item.contribution)),
...(options.components ?? []),
],
endpoints,
- scheduling: document.limits,
+ scheduling: document.capacity,
});
}
-async function createSelectedRuntimeComponents(
+async function createSelectedRuntimeInfrastructure(
document: RuntimeConfigDocument,
- profileRoot: string,
root: string,
packageRoot: string,
registry: RuntimeAdapterRegistry,
- serviceIds: readonly string[],
+ references: readonly RuntimePartReference[],
readOnly: boolean,
-): Promise<readonly RuntimeComponentPackage[]> {
- const serviceEntries = runtimeEntriesForComponents(document.components, serviceIds);
- await installLockedRuntimeAdapters(registry, document.runtimePackageLock, profileRoot, packageRoot, {
+): Promise<readonly RuntimeInfrastructurePackage[]> {
+ const serviceEntries = runtimeEntriesForParts(document.infrastructure, references);
+ await installRuntimeAdapters(registry, packageRoot, {
selected: [],
- logical: serviceEntries.map((item) => ({ abi: runtimeComponentAdapterHostAbi, name: item.use })),
+ logical: serviceEntries.map((item) => ({ abi: runtimeInfrastructureHostAbi, name: item.use })),
});
- const packages: RuntimeComponentPackage[] = [];
+ const packages: RuntimeInfrastructurePackage[] = [];
try {
for (const item of serviceEntries) {
- packages.push(await registry.createComponent(item.use, {
+ packages.push(await registry.createInfrastructure(item.use, {
dataRoot: root,
instance: item.instance,
config: item.config ?? {},
@@ -632,7 +624,7 @@ async function createSelectedRuntimeComponents(
}
return packages;
} catch (error) {
- await closeRuntimeComponentPackages(packages);
+ await closeRuntimeInfrastructurePackages(packages);
throw error;
}
}
@@ -643,17 +635,17 @@ export async function createRuntimeArchiveFromConfig(
options: LoadRuntimeConfigOptions = {},
): Promise<LocalRuntimeArchiveControl> {
const { createProjectLocalRuntimeArchiveControl } = await import("./control.js");
- const { document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+ const { document, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
const registry = options.registry ?? new RuntimeAdapterRegistry();
- const runtimeComponents = await createSelectedRuntimeComponents(document, profileRoot, root, packageRoot, registry, [
- document.bindings.stores.build,
- document.bindings.stores.operations,
- document.bindings.stores.dispatch,
+ const infrastructure = await createSelectedRuntimeInfrastructure(document, root, packageRoot, registry, [
+ document.roles.buildStore,
+ document.roles.operationStore,
+ document.roles.dispatchStore,
], options.readOnly === true);
return await createProjectLocalRuntimeArchiveControl({
dataRoot: root,
- runtimeComponents,
- bindings: document.bindings,
+ infrastructure,
+ roles: document.roles,
});
}
@@ -663,15 +655,15 @@ export async function createRuntimeArtifactAccessFromConfig(
options: LoadRuntimeConfigOptions = {},
): Promise<LocalRuntimeArtifactAccess> {
const { createProjectLocalRuntimeArtifactAccess } = await import("./control.js");
- const { document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+ const { document, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
const registry = options.registry ?? new RuntimeAdapterRegistry();
- const runtimeComponents = await createSelectedRuntimeComponents(document, profileRoot, root, packageRoot, registry, [
- document.bindings.stores.artifacts,
+ const infrastructure = await createSelectedRuntimeInfrastructure(document, root, packageRoot, registry, [
+ document.roles.artifactStore,
], options.readOnly === true);
return await createProjectLocalRuntimeArtifactAccess({
dataRoot: root,
- runtimeComponents,
- bindings: document.bindings,
+ infrastructure,
+ roles: document.roles,
});
}
@@ -681,43 +673,37 @@ export async function createRuntimeMaintenanceFromConfig(
options: LoadRuntimeConfigOptions = {},
): Promise<LocalRuntimeControl> {
const { createProjectLocalRuntimeControl } = await import("./control.js");
- const { document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+ const { document, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
const registry = options.registry ?? new RuntimeAdapterRegistry();
- const runtimeComponents = await createSelectedRuntimeComponents(document, profileRoot, root, packageRoot, registry, [
- document.bindings.stores.build,
- document.bindings.stores.operations,
- document.bindings.stores.dispatch,
- document.bindings.stores.artifacts,
+ const infrastructure = await createSelectedRuntimeInfrastructure(document, root, packageRoot, registry, [
+ document.roles.buildStore,
+ document.roles.operationStore,
+ document.roles.dispatchStore,
+ document.roles.artifactStore,
], options.readOnly === true);
return await createProjectLocalRuntimeControl({
dataRoot: root,
- runtimeComponents,
- bindings: document.bindings,
+ infrastructure,
+ roles: document.roles,
});
}
-function ownsSelectedComponent(entry: RuntimeConfigEntry, component: string): boolean {
- return component === entry.instance || component.startsWith(`${entry.instance}.`);
-}
-
-function runtimeEntriesForComponents(
+function runtimeEntriesForParts(
entries: readonly RuntimeConfigEntry[],
- components: readonly string[],
+ references: readonly RuntimePartReference[],
): readonly RuntimeConfigEntry[] {
const selected = new Set<RuntimeConfigEntry>();
- for (const component of components) {
- const owners = entries.filter((entry) => ownsSelectedComponent(entry, component));
- if (owners.length !== 1) {
- throw new Error(owners.length === 0
- ? `Runtime Component ${component} is outside every configured adapter namespace`
- : `Runtime Component ${component} has overlapping configured adapter namespaces`);
+ for (const reference of references) {
+ const owner = entries.find((entry) => entry.instance === reference.from);
+ if (owner === undefined) {
+ throw new Error(`Runtime role refers to unknown infrastructure instance ${reference.from}`);
}
- selected.add(owners[0]!);
+ selected.add(owner);
}
return [...selected];
}
-async function closeRuntimeComponentPackages(packages: readonly RuntimeComponentPackage[]): Promise<void> {
+async function closeRuntimeInfrastructurePackages(packages: readonly RuntimeInfrastructurePackage[]): Promise<void> {
for (const item of [...packages].reverse()) await item.close?.();
}
@@ -732,50 +718,53 @@ export async function createRuntimeCredentialsFromConfig(
options: LoadRuntimeConfigOptions = {},
): Promise<LocalCredentialControl> {
const { createLocalCredentialControl } = await import("./credentials.js");
- const { document, profileRoot, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
+ const { document, root, packageRoot } = await openRuntimeConfig(path, options.packageRoot);
const endpointEntry = document.endpoints.find((item) => item.instance === endpointInstance);
if (endpointEntry === undefined) throw new Error(`Runtime Profile has no Endpoint instance ${endpointInstance}`);
const registry = options.registry ?? new RuntimeAdapterRegistry();
- const serviceEntries = runtimeEntriesForComponents(
- document.components,
- document.bindings.stores.credentials,
+ const serviceEntries = runtimeEntriesForParts(
+ document.infrastructure,
+ document.roles.credentialStores,
);
- await installLockedRuntimeAdapters(registry, document.runtimePackageLock, profileRoot, packageRoot, {
+ await installRuntimeAdapters(registry, packageRoot, {
selected: [],
logical: [
{ abi: runtimeEndpointAdapterHostAbi, name: endpointEntry.use },
- ...serviceEntries.map((item) => ({ abi: runtimeComponentAdapterHostAbi, name: item.use })),
+ ...serviceEntries.map((item) => ({ abi: runtimeInfrastructureHostAbi, name: item.use })),
],
});
- const packages = await Promise.all(serviceEntries.map(async (item) => await registry.createComponent(item.use, {
+ const packages = await Promise.all(serviceEntries.map(async (item) => await registry.createInfrastructure(item.use, {
dataRoot: root,
instance: item.instance,
config: item.config ?? {},
})));
try {
- for (const item of packages) verifyRuntimeComponentPackage(item);
- const byId = new Map(packages.flatMap((item) => item.components.map((component) => [component.instance.id, component] as const)));
- const credentialStores = document.bindings.stores.credentials.map((id) => {
- const component = byId.get(id);
- if (component === undefined) throw new Error(`CredentialStore selection refers to unknown instance ${id}`);
+ for (const item of packages) verifyRuntimeInfrastructurePackage(item);
+ const byPart = new Map(packages.flatMap((item) => item.parts
+ .map((component) => [`${component.owner}\u0000${component.part}`, component] as const)));
+ const credentialStores = document.roles.credentialStores.map((reference) => {
+ const component = byPart.get(`${reference.from}\u0000${reference.part}`);
+ if (component === undefined) {
+ throw new Error(`CredentialStore role refers to unknown part ${reference.from}.${reference.part}`);
+ }
if (component.role !== "credential-store") {
- throw new Error(`Runtime Component ${id} is ${component.role}, not credential-store`);
+ throw new Error(`Runtime part ${reference.from}.${reference.part} is ${component.role}, not credential-store`);
}
return component.port;
});
const endpoint = await registry.createEndpoint(endpointEntry.use, {
dataRoot: root,
instance: endpointEntry.instance,
- authority: endpointEntry.authority ?? endpointEntry.instance,
+ pool: endpointEntry.pool ?? endpointEntry.instance,
config: endpointEntry.config ?? {},
});
return createLocalCredentialControl({
credentialStore: new CompositeCredentialStore(credentialStores),
endpoints: [endpoint],
- close: async () => await closeRuntimeComponentPackages(packages),
+ close: async () => await closeRuntimeInfrastructurePackages(packages),
});
} catch (error) {
- await closeRuntimeComponentPackages(packages);
+ await closeRuntimeInfrastructurePackages(packages);
throw error;
}
}
diff --git a/packages/local/src/control.ts b/packages/runtime-local/src/control.ts
similarity index 77%
rename from packages/local/src/control.ts
rename to packages/runtime-local/src/control.ts
index c9f87664..ef540231 100644
--- a/packages/local/src/control.ts
+++ b/packages/runtime-local/src/control.ts
@@ -4,9 +4,13 @@ import {
isManagedArtifactStore,
isStreamingArtifactStore,
operationCancellationRequestId,
- verifyRuntimeComponentPackage,
+ verifyRuntimeInfrastructurePackage,
+} from "@narratage/runtime";
+import type {
+ RuntimePart,
+ RuntimeInfrastructurePackage,
+ RuntimePartReference,
} from "@narratage/runtime";
-import type { RuntimeComponent, RuntimeComponentPackage } from "@narratage/runtime";
import type {
CreateLocalRuntimeArchiveControlOptions,
@@ -19,7 +23,7 @@ import type {
ProjectLocalRuntimeArtifactAccessOptions,
ProjectLocalRuntimeControlOptions,
} from "./types.js";
-import { selectedBuildCatalog } from "./project-components.js";
+import { selectedBuildCatalog } from "./project-infrastructure.js";
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
@@ -182,29 +186,30 @@ export function createLocalRuntimeControl(
};
}
-type OpenedProjectComponents = {
- readonly packages: readonly RuntimeComponentPackage[];
- readonly components: ReadonlyMap<string, { readonly package: RuntimeComponentPackage; readonly component: RuntimeComponent }>;
+type OpenedProjectInfrastructure = {
+ readonly packages: readonly RuntimeInfrastructurePackage[];
+ readonly parts: ReadonlyMap<string, { readonly package: RuntimeInfrastructurePackage; readonly part: RuntimePart }>;
close(): Promise<void>;
};
-async function openProjectComponents(
+async function openProjectInfrastructure(
options: ProjectLocalRuntimeControlOptions,
-): Promise<OpenedProjectComponents> {
- const packages = [...options.runtimeComponents];
- const components = new Map<string, { readonly package: RuntimeComponentPackage; readonly component: RuntimeComponent }>();
+): Promise<OpenedProjectInfrastructure> {
+ const packages = [...options.infrastructure];
+ const parts = new Map<string, { readonly package: RuntimeInfrastructurePackage; readonly part: RuntimePart }>();
try {
for (const item of packages) {
- verifyRuntimeComponentPackage(item);
- for (const component of item.components) {
- assert(!components.has(component.instance.id), `Runtime Component instance ${component.instance.id} is configured twice`);
- components.set(component.instance.id, { package: item, component });
+ verifyRuntimeInfrastructurePackage(item);
+ for (const part of item.parts) {
+ const key = `${part.owner}\u0000${part.part}`;
+ assert(!parts.has(key), `Runtime part ${part.owner}.${part.part} is configured twice`);
+ parts.set(key, { package: item, part });
}
}
let closed = false;
return {
packages,
- components,
+ parts,
close: async () => {
if (closed) return;
closed = true;
@@ -217,27 +222,29 @@ async function openProjectComponents(
}
}
-function selectedComponent<Role extends RuntimeComponent["role"]>(
- opened: OpenedProjectComponents,
- id: string,
+function selectedPart<Role extends RuntimePart["role"]>(
+ opened: OpenedProjectInfrastructure,
+ reference: RuntimePartReference,
role: Role,
-): Extract<RuntimeComponent, { readonly role: Role }> {
- const item = opened.components.get(id);
- assert(item !== undefined, `Runtime Component selection refers to unknown instance ${id}`);
- assert(item.component.role === role, `Runtime Component ${id} is ${item.component.role}, not ${role}`);
- return item.component as Extract<RuntimeComponent, { readonly role: Role }>;
+): Extract<RuntimePart, { readonly role: Role }> {
+ const key = `${reference.from}\u0000${reference.part}`;
+ const item = opened.parts.get(key);
+ assert(item !== undefined, `Runtime role refers to unknown part ${reference.from}.${reference.part}`);
+ assert(item.part.role === role,
+ `Runtime part ${reference.from}.${reference.part} is ${item.part.role}, not ${role}`);
+ return item.part as Extract<RuntimePart, { readonly role: Role }>;
}
/** Assemble only Build, Operation and Dispatch state selected by the Profile. */
export async function createProjectLocalRuntimeArchiveControl(
options: ProjectLocalRuntimeArchiveControlOptions,
): Promise<LocalRuntimeArchiveControl> {
- const opened = await openProjectComponents(options);
+ const opened = await openProjectInfrastructure(options);
try {
- const build = selectedComponent(opened, options.bindings.stores.build, "build-store");
- const operations = selectedComponent(opened, options.bindings.stores.operations, "operation-store");
- const dispatch = selectedComponent(opened, options.bindings.stores.dispatch, "dispatch-store");
- const catalog = selectedBuildCatalog(opened.packages, options.bindings.stores.build);
+ const build = selectedPart(opened, options.roles.buildStore, "build-store");
+ const operations = selectedPart(opened, options.roles.operationStore, "operation-store");
+ const dispatch = selectedPart(opened, options.roles.dispatchStore, "dispatch-store");
+ const catalog = selectedBuildCatalog(opened.packages, options.roles.buildStore);
return createLocalRuntimeArchiveControl({
buildStore: build.port,
...(catalog === undefined ? {} : { buildCatalog: catalog }),
@@ -255,9 +262,9 @@ export async function createProjectLocalRuntimeArchiveControl(
export async function createProjectLocalRuntimeArtifactAccess(
options: ProjectLocalRuntimeArtifactAccessOptions,
): Promise<LocalRuntimeArtifactAccess> {
- const opened = await openProjectComponents(options);
+ const opened = await openProjectInfrastructure(options);
try {
- const artifacts = selectedComponent(opened, options.bindings.stores.artifacts, "artifact-store");
+ const artifacts = selectedPart(opened, options.roles.artifactStore, "artifact-store");
return createLocalRuntimeArtifactAccess({ artifactStore: artifacts.port, close: opened.close });
} catch (error) {
await opened.close();
@@ -269,13 +276,13 @@ export async function createProjectLocalRuntimeArtifactAccess(
export async function createProjectLocalRuntimeControl(
options: ProjectLocalRuntimeControlOptions,
): Promise<LocalRuntimeControl> {
- const opened = await openProjectComponents(options);
+ const opened = await openProjectInfrastructure(options);
try {
- const build = selectedComponent(opened, options.bindings.stores.build, "build-store");
- const operations = selectedComponent(opened, options.bindings.stores.operations, "operation-store");
- const dispatch = selectedComponent(opened, options.bindings.stores.dispatch, "dispatch-store");
- const artifacts = selectedComponent(opened, options.bindings.stores.artifacts, "artifact-store");
- const catalog = selectedBuildCatalog(opened.packages, options.bindings.stores.build);
+ const build = selectedPart(opened, options.roles.buildStore, "build-store");
+ const operations = selectedPart(opened, options.roles.operationStore, "operation-store");
+ const dispatch = selectedPart(opened, options.roles.dispatchStore, "dispatch-store");
+ const artifacts = selectedPart(opened, options.roles.artifactStore, "artifact-store");
+ const catalog = selectedBuildCatalog(opened.packages, options.roles.buildStore);
return createLocalRuntimeControl({
buildStore: build.port,
...(catalog === undefined ? {} : { buildCatalog: catalog }),
diff --git a/packages/local/src/credentials.ts b/packages/runtime-local/src/credentials.ts
similarity index 100%
rename from packages/local/src/credentials.ts
rename to packages/runtime-local/src/credentials.ts
diff --git a/packages/local/src/host.ts b/packages/runtime-local/src/host.ts
similarity index 67%
rename from packages/local/src/host.ts
rename to packages/runtime-local/src/host.ts
index effdaf49..4e92bfe7 100644
--- a/packages/local/src/host.ts
+++ b/packages/runtime-local/src/host.ts
@@ -1,13 +1,12 @@
import { digestOf } from "@narratage/protocol";
-import { readNodePackageLock } from "@narratage/package-loader-node";
import {
createNodeRuntimeHostAdapterFacet,
-} from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-host-node";
import type {
NodeRuntimeHost,
NodeRuntimeHostAdapterContext,
RuntimeController,
-} from "@narratage/runtime-adapter-node";
+} from "@narratage/runtime-host-node";
import {
createRuntimeArchiveFromConfig,
@@ -16,7 +15,7 @@ import {
createRuntimeFromConfig,
createRuntimeMaintenanceFromConfig,
doctorRuntimeConfig,
- runtimeConfigPackageSelection,
+ resolveRuntimeConfigPaths,
runtimeConfigRevision,
} from "./config.js";
import {
@@ -37,42 +36,61 @@ async function createLocalRuntimeHost(context: NodeRuntimeHostAdapterContext): P
const basePackageRoot = context.packageRoot;
const controller = async (options: {
readonly workspaceRoot?: string;
- readonly packageLock?: string;
+ readonly implementationPackages?: readonly string[];
readonly packageRoot?: string;
} = {}): Promise<RuntimeController> => {
const packageRoot = options.packageRoot ?? basePackageRoot;
- const selection = await runtimeConfigPackageSelection(profile, { packageRoot });
- const revision = async (): Promise<string> => {
- const source = options.packageLock === undefined
- ? undefined
- : (await readNodePackageLock(options.packageLock)).digest;
- return digestOf({
- format: "narratage.runtime-worker-revision@1",
- profile: await runtimeConfigRevision(profile),
- source,
- });
- };
- const launch = {
- ...context.workerLaunch,
- workerArgs: [
- ...(options.workspaceRoot === undefined ? [] : ["--workspace", options.workspaceRoot]),
- ...(options.packageLock === undefined ? [] : ["--package-lock", options.packageLock]),
- "--package-root", packageRoot,
- ],
+ const selection = await resolveRuntimeConfigPaths(profile, { packageRoot });
+ const revision = async (): Promise<string> => digestOf({
+ format: "narratage.runtime-worker-revision@1",
+ profile: await runtimeConfigRevision(profile),
+ });
+ const implementationPackages = async (): Promise<readonly string[]> => {
+ const values = new Set(options.implementationPackages ?? []);
+ let archive: Awaited<ReturnType<typeof createRuntimeArchiveFromConfig>> | undefined;
+ try {
+ archive = await createRuntimeArchiveFromConfig(profile, { packageRoot, readOnly: true });
+ const queue = await archive.queue();
+ for (const dispatch of queue.dispatches) {
+ if (dispatch.phase === "terminal") continue;
+ for (const item of dispatch.implementationPackages) values.add(item);
+ }
+ } catch {
+ // Before the first submission there may be no durable Runtime state to inspect.
+ } finally {
+ await archive?.close();
+ }
+ return [...values].sort();
};
return {
profile,
dataRoot: selection.dataRoot,
revision,
worker: {
- up: async (workerOptions) => await ensureRuntimeProcess(
+ up: async (workerOptions) => {
+ const packages = await implementationPackages();
+ return await ensureRuntimeProcess(
+ profile,
+ selection.dataRoot,
+ {
+ ...context.workerLaunch,
+ workerArgs: [
+ ...(options.workspaceRoot === undefined ? [] : ["--workspace", options.workspaceRoot]),
+ ...packages.flatMap((item) => ["--package", item]),
+ "--package-root", packageRoot,
+ ],
+ },
+ await revision(),
+ workerOptions?.maxWaitMs ?? 10_000,
+ packages,
+ );
+ },
+ status: async () => await runtimeProcessStatus(
profile,
selection.dataRoot,
- launch,
await revision(),
- workerOptions?.maxWaitMs ?? 10_000,
+ await implementationPackages(),
),
- status: async () => await runtimeProcessStatus(profile, selection.dataRoot, await revision()),
logs: async () => await runtimeProcessLogs(selection.dataRoot),
down: async (workerOptions) => await stopRuntimeProcess(
profile,
@@ -89,13 +107,11 @@ async function createLocalRuntimeHost(context: NodeRuntimeHostAdapterContext): P
};
return {
profile,
- resolvePackages: async () => {
- const selection = await runtimeConfigPackageSelection(profile, { packageRoot: basePackageRoot });
+ resolvePaths: async () => {
+ const selection = await resolveRuntimeConfigPaths(profile, { packageRoot: basePackageRoot });
return {
- ...(selection.runtimePackageLock === undefined ? {} : { runtimePackageLock: selection.runtimePackageLock }),
packageRoot: selection.packageRoot,
runtimeDataRoot: selection.dataRoot,
- runtimeSelection: selection.runtimeSelection,
};
},
controller,
@@ -158,6 +174,6 @@ async function createLocalRuntimeHost(context: NodeRuntimeHostAdapterContext): P
}
export const localRuntimeHostAdapter = createNodeRuntimeHostAdapterFacet({
- use: "@narratage/local",
+ use: "@narratage/runtime-local",
open: createLocalRuntimeHost,
});
diff --git a/packages/local/src/index.ts b/packages/runtime-local/src/index.ts
similarity index 93%
rename from packages/local/src/index.ts
rename to packages/runtime-local/src/index.ts
index 84a73f16..924fc60c 100644
--- a/packages/local/src/index.ts
+++ b/packages/runtime-local/src/index.ts
@@ -23,7 +23,7 @@ export {
declaredManagedPrograms,
doctorRuntimeConfig,
parseRuntimeConfig,
- runtimeConfigPackageSelection,
+ resolveRuntimeConfigPaths,
runtimeConfigRevision,
} from "./config.js";
export {
@@ -33,7 +33,7 @@ export {
} from "./programs.js";
export {
RuntimeAdapterRegistry,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
export type * from "./types.js";
export type * from "./config.js";
export type * from "./programs.js";
diff --git a/packages/local/src/programs.ts b/packages/runtime-local/src/programs.ts
similarity index 99%
rename from packages/local/src/programs.ts
rename to packages/runtime-local/src/programs.ts
index ff09132c..3a14d3f4 100644
--- a/packages/local/src/programs.ts
+++ b/packages/runtime-local/src/programs.ts
@@ -4,7 +4,7 @@ import { join } from "node:path";
import { setTimeout as sleep } from "node:timers/promises";
import type { CapabilityRef } from "@narratage/protocol";
-import type { ManagedProgram, ManagedProgramCommand, ManagedProgramState } from "@narratage/runtime-adapter";
+import type { ManagedProgram, ManagedProgramCommand, ManagedProgramState } from "@narratage/runtime-kit";
import { declaredManagedPrograms } from "./config.js";
import type { LoadRuntimeConfigOptions } from "./config.js";
diff --git a/packages/runtime-local/src/project-infrastructure.ts b/packages/runtime-local/src/project-infrastructure.ts
new file mode 100644
index 00000000..a0569e7f
--- /dev/null
+++ b/packages/runtime-local/src/project-infrastructure.ts
@@ -0,0 +1,71 @@
+import {
+ assembleRuntimeInfrastructure,
+ verifyRuntimeInfrastructurePackage,
+} from "@narratage/runtime";
+import type {
+ BuildCatalog,
+ RuntimeInfrastructureAssembly,
+ RuntimeInfrastructurePackage,
+ RuntimePartReference,
+ RuntimeRoleSelection,
+} from "@narratage/runtime";
+
+import type { ProjectLocalRuntimeControlOptions } from "./types.js";
+
+export type ProjectRuntimeRoles = RuntimeRoleSelection;
+export type ProjectRuntimeInfrastructureAssembly = RuntimeInfrastructureAssembly;
+
+export type AssembledProjectRuntimeInfrastructure = {
+ readonly assembly: ProjectRuntimeInfrastructureAssembly;
+ readonly catalog: BuildCatalog | undefined;
+ readonly selection: ProjectRuntimeRoles;
+ close(): Promise<void>;
+};
+
+function assert(condition: unknown, message: string): asserts condition {
+ if (!condition) throw new Error(message);
+}
+
+export function selectedBuildCatalog(
+ packages: readonly RuntimeInfrastructurePackage[],
+ buildStore: RuntimePartReference,
+): BuildCatalog | undefined {
+ const owner = packages.find((item) => item.parts.some((part) =>
+ part.role === "build-store"
+ && part.owner === buildStore.from
+ && part.part === buildStore.part));
+ if (owner === undefined) return undefined;
+ const catalog = owner.buildCatalog;
+ if (catalog === undefined) return undefined;
+ assert(catalog !== null && typeof catalog === "object"
+ && "record" in catalog && typeof catalog.record === "function"
+ && "read" in catalog && typeof catalog.read === "function"
+ && "list" in catalog && typeof catalog.list === "function",
+ `Runtime part ${buildStore.from}.${buildStore.part} exposes an invalid Build Catalog`);
+ return catalog as BuildCatalog;
+}
+
+/**
+ * Assemble only the infrastructure parts named by the Runtime Profile. This layer never manufactures a
+ * Scheduler, Worker, Store, path or credential source on the project's behalf.
+ */
+export async function createProjectRuntimeInfrastructure(
+ _root: string,
+ options: ProjectLocalRuntimeControlOptions,
+): Promise<AssembledProjectRuntimeInfrastructure> {
+ const packages = [...options.infrastructure];
+ try {
+ for (const item of packages) verifyRuntimeInfrastructurePackage(item);
+ const assembly = assembleRuntimeInfrastructure(packages, options.roles);
+ const catalog = selectedBuildCatalog(packages, options.roles.buildStore);
+ return {
+ assembly,
+ catalog,
+ selection: options.roles,
+ close: () => assembly.close(),
+ };
+ } catch (error) {
+ for (const item of [...packages].reverse()) await item.close?.();
+ throw error;
+ }
+}
diff --git a/packages/local/src/runtime.ts b/packages/runtime-local/src/runtime.ts
similarity index 80%
rename from packages/local/src/runtime.ts
rename to packages/runtime-local/src/runtime.ts
index bc44b832..9acc4429 100644
--- a/packages/local/src/runtime.ts
+++ b/packages/runtime-local/src/runtime.ts
@@ -10,26 +10,20 @@ import {
EndpointRegistry,
} from "@narratage/driver-node";
import {
- loadNodePackageSet,
- collectNodePackageComponents,
-} from "@narratage/package-loader-node";
-import {
- assertRuntimeClosureAdmission,
RuntimeModuleRegistry,
createBuildDispatchIdentity,
isStreamingArtifactStore,
- nonTerminalDispatchPhases,
- resolveRuntimeProfile,
+ resolveRuntimeClosure,
sameBuildCatalogDescriptor,
- sealRuntimeProfile,
+ sealResolvedRuntimeProfile,
} from "@narratage/runtime";
import { TypeValidatorRegistry } from "@narratage/validation";
import type {
RuntimeModuleManifest,
- RuntimeProfileInstance,
+ RuntimeFacetInstance,
} from "@narratage/runtime";
-import { createProjectRuntimeComponents } from "./project-components.js";
+import { createProjectRuntimeInfrastructure } from "./project-infrastructure.js";
import { createLocalRuntimeControl } from "./control.js";
import { createLocalCredentialControl } from "./credentials.js";
import type {
@@ -50,15 +44,10 @@ function moduleKey(manifest: RuntimeModuleManifest): string {
return `${manifest.name}@${manifest.version}`;
}
-function facetKey(instance: RuntimeProfileInstance): string {
+function facetKey(instance: RuntimeFacetInstance): string {
return `${instance.facet.module.name}@${instance.facet.module.version}#${instance.facet.name}`;
}
-function manifestDigest(manifest: RuntimeModuleManifest): string {
- const registry = new RuntimeModuleRegistry();
- return registry.register(manifest);
-}
-
function nonNegativeInteger(value: number, subject: string): number {
assert(Number.isSafeInteger(value) && value >= 0, `${subject} must be a non-negative safe integer`);
return value;
@@ -88,13 +77,13 @@ function registerManifests(
const seen = new Map<string, string>();
for (const manifest of manifests) {
const key = moduleKey(manifest);
- const digest = manifestDigest(manifest);
+ const declaration = JSON.stringify(manifest);
const existing = seen.get(key);
if (existing !== undefined) {
- assert(existing === digest, `Runtime package ${key} was configured with conflicting Manifests`);
+ assert(existing === declaration, `Runtime package ${key} was configured with conflicting Manifests`);
continue;
}
- seen.set(key, digest);
+ seen.set(key, declaration);
registry.register(manifest);
}
}
@@ -108,10 +97,10 @@ function verifyEndpointPackages(packages: readonly EndpointPackage[]): void {
assert(item.manifest.name === item.instance.facet.module.name
&& item.manifest.version === item.instance.facet.module.version,
`${item.instance.id} instance ${facetKey(item.instance)} is outside its Runtime Manifest`);
- assert(item.bindings.length > 0, `${item.instance.id} binds no exact capability`);
- for (const binding of item.bindings) {
- assert(binding.endpoint === item.instance.id,
- `${item.instance.id} binding points to ${binding.endpoint}, not ${item.instance.id}`);
+ assert(item.offers.length > 0, `${item.instance.id} binds no exact capability`);
+ for (const offer of item.offers) {
+ assert(offer.endpoint === item.instance.id,
+ `${item.instance.id} offer points to ${offer.endpoint}, not ${item.instance.id}`);
}
}
}
@@ -121,13 +110,8 @@ export async function createLocalRuntime(
): Promise<LocalRuntime> {
const buildCatalog = options.buildCatalog;
if (options.scheduling?.maxConcurrency !== undefined || options.scheduling?.resourceLimits !== undefined) {
- throw new Error("a locked Runtime Closure owns maxConcurrency and resource limits");
+ throw new Error("the selected Runtime profile owns maxConcurrency and resource limits");
}
- const runtimeClosure = options.closure.value.digest;
- assertRuntimeClosureAdmission(
- runtimeClosure,
- await options.dispatchStore.list({ phases: nonTerminalDispatchPhases }),
- );
const producers = new ProducerRegistry();
const endpoints = new EndpointRegistry();
const validators = options.validators ?? new TypeValidatorRegistry();
@@ -240,7 +224,9 @@ export async function createLocalRuntime(
const created = await options.dispatchStore.create(createBuildDispatchIdentity({
build: request.id,
core: request.state.id,
- runtimeClosure,
+ ...(request.implementationPackages === undefined ? {} : {
+ implementationPackages: request.implementationPackages,
+ }),
}));
if (request.catalog !== undefined) {
await buildCatalog!.record(request.id, request.catalog);
@@ -283,7 +269,7 @@ export async function createLocalRuntime(
}
/**
- * Node project assembly over only the Runtime Component packages selected by the caller. Capability
+ * Node project assembly over only the Runtime infrastructure packages selected by the caller. Capability
* Endpoints may execute locally, in a vendor API, in Lambda, or on a hosted service; none is
* inferred from this local process boundary.
*/
@@ -292,40 +278,36 @@ export async function createProjectLocalRuntime(
): Promise<LocalRuntime> {
const root = resolve(options.dataRoot ?? process.cwd());
const packageRoot = resolve(options.packageRoot ?? root);
- const lockedPackageSet = options.packageLock === undefined
- ? undefined
- : await loadNodePackageSet(resolve(root, options.packageLock), packageRoot);
- const lockedComponents = lockedPackageSet === undefined
- ? []
- : collectNodePackageComponents(lockedPackageSet.packages.map((item) => item.contribution));
- const configuredComponents = [...lockedComponents, ...(options.components ?? [])];
- const projectComponents = await createProjectRuntimeComponents(root, options);
- const components = projectComponents.assembly;
- const selection = projectComponents.selection;
+ const configuredComponents = options.components ?? [];
+ const projectInfrastructure = await createProjectRuntimeInfrastructure(root, options);
+ const infrastructure = projectInfrastructure.assembly;
+ const selection = projectInfrastructure.selection;
+ const partId = (reference: { readonly from: string; readonly part: string }) =>
+ `${reference.from}.${reference.part}`;
const endpointPackages = options.endpoints ?? [];
try {
verifyEndpointPackages(endpointPackages);
const modules = new RuntimeModuleRegistry();
registerManifests(modules, [
- ...components.manifests,
+ ...infrastructure.manifests,
...endpointPackages.map((item) => item.manifest),
]);
- const profile = sealRuntimeProfile({
+ const profile = sealResolvedRuntimeProfile({
instances: [
- ...components.instances,
+ ...infrastructure.instances,
...endpointPackages.map((item) => item.instance),
],
- scheduler: selection.scheduler,
- worker: selection.worker,
+ scheduler: partId(selection.scheduler),
+ worker: partId(selection.worker),
stores: {
- build: selection.stores.build,
- operations: selection.stores.operations,
- dispatch: selection.stores.dispatch,
- artifacts: selection.stores.artifacts,
- credentials: selection.stores.credentials,
+ build: partId(selection.buildStore),
+ operations: partId(selection.operationStore),
+ dispatch: partId(selection.dispatchStore),
+ artifacts: partId(selection.artifactStore),
+ credentials: selection.credentialStores.map(partId),
},
- endpoints: endpointPackages.flatMap((item) => item.bindings),
+ endpoints: endpointPackages.flatMap((item) => item.offers),
scheduling: {
maxConcurrency: options.scheduling.maxConcurrency,
resources: Object.entries(options.scheduling.resources ?? {}).map(([id, maxConcurrency]) => ({
@@ -334,16 +316,16 @@ export async function createProjectLocalRuntime(
})),
},
});
- const closure = resolveRuntimeProfile(modules, profile);
+ const closure = resolveRuntimeClosure(modules, profile);
const runtime = await createLocalRuntime({
- buildStore: components.buildStore,
- ...(projectComponents.catalog === undefined ? {} : { buildCatalog: projectComponents.catalog }),
- operationStore: components.operationStore,
- dispatchStore: components.dispatchStore,
- artifactStore: components.artifactStore,
- credentialStore: components.credentialStore,
- scheduler: components.scheduler,
- worker: components.worker,
+ buildStore: infrastructure.buildStore,
+ ...(projectInfrastructure.catalog === undefined ? {} : { buildCatalog: projectInfrastructure.catalog }),
+ operationStore: infrastructure.operationStore,
+ dispatchStore: infrastructure.dispatchStore,
+ artifactStore: infrastructure.artifactStore,
+ credentialStore: infrastructure.credentialStore,
+ scheduler: infrastructure.scheduler,
+ worker: infrastructure.worker,
...(configuredComponents.length === 0
? {}
: { components: configuredComponents }),
@@ -370,11 +352,11 @@ export async function createProjectLocalRuntime(
openArtifact: runtime.openArtifact,
garbageCollectArtifacts: runtime.garbageCollectArtifacts,
close() {
- return projectComponents.close();
+ return projectInfrastructure.close();
},
};
} catch (error) {
- await projectComponents.close();
+ await projectInfrastructure.close();
throw error;
}
}
diff --git a/packages/runtime-local/src/scheduler-package.ts b/packages/runtime-local/src/scheduler-package.ts
new file mode 100644
index 00000000..1a560bb3
--- /dev/null
+++ b/packages/runtime-local/src/scheduler-package.ts
@@ -0,0 +1,40 @@
+import { digestOf } from "@narratage/protocol";
+import {
+ LocalBuildScheduler,
+ defineRuntimeInfrastructurePackage,
+} from "@narratage/runtime";
+import type { RuntimeInfrastructurePackage } from "@narratage/runtime";
+
+import { durableLocalWorkerFactory } from "./worker.js";
+
+const localRuntimeModuleRef = {
+ name: "@narratage/runtime-local",
+ version: "1",
+} as const;
+
+export function createLocalExecutionPackage(
+ instance: string,
+): RuntimeInfrastructurePackage {
+ return defineRuntimeInfrastructurePackage({
+ module: localRuntimeModuleRef,
+ instance,
+ parts: [
+ {
+ role: "scheduler",
+ part: "scheduler",
+ facet: "scheduler",
+ port: {
+ create(executor, options) {
+ return new LocalBuildScheduler(executor, options);
+ },
+ },
+ },
+ {
+ role: "worker",
+ part: "worker",
+ facet: "worker",
+ port: durableLocalWorkerFactory,
+ },
+ ],
+ });
+}
diff --git a/packages/local/src/types.ts b/packages/runtime-local/src/types.ts
similarity index 92%
rename from packages/local/src/types.ts
rename to packages/runtime-local/src/types.ts
index 37119464..a8ff3541 100644
--- a/packages/local/src/types.ts
+++ b/packages/runtime-local/src/types.ts
@@ -18,8 +18,8 @@ import type {
OperationStore,
OperationSnapshot,
RuntimeModuleRegistry,
- RuntimeComponentPackage,
- RuntimeBindings,
+ RuntimeInfrastructurePackage,
+ RuntimeRoleSelection,
RuntimeWorkerFactory,
} from "@narratage/runtime";
import type { TypeValidatorRegistrar, TypeValidatorRegistryLike } from "@narratage/validation";
@@ -29,7 +29,7 @@ export type { ComponentPackage } from "@narratage/component-kit";
export type LocalTypeValidatorRegistry = TypeValidatorRegistryLike & TypeValidatorRegistrar;
export type { EndpointPackage } from "@narratage/endpoint-kit";
-export type { RuntimeComponentPackage } from "@narratage/runtime";
+export type { RuntimeInfrastructurePackage } from "@narratage/runtime";
export type LocalRuntimeClosureOptions = {
readonly modules: RuntimeModuleRegistry;
@@ -58,13 +58,13 @@ export type CreateLocalRuntimeArchiveControlOptions = {
readonly buildCatalog?: BuildCatalog;
readonly operationStore: OperationStore;
readonly dispatchStore: BuildDispatchStore;
- /** Optional owner supplied by the project Component assembly. */
+ /** Optional owner supplied by the project infrastructure assembly. */
readonly close?: () => Awaitable<void>;
};
export type CreateLocalRuntimeArtifactAccessOptions = {
readonly artifactStore: ArtifactStore;
- /** Optional owner supplied by the project Component assembly. */
+ /** Optional owner supplied by the project infrastructure assembly. */
readonly close?: () => Awaitable<void>;
};
@@ -80,18 +80,16 @@ export type CreateLocalCredentialControlOptions = {
export type ProjectLocalRuntimeOptions = {
/** Runtime data boundary. It does not grant access to author source. */
readonly dataRoot?: string;
- /** Host directory whose node_modules contains the packages named by packageLock. Defaults to dataRoot. */
+ /** Host directory whose node_modules contains selected implementation packages. Defaults to dataRoot. */
readonly packageRoot?: string;
- /** Trusted implementation package inventory. Each compilation activates its exact Source subset. */
- readonly packageLock?: string;
/**
* Replaceable parts of the Runtime itself. One package may fill several roles;
* every selected role is explicit, and two packages exposing the same instance
* id are a configuration error rather than a choice made here.
*/
- readonly runtimeComponents: readonly RuntimeComponentPackage[];
+ readonly infrastructure: readonly RuntimeInfrastructurePackage[];
/** Exact Component instances selected by role; no role is inferred by uniqueness. */
- readonly bindings: RuntimeBindings;
+ readonly roles: RuntimeRoleSelection;
readonly components?: readonly ComponentPackage[];
readonly endpoints?: readonly EndpointPackage[];
readonly scheduling: {
@@ -103,8 +101,8 @@ export type ProjectLocalRuntimeOptions = {
export type ProjectLocalRuntimeArchiveControlOptions = Pick<ProjectLocalRuntimeOptions,
| "dataRoot"
- | "runtimeComponents"
- | "bindings"
+ | "infrastructure"
+ | "roles"
>;
export type ProjectLocalRuntimeArtifactAccessOptions = ProjectLocalRuntimeArchiveControlOptions;
@@ -114,6 +112,8 @@ export type LocalBuildRequest = {
/** Caller-generated identity for one submission; Source identity is separate. */
readonly id: string;
readonly state: BuildState;
+ /** Installed compute packages selected by this Build's Source closure. */
+ readonly implementationPackages?: readonly string[];
/** Source aliases and paths for Host inspection. Not trusted Build input. */
readonly catalog?: BuildCatalogDescriptor;
/** Host transfer bundle. It is staged before Core commands run and never enters BuildState. */
diff --git a/packages/local/src/worker-process.ts b/packages/runtime-local/src/worker-process.ts
similarity index 90%
rename from packages/local/src/worker-process.ts
rename to packages/runtime-local/src/worker-process.ts
index 00fc3c71..2cce774d 100644
--- a/packages/local/src/worker-process.ts
+++ b/packages/runtime-local/src/worker-process.ts
@@ -15,6 +15,7 @@ export type RuntimeProcessState = {
readonly startedAt?: number;
readonly profileDigest?: string;
readonly currentProfileDigest?: string;
+ readonly implementationPackages?: readonly string[];
readonly logPath: string;
};
@@ -24,6 +25,7 @@ type ProcessRecord = {
readonly pid: number;
readonly startedAt: number;
readonly profileDigest: string;
+ readonly implementationPackages: readonly string[];
};
const LOG_TAIL_BYTES = 1024 * 1024;
@@ -109,7 +111,9 @@ async function record(profile: string, dataRoot: string): Promise<ProcessRecord
const value = JSON.parse(await readFile(path, "utf8")) as ProcessRecord;
if (value.format !== "narratage.runtime-process@1" || value.profile !== resolve(profile)
|| !Number.isSafeInteger(value.pid) || value.pid < 1
- || typeof value.profileDigest !== "string" || value.profileDigest.length === 0) return undefined;
+ || typeof value.profileDigest !== "string" || value.profileDigest.length === 0
+ || !Array.isArray(value.implementationPackages)
+ || !value.implementationPackages.every((item) => typeof item === "string" && item.length > 0)) return undefined;
return value;
} catch (error) {
if (error instanceof Error && "code" in error && error.code === "ENOENT") return undefined;
@@ -121,13 +125,16 @@ export async function runtimeProcessStatus(
profile: string,
dataRoot: string,
currentProfileDigest: string,
+ requiredImplementationPackages: readonly string[] = [],
): Promise<RuntimeProcessState> {
const location = paths(dataRoot);
const current = await record(profile, dataRoot);
if (current === undefined || !alive(current.pid)) {
return { state: "stopped", profile: resolve(profile), logPath: location.log };
}
- if (current.profileDigest !== currentProfileDigest) {
+ const currentPackages = new Set(current.implementationPackages);
+ if (current.profileDigest !== currentProfileDigest
+ || requiredImplementationPackages.some((item) => !currentPackages.has(item))) {
return {
state: "stale",
profile: current.profile,
@@ -135,6 +142,7 @@ export async function runtimeProcessStatus(
startedAt: current.startedAt,
profileDigest: current.profileDigest,
currentProfileDigest,
+ implementationPackages: current.implementationPackages,
logPath: location.log,
};
}
@@ -145,6 +153,7 @@ export async function runtimeProcessStatus(
startedAt: current.startedAt,
profileDigest: current.profileDigest,
currentProfileDigest,
+ implementationPackages: current.implementationPackages,
logPath: location.log,
};
}
@@ -154,11 +163,12 @@ async function waitForReady(
dataRoot: string,
profileDigest: string,
timeoutMs: number,
+ implementationPackages: readonly string[],
): Promise<RuntimeProcessState> {
const location = paths(dataRoot);
const deadline = Date.now() + timeoutMs;
while (Date.now() <= deadline) {
- const state = await runtimeProcessStatus(profile, dataRoot, profileDigest);
+ const state = await runtimeProcessStatus(profile, dataRoot, profileDigest, implementationPackages);
if (state.state === "stopped") {
const log = await readFile(location.log, "utf8").catch(() => "");
throw new Error(`Runtime Worker exited before becoming ready${log.length === 0 ? "" : `: ${log.trim().split("\n").at(-1)}`}`);
@@ -175,9 +185,11 @@ export async function ensureRuntimeProcess(
launch: RuntimeWorkerLaunch,
profileDigest: string,
timeoutMs = 10_000,
+ implementationPackages: readonly string[] = [],
): Promise<RuntimeProcessState> {
return await withLifecycleLock(dataRoot, timeoutMs, async () => {
- const current = await runtimeProcessStatus(profile, dataRoot, profileDigest);
+ const selectedPackages = [...new Set(implementationPackages)].sort();
+ const current = await runtimeProcessStatus(profile, dataRoot, profileDigest, selectedPackages);
if (current.state === "running") return current;
if (current.state === "stale") await stopRuntimeProcessUnlocked(profile, dataRoot, timeoutMs);
const absolute = resolve(profile);
@@ -207,10 +219,11 @@ export async function ensureRuntimeProcess(
pid: child.pid,
startedAt,
profileDigest,
+ implementationPackages: selectedPackages,
} satisfies ProcessRecord), "utf8");
child.unref();
await log.close();
- return await waitForReady(absolute, dataRoot, profileDigest, timeoutMs);
+ return await waitForReady(absolute, dataRoot, profileDigest, timeoutMs, selectedPackages);
});
}
diff --git a/packages/local/src/worker.ts b/packages/runtime-local/src/worker.ts
similarity index 98%
rename from packages/local/src/worker.ts
rename to packages/runtime-local/src/worker.ts
index 68eb1cd9..75221688 100644
--- a/packages/local/src/worker.ts
+++ b/packages/runtime-local/src/worker.ts
@@ -251,7 +251,7 @@ class DurableLocalWorker implements RuntimeWorker {
dispatch.build,
lease,
"cancelled",
- dispatch.cancellation?.reason ?? "cancelled by Runtime authority",
+ dispatch.cancellation?.reason ?? "cancelled by Runtime pool",
);
}
@@ -290,10 +290,8 @@ class DurableLocalWorker implements RuntimeWorker {
async runOnce(options: { readonly owner: string; readonly leaseMs: number }): Promise<BuildDispatchSnapshot | undefined> {
assert(options.owner.trim().length > 0, "Worker owner is empty");
const leaseMs = positive(options.leaseMs, "Worker leaseMs");
- const runtimeClosure = this.#options.runtimeClosure;
const token = randomUUID();
const dispatch = await this.#options.stores.dispatch.claim({
- runtimeClosure: runtimeClosure.digest,
owner: options.owner,
token,
now: Date.now(),
@@ -306,8 +304,6 @@ class DurableLocalWorker implements RuntimeWorker {
const stored = await this.#options.stores.builds.read(dispatch.build);
assert(stored !== undefined, `Dispatch ${dispatch.build} has no BuildState`);
assert(stored.state.id === dispatch.core, `Dispatch ${dispatch.build} Core identity differs`);
- assert(runtimeClosure.digest === dispatch.runtimeClosure,
- `Dispatch ${dispatch.build} Runtime Closure differs`);
const suppressedCommands = new Set<string>();
const controlled = new CapacityExecutor(
this.#executor,
@@ -321,7 +317,7 @@ class DurableLocalWorker implements RuntimeWorker {
const scheduler = this.#options.scheduler.create(controlled, {
...this.#options.scheduling,
buildStore: this.#options.stores.builds,
- runtimeClosure,
+ runtimeClosure: this.#options.runtimeClosure,
});
let heartbeatError: unknown;
let heartbeat = Promise.resolve();
diff --git a/packages/local/test/config.test.ts b/packages/runtime-local/test/config.test.ts
similarity index 59%
rename from packages/local/test/config.test.ts
rename to packages/runtime-local/test/config.test.ts
index ffb25312..00aba533 100644
--- a/packages/local/test/config.test.ts
+++ b/packages/runtime-local/test/config.test.ts
@@ -4,12 +4,11 @@ import { tmpdir } from "node:os";
import { join } from "node:path";
import test from "node:test";
-import { digestOf } from "@narratage/protocol";
import {
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
createRuntimeEndpointAdapterFacet,
-} from "@narratage/runtime-adapter";
-import { createSqliteRuntimeComponentPackage } from "@narratage/store-sqlite";
+} from "@narratage/runtime-kit";
+import { createSqliteRuntimeInfrastructurePackage } from "@narratage/store-sqlite";
import {
createRuntimeArchiveFromConfig,
createRuntimeArtifactAccessFromConfig,
@@ -17,38 +16,34 @@ import {
parseRuntimeConfig,
runtimeConfigRevision,
RuntimeAdapterRegistry,
-} from "@narratage/local";
+} from "@narratage/runtime-local";
-const bindings = {
- scheduler: "execution.scheduler",
- worker: "execution.worker",
- stores: {
- build: "state.builds",
- operations: "state.operations",
- dispatch: "state.dispatch",
- artifacts: "artifacts.store",
- credentials: [] as string[],
- },
+const roles = {
+ scheduler: { from: "execution", part: "scheduler" },
+ worker: { from: "execution", part: "worker" },
+ buildStore: { from: "state", part: "builds" },
+ operationStore: { from: "state", part: "operations" },
+ dispatchStore: { from: "state", part: "dispatch" },
+ artifactStore: { from: "artifacts", part: "store" },
+ credentialStores: [] as { from: string; part: string }[],
};
function profile(config: {
readonly dataRoot?: string;
- readonly components?: Readonly<Record<string, unknown>>;
+ readonly infrastructure?: Readonly<Record<string, unknown>>;
readonly endpoints?: Readonly<Record<string, unknown>>;
- readonly selectedBindings?: typeof bindings;
- readonly runtimePackageLock?: string;
+ readonly selectedRoles?: typeof roles;
} = {}) {
return {
format: "narratage.runtime-profile@1",
- ...(config.runtimePackageLock === undefined ? {} : { runtimePackageLock: config.runtimePackageLock }),
runtime: {
- use: "@narratage/local",
+ use: "@narratage/runtime-local",
config: {
dataRoot: config.dataRoot ?? ".narratage/runtimes/local",
- components: config.components ?? {},
- bindings: config.selectedBindings ?? bindings,
+ infrastructure: config.infrastructure ?? {},
+ roles: config.selectedRoles ?? roles,
endpoints: config.endpoints ?? {},
- limits: { maxOperations: 3 },
+ capacity: { maxActiveOperations: 3 },
},
},
};
@@ -56,11 +51,11 @@ function profile(config: {
test("Runtime Profile keeps deployment data separate from source and derives instance names from maps", () => {
const parsed = parseRuntimeConfig(profile({
- components: { state: { use: "example.state", config: { path: "state.sqlite" } } },
- endpoints: { generation: { use: "example.provider", authority: "shared" } },
+ infrastructure: { state: { use: "example.state", config: { path: "state.sqlite" } } },
+ endpoints: { generation: { use: "example.provider", pool: "shared" } },
}));
assert.equal(parsed.dataRoot, ".narratage/runtimes/local");
- assert.deepEqual(parsed.components, [{
+ assert.deepEqual(parsed.infrastructure, [{
use: "example.state",
instance: "state",
config: { path: "state.sqlite" },
@@ -68,72 +63,56 @@ test("Runtime Profile keeps deployment data separate from source and derives ins
assert.deepEqual(parsed.endpoints, [{
use: "example.provider",
instance: "generation",
- authority: "shared",
+ pool: "shared",
}]);
- assert.deepEqual(parsed.bindings, bindings);
+ assert.deepEqual(parsed.roles, roles);
assert.equal("root" in parsed, false);
- assert.equal("packageLock" in parsed, false);
});
test("Runtime Profile rejects source ownership fields", () => {
- assert.throws(() => parseRuntimeConfig({ ...profile(), packageLock: "./svml.packages.lock" }),
- /does not accept packageLock/u);
assert.throws(() => parseRuntimeConfig({ ...profile(), root: "." }),
/does not accept root/u);
});
-test("Runtime revision follows Profile content and its Runtime lock only", async () => {
+test("Runtime revision follows Profile meaning rather than formatting", async () => {
const root = await mkdtemp(join(tmpdir(), "narratage-runtime-revision-"));
const profilePath = join(root, "deployment.profile");
- const lockPath = join(root, "runtime.lock");
- const lock = (label: string) => {
- const content = {
- format: "svml.node-package-lock@1" as const,
- selected: [],
- artifacts: [{ name: `example-${label}`, version: "1", digest: digestOf(label) }],
- packages: [],
- };
- return JSON.stringify({ ...content, digest: digestOf(content) });
- };
try {
- await writeFile(lockPath, lock("one"), "utf8");
- await writeFile(profilePath, JSON.stringify(profile({ runtimePackageLock: "./runtime.lock" })), "utf8");
+ await writeFile(profilePath, JSON.stringify(profile()), "utf8");
const first = await runtimeConfigRevision(profilePath);
- await writeFile(profilePath, JSON.stringify(profile({ runtimePackageLock: "./runtime.lock" }), null, 2), "utf8");
+ await writeFile(profilePath, JSON.stringify(profile(), null, 2), "utf8");
assert.equal(await runtimeConfigRevision(profilePath), first);
- await writeFile(lockPath, lock("two"), "utf8");
+ await writeFile(profilePath, JSON.stringify(profile({ dataRoot: "elsewhere" })), "utf8");
assert.notEqual(await runtimeConfigRevision(profilePath), first);
} finally {
await rm(root, { recursive: true, force: true });
}
});
-test("archive observation constructs only the Components bound to archive roles", async () => {
+test("archive observation constructs only the infrastructure selected by archive roles", async () => {
const root = await mkdtemp(join(tmpdir(), "narratage-runtime-slice-"));
- const path = join(root, "svml.runtime.json");
+ const path = join(root, "narratage.runtime.json");
await writeFile(path, JSON.stringify(profile({
dataRoot: ".",
- components: {
+ infrastructure: {
state: { use: "example.state" },
artifacts: { use: "example.artifacts" },
},
})));
let artifactConstructions = 0;
const registry = new RuntimeAdapterRegistry();
- registry.registerFacet(createRuntimeComponentAdapterFacet({
+ registry.registerFacet(createRuntimeInfrastructureAdapterFacet({
use: "example.state",
validate() {},
create(context) {
- return createSqliteRuntimeComponentPackage({
+ return createSqliteRuntimeInfrastructurePackage({
path: join(context.dataRoot, "state.sqlite"),
- buildInstance: `${context.instance}.builds`,
- operationInstance: `${context.instance}.operations`,
- dispatchInstance: `${context.instance}.dispatch`,
+ instance: context.instance,
readOnly: context.access === "read-only",
});
},
}));
- registry.registerFacet(createRuntimeComponentAdapterFacet({
+ registry.registerFacet(createRuntimeInfrastructureAdapterFacet({
use: "example.artifacts",
validate() {},
create() {
@@ -155,7 +134,7 @@ test("archive observation constructs only the Components bound to archive roles"
test("doctor reports a down Managed Program without inventing a Runtime default", async () => {
const root = await mkdtemp(join(tmpdir(), "narratage-runtime-program-"));
- const path = join(root, "svml.runtime.json");
+ const path = join(root, "narratage.runtime.json");
await writeFile(path, JSON.stringify(profile({
dataRoot: ".",
endpoints: { speech: { use: "example.speech" } },
@@ -168,7 +147,7 @@ test("doctor reports a down Managed Program without inventing a Runtime default"
name: context.instance,
manifest: { facets: [] },
instance: { id: context.instance },
- bindings: [],
+ offers: [],
credentials: [],
install() {},
} as never,
diff --git a/packages/local/test/local.test.ts b/packages/runtime-local/test/local.test.ts
similarity index 79%
rename from packages/local/test/local.test.ts
rename to packages/runtime-local/test/local.test.ts
index 13b41b50..104822b4 100644
--- a/packages/local/test/local.test.ts
+++ b/packages/runtime-local/test/local.test.ts
@@ -18,22 +18,21 @@ import type { RecoverableEndpoint } from "@narratage/endpoint-kit";
import type {
ComponentPackage,
EndpointPackage,
-} from "@narratage/local";
-import { createLocalExecutionPackage, createProjectLocalRuntime } from "@narratage/local";
+} from "@narratage/runtime-local";
+import { createLocalExecutionPackage, createProjectLocalRuntime } from "@narratage/runtime-local";
import { digestOf } from "@narratage/core";
import {
- createNodePackageLock,
- writeNodePackageLock,
+ collectNodePackageComponents,
+ loadNodePackageSelection,
} from "@narratage/package-loader-node";
-import { LocalBuildScheduler, credentialRef, defineRuntimeComponentPackage } from "@narratage/runtime";
+import { LocalBuildScheduler, credentialRef, defineRuntimeInfrastructurePackage } from "@narratage/runtime";
import type { CredentialValue, WritableCredentialStore } from "@narratage/runtime";
import type { RuntimeModuleManifest } from "@narratage/runtime";
-import { createSqliteRuntimeComponentPackage } from "@narratage/store-sqlite";
+import { createSqliteRuntimeInfrastructurePackage } from "@narratage/store-sqlite";
import {
capabilities,
createGreetingBuild,
- implementationDigests,
manifest as greetingManifest,
producers,
types,
@@ -41,15 +40,13 @@ import {
const providerModule = { name: "example.local-endpoint", version: "1" } as const;
const providerFacet = { module: providerModule, name: "generation" } as const;
-const providerDigest = digestOf("example.local-endpoint/generation@1");
const providerManifest: RuntimeModuleManifest = {
- format: "svml.runtime-module@1",
+ format: "narratage.runtime-module@1",
name: providerModule.name,
version: providerModule.version,
facets: [{
name: providerFacet.name,
role: "capability-endpoint",
- implementation: { digest: providerDigest },
fulfills: [{ capability: capabilities.generation, returns: types.generated }],
lifecycle: "recoverable",
defaultConcurrency: 1,
@@ -57,75 +54,33 @@ const providerManifest: RuntimeModuleManifest = {
};
function projectRuntimeFixture(directory: string) {
- const execution = createLocalExecutionPackage("execution.local");
- const state = createSqliteRuntimeComponentPackage({
+ const execution = createLocalExecutionPackage("execution");
+ const state = createSqliteRuntimeInfrastructurePackage({
path: join(directory, ".narratage", "runtime.sqlite"),
- buildInstance: "state.builds",
- operationInstance: "state.operations",
- dispatchInstance: "state.dispatch",
+ instance: "state",
});
const artifacts = createFileArtifactStorePackage({
root: join(directory, ".narratage", "artifacts"),
- instance: "artifacts.fs",
+ instance: "artifacts",
});
- const credentials = createEnvironmentCredentialStorePackage({ instance: "credentials.env" });
+ const credentials = createEnvironmentCredentialStorePackage({ instance: "credentials" });
return {
- runtimeComponents: [execution, state, artifacts, credentials],
- bindings: {
- scheduler: "execution.local.scheduler",
- worker: "execution.local.worker",
- stores: {
- build: "state.builds",
- operations: "state.operations",
- dispatch: "state.dispatch",
- artifacts: "artifacts.fs",
- credentials: ["credentials.env"],
- },
+ infrastructure: [execution, state, artifacts, credentials],
+ roles: {
+ scheduler: { from: "execution", part: "scheduler" },
+ worker: { from: "execution", part: "worker" },
+ buildStore: { from: "state", part: "builds" },
+ operationStore: { from: "state", part: "operations" },
+ dispatchStore: { from: "state", part: "dispatch" },
+ artifactStore: { from: "artifacts", part: "store" },
+ credentialStores: [{ from: "credentials", part: "store" }],
},
scheduling: { maxConcurrency: 4 },
} as const;
}
-test("one local execution domain fences Runtime Closure revisions, not author package subsets", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-revision-gate-"));
- try {
- const first = await createProjectLocalRuntime({
- dataRoot: directory,
- ...projectRuntimeFixture(directory),
- });
- await first.build({
- id: "unfinished-build",
- state: createGreetingBuild({ implementationClosure: digestOf("implementation:first") }),
- });
- await first.close();
-
- const changedRuntimePackages = projectRuntimeFixture(directory);
- const execution = changedRuntimePackages.runtimeComponents[0];
- const revisedExecution = {
- ...execution,
- manifest: {
- ...execution.manifest,
- facets: execution.manifest.facets.map((facet) => ({
- ...facet,
- implementation: { ...facet.implementation, digest: digestOf(`${facet.name}:revision-two`) },
- })),
- },
- };
- await assert.rejects(
- createProjectLocalRuntime({
- dataRoot: directory,
- ...changedRuntimePackages,
- runtimeComponents: [revisedExecution, ...changedRuntimePackages.runtimeComponents.slice(1)],
- }),
- /cannot enter this execution domain[\s\S]*unfinished-build[\s\S]*original Runtime Profile/u,
- );
- } finally {
- await rm(directory, { recursive: true, force: true });
- }
-});
-
test("Artifact GC is explicit, dry-run by default, and only removes unreachable managed bytes", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-artifact-gc-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-artifact-gc-"));
try {
const artifacts = new FileArtifactStore(join(directory, ".narratage", "artifacts"));
const orphan = await artifacts.put(new TextEncoder().encode("orphan"), "application/octet-stream");
@@ -143,7 +98,7 @@ test("Artifact GC is explicit, dry-run by default, and only removes unreachable
});
test("Endpoint-declared credentials use the selected writable Store without a Provider switch", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-auth-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-auth-"));
const values = new Map<string, CredentialValue>();
const credentialStore: WritableCredentialStore = {
owns(ref) { return ref.store === "memory"; },
@@ -151,13 +106,13 @@ test("Endpoint-declared credentials use the selected writable Store without a Pr
async put(ref, value) { values.set(ref.key, value); },
async delete(ref) { return values.delete(ref.key); },
};
- const memoryCredentials = defineRuntimeComponentPackage({
+ const memoryCredentials = defineRuntimeInfrastructurePackage({
module: { name: "example.credentials-memory", version: "1" },
- components: [{
+ instance: "memory-credentials",
+ parts: [{
role: "credential-store",
facet: "credential-store",
- instance: "credentials.memory",
- implementation: { digest: digestOf("credentials-memory@1") },
+ part: "store",
port: credentialStore,
}],
});
@@ -165,8 +120,7 @@ test("Endpoint-declared credentials use the selected writable Store without a Pr
module: providerModule,
facet: "generation",
instance: "generation.auth-test",
- authority: "generation.auth-test",
- implementation: { digest: providerDigest },
+ pool: "generation.auth-test",
credentials: { apiKey: credentialRef("memory", "generation.api-key") },
credentialInputs: { apiKey: { label: "Generation API key" } },
capabilities: [{
@@ -184,10 +138,10 @@ test("Endpoint-declared credentials use the selected writable Store without a Pr
const runtime = await createProjectLocalRuntime({
dataRoot: directory,
...base,
- runtimeComponents: [...base.runtimeComponents.slice(0, -1), memoryCredentials],
- bindings: {
- ...base.bindings,
- stores: { ...base.bindings.stores, credentials: ["credentials.memory"] },
+ infrastructure: [...base.infrastructure.slice(0, -1), memoryCredentials],
+ roles: {
+ ...base.roles,
+ credentialStores: [{ from: "memory-credentials", part: "store" }],
},
endpoints: [endpoint],
});
@@ -206,10 +160,10 @@ test("Endpoint-declared credentials use the selected writable Store without a Pr
});
test("project local runtime resumes durable work while component and endpoint packages stay replaceable", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-"));
const initial = createGreetingBuild();
const catalog = {
- format: "svml.build-catalog-descriptor@1" as const,
+ format: "narratage.build-catalog-descriptor@1" as const,
core: initial.id,
source: { path: join(directory, "main.svml"), closure: digestOf("source:greeting") },
aliases: [{
@@ -232,7 +186,6 @@ test("project local runtime resumes durable work while component and endpoint pa
producers: [
{
producer: producers.makePrompt,
- implementationDigest: implementationDigests.makePrompt,
handler: ({ inputs }) => {
promptCalls += 1;
const intent = inputs.intent;
@@ -243,7 +196,6 @@ test("project local runtime resumes durable work while component and endpoint pa
},
{
producer: producers.requestText,
- implementationDigest: implementationDigests.requestText,
handler: ({ inputs }) => {
requestCalls += 1;
assert.equal(inputs.prompt?.value.kind, "inline");
@@ -252,7 +204,6 @@ test("project local runtime resumes durable work while component and endpoint pa
},
{
producer: producers.placeholderText,
- implementationDigest: implementationDigests.placeholderText,
handler: async ({ inputs }) => {
placeholderCalls += 1;
assert.equal(inputs.prompt?.value.kind, "inline");
@@ -262,7 +213,6 @@ test("project local runtime resumes durable work while component and endpoint pa
},
{
producer: producers.assemble,
- implementationDigest: implementationDigests.assemble,
handler: ({ inputs }) => {
assembleCalls += 1;
assert.equal(inputs.generated?.value.kind, "inline");
@@ -303,10 +253,9 @@ test("project local runtime resumes durable work while component and endpoint pa
instance: {
id: "generation.personal",
facet: providerFacet,
- authority: "generation.personal",
- configurationDigest: digestOf({}),
+ pool: "generation.personal",
},
- bindings: [{
+ offers: [{
capability: capabilities.generation,
returns: types.generated,
endpoint: "generation.personal",
@@ -318,13 +267,6 @@ test("project local runtime resumes durable work while component and endpoint pa
capabilities.generation,
types.generated,
recoverableEndpoint,
- {
- runtimeImplementation: {
- facet: providerFacet,
- digest: providerDigest,
- configurationDigest: digestOf({}),
- },
- },
);
},
};
@@ -458,7 +400,7 @@ test("project local runtime resumes durable work while component and endpoint pa
});
test("two durable Workers share one SQLite capacity limit across Runtime instances", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-shared-capacity-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-shared-capacity-"));
let promptCalls = 0;
let entered: (() => void) | undefined;
let release: (() => void) | undefined;
@@ -467,7 +409,6 @@ test("two durable Workers share one SQLite capacity limit across Runtime instanc
const components: ComponentPackage = {
producers: [{
producer: producers.makePrompt,
- implementationDigest: implementationDigests.makePrompt,
handler: async ({ inputs }) => {
promptCalls += 1;
if (promptCalls === 1) {
@@ -479,21 +420,18 @@ test("two durable Workers share one SQLite capacity limit across Runtime instanc
},
}, {
producer: producers.requestText,
- implementationDigest: implementationDigests.requestText,
handler: ({ inputs }) => {
assert.equal(inputs.prompt?.value.kind, "inline");
return { outputs: {}, needs: { generation: { prompt: inputs.prompt.value.value } } };
},
}, {
producer: producers.placeholderText,
- implementationDigest: implementationDigests.placeholderText,
handler: ({ inputs }) => ({
outputs: { generated: { kind: "inline", value: `Preview: ${String(inputs.prompt?.value.kind === "inline" ? inputs.prompt.value.value : "")}` } },
needs: {},
}),
}, {
producer: producers.assemble,
- implementationDigest: implementationDigests.assemble,
handler: ({ inputs }) => ({
outputs: { document: { kind: "inline", value: { text: String(inputs.generated?.value.kind === "inline" ? inputs.generated.value.value : "") } } },
needs: {},
@@ -543,12 +481,11 @@ test("two durable Workers share one SQLite capacity limit across Runtime instanc
}
});
-test("project local runtime activates locked compute facets without deployment source registration", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-locked-components-"));
+test("project local runtime accepts components loaded from an installed package", async () => {
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-components-"));
const runtimeRoot = join(directory, "external-project");
const installedRoot = join(directory, "narratage-install");
const packageRoot = join(installedRoot, "node_modules", "example-greeting-components");
- const lockPath = join(directory, "svml.packages.lock");
await mkdir(runtimeRoot, { recursive: true });
await mkdir(packageRoot, { recursive: true });
await writeFile(join(packageRoot, "package.json"), JSON.stringify({
@@ -556,20 +493,19 @@ test("project local runtime activates locked compute facets without deployment s
version: "1.0.0",
type: "module",
exports: "./activation.mjs",
- svml: { activation: "./activation.mjs" },
+ narratage: { activation: "./activation.mjs" },
}), "utf8");
await writeFile(join(packageRoot, "activation.mjs"), `
const manifest = ${JSON.stringify(greetingManifest)};
const module = { name: manifest.name, version: manifest.version };
const producer = (name) => ({ module, name });
export default {
- format: "svml.node-package@1",
+ format: "narratage.node-package@1",
modules: [{ manifest }],
components: [{
producers: [
{
producer: producer("make-prompt"),
- implementationDigest: ${JSON.stringify(implementationDigests.makePrompt)},
handler({ inputs }) {
const intent = inputs.intent.value.value;
return { outputs: { prompt: { kind: "inline", value: "Greet " + intent.name } }, needs: {} };
@@ -577,14 +513,12 @@ test("project local runtime activates locked compute facets without deployment s
},
{
producer: producer("placeholder-text"),
- implementationDigest: ${JSON.stringify(implementationDigests.placeholderText)},
handler() {
return { outputs: { generated: { kind: "inline", value: "Preview greeting" } }, needs: {} };
},
},
{
producer: producer("assemble"),
- implementationDigest: ${JSON.stringify(implementationDigests.assemble)},
handler({ inputs }) {
return { outputs: { document: { kind: "inline", value: { text: inputs.generated.value.value } } }, needs: {} };
},
@@ -595,25 +529,23 @@ test("project local runtime activates locked compute facets without deployment s
`, "utf8");
try {
- const lock = await createNodePackageLock(["example-greeting-components"], installedRoot);
- await writeNodePackageLock(lockPath, lock);
+ const loaded = await loadNodePackageSelection(["example-greeting-components"], installedRoot);
const runtime = await createProjectLocalRuntime({
dataRoot: runtimeRoot,
...projectRuntimeFixture(runtimeRoot),
packageRoot: installedRoot,
- packageLock: "../svml.packages.lock",
+ components: collectNodePackageComponents(loaded.map((item) => item.contribution)),
});
const result = await runtime.build({
- id: "locked-preview",
+ id: "selected-preview",
state: createGreetingBuild({
generationRealization: "placeholder",
- implementationClosure: lock.digest,
}),
});
assert.equal(result.status, "queued");
- const completed = await runtime.workOnce({ owner: "locked-test", leaseMs: 5_000 });
+ const completed = await runtime.workOnce({ owner: "selected-test", leaseMs: 5_000 });
assert.equal(completed?.terminal, "complete");
- assert.equal((await runtime.status("locked-preview")).build?.state.records
+ assert.equal((await runtime.status("selected-preview")).build?.state.records
.some((record) => record.id === "document:root"), true);
await runtime.close();
} finally {
@@ -622,17 +554,15 @@ test("project local runtime activates locked compute facets without deployment s
});
test("project local runtime uses only the explicitly selected Scheduler", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-scheduler-service-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-scheduler-service-"));
let creates = 0;
- const scheduler = defineRuntimeComponentPackage({
+ const scheduler = defineRuntimeInfrastructurePackage({
module: { name: "example.scheduler", version: "1" },
- components: [{
+ instance: "custom-scheduler",
+ parts: [{
role: "scheduler",
facet: "scheduler",
- instance: "scheduler.example",
- implementation: {
- digest: digestOf("example.scheduler/fair@1"),
- },
+ part: "scheduler",
port: {
create(executor, options) {
creates += 1;
@@ -646,8 +576,8 @@ test("project local runtime uses only the explicitly selected Scheduler", async
const runtime = await createProjectLocalRuntime({
dataRoot: directory,
...base,
- runtimeComponents: [...base.runtimeComponents, scheduler],
- bindings: { ...base.bindings, scheduler: "scheduler.example" },
+ infrastructure: [...base.infrastructure, scheduler],
+ roles: { ...base.roles, scheduler: { from: "custom-scheduler", part: "scheduler" } },
});
await runtime.build({ id: "scheduler-selection", state: createGreetingBuild() });
await runtime.workOnce({ owner: "scheduler-test", leaseMs: 5_000 });
@@ -659,18 +589,16 @@ test("project local runtime uses only the explicitly selected Scheduler", async
});
test("two installed Schedulers are unambiguous because the Profile selects one", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-scheduler-selection-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-scheduler-selection-"));
const creates = { one: 0, two: 0 };
const closes = { one: 0, two: 0 };
- const scheduler = (name: "one" | "two") => defineRuntimeComponentPackage({
+ const scheduler = (name: "one" | "two") => defineRuntimeInfrastructurePackage({
module: { name: `example.scheduler.${name}`, version: "1" },
- components: [{
+ instance: `scheduler-${name}`,
+ parts: [{
role: "scheduler",
facet: "scheduler",
- instance: `scheduler.${name}`,
- implementation: {
- digest: digestOf(`example.scheduler.${name}/fair@1`),
- },
+ part: "scheduler",
port: {
create(executor, options) {
creates[name] += 1;
@@ -685,8 +613,8 @@ test("two installed Schedulers are unambiguous because the Profile selects one",
const runtime = await createProjectLocalRuntime({
dataRoot: directory,
...base,
- runtimeComponents: [...base.runtimeComponents, scheduler("one"), scheduler("two")],
- bindings: { ...base.bindings, scheduler: "scheduler.two" },
+ infrastructure: [...base.infrastructure, scheduler("one"), scheduler("two")],
+ roles: { ...base.roles, scheduler: { from: "scheduler-two", part: "scheduler" } },
});
await runtime.build({ id: "scheduler-two", state: createGreetingBuild() });
await runtime.workOnce({ owner: "scheduler-test", leaseMs: 5_000 });
@@ -699,19 +627,16 @@ test("two installed Schedulers are unambiguous because the Profile selects one",
});
test("project local runtime accepts an explicitly selected replacement ArtifactStore package", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-local-artifacts-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-local-artifacts-"));
const module = { name: "example.remote-artifacts", version: "1" } as const;
const artifactStore = new MemoryArtifactStore();
- const artifacts = defineRuntimeComponentPackage({
+ const artifacts = defineRuntimeInfrastructurePackage({
module,
- components: [{
+ instance: "remote-artifacts",
+ parts: [{
facet: "artifact-store",
- instance: "artifacts.remote",
+ part: "store",
role: "artifact-store",
- implementation: {
- digest: digestOf("example.remote-artifacts@1"),
- },
- configuration: { bucket: "fixture" },
port: artifactStore,
}],
});
@@ -720,10 +645,10 @@ test("project local runtime accepts an explicitly selected replacement ArtifactS
const runtime = await createProjectLocalRuntime({
dataRoot: directory,
...selected,
- runtimeComponents: [...selected.runtimeComponents, artifacts],
- bindings: {
- ...selected.bindings,
- stores: { ...selected.bindings.stores, artifacts: "artifacts.remote" },
+ infrastructure: [...selected.infrastructure, artifacts],
+ roles: {
+ ...selected.roles,
+ artifactStore: { from: "remote-artifacts", part: "store" },
},
});
const bytes = new Uint8Array([7, 8, 9]);
diff --git a/packages/local/test/programs.test.ts b/packages/runtime-local/test/programs.test.ts
similarity index 88%
rename from packages/local/test/programs.test.ts
rename to packages/runtime-local/test/programs.test.ts
index f6e59026..b3885bce 100644
--- a/packages/local/test/programs.test.ts
+++ b/packages/runtime-local/test/programs.test.ts
@@ -5,8 +5,8 @@ import { join } from "node:path";
import test from "node:test";
import { setTimeout as sleep } from "node:timers/promises";
-import { createRuntimeEndpointAdapterFacet } from "@narratage/runtime-adapter";
-import type { ManagedProgram } from "@narratage/runtime-adapter";
+import { createRuntimeEndpointAdapterFacet } from "@narratage/runtime-kit";
+import type { ManagedProgram } from "@narratage/runtime-kit";
import type { CapabilityRef } from "@narratage/protocol";
import {
@@ -15,7 +15,7 @@ import {
reportManagedPrograms,
RuntimeAdapterRegistry,
takeManagedProgramsDown,
-} from "@narratage/local";
+} from "@narratage/runtime-local";
const requiredCapability = {
module: { name: "example.capabilities", version: "1" },
@@ -29,30 +29,28 @@ const requiredCapability = {
*/
async function project(program: (root: string) => ManagedProgram) {
const root = await mkdtemp(join(tmpdir(), "narratage-programs-"));
- const path = join(root, "svml.runtime.json");
+ const path = join(root, "narratage.runtime.json");
await writeFile(path, JSON.stringify({
format: "narratage.runtime-profile@1",
runtime: {
- use: "@narratage/local",
+ use: "@narratage/runtime-local",
config: {
dataRoot: ".",
- components: {},
- bindings: {
- scheduler: "execution.scheduler",
- worker: "execution.worker",
- stores: {
- build: "state.builds",
- operations: "state.operations",
- dispatch: "state.dispatch",
- artifacts: "artifacts",
- credentials: ["credentials"],
- },
+ infrastructure: {},
+ roles: {
+ scheduler: { from: "execution", part: "scheduler" },
+ worker: { from: "execution", part: "worker" },
+ buildStore: { from: "state", part: "builds" },
+ operationStore: { from: "state", part: "operations" },
+ dispatchStore: { from: "state", part: "dispatch" },
+ artifactStore: { from: "artifacts", part: "store" },
+ credentialStores: [{ from: "credentials", part: "store" }],
},
endpoints: {
- one: { use: "example.program", authority: "example.local", config: {} },
- two: { use: "example.program", authority: "example.local", config: {} },
+ one: { use: "example.program", pool: "example.local", config: {} },
+ two: { use: "example.program", pool: "example.local", config: {} },
},
- limits: { maxOperations: 1 },
+ capacity: { maxActiveOperations: 1 },
},
},
}));
@@ -64,7 +62,7 @@ async function project(program: (root: string) => ManagedProgram) {
name: context.instance,
manifest: { facets: [] },
instance: { id: context.instance },
- bindings: [{
+ offers: [{
capability: requiredCapability,
returns: { module: { name: "example.values", version: "1" }, name: "Value" },
endpoint: context.instance,
@@ -107,7 +105,7 @@ test("an empty Build capability set loads no Runtime Adapter closure", async ()
}));
const result = await declaredManagedPrograms(configured.path, {
// Deliberately omit the registry. Reaching adapter activation would fail
- // because `example.program` is not installed in a package lock.
+ // because no installed package provides `example.program`.
capabilities: [],
});
assert.deepEqual(result, { dataRoot: configured.root, programs: [] });
@@ -129,7 +127,7 @@ function fileBackedProgram(root: string, marker: string): ManagedProgram {
}
test("up starts the program once for every Endpoint that drives it, and down stops it", async () => {
- const marker = join(await mkdtemp(join(tmpdir(), "svml-marker-")), "ready");
+ const marker = join(await mkdtemp(join(tmpdir(), "narratage-marker-")), "ready");
const { root, path, options } = await project((projectRoot) => fileBackedProgram(projectRoot, marker));
const progress: string[] = [];
@@ -167,7 +165,7 @@ test("up starts the program once for every Endpoint that drives it, and down sto
});
test("concurrent up calls atomically share one Managed Program process", async () => {
- const markerRoot = await mkdtemp(join(tmpdir(), "svml-marker-concurrent-"));
+ const markerRoot = await mkdtemp(join(tmpdir(), "narratage-marker-concurrent-"));
const marker = join(markerRoot, "ready");
const { root, path, options } = await project((projectRoot) => fileBackedProgram(projectRoot, marker));
try {
@@ -211,7 +209,7 @@ test("down leaves a running program this project did not start", async () => {
});
test("a program with nothing to start is prepared, and preparing is the whole job", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-prepare-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-prepare-"));
const marker = join(directory, "installed");
const { path, options } = await project(() => ({
id: "example",
diff --git a/packages/local/test/worker-process.test.ts b/packages/runtime-local/test/worker-process.test.ts
similarity index 88%
rename from packages/local/test/worker-process.test.ts
rename to packages/runtime-local/test/worker-process.test.ts
index 7ad389a9..b3d0992b 100644
--- a/packages/local/test/worker-process.test.ts
+++ b/packages/runtime-local/test/worker-process.test.ts
@@ -15,14 +15,7 @@ test("one detached Runtime Worker is observable, reusable and explicitly stoppab
const root = await mkdtemp(join(tmpdir(), "narratage-runtime-process-"));
const profile = join(root, "runtime.json");
const dataRoot = join(root, ".narratage", "runtimes", "local");
- const authorLock = join(root, "author.lock");
- const runtimeLock = join(root, "runtime.lock");
- await writeFile(authorLock, "author-v1\n", "utf8");
- await writeFile(runtimeLock, "runtime-v1\n", "utf8");
- await writeFile(profile, JSON.stringify({
- packageLock: "./author.lock",
- runtimePackageLock: "./runtime.lock",
- }), "utf8");
+ await writeFile(profile, JSON.stringify({ format: "narratage.runtime-profile@1" }), "utf8");
await mkdir(join(root, ".narratage"), { recursive: true });
await writeFile(join(root, ".narratage", "runtime"), "runtime.json\n", "utf8");
const program = `
@@ -56,16 +49,14 @@ test("one detached Runtime Worker is observable, reusable and explicitly stoppab
const bounded = await runtimeProcessLogs(dataRoot);
assert.ok(Buffer.byteLength(bounded.text) <= 1024 * 1024);
assert.match(bounded.text, /tail-marker/u);
- await writeFile(runtimeLock, "runtime-v2\n", "utf8");
assert.equal((await runtimeProcessStatus(profile, dataRoot, "revision-2")).state, "stale");
const replaced = await ensureRuntimeProcess(
profile, dataRoot, { command: process.execPath, args: ["-e", program] }, "revision-2", 5_000);
assert.notEqual(replaced.pid, first.pid);
assert.equal(replaced.state, "running");
await writeFile(profile, JSON.stringify({
- root: ".",
- packageLock: "./author.lock",
- runtimePackageLock: "./runtime.lock",
+ format: "narratage.runtime-profile@1",
+ runtime: { use: "example.runtime" },
}), "utf8");
assert.equal((await runtimeProcessStatus(profile, dataRoot, "revision-3")).state, "stale");
const replacedAgain = await ensureRuntimeProcess(
diff --git a/packages/runtime/README.md b/packages/runtime/README.md
index cdd1e686..642b48ab 100644
--- a/packages/runtime/README.md
+++ b/packages/runtime/README.md
@@ -7,30 +7,30 @@ The first implementation contains:
- `RuntimeCommandExecutor`: regenerate Core-authorized commands and execute one by identity;
- `LocalBuildScheduler`: one authoritative, queue-free scheduler shared by multiple Builds;
- atomic generic resource claims with Runtime Profile overrides;
-- static Runtime Module facets, sealed Profile resolution and a content-addressed Runtime Closure;
-- exact Endpoint capability/return bindings and implementation digests;
+- static Runtime Module facets and explicit Profile resolution;
+- exact Endpoint capability/return offers;
- `BuildStore` and `OperationStore` ports with compare-and-swap in-memory references;
- a recoverable Endpoint lifecycle that creates an Operation before `start`, checkpoints `pending`,
calls `resume` after a restart, and records wake, retry, failure and cancellation state;
- a narrow `CredentialStore`/`CredentialRef` port that keeps secrets out of framework facts.
-- one host-neutral `RuntimeComponentPackage` ABI that binds configured Scheduler, BuildStore,
- OperationStore, ArtifactStore and CredentialStore implementations to their exact Manifest facet;
- one physical package may expose several separately selected Components.
+- one host-neutral `RuntimeInfrastructurePackage` ABI that binds configured Scheduler, BuildStore,
+ OperationStore, ArtifactStore and CredentialStore implementations to their selected Manifest facet;
+ one configured package instance may expose several separately selected parts.
A Runtime assembly owns the lifecycle of the configured packages passed to it and closes each once.
-Binding grants Component authority; merely being installed never grants scheduling, storage or
+Role selection grants a part one responsibility; merely being installed never grants scheduling, storage or
credential authority. These remain trusted deployment packages, not author-importable modules.
The Scheduler does not traverse Graphs, choose Candidates, rewrite Needs or accept arbitrary
serialized commands. Core remains the sole source of readiness and the sole Event acceptance law.
Resources only limit how many already-authorized commands execute concurrently. Provider Endpoints
-claim both an explicit Authority and an exact capability Route; the Store acquires them atomically.
+claim both an explicit Provider pool and an exact capability lane; the Store acquires them atomically.
An Endpoint's vendor-side job system remains internal and cannot advance another Build step.
`MemoryBuildStore` stores verified BuildState only. `MemoryOperationStore` separately records a
-content-addressed attempt identity, pending checkpoint and terminal result. The Operation id is also
+stable attempt identity, pending checkpoint and terminal result. The Operation id is also
the stable key supplied to an upstream system when it supports idempotent submission.
-Changing the Build, Command, Endpoint implementation or Runtime Closure changes that identity.
+Changing the Build, Command, selected Endpoint or attempt changes that identity.
Nothing in the OperationStore becomes an accepted domain fact until an Endpoint completion is
validated and reduced by Core. If a process stops after completion is persisted but before Core
accepts its Event, the next run reconstructs the same Event from the stored completion and does not
diff --git a/packages/runtime/src/catalog.ts b/packages/runtime/src/catalog.ts
index e6815aca..8a4d1cad 100644
--- a/packages/runtime/src/catalog.ts
+++ b/packages/runtime/src/catalog.ts
@@ -11,7 +11,7 @@ export type BuildCatalogAlias = {
};
export type BuildCatalogDescriptor = {
- readonly format: "svml.build-catalog-descriptor@1";
+ readonly format: "narratage.build-catalog-descriptor@1";
readonly core: Digest;
readonly source: {
readonly path: string;
@@ -41,7 +41,7 @@ function assert(condition: unknown, message: string): asserts condition {
}
export function verifyBuildCatalogDescriptor(descriptor: BuildCatalogDescriptor): void {
- assert(descriptor.format === "svml.build-catalog-descriptor@1", "Build Catalog descriptor format is invalid");
+ assert(descriptor.format === "narratage.build-catalog-descriptor@1", "Build Catalog descriptor format is invalid");
assert(isDigest(descriptor.core), "Build Catalog Core identity is invalid");
assert(descriptor.source.path.trim().length > 0, "Build Catalog source path is empty");
assert(isDigest(descriptor.source.closure), "Build Catalog source closure is invalid");
diff --git a/packages/runtime/src/components.ts b/packages/runtime/src/components.ts
deleted file mode 100644
index da088391..00000000
--- a/packages/runtime/src/components.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-import { canonicalize, digestOf, isDigest } from "@narratage/protocol";
-import type { CanonicalValue, Digest, ModuleRef } from "@narratage/protocol";
-
-import { CompositeCredentialStore } from "./credentials.js";
-import type { CredentialStore } from "./credentials.js";
-import type { BuildCatalog } from "./catalog.js";
-import type { BuildDispatchStore } from "./dispatch.js";
-import type { OperationStore } from "./operations.js";
-import {
- RuntimeModuleRegistry,
-} from "./profile.js";
-import type {
- RuntimeModuleManifest,
- RuntimeProfileInstance,
- RuntimeComponentFacetRole,
-} from "./profile.js";
-import type {
- ArtifactStore,
- BuildSchedulerFactory,
- BuildStore,
- RuntimeWorkerFactory,
-} from "./types.js";
-
-type RuntimeComponentBase<Role extends RuntimeComponentFacetRole, Implementation> = {
- readonly role: Role;
- readonly instance: RuntimeProfileInstance;
- readonly port: Implementation;
-};
-
-export type RuntimeSchedulerComponent = RuntimeComponentBase<"scheduler", BuildSchedulerFactory>;
-export type RuntimeWorkerComponent = RuntimeComponentBase<"worker", RuntimeWorkerFactory>;
-export type RuntimeBuildStoreComponent = RuntimeComponentBase<"build-store", BuildStore>;
-export type RuntimeOperationStoreComponent = RuntimeComponentBase<"operation-store", OperationStore>;
-export type RuntimeDispatchStoreComponent = RuntimeComponentBase<"dispatch-store", BuildDispatchStore>;
-export type RuntimeArtifactStoreComponent = RuntimeComponentBase<"artifact-store", ArtifactStore>;
-export type RuntimeCredentialStoreComponent = RuntimeComponentBase<"credential-store", CredentialStore>;
-
-export type RuntimeComponent =
- | RuntimeSchedulerComponent
- | RuntimeWorkerComponent
- | RuntimeBuildStoreComponent
- | RuntimeOperationStoreComponent
- | RuntimeDispatchStoreComponent
- | RuntimeArtifactStoreComponent
- | RuntimeCredentialStoreComponent;
-
-/** One configured deployment package may expose several exact Runtime Components. */
-export type RuntimeComponentPackage = {
- readonly manifest: RuntimeModuleManifest;
- readonly components: readonly RuntimeComponent[];
- /** Optional Host-facing index owned by the same durable Build store; never part of Runtime selection. */
- readonly buildCatalog?: BuildCatalog;
- close?(): void | Promise<void>;
-};
-
-type RuntimeComponentDefinitionBase<Role extends RuntimeComponentFacetRole, Implementation> = {
- readonly role: Role;
- readonly facet: string;
- readonly instance: string;
- readonly implementation: {
- readonly digest: Digest;
- };
- readonly configuration?: CanonicalValue;
- readonly port: Implementation;
-};
-
-export type RuntimeComponentDefinition =
- | RuntimeComponentDefinitionBase<"scheduler", BuildSchedulerFactory>
- | RuntimeComponentDefinitionBase<"worker", RuntimeWorkerFactory>
- | RuntimeComponentDefinitionBase<"build-store", BuildStore>
- | RuntimeComponentDefinitionBase<"operation-store", OperationStore>
- | RuntimeComponentDefinitionBase<"dispatch-store", BuildDispatchStore>
- | RuntimeComponentDefinitionBase<"artifact-store", ArtifactStore>
- | RuntimeComponentDefinitionBase<"credential-store", CredentialStore>;
-
-export type DefineRuntimeComponentPackageOptions = {
- readonly module: ModuleRef;
- readonly components: readonly RuntimeComponentDefinition[];
- /** Host presentation index co-owned with this package's BuildStore, if any. */
- readonly buildCatalog?: BuildCatalog;
- readonly close?: () => void | Promise<void>;
-};
-
-export type RuntimeBindings = {
- readonly scheduler: string;
- readonly worker: string;
- readonly stores: {
- readonly build: string;
- readonly operations: string;
- readonly dispatch: string;
- readonly artifacts: string;
- readonly credentials: readonly string[];
- };
-};
-
-export type RuntimeComponentAssembly = {
- readonly manifests: readonly RuntimeModuleManifest[];
- readonly instances: readonly RuntimeProfileInstance[];
- readonly scheduler: BuildSchedulerFactory;
- readonly worker: RuntimeWorkerFactory;
- readonly buildStore: BuildStore;
- readonly operationStore: OperationStore;
- readonly dispatchStore: BuildDispatchStore;
- readonly artifactStore: ArtifactStore;
- readonly credentialStore: CredentialStore;
- close(): Promise<void>;
-};
-
-function assert(condition: unknown, message: string): asserts condition {
- if (!condition) throw new Error(message);
-}
-
-function componentFacetKey(component: RuntimeComponent): string {
- const ref = component.instance.facet;
- return `${ref.module.name}@${ref.module.version}#${ref.name}`;
-}
-
-function callable(value: object, name: string, subject: string): void {
- assert(name in value && typeof (value as Record<string, unknown>)[name] === "function",
- `${subject} does not implement ${name}()`);
-}
-
-function verifyComponentPort(component: RuntimeComponent): void {
- assert(typeof component.port === "object" && component.port !== null,
- `${component.instance.id} Runtime Component implementation is invalid`);
- switch (component.role) {
- case "scheduler":
- callable(component.port, "create", component.instance.id);
- break;
- case "worker":
- callable(component.port, "create", component.instance.id);
- break;
- case "build-store":
- callable(component.port, "create", component.instance.id);
- callable(component.port, "read", component.instance.id);
- callable(component.port, "compareAndSwap", component.instance.id);
- break;
- case "operation-store":
- callable(component.port, "create", component.instance.id);
- callable(component.port, "read", component.instance.id);
- callable(component.port, "list", component.instance.id);
- callable(component.port, "compareAndSwap", component.instance.id);
- break;
- case "dispatch-store":
- for (const method of [
- "create", "read", "list", "claim", "heartbeat", "release", "finish", "requestCancellation", "wake",
- "acquireCapacity", "heartbeatCapacity", "parkCapacity", "releaseCapacity", "clearCapacity", "listCapacity",
- ]) callable(component.port, method, component.instance.id);
- break;
- case "artifact-store":
- callable(component.port, "put", component.instance.id);
- callable(component.port, "get", component.instance.id);
- callable(component.port, "has", component.instance.id);
- break;
- case "credential-store":
- callable(component.port, "resolve", component.instance.id);
- break;
- }
-}
-
-export function defineRuntimeComponentPackage(
- options: DefineRuntimeComponentPackageOptions,
-): RuntimeComponentPackage {
- assert(options.module.name.trim().length > 0 && options.module.version.trim().length > 0,
- "Runtime Component module identity is invalid");
- assert(options.components.length > 0, "Runtime Component package is empty");
- const instances = new Set<string>();
- const facets = new Set<string>();
- const components = options.components.map((definition): RuntimeComponent => {
- assert(definition.facet.trim().length > 0, "Runtime Component facet is empty");
- assert(definition.instance.trim().length > 0, "Runtime Component instance is empty");
- assert(!instances.has(definition.instance), `Runtime Component instance ${definition.instance} is duplicated`);
- assert(!facets.has(definition.facet), `Runtime Component facet ${definition.facet} is duplicated`);
- assert(isDigest(definition.implementation.digest), `${definition.instance} implementation digest is invalid`);
- instances.add(definition.instance);
- facets.add(definition.facet);
- return {
- role: definition.role,
- instance: {
- id: definition.instance,
- facet: { module: { ...options.module }, name: definition.facet },
- configurationDigest: digestOf(canonicalize(definition.configuration ?? null)),
- },
- port: definition.port,
- } as RuntimeComponent;
- });
- const manifest: RuntimeModuleManifest = {
- format: "svml.runtime-module@1",
- name: options.module.name,
- version: options.module.version,
- facets: options.components.map((definition) => ({
- name: definition.facet,
- role: definition.role,
- implementation: { ...definition.implementation },
- })),
- };
- const result: RuntimeComponentPackage = {
- manifest,
- components,
- ...(options.buildCatalog === undefined ? {} : { buildCatalog: options.buildCatalog }),
- ...(options.close === undefined ? {} : { close: options.close }),
- };
- verifyRuntimeComponentPackage(result);
- return result;
-}
-
-export function verifyRuntimeComponentPackage(value: RuntimeComponentPackage): void {
- const packageName = `${value.manifest.name}@${value.manifest.version}`;
- assert(value.components.length > 0, `${packageName} contains no Runtime Component`);
- const modules = new RuntimeModuleRegistry();
- modules.register(value.manifest);
- const ids = new Set<string>();
- const claimedFacets = new Set<string>();
- for (const component of value.components) {
- assert(component.instance.id.trim().length > 0, `${packageName} Runtime Component instance is empty`);
- assert(!ids.has(component.instance.id), `${packageName} repeats Runtime Component ${component.instance.id}`);
- ids.add(component.instance.id);
- assert(isDigest(component.instance.configurationDigest),
- `${packageName} component ${component.instance.id} configuration digest is invalid`);
- verifyComponentPort(component);
- const resolved = modules.resolve(component.instance.facet);
- assert(resolved !== undefined, `${packageName} component ${component.instance.id} has no Manifest facet`);
- assert(resolved.facet.role === component.role,
- `${packageName} component ${component.instance.id} role differs from its Manifest facet`);
- claimedFacets.add(componentFacetKey(component));
- }
- for (const facet of value.manifest.facets) {
- assert(facet.role !== "capability-endpoint", `${packageName} Runtime Component Manifest contains an Endpoint facet`);
- const key = `${value.manifest.name}@${value.manifest.version}#${facet.name}`;
- assert(claimedFacets.has(key), `${packageName} Manifest facet ${facet.name} has no configured component`);
- }
-}
-
-type SelectedRuntimeComponent<Role extends RuntimeComponentFacetRole> = {
- readonly package: RuntimeComponentPackage;
- readonly component: Extract<RuntimeComponent, { readonly role: Role }>;
-};
-
-function selectedComponent<Role extends RuntimeComponentFacetRole>(
- components: ReadonlyMap<string, { readonly package: RuntimeComponentPackage; readonly component: RuntimeComponent }>,
- id: string | undefined,
- role: Role,
-): SelectedRuntimeComponent<Role> | undefined {
- if (id === undefined) return undefined;
- const selected = components.get(id);
- assert(selected !== undefined, `Runtime Component selection refers to unknown instance ${id}`);
- assert(selected.component.role === role, `Runtime Component ${id} is ${selected.component.role}, not ${role}`);
- return selected as SelectedRuntimeComponent<Role>;
-}
-
-/** Resolve exact configured Component instances without giving any package routing authority. */
-export function assembleRuntimeComponents(
- packages: readonly RuntimeComponentPackage[],
- selection: RuntimeBindings,
-): RuntimeComponentAssembly {
- const components = new Map<string, { readonly package: RuntimeComponentPackage; readonly component: RuntimeComponent }>();
- for (const item of packages) {
- verifyRuntimeComponentPackage(item);
- for (const component of item.components) {
- assert(!components.has(component.instance.id), `Runtime Component instance ${component.instance.id} is configured twice`);
- components.set(component.instance.id, { package: item, component });
- }
- }
- const scheduler = selectedComponent(components, selection.scheduler, "scheduler")!;
- const worker = selectedComponent(components, selection.worker, "worker")!;
- const build = selectedComponent(components, selection.stores.build, "build-store");
- const operations = selectedComponent(components, selection.stores.operations, "operation-store");
- const dispatch = selectedComponent(components, selection.stores.dispatch, "dispatch-store");
- const artifacts = selectedComponent(components, selection.stores.artifacts, "artifact-store");
- const credentialComponents = selection.stores.credentials.map((id) => selectedComponent(components, id, "credential-store")!);
- const selected = [scheduler, worker, build, operations, dispatch, artifacts, ...credentialComponents]
- .filter((item): item is NonNullable<typeof item> => item !== undefined);
- const selectedPackages = [...new Set(selected.map((item) => item.package))];
- let closed = false;
- return {
- manifests: selectedPackages.map((item) => item.manifest),
- instances: selected.map((item) => item.component.instance),
- scheduler: scheduler.component.port,
- worker: worker.component.port,
- buildStore: build!.component.port,
- operationStore: operations!.component.port,
- dispatchStore: dispatch!.component.port,
- artifactStore: artifacts!.component.port,
- credentialStore: new CompositeCredentialStore(credentialComponents.map((item) => item.component.port)),
- async close() {
- if (closed) return;
- closed = true;
- for (const item of [...packages].reverse()) await item.close?.();
- },
- };
-}
diff --git a/packages/runtime/src/credentials.ts b/packages/runtime/src/credentials.ts
index ca5d74b8..380b7de7 100644
--- a/packages/runtime/src/credentials.ts
+++ b/packages/runtime/src/credentials.ts
@@ -1,5 +1,5 @@
export type CredentialRef = {
- readonly format: "svml.credential-ref@1";
+ readonly format: "narratage.credential-ref@1";
/** CredentialStore implementation name, for example env, keychain or aws-default. */
readonly store: string;
/** Store-local opaque lookup key. It is configuration, never the secret value. */
@@ -27,13 +27,13 @@ function assert(condition: unknown, message: string): asserts condition {
}
export function credentialRef(store: string, key: string): CredentialRef {
- const value = { format: "svml.credential-ref@1", store, key } as const;
+ const value = { format: "narratage.credential-ref@1", store, key } as const;
verifyCredentialRef(value);
return value;
}
export function verifyCredentialRef(ref: CredentialRef): void {
- assert(ref.format === "svml.credential-ref@1", "unsupported CredentialRef format");
+ assert(ref.format === "narratage.credential-ref@1", "unsupported CredentialRef format");
assert(ref.store.trim().length > 0, "CredentialRef store is empty");
assert(ref.key.trim().length > 0, "CredentialRef key is empty");
}
diff --git a/packages/runtime/src/dispatch.ts b/packages/runtime/src/dispatch.ts
index c18756f9..f2509cdd 100644
--- a/packages/runtime/src/dispatch.ts
+++ b/packages/runtime/src/dispatch.ts
@@ -14,12 +14,12 @@ export type DispatchLease = {
};
export type BuildDispatchIdentity = {
- readonly format: "svml.build-dispatch-identity@1";
+ readonly format: "narratage.build-dispatch-identity@1";
readonly id: Digest;
readonly build: string;
readonly core: Digest;
- /** Exact Runtime Closure selected for this execution domain. */
- readonly runtimeClosure: Digest;
+ /** Installed compute packages required to execute this Build. */
+ readonly implementationPackages: readonly string[];
};
export type BuildDispatchSnapshot = BuildDispatchIdentity & {
@@ -44,8 +44,6 @@ export type BuildDispatchCreate =
| { readonly status: "existing"; readonly snapshot: BuildDispatchSnapshot };
export type BuildDispatchClaim = {
- /** Exact Runtime Closure this Worker can execute. Claims are filtered before leasing. */
- readonly runtimeClosure: Digest;
readonly owner: string;
readonly token: string;
readonly now: number;
@@ -84,14 +82,14 @@ export type CapacityResourceClaim = {
};
export type CapacityReservation = {
- readonly format: "svml.capacity-reservation@1";
+ readonly format: "narratage.capacity-reservation@1";
readonly id: Digest;
readonly build: string;
readonly command: string;
readonly resources: readonly CapacityResourceClaim[];
readonly queue?: {
- readonly authority: string;
- readonly route: string;
+ readonly pool: string;
+ readonly lane: string;
};
readonly mode: CapacityMode;
readonly inFlight: boolean;
@@ -106,7 +104,7 @@ export type CapacityAcquireRequest = {
readonly resources: readonly CapacityResourceClaim[];
readonly queue?: CapacityReservation["queue"];
readonly mode: CapacityMode;
- /** Current Build authority; a stale Worker cannot reserve capacity after being fenced. */
+ /** Current Build pool; a stale Worker cannot reserve capacity after being fenced. */
readonly buildLease: DispatchLease;
readonly owner: string;
readonly token: string;
@@ -171,16 +169,17 @@ function positive(value: number, subject: string): number {
export function createBuildDispatchIdentity(input: {
readonly build: string;
readonly core: Digest;
- readonly runtimeClosure: Digest;
+ readonly implementationPackages?: readonly string[];
}): BuildDispatchIdentity {
assert(input.build.trim().length > 0, "Build Dispatch build id is empty");
assert(isDigest(input.core), "Build Dispatch Core digest is invalid");
- assert(isDigest(input.runtimeClosure), "Build Dispatch Runtime Closure digest is invalid");
+ const implementationPackages = [...new Set(input.implementationPackages ?? [])].sort();
+ assert(implementationPackages.every((item) => item.trim().length > 0), "Build Dispatch implementation package is empty");
const content = {
- format: "svml.build-dispatch-identity@1" as const,
+ format: "narratage.build-dispatch-identity@1" as const,
build: input.build,
core: input.core,
- runtimeClosure: input.runtimeClosure,
+ implementationPackages,
};
return { ...content, id: digestOf(content) };
}
@@ -213,31 +212,9 @@ export function verifyBuildDispatchSnapshot(value: BuildDispatchSnapshot): void
if (value.cancellation !== undefined) safeNonNegative(value.cancellation.requestedAt, "cancellation requestedAt");
}
-/**
- * One DispatchStore is one execution domain. It may admit only one Runtime Closure while work is
- * unfinished. This keeps execution honest without retaining old code or inventing a multi-version
- * Worker supervisor. A caller that intentionally wants another execution domain selects another
- * DispatchStore.
- */
-export function assertRuntimeClosureAdmission(
- runtimeClosure: Digest,
- dispatches: readonly BuildDispatchSnapshot[],
-): void {
- assert(isDigest(runtimeClosure), "Runtime Closure digest is invalid");
- const conflicts = dispatches
- .filter((item) => item.phase !== "terminal" && item.runtimeClosure !== runtimeClosure)
- .sort((left, right) => left.build.localeCompare(right.build));
- if (conflicts.length === 0) return;
- throw new Error([
- `Runtime Closure ${runtimeClosure} cannot enter this execution domain while unfinished Builds belong to another closure:`,
- ...conflicts.map((item) => ` ${item.build} · ${item.phase} · ${item.runtimeClosure}`),
- "Finish or cancel those Builds with their original Runtime Profile, restore that Profile and its package locks, or select another DispatchStore.",
- ].join("\n"));
-}
-
export function capacityReservationId(build: string, command: string): Digest {
assert(build.trim().length > 0 && command.trim().length > 0, "Capacity reservation identity is empty");
- return digestOf({ format: "svml.capacity-reservation-identity@1", build, command });
+ return digestOf({ format: "narratage.capacity-reservation-identity@1", build, command });
}
export function verifyCapacityLimits(value: CapacityLimits): void {
@@ -245,7 +222,7 @@ export function verifyCapacityLimits(value: CapacityLimits): void {
}
export function verifyCapacityReservation(value: CapacityReservation): void {
- assert(value.format === "svml.capacity-reservation@1", "Capacity reservation format is unsupported");
+ assert(value.format === "narratage.capacity-reservation@1", "Capacity reservation format is unsupported");
assert(value.id === capacityReservationId(value.build, value.command), "Capacity reservation identity differs");
assert(value.resources.length > 0, "Capacity reservation resources are empty");
const resources = value.resources.map((resource) => {
@@ -256,8 +233,8 @@ export function verifyCapacityReservation(value: CapacityReservation): void {
});
assert(new Set(resources).size === resources.length, "Capacity reservation repeats a resource");
if (value.queue !== undefined) {
- assert(value.queue.authority.trim().length > 0, "Capacity queue authority is empty");
- assert(value.queue.route.trim().length > 0, "Capacity queue route is empty");
+ assert(value.queue.pool.trim().length > 0, "Capacity queue pool is empty");
+ assert(value.queue.lane.trim().length > 0, "Capacity queue lane is empty");
}
assert(value.mode === "active" || value.mode === "recoverable", "Capacity reservation mode is invalid");
if (value.active !== undefined) verifyDispatchLease(value.active, "Capacity lease");
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index 4065a119..ec183d68 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -16,7 +16,6 @@ export {
} from "./credentials.js";
export type * from "./credentials.js";
export {
- assertRuntimeClosureAdmission,
capacityReservationId,
createBuildDispatchIdentity,
nonTerminalDispatchPhases,
@@ -38,20 +37,20 @@ export type * from "./operations.js";
export {
RuntimeModuleRegistry,
localSchedulerOptionsFromClosure,
- resolveRuntimeProfile,
+ resolveRuntimeClosure,
runtimeEndpoint,
- sealRuntimeProfile,
+ sealResolvedRuntimeProfile,
verifyRuntimeClosure,
verifyRuntimeCoverage,
- verifyRuntimeProfile,
+ verifyResolvedRuntimeProfile,
} from "./profile.js";
export type * from "./profile.js";
export {
- assembleRuntimeComponents,
- defineRuntimeComponentPackage,
- verifyRuntimeComponentPackage,
-} from "./components.js";
-export type * from "./components.js";
+ assembleRuntimeInfrastructure,
+ defineRuntimeInfrastructurePackage,
+ verifyRuntimeInfrastructurePackage,
+} from "./infrastructure.js";
+export type * from "./infrastructure.js";
export { LocalBuildScheduler } from "./scheduler.js";
export {
isEnumerableBuildStore,
diff --git a/packages/runtime/src/infrastructure.ts b/packages/runtime/src/infrastructure.ts
new file mode 100644
index 00000000..6e1e3b81
--- /dev/null
+++ b/packages/runtime/src/infrastructure.ts
@@ -0,0 +1,308 @@
+import type { ModuleRef } from "@narratage/protocol";
+
+import { CompositeCredentialStore } from "./credentials.js";
+import type { CredentialStore } from "./credentials.js";
+import type { BuildCatalog } from "./catalog.js";
+import type { BuildDispatchStore } from "./dispatch.js";
+import type { OperationStore } from "./operations.js";
+import {
+ RuntimeModuleRegistry,
+} from "./profile.js";
+import type {
+ RuntimeModuleManifest,
+ RuntimeFacetInstance,
+ RuntimePartRole,
+} from "./profile.js";
+import type {
+ ArtifactStore,
+ BuildSchedulerFactory,
+ BuildStore,
+ RuntimeWorkerFactory,
+} from "./types.js";
+
+type RuntimePartBase<Role extends RuntimePartRole, Implementation> = {
+ readonly role: Role;
+ /** Configured infrastructure instance that owns this part. */
+ readonly owner: string;
+ /** Stable part name exported by that configured instance. */
+ readonly part: string;
+ readonly instance: RuntimeFacetInstance;
+ readonly port: Implementation;
+};
+
+export type RuntimeSchedulerPart = RuntimePartBase<"scheduler", BuildSchedulerFactory>;
+export type RuntimeWorkerPart = RuntimePartBase<"worker", RuntimeWorkerFactory>;
+export type RuntimeBuildStorePart = RuntimePartBase<"build-store", BuildStore>;
+export type RuntimeOperationStorePart = RuntimePartBase<"operation-store", OperationStore>;
+export type RuntimeDispatchStorePart = RuntimePartBase<"dispatch-store", BuildDispatchStore>;
+export type RuntimeArtifactStorePart = RuntimePartBase<"artifact-store", ArtifactStore>;
+export type RuntimeCredentialStorePart = RuntimePartBase<"credential-store", CredentialStore>;
+
+export type RuntimePart =
+ | RuntimeSchedulerPart
+ | RuntimeWorkerPart
+ | RuntimeBuildStorePart
+ | RuntimeOperationStorePart
+ | RuntimeDispatchStorePart
+ | RuntimeArtifactStorePart
+ | RuntimeCredentialStorePart;
+
+/** One configured infrastructure instance may expose several exact Runtime parts. */
+export type RuntimeInfrastructurePackage = {
+ /** Configured infrastructure instance created from the Runtime Profile. */
+ readonly instance: string;
+ readonly manifest: RuntimeModuleManifest;
+ readonly parts: readonly RuntimePart[];
+ /** Optional Host-facing index owned by the same durable Build store; never part of Runtime selection. */
+ readonly buildCatalog?: BuildCatalog;
+ close?(): void | Promise<void>;
+};
+
+type RuntimePartDefinitionBase<Role extends RuntimePartRole, Implementation> = {
+ readonly role: Role;
+ readonly part: string;
+ readonly facet: string;
+ readonly port: Implementation;
+};
+
+export type RuntimePartDefinition =
+ | RuntimePartDefinitionBase<"scheduler", BuildSchedulerFactory>
+ | RuntimePartDefinitionBase<"worker", RuntimeWorkerFactory>
+ | RuntimePartDefinitionBase<"build-store", BuildStore>
+ | RuntimePartDefinitionBase<"operation-store", OperationStore>
+ | RuntimePartDefinitionBase<"dispatch-store", BuildDispatchStore>
+ | RuntimePartDefinitionBase<"artifact-store", ArtifactStore>
+ | RuntimePartDefinitionBase<"credential-store", CredentialStore>;
+
+export type DefineRuntimeInfrastructurePackageOptions = {
+ readonly module: ModuleRef;
+ readonly instance: string;
+ readonly parts: readonly RuntimePartDefinition[];
+ /** Host presentation index co-owned with this package's BuildStore, if any. */
+ readonly buildCatalog?: BuildCatalog;
+ readonly close?: () => void | Promise<void>;
+};
+
+export type RuntimePartReference = {
+ readonly from: string;
+ readonly part: string;
+};
+
+export type RuntimeRoleSelection = {
+ readonly scheduler: RuntimePartReference;
+ readonly worker: RuntimePartReference;
+ readonly buildStore: RuntimePartReference;
+ readonly operationStore: RuntimePartReference;
+ readonly dispatchStore: RuntimePartReference;
+ readonly artifactStore: RuntimePartReference;
+ readonly credentialStores: readonly RuntimePartReference[];
+};
+
+export type RuntimeInfrastructureAssembly = {
+ readonly manifests: readonly RuntimeModuleManifest[];
+ readonly instances: readonly RuntimeFacetInstance[];
+ readonly scheduler: BuildSchedulerFactory;
+ readonly worker: RuntimeWorkerFactory;
+ readonly buildStore: BuildStore;
+ readonly operationStore: OperationStore;
+ readonly dispatchStore: BuildDispatchStore;
+ readonly artifactStore: ArtifactStore;
+ readonly credentialStore: CredentialStore;
+ close(): Promise<void>;
+};
+
+function assert(condition: unknown, message: string): asserts condition {
+ if (!condition) throw new Error(message);
+}
+
+function partFacetKey(part: RuntimePart): string {
+ const ref = part.instance.facet;
+ return `${ref.module.name}@${ref.module.version}#${ref.name}`;
+}
+
+function callable(value: object, name: string, subject: string): void {
+ assert(name in value && typeof (value as Record<string, unknown>)[name] === "function",
+ `${subject} does not implement ${name}()`);
+}
+
+function verifyPartPort(part: RuntimePart): void {
+ assert(typeof part.port === "object" && part.port !== null,
+ `${part.instance.id} Runtime infrastructure implementation is invalid`);
+ switch (part.role) {
+ case "scheduler":
+ callable(part.port, "create", part.instance.id);
+ break;
+ case "worker":
+ callable(part.port, "create", part.instance.id);
+ break;
+ case "build-store":
+ callable(part.port, "create", part.instance.id);
+ callable(part.port, "read", part.instance.id);
+ callable(part.port, "compareAndSwap", part.instance.id);
+ break;
+ case "operation-store":
+ callable(part.port, "create", part.instance.id);
+ callable(part.port, "read", part.instance.id);
+ callable(part.port, "list", part.instance.id);
+ callable(part.port, "compareAndSwap", part.instance.id);
+ break;
+ case "dispatch-store":
+ for (const method of [
+ "create", "read", "list", "claim", "heartbeat", "release", "finish", "requestCancellation", "wake",
+ "acquireCapacity", "heartbeatCapacity", "parkCapacity", "releaseCapacity", "clearCapacity", "listCapacity",
+ ]) callable(part.port, method, part.instance.id);
+ break;
+ case "artifact-store":
+ callable(part.port, "put", part.instance.id);
+ callable(part.port, "get", part.instance.id);
+ callable(part.port, "has", part.instance.id);
+ break;
+ case "credential-store":
+ callable(part.port, "resolve", part.instance.id);
+ break;
+ }
+}
+
+export function defineRuntimeInfrastructurePackage(
+ options: DefineRuntimeInfrastructurePackageOptions,
+): RuntimeInfrastructurePackage {
+ assert(options.module.name.trim().length > 0 && options.module.version.trim().length > 0,
+ "Runtime infrastructure module identity is invalid");
+ assert(options.instance.trim().length > 0, "Runtime infrastructure instance is empty");
+ assert(options.parts.length > 0, "Runtime infrastructure package is empty");
+ const partNames = new Set<string>();
+ const facets = new Set<string>();
+ const parts = options.parts.map((definition): RuntimePart => {
+ assert(definition.part.trim().length > 0, "Runtime infrastructure part is empty");
+ assert(definition.facet.trim().length > 0, "Runtime infrastructure facet is empty");
+ assert(!partNames.has(definition.part), `Runtime infrastructure part ${definition.part} is duplicated`);
+ assert(!facets.has(definition.facet), `Runtime infrastructure facet ${definition.facet} is duplicated`);
+ partNames.add(definition.part);
+ facets.add(definition.facet);
+ return {
+ role: definition.role,
+ owner: options.instance,
+ part: definition.part,
+ instance: {
+ id: `${options.instance}.${definition.part}`,
+ facet: { module: { ...options.module }, name: definition.facet },
+ },
+ port: definition.port,
+ } as RuntimePart;
+ });
+ const manifest: RuntimeModuleManifest = {
+ format: "narratage.runtime-module@1",
+ name: options.module.name,
+ version: options.module.version,
+ facets: options.parts.map((definition) => ({
+ name: definition.facet,
+ role: definition.role,
+ })),
+ };
+ const result: RuntimeInfrastructurePackage = {
+ instance: options.instance,
+ manifest,
+ parts,
+ ...(options.buildCatalog === undefined ? {} : { buildCatalog: options.buildCatalog }),
+ ...(options.close === undefined ? {} : { close: options.close }),
+ };
+ verifyRuntimeInfrastructurePackage(result);
+ return result;
+}
+
+export function verifyRuntimeInfrastructurePackage(value: RuntimeInfrastructurePackage): void {
+ const packageName = `${value.manifest.name}@${value.manifest.version}`;
+ assert(value.instance.trim().length > 0, `${packageName} infrastructure instance is empty`);
+ assert(value.parts.length > 0, `${packageName} contains no Runtime infrastructure`);
+ const modules = new RuntimeModuleRegistry();
+ modules.register(value.manifest);
+ const ids = new Set<string>();
+ const parts = new Set<string>();
+ const claimedFacets = new Set<string>();
+ for (const part of value.parts) {
+ assert(part.owner === value.instance,
+ `${packageName} part ${part.instance.id} belongs to another infrastructure instance`);
+ assert(part.part.trim().length > 0, `${packageName} Runtime infrastructure part is empty`);
+ assert(!parts.has(part.part), `${packageName} repeats Runtime infrastructure part ${part.part}`);
+ parts.add(part.part);
+ assert(part.instance.id.trim().length > 0, `${packageName} Runtime infrastructure instance is empty`);
+ assert(part.instance.id === `${part.owner}.${part.part}`,
+ `${packageName} part ${part.part} has a non-canonical instance id`);
+ assert(!ids.has(part.instance.id), `${packageName} repeats Runtime infrastructure ${part.instance.id}`);
+ ids.add(part.instance.id);
+ verifyPartPort(part);
+ const resolved = modules.resolve(part.instance.facet);
+ assert(resolved !== undefined, `${packageName} part ${part.instance.id} has no Manifest facet`);
+ assert(resolved.facet.role === part.role,
+ `${packageName} part ${part.instance.id} role differs from its Manifest facet`);
+ claimedFacets.add(partFacetKey(part));
+ }
+ for (const facet of value.manifest.facets) {
+ assert(facet.role !== "capability-endpoint", `${packageName} Runtime infrastructure Manifest contains an Endpoint facet`);
+ const key = `${value.manifest.name}@${value.manifest.version}#${facet.name}`;
+ assert(claimedFacets.has(key), `${packageName} Manifest facet ${facet.name} has no configured part`);
+ }
+}
+
+type SelectedRuntimePart<Role extends RuntimePartRole> = {
+ readonly package: RuntimeInfrastructurePackage;
+ readonly part: Extract<RuntimePart, { readonly role: Role }>;
+};
+
+function selectedPart<Role extends RuntimePartRole>(
+ parts: ReadonlyMap<string, { readonly package: RuntimeInfrastructurePackage; readonly part: RuntimePart }>,
+ reference: RuntimePartReference | undefined,
+ role: Role,
+): SelectedRuntimePart<Role> | undefined {
+ if (reference === undefined) return undefined;
+ const key = `${reference.from}\u0000${reference.part}`;
+ const selected = parts.get(key);
+ assert(selected !== undefined, `Runtime role refers to unknown part ${reference.from}.${reference.part}`);
+ assert(selected.part.role === role,
+ `Runtime part ${reference.from}.${reference.part} is ${selected.part.role}, not ${role}`);
+ return selected as SelectedRuntimePart<Role>;
+}
+
+/** Resolve exact configured infrastructure parts without giving any package routing authority. */
+export function assembleRuntimeInfrastructure(
+ packages: readonly RuntimeInfrastructurePackage[],
+ selection: RuntimeRoleSelection,
+): RuntimeInfrastructureAssembly {
+ const parts = new Map<string, { readonly package: RuntimeInfrastructurePackage; readonly part: RuntimePart }>();
+ for (const item of packages) {
+ verifyRuntimeInfrastructurePackage(item);
+ for (const part of item.parts) {
+ const key = `${part.owner}\u0000${part.part}`;
+ assert(!parts.has(key), `Runtime part ${part.owner}.${part.part} is configured twice`);
+ parts.set(key, { package: item, part });
+ }
+ }
+ const scheduler = selectedPart(parts, selection.scheduler, "scheduler")!;
+ const worker = selectedPart(parts, selection.worker, "worker")!;
+ const build = selectedPart(parts, selection.buildStore, "build-store");
+ const operations = selectedPart(parts, selection.operationStore, "operation-store");
+ const dispatch = selectedPart(parts, selection.dispatchStore, "dispatch-store");
+ const artifacts = selectedPart(parts, selection.artifactStore, "artifact-store");
+ const credentialParts = selection.credentialStores
+ .map((reference) => selectedPart(parts, reference, "credential-store")!);
+ const selected = [scheduler, worker, build, operations, dispatch, artifacts, ...credentialParts]
+ .filter((item): item is NonNullable<typeof item> => item !== undefined);
+ const selectedPackages = [...new Set(selected.map((item) => item.package))];
+ let closed = false;
+ return {
+ manifests: selectedPackages.map((item) => item.manifest),
+ instances: selected.map((item) => item.part.instance),
+ scheduler: scheduler.part.port,
+ worker: worker.part.port,
+ buildStore: build!.part.port,
+ operationStore: operations!.part.port,
+ dispatchStore: dispatch!.part.port,
+ artifactStore: artifacts!.part.port,
+ credentialStore: new CompositeCredentialStore(credentialParts.map((item) => item.part.port)),
+ async close() {
+ if (closed) return;
+ closed = true;
+ for (const item of [...packages].reverse()) await item.close?.();
+ },
+ };
+}
diff --git a/packages/runtime/src/operations.ts b/packages/runtime/src/operations.ts
index 05bdec83..c3e79446 100644
--- a/packages/runtime/src/operations.ts
+++ b/packages/runtime/src/operations.ts
@@ -6,14 +6,13 @@ import type {
} from "@narratage/protocol";
export type OperationIdentity = {
- readonly format: "svml.operation-identity@1";
+ readonly format: "narratage.operation-identity@1";
readonly id: Digest;
readonly build: string;
readonly command: string;
readonly endpoint: string;
- readonly authority: string;
- readonly route: string;
- readonly runtimeClosure: Digest;
+ readonly pool: string;
+ readonly lane: string;
readonly attempt: number;
};
@@ -90,9 +89,8 @@ export type OperationQuery = {
readonly build?: string;
readonly command?: string;
readonly endpoint?: string;
- readonly authority?: string;
- readonly route?: string;
- readonly runtimeClosure?: Digest;
+ readonly pool?: string;
+ readonly lane?: string;
};
export type OperationStore = {
@@ -118,13 +116,12 @@ function epochMillisecond(value: number, subject: string): number {
function identityContent(value: Omit<OperationIdentity, "id">): Omit<OperationIdentity, "id"> {
return {
- format: "svml.operation-identity@1",
+ format: "narratage.operation-identity@1",
build: value.build,
command: value.command,
endpoint: value.endpoint,
- authority: value.authority,
- route: value.route,
- runtimeClosure: value.runtimeClosure,
+ pool: value.pool,
+ lane: value.lane,
attempt: value.attempt,
};
}
@@ -135,12 +132,11 @@ export function sealOperationIdentity(
assert(value.build.trim().length > 0, "Operation build id is empty");
assert(value.command.trim().length > 0, "Operation command id is empty");
assert(value.endpoint.trim().length > 0, "Operation Endpoint id is empty");
- assert(value.authority.trim().length > 0, "Operation Provider Authority is empty");
- assert(value.route.trim().length > 0, "Operation Capability Route is empty");
- assert(isDigest(value.runtimeClosure), "Operation Runtime Closure digest is invalid");
+ assert(value.pool.trim().length > 0, "Operation Provider Pool is empty");
+ assert(value.lane.trim().length > 0, "Operation Capability Lane is empty");
positiveInteger(value.attempt, "Operation attempt");
const content = identityContent({
- format: "svml.operation-identity@1",
+ format: "narratage.operation-identity@1",
...value,
});
return { ...content, id: digestOf(content) };
@@ -203,7 +199,7 @@ export function verifyOperationSnapshot(snapshot: OperationSnapshot): void {
export function operationCancellationRequestId(operation: Digest, requestedAt: number): Digest {
epochMillisecond(requestedAt, "Operation cancellation requestedAt");
- return digestOf({ format: "svml.operation-cancellation-request@1", operation, requestedAt });
+ return digestOf({ format: "narratage.operation-cancellation-request@1", operation, requestedAt });
}
function verifyOperationCancellationControl(
@@ -256,9 +252,8 @@ export class MemoryOperationStore implements OperationStore {
.filter((snapshot) => query.build === undefined || snapshot.build === query.build)
.filter((snapshot) => query.command === undefined || snapshot.command === query.command)
.filter((snapshot) => query.endpoint === undefined || snapshot.endpoint === query.endpoint)
- .filter((snapshot) => query.authority === undefined || snapshot.authority === query.authority)
- .filter((snapshot) => query.route === undefined || snapshot.route === query.route)
- .filter((snapshot) => query.runtimeClosure === undefined || snapshot.runtimeClosure === query.runtimeClosure)
+ .filter((snapshot) => query.pool === undefined || snapshot.pool === query.pool)
+ .filter((snapshot) => query.lane === undefined || snapshot.lane === query.lane)
.sort((left, right) => left.attempt - right.attempt || left.id.localeCompare(right.id))
.map(copy);
}
@@ -304,9 +299,8 @@ export class MemoryOperationStore implements OperationStore {
build: current.build,
command: current.command,
endpoint: current.endpoint,
- authority: current.authority,
- route: current.route,
- runtimeClosure: current.runtimeClosure,
+ pool: current.pool,
+ lane: current.lane,
attempt: current.attempt,
revision: current.revision + 1,
...mutable,
diff --git a/packages/runtime/src/profile.ts b/packages/runtime/src/profile.ts
index eb1fdba6..a20ab302 100644
--- a/packages/runtime/src/profile.ts
+++ b/packages/runtime/src/profile.ts
@@ -1,9 +1,7 @@
import { plannedNeeds } from "@narratage/core";
-import { digestOf, isDigest } from "@narratage/protocol";
import type {
BuildState,
CapabilityRef,
- Digest,
ModuleRef,
TypeRef,
} from "@narratage/protocol";
@@ -18,70 +16,62 @@ export type RuntimeFacetRole =
| "credential-store"
| "capability-endpoint";
-export type RuntimeComponentFacetRole = Exclude<RuntimeFacetRole, "capability-endpoint">;
+export type RuntimePartRole = Exclude<RuntimeFacetRole, "capability-endpoint">;
export type RuntimeFacetRef = {
readonly module: ModuleRef;
readonly name: string;
};
-export type RuntimeImplementation = {
- readonly digest: Digest;
-};
-
export type RuntimeCapability = {
readonly capability: CapabilityRef;
readonly returns: TypeRef;
};
-export type RuntimeComponentFacet = {
+export type RuntimePartFacet = {
readonly name: string;
- readonly role: RuntimeComponentFacetRole;
- readonly implementation: RuntimeImplementation;
+ readonly role: RuntimePartRole;
};
export type RuntimeEndpointFacet = {
readonly name: string;
readonly role: "capability-endpoint";
- readonly implementation: RuntimeImplementation;
readonly fulfills: readonly RuntimeCapability[];
readonly lifecycle: "immediate" | "recoverable";
readonly defaultConcurrency: number;
/** Provider-local lanes. When omitted, each capability inherits the Provider total. */
- readonly routes?: readonly (RuntimeCapability & {
- readonly route: string;
+ readonly lanes?: readonly (RuntimeCapability & {
+ readonly lane: string;
readonly maxConcurrency: number;
})[];
/** Named secret inputs. Values are resolved by the selected CredentialStore only at invocation. */
readonly credentialSlots?: readonly string[];
};
-export type RuntimeFacet = RuntimeComponentFacet | RuntimeEndpointFacet;
+export type RuntimeFacet = RuntimePartFacet | RuntimeEndpointFacet;
/** Static package metadata. Reading it must never execute the implementation it describes. */
export type RuntimeModuleManifest = {
- readonly format: "svml.runtime-module@1";
+ readonly format: "narratage.runtime-module@1";
readonly name: string;
readonly version: string;
readonly facets: readonly RuntimeFacet[];
};
-export type RuntimeProfileInstance = {
+export type RuntimeFacetInstance = {
readonly id: string;
readonly facet: RuntimeFacetRef;
/** Required for capability Endpoints; absent for Scheduler and Store instances. */
- readonly authority?: string;
- /** Digest of non-secret endpoint/store configuration. Secret bytes must never enter it. */
- readonly configurationDigest: Digest;
+ readonly pool?: string;
};
-export type RuntimeEndpointBinding = RuntimeCapability & {
+export type EndpointOffer = RuntimeCapability & {
readonly endpoint: string;
};
-export type RuntimeProfile = {
- readonly format: "svml.runtime-profile@1";
- readonly instances: readonly RuntimeProfileInstance[];
+export type ResolvedRuntimeProfile = {
+ readonly format: "narratage.resolved-runtime@1";
+ readonly instances: readonly RuntimeFacetInstance[];
readonly scheduler: string;
readonly worker: string;
readonly stores: {
@@ -91,55 +81,48 @@ export type RuntimeProfile = {
readonly artifacts: string;
readonly credentials: readonly string[];
};
- readonly endpoints: readonly RuntimeEndpointBinding[];
+ readonly endpoints: readonly EndpointOffer[];
readonly scheduling: {
readonly maxConcurrency: number;
readonly resources: readonly { readonly id: string; readonly maxConcurrency: number }[];
};
};
-export type ResolvedRuntimeComponent = {
+export type ResolvedRuntimePart = {
readonly id: string;
- readonly role: RuntimeComponentFacetRole;
+ readonly role: RuntimePartRole;
readonly facet: RuntimeFacetRef;
- readonly implementation: RuntimeImplementation;
- readonly configurationDigest: Digest;
};
export type ResolvedRuntimeEndpoint = {
readonly id: string;
readonly role: "capability-endpoint";
readonly facet: RuntimeFacetRef;
- readonly implementation: RuntimeImplementation;
- readonly configurationDigest: Digest;
readonly fulfills: readonly RuntimeCapability[];
readonly lifecycle: "immediate" | "recoverable";
readonly credentialSlots: readonly string[];
- readonly authority: string;
+ readonly pool: string;
readonly maxConcurrency: number;
- readonly routes: readonly (RuntimeCapability & {
- readonly route: string;
+ readonly lanes: readonly (RuntimeCapability & {
+ readonly lane: string;
readonly maxConcurrency: number;
})[];
};
-export type ResolvedRuntimeInstance = ResolvedRuntimeComponent | ResolvedRuntimeEndpoint;
+export type ResolvedRuntimeInstance = ResolvedRuntimePart | ResolvedRuntimeEndpoint;
export type RuntimeClosure = {
- readonly format: "svml.runtime-closure@1";
- readonly digest: Digest;
- readonly modules: readonly { readonly module: ModuleRef; readonly digest: Digest }[];
+ readonly format: "narratage.runtime-closure@1";
readonly instances: readonly ResolvedRuntimeInstance[];
readonly scheduler: string;
readonly worker: string;
- readonly stores: RuntimeProfile["stores"];
- readonly endpoints: readonly RuntimeEndpointBinding[];
- readonly scheduling: RuntimeProfile["scheduling"];
+ readonly stores: ResolvedRuntimeProfile["stores"];
+ readonly endpoints: readonly EndpointOffer[];
+ readonly scheduling: ResolvedRuntimeProfile["scheduling"];
};
type RegisteredRuntimeModule = {
readonly manifest: RuntimeModuleManifest;
- readonly digest: Digest;
};
function assert(condition: unknown, message: string): asserts condition {
@@ -167,8 +150,8 @@ function typeKey(type: TypeRef): string {
return `${moduleKey(type.module)}#${type.name}`;
}
-function bindingKey(binding: RuntimeCapability): string {
- return `${capabilityKey(binding.capability)} -> ${typeKey(binding.returns)}`;
+function offerKey(offer: RuntimeCapability): string {
+ return `${capabilityKey(offer.capability)} -> ${typeKey(offer.returns)}`;
}
function sameModule(left: ModuleRef, right: ModuleRef): boolean {
@@ -189,11 +172,6 @@ function sortedUniqueStrings(values: readonly string[], subject: string): readon
return sorted;
}
-function normalizeImplementation(value: RuntimeImplementation, subject: string): RuntimeImplementation {
- assert(isDigest(value.digest), `${subject} implementation digest is invalid`);
- return { digest: value.digest };
-}
-
function normalizeCapability(value: RuntimeCapability): RuntimeCapability {
assert(value.capability.module.name.length > 0 && value.capability.module.version.length > 0, "runtime capability module is invalid");
assert(value.capability.name.length > 0, "runtime capability name is empty");
@@ -215,33 +193,32 @@ function normalizeFacet(facet: RuntimeFacet): RuntimeFacet {
assert(facet.name.trim().length > 0, "runtime facet name is empty");
const common = {
name: facet.name,
- implementation: normalizeImplementation(facet.implementation, facet.name),
};
if (facet.role !== "capability-endpoint") return { ...common, role: facet.role };
const fulfills = facet.fulfills.map(normalizeCapability)
- .sort((left, right) => bindingKey(left).localeCompare(bindingKey(right)));
+ .sort((left, right) => offerKey(left).localeCompare(offerKey(right)));
assert(fulfills.length > 0, `${facet.name} must fulfill at least one exact capability`);
- assert(new Set(fulfills.map(bindingKey)).size === fulfills.length, `${facet.name} repeats a capability binding`);
+ assert(new Set(fulfills.map(offerKey)).size === fulfills.length, `${facet.name} repeats a capability offer`);
assert(facet.lifecycle === "immediate" || facet.lifecycle === "recoverable", `${facet.name} lifecycle is invalid`);
const defaultConcurrency = positiveInteger(facet.defaultConcurrency, `${facet.name} defaultConcurrency`);
- const routes = (facet.routes ?? fulfills.map((item) => ({
+ const lanes = (facet.lanes ?? fulfills.map((item) => ({
...item,
- route: capabilityKey(item.capability),
+ lane: capabilityKey(item.capability),
maxConcurrency: defaultConcurrency,
}))).map((item) => ({
...normalizeCapability(item),
- route: item.route,
- maxConcurrency: positiveInteger(item.maxConcurrency, `${facet.name} route ${item.route}`),
- })).sort((left, right) => bindingKey(left).localeCompare(bindingKey(right)));
- assert(routes.every((item) => item.route.trim().length > 0), `${facet.name} has an empty route`);
- assert(JSON.stringify(routes.map(bindingKey)) === JSON.stringify(fulfills.map(bindingKey)),
- `${facet.name} routes must cover every fulfilled capability exactly once`);
- const routeConcurrency = new Map<string, number>();
- for (const item of routes) {
- const previous = routeConcurrency.get(item.route);
+ lane: item.lane,
+ maxConcurrency: positiveInteger(item.maxConcurrency, `${facet.name} lane ${item.lane}`),
+ })).sort((left, right) => offerKey(left).localeCompare(offerKey(right)));
+ assert(lanes.every((item) => item.lane.trim().length > 0), `${facet.name} has an empty lane`);
+ assert(JSON.stringify(lanes.map(offerKey)) === JSON.stringify(fulfills.map(offerKey)),
+ `${facet.name} lanes must cover every fulfilled capability exactly once`);
+ const laneConcurrency = new Map<string, number>();
+ for (const item of lanes) {
+ const previous = laneConcurrency.get(item.lane);
assert(previous === undefined || previous === item.maxConcurrency,
- `${facet.name} route ${item.route} has conflicting concurrency limits`);
- routeConcurrency.set(item.route, item.maxConcurrency);
+ `${facet.name} lane ${item.lane} has conflicting concurrency limits`);
+ laneConcurrency.set(item.lane, item.maxConcurrency);
}
return {
...common,
@@ -249,18 +226,18 @@ function normalizeFacet(facet: RuntimeFacet): RuntimeFacet {
fulfills,
lifecycle: facet.lifecycle,
defaultConcurrency,
- routes,
+ lanes,
credentialSlots: sortedUniqueStrings(facet.credentialSlots ?? [], `${facet.name} credential slots`),
};
}
function normalizeManifest(manifest: RuntimeModuleManifest): RuntimeModuleManifest {
- assert(manifest.format === "svml.runtime-module@1", "unsupported Runtime Module Manifest format");
+ assert(manifest.format === "narratage.runtime-module@1", "unsupported Runtime Module Manifest format");
assert(manifest.name.trim().length > 0 && manifest.version.trim().length > 0, "runtime module identity is invalid");
const facets = manifest.facets.map(normalizeFacet).sort((left, right) => left.name.localeCompare(right.name));
assert(new Set(facets.map((facet) => facet.name)).size === facets.length, `${manifest.name} repeats a Runtime facet`);
return {
- format: "svml.runtime-module@1",
+ format: "narratage.runtime-module@1",
name: manifest.name,
version: manifest.version,
facets,
@@ -270,13 +247,11 @@ function normalizeManifest(manifest: RuntimeModuleManifest): RuntimeModuleManife
export class RuntimeModuleRegistry {
readonly #modules = new Map<string, RegisteredRuntimeModule>();
- register(manifest: RuntimeModuleManifest): Digest {
+ register(manifest: RuntimeModuleManifest): void {
const normalized = normalizeManifest(manifest);
const key = moduleKey(normalized);
assert(!this.#modules.has(key), `runtime module ${key} is already registered`);
- const registered = { manifest: normalized, digest: digestOf(normalized) };
- this.#modules.set(key, registered);
- return registered.digest;
+ this.#modules.set(key, { manifest: normalized });
}
resolve(ref: RuntimeFacetRef): { readonly module: RegisteredRuntimeModule; readonly facet: RuntimeFacet } | undefined {
@@ -287,39 +262,33 @@ export class RuntimeModuleRegistry {
verifyClosure(closure: RuntimeClosure): void {
verifyRuntimeClosure(closure);
- const modules = new Map(closure.modules.map((item) => [moduleKey(item.module), item]));
for (const instance of closure.instances) {
const resolved = this.resolve(instance.facet);
assert(resolved !== undefined, `Runtime facet ${facetKey(instance.facet)} is not registered`);
- assert(modules.get(moduleKey(instance.facet.module))?.digest === resolved.module.digest,
- `${moduleKey(instance.facet.module)} Manifest digest does not match the Runtime Closure`);
assert(instance.role === resolved.facet.role, `${instance.id} Runtime facet role differs`);
- assert(instance.implementation.digest === resolved.facet.implementation.digest,
- `${instance.id} Runtime implementation differs`);
if (instance.role === "capability-endpoint" && resolved.facet.role === "capability-endpoint") {
assert(instance.lifecycle === resolved.facet.lifecycle, `${instance.id} Endpoint lifecycle differs`);
assert(JSON.stringify(instance.credentialSlots)
=== JSON.stringify(resolved.facet.credentialSlots ?? []), `${instance.id} Endpoint credential slots differ`);
- assert(JSON.stringify(instance.fulfills.map(bindingKey))
- === JSON.stringify(resolved.facet.fulfills.map(bindingKey)), `${instance.id} Endpoint capabilities differ`);
+ assert(JSON.stringify(instance.fulfills.map(offerKey))
+ === JSON.stringify(resolved.facet.fulfills.map(offerKey)), `${instance.id} Endpoint capabilities differ`);
assert(instance.maxConcurrency === resolved.facet.defaultConcurrency,
`${instance.id} Endpoint concurrency differs`);
- assert(JSON.stringify(instance.routes) === JSON.stringify(resolved.facet.routes),
- `${instance.id} Endpoint routes differ`);
+ assert(JSON.stringify(instance.lanes) === JSON.stringify(resolved.facet.lanes),
+ `${instance.id} Endpoint lanes differ`);
}
}
}
}
-function profileContent(profile: RuntimeProfile): RuntimeProfile {
+function resolvedRuntimeContent(profile: ResolvedRuntimeProfile): ResolvedRuntimeProfile {
return {
- format: "svml.runtime-profile@1",
+ format: "narratage.resolved-runtime@1",
instances: [...profile.instances]
.map((instance) => ({
id: instance.id,
facet: { module: { ...instance.facet.module }, name: instance.facet.name },
- ...(instance.authority === undefined ? {} : { authority: instance.authority }),
- configurationDigest: instance.configurationDigest,
+ ...(instance.pool === undefined ? {} : { pool: instance.pool }),
}))
.sort((left, right) => left.id.localeCompare(right.id)),
scheduler: profile.scheduler,
@@ -332,8 +301,8 @@ function profileContent(profile: RuntimeProfile): RuntimeProfile {
credentials: [...profile.stores.credentials].sort(),
},
endpoints: [...profile.endpoints]
- .map((binding) => ({ ...normalizeCapability(binding), endpoint: binding.endpoint }))
- .sort((left, right) => bindingKey(left).localeCompare(bindingKey(right))),
+ .map((offer) => ({ ...normalizeCapability(offer), endpoint: offer.endpoint }))
+ .sort((left, right) => offerKey(left).localeCompare(offerKey(right))),
scheduling: {
maxConcurrency: profile.scheduling.maxConcurrency,
resources: [...profile.scheduling.resources]
@@ -343,87 +312,59 @@ function profileContent(profile: RuntimeProfile): RuntimeProfile {
};
}
-function verifyProfileShape(profile: RuntimeProfile): void {
- assert(profile.format === "svml.runtime-profile@1", "unsupported Runtime Profile format");
- assert(profile.scheduler.trim().length > 0, "Runtime Profile scheduler is empty");
- assert(profile.worker.trim().length > 0, "Runtime Profile worker is empty");
+function verifyResolvedRuntimeShape(profile: ResolvedRuntimeProfile): void {
+ assert(profile.format === "narratage.resolved-runtime@1", "unsupported Resolved Runtime format");
+ assert(profile.scheduler.trim().length > 0, "Resolved Runtime scheduler is empty");
+ assert(profile.worker.trim().length > 0, "Resolved Runtime worker is empty");
for (const [name, id] of Object.entries({
build: profile.stores.build,
operations: profile.stores.operations,
dispatch: profile.stores.dispatch,
artifacts: profile.stores.artifacts,
- })) assert(id.trim().length > 0, `Runtime Profile ${name} store is empty`);
- for (const id of profile.stores.credentials) assert(id.trim().length > 0, "Runtime Profile CredentialStore id is empty");
+ })) assert(id.trim().length > 0, `Resolved Runtime ${name} store is empty`);
+ for (const id of profile.stores.credentials) assert(id.trim().length > 0, "Resolved Runtime CredentialStore id is empty");
assert(new Set(profile.stores.credentials).size === profile.stores.credentials.length,
- "Runtime Profile repeats a CredentialStore");
- positiveInteger(profile.scheduling.maxConcurrency, "Runtime Profile maxConcurrency");
+ "Resolved Runtime repeats a CredentialStore");
+ positiveInteger(profile.scheduling.maxConcurrency, "Resolved Runtime maxConcurrency");
const ids = profile.instances.map((instance) => {
- assert(instance.id.trim().length > 0, "Runtime Profile instance id is empty");
+ assert(instance.id.trim().length > 0, "Resolved Runtime instance id is empty");
assert(instance.facet.name.trim().length > 0, `${instance.id} facet name is empty`);
assert(instance.facet.module.name.length > 0 && instance.facet.module.version.length > 0, `${instance.id} facet module is invalid`);
- if (instance.authority !== undefined) assert(instance.authority.trim().length > 0, `${instance.id} authority is empty`);
- assert(isDigest(instance.configurationDigest), `${instance.id} configuration digest is invalid`);
+ if (instance.pool !== undefined) assert(instance.pool.trim().length > 0, `${instance.id} pool is empty`);
return instance.id;
});
- assert(new Set(ids).size === ids.length, "Runtime Profile repeats an instance id");
- const bindings = profile.endpoints.map((binding) => {
- assert(binding.endpoint.trim().length > 0, "Runtime Endpoint binding endpoint is empty");
- return bindingKey(normalizeCapability(binding));
+ assert(new Set(ids).size === ids.length, "Resolved Runtime repeats an instance id");
+ const offers = profile.endpoints.map((offer) => {
+ assert(offer.endpoint.trim().length > 0, "Runtime Endpoint offer endpoint is empty");
+ return offerKey(normalizeCapability(offer));
});
- assert(new Set(bindings).size === bindings.length, "Runtime Profile repeats an Endpoint binding");
+ assert(new Set(offers).size === offers.length, "Resolved Runtime repeats an Endpoint offer");
const resourceNames = profile.scheduling.resources.map((resource) => {
- assert(resource.id.trim().length > 0, "Runtime Profile resource id is empty");
+ assert(resource.id.trim().length > 0, "Resolved Runtime resource id is empty");
positiveInteger(resource.maxConcurrency, `Runtime resource ${resource.id}`);
return resource.id;
});
- assert(new Set(resourceNames).size === resourceNames.length, "Runtime Profile repeats a resource override");
+ assert(new Set(resourceNames).size === resourceNames.length, "Resolved Runtime repeats a resource override");
}
-export function sealRuntimeProfile(
- value: Omit<RuntimeProfile, "format">,
-): RuntimeProfile {
- const draft: RuntimeProfile = {
- format: "svml.runtime-profile@1",
+export function sealResolvedRuntimeProfile(
+ value: Omit<ResolvedRuntimeProfile, "format">,
+): ResolvedRuntimeProfile {
+ const draft: ResolvedRuntimeProfile = {
+ format: "narratage.resolved-runtime@1",
...value,
};
- verifyProfileShape(draft);
- return profileContent(draft);
+ verifyResolvedRuntimeShape(draft);
+ return resolvedRuntimeContent(draft);
}
-export function verifyRuntimeProfile(profile: RuntimeProfile): void {
- verifyProfileShape(profile);
-}
-
-function closureContent(closure: Omit<RuntimeClosure, "digest">): Omit<RuntimeClosure, "digest"> {
- return {
- format: "svml.runtime-closure@1",
- modules: [...closure.modules].map((item) => ({ module: { ...item.module }, digest: item.digest }))
- .sort((left, right) => moduleKey(left.module).localeCompare(moduleKey(right.module))),
- instances: [...closure.instances].map((instance) => structuredClone(instance))
- .sort((left, right) => left.id.localeCompare(right.id)),
- scheduler: closure.scheduler,
- worker: closure.worker,
- stores: { ...closure.stores },
- endpoints: [...closure.endpoints].map((binding) => structuredClone(binding))
- .sort((left, right) => bindingKey(left).localeCompare(bindingKey(right))),
- scheduling: {
- maxConcurrency: closure.scheduling.maxConcurrency,
- resources: [...closure.scheduling.resources].map((resource) => ({ ...resource }))
- .sort((left, right) => left.id.localeCompare(right.id)),
- },
- };
+export function verifyResolvedRuntimeProfile(profile: ResolvedRuntimeProfile): void {
+ verifyResolvedRuntimeShape(profile);
}
export function verifyRuntimeClosure(closure: RuntimeClosure): void {
- assert(closure.format === "svml.runtime-closure@1", "unsupported Runtime Closure format");
- assert(isDigest(closure.digest) && closure.digest === digestOf(closureContent(closure)), "Runtime Closure digest differs");
+ assert(closure.format === "narratage.runtime-closure@1", "unsupported Runtime Closure format");
positiveInteger(closure.scheduling.maxConcurrency, "Runtime Closure maxConcurrency");
- const moduleKeys = closure.modules.map((item) => {
- assert(item.module.name.length > 0 && item.module.version.length > 0, "Runtime Closure module identity is invalid");
- assert(isDigest(item.digest), `${moduleKey(item.module)} Runtime Manifest digest is invalid`);
- return moduleKey(item.module);
- });
- assert(new Set(moduleKeys).size === moduleKeys.length, "Runtime Closure repeats a module");
const resourceNames = closure.scheduling.resources.map((resource) => {
assert(resource.id.trim().length > 0, "Runtime Closure resource id is empty");
positiveInteger(resource.maxConcurrency, `Runtime Closure resource ${resource.id}`);
@@ -433,27 +374,27 @@ export function verifyRuntimeClosure(closure: RuntimeClosure): void {
const instances = new Map<string, ResolvedRuntimeInstance>();
for (const instance of closure.instances) {
assert(!instances.has(instance.id), `Runtime Closure repeats instance ${instance.id}`);
- assert(isDigest(instance.implementation.digest), `${instance.id} implementation digest is invalid`);
- assert(isDigest(instance.configurationDigest), `${instance.id} configuration digest is invalid`);
- assert(moduleKeys.includes(moduleKey(instance.facet.module)), `${instance.id} refers to an unlocked Runtime module`);
+ assert(instance.facet.module.name.trim().length > 0 && instance.facet.module.version.trim().length > 0,
+ `${instance.id} Runtime module identity is invalid`);
+ assert(instance.facet.name.trim().length > 0, `${instance.id} Runtime facet name is empty`);
if (instance.role === "capability-endpoint") {
- assert(instance.authority.trim().length > 0, `${instance.id} Endpoint authority is empty`);
+ assert(instance.pool.trim().length > 0, `${instance.id} Endpoint pool is empty`);
positiveInteger(instance.maxConcurrency, `${instance.id} Endpoint maxConcurrency`);
assert(instance.fulfills.length > 0, `${instance.id} Endpoint fulfills nothing`);
- assert(new Set(instance.fulfills.map(bindingKey)).size === instance.fulfills.length,
+ assert(new Set(instance.fulfills.map(offerKey)).size === instance.fulfills.length,
`${instance.id} Endpoint repeats a capability`);
- assert(instance.routes.length === instance.fulfills.length,
- `${instance.id} Endpoint routes differ from capabilities`);
- const routeConcurrency = new Map<string, number>();
- for (const route of instance.routes) {
- assert(route.route.trim().length > 0, `${instance.id} Endpoint route is empty`);
- positiveInteger(route.maxConcurrency, `${instance.id} Endpoint route ${route.route}`);
- assert(instance.fulfills.some((item) => bindingKey(item) === bindingKey(route)),
- `${instance.id} Endpoint route is outside its capabilities`);
- const previous = routeConcurrency.get(route.route);
- assert(previous === undefined || previous === route.maxConcurrency,
- `${instance.id} Endpoint route ${route.route} has conflicting concurrency limits`);
- routeConcurrency.set(route.route, route.maxConcurrency);
+ assert(instance.lanes.length === instance.fulfills.length,
+ `${instance.id} Endpoint lanes differ from capabilities`);
+ const laneConcurrency = new Map<string, number>();
+ for (const lane of instance.lanes) {
+ assert(lane.lane.trim().length > 0, `${instance.id} Endpoint lane is empty`);
+ positiveInteger(lane.maxConcurrency, `${instance.id} Endpoint lane ${lane.lane}`);
+ assert(instance.fulfills.some((item) => offerKey(item) === offerKey(lane)),
+ `${instance.id} Endpoint lane is outside its capabilities`);
+ const previous = laneConcurrency.get(lane.lane);
+ assert(previous === undefined || previous === lane.maxConcurrency,
+ `${instance.id} Endpoint lane ${lane.lane} has conflicting concurrency limits`);
+ laneConcurrency.set(lane.lane, lane.maxConcurrency);
}
sortedUniqueStrings(instance.credentialSlots, `${instance.id} Endpoint credential slots`);
}
@@ -476,13 +417,13 @@ export function verifyRuntimeClosure(closure: RuntimeClosure): void {
for (const id of closure.stores.credentials) {
assert(instances.get(id)?.role === "credential-store", `Runtime Closure credential store ${id} has the wrong role`);
}
- for (const binding of closure.endpoints) {
- const endpoint = instances.get(binding.endpoint);
- assert(endpoint?.role === "capability-endpoint", `${binding.endpoint} is not a capability Endpoint`);
- assert(endpoint.fulfills.some((item) => sameCapability(item, binding)), `${binding.endpoint} does not fulfill ${bindingKey(binding)}`);
+ for (const offer of closure.endpoints) {
+ const endpoint = instances.get(offer.endpoint);
+ assert(endpoint?.role === "capability-endpoint", `${offer.endpoint} is not a capability Endpoint`);
+ assert(endpoint.fulfills.some((item) => sameCapability(item, offer)), `${offer.endpoint} does not fulfill ${offerKey(offer)}`);
}
- assert(new Set(closure.endpoints.map(bindingKey)).size === closure.endpoints.length,
- "Runtime Closure repeats an Endpoint binding");
+ assert(new Set(closure.endpoints.map(offerKey)).size === closure.endpoints.length,
+ "Runtime Closure repeats an Endpoint offer");
if (closure.instances.some((instance) => instance.role === "capability-endpoint" && instance.lifecycle === "recoverable")) {
assert(instances.get(closure.stores.operations)?.role === "operation-store", "recoverable Endpoints require an OperationStore");
}
@@ -491,47 +432,40 @@ export function verifyRuntimeClosure(closure: RuntimeClosure): void {
}
}
-export function resolveRuntimeProfile(
+export function resolveRuntimeClosure(
registry: RuntimeModuleRegistry,
- profile: RuntimeProfile,
+ profile: ResolvedRuntimeProfile,
): RuntimeClosure {
- verifyRuntimeProfile(profile);
- const modules = new Map<string, { readonly module: ModuleRef; readonly digest: Digest }>();
+ verifyResolvedRuntimeProfile(profile);
const instances = profile.instances.map((instance): ResolvedRuntimeInstance => {
const resolved = registry.resolve(instance.facet);
assert(resolved !== undefined, `Runtime facet ${facetKey(instance.facet)} is not registered`);
- modules.set(moduleKey(instance.facet.module), { module: { ...instance.facet.module }, digest: resolved.module.digest });
const common = {
id: instance.id,
facet: { module: { ...instance.facet.module }, name: instance.facet.name },
- implementation: { ...resolved.facet.implementation },
- configurationDigest: instance.configurationDigest,
};
if (resolved.facet.role !== "capability-endpoint") return { ...common, role: resolved.facet.role };
- assert(instance.authority !== undefined, `${instance.id} Endpoint Provider Authority is required`);
+ assert(instance.pool !== undefined, `${instance.id} Endpoint Provider Pool is required`);
return {
...common,
role: "capability-endpoint",
fulfills: resolved.facet.fulfills.map((item) => structuredClone(item)),
lifecycle: resolved.facet.lifecycle,
credentialSlots: [...(resolved.facet.credentialSlots ?? [])],
- authority: instance.authority,
+ pool: instance.pool,
maxConcurrency: resolved.facet.defaultConcurrency,
- routes: structuredClone(resolved.facet.routes ?? []),
+ lanes: structuredClone(resolved.facet.lanes ?? []),
};
});
- const draft: Omit<RuntimeClosure, "digest"> = {
- format: "svml.runtime-closure@1",
- modules: [...modules.values()],
+ const closure: RuntimeClosure = {
+ format: "narratage.runtime-closure@1",
instances,
scheduler: profile.scheduler,
worker: profile.worker,
stores: { ...profile.stores },
- endpoints: profile.endpoints.map((binding) => structuredClone(binding)),
+ endpoints: profile.endpoints.map((offer) => structuredClone(offer)),
scheduling: structuredClone(profile.scheduling),
};
- const content = closureContent(draft);
- const closure = { ...content, digest: digestOf(content) };
verifyRuntimeClosure(closure);
return closure;
}
@@ -550,8 +484,8 @@ export function verifyRuntimeCoverage(closure: RuntimeClosure, state: BuildState
verifyRuntimeClosure(closure);
for (const requirement of plannedNeeds(state)) {
assert(
- closure.endpoints.some((binding) => sameCapability(binding, requirement)),
- `Runtime Closure does not bind demanded capability ${bindingKey(requirement)}`,
+ closure.endpoints.some((offer) => sameCapability(offer, requirement)),
+ `Runtime Closure does not bind demanded capability ${offerKey(requirement)}`,
);
}
}
diff --git a/packages/runtime/src/types.ts b/packages/runtime/src/types.ts
index 5f8b26e3..bb50333b 100644
--- a/packages/runtime/src/types.ts
+++ b/packages/runtime/src/types.ts
@@ -19,7 +19,7 @@ export type RuntimeRunnableCommand = {
readonly command: CoreCommand;
/** Every resource is acquired atomically before the command can cause a side effect. */
readonly resources: readonly RuntimeResourceClaim[];
- readonly queue?: RuntimeQueueRoute;
+ readonly queue?: RuntimeQueueLane;
/** Recoverable work retains one shared in-flight reservation while polling. */
readonly capacityMode?: "active" | "recoverable";
};
@@ -30,9 +30,9 @@ export type RuntimeResourceClaim = {
readonly maxInFlight: number;
};
-export type RuntimeQueueRoute = {
- readonly authority: string;
- readonly route: string;
+export type RuntimeQueueLane = {
+ readonly pool: string;
+ readonly lane: string;
};
export type RuntimeExecutionStores = {
diff --git a/packages/runtime/test/catalog.test.ts b/packages/runtime/test/catalog.test.ts
index 71ab9613..bd8c3489 100644
--- a/packages/runtime/test/catalog.test.ts
+++ b/packages/runtime/test/catalog.test.ts
@@ -6,7 +6,7 @@ import { MemoryBuildCatalog } from "@narratage/runtime";
function descriptor(core = digestOf("core:one")) {
return {
- format: "svml.build-catalog-descriptor@1" as const,
+ format: "narratage.build-catalog-descriptor@1" as const,
core,
source: { path: "/project/main.svml", closure: digestOf("source:one") },
run: { path: "/project/delivery.svrun" },
diff --git a/packages/runtime/test/components.test.ts b/packages/runtime/test/components.test.ts
deleted file mode 100644
index 58ede1f7..00000000
--- a/packages/runtime/test/components.test.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import { digestOf } from "@narratage/protocol";
-import {
- MemoryBuildStore,
- MemoryOperationStore,
- assembleRuntimeComponents,
- defineRuntimeComponentPackage,
- verifyRuntimeComponentPackage,
-} from "@narratage/runtime";
-
-const moduleRef = { name: "example.runtime-components", version: "1" } as const;
-
-function servicePackage(close?: () => void) {
- return defineRuntimeComponentPackage({
- module: moduleRef,
- components: [
- {
- role: "scheduler",
- facet: "scheduler",
- instance: "scheduler.example",
- implementation: {
- digest: digestOf("example.runtime-components/scheduler@1"),
- },
- configuration: { algorithm: "fixture" },
- port: {
- create() {
- return { async run() { return []; } };
- },
- },
- },
- {
- role: "worker",
- facet: "worker",
- instance: "worker.example",
- implementation: { digest: digestOf("worker") },
- port: { create() { return { async runOnce() { return undefined; }, async run() {} }; } },
- },
- {
- role: "build-store",
- facet: "build-store",
- instance: "builds.example",
- implementation: {
- digest: digestOf("example.runtime-components/build-store@1"),
- },
- configuration: { database: "fixture" },
- port: new MemoryBuildStore(),
- },
- {
- role: "operation-store",
- facet: "operation-store",
- instance: "operations.example",
- implementation: {
- digest: digestOf("example.runtime-components/operation-store@1"),
- },
- configuration: { database: "fixture" },
- port: new MemoryOperationStore(),
- },
- {
- role: "dispatch-store",
- facet: "dispatch-store",
- instance: "dispatch.example",
- implementation: { digest: digestOf("dispatch") },
- port: Object.fromEntries([
- "create", "read", "list", "wake", "claim", "heartbeat", "release", "finish", "requestCancellation",
- "acquireCapacity", "heartbeatCapacity", "parkCapacity", "releaseCapacity", "clearCapacity", "listCapacity",
- ].map((name) => [name, async () => undefined])) as never,
- },
- {
- role: "artifact-store",
- facet: "artifact-store",
- instance: "artifacts.example",
- implementation: { digest: digestOf("artifacts") },
- port: {
- async put() { throw new Error("unused"); },
- async get() { return undefined; },
- async has() { return false; },
- },
- },
- {
- role: "credential-store",
- facet: "credential-store",
- instance: "credentials.example",
- implementation: { digest: digestOf("credentials") },
- port: { async resolve() { return undefined; } },
- },
- ],
- ...(close === undefined ? {} : { close }),
- });
-}
-
-test("one physical Runtime package exposes separately selected Scheduler and Store Components", async () => {
- let closes = 0;
- const configured = servicePackage(() => { closes += 1; });
- const assembly = assembleRuntimeComponents([configured], {
- scheduler: "scheduler.example",
- worker: "worker.example",
- stores: {
- build: "builds.example",
- operations: "operations.example",
- dispatch: "dispatch.example",
- artifacts: "artifacts.example",
- credentials: ["credentials.example"],
- },
- });
- assert.equal(assembly.manifests.length, 1);
- assert.deepEqual(assembly.instances.map((item) => item.id), [
- "scheduler.example",
- "worker.example",
- "builds.example",
- "operations.example",
- "dispatch.example",
- "artifacts.example",
- "credentials.example",
- ]);
- assert.ok(assembly.buildStore);
- assert.ok(assembly.operationStore);
- assert.ok(assembly.artifactStore);
- assert.equal((await assembly.scheduler.create({
- prepare() { throw new Error("unused"); },
- async executeCommand() { throw new Error("unused"); },
- }).run([])).length, 0);
- await assembly.close();
- await assembly.close();
- assert.equal(closes, 1);
-});
-
-test("Runtime Component configuration is identity-bound and role selection is exact", () => {
- const configured = servicePackage();
- assert.ok(configured.components.every((item) => item.instance.configurationDigest !== undefined));
- assert.throws(
- () => assembleRuntimeComponents([configured], {
- scheduler: "builds.example",
- worker: "worker.example",
- stores: {
- build: "builds.example",
- operations: "operations.example",
- dispatch: "dispatch.example",
- artifacts: "artifacts.example",
- credentials: ["credentials.example"],
- },
- }),
- /not scheduler/u,
- );
-
- const tampered = {
- ...configured,
- manifest: structuredClone(configured.manifest),
- components: [...configured.components],
- };
- (tampered.manifest.facets[1] as { role: "artifact-store" }).role = "artifact-store";
- assert.throws(() => verifyRuntimeComponentPackage(tampered), /role differs/u);
-
- const missingPort = {
- ...configured,
- components: configured.components.map((component) => component.role === "build-store"
- ? { ...component, port: {} as never }
- : component),
- };
- assert.throws(() => verifyRuntimeComponentPackage(missingPort), /does not implement create/u);
-});
diff --git a/packages/runtime/test/infrastructure.test.ts b/packages/runtime/test/infrastructure.test.ts
new file mode 100644
index 00000000..34e2f081
--- /dev/null
+++ b/packages/runtime/test/infrastructure.test.ts
@@ -0,0 +1,141 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+ MemoryBuildStore,
+ MemoryOperationStore,
+ assembleRuntimeInfrastructure,
+ defineRuntimeInfrastructurePackage,
+ verifyRuntimeInfrastructurePackage,
+} from "@narratage/runtime";
+
+const moduleRef = { name: "example.infrastructures", version: "1" } as const;
+
+function servicePackage(close?: () => void) {
+ return defineRuntimeInfrastructurePackage({
+ module: moduleRef,
+ instance: "example",
+ parts: [
+ {
+ role: "scheduler",
+ facet: "scheduler",
+ part: "scheduler",
+ port: {
+ create() {
+ return { async run() { return []; } };
+ },
+ },
+ },
+ {
+ role: "worker",
+ facet: "worker",
+ part: "worker",
+ port: { create() { return { async runOnce() { return undefined; }, async run() {} }; } },
+ },
+ {
+ role: "build-store",
+ facet: "build-store",
+ part: "builds",
+ port: new MemoryBuildStore(),
+ },
+ {
+ role: "operation-store",
+ facet: "operation-store",
+ part: "operations",
+ port: new MemoryOperationStore(),
+ },
+ {
+ role: "dispatch-store",
+ facet: "dispatch-store",
+ part: "dispatch",
+ port: Object.fromEntries([
+ "create", "read", "list", "wake", "claim", "heartbeat", "release", "finish", "requestCancellation",
+ "acquireCapacity", "heartbeatCapacity", "parkCapacity", "releaseCapacity", "clearCapacity", "listCapacity",
+ ].map((name) => [name, async () => undefined])) as never,
+ },
+ {
+ role: "artifact-store",
+ facet: "artifact-store",
+ part: "artifacts",
+ port: {
+ async put() { throw new Error("unused"); },
+ async get() { return undefined; },
+ async has() { return false; },
+ },
+ },
+ {
+ role: "credential-store",
+ facet: "credential-store",
+ part: "credentials",
+ port: { async resolve() { return undefined; } },
+ },
+ ],
+ ...(close === undefined ? {} : { close }),
+ });
+}
+
+test("one physical Runtime package exposes separately selected Scheduler and Store parts", async () => {
+ let closes = 0;
+ const configured = servicePackage(() => { closes += 1; });
+ const assembly = assembleRuntimeInfrastructure([configured], {
+ scheduler: { from: "example", part: "scheduler" },
+ worker: { from: "example", part: "worker" },
+ buildStore: { from: "example", part: "builds" },
+ operationStore: { from: "example", part: "operations" },
+ dispatchStore: { from: "example", part: "dispatch" },
+ artifactStore: { from: "example", part: "artifacts" },
+ credentialStores: [{ from: "example", part: "credentials" }],
+ });
+ assert.equal(assembly.manifests.length, 1);
+ assert.deepEqual(assembly.instances.map((item) => item.id), [
+ "example.scheduler",
+ "example.worker",
+ "example.builds",
+ "example.operations",
+ "example.dispatch",
+ "example.artifacts",
+ "example.credentials",
+ ]);
+ assert.ok(assembly.buildStore);
+ assert.ok(assembly.operationStore);
+ assert.ok(assembly.artifactStore);
+ assert.equal((await assembly.scheduler.create({
+ prepare() { throw new Error("unused"); },
+ async executeCommand() { throw new Error("unused"); },
+ }).run([])).length, 0);
+ await assembly.close();
+ await assembly.close();
+ assert.equal(closes, 1);
+});
+
+test("Runtime infrastructure role selection is exact", () => {
+ const configured = servicePackage();
+ assert.throws(
+ () => assembleRuntimeInfrastructure([configured], {
+ scheduler: { from: "example", part: "builds" },
+ worker: { from: "example", part: "worker" },
+ buildStore: { from: "example", part: "builds" },
+ operationStore: { from: "example", part: "operations" },
+ dispatchStore: { from: "example", part: "dispatch" },
+ artifactStore: { from: "example", part: "artifacts" },
+ credentialStores: [{ from: "example", part: "credentials" }],
+ }),
+ /not scheduler/u,
+ );
+
+ const tampered = {
+ ...configured,
+ manifest: structuredClone(configured.manifest),
+ parts: [...configured.parts],
+ };
+ (tampered.manifest.facets[1] as { role: "artifact-store" }).role = "artifact-store";
+ assert.throws(() => verifyRuntimeInfrastructurePackage(tampered), /role differs/u);
+
+ const missingPort = {
+ ...configured,
+ parts: configured.parts.map((part) => part.role === "build-store"
+ ? { ...part, port: {} as never }
+ : part),
+ };
+ assert.throws(() => verifyRuntimeInfrastructurePackage(missingPort), /does not implement create/u);
+});
diff --git a/packages/runtime/test/operations.test.ts b/packages/runtime/test/operations.test.ts
index 8d41253d..e12b84d3 100644
--- a/packages/runtime/test/operations.test.ts
+++ b/packages/runtime/test/operations.test.ts
@@ -1,30 +1,27 @@
import assert from "node:assert/strict";
import test from "node:test";
-import { digestOf } from "@narratage/core";
import {
MemoryOperationStore,
sealOperationIdentity,
verifyOperationSnapshot,
} from "@narratage/runtime";
-function identity(overrides: { readonly endpoint?: string; readonly runtimeClosure?: string } = {}) {
+function identity(overrides: { readonly endpoint?: string } = {}) {
return sealOperationIdentity({
build: "video-42",
command: "command:render",
endpoint: overrides.endpoint ?? "hyperframes.local",
- authority: "hyperframes.local",
- route: "fixture.render",
- runtimeClosure: (overrides.runtimeClosure ?? digestOf("runtime-closure:local")) as never,
+ pool: "hyperframes.local",
+ lane: "fixture.render",
attempt: 1,
});
}
-test("Operation identity locks Build, Command, Endpoint and Runtime Closure", () => {
+test("Operation identity distinguishes Build, Command and Endpoint", () => {
const first = identity();
assert.equal(first.id, identity().id);
assert.notEqual(first.id, identity({ endpoint: "hyperframes.hosted" }).id);
- assert.notEqual(first.id, identity({ runtimeClosure: digestOf("runtime-closure:hosted") }).id);
});
test("OperationStore idempotently discovers an existing submission after restart", async () => {
diff --git a/packages/runtime/test/profile.test.ts b/packages/runtime/test/profile.test.ts
index e646d076..361f9de8 100644
--- a/packages/runtime/test/profile.test.ts
+++ b/packages/runtime/test/profile.test.ts
@@ -1,15 +1,14 @@
import assert from "node:assert/strict";
import test from "node:test";
-import { digestOf } from "@narratage/core";
import {
RuntimeModuleRegistry,
localSchedulerOptionsFromClosure,
- resolveRuntimeProfile,
- sealRuntimeProfile,
+ resolveRuntimeClosure,
+ sealResolvedRuntimeProfile,
verifyRuntimeClosure,
verifyRuntimeCoverage,
- verifyRuntimeProfile,
+ verifyResolvedRuntimeProfile,
} from "@narratage/runtime";
import type { RuntimeModuleManifest } from "@narratage/runtime";
@@ -21,20 +20,16 @@ import {
const runtimeModule = { name: "example.runtime-fixture", version: "1" } as const;
const endpointFacet = { module: runtimeModule, name: "greeting-endpoint" } as const;
-const endpointImplementationDigest = digestOf("example.runtime-fixture/greeting-endpoint@1");
function manifest(): RuntimeModuleManifest {
return {
- format: "svml.runtime-module@1",
+ format: "narratage.runtime-module@1",
name: runtimeModule.name,
version: runtimeModule.version,
facets: [
{
name: "local-scheduler",
role: "scheduler",
- implementation: {
- digest: digestOf("example.runtime-fixture/local-scheduler@1"),
- },
},
...([
["local-worker", "worker"],
@@ -46,16 +41,10 @@ function manifest(): RuntimeModuleManifest {
] as const).map(([name, role]) => ({
name,
role,
- implementation: {
- digest: digestOf(`example.runtime-fixture/${name}@1`),
- },
})),
{
name: endpointFacet.name,
role: "capability-endpoint",
- implementation: {
- digest: endpointImplementationDigest,
- },
fulfills: [{ capability: capabilities.generation, returns: types.generated }],
lifecycle: "recoverable",
defaultConcurrency: 1,
@@ -65,7 +54,7 @@ function manifest(): RuntimeModuleManifest {
}
function profile(options: { readonly operations?: boolean; readonly resource?: number } = {}) {
- return sealRuntimeProfile({
+ return sealResolvedRuntimeProfile({
instances: [
{ id: "scheduler.local", facet: { module: runtimeModule, name: "local-scheduler" } },
{ id: "worker.local", facet: { module: runtimeModule, name: "local-worker" } },
@@ -80,9 +69,9 @@ function profile(options: { readonly operations?: boolean; readonly resource?: n
{
id: "greeting.local",
facet: endpointFacet,
- authority: "greeting.local",
+ pool: "greeting.local",
},
- ].map((instance) => ({ ...instance, configurationDigest: digestOf({}) })),
+ ],
scheduler: "scheduler.local",
worker: "worker.local",
stores: {
@@ -99,65 +88,43 @@ function profile(options: { readonly operations?: boolean; readonly resource?: n
}],
scheduling: {
maxConcurrency: 8,
- resources: [{ id: "authority:greeting.local", maxConcurrency: options.resource ?? 2 }],
+ resources: [{ id: "pool:greeting.local", maxConcurrency: options.resource ?? 2 }],
},
});
}
-test("Runtime Profile resolves installed static facets into one deterministic locked Closure", () => {
+test("Resolved Runtime resolves selected facets into one execution environment", () => {
const registry = new RuntimeModuleRegistry();
- const manifestDigest = registry.register(manifest());
- const first = resolveRuntimeProfile(registry, profile());
- const second = resolveRuntimeProfile(registry, profile());
- assert.equal(first.digest, second.digest);
- assert.equal(first.modules[0]?.digest, manifestDigest);
+ registry.register(manifest());
+ const first = resolveRuntimeClosure(registry, profile());
+ const second = resolveRuntimeClosure(registry, profile());
+ assert.deepEqual(first, second);
assert.equal(first.instances.filter((instance) => instance.role === "scheduler").length, 1);
const endpoint = first.instances.find((instance) => instance.id === "greeting.local");
assert.equal(endpoint?.role, "capability-endpoint");
if (endpoint?.role === "capability-endpoint") {
- assert.equal(endpoint.implementation.digest, endpointImplementationDigest);
- assert.equal(endpoint.authority, "greeting.local");
+ assert.equal(endpoint.pool, "greeting.local");
assert.equal(endpoint.maxConcurrency, 1);
}
assert.deepEqual(localSchedulerOptionsFromClosure(first).resourceLimits, {
- "authority:greeting.local": 2,
+ "pool:greeting.local": 2,
});
assert.doesNotThrow(() => verifyRuntimeCoverage(first, createGreetingBuild()));
});
-test("Profile order is not identity but an execution-policy change is", () => {
+test("Profile order does not change the resolved selection", () => {
const registry = new RuntimeModuleRegistry();
registry.register(manifest());
const normal = profile();
- const reordered = sealRuntimeProfile({
+ const reordered = sealResolvedRuntimeProfile({
...normal,
instances: [...normal.instances].reverse(),
endpoints: [...normal.endpoints].reverse(),
scheduling: { ...normal.scheduling, resources: [...normal.scheduling.resources].reverse() },
});
- assert.equal(
- resolveRuntimeProfile(registry, normal).digest,
- resolveRuntimeProfile(registry, reordered).digest,
- );
- assert.notEqual(
- resolveRuntimeProfile(registry, normal).digest,
- resolveRuntimeProfile(registry, profile({ resource: 1 })).digest,
- );
-});
-
-test("non-secret instance configuration is locked independently from implementation bytes", () => {
- const registry = new RuntimeModuleRegistry();
- registry.register(manifest());
- const original = profile();
- const configured = sealRuntimeProfile({
- ...original,
- instances: original.instances.map((instance) => instance.id === "greeting.local"
- ? { ...instance, configurationDigest: digestOf({ baseUrl: "https://provider.example" }) }
- : instance),
- });
- assert.notEqual(
- resolveRuntimeProfile(registry, original).digest,
- resolveRuntimeProfile(registry, configured).digest,
+ assert.deepEqual(
+ resolveRuntimeClosure(registry, normal),
+ resolveRuntimeClosure(registry, reordered),
);
});
@@ -165,7 +132,7 @@ test("recoverable Endpoints require an OperationStore before any paid execution"
const registry = new RuntimeModuleRegistry();
registry.register(manifest());
assert.throws(
- () => resolveRuntimeProfile(registry, profile({ operations: false })),
+ () => resolveRuntimeClosure(registry, profile({ operations: false })),
/operations store/u,
);
});
@@ -181,7 +148,7 @@ test("credentialed Endpoints require a selected CredentialStore", () => {
});
const withoutCredentials = profile();
assert.throws(
- () => resolveRuntimeProfile(registry, sealRuntimeProfile({
+ () => resolveRuntimeClosure(registry, sealResolvedRuntimeProfile({
...withoutCredentials,
stores: { ...withoutCredentials.stores, credentials: [] },
})),
@@ -193,40 +160,40 @@ test("Coverage rejects an unbound demanded Need before the Scheduler starts", ()
const registry = new RuntimeModuleRegistry();
registry.register(manifest());
const configured = profile();
- const unbound = sealRuntimeProfile({ ...configured, endpoints: [] });
- const closure = resolveRuntimeProfile(registry, unbound);
+ const unbound = sealResolvedRuntimeProfile({ ...configured, endpoints: [] });
+ const closure = resolveRuntimeClosure(registry, unbound);
assert.throws(
() => verifyRuntimeCoverage(closure, createGreetingBuild()),
/does not bind demanded capability/u,
);
});
-test("Runtime Closure content cannot be changed without invalidating its digest", () => {
+test("Runtime Closure content is structurally validated", () => {
const registry = new RuntimeModuleRegistry();
registry.register(manifest());
- const closure = resolveRuntimeProfile(registry, profile());
+ const closure = resolveRuntimeClosure(registry, profile());
const tampered = structuredClone(closure);
- (tampered.scheduling as { maxConcurrency: number }).maxConcurrency = 999;
- assert.throws(() => verifyRuntimeClosure(tampered), /digest differs/u);
+ (tampered.scheduling as { maxConcurrency: number }).maxConcurrency = 0;
+ assert.throws(() => verifyRuntimeClosure(tampered), /positive safe integer/u);
});
test("unsupported Runtime formats are rejected instead of being reinterpreted", () => {
const registry = new RuntimeModuleRegistry();
assert.throws(
- () => registry.register({ ...manifest(), format: "svml.runtime-module@invalid" } as never),
+ () => registry.register({ ...manifest(), format: "narratage.runtime-module@invalid" } as never),
/unsupported Runtime Module Manifest format/u,
);
const configured = profile();
assert.throws(
- () => verifyRuntimeProfile({ ...configured, format: "svml.runtime-profile@invalid" } as never),
- /unsupported Runtime Profile format/u,
+ () => verifyResolvedRuntimeProfile({ ...configured, format: "narratage.resolved-runtime@invalid" } as never),
+ /unsupported Resolved Runtime format/u,
);
registry.register(manifest());
- const closure = resolveRuntimeProfile(registry, configured);
+ const closure = resolveRuntimeClosure(registry, configured);
assert.throws(
- () => verifyRuntimeClosure({ ...closure, format: "svml.runtime-closure@invalid" } as never),
+ () => verifyRuntimeClosure({ ...closure, format: "narratage.runtime-closure@invalid" } as never),
/unsupported Runtime Closure format/u,
);
});
diff --git a/packages/screen-overlay/package.json b/packages/screen-overlay/package.json
index 78faa96d..0b8e8a6f 100644
--- a/packages/screen-overlay/package.json
+++ b/packages/screen-overlay/package.json
@@ -5,7 +5,7 @@
"private": true,
"type": "module",
"exports": { ".": "./src/index.ts" },
- "svml": { "activation": "./src/activation.ts" },
+ "narratage": { "activation": "./src/activation.ts" },
"dependencies": {
"@narratage/component-kit": "workspace:*",
"@narratage/composition": "workspace:*",
diff --git a/packages/screen-overlay/src/activation.ts b/packages/screen-overlay/src/activation.ts
index 4858d006..696a31a7 100644
--- a/packages/screen-overlay/src/activation.ts
+++ b/packages/screen-overlay/src/activation.ts
@@ -3,8 +3,8 @@ import {
decodeScreenOverlaySurface, screenOverlayComponent, screenOverlayManifest, screenOverlayModuleRef,
screenOverlayMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: screenOverlayManifest }],
components: [screenOverlayComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -12,4 +12,4 @@ export const svmlPackage = {
declaration: screenOverlayMarkupSurfaces.find((item) => item.name === "track")!, handler: decodeScreenOverlaySurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/screen-overlay/src/component.ts b/packages/screen-overlay/src/component.ts
index 27b106ae..a544d2c7 100644
--- a/packages/screen-overlay/src/component.ts
+++ b/packages/screen-overlay/src/component.ts
@@ -6,22 +6,18 @@ import type { StoredValue } from "@narratage/protocol";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import type { CanvasSpace } from "@narratage/spatial";
import { screenOverlayProducers, screenOverlayTypes } from "./manifest.js";
-import {
- appendMomentScreenOverlay, appendProgramScreenOverlay, appendSelectionScreenOverlay,
- assertScreenOverlayProgram, createScreenOverlaySet, finalizeScreenOverlay, renderScreenOverlay,
- screenOverlayImplementationDigests, screenOverlayValidatorDigests,
-} from "./program.js";
+import { appendMomentScreenOverlay, appendProgramScreenOverlay, appendSelectionScreenOverlay, assertScreenOverlayProgram, createScreenOverlaySet, finalizeScreenOverlay, renderScreenOverlay } from "./program.js";
import type { ScreenOverlayHeader, ScreenOverlayItemSpec, ScreenOverlayProgram, ScreenOverlaySet } from "./types.js";
function inline<T>(value: StoredValue | undefined, label: string): T { if (value?.kind !== "inline") throw new Error(`${label} must be inline.`); return value.value as unknown as T; }
const output = (value: unknown) => ({ kind: "inline" as const, value: canonicalize(value) });
export const screenOverlayComponent = {
producers: [
- { producer: screenOverlayProducers.createSet, implementationDigest: screenOverlayImplementationDigests.createSet, handler: () => ({ outputs: { set: output(createScreenOverlaySet()) }, needs: {} }) },
- { producer: screenOverlayProducers.appendProgram, implementationDigest: screenOverlayImplementationDigests.appendProgram, handler: ({ inputs }) => ({ outputs: { set: output(appendProgramScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<ScreenOverlayItemSpec>(inputs.spec?.value, "ScreenOverlayItemSpec"))) }, needs: {} }) },
- { producer: screenOverlayProducers.appendSelection, implementationDigest: screenOverlayImplementationDigests.appendSelection, handler: ({ inputs }) => ({ outputs: { set: output(appendSelectionScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"), inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelection"), inline<ScreenOverlayItemSpec>(inputs.spec?.value, "ScreenOverlayItemSpec"))) }, needs: {} }) },
- { producer: screenOverlayProducers.appendMoment, implementationDigest: screenOverlayImplementationDigests.appendMoment, handler: ({ inputs }) => ({ outputs: { set: output(appendMomentScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"), inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMoment"), inline<ScreenOverlayItemSpec>(inputs.spec?.value, "ScreenOverlayItemSpec"))) }, needs: {} }) },
- { producer: screenOverlayProducers.finalize, implementationDigest: screenOverlayImplementationDigests.finalize, handler: ({ inputs }) => ({ outputs: { program: output(finalizeScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"))) }, needs: {} }) },
- { producer: screenOverlayProducers.render, implementationDigest: screenOverlayImplementationDigests.render, handler: ({ inputs }) => ({ outputs: { track: output(renderScreenOverlay(inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<ScreenOverlayProgram>(inputs.program?.value, "ScreenOverlayProgram"))) }, needs: {} }) },
+ { producer: screenOverlayProducers.createSet, handler: () => ({ outputs: { set: output(createScreenOverlaySet()) }, needs: {} }) },
+ { producer: screenOverlayProducers.appendProgram, handler: ({ inputs }) => ({ outputs: { set: output(appendProgramScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<ScreenOverlayItemSpec>(inputs.spec?.value, "ScreenOverlayItemSpec"))) }, needs: {} }) },
+ { producer: screenOverlayProducers.appendSelection, handler: ({ inputs }) => ({ outputs: { set: output(appendSelectionScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"), inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelection"), inline<ScreenOverlayItemSpec>(inputs.spec?.value, "ScreenOverlayItemSpec"))) }, needs: {} }) },
+ { producer: screenOverlayProducers.appendMoment, handler: ({ inputs }) => ({ outputs: { set: output(appendMomentScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"), inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMoment"), inline<ScreenOverlayItemSpec>(inputs.spec?.value, "ScreenOverlayItemSpec"))) }, needs: {} }) },
+ { producer: screenOverlayProducers.finalize, handler: ({ inputs }) => ({ outputs: { program: output(finalizeScreenOverlay(inline<ScreenOverlaySet>(inputs.set?.value, "ScreenOverlaySet"), inline<ScreenOverlayHeader>(inputs.header?.value, "ScreenOverlayHeader"))) }, needs: {} }) },
+ { producer: screenOverlayProducers.render, handler: ({ inputs }) => ({ outputs: { track: output(renderScreenOverlay(inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"), inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"), inline<ScreenOverlayProgram>(inputs.program?.value, "ScreenOverlayProgram"))) }, needs: {} }) },
],
- validators: [{ type: screenOverlayTypes.program, implementationDigest: screenOverlayValidatorDigests.program, handler: ({ value }) => assertScreenOverlayProgram(inline<ScreenOverlayProgram>(value, "ScreenOverlayProgram")) }],
+ validators: [{ type: screenOverlayTypes.program, handler: ({ value }) => assertScreenOverlayProgram(inline<ScreenOverlayProgram>(value, "ScreenOverlayProgram")) }],
} satisfies ComponentPackage;
diff --git a/packages/screen-overlay/src/index.ts b/packages/screen-overlay/src/index.ts
index 45ab8d1b..f3e8158d 100644
--- a/packages/screen-overlay/src/index.ts
+++ b/packages/screen-overlay/src/index.ts
@@ -1,17 +1,7 @@
export { screenOverlayComponent } from "./component.js";
export { createScreenOverlayFragment, programScreenOverlayFragment } from "./fragment.js";
export type { ScreenOverlayFragmentItem } from "./fragment.js";
-export {
- screenOverlayDependency, screenOverlayHeaderSchema, screenOverlayItemSpecSchema, screenOverlayManifest, screenOverlayMarkupSurfaces,
- screenOverlayManifestDigest, screenOverlayModuleRef, screenOverlayProducers, screenOverlayProgramSchema,
- screenOverlaySetSchema, screenOverlaySurfaceImplementationDigest, screenOverlayTypes,
-} from "./manifest.js";
-export {
- appendMomentScreenOverlay, appendProgramScreenOverlay, appendSelectionScreenOverlay,
- assertScreenOverlayComponent, assertScreenOverlayHeader, assertScreenOverlayItemSpec,
- assertScreenOverlayProgram, assertScreenOverlaySet, createScreenOverlaySet, finalizeScreenOverlay,
- renderScreenOverlay, screenOverlayImplementationDigests, screenOverlayValidatorDigests,
- sealScreenOverlayHeader, sealScreenOverlayItemSpec, sealScreenOverlayProgram,
-} from "./program.js";
+export { screenOverlayDependency, screenOverlayHeaderSchema, screenOverlayItemSpecSchema, screenOverlayManifest, screenOverlayMarkupSurfaces, screenOverlayModuleRef, screenOverlayProducers, screenOverlayProgramSchema, screenOverlaySetSchema, screenOverlayTypes } from "./manifest.js";
+export { appendMomentScreenOverlay, appendProgramScreenOverlay, appendSelectionScreenOverlay, assertScreenOverlayComponent, assertScreenOverlayHeader, assertScreenOverlayItemSpec, assertScreenOverlayProgram, assertScreenOverlaySet, createScreenOverlaySet, finalizeScreenOverlay, renderScreenOverlay, sealScreenOverlayHeader, sealScreenOverlayItemSpec, sealScreenOverlayProgram } from "./program.js";
export { decodeScreenOverlaySurface } from "./surface.js";
export type * from "./types.js";
diff --git a/packages/screen-overlay/src/manifest.ts b/packages/screen-overlay/src/manifest.ts
index 11f70206..14c7841f 100644
--- a/packages/screen-overlay/src/manifest.ts
+++ b/packages/screen-overlay/src/manifest.ts
@@ -7,8 +7,6 @@ import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map
import { spatialDependency, spatialTypes } from "@narratage/spatial";
import { temporalDependency } from "@narratage/temporal";
-import { screenOverlayImplementationDigests, screenOverlayValidatorDigests } from "./program.js";
-
export const screenOverlayModuleRef = { name: "@narratage/screen-overlay", version: "1" } as const;
export const screenOverlayTypes = {
header: { module: screenOverlayModuleRef, name: "ScreenOverlayHeader" },
@@ -71,30 +69,28 @@ export const screenOverlayHeaderSchema: ValueSchema = object({ id: { schema: str
export const screenOverlayItemSpecSchema: ValueSchema = itemSpec;
export const screenOverlaySetSchema: ValueSchema = object({ items: { schema: { kind: "array", items: item } } });
export const screenOverlayProgramSchema: ValueSchema = object({ id: { schema: string }, items: { schema: { kind: "array", minItems: 1, items: item } } });
-export const screenOverlaySurfaceImplementationDigest = digestOf("@narratage/screen-overlay/track-surface@1");
const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: { digest } });
const appendInputs = [{ name: "set", type: screenOverlayTypes.set }, { name: "header", type: screenOverlayTypes.header }, { name: "space", type: programSpaceTypes.programSpace }, { name: "spec", type: screenOverlayTypes.itemSpec }] as const;
-export const screenOverlayMarkupSurfaces = [{ name: "track", tag: "Track", mode: "structured", outputs: [screenOverlayTypes.header, screenOverlayTypes.itemSpec, screenOverlayTypes.program, compositionTypes.visualTrack], implementation: { digest: screenOverlaySurfaceImplementationDigest } }] as const;
+export const screenOverlayMarkupSurfaces = [{ name: "track", tag: "Track", mode: "structured", outputs: [screenOverlayTypes.header, screenOverlayTypes.itemSpec, screenOverlayTypes.program, compositionTypes.visualTrack] }] as const;
export const screenOverlayManifest: ModuleManifest = {
- format: "svml.module@1", name: screenOverlayModuleRef.name, version: screenOverlayModuleRef.version,
+ format: "narratage.module@1", name: screenOverlayModuleRef.name, version: screenOverlayModuleRef.version,
dependencies: [narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, compositionDependency],
types: [
- { name: screenOverlayTypes.header.name, schema: screenOverlayHeaderSchema },
- { name: screenOverlayTypes.itemSpec.name, schema: screenOverlayItemSpecSchema },
- { name: screenOverlayTypes.set.name, schema: screenOverlaySetSchema },
- { name: screenOverlayTypes.program.name, schema: screenOverlayProgramSchema, validator: validator(screenOverlayValidatorDigests.program) },
+ { name: screenOverlayTypes.header.name },
+ { name: screenOverlayTypes.itemSpec.name },
+ { name: screenOverlayTypes.set.name },
+ { name: screenOverlayTypes.program.name },
], capabilities: [],
producers: [
- { name: screenOverlayProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [], implementation: { digest: screenOverlayImplementationDigests.createSet } },
- { name: screenOverlayProducers.appendProgram.name, inputs: [...appendInputs], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [], implementation: { digest: screenOverlayImplementationDigests.appendProgram } },
- { name: screenOverlayProducers.appendSelection.name, inputs: [...appendInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [], implementation: { digest: screenOverlayImplementationDigests.appendSelection } },
- { name: screenOverlayProducers.appendMoment.name, inputs: [...appendInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [], implementation: { digest: screenOverlayImplementationDigests.appendMoment } },
- { name: screenOverlayProducers.finalize.name, inputs: [{ name: "set", type: screenOverlayTypes.set }, { name: "header", type: screenOverlayTypes.header }], outputs: [{ name: "program", type: screenOverlayTypes.program }], needs: [], implementation: { digest: screenOverlayImplementationDigests.finalize } },
- { name: screenOverlayProducers.render.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }, { name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: screenOverlayTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: { digest: screenOverlayImplementationDigests.render } },
+ { name: screenOverlayProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [] },
+ { name: screenOverlayProducers.appendProgram.name, inputs: [...appendInputs], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [] },
+ { name: screenOverlayProducers.appendSelection.name, inputs: [...appendInputs, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [] },
+ { name: screenOverlayProducers.appendMoment.name, inputs: [...appendInputs, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [] },
+ { name: screenOverlayProducers.finalize.name, inputs: [{ name: "set", type: screenOverlayTypes.set }, { name: "header", type: screenOverlayTypes.header }], outputs: [{ name: "program", type: screenOverlayTypes.program }], needs: [] },
+ { name: screenOverlayProducers.render.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }, { name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: screenOverlayTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
],
};
-export const screenOverlayManifestDigest = digestOf(screenOverlayManifest);
-export const screenOverlayDependency = { module: screenOverlayModuleRef, digest: screenOverlayManifestDigest } as const;
+export const screenOverlayDependency = { module: screenOverlayModuleRef } as const;
diff --git a/packages/screen-overlay/src/program.ts b/packages/screen-overlay/src/program.ts
index a906067c..2c7bc0a3 100644
--- a/packages/screen-overlay/src/program.ts
+++ b/packages/screen-overlay/src/program.ts
@@ -19,16 +19,6 @@ import type {
ScreenOverlaySet,
} from "./types.js";
-export const screenOverlayImplementationDigests = {
- createSet: digestOf("@narratage/screen-overlay/create-set@1"),
- appendProgram: digestOf("@narratage/screen-overlay/append-program@1"),
- appendSelection: digestOf("@narratage/screen-overlay/append-selection@1"),
- appendMoment: digestOf("@narratage/screen-overlay/append-moment@1"),
- finalize: digestOf("@narratage/screen-overlay/finalize@1"),
- render: digestOf("@narratage/screen-overlay/render@1"),
-} as const;
-export const screenOverlayValidatorDigests = { program: digestOf("@narratage/screen-overlay/validate-program@1") } as const;
-
function assert(condition: unknown, message: string): asserts condition { if (!condition) throw new Error(message); }
function identity(value: string, label: string): void {
assert(/^[A-Za-z][A-Za-z0-9_.:#-]{0,191}$/u.test(value), `${label} is invalid.`);
@@ -319,7 +309,7 @@ function overlayElements(content: ScreenOverlayComponent, canvas: CanvasSpace, d
export function renderScreenOverlay(canvas: CanvasSpace, space: ProgramSpace, program: ScreenOverlayProgram): VisualTrack {
assertCanvasSpace(canvas); assertProgramSpaceIdentity(space); assertScreenOverlayProgram(program);
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1", id: program.id,
+ visualIr: "narratage.visual-ir@1", id: program.id,
presents: program.items.map((item) => ({
id: item.id, span: { ...item.span }, stacking: { ...item.stacking },
elements: overlayElements(item.content, canvas, item.span.endFrameExclusive - item.span.startFrame),
diff --git a/packages/screen-overlay/test/screen-overlay.test.ts b/packages/screen-overlay/test/screen-overlay.test.ts
index a4f7827a..1076fa06 100644
--- a/packages/screen-overlay/test/screen-overlay.test.ts
+++ b/packages/screen-overlay/test/screen-overlay.test.ts
@@ -101,7 +101,7 @@ test("overlay Tracks interleave with peer Tracks only through absolute stacking"
const below = trackFor(components[1]!, 20);
const above = { ...trackFor(components[0]!, 80), id: "screen-above" };
const middle = sealVisualTrack({
- visualIr: "svml.visual-ir@1", id: "middle",
+ visualIr: "narratage.visual-ir@1", id: "middle",
presents: [{ id: "middle", span: { startFrame: 0, endFrameExclusive: 60 }, stacking: { order: 50, tieBreak: "middle" },
elements: [{ id: "root", order: 0, kind: "box", style: [{ name: "background-color", value: "#112233" }] }] }],
});
@@ -109,9 +109,9 @@ test("overlay Tracks interleave with peer Tracks only through absolute stacking"
id: "stack", canvas: { width: 1080, height: 1920, clearColor: "#000000" },
tracks: [above, middle, below],
}), space);
- const belowAt = document.html.indexOf('data-svml-track-id="screen"');
- const middleAt = document.html.indexOf('data-svml-track-id="middle"');
- const aboveAt = document.html.indexOf('data-svml-track-id="screen-above"');
+ const belowAt = document.html.indexOf('data-narratage-track-id="screen"');
+ const middleAt = document.html.indexOf('data-narratage-track-id="middle"');
+ const aboveAt = document.html.indexOf('data-narratage-track-id="screen-above"');
assert.ok(belowAt < middleAt && middleAt < aboveAt);
});
@@ -133,10 +133,9 @@ test("the self-described Screen Surface parses into a finite peer-Track graph",
const fixtureSurface = {
name: "inputs", tag: "Inputs", mode: "structured",
outputs: [spatialTypes.canvas, programSpaceTypes.programSpace],
- implementation: { digest: fixtureSurfaceDigest },
} as const;
const fixtureManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: fixtureModule.name,
version: fixtureModule.version,
dependencies: [spatialDependency, programSpaceDependency],
diff --git a/packages/script/package.json b/packages/script/package.json
index 412a20ac..6ff684d9 100644
--- a/packages/script/package.json
+++ b/packages/script/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/script/src/activation.ts b/packages/script/src/activation.ts
index ae1f82e2..4886aff6 100644
--- a/packages/script/src/activation.ts
+++ b/packages/script/src/activation.ts
@@ -7,8 +7,8 @@ import {
scriptMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: scriptManifest }],
hostFacets: [createMarkupSurfaceHostFacet({
module: scriptModuleRef,
@@ -17,4 +17,4 @@ export const svmlPackage = {
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts
index 0d3fff80..bf3ddc2e 100644
--- a/packages/script/src/index.ts
+++ b/packages/script/src/index.ts
@@ -1,18 +1,6 @@
export { ScriptSyntaxError } from "./error.js";
export { formatScript } from "./format.js";
-export {
- captionCorrespondenceType,
- captionDisplayType,
- captionDisplayWordSubsetType,
- narrativeExcerptType,
- narrativeMomentType,
- narrativeSelectionType,
- narrativeSchema,
- narrativeType,
- scriptManifest, scriptMarkupSurfaces,
- scriptModuleRef,
- scriptSurfaceImplementationDigest,
-} from "./manifest.js";
+export { captionCorrespondenceType, captionDisplayType, captionDisplayWordSubsetType, narrativeExcerptType, narrativeMomentType, narrativeSelectionType, narrativeSchema, narrativeType, scriptManifest, scriptMarkupSurfaces, scriptModuleRef } from "./manifest.js";
export {
captionCorrespondence,
captionCorrespondenceValue,
diff --git a/packages/script/src/manifest.ts b/packages/script/src/manifest.ts
index b853a054..ec0b88a6 100644
--- a/packages/script/src/manifest.ts
+++ b/packages/script/src/manifest.ts
@@ -13,8 +13,6 @@ export const captionCorrespondenceType: TypeRef = narrativeTypes.captionCorrespo
export const captionDisplayWordSubsetType: TypeRef = narrativeTypes.captionDisplayWordSubset;
export { narrativeSchema };
-export const scriptSurfaceImplementationDigest = digestOf("@narratage/script/display-atoms-with-structural-order-surface@1");
-
export const scriptMarkupSurfaces = [
{
name: "script",
@@ -30,14 +28,11 @@ export const scriptMarkupSurfaces = [
captionCorrespondenceType,
captionDisplayWordSubsetType,
],
- implementation: {
- digest: scriptSurfaceImplementationDigest,
- },
},
] as const;
export const scriptManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: scriptModuleRef.name,
version: scriptModuleRef.version,
dependencies: [narrativeDependency, textDependency],
diff --git a/packages/script/test/markup-integration.test.ts b/packages/script/test/markup-integration.test.ts
index 7448bf9f..9c0a7445 100644
--- a/packages/script/test/markup-integration.test.ts
+++ b/packages/script/test/markup-integration.test.ts
@@ -4,7 +4,7 @@ import { textManifest } from "@narratage/text";
import assert from "node:assert/strict";
import test from "node:test";
-import { createResolvedClosure, digestOf, isDigest } from "@narratage/core";
+import { createResolvedClosure, isDigest } from "@narratage/core";
import type { ModuleManifest } from "@narratage/protocol";
import {
decodeScriptSurface,
@@ -172,26 +172,20 @@ test("Markup also exposes a generic structured Surface tree", () => {
test("a module can use Markup's generic structured parser without adding another parser", async () => {
const module = { name: "example.card", version: "1" } as const;
const type = { module, name: "Card" } as const;
- const implementationDigest = digestOf("example.card/surface@1");
const cardSurface = {
name: "card",
tag: "card",
mode: "structured",
outputs: [type],
- implementation: { digest: implementationDigest },
} as const;
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: module.name,
version: module.version,
dependencies: [],
types: [
{
name: type.name,
- schema: {
- kind: "object",
- fields: { tag: { schema: { kind: "literal", value: "card" } } },
- },
},
],
capabilities: [],
diff --git a/packages/seedance/package.json b/packages/seedance/package.json
index 6f05b5ce..67311ada 100644
--- a/packages/seedance/package.json
+++ b/packages/seedance/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/seedance/src/activation.ts b/packages/seedance/src/activation.ts
index 848482ef..850f94e6 100644
--- a/packages/seedance/src/activation.ts
+++ b/packages/seedance/src/activation.ts
@@ -10,8 +10,8 @@ import {
seedanceMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: seedanceManifest }],
components: [seedanceComponent],
hostFacets: [
@@ -33,4 +33,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/seedance/src/index.ts b/packages/seedance/src/index.ts
index c6f9bde4..57cab623 100644
--- a/packages/seedance/src/index.ts
+++ b/packages/seedance/src/index.ts
@@ -114,16 +114,6 @@ export const seedanceDurationCompileProducers = Object.fromEntries(
}]),
) as Record<SeedanceModel, ProducerRef>;
-export const seedanceDurationCompileImplementationDigests = Object.fromEntries(
- seedanceModels.map((model) => [model, digestOf(`@narratage/seedance/compile-${model}-duration-request@1`)]),
-) as Record<SeedanceModel, Digest>;
-
-export const seedanceSurfaceImplementationDigests = {
- textVideo: digestOf("@narratage/seedance/text-video-surface@1"),
- frameVideo: digestOf("@narratage/seedance/frame-video-surface@1"),
- referenceVideo: digestOf("@narratage/seedance/reference-video-surface@1"),
-} as const;
-
function assertObject(value: unknown): asserts value is Record<string, unknown> {
if (value === null || typeof value !== "object" || Array.isArray(value)) {
throw new Error("Seedance value must be an object");
@@ -213,9 +203,6 @@ export const seedanceMarkupSurfaces = [
...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
]),
],
- implementation: {
- digest: seedanceSurfaceImplementationDigests.textVideo,
- },
},
{
name: "frame-video",
@@ -224,9 +211,6 @@ export const seedanceMarkupSurfaces = [
outputs: [seedanceTypes.durationProgram, ...Object.values(seedanceEndpoints).flatMap((endpoint) => [
endpoint.draftType, ...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
])],
- implementation: {
- digest: seedanceSurfaceImplementationDigests.frameVideo,
- },
},
{
name: "reference-video",
@@ -235,9 +219,6 @@ export const seedanceMarkupSurfaces = [
outputs: [seedanceTypes.durationProgram, ...Object.values(seedanceEndpoints).flatMap((endpoint) => [
endpoint.draftType, ...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
])],
- implementation: {
- digest: seedanceSurfaceImplementationDigests.referenceVideo,
- },
},
] as const;
@@ -251,7 +232,6 @@ export const seedanceManifest = {
...seedanceBaseDefinition.manifest.types,
{
name: seedanceTypes.durationProgram.name,
- schema: { kind: "oneOf", variants: seedanceModels.map(durationProgramSchema) } satisfies ValueSchema,
},
],
producers: [
@@ -264,20 +244,15 @@ export const seedanceManifest = {
],
outputs: [{ name: "draft", type: seedanceEndpointsByModel[model].draftType }],
needs: [],
- implementation: {
- digest: seedanceDurationCompileImplementationDigests[model],
- },
})),
],
} as const;
-export const seedanceManifestDigest = digestOf(seedanceManifest);
export const seedanceComponent = {
...seedanceBaseDefinition.component,
producers: [
...seedanceBaseDefinition.component.producers,
...seedanceModels.map((model) => ({
producer: seedanceDurationCompileProducers[model],
- implementationDigest: seedanceDurationCompileImplementationDigests[model],
handler: ({ inputs }: { readonly inputs: Readonly<Record<string, { readonly value: import("@narratage/protocol").StoredValue }>> }) => ({
outputs: {
draft: {
@@ -300,7 +275,6 @@ export const seedanceComponent = {
export const seedanceDefinition = {
...seedanceBaseDefinition,
manifest: seedanceManifest,
- manifestDigest: seedanceManifestDigest,
};
export {
diff --git a/packages/seedream/package.json b/packages/seedream/package.json
index 34a17fd2..1d29af3b 100644
--- a/packages/seedream/package.json
+++ b/packages/seedream/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/seedream/src/activation.ts b/packages/seedream/src/activation.ts
index 1383813f..c5f03dc5 100644
--- a/packages/seedream/src/activation.ts
+++ b/packages/seedream/src/activation.ts
@@ -2,10 +2,10 @@ import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import { seedreamComponent, seedreamManifest, seedreamModuleRef,
seedreamMarkupSurfaces } from "./index.js";
import { decodeSeedreamReferenceImageSurface, decodeSeedreamTextImageSurface } from "./surface.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: seedreamManifest }], components: [seedreamComponent], hostFacets: [
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: seedreamManifest }], components: [seedreamComponent], hostFacets: [
createMarkupSurfaceHostFacet({ module: seedreamModuleRef,
declaration: seedreamMarkupSurfaces.find((item) => item.name === "text-image")!, handler: decodeSeedreamTextImageSurface }),
createMarkupSurfaceHostFacet({ module: seedreamModuleRef,
declaration: seedreamMarkupSurfaces.find((item) => item.name === "reference-image")!, handler: decodeSeedreamReferenceImageSurface }),
] };
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/seedream/src/index.ts b/packages/seedream/src/index.ts
index 6cd5ac81..cb8e895e 100644
--- a/packages/seedream/src/index.ts
+++ b/packages/seedream/src/index.ts
@@ -44,26 +44,19 @@ const seedreamBaseDefinition = defineExactModelModule({
export const seedreamEndpoints = seedreamBaseDefinition.endpoints;
export const seedreamComponent = seedreamBaseDefinition.component;
-export const seedreamSurfaceImplementationDigests = {
- textImage: digestOf("@narratage/seedream/text-image-surface@1"),
- referenceImage: digestOf("@narratage/seedream/reference-image-surface@1"),
-} as const;
const endpoint = seedreamEndpoints.image!;
export const seedreamMarkupSurfaces = [{
name: "text-image", tag: "TextImage", mode: "structured" as const,
outputs: [endpoint.draftType],
- implementation: { digest: seedreamSurfaceImplementationDigests.textImage },
}, {
name: "reference-image", tag: "ReferenceImage", mode: "structured" as const,
outputs: [endpoint.draftType, endpoint.mediaBindings.images!.type],
- implementation: { digest: seedreamSurfaceImplementationDigests.referenceImage },
}] as const;
export const seedreamManifest = {
...seedreamBaseDefinition.manifest,
};
-export const seedreamManifestDigest = digestOf(seedreamManifest);
export const seedreamDefinition = {
- ...seedreamBaseDefinition, manifest: seedreamManifest, manifestDigest: seedreamManifestDigest,
+ ...seedreamBaseDefinition, manifest: seedreamManifest,
};
diff --git a/packages/semantic-map/package.json b/packages/semantic-map/package.json
index fb56ddf0..c358a5a2 100644
--- a/packages/semantic-map/package.json
+++ b/packages/semantic-map/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/semantic-map/src/activation.ts b/packages/semantic-map/src/activation.ts
index 1f83adfc..e4c93463 100644
--- a/packages/semantic-map/src/activation.ts
+++ b/packages/semantic-map/src/activation.ts
@@ -1,3 +1,3 @@
import { semanticMapManifest } from "./index.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: semanticMapManifest }] };
-export default svmlPackage;
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: semanticMapManifest }] };
+export default narratagePackage;
diff --git a/packages/semantic-map/src/index.ts b/packages/semantic-map/src/index.ts
index f9b72f58..f20ee15d 100644
--- a/packages/semantic-map/src/index.ts
+++ b/packages/semantic-map/src/index.ts
@@ -7,5 +7,5 @@ export {
selectionFrameSpans,
tokenFrameSpan,
} from "./location.js";
-export { completeSemanticMapSchema, semanticMapDependency, semanticMapManifest, semanticMapManifestDigest, semanticMapModuleRef, semanticMapTypes } from "./manifest.js";
+export { completeSemanticMapSchema, semanticMapDependency, semanticMapManifest, semanticMapModuleRef, semanticMapTypes } from "./manifest.js";
export type * from "./types.js";
diff --git a/packages/semantic-map/src/manifest.ts b/packages/semantic-map/src/manifest.ts
index 44aff548..14db13ff 100644
--- a/packages/semantic-map/src/manifest.ts
+++ b/packages/semantic-map/src/manifest.ts
@@ -11,7 +11,6 @@ export const completeSemanticMapSchema: ValueSchema = object({
tokens: { schema: { kind: "array", items: timedToken } }, anchors: { schema: { kind: "array", items: point } } });
export const semanticMapModuleRef = { name: "@narratage/semantic-map", version: "1" } as const;
export const semanticMapTypes = { complete: { module: semanticMapModuleRef, name: "CompleteSemanticMap" } } satisfies Record<string, TypeRef>;
-export const semanticMapManifest: ModuleManifest = { format: "svml.module@1", name: semanticMapModuleRef.name, version: semanticMapModuleRef.version,
- dependencies: [narrativeDependency, speechEvidenceDependency], types: [{ name: semanticMapTypes.complete.name, schema: completeSemanticMapSchema }], capabilities: [], producers: [] };
-export const semanticMapManifestDigest = digestOf(semanticMapManifest);
-export const semanticMapDependency = { module: semanticMapModuleRef, digest: semanticMapManifestDigest } as const;
+export const semanticMapManifest: ModuleManifest = { format: "narratage.module@1", name: semanticMapModuleRef.name, version: semanticMapModuleRef.version,
+ dependencies: [narrativeDependency, speechEvidenceDependency], types: [{ name: semanticMapTypes.complete.name }], capabilities: [], producers: [] };
+export const semanticMapDependency = { module: semanticMapModuleRef } as const;
diff --git a/packages/source/src/header.ts b/packages/source/src/header.ts
index 16f467ba..2db61b17 100644
--- a/packages/source/src/header.ts
+++ b/packages/source/src/header.ts
@@ -1,5 +1,5 @@
export type SourceHeader = {
- readonly format: "svml.source-header@1";
+ readonly format: "narratage.source-header@1";
/** Logical Frontend request. A trusted Host resolves it to one exact implementation. */
readonly using: string;
readonly start: number;
@@ -76,7 +76,7 @@ export function parseSourceHeader(sourceName: string, text: string): SourceHeade
if (nextContent !== null && after.startsWith("<?svml", nextContent.index)) {
fail(sourceName, text, "SOURCE_HEADER_DUPLICATE", "Source declares more than one Source Header", end + nextContent.index);
}
- return { format: "svml.source-header@1", using, start, end };
+ return { format: "narratage.source-header@1", using, start, end };
}
/** Preserve every original offset while making the Header ordinary whitespace to body Frontends. */
diff --git a/packages/source/src/index.ts b/packages/source/src/index.ts
index d60b83a5..fbcfa9af 100644
--- a/packages/source/src/index.ts
+++ b/packages/source/src/index.ts
@@ -19,4 +19,4 @@ export {
verifyCompiledSourceIdentity,
} from "./unit.js";
/** Logical package address for Source Frontends selected by a Source Header. */
-export const sourceFrontendPackageAbi = "svml.source-frontend@1";
+export const sourceFrontendPackageAbi = "narratage.source-frontend@1";
diff --git a/packages/source/src/unit.ts b/packages/source/src/unit.ts
index 1426fd46..93db7698 100644
--- a/packages/source/src/unit.ts
+++ b/packages/source/src/unit.ts
@@ -11,7 +11,6 @@ export type SourceUnit = {
/** Shared identity fields of any successfully decoded self-described Source. */
export type CompiledSourceIdentity = {
readonly frontend: string;
- readonly frontendDigest: Digest;
readonly sourceDigest: Digest;
readonly semanticDigest: Digest;
};
@@ -19,7 +18,6 @@ export type CompiledSourceIdentity = {
export function compiledSourceIdentity(value: CompiledSourceIdentity): CompiledSourceIdentity {
return {
frontend: value.frontend,
- frontendDigest: value.frontendDigest,
sourceDigest: value.sourceDigest,
semanticDigest: value.semanticDigest,
};
@@ -27,7 +25,6 @@ export function compiledSourceIdentity(value: CompiledSourceIdentity): CompiledS
export function verifyCompiledSourceIdentity(value: CompiledSourceIdentity): void {
if (value.frontend.trim().length === 0) throw new Error("Source Frontend is empty");
- if (!isDigest(value.frontendDigest)) throw new Error("Source Frontend digest is invalid");
if (!isDigest(value.sourceDigest)) throw new Error("Source digest is invalid");
if (!isDigest(value.semanticDigest)) throw new Error("Source semantic digest is invalid");
}
diff --git a/packages/spatial/package.json b/packages/spatial/package.json
index e18ee3ab..6f847773 100644
--- a/packages/spatial/package.json
+++ b/packages/spatial/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/spatial/src/activation.ts b/packages/spatial/src/activation.ts
index eec037dc..0cda214b 100644
--- a/packages/spatial/src/activation.ts
+++ b/packages/spatial/src/activation.ts
@@ -16,8 +16,8 @@ import {
} from "./manifest.js";
import { spatialComponent } from "./component.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: spatialManifest }],
components: [spatialComponent],
hostFacets: [
@@ -37,4 +37,4 @@ export const svmlPackage = {
declaration: spatialMarkupSurfaces.find((item) => item.name === "aspect-frame")!, handler: decodeAspectFrameSurface }),
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/spatial/src/component.ts b/packages/spatial/src/component.ts
index 6ea4b2ab..b86f0fdf 100644
--- a/packages/spatial/src/component.ts
+++ b/packages/spatial/src/component.ts
@@ -2,22 +2,7 @@ import type { ComponentPackage } from "@narratage/component-kit";
import { canonicalize } from "@narratage/protocol";
import type { StoredValue } from "@narratage/protocol";
-import {
- anchoredFrame,
- aspectFrame,
- assertCanvasSpace,
- assertContentFit,
- assertFittedContent,
- assertIntrinsicExtent,
- assertSpatialFrame,
- assertSpatialPath,
- assertSpatialPoint,
- canvasFrame,
- fitContent,
- frameFromEdges,
- spatialImplementationDigests,
- spatialValidatorDigests,
-} from "./geometry.js";
+import { anchoredFrame, aspectFrame, assertCanvasSpace, assertContentFit, assertFittedContent, assertIntrinsicExtent, assertSpatialFrame, assertSpatialPath, assertSpatialPoint, canvasFrame, fitContent, frameFromEdges } from "./geometry.js";
import { spatialProducers, spatialTypes } from "./manifest.js";
import type {
AnchoredFrameProgram,
@@ -40,19 +25,19 @@ const output = (value: unknown) => ({ kind: "inline" as const, value: canonicali
export const spatialComponent = {
producers: [
- { producer: spatialProducers.canvasFrame, implementationDigest: spatialImplementationDigests.canvasFrame, handler: ({ inputs }) => ({ outputs: { frame: output(canvasFrame(inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"))) }, needs: {} }) },
- { producer: spatialProducers.frameEdges, implementationDigest: spatialImplementationDigests.frameEdges, handler: ({ inputs }) => ({ outputs: { frame: output(frameFromEdges(inline<SpatialFrame>(inputs.parent?.value, "SpatialFrame"), inline<FrameEdgesProgram>(inputs.program?.value, "FrameEdgesProgram"))) }, needs: {} }) },
- { producer: spatialProducers.anchoredFrame, implementationDigest: spatialImplementationDigests.anchoredFrame, handler: ({ inputs }) => ({ outputs: { frame: output(anchoredFrame(inline<SpatialFrame>(inputs.parent?.value, "SpatialFrame"), inline<AnchoredFrameProgram>(inputs.program?.value, "AnchoredFrameProgram"))) }, needs: {} }) },
- { producer: spatialProducers.aspectFrame, implementationDigest: spatialImplementationDigests.aspectFrame, handler: ({ inputs }) => ({ outputs: { frame: output(aspectFrame(inline<SpatialFrame>(inputs.parent?.value, "SpatialFrame"), inline<IntrinsicExtent>(inputs.extent?.value, "IntrinsicExtent"), inline<AspectFrameProgram>(inputs.program?.value, "AspectFrameProgram"))) }, needs: {} }) },
- { producer: spatialProducers.fitContent, implementationDigest: spatialImplementationDigests.fitContent, handler: ({ inputs }) => ({ outputs: { fitted: output(fitContent(inline<SpatialFrame>(inputs.frame?.value, "SpatialFrame"), inline<IntrinsicExtent>(inputs.extent?.value, "IntrinsicExtent"), inline<ContentFit>(inputs.fit?.value, "ContentFit"))) }, needs: {} }) },
+ { producer: spatialProducers.canvasFrame, handler: ({ inputs }) => ({ outputs: { frame: output(canvasFrame(inline<CanvasSpace>(inputs.canvas?.value, "CanvasSpace"))) }, needs: {} }) },
+ { producer: spatialProducers.frameEdges, handler: ({ inputs }) => ({ outputs: { frame: output(frameFromEdges(inline<SpatialFrame>(inputs.parent?.value, "SpatialFrame"), inline<FrameEdgesProgram>(inputs.program?.value, "FrameEdgesProgram"))) }, needs: {} }) },
+ { producer: spatialProducers.anchoredFrame, handler: ({ inputs }) => ({ outputs: { frame: output(anchoredFrame(inline<SpatialFrame>(inputs.parent?.value, "SpatialFrame"), inline<AnchoredFrameProgram>(inputs.program?.value, "AnchoredFrameProgram"))) }, needs: {} }) },
+ { producer: spatialProducers.aspectFrame, handler: ({ inputs }) => ({ outputs: { frame: output(aspectFrame(inline<SpatialFrame>(inputs.parent?.value, "SpatialFrame"), inline<IntrinsicExtent>(inputs.extent?.value, "IntrinsicExtent"), inline<AspectFrameProgram>(inputs.program?.value, "AspectFrameProgram"))) }, needs: {} }) },
+ { producer: spatialProducers.fitContent, handler: ({ inputs }) => ({ outputs: { fitted: output(fitContent(inline<SpatialFrame>(inputs.frame?.value, "SpatialFrame"), inline<IntrinsicExtent>(inputs.extent?.value, "IntrinsicExtent"), inline<ContentFit>(inputs.fit?.value, "ContentFit"))) }, needs: {} }) },
],
validators: [
- { type: spatialTypes.canvas, implementationDigest: spatialValidatorDigests.canvas, handler: ({ value }) => assertCanvasSpace(inline<CanvasSpace>(value, "CanvasSpace")) },
- { type: spatialTypes.point, implementationDigest: spatialValidatorDigests.point, handler: ({ value }) => assertSpatialPoint(inline<SpatialPoint>(value, "SpatialPoint")) },
- { type: spatialTypes.frame, implementationDigest: spatialValidatorDigests.frame, handler: ({ value }) => assertSpatialFrame(inline<SpatialFrame>(value, "SpatialFrame")) },
- { type: spatialTypes.path, implementationDigest: spatialValidatorDigests.path, handler: ({ value }) => assertSpatialPath(inline<SpatialPath>(value, "SpatialPath")) },
- { type: spatialTypes.extent, implementationDigest: spatialValidatorDigests.extent, handler: ({ value }) => assertIntrinsicExtent(inline<IntrinsicExtent>(value, "IntrinsicExtent")) },
- { type: spatialTypes.fit, implementationDigest: spatialValidatorDigests.fit, handler: ({ value }) => assertContentFit(inline<ContentFit>(value, "ContentFit")) },
- { type: spatialTypes.fitted, implementationDigest: spatialValidatorDigests.fitted, handler: ({ value }) => assertFittedContent(inline<FittedContent>(value, "FittedContent")) },
+ { type: spatialTypes.canvas, handler: ({ value }) => assertCanvasSpace(inline<CanvasSpace>(value, "CanvasSpace")) },
+ { type: spatialTypes.point, handler: ({ value }) => assertSpatialPoint(inline<SpatialPoint>(value, "SpatialPoint")) },
+ { type: spatialTypes.frame, handler: ({ value }) => assertSpatialFrame(inline<SpatialFrame>(value, "SpatialFrame")) },
+ { type: spatialTypes.path, handler: ({ value }) => assertSpatialPath(inline<SpatialPath>(value, "SpatialPath")) },
+ { type: spatialTypes.extent, handler: ({ value }) => assertIntrinsicExtent(inline<IntrinsicExtent>(value, "IntrinsicExtent")) },
+ { type: spatialTypes.fit, handler: ({ value }) => assertContentFit(inline<ContentFit>(value, "ContentFit")) },
+ { type: spatialTypes.fitted, handler: ({ value }) => assertFittedContent(inline<FittedContent>(value, "FittedContent")) },
],
} satisfies ComponentPackage;
diff --git a/packages/spatial/src/geometry.ts b/packages/spatial/src/geometry.ts
index b69557bb..7e596e20 100644
--- a/packages/spatial/src/geometry.ts
+++ b/packages/spatial/src/geometry.ts
@@ -15,24 +15,6 @@ import type {
SpatialPoint,
} from "./types.js";
-export const spatialImplementationDigests = {
- canvasFrame: digestOf("@narratage/spatial/canvas-frame@1"),
- frameEdges: digestOf("@narratage/spatial/frame-edges@1"),
- anchoredFrame: digestOf("@narratage/spatial/anchored-frame@1"),
- aspectFrame: digestOf("@narratage/spatial/aspect-frame@1"),
- fitContent: digestOf("@narratage/spatial/fit-content@1"),
-} as const;
-
-export const spatialValidatorDigests = {
- canvas: digestOf("@narratage/spatial/validate-canvas@1"),
- point: digestOf("@narratage/spatial/validate-point@1"),
- frame: digestOf("@narratage/spatial/validate-frame@1"),
- path: digestOf("@narratage/spatial/validate-path@1"),
- extent: digestOf("@narratage/spatial/validate-extent@1"),
- fit: digestOf("@narratage/spatial/validate-fit@1"),
- fitted: digestOf("@narratage/spatial/validate-fitted@1"),
-} as const;
-
function finite(value: number, label: string): void {
if (!Number.isFinite(value)) throw new Error(`${label} must be finite.`);
}
diff --git a/packages/spatial/src/index.ts b/packages/spatial/src/index.ts
index 07d2c9f8..eba26c30 100644
--- a/packages/spatial/src/index.ts
+++ b/packages/spatial/src/index.ts
@@ -11,7 +11,6 @@ export * from "./geometry.js";
export {
spatialDependency,
spatialManifest, spatialMarkupSurfaces,
- spatialManifestDigest,
spatialModuleRef,
spatialProducers,
spatialSurfaceDigests,
diff --git a/packages/spatial/src/manifest.ts b/packages/spatial/src/manifest.ts
index 914c16ad..b9a2ace4 100644
--- a/packages/spatial/src/manifest.ts
+++ b/packages/spatial/src/manifest.ts
@@ -1,7 +1,5 @@
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef, TypeRef } from "@narratage/protocol";
-
-import { spatialImplementationDigests, spatialValidatorDigests } from "./geometry.js";
import {
anchoredFrameProgramSchema,
aspectFrameProgramSchema,
@@ -50,41 +48,40 @@ const validator = (digest: ReturnType<typeof digestOf>) => ({
});
export const spatialMarkupSurfaces = [
- { name: "canvas", tag: "Canvas", mode: "structured", outputs: [spatialTypes.canvas], implementation: { digest: spatialSurfaceDigests.canvas } },
- { name: "point", tag: "Point", mode: "structured", outputs: [spatialTypes.point], implementation: { digest: spatialSurfaceDigests.point } },
- { name: "path", tag: "Path", mode: "structured", outputs: [spatialTypes.path], implementation: { digest: spatialSurfaceDigests.path } },
- { name: "extent", tag: "Extent", mode: "structured", outputs: [spatialTypes.extent], implementation: { digest: spatialSurfaceDigests.extent } },
- { name: "frame", tag: "Frame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.frameEdgesProgram], implementation: { digest: spatialSurfaceDigests.frame } },
- { name: "anchored-frame", tag: "AnchoredFrame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.anchoredFrameProgram], implementation: { digest: spatialSurfaceDigests.anchoredFrame } },
- { name: "aspect-frame", tag: "AspectFrame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.extent, spatialTypes.aspectFrameProgram], implementation: { digest: spatialSurfaceDigests.aspectFrame } },
+ { name: "canvas", tag: "Canvas", mode: "structured", outputs: [spatialTypes.canvas] },
+ { name: "point", tag: "Point", mode: "structured", outputs: [spatialTypes.point] },
+ { name: "path", tag: "Path", mode: "structured", outputs: [spatialTypes.path] },
+ { name: "extent", tag: "Extent", mode: "structured", outputs: [spatialTypes.extent] },
+ { name: "frame", tag: "Frame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.frameEdgesProgram] },
+ { name: "anchored-frame", tag: "AnchoredFrame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.anchoredFrameProgram] },
+ { name: "aspect-frame", tag: "AspectFrame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.extent, spatialTypes.aspectFrameProgram] },
] as const;
export const spatialManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: spatialModuleRef.name,
version: spatialModuleRef.version,
dependencies: [],
types: [
- { name: spatialTypes.canvas.name, schema: canvasSpaceSchema, validator: validator(spatialValidatorDigests.canvas) },
- { name: spatialTypes.point.name, schema: spatialPointSchema, validator: validator(spatialValidatorDigests.point) },
- { name: spatialTypes.frame.name, schema: spatialFrameSchema, validator: validator(spatialValidatorDigests.frame) },
- { name: spatialTypes.path.name, schema: spatialPathSchema, validator: validator(spatialValidatorDigests.path) },
- { name: spatialTypes.extent.name, schema: intrinsicExtentSchema, validator: validator(spatialValidatorDigests.extent) },
- { name: spatialTypes.fit.name, schema: contentFitSchema, validator: validator(spatialValidatorDigests.fit) },
- { name: spatialTypes.fitted.name, schema: fittedContentSchema, validator: validator(spatialValidatorDigests.fitted) },
- { name: spatialTypes.frameEdgesProgram.name, schema: frameEdgesProgramSchema },
- { name: spatialTypes.anchoredFrameProgram.name, schema: anchoredFrameProgramSchema },
- { name: spatialTypes.aspectFrameProgram.name, schema: aspectFrameProgramSchema },
+ { name: spatialTypes.canvas.name },
+ { name: spatialTypes.point.name },
+ { name: spatialTypes.frame.name },
+ { name: spatialTypes.path.name },
+ { name: spatialTypes.extent.name },
+ { name: spatialTypes.fit.name },
+ { name: spatialTypes.fitted.name },
+ { name: spatialTypes.frameEdgesProgram.name },
+ { name: spatialTypes.anchoredFrameProgram.name },
+ { name: spatialTypes.aspectFrameProgram.name },
],
capabilities: [],
producers: [
- { name: spatialProducers.canvasFrame.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [], implementation: { digest: spatialImplementationDigests.canvasFrame } },
- { name: spatialProducers.frameEdges.name, inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "program", type: spatialTypes.frameEdgesProgram }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [], implementation: { digest: spatialImplementationDigests.frameEdges } },
- { name: spatialProducers.anchoredFrame.name, inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "program", type: spatialTypes.anchoredFrameProgram }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [], implementation: { digest: spatialImplementationDigests.anchoredFrame } },
- { name: spatialProducers.aspectFrame.name, inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "extent", type: spatialTypes.extent }, { name: "program", type: spatialTypes.aspectFrameProgram }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [], implementation: { digest: spatialImplementationDigests.aspectFrame } },
- { name: spatialProducers.fitContent.name, inputs: [{ name: "frame", type: spatialTypes.frame }, { name: "extent", type: spatialTypes.extent }, { name: "fit", type: spatialTypes.fit }], outputs: [{ name: "fitted", type: spatialTypes.fitted }], needs: [], implementation: { digest: spatialImplementationDigests.fitContent } },
+ { name: spatialProducers.canvasFrame.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [] },
+ { name: spatialProducers.frameEdges.name, inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "program", type: spatialTypes.frameEdgesProgram }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [] },
+ { name: spatialProducers.anchoredFrame.name, inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "program", type: spatialTypes.anchoredFrameProgram }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [] },
+ { name: spatialProducers.aspectFrame.name, inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "extent", type: spatialTypes.extent }, { name: "program", type: spatialTypes.aspectFrameProgram }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [] },
+ { name: spatialProducers.fitContent.name, inputs: [{ name: "frame", type: spatialTypes.frame }, { name: "extent", type: spatialTypes.extent }, { name: "fit", type: spatialTypes.fit }], outputs: [{ name: "fitted", type: spatialTypes.fitted }], needs: [] },
],
};
-export const spatialManifestDigest = digestOf(spatialManifest);
-export const spatialDependency = { module: spatialModuleRef, digest: spatialManifestDigest } as const;
+export const spatialDependency = { module: spatialModuleRef } as const;
diff --git a/packages/speech-alignment/package.json b/packages/speech-alignment/package.json
index 6c09b51d..dbb40de4 100644
--- a/packages/speech-alignment/package.json
+++ b/packages/speech-alignment/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/speech-alignment/src/activation.ts b/packages/speech-alignment/src/activation.ts
index 43f0f70b..11cae6d1 100644
--- a/packages/speech-alignment/src/activation.ts
+++ b/packages/speech-alignment/src/activation.ts
@@ -1,8 +1,8 @@
import { speechAlignmentComponent, speechAlignmentManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: speechAlignmentManifest }],
components: [speechAlignmentComponent],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/speech-alignment/src/component.ts b/packages/speech-alignment/src/component.ts
index 1bb6cde7..2968f646 100644
--- a/packages/speech-alignment/src/component.ts
+++ b/packages/speech-alignment/src/component.ts
@@ -20,7 +20,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
export const speechAlignmentComponent = {
producers: [{
producer: speechAlignmentProducers.locate,
- implementationDigest: speechLocatorDigest,
handler: ({ inputs }) => ({
outputs: {
map: {
diff --git a/packages/speech-alignment/src/manifest.ts b/packages/speech-alignment/src/manifest.ts
index 25bddf25..b25e8aa3 100644
--- a/packages/speech-alignment/src/manifest.ts
+++ b/packages/speech-alignment/src/manifest.ts
@@ -12,7 +12,7 @@ export const speechAlignmentProducers = {
} satisfies Record<string, ProducerRef>;
export const speechAlignmentManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: speechAlignmentModuleRef.name,
version: speechAlignmentModuleRef.version,
dependencies: [
@@ -32,8 +32,5 @@ export const speechAlignmentManifest: ModuleManifest = {
],
outputs: [{ name: "map", type: semanticMapTypes.complete }],
needs: [],
- implementation: {
- digest: speechLocatorDigest,
- },
}],
};
diff --git a/packages/speech-basis/README.md b/packages/speech-basis/README.md
index 6729ea7d..3467c83f 100644
--- a/packages/speech-basis/README.md
+++ b/packages/speech-basis/README.md
@@ -13,8 +13,8 @@ Operation. Selecting an Existing `SpeechBasis` stops generation and leaves both
selecting only an Existing visual Candidate does not change the independent audio path.
`speechBasisComponent` enumerates all four Producer facets. Their identities are checked against the
-static `speechBasisManifest`, enter the installed implementation package lock, and can be activated by
-any compatible compute Host without a Driver or Runtime source change. The component has no Provider,
+static `speechBasisManifest` and can be activated by any compatible compute Host selected by Source
+imports without a Driver or Runtime source change. The component has no Provider,
Artifact access, queue or credentials.
The package intentionally publishes no Type validators: it does not own any of its input or output
diff --git a/packages/speech-basis/package.json b/packages/speech-basis/package.json
index 9212f4fc..9a9b2eb7 100644
--- a/packages/speech-basis/package.json
+++ b/packages/speech-basis/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/speech-basis/src/activation.ts b/packages/speech-basis/src/activation.ts
index b2fb753a..b4ef8024 100644
--- a/packages/speech-basis/src/activation.ts
+++ b/packages/speech-basis/src/activation.ts
@@ -1,8 +1,8 @@
import { speechBasisComponent, speechBasisManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: speechBasisManifest }],
components: [speechBasisComponent],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/speech-basis/src/component.ts b/packages/speech-basis/src/component.ts
index ccd37066..b0842a99 100644
--- a/packages/speech-basis/src/component.ts
+++ b/packages/speech-basis/src/component.ts
@@ -6,16 +6,7 @@ import { canonicalize } from "@narratage/protocol";
import {
speechBasisProducers,
} from "./manifest.js";
-import {
- projectSpeechAudio,
- projectSpeechAudioImplementationDigest,
- projectSpeechAudioTrack,
- projectSpeechAudioTrackImplementationDigest,
- projectSpeechProgramSpace,
- projectSpeechProgramSpaceImplementationDigest,
- projectSpeechVisual,
- projectSpeechVisualImplementationDigest,
-} from "./projection.js";
+import { projectSpeechAudio, projectSpeechAudioTrack, projectSpeechProgramSpace, projectSpeechVisual } from "./projection.js";
function speechBasis(value: StoredValue | undefined): SpeechBasis {
if (value?.kind !== "inline") throw new Error("SpeechBasis must be inline");
@@ -27,7 +18,6 @@ export const speechBasisComponent = {
producers: [
{
producer: speechBasisProducers.projectProgramSpace,
- implementationDigest: projectSpeechProgramSpaceImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
programSpace: {
@@ -40,7 +30,6 @@ export const speechBasisComponent = {
},
{
producer: speechBasisProducers.projectAudio,
- implementationDigest: projectSpeechAudioImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
audio: {
@@ -53,7 +42,6 @@ export const speechBasisComponent = {
},
{
producer: speechBasisProducers.projectVisual,
- implementationDigest: projectSpeechVisualImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
visual: {
@@ -66,7 +54,6 @@ export const speechBasisComponent = {
},
{
producer: speechBasisProducers.projectAudioTrack,
- implementationDigest: projectSpeechAudioTrackImplementationDigest,
handler: ({ inputs }) => ({
outputs: {
track: {
diff --git a/packages/speech-basis/src/index.ts b/packages/speech-basis/src/index.ts
index 2d78ec29..d249b951 100644
--- a/packages/speech-basis/src/index.ts
+++ b/packages/speech-basis/src/index.ts
@@ -2,17 +2,7 @@ export { speechBasisComponent } from "./component.js";
export { speechBasisProjectionFragment } from "./fragment.js";
export {
speechBasisManifest,
- speechBasisManifestDigest,
speechBasisModuleRef,
speechBasisProducers,
} from "./manifest.js";
-export {
- projectSpeechAudio,
- projectSpeechAudioImplementationDigest,
- projectSpeechAudioTrack,
- projectSpeechAudioTrackImplementationDigest,
- projectSpeechProgramSpace,
- projectSpeechProgramSpaceImplementationDigest,
- projectSpeechVisual,
- projectSpeechVisualImplementationDigest,
-} from "./projection.js";
+export { projectSpeechAudio, projectSpeechAudioTrack, projectSpeechProgramSpace, projectSpeechVisual } from "./projection.js";
diff --git a/packages/speech-basis/src/manifest.ts b/packages/speech-basis/src/manifest.ts
index 8d8e3ffd..839203ee 100644
--- a/packages/speech-basis/src/manifest.ts
+++ b/packages/speech-basis/src/manifest.ts
@@ -4,13 +4,6 @@ import { compositionDependency, compositionTypes } from "@narratage/composition"
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef } from "@narratage/protocol";
-import {
- projectSpeechAudioImplementationDigest,
- projectSpeechAudioTrackImplementationDigest,
- projectSpeechProgramSpaceImplementationDigest,
- projectSpeechVisualImplementationDigest,
-} from "./projection.js";
-
export const speechBasisModuleRef = { name: "@narratage/speech-basis", version: "1" } as const;
export const speechBasisProducers = {
@@ -21,7 +14,7 @@ export const speechBasisProducers = {
} satisfies Record<string, ProducerRef>;
export const speechBasisManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: speechBasisModuleRef.name,
version: speechBasisModuleRef.version,
dependencies: [
@@ -37,38 +30,24 @@ export const speechBasisManifest: ModuleManifest = {
inputs: [{ name: "basis", type: speechTypes.basis }],
outputs: [{ name: "programSpace", type: programSpaceTypes.programSpace }],
needs: [],
- implementation: {
- digest: projectSpeechProgramSpaceImplementationDigest,
- },
},
{
name: speechBasisProducers.projectAudio.name,
inputs: [{ name: "basis", type: speechTypes.basis }],
outputs: [{ name: "audio", type: speechTypes.audioBasis }],
needs: [],
- implementation: {
- digest: projectSpeechAudioImplementationDigest,
- },
},
{
name: speechBasisProducers.projectVisual.name,
inputs: [{ name: "basis", type: speechTypes.basis }],
outputs: [{ name: "visual", type: compositionTypes.visualTrack }],
needs: [],
- implementation: {
- digest: projectSpeechVisualImplementationDigest,
- },
},
{
name: speechBasisProducers.projectAudioTrack.name,
inputs: [{ name: "basis", type: speechTypes.basis }],
outputs: [{ name: "track", type: compositionTypes.audioTrack }],
needs: [],
- implementation: {
- digest: projectSpeechAudioTrackImplementationDigest,
- },
},
],
};
-
-export const speechBasisManifestDigest = digestOf(speechBasisManifest);
diff --git a/packages/speech-basis/src/projection.ts b/packages/speech-basis/src/projection.ts
index 04803098..570447dc 100644
--- a/packages/speech-basis/src/projection.ts
+++ b/packages/speech-basis/src/projection.ts
@@ -7,22 +7,6 @@ import { sealAudioTrack, sealVisualTrack } from "@narratage/composition";
import type { AudioTrack, VisualTrack } from "@narratage/composition";
import { digestOf } from "@narratage/protocol";
-export const projectSpeechAudioImplementationDigest = digestOf(
- "@narratage/speech-basis/project-audio@1",
-);
-
-export const projectSpeechVisualImplementationDigest = digestOf(
- "@narratage/speech-basis/project-visual@1",
-);
-
-export const projectSpeechAudioTrackImplementationDigest = digestOf(
- "@narratage/speech-basis/project-audio-track@1",
-);
-
-export const projectSpeechProgramSpaceImplementationDigest = digestOf(
- "@narratage/speech-basis/project-program-space@1",
-);
-
export function projectSpeechProgramSpace(basis: SpeechBasis): ProgramSpace {
assertSpeechBasisIdentity(basis);
return basis.programSpace;
@@ -45,7 +29,7 @@ export function projectSpeechVisual(basis: SpeechBasis): VisualTrack {
endFrameExclusive: segment.endFrameExclusive,
}]));
return sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: trackId,
presents: lowerRestrictedSpeechVisualPresents(
trackId,
diff --git a/packages/speech-basis/test/product.test.ts b/packages/speech-basis/test/product.test.ts
index 7ce972b8..ee7d8e25 100644
--- a/packages/speech-basis/test/product.test.ts
+++ b/packages/speech-basis/test/product.test.ts
@@ -44,23 +44,19 @@ import { mediaTrackManifest } from "@narratage/media-track";
const testModule = { name: "example.speech-basis-product", version: "0.0.0" } as const;
const requestType = { module: testModule, name: "SpeechRequest" } satisfies TypeRef;
const generateProducer = { module: testModule, name: "generate-speech-basis" } satisfies ProducerRef;
-const generateImplementationDigest = digestOf("example.speech-basis-product/generate@1");
const testManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: testModule.name,
version: testModule.version,
dependencies: [speechDependency],
- types: [{ name: requestType.name, schema: { kind: "string", minLength: 1 } }],
+ types: [{ name: requestType.name }],
capabilities: [],
producers: [{
name: generateProducer.name,
inputs: [{ name: "request", type: requestType }],
outputs: [{ name: "take", type: speechTypes.basis }],
needs: [],
- implementation: {
- digest: generateImplementationDigest,
- },
}],
};
@@ -313,7 +309,7 @@ test("selecting an Existing SpeechBasis stops generation but keeps both projecti
test("the Build Machine executes one shared generation for both projected outputs", async () => {
let generations = 0;
const registry = new ProducerRegistry();
- registry.registerProducer(generateProducer, generateImplementationDigest, () => {
+ registry.registerProducer(generateProducer, () => {
generations += 1;
return { outputs: { take: { kind: "inline", value: sampleTake() } }, needs: {} };
});
diff --git a/packages/speech-evidence/package.json b/packages/speech-evidence/package.json
index 0686f915..8e7f965d 100644
--- a/packages/speech-evidence/package.json
+++ b/packages/speech-evidence/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/speech-evidence/src/activation.ts b/packages/speech-evidence/src/activation.ts
index 2e223f27..a8afe29a 100644
--- a/packages/speech-evidence/src/activation.ts
+++ b/packages/speech-evidence/src/activation.ts
@@ -1,3 +1,3 @@
import { speechEvidenceManifest } from "./index.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: speechEvidenceManifest }] };
-export default svmlPackage;
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: speechEvidenceManifest }] };
+export default narratagePackage;
diff --git a/packages/speech-evidence/src/index.ts b/packages/speech-evidence/src/index.ts
index aefbc338..987714de 100644
--- a/packages/speech-evidence/src/index.ts
+++ b/packages/speech-evidence/src/index.ts
@@ -86,18 +86,16 @@ export const speechEvidenceTypes = {
alignedTranscript: { module: speechEvidenceModuleRef, name: "AlignedTranscriptEvidence" },
} satisfies Record<string, TypeRef>;
export const speechEvidenceManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: speechEvidenceModuleRef.name,
version: speechEvidenceModuleRef.version,
dependencies: [],
- types: [{ name: speechEvidenceTypes.alignedTranscript.name, schema: alignedTranscriptEvidenceSchema }],
+ types: [{ name: speechEvidenceTypes.alignedTranscript.name }],
capabilities: [],
producers: [],
};
-export const speechEvidenceManifestDigest = digestOf(speechEvidenceManifest);
export const speechEvidenceDependency = {
module: speechEvidenceModuleRef,
- digest: speechEvidenceManifestDigest,
} as const;
export function sealAlignedTranscriptEvidence(value: AlignedTranscriptEvidence): AlignedTranscriptEvidence {
diff --git a/packages/speech-spine/package.json b/packages/speech-spine/package.json
index 24202b2a..4ca48606 100644
--- a/packages/speech-spine/package.json
+++ b/packages/speech-spine/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/speech-spine/src/activation.ts b/packages/speech-spine/src/activation.ts
index 96f512ec..eb6eb48d 100644
--- a/packages/speech-spine/src/activation.ts
+++ b/packages/speech-spine/src/activation.ts
@@ -5,8 +5,8 @@ import {
speechSpineMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{
manifest: speechSpineManifest,
}],
@@ -16,4 +16,4 @@ export const svmlPackage = {
declaration: speechSpineMarkupSurfaces.find((item) => item.name === "spine")!, handler: decodeSpeechSpineSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/speech-spine/src/component.ts b/packages/speech-spine/src/component.ts
index 1d5132c8..b59003ac 100644
--- a/packages/speech-spine/src/component.ts
+++ b/packages/speech-spine/src/component.ts
@@ -6,18 +6,7 @@ import { canonicalize } from "@narratage/protocol";
import type { ContentFit, SpatialFrame } from "@narratage/spatial";
import { speechSpineProducers } from "./manifest.js";
-import {
- appendSpeechSpineAudioTake,
- appendSpeechSpineAudioTakeImplementationDigest,
- appendSpeechSpineVisualTake,
- appendSpeechSpineVisualTakeImplementationDigest,
- assembleSpeechBasis,
- assembleSpeechBasisImplementationDigest,
- compileSpeechSpineAudio,
- compileSpeechSpineAudioImplementationDigest,
- createSpeechSpineSet,
- createSpeechSpineSetImplementationDigest,
-} from "./program.js";
+import { appendSpeechSpineAudioTake, appendSpeechSpineVisualTake, assembleSpeechBasis, compileSpeechSpineAudio, createSpeechSpineSet } from "./program.js";
import type { SpeechSpineProgram, SpeechSpineSet, SpeechSpineVisualSpec } from "./types.js";
function inline<T>(value: StoredValue | undefined, subject: string): T {
@@ -29,7 +18,6 @@ export const speechSpineComponent = {
producers: [
{
producer: speechSpineProducers.createSet,
- implementationDigest: createSpeechSpineSetImplementationDigest,
handler: () => ({
outputs: { set: { kind: "inline", value: canonicalize(createSpeechSpineSet()) } },
needs: {},
@@ -37,7 +25,6 @@ export const speechSpineComponent = {
},
{
producer: speechSpineProducers.appendAudioTake,
- implementationDigest: appendSpeechSpineAudioTakeImplementationDigest,
handler: ({ inputs }) => ({
outputs: { set: { kind: "inline", value: canonicalize(appendSpeechSpineAudioTake(
inline<SpeechSpineSet>(inputs.set?.value, "SpeechSpineSet"),
@@ -50,7 +37,6 @@ export const speechSpineComponent = {
},
{
producer: speechSpineProducers.appendVisualTake,
- implementationDigest: appendSpeechSpineVisualTakeImplementationDigest,
handler: ({ inputs }) => ({
outputs: { set: { kind: "inline", value: canonicalize(appendSpeechSpineVisualTake(
inline<SpeechSpineSet>(inputs.set?.value, "SpeechSpineSet"),
@@ -66,7 +52,6 @@ export const speechSpineComponent = {
},
{
producer: speechSpineProducers.compileAudio,
- implementationDigest: compileSpeechSpineAudioImplementationDigest,
handler: ({ inputs }) => ({
outputs: { plan: { kind: "inline", value: canonicalize(compileSpeechSpineAudio(
inline<SpeechSpineProgram>(inputs.program?.value, "SpeechSpineProgram"),
@@ -77,7 +62,6 @@ export const speechSpineComponent = {
},
{
producer: speechSpineProducers.assembleBasis,
- implementationDigest: assembleSpeechBasisImplementationDigest,
handler: ({ inputs }) => ({
outputs: { basis: { kind: "inline", value: canonicalize(assembleSpeechBasis(
inline<SpeechSpineProgram>(inputs.program?.value, "SpeechSpineProgram"),
diff --git a/packages/speech-spine/src/index.ts b/packages/speech-spine/src/index.ts
index 3d33bca1..f04a947b 100644
--- a/packages/speech-spine/src/index.ts
+++ b/packages/speech-spine/src/index.ts
@@ -1,33 +1,7 @@
/** Official Speech Spine authoring and deterministic basis assembly. */
export { speechSpineComponent } from "./component.js";
export { createSpeechSpineFragment } from "./fragment.js";
-export {
- speechSpineManifest, speechSpineMarkupSurfaces,
- speechSpineManifestDigest,
- speechSpineModuleRef,
- speechSpineProducers,
- speechSpineTypes,
- speechSpineProgramSchema,
- speechSpineSetSchema,
- speechSpineVisualSpecSchema,
- speechSpineSurfaceImplementationDigest,
-} from "./manifest.js";
-export {
- appendSpeechSpineAudioTake,
- appendSpeechSpineAudioTakeImplementationDigest,
- appendSpeechSpineVisualTake,
- appendSpeechSpineVisualTakeImplementationDigest,
- assembleSpeechBasis,
- assembleSpeechBasisImplementationDigest,
- assertSpeechSpineProgram,
- assertSpeechSpineSet,
- assertSpeechSpineVisualSpec,
- compileSpeechSpineAudio,
- compileSpeechSpineAudioImplementationDigest,
- createSpeechSpineSet,
- createSpeechSpineSetImplementationDigest,
- sealSpeechSpineProgram,
- sealSpeechSpineVisualSpec,
-} from "./program.js";
+export { speechSpineManifest, speechSpineMarkupSurfaces, speechSpineModuleRef, speechSpineProducers, speechSpineTypes, speechSpineProgramSchema, speechSpineSetSchema, speechSpineVisualSpecSchema } from "./manifest.js";
+export { appendSpeechSpineAudioTake, appendSpeechSpineVisualTake, assembleSpeechBasis, assertSpeechSpineProgram, assertSpeechSpineSet, assertSpeechSpineVisualSpec, compileSpeechSpineAudio, createSpeechSpineSet, sealSpeechSpineProgram, sealSpeechSpineVisualSpec } from "./program.js";
export { decodeSpeechSpineSurface } from "./surface.js";
export type * from "./types.js";
diff --git a/packages/speech-spine/src/manifest.ts b/packages/speech-spine/src/manifest.ts
index 79d44cbd..97a9a523 100644
--- a/packages/speech-spine/src/manifest.ts
+++ b/packages/speech-spine/src/manifest.ts
@@ -20,16 +20,7 @@ import {
} from "@narratage/spatial";
import { svsManifest, svsModuleRef } from "@narratage/svs";
-import {
- appendSpeechSpineAudioTakeImplementationDigest,
- appendSpeechSpineVisualTakeImplementationDigest,
- assembleSpeechBasisImplementationDigest,
- compileSpeechSpineAudioImplementationDigest,
- createSpeechSpineSetImplementationDigest,
-} from "./program.js";
-
export const speechSpineModuleRef = { name: "@narratage/speech-spine", version: "1" } as const;
-export const speechSpineSurfaceImplementationDigest = digestOf("@narratage/speech-spine/spine-surface@1");
export const speechSpineTypes = {
spineProgram: { module: speechSpineModuleRef, name: "SpeechSpineProgram" },
spineSet: { module: speechSpineModuleRef, name: "SpeechSpineSet" },
@@ -83,14 +74,11 @@ export const speechSpineMarkupSurfaces = [{
mediaPipelineTypes.selectionRequest,
speechTypes.basis, programSpaceTypes.programSpace, speechTypes.audioBasis,
compositionTypes.visualTrack, compositionTypes.audioTrack],
- implementation: {
- digest: speechSpineSurfaceImplementationDigest,
- },
}] as const;
export const speechSpineManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: speechSpineModuleRef.name,
version: speechSpineModuleRef.version,
dependencies: [
@@ -101,14 +89,14 @@ export const speechSpineManifest: ModuleManifest = {
speechDependency,
compositionDependency,
spatialDependency,
- { module: svsModuleRef, digest: digestOf(svsManifest) },
- { module: mediaPipelineModuleRef, digest: digestOf(mediaPipelineManifest) },
- { module: speechBasisModuleRef, digest: digestOf(speechBasisManifest) },
+ { module: svsModuleRef },
+ { module: mediaPipelineModuleRef },
+ { module: speechBasisModuleRef },
],
types: [
- { name: speechSpineTypes.spineProgram.name, schema: speechSpineProgramSchema },
- { name: speechSpineTypes.spineSet.name, schema: speechSpineSetSchema },
- { name: speechSpineTypes.visualSpec.name, schema: speechSpineVisualSpecSchema },
+ { name: speechSpineTypes.spineProgram.name },
+ { name: speechSpineTypes.spineSet.name },
+ { name: speechSpineTypes.visualSpec.name },
],
capabilities: [],
producers: [
@@ -117,7 +105,6 @@ export const speechSpineManifest: ModuleManifest = {
inputs: [],
outputs: [{ name: "set", type: speechSpineTypes.spineSet }],
needs: [],
- implementation: { digest: createSpeechSpineSetImplementationDigest },
},
{
name: speechSpineProducers.appendAudioTake.name,
@@ -129,7 +116,6 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "set", type: speechSpineTypes.spineSet }],
needs: [],
- implementation: { digest: appendSpeechSpineAudioTakeImplementationDigest },
},
{
name: speechSpineProducers.appendVisualTake.name,
@@ -144,7 +130,6 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "set", type: speechSpineTypes.spineSet }],
needs: [],
- implementation: { digest: appendSpeechSpineVisualTakeImplementationDigest },
},
{
name: speechSpineProducers.compileAudio.name,
@@ -154,7 +139,6 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "plan", type: mediaPipelineTypes.audioProgramPlan }],
needs: [],
- implementation: { digest: compileSpeechSpineAudioImplementationDigest },
},
{
name: speechSpineProducers.assembleBasis.name,
@@ -165,9 +149,6 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "basis", type: speechTypes.basis }],
needs: [],
- implementation: { digest: assembleSpeechBasisImplementationDigest },
},
],
};
-
-export const speechSpineManifestDigest = digestOf(speechSpineManifest);
diff --git a/packages/speech-spine/src/program.ts b/packages/speech-spine/src/program.ts
index c9e09095..4bf274bb 100644
--- a/packages/speech-spine/src/program.ts
+++ b/packages/speech-spine/src/program.ts
@@ -21,12 +21,6 @@ import type {
SpeechSpineVisualSpec,
} from "./types.js";
-export const createSpeechSpineSetImplementationDigest = digestOf("@narratage/speech-spine/create-spine-set@1");
-export const appendSpeechSpineAudioTakeImplementationDigest = digestOf("@narratage/speech-spine/append-spine-audio-take@1");
-export const appendSpeechSpineVisualTakeImplementationDigest = digestOf("@narratage/speech-spine/append-spine-visual-take@1");
-export const compileSpeechSpineAudioImplementationDigest = digestOf("@narratage/speech-spine/compile-spine-audio@1");
-export const assembleSpeechBasisImplementationDigest = digestOf("@narratage/speech-spine/assemble-speech-basis@1");
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
diff --git a/packages/speech-spine/test/surface.test.ts b/packages/speech-spine/test/surface.test.ts
index a6c7d6db..f8d02f28 100644
--- a/packages/speech-spine/test/surface.test.ts
+++ b/packages/speech-spine/test/surface.test.ts
@@ -54,13 +54,12 @@ const fixtureModule = { name: "example.speech-media", version: "1" } as const;
const fixtureSurfaceDigest = digestOf("example.speech-media/surface@1");
const fixtureSurface = {
name: "media", tag: "Media", mode: "structured", outputs: [artifactTypes.blob, svsRecipeType],
- implementation: { digest: fixtureSurfaceDigest },
} as const;
const fixtureManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: fixtureModule.name,
version: fixtureModule.version,
- dependencies: [artifactDependency, mediaDependency, { module: svsModuleRef, digest: digestOf(svsManifest) }],
+ dependencies: [artifactDependency, mediaDependency, { module: svsModuleRef }],
types: [], capabilities: [], producers: [],
};
diff --git a/packages/speech/package.json b/packages/speech/package.json
index f2046466..19e2f588 100644
--- a/packages/speech/package.json
+++ b/packages/speech/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/speech/src/activation.ts b/packages/speech/src/activation.ts
index 651669a9..202e620c 100644
--- a/packages/speech/src/activation.ts
+++ b/packages/speech/src/activation.ts
@@ -1,3 +1,3 @@
import { speechManifest } from "./index.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: speechManifest }] };
-export default svmlPackage;
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: speechManifest }] };
+export default narratagePackage;
diff --git a/packages/speech/src/index.ts b/packages/speech/src/index.ts
index 08654b7c..57f21b2a 100644
--- a/packages/speech/src/index.ts
+++ b/packages/speech/src/index.ts
@@ -1,4 +1,4 @@
export { assertSpeechAudioBasisIdentity, assertSpeechBasisIdentity, assertSpeechDurationIdentity, assertSpeechEvidenceAudioIdentity, sealSpeechBasis, sealSpeechDuration, sealSpeechEvidenceAudio, speechEvidenceSampleBoundary } from "./identity.js";
-export { speechDependency, speechManifest, speechManifestDigest, speechModuleRef, speechTypes } from "./manifest.js";
+export { speechDependency, speechManifest, speechModuleRef, speechTypes } from "./manifest.js";
export { speechAudioBasisSchema, speechBasisSchema, speechDurationSchema, speechEvidenceAudioSchema } from "./schema.js";
export type * from "./types.js";
diff --git a/packages/speech/src/manifest.ts b/packages/speech/src/manifest.ts
index 9b8352a7..7234f2bf 100644
--- a/packages/speech/src/manifest.ts
+++ b/packages/speech/src/manifest.ts
@@ -10,10 +10,9 @@ export const speechTypes = {
duration: { module: speechModuleRef, name: "SpeechDuration" }, basis: { module: speechModuleRef, name: "SpeechBasis" },
audioBasis: { module: speechModuleRef, name: "SpeechAudioBasis" }, evidenceAudio: { module: speechModuleRef, name: "SpeechEvidenceAudio" },
} satisfies Record<string, TypeRef>;
-export const speechManifest: ModuleManifest = { format: "svml.module@1", name: speechModuleRef.name, version: speechModuleRef.version,
+export const speechManifest: ModuleManifest = { format: "narratage.module@1", name: speechModuleRef.name, version: speechModuleRef.version,
dependencies: [narrativeDependency, mediaDependency, programSpaceDependency, spatialDependency],
- types: [{ name: speechTypes.duration.name, schema: speechDurationSchema }, { name: speechTypes.basis.name, schema: speechBasisSchema },
- { name: speechTypes.audioBasis.name, schema: speechAudioBasisSchema }, { name: speechTypes.evidenceAudio.name, schema: speechEvidenceAudioSchema }],
+ types: [{ name: speechTypes.duration.name }, { name: speechTypes.basis.name },
+ { name: speechTypes.audioBasis.name }, { name: speechTypes.evidenceAudio.name }],
capabilities: [], producers: [] };
-export const speechManifestDigest = digestOf(speechManifest);
-export const speechDependency = { module: speechModuleRef, digest: speechManifestDigest } as const;
+export const speechDependency = { module: speechModuleRef } as const;
diff --git a/packages/store-sqlite/README.md b/packages/store-sqlite/README.md
index 9b62bd9a..d58aaee7 100644
--- a/packages/store-sqlite/README.md
+++ b/packages/store-sqlite/README.md
@@ -15,8 +15,8 @@ Artifacts and credentials never enter this database. The adapter owns its privat
schema `6`; Core and Endpoint packages do not import SQLite. Incompatible development databases are
rejected and recreated explicitly instead of carrying migration code before the first release.
-`createSqliteRuntimeComponentPackage()` returns one physical package with three separately selectable
-execution Components plus a Host-only `catalog` handle. They share one connection and one close
-lifecycle. The catalog is deliberately absent from the Runtime Component Manifest and Runtime
+`createSqliteRuntimeInfrastructurePackage()` returns one configured instance with three separately selectable
+parts plus a Host-only `catalog` handle. They share one connection and one close
+lifecycle. The catalog is deliberately absent from the Runtime infrastructure Manifest and Runtime
Closure; changing the Host-only catalog table therefore cannot change the identity under which an
active Build continues.
diff --git a/packages/store-sqlite/package.json b/packages/store-sqlite/package.json
index 494ffe3a..241cc4ab 100644
--- a/packages/store-sqlite/package.json
+++ b/packages/store-sqlite/package.json
@@ -10,13 +10,13 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
"@narratage/core": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-kit": "workspace:*"
}
}
diff --git a/packages/store-sqlite/src/activation.ts b/packages/store-sqlite/src/activation.ts
index d9dfd01e..1267ce35 100644
--- a/packages/store-sqlite/src/activation.ts
+++ b/packages/store-sqlite/src/activation.ts
@@ -1,13 +1,13 @@
import {
- createRuntimeComponentAdapterFacet,
+ createRuntimeInfrastructureAdapterFacet,
runtimeConfigExact,
runtimeConfigObject,
runtimeConfigPositiveInteger,
runtimeConfigString,
-} from "@narratage/runtime-adapter";
+} from "@narratage/runtime-kit";
import { resolve } from "node:path";
-const sqliteStateAdapter = createRuntimeComponentAdapterFacet({
+const sqliteStateAdapter = createRuntimeInfrastructureAdapterFacet({
use: "@narratage/store-sqlite",
validate(context) {
const config = runtimeConfigObject(context.config, "SQLite Runtime state");
@@ -19,12 +19,10 @@ const sqliteStateAdapter = createRuntimeComponentAdapterFacet({
const config = runtimeConfigObject(context.config, "SQLite Runtime state");
const path = runtimeConfigString(config.path, "SQLite path");
if (path === undefined) throw new Error("SQLite path is required");
- const { createSqliteRuntimeComponentPackage } = await import("./store.js");
- return createSqliteRuntimeComponentPackage({
+ const { createSqliteRuntimeInfrastructurePackage } = await import("./store.js");
+ return createSqliteRuntimeInfrastructurePackage({
path: resolve(context.dataRoot, path),
- buildInstance: `${context.instance}.builds`,
- operationInstance: `${context.instance}.operations`,
- dispatchInstance: `${context.instance}.dispatch`,
+ instance: context.instance,
...(runtimeConfigPositiveInteger(config.busyTimeoutMs, "SQLite busyTimeoutMs") === undefined
? {} : { busyTimeoutMs: config.busyTimeoutMs as number }),
...(context.access === "read-only" ? { readOnly: true } : {}),
@@ -32,9 +30,9 @@ const sqliteStateAdapter = createRuntimeComponentAdapterFacet({
},
});
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
hostFacets: [sqliteStateAdapter],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/store-sqlite/src/index.ts b/packages/store-sqlite/src/index.ts
index 7bee0822..aca6dc42 100644
--- a/packages/store-sqlite/src/index.ts
+++ b/packages/store-sqlite/src/index.ts
@@ -1,9 +1,2 @@
-export {
- SqliteRuntimeState,
- createSqliteRuntimeComponentPackage,
- sqliteBuildStoreImplementationDigest,
- sqliteDispatchStoreImplementationDigest,
- sqliteOperationStoreImplementationDigest,
- sqliteStoreModuleRef,
-} from "./store.js";
+export { SqliteRuntimeState, createSqliteRuntimeInfrastructurePackage, sqliteStoreModuleRef } from "./store.js";
export type * from "./store.js";
diff --git a/packages/store-sqlite/src/store.ts b/packages/store-sqlite/src/store.ts
index 3bb4cc2e..f492eff5 100644
--- a/packages/store-sqlite/src/store.ts
+++ b/packages/store-sqlite/src/store.ts
@@ -12,11 +12,10 @@ import type {
Digest,
} from "@narratage/protocol";
import {
- assertRuntimeClosureAdmission,
sameBuildCatalogDescriptor,
verifyBuildCatalogDescriptor,
verifyBuildCatalogEntry,
- defineRuntimeComponentPackage,
+ defineRuntimeInfrastructurePackage,
capacityReservationId,
verifyBuildDispatchIdentity,
verifyBuildDispatchSnapshot,
@@ -51,7 +50,7 @@ import type {
OperationStore,
OperationStoreWrite,
OperationUpdate,
- RuntimeComponentPackage,
+ RuntimeInfrastructurePackage,
} from "@narratage/runtime";
const databaseSchemaVersion = 6;
@@ -61,29 +60,15 @@ export const sqliteStoreModuleRef = {
version: "1",
} as const;
-export const sqliteBuildStoreImplementationDigest = digestOf(
- "@narratage/store-sqlite/build-store@1",
-);
-
-export const sqliteOperationStoreImplementationDigest = digestOf(
- "@narratage/store-sqlite/operation-store@1",
-);
-
-export const sqliteDispatchStoreImplementationDigest = digestOf(
- "@narratage/store-sqlite/dispatch-store@1",
-);
-
export type SqliteRuntimeStateOptions = {
readonly busyTimeoutMs?: number;
/** Open an existing archive without creating files or schema. */
readonly readOnly?: boolean;
};
-export type CreateSqliteRuntimeComponentPackageOptions = SqliteRuntimeStateOptions & {
+export type CreateSqliteRuntimeInfrastructurePackageOptions = SqliteRuntimeStateOptions & {
readonly path: string;
- readonly buildInstance?: string;
- readonly operationInstance?: string;
- readonly dispatchInstance?: string;
+ readonly instance?: string;
};
type Row = Record<string, unknown>;
@@ -137,9 +122,8 @@ function operationIdentity(snapshot: OperationSnapshot): OperationIdentity {
build: snapshot.build,
command: snapshot.command,
endpoint: snapshot.endpoint,
- authority: snapshot.authority,
- route: snapshot.route,
- runtimeClosure: snapshot.runtimeClosure,
+ pool: snapshot.pool,
+ lane: snapshot.lane,
attempt: snapshot.attempt,
};
}
@@ -158,7 +142,7 @@ function parseOperationSnapshot(row: Row): OperationSnapshot {
}
: undefined;
if (row.status === "pending") {
- assert(pending?.format === "svml.operation-pending@1" && pending.checkpoint !== undefined,
+ assert(pending?.format === "narratage.operation-pending@1" && pending.checkpoint !== undefined,
"SQLite pending Operation has an unsupported checkpoint envelope");
}
const mutable = row.status === "pending"
@@ -201,7 +185,7 @@ class SqliteBuildStore implements BuildStore {
assert(build.trim().length > 0, "build id must not be empty");
const durable = durableBuildState(state);
const result = this.#database.prepare(`
- INSERT OR IGNORE INTO svml_builds (build_id, revision, state_json)
+ INSERT OR IGNORE INTO narratage_builds (build_id, revision, state_json)
VALUES (?, 0, ?)
`).run(build, canonicalStringify(durable));
if (result.changes !== 1) throw new Error(`build ${build} already exists`);
@@ -211,7 +195,7 @@ class SqliteBuildStore implements BuildStore {
async read(build: string): Promise<BuildSnapshot | undefined> {
const row = this.#database.prepare(`
SELECT build_id, revision, state_json
- FROM svml_builds
+ FROM narratage_builds
WHERE build_id = ?
`).get(build) as Row | undefined;
return row === undefined ? undefined : parseBuildSnapshot(row);
@@ -220,7 +204,7 @@ class SqliteBuildStore implements BuildStore {
async list(): Promise<readonly BuildSnapshot[]> {
const rows = this.#database.prepare(`
SELECT build_id, revision, state_json
- FROM svml_builds
+ FROM narratage_builds
ORDER BY build_id ASC
`).all() as Row[];
return rows.map(parseBuildSnapshot);
@@ -234,7 +218,7 @@ class SqliteBuildStore implements BuildStore {
assert(Number.isSafeInteger(expectedRevision) && expectedRevision >= 0, "expected revision is invalid");
const durable = durableBuildState(state);
const result = this.#database.prepare(`
- UPDATE svml_builds
+ UPDATE narratage_builds
SET revision = ?, state_json = ?
WHERE build_id = ? AND revision = ?
`).run(expectedRevision + 1, canonicalStringify(durable), build, expectedRevision);
@@ -284,7 +268,7 @@ class SqliteBuildCatalog implements BuildCatalog {
}
const now = Date.now();
this.#database.prepare(`
- INSERT OR IGNORE INTO svml_build_catalog (
+ INSERT OR IGNORE INTO narratage_build_catalog (
build_id, core_id, created_at, updated_at, descriptor_json
) VALUES (?, ?, ?, ?, ?)
`).run(build, descriptor.core, now, now, canonicalStringify(descriptor));
@@ -298,7 +282,7 @@ class SqliteBuildCatalog implements BuildCatalog {
async read(build: string): Promise<BuildCatalogEntry | undefined> {
const row = this.#database.prepare(`
SELECT build_id, created_at, updated_at, descriptor_json
- FROM svml_build_catalog
+ FROM narratage_build_catalog
WHERE build_id = ?
`).get(build) as Row | undefined;
return row === undefined ? undefined : parseCatalogEntry(row);
@@ -307,7 +291,7 @@ class SqliteBuildCatalog implements BuildCatalog {
async list(): Promise<readonly BuildCatalogEntry[]> {
const rows = this.#database.prepare(`
SELECT build_id, created_at, updated_at, descriptor_json
- FROM svml_build_catalog
+ FROM narratage_build_catalog
ORDER BY created_at DESC, build_id ASC
`).all() as Row[];
return rows.map(parseCatalogEntry);
@@ -324,7 +308,7 @@ class SqliteOperationStore implements OperationStore {
async create(identity: OperationIdentity): Promise<OperationCreate> {
verifyOperationIdentity(identity);
const result = this.#database.prepare(`
- INSERT OR IGNORE INTO svml_operations (
+ INSERT OR IGNORE INTO narratage_operations (
operation_id, revision, status, identity_json,
checkpoint_json, completion_json, failure_json, cancellation_json
) VALUES (?, 0, 'created', ?, NULL, NULL, NULL, NULL)
@@ -345,7 +329,7 @@ class SqliteOperationStore implements OperationStore {
async read(id: Digest): Promise<OperationSnapshot | undefined> {
const row = this.#database.prepare(`
SELECT identity_json, revision, status, checkpoint_json, completion_json, failure_json, cancellation_json
- FROM svml_operations
+ FROM narratage_operations
WHERE operation_id = ?
`).get(id) as Row | undefined;
return row === undefined ? undefined : parseOperationSnapshot(row);
@@ -358,9 +342,8 @@ class SqliteOperationStore implements OperationStore {
["build", query.build],
["command", query.command],
["endpoint", query.endpoint],
- ["authority", query.authority],
- ["route", query.route],
- ["runtimeClosure", query.runtimeClosure],
+ ["pool", query.pool],
+ ["lane", query.lane],
] as const) {
if (value === undefined) continue;
predicates.push(`json_extract(identity_json, '$.${field}') = ?`);
@@ -368,7 +351,7 @@ class SqliteOperationStore implements OperationStore {
}
const rows = this.#database.prepare(`
SELECT identity_json, revision, status, checkpoint_json, completion_json, failure_json, cancellation_json
- FROM svml_operations
+ FROM narratage_operations
${predicates.length === 0 ? "" : `WHERE ${predicates.join(" AND ")}`}
ORDER BY operation_id ASC
`).all(...values) as Row[];
@@ -391,7 +374,7 @@ class SqliteOperationStore implements OperationStore {
}
if (update.status === "control") {
const result = this.#database.prepare(`
- UPDATE svml_operations
+ UPDATE narratage_operations
SET revision = ?, cancellation_json = ?
WHERE operation_id = ? AND revision = ?
`).run(expectedRevision + 1, canonicalStringify(update.cancellation), id, expectedRevision);
@@ -405,7 +388,7 @@ class SqliteOperationStore implements OperationStore {
return { status: "stored", snapshot: stored };
}
const checkpoint = update.status === "pending" ? canonicalStringify({
- format: "svml.operation-pending@1",
+ format: "narratage.operation-pending@1",
checkpoint: update.checkpoint,
...(update.wakeAt === undefined ? {} : { wakeAt: update.wakeAt }),
...(update.progress === undefined ? {} : { progress: update.progress }),
@@ -418,7 +401,7 @@ class SqliteOperationStore implements OperationStore {
? canonicalStringify(update.cancellation)
: current.cancellation === undefined ? null : canonicalStringify(current.cancellation);
const result = this.#database.prepare(`
- UPDATE svml_operations
+ UPDATE narratage_operations
SET revision = ?, status = ?, checkpoint_json = ?, completion_json = ?, failure_json = ?, cancellation_json = ?
WHERE operation_id = ? AND revision = ? AND status NOT IN ('completed', 'failed', 'cancelled')
`).run(expectedRevision + 1, update.status, checkpoint, completion, failure, cancellation, id, expectedRevision);
@@ -502,7 +485,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
const availableAt = nonNegativeInteger(options.availableAt ?? now, "Dispatch availableAt");
return transaction(this.#database, () => {
const existingRow = this.#database.prepare(
- "SELECT * FROM svml_dispatches WHERE build_id = ?",
+ "SELECT * FROM narratage_dispatches WHERE build_id = ?",
).get(identity.build) as Row | undefined;
if (existingRow !== undefined) {
const existing = parseDispatchSnapshot(existingRow);
@@ -511,22 +494,14 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
id: existing.id,
build: existing.build,
core: existing.core,
- runtimeClosure: existing.runtimeClosure,
+ implementationPackages: existing.implementationPackages,
}) === canonicalStringify(identity),
- `Dispatch ${identity.build} already names another Build or Runtime Closure`);
+ `Dispatch ${identity.build} already names another Build`);
return { status: "existing", snapshot: existing };
}
- const conflictingRows = this.#database.prepare(`
- SELECT * FROM svml_dispatches
- WHERE phase != 'terminal'
- AND json_extract(identity_json, '$.runtimeClosure') != ?
- ORDER BY created_at ASC, build_id ASC
- `).all(identity.runtimeClosure) as Row[];
- assertRuntimeClosureAdmission(identity.runtimeClosure, conflictingRows.map(parseDispatchSnapshot));
-
const result = this.#database.prepare(`
- INSERT INTO svml_dispatches (
+ INSERT INTO narratage_dispatches (
build_id, identity_json, revision, created_at, updated_at, priority, available_at,
admission, phase, lease_owner, lease_token, lease_fence, lease_expires_at,
reason, cancel_requested_at, cancel_reason, terminal
@@ -534,7 +509,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
`).run(identity.build, canonicalStringify(identity), now, now, priority, availableAt);
assert(result.changes === 1, `Dispatch ${identity.build} was not created`);
const createdRow = this.#database.prepare(
- "SELECT * FROM svml_dispatches WHERE build_id = ?",
+ "SELECT * FROM narratage_dispatches WHERE build_id = ?",
).get(identity.build) as Row | undefined;
if (createdRow === undefined) throw new Error(`Dispatch ${identity.build} disappeared after create`);
return { status: "created", snapshot: parseDispatchSnapshot(createdRow) };
@@ -542,7 +517,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
}
async read(build: string): Promise<BuildDispatchSnapshot | undefined> {
- const row = this.#database.prepare("SELECT * FROM svml_dispatches WHERE build_id = ?").get(build) as Row | undefined;
+ const row = this.#database.prepare("SELECT * FROM narratage_dispatches WHERE build_id = ?").get(build) as Row | undefined;
return row === undefined ? undefined : parseDispatchSnapshot(row);
}
@@ -559,7 +534,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
values.push(query.admission);
}
const rows = this.#database.prepare(`
- SELECT * FROM svml_dispatches
+ SELECT * FROM narratage_dispatches
${predicates.length === 0 ? "" : `WHERE ${predicates.join(" AND ")}`}
ORDER BY priority DESC, available_at ASC, created_at ASC, build_id ASC
`).all(...values) as Row[];
@@ -568,32 +543,30 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
async claim(request: BuildDispatchClaim): Promise<BuildDispatchSnapshot | undefined> {
assert(request.owner.trim().length > 0 && request.token.trim().length > 0, "Dispatch claim identity is empty");
- assert(/^sha256:[0-9a-f]{64}$/u.test(request.runtimeClosure), "Dispatch claim Runtime Closure is invalid");
const now = nonNegativeInteger(request.now, "Dispatch claim time");
const leaseMs = positiveInteger(request.leaseMs, "Dispatch leaseMs");
return transaction(this.#database, () => {
const row = this.#database.prepare(`
- SELECT * FROM svml_dispatches
+ SELECT * FROM narratage_dispatches
WHERE phase != 'terminal'
- AND json_extract(identity_json, '$.runtimeClosure') = ?
AND available_at <= ?
AND (lease_owner IS NULL OR lease_expires_at <= ?)
ORDER BY priority DESC, available_at ASC, created_at ASC, build_id ASC
LIMIT 1
- `).get(request.runtimeClosure, now, now) as Row | undefined;
+ `).get(now, now) as Row | undefined;
if (row === undefined) return undefined;
assert(typeof row.build_id === "string" && typeof row.revision === "number" && typeof row.lease_fence === "number",
"SQLite Dispatch claim row is invalid");
const fence = row.lease_fence + 1;
const updated = this.#database.prepare(`
- UPDATE svml_dispatches
+ UPDATE narratage_dispatches
SET revision = revision + 1, updated_at = ?, phase = 'leased',
lease_owner = ?, lease_token = ?, lease_fence = ?, lease_expires_at = ?
WHERE build_id = ? AND revision = ?
AND phase != 'terminal' AND (lease_owner IS NULL OR lease_expires_at <= ?)
`).run(now, request.owner, request.token, fence, now + leaseMs, row.build_id, row.revision, now);
assert(updated.changes === 1, `Dispatch ${row.build_id} claim lost its transaction`);
- const claimed = this.#database.prepare("SELECT * FROM svml_dispatches WHERE build_id = ?").get(row.build_id) as Row;
+ const claimed = this.#database.prepare("SELECT * FROM narratage_dispatches WHERE build_id = ?").get(row.build_id) as Row;
return parseDispatchSnapshot(claimed);
});
}
@@ -603,7 +576,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
nonNegativeInteger(now, "Dispatch heartbeat time");
positiveInteger(leaseMs, "Dispatch heartbeat leaseMs");
const updated = this.#database.prepare(`
- UPDATE svml_dispatches
+ UPDATE narratage_dispatches
SET revision = revision + 1, updated_at = ?, lease_expires_at = ?
WHERE build_id = ? AND phase = 'leased'
AND lease_owner = ? AND lease_token = ? AND lease_fence = ? AND lease_expires_at > ?
@@ -622,7 +595,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
nonNegativeInteger(now, "Dispatch release time");
nonNegativeInteger(update.availableAt, "Dispatch release availableAt");
const updated = this.#database.prepare(`
- UPDATE svml_dispatches
+ UPDATE narratage_dispatches
SET revision = revision + 1, updated_at = ?, phase = ?,
available_at = CASE WHEN wake_at IS NULL THEN ? ELSE MIN(?, wake_at) END,
wake_at = NULL, reason = ?,
@@ -644,7 +617,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
): Promise<BuildDispatchSnapshot> {
verifyDispatchLease(lease);
const updated = this.#database.prepare(`
- UPDATE svml_dispatches
+ UPDATE narratage_dispatches
SET revision = revision + 1, updated_at = ?, phase = 'terminal', admission = 'closed',
terminal = ?, reason = ?, wake_at = NULL,
lease_owner = NULL, lease_token = NULL, lease_expires_at = NULL
@@ -659,7 +632,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
nonNegativeInteger(now, "cancellation request time");
return transaction(this.#database, () => {
const row = this.#database.prepare(
- "SELECT * FROM svml_dispatches WHERE build_id = ?",
+ "SELECT * FROM narratage_dispatches WHERE build_id = ?",
).get(build) as Row | undefined;
if (row === undefined) throw new Error(`Dispatch ${build} does not exist`);
const current = parseDispatchSnapshot(row);
@@ -670,7 +643,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
// exist. Resolve it in this same transaction so a racing claim has exactly one winner.
if (current.phase === "queued" && row.lease_fence === 0 && row.lease_owner === null) {
const updated = this.#database.prepare(`
- UPDATE svml_dispatches
+ UPDATE narratage_dispatches
SET revision = revision + 1, updated_at = ?, admission = 'closed', phase = 'terminal',
terminal = 'cancelled', reason = ?, cancel_requested_at = ?, cancel_reason = ?,
wake_at = NULL, lease_owner = NULL, lease_token = NULL, lease_expires_at = NULL
@@ -679,7 +652,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
assert(updated.changes === 1, `Dispatch ${build} cancellation lost its transaction`);
} else {
const updated = this.#database.prepare(`
- UPDATE svml_dispatches
+ UPDATE narratage_dispatches
SET revision = revision + 1, updated_at = ?, admission = 'closing',
cancel_requested_at = COALESCE(cancel_requested_at, ?),
cancel_reason = COALESCE(cancel_reason, ?),
@@ -690,7 +663,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
assert(updated.changes === 1, `Dispatch ${build} cancellation lost its transaction`);
}
const result = this.#database.prepare(
- "SELECT * FROM svml_dispatches WHERE build_id = ?",
+ "SELECT * FROM narratage_dispatches WHERE build_id = ?",
).get(build) as Row | undefined;
assert(result !== undefined, `Dispatch ${build} disappeared after cancellation`);
return parseDispatchSnapshot(result);
@@ -700,7 +673,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
async wake(build: string, now = Date.now()): Promise<BuildDispatchSnapshot> {
nonNegativeInteger(now, "Dispatch wake time");
const updated = this.#database.prepare(`
- UPDATE svml_dispatches
+ UPDATE narratage_dispatches
SET revision = revision + 1, updated_at = ?,
available_at = CASE WHEN phase = 'leased' THEN available_at ELSE MIN(available_at, ?) END,
wake_at = CASE WHEN phase = 'leased' THEN MIN(COALESCE(wake_at, ?), ?) ELSE wake_at END
@@ -731,29 +704,29 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
});
assert(new Set(resourceIds).size === resourceIds.length, "Capacity resources contain duplicates");
if (request.queue !== undefined) {
- assert(request.queue.authority.trim().length > 0 && request.queue.route.trim().length > 0,
- "Capacity queue authority and route are required");
+ assert(request.queue.pool.trim().length > 0 && request.queue.lane.trim().length > 0,
+ "Capacity queue pool and lane are required");
}
const resourcesJson = canonicalStringify(resources);
const queueJson = request.queue === undefined ? null : canonicalStringify(request.queue);
const id = capacityReservationId(request.build, request.command);
return transaction(this.#database, () => {
const dispatch = this.#database.prepare(`
- SELECT lease_owner, lease_token, lease_fence FROM svml_dispatches
+ SELECT lease_owner, lease_token, lease_fence FROM narratage_dispatches
WHERE build_id = ? AND phase = 'leased'
`).get(request.build) as Row | undefined;
assert(dispatch !== undefined && leaseMatches(dispatch, request.buildLease),
`Dispatch ${request.build} lease is stale`);
- let existing = this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row | undefined;
+ let existing = this.#database.prepare("SELECT * FROM narratage_capacity WHERE reservation_id = ?").get(id) as Row | undefined;
if (existing === undefined) {
this.#database.prepare(`
- INSERT INTO svml_capacity (
+ INSERT INTO narratage_capacity (
reservation_id, build_id, command_id, resources_json, queue_json, mode, in_flight,
active_owner, active_token, active_fence, active_expires_at, created_at, updated_at
) VALUES (?, ?, ?, ?, ?, ?, 0, NULL, NULL, 0, NULL, ?, ?)
`).run(id, request.build, request.command, resourcesJson, queueJson, request.mode,
request.now, request.now);
- existing = this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row;
+ existing = this.#database.prepare("SELECT * FROM narratage_capacity WHERE reservation_id = ?").get(id) as Row;
}
assert(existing.build_id === request.build && existing.command_id === request.command
&& existing.resources_json === resourcesJson && existing.queue_json === queueJson
@@ -763,12 +736,12 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
return { status: "blocked", retryAt: existing.active_expires_at, reason: "resource-active" };
}
const activeGlobal = this.#database.prepare(`
- SELECT COUNT(*) AS count FROM svml_capacity
+ SELECT COUNT(*) AS count FROM narratage_capacity
WHERE active_owner IS NOT NULL AND active_expires_at > ? AND reservation_id != ?
`).get(request.now, id) as Row;
assert(typeof activeGlobal.count === "number", "SQLite global Capacity count is invalid");
const retryAtRow = this.#database.prepare(`
- SELECT MIN(active_expires_at) AS retry_at FROM svml_capacity
+ SELECT MIN(active_expires_at) AS retry_at FROM narratage_capacity
WHERE active_owner IS NOT NULL AND active_expires_at > ?
`).get(request.now) as Row;
const retryAt = typeof retryAtRow.retry_at === "number" ? retryAtRow.retry_at : request.now + 100;
@@ -777,14 +750,14 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
for (const resource of resources) {
const active = this.#database.prepare(`
SELECT COUNT(DISTINCT capacity.reservation_id) AS count
- FROM svml_capacity AS capacity, json_each(capacity.resources_json) AS claim
+ FROM narratage_capacity AS capacity, json_each(capacity.resources_json) AS claim
WHERE json_extract(claim.value, '$.id') = ?
AND capacity.active_owner IS NOT NULL AND capacity.active_expires_at > ?
AND capacity.reservation_id != ?
`).get(resource.id, request.now, id) as Row;
const inFlight = this.#database.prepare(`
SELECT COUNT(DISTINCT capacity.reservation_id) AS count
- FROM svml_capacity AS capacity, json_each(capacity.resources_json) AS claim
+ FROM narratage_capacity AS capacity, json_each(capacity.resources_json) AS claim
WHERE json_extract(claim.value, '$.id') = ?
AND capacity.in_flight = 1 AND capacity.reservation_id != ?
`).get(resource.id, id) as Row;
@@ -799,14 +772,14 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
}
const fence = typeof existing?.active_fence === "number" ? existing.active_fence + 1 : 1;
this.#database.prepare(`
- UPDATE svml_capacity
+ UPDATE narratage_capacity
SET in_flight = MAX(in_flight, ?), active_owner = ?, active_token = ?,
active_fence = ?, active_expires_at = ?, updated_at = ?
WHERE reservation_id = ?
`).run(request.mode === "recoverable" ? 1 : 0, request.owner, request.token,
fence, request.now + request.leaseMs, request.now, id);
return { status: "acquired", reservation: parseCapacityReservation(
- this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row,
+ this.#database.prepare("SELECT * FROM narratage_capacity WHERE reservation_id = ?").get(id) as Row,
) };
});
}
@@ -814,28 +787,28 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
async heartbeatCapacity(id: Digest, lease: DispatchLease, now: number, leaseMs: number): Promise<CapacityReservation> {
verifyDispatchLease(lease, "Capacity lease");
const updated = this.#database.prepare(`
- UPDATE svml_capacity SET active_expires_at = ?, updated_at = ?
+ UPDATE narratage_capacity SET active_expires_at = ?, updated_at = ?
WHERE reservation_id = ? AND active_owner = ? AND active_token = ? AND active_fence = ? AND active_expires_at > ?
`).run(now + leaseMs, now, id, lease.owner, lease.token, lease.fence, now);
assert(updated.changes === 1, `Capacity reservation ${id} lease is stale`);
- return parseCapacityReservation(this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row);
+ return parseCapacityReservation(this.#database.prepare("SELECT * FROM narratage_capacity WHERE reservation_id = ?").get(id) as Row);
}
async parkCapacity(id: Digest, lease: DispatchLease, inFlight: boolean, now = Date.now()): Promise<CapacityReservation> {
verifyDispatchLease(lease, "Capacity lease");
const updated = this.#database.prepare(`
- UPDATE svml_capacity
+ UPDATE narratage_capacity
SET in_flight = ?, active_owner = NULL, active_token = NULL, active_expires_at = NULL, updated_at = ?
WHERE reservation_id = ? AND active_owner = ? AND active_token = ? AND active_fence = ?
`).run(inFlight ? 1 : 0, now, id, lease.owner, lease.token, lease.fence);
assert(updated.changes === 1, `Capacity reservation ${id} lease is stale`);
- return parseCapacityReservation(this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row);
+ return parseCapacityReservation(this.#database.prepare("SELECT * FROM narratage_capacity WHERE reservation_id = ?").get(id) as Row);
}
async releaseCapacity(id: Digest, lease: DispatchLease): Promise<void> {
verifyDispatchLease(lease, "Capacity lease");
const removed = this.#database.prepare(`
- DELETE FROM svml_capacity
+ DELETE FROM narratage_capacity
WHERE reservation_id = ? AND active_owner = ? AND active_token = ? AND active_fence = ?
`).run(id, lease.owner, lease.token, lease.fence);
assert(removed.changes === 1, `Capacity reservation ${id} lease is stale`);
@@ -845,19 +818,19 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
verifyDispatchLease(buildLease);
transaction(this.#database, () => {
const dispatch = this.#database.prepare(`
- SELECT lease_owner, lease_token, lease_fence FROM svml_dispatches
+ SELECT lease_owner, lease_token, lease_fence FROM narratage_dispatches
WHERE build_id = ? AND phase = 'leased'
`).get(build) as Row | undefined;
assert(dispatch !== undefined && leaseMatches(dispatch, buildLease),
`Dispatch ${build} lease is stale`);
this.#database.prepare(`
- DELETE FROM svml_capacity WHERE reservation_id = ? AND build_id = ?
+ DELETE FROM narratage_capacity WHERE reservation_id = ? AND build_id = ?
`).run(id, build);
});
}
async listCapacity(): Promise<readonly CapacityReservation[]> {
- return (this.#database.prepare("SELECT * FROM svml_capacity ORDER BY created_at ASC, reservation_id ASC").all() as Row[])
+ return (this.#database.prepare("SELECT * FROM narratage_capacity ORDER BY created_at ASC, reservation_id ASC").all() as Row[])
.map(parseCapacityReservation);
}
}
@@ -875,7 +848,7 @@ function parseCapacityReservation(row: Row): CapacityReservation {
return { owner: row.active_owner, token: row.active_token, fence: row.active_fence, expiresAt: row.active_expires_at };
})();
const value = {
- format: "svml.capacity-reservation@1" as const,
+ format: "narratage.capacity-reservation@1" as const,
id: row.reservation_id as Digest,
build: row.build_id,
command: row.command_id,
@@ -921,11 +894,11 @@ export class SqliteRuntimeState {
}
const alreadyInitialized = this.#database.prepare(`
SELECT 1 AS present FROM sqlite_master
- WHERE type = 'table' AND name = 'svml_store_meta'
+ WHERE type = 'table' AND name = 'narratage_store_meta'
`).get() as Row | undefined;
if (alreadyInitialized !== undefined) {
const version = this.#database.prepare(
- "SELECT schema_version FROM svml_store_meta WHERE singleton = 1",
+ "SELECT schema_version FROM narratage_store_meta WHERE singleton = 1",
).get() as Row | undefined;
if (version === undefined || version.schema_version !== databaseSchemaVersion) {
const found = version === undefined ? "an incomplete schema" : `schema ${String(version.schema_version)}`;
@@ -938,16 +911,16 @@ export class SqliteRuntimeState {
}
}
if (!options.readOnly || emptyReadOnly) this.#database.exec(`
- CREATE TABLE IF NOT EXISTS svml_store_meta (
+ CREATE TABLE IF NOT EXISTS narratage_store_meta (
singleton INTEGER PRIMARY KEY CHECK (singleton = 1),
schema_version INTEGER NOT NULL
) STRICT;
- CREATE TABLE IF NOT EXISTS svml_builds (
+ CREATE TABLE IF NOT EXISTS narratage_builds (
build_id TEXT PRIMARY KEY,
revision INTEGER NOT NULL,
state_json TEXT NOT NULL
) STRICT;
- CREATE TABLE IF NOT EXISTS svml_operations (
+ CREATE TABLE IF NOT EXISTS narratage_operations (
operation_id TEXT PRIMARY KEY,
revision INTEGER NOT NULL,
status TEXT NOT NULL CHECK (status IN ('created', 'pending', 'completed', 'failed', 'cancelled')),
@@ -957,14 +930,14 @@ export class SqliteRuntimeState {
failure_json TEXT,
cancellation_json TEXT
) STRICT;
- CREATE TABLE IF NOT EXISTS svml_build_catalog (
+ CREATE TABLE IF NOT EXISTS narratage_build_catalog (
build_id TEXT PRIMARY KEY,
core_id TEXT NOT NULL,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
descriptor_json TEXT NOT NULL
) STRICT;
- CREATE TABLE IF NOT EXISTS svml_dispatches (
+ CREATE TABLE IF NOT EXISTS narratage_dispatches (
build_id TEXT PRIMARY KEY,
identity_json TEXT NOT NULL,
revision INTEGER NOT NULL,
@@ -984,9 +957,9 @@ export class SqliteRuntimeState {
cancel_reason TEXT,
terminal TEXT CHECK (terminal IS NULL OR terminal IN ('complete', 'failed', 'cancelled'))
) STRICT;
- CREATE INDEX IF NOT EXISTS svml_dispatch_ready
- ON svml_dispatches (phase, available_at, priority DESC);
- CREATE TABLE IF NOT EXISTS svml_capacity (
+ CREATE INDEX IF NOT EXISTS narratage_dispatch_ready
+ ON narratage_dispatches (phase, available_at, priority DESC);
+ CREATE TABLE IF NOT EXISTS narratage_capacity (
reservation_id TEXT PRIMARY KEY,
build_id TEXT NOT NULL,
command_id TEXT NOT NULL,
@@ -1002,10 +975,10 @@ export class SqliteRuntimeState {
updated_at INTEGER NOT NULL,
UNIQUE (build_id, command_id)
) STRICT;
- CREATE INDEX IF NOT EXISTS svml_capacity_state ON svml_capacity (in_flight, active_expires_at);
+ CREATE INDEX IF NOT EXISTS narratage_capacity_state ON narratage_capacity (in_flight, active_expires_at);
`);
if (alreadyInitialized === undefined) {
- this.#database.prepare("INSERT INTO svml_store_meta (singleton, schema_version) VALUES (1, ?)").run(databaseSchemaVersion);
+ this.#database.prepare("INSERT INTO narratage_store_meta (singleton, schema_version) VALUES (1, ?)").run(databaseSchemaVersion);
}
this.builds = new SqliteBuildStore(database);
this.operations = new SqliteOperationStore(database);
@@ -1018,60 +991,35 @@ export class SqliteRuntimeState {
}
}
-export function createSqliteRuntimeComponentPackage(
- options: CreateSqliteRuntimeComponentPackageOptions,
-): RuntimeComponentPackage {
+export function createSqliteRuntimeInfrastructurePackage(
+ options: CreateSqliteRuntimeInfrastructurePackageOptions,
+): RuntimeInfrastructurePackage {
const state = new SqliteRuntimeState(options.path, {
...(options.busyTimeoutMs === undefined ? {} : { busyTimeoutMs: options.busyTimeoutMs }),
...(options.readOnly === undefined ? {} : { readOnly: options.readOnly }),
});
- const buildInstance = options.buildInstance ?? "builds.sqlite";
- const operationInstance = options.operationInstance ?? "operations.sqlite";
- const dispatchInstance = options.dispatchInstance ?? "dispatch.sqlite";
+ const instance = options.instance ?? "state";
try {
- return defineRuntimeComponentPackage({
+ return defineRuntimeInfrastructurePackage({
module: sqliteStoreModuleRef,
- components: [
+ instance,
+ parts: [
{
role: "build-store",
+ part: "builds",
facet: "build-store",
- instance: buildInstance,
- implementation: {
- digest: sqliteBuildStoreImplementationDigest,
- },
- configuration: {
- path: state.path,
- schemaVersion: databaseSchemaVersion,
- busyTimeoutMs: options.busyTimeoutMs ?? 5_000,
- },
port: state.builds,
},
{
role: "operation-store",
+ part: "operations",
facet: "operation-store",
- instance: operationInstance,
- implementation: {
- digest: sqliteOperationStoreImplementationDigest,
- },
- configuration: {
- path: state.path,
- schemaVersion: databaseSchemaVersion,
- busyTimeoutMs: options.busyTimeoutMs ?? 5_000,
- },
port: state.operations,
},
{
role: "dispatch-store",
+ part: "dispatch",
facet: "dispatch-store",
- instance: dispatchInstance,
- implementation: {
- digest: sqliteDispatchStoreImplementationDigest,
- },
- configuration: {
- path: state.path,
- schemaVersion: databaseSchemaVersion,
- busyTimeoutMs: options.busyTimeoutMs ?? 5_000,
- },
port: state.dispatch,
},
],
diff --git a/packages/store-sqlite/test/store.test.ts b/packages/store-sqlite/test/store.test.ts
index fde70174..d6841b2c 100644
--- a/packages/store-sqlite/test/store.test.ts
+++ b/packages/store-sqlite/test/store.test.ts
@@ -12,14 +12,14 @@ import {
sealOperationIdentity,
} from "@narratage/runtime";
import {
- createSqliteRuntimeComponentPackage,
+ createSqliteRuntimeInfrastructurePackage,
SqliteRuntimeState,
} from "@narratage/store-sqlite";
import { createGreetingBuild } from "../../core/test/greeting-fixture.js";
test("read-only SQLite observation of an absent archive creates no file", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-read-only-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-sqlite-read-only-"));
const path = join(directory, ".svml", "runtime.sqlite");
try {
const state = new SqliteRuntimeState(path, { readOnly: true });
@@ -34,7 +34,7 @@ test("read-only SQLite observation of an absent archive creates no file", async
});
test("SQLite stores verified Build facts and Operation checkpoints across reopen", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-sqlite-"));
const path = join(directory, "runtime.sqlite");
try {
const first = new SqliteRuntimeState(path);
@@ -42,7 +42,7 @@ test("SQLite stores verified Build facts and Operation checkpoints across reopen
const created = await first.builds.create("video", initial);
assert.equal(created.revision, 0);
const catalog = {
- format: "svml.build-catalog-descriptor@1",
+ format: "narratage.build-catalog-descriptor@1",
core: initial.id,
source: { path: "/project/main.svml", closure: digestOf("source-closure") },
aliases: [{
@@ -60,9 +60,8 @@ test("SQLite stores verified Build facts and Operation checkpoints across reopen
build: "video",
command: "command:generation",
endpoint: "kie.personal",
- authority: "kie.personal",
- route: "fixture.generation",
- runtimeClosure: digestOf("runtime-closure"),
+ pool: "kie.personal",
+ lane: "fixture.generation",
attempt: 1,
});
const operationCreated = await first.operations.create(operation);
@@ -99,16 +98,15 @@ test("SQLite stores verified Build facts and Operation checkpoints across reopen
});
test("SQLite Operation CAS preserves a terminal completion", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-operation-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-operation-"));
try {
const state = new SqliteRuntimeState(join(directory, "runtime.sqlite"));
const identity = sealOperationIdentity({
build: "video",
command: "command:render",
endpoint: "hyperframes.lambda",
- authority: "hyperframes.lambda",
- route: "fixture.render",
- runtimeClosure: digestOf("runtime"),
+ pool: "hyperframes.lambda",
+ lane: "fixture.render",
attempt: 1,
});
await state.operations.create(identity);
@@ -134,16 +132,15 @@ test("SQLite Operation CAS preserves a terminal completion", async () => {
});
test("SQLite keeps cancellation control independent from execution state", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-cancel-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-sqlite-cancel-"));
try {
const state = new SqliteRuntimeState(join(directory, "runtime.sqlite"));
const identity = sealOperationIdentity({
build: "cancel-build",
command: "command:cancel",
endpoint: "endpoint.cancel",
- authority: "endpoint.cancel",
- route: "fixture.cancel",
- runtimeClosure: digestOf("runtime.cancel"),
+ pool: "endpoint.cancel",
+ lane: "fixture.cancel",
attempt: 1,
});
await state.operations.create(identity);
@@ -169,39 +166,22 @@ test("SQLite keeps cancellation control independent from execution state", async
}
});
-test("Host Catalog schema changes do not change the execution Runtime Closure", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-closure-"));
- try {
- const services = createSqliteRuntimeComponentPackage({ path: join(directory, "runtime.sqlite") });
- assert.deepEqual(
- services.components.map((item) => item.instance.configurationDigest),
- [
- ...Array(3).fill(digestOf({ path: join(directory, "runtime.sqlite"), schemaVersion: 6, busyTimeoutMs: 5_000 })),
- ],
- );
- await services.close?.();
- } finally {
- await rm(directory, { recursive: true, force: true });
- }
-});
-
test("SQLite fences expired Workers and shares capacity across Build dispatches", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-dispatch-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-sqlite-dispatch-"));
try {
const state = new SqliteRuntimeState(join(directory, "runtime.sqlite"));
- const closure = digestOf("runtime:dispatch-test");
await state.dispatch.create(createBuildDispatchIdentity({
- build: "build-a", core: digestOf("core:a"), runtimeClosure: closure,
+ build: "build-a", core: digestOf("core:a"),
}), { now: 100 });
- const first = await state.dispatch.claim({ runtimeClosure: closure, owner: "worker-a", token: "lease-a", now: 100, leaseMs: 10 });
+ const first = await state.dispatch.claim({ owner: "worker-a", token: "lease-a", now: 100, leaseMs: 10 });
assert.ok(first?.lease);
assert.equal(first.build, "build-a");
assert.equal(first.lease.fence, 1);
- assert.equal(await state.dispatch.claim({ runtimeClosure: closure, owner: "worker-b", token: "early", now: 105, leaseMs: 10 }), undefined);
- const second = await state.dispatch.claim({ runtimeClosure: closure, owner: "worker-b", token: "lease-b", now: 111, leaseMs: 10 });
+ assert.equal(await state.dispatch.claim({ owner: "worker-b", token: "early", now: 105, leaseMs: 10 }), undefined);
+ const second = await state.dispatch.claim({ owner: "worker-b", token: "lease-b", now: 111, leaseMs: 10 });
assert.ok(second?.lease);
assert.equal(second.lease.fence, 2);
- const paidResources = [{ id: "authority:paid", maxActive: 1, maxInFlight: 1 }];
+ const paidResources = [{ id: "pool:paid", maxActive: 1, maxInFlight: 1 }];
await assert.rejects(
state.dispatch.release("build-a", first.lease, { phase: "waiting", availableAt: 120 }, 112),
/stale/u,
@@ -234,9 +214,9 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"
assert.equal(woken.phase, "waiting");
await state.dispatch.create(createBuildDispatchIdentity({
- build: "build-b", core: digestOf("core:b"), runtimeClosure: closure,
+ build: "build-b", core: digestOf("core:b"),
}), { now: 112 });
- const third = await state.dispatch.claim({ runtimeClosure: closure, owner: "worker-c", token: "lease-c", now: 112, leaseMs: 10 });
+ const third = await state.dispatch.claim({ owner: "worker-c", token: "lease-c", now: 112, leaseMs: 10 });
assert.ok(third?.lease);
const blocked = await state.dispatch.acquireCapacity({
build: "build-b", command: "command:b", resources: paidResources, mode: "recoverable",
@@ -246,9 +226,9 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"
assert.equal(blocked.status, "blocked");
await state.dispatch.create(createBuildDispatchIdentity({
- build: "build-c", core: digestOf("core:c"), runtimeClosure: closure,
+ build: "build-c", core: digestOf("core:c"),
}), { now: 200, priority: 100 });
- const fourth = await state.dispatch.claim({ runtimeClosure: closure, owner: "worker-d", token: "lease-d", now: 200, leaseMs: 10 });
+ const fourth = await state.dispatch.claim({ owner: "worker-d", token: "lease-d", now: 200, leaseMs: 10 });
assert.ok(fourth?.lease);
await state.dispatch.requestCancellation("build-c", "stop", 201);
const cancelledWake = await state.dispatch.release(
@@ -267,14 +247,12 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"
});
test("cancelling a never-claimed Build atomically withdraws it from dispatch", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-cancel-queued-"));
+ const directory = await mkdtemp(join(tmpdir(), "narratage-sqlite-cancel-queued-"));
try {
const state = new SqliteRuntimeState(join(directory, "runtime.sqlite"));
- const closure = digestOf("runtime:cancel-queued");
await state.dispatch.create(createBuildDispatchIdentity({
build: "queued-build",
core: digestOf("core:queued-build"),
- runtimeClosure: closure,
}), { now: 100 });
const cancelled = await state.dispatch.requestCancellation("queued-build", "no longer needed", 101);
@@ -284,7 +262,6 @@ test("cancelling a never-claimed Build atomically withdraws it from dispatch", a
assert.equal(cancelled.cancellation?.requestedAt, 101);
assert.equal(cancelled.cancellation?.reason, "no longer needed");
assert.equal(await state.dispatch.claim({
- runtimeClosure: closure,
owner: "worker",
token: "lease",
now: 102,
@@ -300,65 +277,20 @@ test("cancelling a never-claimed Build atomically withdraws it from dispatch", a
}
});
-test("one SQLite execution domain rejects a second Runtime Closure until prior work is terminal", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-revision-gate-"));
- try {
- const state = new SqliteRuntimeState(join(directory, "runtime.sqlite"));
- const firstClosure = digestOf("runtime:first");
- const secondClosure = digestOf("runtime:second");
- const firstIdentity = createBuildDispatchIdentity({
- build: "first-build",
- core: digestOf("core:first"),
- runtimeClosure: firstClosure,
- });
- assert.equal((await state.dispatch.create(firstIdentity, { now: 100 })).status, "created");
- assert.equal((await state.dispatch.create(firstIdentity, { now: 101 })).status, "existing");
- await assert.rejects(
- state.dispatch.create(createBuildDispatchIdentity({
- build: "second-build",
- core: digestOf("core:second"),
- runtimeClosure: secondClosure,
- }), { now: 102 }),
- /cannot enter this execution domain[\s\S]*first-build[\s\S]*original Runtime Profile/u,
- );
-
- const claimed = await state.dispatch.claim({
- runtimeClosure: firstClosure,
- owner: "worker:first",
- token: "lease:first",
- now: 103,
- leaseMs: 1_000,
- });
- assert.ok(claimed?.lease);
- await state.dispatch.finish("first-build", claimed.lease, "complete", undefined, 104);
- assert.equal((await state.dispatch.create(createBuildDispatchIdentity({
- build: "second-build",
- core: digestOf("core:second"),
- runtimeClosure: secondClosure,
- }), { now: 105 })).status, "created");
- state.close();
- } finally {
- await rm(directory, { recursive: true, force: true });
- }
-});
-
-test("Authority and Route resources are acquired atomically across models", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-hierarchy-"));
+test("Pool and Lane resources are acquired atomically across models", async () => {
+ const directory = await mkdtemp(join(tmpdir(), "narratage-sqlite-hierarchy-"));
try {
const state = new SqliteRuntimeState(join(directory, "runtime.sqlite"));
- const closure = digestOf("runtime:hierarchical-capacity");
- const authority = { id: "authority:kie.main", maxActive: 2, maxInFlight: 2 };
- const seedance = { id: "route:kie.main/seedance-2-mini", maxActive: 1, maxInFlight: 1 };
- const minimax = { id: "route:kie.main/minimax-h3", maxActive: 2, maxInFlight: 2 };
+ const pool = { id: "pool:kie.main", maxActive: 2, maxInFlight: 2 };
+ const seedance = { id: "lane:kie.main/seedance-2-mini", maxActive: 1, maxInFlight: 1 };
+ const minimax = { id: "lane:kie.main/minimax-h3", maxActive: 2, maxInFlight: 2 };
const leaseBuild = async (build: string, now: number) => {
await state.dispatch.create(createBuildDispatchIdentity({
build,
core: digestOf(`core:${build}`),
- runtimeClosure: closure,
}), { now });
const claimed = await state.dispatch.claim({
- runtimeClosure: closure,
owner: `worker:${build}`,
token: `lease:${build}`,
now,
@@ -373,8 +305,8 @@ test("Authority and Route resources are acquired atomically across models", asyn
const first = await state.dispatch.acquireCapacity({
build: "seedance-a",
command: "generate:a",
- resources: [authority, seedance],
- queue: { authority: "kie.main", route: "seedance-2-mini" },
+ resources: [pool, seedance],
+ queue: { pool: "kie.main", lane: "seedance-2-mini" },
mode: "recoverable",
buildLease: firstLease,
owner: "worker:seedance-a",
@@ -391,8 +323,8 @@ test("Authority and Route resources are acquired atomically across models", asyn
const sameRoute = await state.dispatch.acquireCapacity({
build: "seedance-b",
command: "generate:b",
- resources: [authority, seedance],
- queue: { authority: "kie.main", route: "seedance-2-mini" },
+ resources: [pool, seedance],
+ queue: { pool: "kie.main", lane: "seedance-2-mini" },
mode: "recoverable",
buildLease: secondLease,
owner: "worker:seedance-b",
@@ -412,8 +344,8 @@ test("Authority and Route resources are acquired atomically across models", asyn
const otherRoute = await state.dispatch.acquireCapacity({
build: "minimax-a",
command: "generate:c",
- resources: [authority, minimax],
- queue: { authority: "kie.main", route: "minimax-h3" },
+ resources: [pool, minimax],
+ queue: { pool: "kie.main", lane: "minimax-h3" },
mode: "recoverable",
buildLease: thirdLease,
owner: "worker:minimax-a",
@@ -423,7 +355,7 @@ test("Authority and Route resources are acquired atomically across models", asyn
limits: { globalActive: 10 },
});
assert.equal(otherRoute.status, "acquired",
- "another model may use the remaining Provider Authority capacity");
+ "another model may use the remaining Provider Pool capacity");
state.close();
} finally {
await rm(directory, { recursive: true, force: true });
diff --git a/packages/svs/package.json b/packages/svs/package.json
index 7a433514..cc0c2f7f 100644
--- a/packages/svs/package.json
+++ b/packages/svs/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/svs/src/activation.ts b/packages/svs/src/activation.ts
index 0c87c4b5..51f4bac5 100644
--- a/packages/svs/src/activation.ts
+++ b/packages/svs/src/activation.ts
@@ -2,10 +2,10 @@ import { createAuthorFrontendHostFacet } from "@narratage/elaborator";
import { svsFrontend, svsManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: svsManifest }],
hostFacets: [createAuthorFrontendHostFacet(svsFrontend)],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/svs/src/frontend.ts b/packages/svs/src/frontend.ts
index 3184b0c9..0cae6759 100644
--- a/packages/svs/src/frontend.ts
+++ b/packages/svs/src/frontend.ts
@@ -1,26 +1,17 @@
import {
sealRecord,
- verifyClosure,
- verifyRecordStructure,
} from "@narratage/core";
import type { AuthorFrontend, AuthorSourceExport } from "@narratage/elaborator";
-import {
- svsFrontendId,
- svsFrontendImplementationDigest,
- svsModuleRef,
- svsRecipeType,
-} from "./manifest.js";
+import { svsFrontendId, svsModuleRef, svsRecipeType } from "./manifest.js";
import { parseSvs } from "./parser.js";
export const svsFrontend: AuthorFrontend = {
id: svsFrontendId,
- implementationDigest: svsFrontendImplementationDigest,
discover() {
return { modules: [`${svsModuleRef.name}@${svsModuleRef.version}`], sources: [] };
},
decode(source, context) {
- verifyClosure(context.closure);
const parsed = parseSvs(source.name, source.text);
const records = parsed.recipes.map((recipe) => sealRecord({
id: recipe.value.path,
@@ -28,7 +19,6 @@ export const svsFrontend: AuthorFrontend = {
value: { kind: "inline", value: recipe.value },
origin: { kind: "authored" },
}));
- records.forEach((record) => verifyRecordStructure(context.closure, record));
const exports: AuthorSourceExport[] = records.map((record) => ({
name: record.id,
ref: { kind: "record", id: record.id },
diff --git a/packages/svs/src/index.ts b/packages/svs/src/index.ts
index 0aba0021..db3cf472 100644
--- a/packages/svs/src/index.ts
+++ b/packages/svs/src/index.ts
@@ -1,10 +1,4 @@
-export {
- svsFrontendId,
- svsFrontendImplementationDigest,
- svsManifest,
- svsModuleRef,
- svsRecipeType,
-} from "./manifest.js";
+export { svsFrontendId, svsManifest, svsModuleRef, svsRecipeType } from "./manifest.js";
export { SvsSyntaxError, parseSvs } from "./parser.js";
export { svsFrontend } from "./frontend.js";
export type * from "./types.js";
diff --git a/packages/svs/src/manifest.ts b/packages/svs/src/manifest.ts
index 9e114490..0691d011 100644
--- a/packages/svs/src/manifest.ts
+++ b/packages/svs/src/manifest.ts
@@ -4,29 +4,14 @@ import type { ModuleManifest, TypeRef } from "@narratage/protocol";
export const svsModuleRef = { name: "@narratage/svs", version: "1" } as const;
export const svsRecipeType = { module: svsModuleRef, name: "Recipe" } satisfies TypeRef;
export const svsFrontendId = "@narratage/svs@1";
-export const svsFrontendImplementationDigest = digestOf("@narratage/svs/frontend@1");
export const svsManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: svsModuleRef.name,
version: svsModuleRef.version,
dependencies: [],
types: [{
name: svsRecipeType.name,
- schema: {
- kind: "object",
- fields: {
-
- path: { schema: { kind: "string", minLength: 3 } },
- properties: {
- schema: {
- kind: "object",
- fields: {},
- allowUnknown: true,
- },
- },
- },
- },
}],
capabilities: [],
producers: [],
diff --git a/packages/svs/test/source-closure.test.ts b/packages/svs/test/source-closure.test.ts
index b0ca6afc..2f78077c 100644
--- a/packages/svs/test/source-closure.test.ts
+++ b/packages/svs/test/source-closure.test.ts
@@ -44,27 +44,17 @@ const renderProducer = { module: laboratory, name: "render-card" } satisfies Pro
const cardSurfaceDigest = digestOf("example.recipe-card/card-surface@1");
const cardSurface = {
name: "card", tag: "Card", mode: "structured", outputs: [cardAppearanceType],
- implementation: { digest: cardSurfaceDigest },
} as const;
const manifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: laboratory.name,
version: laboratory.version,
- dependencies: [{ module: { name: svsManifest.name, version: svsManifest.version }, digest: computeModuleDigest(svsManifest) }],
+ dependencies: [{ module: { name: svsManifest.name, version: svsManifest.version } }],
types: [
- { name: cardType.name, schema: { kind: "string", minLength: 1 } },
+ { name: cardType.name },
{
name: cardAppearanceType.name,
- schema: {
- kind: "object",
- fields: {
- contract: { schema: { kind: "literal", value: "example.card-appearance@1" } },
- sourceRecipeDigest: { schema: { kind: "string", minLength: 71, maxLength: 71 } },
- fill: { schema: { kind: "string", minLength: 1 } },
- padding: { schema: { kind: "string", minLength: 1 } },
- },
- },
},
],
capabilities: [],
@@ -73,9 +63,6 @@ const manifest: ModuleManifest = {
inputs: [{ name: "appearance", type: cardAppearanceType }],
outputs: [{ name: "card", type: cardType }],
needs: [],
- implementation: {
- digest: digestOf("example.recipe-card/render-card@1"),
- },
}],
};
@@ -278,7 +265,6 @@ test("Frontend identity changes Source Closure identity but not equal decoded au
const alternate = {
...svsFrontend,
id: "example.svs-compatible@1",
- implementationDigest: digestOf("example.svs-compatible/implementation@1"),
};
const compileWith = async (frontend: typeof svsFrontend | typeof alternate) => {
const frontends = new AuthorFrontendRegistry();
@@ -293,7 +279,6 @@ test("Frontend identity changes Source Closure identity but not equal decoded au
const official = await compileWith(svsFrontend);
const compatible = await compileWith(alternate);
assert.notEqual(official.closure.id, compatible.closure.id);
- assert.notEqual(official.closure.units[0]?.frontendDigest, compatible.closure.units[0]?.frontendDigest);
assert.equal(official.closure.units[0]?.semanticDigest, compatible.closure.units[0]?.semanticDigest);
assert.equal(official.program.semanticDigest, compatible.program.semanticDigest);
assert.equal(official.graph.id, compatible.graph.id);
diff --git a/packages/temporal/package.json b/packages/temporal/package.json
index 1152dc57..c655e10a 100644
--- a/packages/temporal/package.json
+++ b/packages/temporal/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/temporal/src/activation.ts b/packages/temporal/src/activation.ts
index 3fd4177e..368eff28 100644
--- a/packages/temporal/src/activation.ts
+++ b/packages/temporal/src/activation.ts
@@ -1,7 +1,7 @@
import { temporalManifest } from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: temporalManifest }],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/temporal/src/index.ts b/packages/temporal/src/index.ts
index 39017688..b352af67 100644
--- a/packages/temporal/src/index.ts
+++ b/packages/temporal/src/index.ts
@@ -9,7 +9,7 @@ export type * from "./types.js";
export const temporalModuleRef = { name: "@narratage/temporal", version: "1" } as const;
export const temporalManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: temporalModuleRef.name,
version: temporalModuleRef.version,
dependencies: [],
@@ -17,5 +17,4 @@ export const temporalManifest: ModuleManifest = {
capabilities: [],
producers: [],
};
-export const temporalManifestDigest = digestOf(temporalManifest);
-export const temporalDependency = { module: temporalModuleRef, digest: temporalManifestDigest } as const;
+export const temporalDependency = { module: temporalModuleRef } as const;
diff --git a/packages/text/package.json b/packages/text/package.json
index fa2d76d9..6130b364 100644
--- a/packages/text/package.json
+++ b/packages/text/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/text/src/activation.ts b/packages/text/src/activation.ts
index 50dd5f7b..08bb117a 100644
--- a/packages/text/src/activation.ts
+++ b/packages/text/src/activation.ts
@@ -11,8 +11,8 @@ import {
textMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: textManifest }],
components: [textComponent],
hostFacets: [
@@ -30,4 +30,4 @@ export const svmlPackage = {
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/text/src/component.ts b/packages/text/src/component.ts
index 7a089a5a..ee65def1 100644
--- a/packages/text/src/component.ts
+++ b/packages/text/src/component.ts
@@ -2,7 +2,6 @@ import type { ComponentPackage, ProducerHandlerContext } from "@narratage/compon
import type { StoredValue } from "@narratage/protocol";
import {
- textImplementationDigests,
textProducers,
textTypes,
} from "./manifest.js";
@@ -24,24 +23,22 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
export const textComponent = {
validators: [
- { type: textTypes.text, implementationDigest: textImplementationDigests.validateText,
+ { type: textTypes.text,
handler: ({ value }) => verifyText(inline(value, "Text")) },
- { type: textTypes.template, implementationDigest: textImplementationDigests.validateTemplate,
+ { type: textTypes.template,
handler: ({ value }) => verifyTextTemplate(inline(value, "TextTemplate")) },
- { type: textTypes.bindings, implementationDigest: textImplementationDigests.validateBindings,
+ { type: textTypes.bindings,
handler: ({ value }) => verifyTextBindings(inline(value, "TextBindings")) },
- { type: textTypes.binding, implementationDigest: textImplementationDigests.validateBinding,
+ { type: textTypes.binding,
handler: ({ value }) => verifyTextBinding(inline(value, "TextBinding")) },
],
producers: [
{
producer: textProducers.emptyBindings,
- implementationDigest: textImplementationDigests.emptyBindings,
handler: () => ({ outputs: { bindings: { kind: "inline", value: sealTextBindings() } }, needs: {} }),
},
{
producer: textProducers.bindText,
- implementationDigest: textImplementationDigests.bindText,
handler: ({ inputs }: ProducerHandlerContext) => ({
outputs: {
bindings: {
@@ -58,7 +55,6 @@ export const textComponent = {
},
{
producer: textProducers.render,
- implementationDigest: textImplementationDigests.render,
handler: ({ inputs }: ProducerHandlerContext) => ({
outputs: {
text: {
diff --git a/packages/text/src/frontend.ts b/packages/text/src/frontend.ts
index fea3b64a..832cf15d 100644
--- a/packages/text/src/frontend.ts
+++ b/packages/text/src/frontend.ts
@@ -1,24 +1,20 @@
import {
sealRecord,
- verifyClosure,
- verifyRecordStructure,
} from "@narratage/core";
import type { AuthorFrontend, AuthorSourceExport } from "@narratage/elaborator";
import { parseSvs } from "@narratage/svs";
-import { textImplementationDigests, textModuleRef, textTypes } from "./manifest.js";
+import { textModuleRef, textTypes } from "./manifest.js";
import { textTemplateFromSvsRecipes } from "./svs.js";
export const textSvsFrontendId = "@narratage/text/svs@1";
export const textSvsFrontend: AuthorFrontend = {
id: textSvsFrontendId,
- implementationDigest: textImplementationDigests.svsFrontend,
discover() {
return { modules: [`${textModuleRef.name}@${textModuleRef.version}`], sources: [] };
},
decode(source, context) {
- verifyClosure(context.closure);
const parsed = parseSvs(source.name, source.text);
const recipes = parsed.recipes.map((item) => item.value);
const candidates = recipes
@@ -33,7 +29,6 @@ export const textSvsFrontend: AuthorFrontend = {
value: { kind: "inline", value: template as unknown as import("@narratage/protocol").CanonicalValue },
origin: { kind: "authored" },
});
- verifyRecordStructure(context.closure, record);
const exports: AuthorSourceExport[] = [{ name: id, ref: { kind: "record", id }, type: textTypes.template }];
return {
records: [record],
diff --git a/packages/text/src/index.ts b/packages/text/src/index.ts
index 7b57aa0f..7ff90858 100644
--- a/packages/text/src/index.ts
+++ b/packages/text/src/index.ts
@@ -4,9 +4,7 @@ export { createTextRenderFragment } from "./fragment.js";
export type { TextFragmentBinding } from "./fragment.js";
export {
textDependency,
- textImplementationDigests,
textManifest, textMarkupSurfaces,
- textManifestDigest,
textModuleRef,
textProducers,
textTypes,
diff --git a/packages/text/src/manifest.ts b/packages/text/src/manifest.ts
index 814626d1..0c40358a 100644
--- a/packages/text/src/manifest.ts
+++ b/packages/text/src/manifest.ts
@@ -1,5 +1,4 @@
-import { digestOf } from "@narratage/protocol";
-import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
+import type { ModuleManifest, ProducerRef, TypeRef } from "@narratage/protocol";
export const textModuleRef = { name: "@narratage/text", version: "1" } as const;
@@ -16,74 +15,29 @@ export const textProducers = {
render: { module: textModuleRef, name: "render" },
} satisfies Record<string, ProducerRef>;
-export const textImplementationDigests = {
- svsFrontend: digestOf("@narratage/text/svs-frontend@1"),
- valueSurface: digestOf("@narratage/text/value-surface@1"),
- renderSurface: digestOf("@narratage/text/render-surface-with-recipe@1"),
- validateText: digestOf("@narratage/text/validate-text@1"),
- validateTemplate: digestOf("@narratage/text/validate-template@1"),
- validateBindings: digestOf("@narratage/text/validate-bindings@1"),
- validateBinding: digestOf("@narratage/text/validate-binding@1"),
- emptyBindings: digestOf("@narratage/text/empty-bindings@1"),
- bindText: digestOf("@narratage/text/bind-text@1"),
- render: digestOf("@narratage/text/render@1"),
-} as const;
-
-const openObject: ValueSchema = { kind: "object", fields: {}, allowUnknown: true };
-const type = (
- name: string,
- schema: ValueSchema,
- digest: (typeof textImplementationDigests)[keyof typeof textImplementationDigests],
-) => ({
- name,
- schema,
- validator: {
- implementation: { digest },
- },
-});
-
export const textMarkupSurfaces = [{
name: "value",
tag: "Value",
mode: "structured",
outputs: [textTypes.text],
- implementation: {
- digest: textImplementationDigests.valueSurface,
- },
}, {
name: "render",
tag: "Render",
mode: "structured",
outputs: [textTypes.text, textTypes.bindings, textTypes.binding],
- implementation: {
- digest: textImplementationDigests.renderSurface,
- },
}] as const;
export const textManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: textModuleRef.name,
version: textModuleRef.version,
dependencies: [],
types: [
- type(textTypes.text.name, {
- kind: "object",
- fields: {
-
- value: { schema: { kind: "string" } },
- },
- }, textImplementationDigests.validateText),
- type(textTypes.template.name, openObject, textImplementationDigests.validateTemplate),
- type(textTypes.bindings.name, openObject, textImplementationDigests.validateBindings),
- type(textTypes.binding.name, {
- kind: "object",
- fields: {
-
- name: { schema: { kind: "string", minLength: 1 } },
- mode: { schema: { kind: "string", enum: ["set", "append"] } },
- },
- }, textImplementationDigests.validateBinding),
+ { name: textTypes.text.name },
+ { name: textTypes.template.name },
+ { name: textTypes.bindings.name },
+ { name: textTypes.binding.name },
],
capabilities: [],
producers: [
@@ -92,7 +46,6 @@ export const textManifest: ModuleManifest = {
inputs: [],
outputs: [{ name: "bindings", type: textTypes.bindings }],
needs: [],
- implementation: { digest: textImplementationDigests.emptyBindings },
},
{
name: textProducers.bindText.name,
@@ -103,7 +56,6 @@ export const textManifest: ModuleManifest = {
],
outputs: [{ name: "bindings", type: textTypes.bindings }],
needs: [],
- implementation: { digest: textImplementationDigests.bindText },
},
{
name: textProducers.render.name,
@@ -113,10 +65,8 @@ export const textManifest: ModuleManifest = {
],
outputs: [{ name: "text", type: textTypes.text }],
needs: [],
- implementation: { digest: textImplementationDigests.render },
},
],
};
-export const textManifestDigest = digestOf(textManifest);
-export const textDependency = { module: textModuleRef, digest: textManifestDigest } as const;
+export const textDependency = { module: textModuleRef } as const;
diff --git a/packages/typography-track/package.json b/packages/typography-track/package.json
index 65a562a8..cf805565 100644
--- a/packages/typography-track/package.json
+++ b/packages/typography-track/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/typography-track/src/activation.ts b/packages/typography-track/src/activation.ts
index b7efdc35..2ee47c12 100644
--- a/packages/typography-track/src/activation.ts
+++ b/packages/typography-track/src/activation.ts
@@ -10,8 +10,8 @@ import {
typographyTrackMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: typographyTrackManifest }],
components: [typographyTrackComponent],
hostFacets: [
@@ -33,4 +33,4 @@ export const svmlPackage = {
}),
],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/typography-track/src/component.ts b/packages/typography-track/src/component.ts
index f24d1570..f021c9f3 100644
--- a/packages/typography-track/src/component.ts
+++ b/packages/typography-track/src/component.ts
@@ -9,30 +9,7 @@ import type { Text } from "@narratage/text";
import { canonicalize } from "@narratage/protocol";
import { typographyTrackProducers } from "./manifest.js";
-import {
- appendMomentTextItem,
- appendProgramTextItem,
- appendSelectionTextItem,
- bindAreaTextPlacement,
- bindAreaTextPlacementImplementationDigest,
- bindPathTextPlacement,
- bindPathTextPlacementImplementationDigest,
- bindPointTextPlacement,
- bindPointTextPlacementImplementationDigest,
- createTypographyTrackSet,
- createTypographyTrackSetImplementationDigest,
- finalizeTypographyTrack,
- finalizeTypographyTrackImplementationDigest,
- renderTypographyTrack,
- renderTypographyTrackImplementationDigest,
- renderTextMaskTrack,
- renderTextMaskTrackImplementationDigest,
- appendMomentTextItemImplementationDigest,
- appendProgramTextItemImplementationDigest,
- appendSelectionTextItemImplementationDigest,
- materializePlainTextItem,
- materializePlainTextItemImplementationDigest,
-} from "./program.js";
+import { appendMomentTextItem, appendProgramTextItem, appendSelectionTextItem, bindAreaTextPlacement, bindPathTextPlacement, bindPointTextPlacement, createTypographyTrackSet, finalizeTypographyTrack, renderTypographyTrack, renderTextMaskTrack, materializePlainTextItem } from "./program.js";
import type {
TextItemSpec,
PlainTextItemSpec,
@@ -56,7 +33,6 @@ export const typographyTrackComponent = {
producers: [
{
producer: typographyTrackProducers.materializePlainItem,
- implementationDigest: materializePlainTextItemImplementationDigest,
handler: ({ inputs }) => ({ outputs: { spec: output(materializePlainTextItem(
inline<PlainTextItemSpec>(inputs.spec?.value, "PlainTextItemSpec"),
inline<Text>(inputs.content?.value, "Text"),
@@ -64,27 +40,22 @@ export const typographyTrackComponent = {
},
{
producer: typographyTrackProducers.bindPoint,
- implementationDigest: bindPointTextPlacementImplementationDigest,
handler: ({ inputs }) => ({ outputs: { placement: output(bindPointTextPlacement(inline<SpatialPoint>(inputs.point?.value, "SpatialPoint"))) }, needs: {} }),
},
{
producer: typographyTrackProducers.bindArea,
- implementationDigest: bindAreaTextPlacementImplementationDigest,
handler: ({ inputs }) => ({ outputs: { placement: output(bindAreaTextPlacement(inline<SpatialFrame>(inputs.frame?.value, "SpatialFrame"))) }, needs: {} }),
},
{
producer: typographyTrackProducers.bindPath,
- implementationDigest: bindPathTextPlacementImplementationDigest,
handler: ({ inputs }) => ({ outputs: { placement: output(bindPathTextPlacement(inline<SpatialPath>(inputs.path?.value, "SpatialPath"))) }, needs: {} }),
},
{
producer: typographyTrackProducers.createSet,
- implementationDigest: createTypographyTrackSetImplementationDigest,
handler: () => ({ outputs: { set: output(createTypographyTrackSet()) }, needs: {} }),
},
{
producer: typographyTrackProducers.appendProgram,
- implementationDigest: appendProgramTextItemImplementationDigest,
handler: ({ inputs }) => ({ outputs: { set: output(appendProgramTextItem(
inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
@@ -97,7 +68,6 @@ export const typographyTrackComponent = {
},
{
producer: typographyTrackProducers.appendSelection,
- implementationDigest: appendSelectionTextItemImplementationDigest,
handler: ({ inputs }) => ({ outputs: { set: output(appendSelectionTextItem(
inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
@@ -112,7 +82,6 @@ export const typographyTrackComponent = {
},
{
producer: typographyTrackProducers.appendMoment,
- implementationDigest: appendMomentTextItemImplementationDigest,
handler: ({ inputs }) => ({ outputs: { set: output(appendMomentTextItem(
inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
@@ -127,7 +96,6 @@ export const typographyTrackComponent = {
},
{
producer: typographyTrackProducers.finalize,
- implementationDigest: finalizeTypographyTrackImplementationDigest,
handler: ({ inputs }) => ({ outputs: { program: output(finalizeTypographyTrack(
inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
@@ -135,7 +103,6 @@ export const typographyTrackComponent = {
},
{
producer: typographyTrackProducers.render,
- implementationDigest: renderTypographyTrackImplementationDigest,
handler: ({ inputs }) => ({ outputs: { track: output(renderTypographyTrack(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
inline<TypographyTrackProgram>(inputs.program?.value, "TypographyTrackProgram"),
@@ -143,7 +110,6 @@ export const typographyTrackComponent = {
},
{
producer: typographyTrackProducers.renderMask,
- implementationDigest: renderTextMaskTrackImplementationDigest,
handler: ({ inputs }) => ({ outputs: { track: output(renderTextMaskTrack(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
inline<TypographyTrackProgram>(inputs.program?.value, "TypographyTrackProgram"),
diff --git a/packages/typography-track/src/index.ts b/packages/typography-track/src/index.ts
index d4562571..74c6aa08 100644
--- a/packages/typography-track/src/index.ts
+++ b/packages/typography-track/src/index.ts
@@ -1,56 +1,7 @@
export { typographyTrackFragment } from "./fragment.js";
export { typographyTrackComponent } from "./component.js";
-export {
- typographyTrackManifest, typographyTrackMarkupSurfaces,
- typographyTrackManifestDigest,
- typographyTrackModuleRef,
- typographyTrackProducers,
- typographyTrackProgramSchema,
- typographyTrackSurfaceImplementationDigests,
- typographyTrackTypes,
-} from "./manifest.js";
-export {
- appendMomentTextItem,
- appendMomentTextItemImplementationDigest,
- appendProgramTextItem,
- appendProgramTextItemImplementationDigest,
- appendSelectionTextItem,
- appendSelectionTextItemImplementationDigest,
- assertPlainTextItemSpec,
- bindAreaTextPlacement,
- bindAreaTextPlacementImplementationDigest,
- bindPathTextPlacement,
- bindPathTextPlacementImplementationDigest,
- bindPointTextPlacement,
- bindPointTextPlacementImplementationDigest,
- assertTextItemSpec,
- assertTextMaskSpec,
- assertTextMotion,
- assertTextPlacement,
- assertTextStyle,
- assertTypographyTrackHeader,
- assertTypographyTrackProgramIdentity,
- assertTypographyTrackSet,
- createTypographyTrackSet,
- createTypographyTrackSetImplementationDigest,
- finalizeTypographyTrack,
- finalizeTypographyTrackImplementationDigest,
- renderTypographyTrack,
- renderTypographyTrackImplementationDigest,
- renderTextMaskTrack,
- renderTextMaskTrackImplementationDigest,
- sealTypographyTrackProgram,
- sealTypographyTrackHeader,
- sealTextItemSpec,
- sealPlainTextItemSpec,
- materializePlainTextItem,
- materializePlainTextItemImplementationDigest,
- sealTextMotion,
- sealTextMaskSpec,
- sealTextPlacement,
- sealTextStyle,
- stillTextMotion,
-} from "./program.js";
+export { typographyTrackManifest, typographyTrackMarkupSurfaces, typographyTrackModuleRef, typographyTrackProducers, typographyTrackProgramSchema, typographyTrackTypes } from "./manifest.js";
+export { appendMomentTextItem, appendProgramTextItem, appendSelectionTextItem, assertPlainTextItemSpec, bindAreaTextPlacement, bindPathTextPlacement, bindPointTextPlacement, assertTextItemSpec, assertTextMaskSpec, assertTextMotion, assertTextPlacement, assertTextStyle, assertTypographyTrackHeader, assertTypographyTrackProgramIdentity, assertTypographyTrackSet, createTypographyTrackSet, finalizeTypographyTrack, renderTypographyTrack, renderTextMaskTrack, sealTypographyTrackProgram, sealTypographyTrackHeader, sealTextItemSpec, sealPlainTextItemSpec, materializePlainTextItem, sealTextMotion, sealTextMaskSpec, sealTextPlacement, sealTextStyle, stillTextMotion } from "./program.js";
export {
decodeTypographyMotionSurface,
decodeTypographyStyleSurface,
diff --git a/packages/typography-track/src/manifest.ts b/packages/typography-track/src/manifest.ts
index aaa282d7..3c862c34 100644
--- a/packages/typography-track/src/manifest.ts
+++ b/packages/typography-track/src/manifest.ts
@@ -23,20 +23,6 @@ import { textDependency, textTypes } from "@narratage/text";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
-import {
- appendMomentTextItemImplementationDigest,
- appendProgramTextItemImplementationDigest,
- appendSelectionTextItemImplementationDigest,
- bindAreaTextPlacementImplementationDigest,
- bindPathTextPlacementImplementationDigest,
- bindPointTextPlacementImplementationDigest,
- createTypographyTrackSetImplementationDigest,
- finalizeTypographyTrackImplementationDigest,
- renderTypographyTrackImplementationDigest,
- renderTextMaskTrackImplementationDigest,
- materializePlainTextItemImplementationDigest,
-} from "./program.js";
-
export const typographyTrackModuleRef = { name: "@narratage/typography-track", version: "1" } as const;
export const typographyTrackTypes = {
style: { module: typographyTrackModuleRef, name: "TextStyle" },
@@ -168,53 +154,44 @@ const textMaskSpecSchema = object({
materialFit: { schema: enumString(["contain", "cover", "fill"]) },
});
-export const typographyTrackSurfaceImplementationDigests = {
- style: digestOf("@narratage/typography-track/style-surface@1"),
- motion: digestOf("@narratage/typography-track/motion-surface@1"),
- track: digestOf("@narratage/typography-track/complete-track-surface@1"),
- mask: digestOf("@narratage/typography-track/owned-mask-surface@1"),
-} as const;
-
const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
export const typographyTrackMarkupSurfaces = [
- { name: "style", tag: "Style", mode: "structured", outputs: [typographyTrackTypes.style], implementation: { digest: typographyTrackSurfaceImplementationDigests.style } },
- { name: "motion", tag: "Motion", mode: "structured", outputs: [typographyTrackTypes.motion], implementation: { digest: typographyTrackSurfaceImplementationDigests.motion } },
- { name: "track", tag: "Track", mode: "structured", outputs: [typographyTrackTypes.header, typographyTrackTypes.itemSpec, typographyTrackTypes.plainItemSpec, typographyTrackTypes.motion, typographyTrackTypes.set, typographyTrackTypes.placement, typographyTrackTypes.program, compositionTypes.visualTrack], implementation: { digest: typographyTrackSurfaceImplementationDigests.track } },
- { name: "mask", tag: "Mask", mode: "structured", outputs: [typographyTrackTypes.maskSpec, compositionTypes.visualTrack], implementation: { digest: typographyTrackSurfaceImplementationDigests.mask } },
+ { name: "style", tag: "Style", mode: "structured", outputs: [typographyTrackTypes.style] },
+ { name: "motion", tag: "Motion", mode: "structured", outputs: [typographyTrackTypes.motion] },
+ { name: "track", tag: "Track", mode: "structured", outputs: [typographyTrackTypes.header, typographyTrackTypes.itemSpec, typographyTrackTypes.plainItemSpec, typographyTrackTypes.motion, typographyTrackTypes.set, typographyTrackTypes.placement, typographyTrackTypes.program, compositionTypes.visualTrack] },
+ { name: "mask", tag: "Mask", mode: "structured", outputs: [typographyTrackTypes.maskSpec, compositionTypes.visualTrack] },
] as const;
export const typographyTrackManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: typographyTrackModuleRef.name,
version: typographyTrackModuleRef.version,
dependencies: [programSpaceDependency, narrativeDependency, semanticMapDependency, spatialDependency, mediaDependency, compositionDependency, textDependency],
types: [
- { name: typographyTrackTypes.style.name, schema: textStyleSchema },
- { name: typographyTrackTypes.motion.name, schema: textMotionSchema },
- { name: typographyTrackTypes.placement.name, schema: textPlacementSchema },
- { name: typographyTrackTypes.program.name, schema: typographyTrackProgramSchema },
- { name: typographyTrackTypes.header.name, schema: typographyTrackHeaderSchema },
- { name: typographyTrackTypes.itemSpec.name, schema: textItemSpecSchema },
- { name: typographyTrackTypes.plainItemSpec.name, schema: plainTextItemSpecSchema },
- { name: typographyTrackTypes.set.name, schema: typographyTrackSetSchema },
- { name: typographyTrackTypes.maskSpec.name, schema: textMaskSpecSchema },
+ { name: typographyTrackTypes.style.name },
+ { name: typographyTrackTypes.motion.name },
+ { name: typographyTrackTypes.placement.name },
+ { name: typographyTrackTypes.program.name },
+ { name: typographyTrackTypes.header.name },
+ { name: typographyTrackTypes.itemSpec.name },
+ { name: typographyTrackTypes.plainItemSpec.name },
+ { name: typographyTrackTypes.set.name },
+ { name: typographyTrackTypes.maskSpec.name },
],
capabilities: [],
producers: [
- { name: typographyTrackProducers.materializePlainItem.name, inputs: [{ name: "spec", type: typographyTrackTypes.plainItemSpec }, { name: "content", type: textTypes.text }], outputs: [{ name: "spec", type: typographyTrackTypes.itemSpec }], needs: [], implementation: registered(materializePlainTextItemImplementationDigest) },
- { name: typographyTrackProducers.bindPoint.name, inputs: [{ name: "point", type: spatialTypes.point }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered(bindPointTextPlacementImplementationDigest) },
- { name: typographyTrackProducers.bindArea.name, inputs: [{ name: "frame", type: spatialTypes.frame }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered(bindAreaTextPlacementImplementationDigest) },
- { name: typographyTrackProducers.bindPath.name, inputs: [{ name: "path", type: spatialTypes.path }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered(bindPathTextPlacementImplementationDigest) },
- { name: typographyTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered(createTypographyTrackSetImplementationDigest) },
- { name: typographyTrackProducers.appendProgram.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered(appendProgramTextItemImplementationDigest) },
- { name: typographyTrackProducers.appendSelection.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered(appendSelectionTextItemImplementationDigest) },
- { name: typographyTrackProducers.appendMoment.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered(appendMomentTextItemImplementationDigest) },
- { name: typographyTrackProducers.finalize.name, inputs: [{ name: "header", type: typographyTrackTypes.header }, { name: "set", type: typographyTrackTypes.set }], outputs: [{ name: "program", type: typographyTrackTypes.program }], needs: [], implementation: registered(finalizeTypographyTrackImplementationDigest) },
- { name: typographyTrackProducers.render.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: typographyTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered(renderTypographyTrackImplementationDigest) },
- { name: typographyTrackProducers.renderMask.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: typographyTrackTypes.program }, { name: "material", type: mediaTypes.compositableSurface }, { name: "spec", type: typographyTrackTypes.maskSpec }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered(renderTextMaskTrackImplementationDigest) },
+ { name: typographyTrackProducers.materializePlainItem.name, inputs: [{ name: "spec", type: typographyTrackTypes.plainItemSpec }, { name: "content", type: textTypes.text }], outputs: [{ name: "spec", type: typographyTrackTypes.itemSpec }], needs: [] },
+ { name: typographyTrackProducers.bindPoint.name, inputs: [{ name: "point", type: spatialTypes.point }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [] },
+ { name: typographyTrackProducers.bindArea.name, inputs: [{ name: "frame", type: spatialTypes.frame }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [] },
+ { name: typographyTrackProducers.bindPath.name, inputs: [{ name: "path", type: spatialTypes.path }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [] },
+ { name: typographyTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [] },
+ { name: typographyTrackProducers.appendProgram.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [] },
+ { name: typographyTrackProducers.appendSelection.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [] },
+ { name: typographyTrackProducers.appendMoment.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [] },
+ { name: typographyTrackProducers.finalize.name, inputs: [{ name: "header", type: typographyTrackTypes.header }, { name: "set", type: typographyTrackTypes.set }], outputs: [{ name: "program", type: typographyTrackTypes.program }], needs: [] },
+ { name: typographyTrackProducers.render.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: typographyTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
+ { name: typographyTrackProducers.renderMask.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: typographyTrackTypes.program }, { name: "material", type: mediaTypes.compositableSurface }, { name: "spec", type: typographyTrackTypes.maskSpec }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [] },
],
};
-
-export const typographyTrackManifestDigest = digestOf(typographyTrackManifest);
diff --git a/packages/typography-track/src/program.ts b/packages/typography-track/src/program.ts
index 0493eb94..4f009358 100644
--- a/packages/typography-track/src/program.ts
+++ b/packages/typography-track/src/program.ts
@@ -52,18 +52,6 @@ import type {
TypographyTrackSet,
} from "./types.js";
-export const renderTypographyTrackImplementationDigest = digestOf("@narratage/typography-track/render-complete@1");
-export const renderTextMaskTrackImplementationDigest = digestOf("@narratage/typography-track/render-owned-mask@1");
-export const createTypographyTrackSetImplementationDigest = digestOf("@narratage/typography-track/create-set-complete@1");
-export const appendProgramTextItemImplementationDigest = digestOf("@narratage/typography-track/append-program-item@1");
-export const appendSelectionTextItemImplementationDigest = digestOf("@narratage/typography-track/append-selection-item@1");
-export const appendMomentTextItemImplementationDigest = digestOf("@narratage/typography-track/append-moment-item@1");
-export const finalizeTypographyTrackImplementationDigest = digestOf("@narratage/typography-track/finalize-complete@1");
-export const bindPointTextPlacementImplementationDigest = digestOf("@narratage/typography-track/bind-point-placement@1");
-export const bindAreaTextPlacementImplementationDigest = digestOf("@narratage/typography-track/bind-area-placement@1");
-export const bindPathTextPlacementImplementationDigest = digestOf("@narratage/typography-track/bind-path-placement@1");
-export const materializePlainTextItemImplementationDigest = digestOf("@narratage/typography-track/materialize-plain-text-item@1");
-
function nonEmpty(value: string, label: string): void {
if (!value.trim()) throw new Error(`${label} must not be empty.`);
}
@@ -125,7 +113,7 @@ export function assertTextStyle(style: TextStyle): void {
}
assertVisualTrackIdentity({
kind: "visual",
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "text-style-validation",
presents: [{
id: "style",
@@ -625,7 +613,7 @@ function elements(item: TextItem): VisualElement[] {
export function renderTypographyTrack(space: ProgramSpace, program: TypographyTrackProgram): VisualTrack {
assertTypographyTrackProgramIdentity(program, space);
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: program.id,
presents: program.items.map((item) => ({
id: item.id,
@@ -651,7 +639,7 @@ export function renderTextMaskTrack(
throw new Error("Official Text Mask requires one explicit still material Surface; timed materials use an independent package.");
}
const track = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: spec.id,
presents: program.items.map((item) => {
assertMotionDomain(item);
diff --git a/packages/typography-track/test/typography-track.test.ts b/packages/typography-track/test/typography-track.test.ts
index 41ce93e0..9fb2539b 100644
--- a/packages/typography-track/test/typography-track.test.ts
+++ b/packages/typography-track/test/typography-track.test.ts
@@ -184,7 +184,7 @@ test("persistent and timed Text Items lower to ordinary VisualTrack Presents", (
assert.equal(track.presents[0]?.elements[2]?.kind, "text-flow");
const lower = sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "lower",
presents: [{
id: "lower",
@@ -198,9 +198,9 @@ test("persistent and timed Text Items lower to ordinary VisualTrack Presents", (
canvas: { width: 1080, height: 1920, clearColor: "#000000" },
tracks: [track, lower],
}), space);
- assert.match(rendered.html, /data-svml-text-run="run"/u);
+ assert.match(rendered.html, /data-narratage-text-run="run"/u);
assert.match(rendered.html, /background-image:linear-gradient\(#111111,#111111\)/u);
- assert.ok(rendered.html.indexOf('data-svml-present-id="lower"') < rendered.html.indexOf('data-svml-present-id="callout"'));
+ assert.ok(rendered.html.indexOf('data-narratage-present-id="lower"') < rendered.html.indexOf('data-narratage-present-id="callout"'));
});
test("Text Mask explicitly consumes one authored Text Program and one owned still Surface", () => {
@@ -320,10 +320,9 @@ test("the self-described Markup Surfaces compile Style, Motion and all three spa
mediaTypes.compositableSurface,
textTypes.text,
],
- implementation: { digest: fixtureDigest },
} as const;
const fixtureManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: fixtureModule.name,
version: fixtureModule.version,
dependencies: [
@@ -332,7 +331,6 @@ test("the self-described Markup Surfaces compile Style, Motion and all three spa
mediaDependency,
{
module: { name: svsManifest.name, version: svsManifest.version },
- digest: computeModuleDigest(svsManifest),
},
textDependency,
],
@@ -596,12 +594,12 @@ test("rich Text lowers ordered glyph layers, boxes, bounded flow, sequences and
id: "rich-text-film",
canvas: { width: 1080, height: 900, clearColor: "#000000" }, tracks: [track],
}), space);
- assert.match(rendered.html, /data-svml-text-paint-layer="5"/u);
+ assert.match(rendered.html, /data-narratage-text-paint-layer="5"/u);
assert.match(rendered.html, /feMorphology/u);
assert.match(rendered.html, /linear-gradient\(30deg/u);
assert.match(rendered.html, /radial-gradient/u);
- assert.match(rendered.html, /data-svml-text-overflow="shrink"/u);
- assert.match(rendered.html, /data-svml-text-line-sequences/u);
+ assert.match(rendered.html, /data-narratage-text-overflow="shrink"/u);
+ assert.match(rendered.html, /data-narratage-text-line-sequences/u);
assert.match(rendered.html, /<textPath/u);
- assert.match(rendered.html, /data-svml-text-path-margin/u);
+ assert.match(rendered.html, /data-narratage-text-path-margin/u);
});
diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.ts
index 5ad8c2be..d33a0590 100644
--- a/packages/validation/src/index.ts
+++ b/packages/validation/src/index.ts
@@ -1,8 +1,6 @@
import {
- isDigest,
resolveType,
sealRecord,
- validateStoredValue,
verifyRecordStructure,
} from "@narratage/core";
import type {
@@ -10,14 +8,7 @@ import type {
TypeValidatorHandler,
TypeValidatorRegistrar,
} from "@narratage/component-kit";
-import type {
- Digest,
- ResolvedModuleClosure,
- ResolvedTypeDeclaration,
- StoredValue,
- TypeRef,
- TypedRecord,
-} from "@narratage/protocol";
+import type { ResolvedModuleClosure, StoredValue, TypeRef, TypedRecord } from "@narratage/protocol";
function typeKey(type: TypeRef): string {
return `${type.module.name}@${type.module.version}#${type.name}`;
@@ -26,7 +17,6 @@ function typeKey(type: TypeRef): string {
export type { TypeValidatorContext, TypeValidatorHandler, TypeValidatorRegistrar } from "@narratage/component-kit";
export type TypeValidatorRegistration = {
- readonly implementationDigest: Digest;
readonly handler: TypeValidatorHandler;
};
@@ -51,17 +41,13 @@ export class TypeValidatorRegistry implements TypeValidatorRegistryLike, TypeVal
register(
type: TypeRef,
- implementationDigest: Digest,
handler: TypeValidatorHandler,
): void {
const key = typeKey(type);
- if (!isDigest(implementationDigest)) {
- throw new TypeValidationError("INVALID_TYPE_VALIDATOR_DIGEST", `${key} validator digest is invalid`, key);
- }
if (this.#validators.has(key)) {
throw new TypeValidationError("DUPLICATE_TYPE_VALIDATOR", `${key} validator is already registered`, key);
}
- this.#validators.set(key, { implementationDigest, handler });
+ this.#validators.set(key, { handler });
}
resolve(type: TypeRef): TypeValidatorRegistration | undefined {
@@ -70,23 +56,12 @@ export class TypeValidatorRegistry implements TypeValidatorRegistryLike, TypeVal
}
async function refineValue(
- declaration: ResolvedTypeDeclaration,
type: TypeRef,
value: StoredValue,
registry: TypeValidatorRegistryLike,
): Promise<void> {
- if (declaration.validator === undefined) return;
const registration = registry.resolve(type);
- if (registration === undefined) {
- throw new TypeValidationError("MISSING_TYPE_VALIDATOR", `${typeKey(type)} validator is not registered`, typeKey(type));
- }
- if (registration.implementationDigest !== declaration.validator.implementation.digest) {
- throw new TypeValidationError(
- "TYPE_VALIDATOR_IMPLEMENTATION_MISMATCH",
- `${typeKey(type)} validator does not match the locked Manifest`,
- typeKey(type),
- );
- }
+ if (registration === undefined) return;
try {
await registration.handler({ type: structuredClone(type), value: structuredClone(value) });
} catch (error) {
@@ -104,9 +79,8 @@ export async function validateValue(
value: StoredValue,
registry: TypeValidatorRegistryLike,
): Promise<void> {
- const declaration = resolveType(closure, type);
- validateStoredValue(value, declaration.schema, `$validation.${typeKey(type)}`);
- await refineValue(declaration, type, value, registry);
+ resolveType(closure, type);
+ await refineValue(type, value, registry);
}
export async function admitRecord(
@@ -119,13 +93,15 @@ export async function admitRecord(
...draft
} = record;
const admitted = sealRecord(draft);
- const declaration = verifyRecordStructure(closure, admitted);
- await refineValue(declaration, record.type, record.value, registry);
+ verifyRecordStructure(closure, admitted);
+ await refineValue(record.type, record.value, registry);
return admitted;
}
export function createRecordAdmitter(
registry: TypeValidatorRegistryLike,
-): (closure: ResolvedModuleClosure, record: TypedRecord) => Promise<TypedRecord> {
- return async (closure, record) => await admitRecord(closure, record, registry);
+): (closure: ResolvedModuleClosure, record: TypedRecord) => Promise<void> {
+ return async (closure, record) => {
+ await admitRecord(closure, record, registry);
+ };
}
diff --git a/packages/video-cli/README.md b/packages/video-cli/README.md
index 41e760c7..83a307cd 100644
--- a/packages/video-cli/README.md
+++ b/packages/video-cli/README.md
@@ -3,58 +3,56 @@
Official video command application. It selects the Markup compiler Host, but deliberately carries
no built-in author, Run, Provider or Store package.
-Every Frontend, Surface, deterministic Producer and Validator is activated from an explicit
-`svml.packages.lock`. Installing a new author package therefore does not require a video CLI or Core
-release. Source imports select logical author meaning only after the Host has reviewed and locked
-the corresponding physical package. They never grant network, credential or process authority.
+Every Frontend, Surface, deterministic Producer and Validator is activated from Source imports.
+Installing a new author package therefore does not require a video CLI or Core release. Source
+imports never grant network, credential or process authority.
From the repository:
```bash
cd path/to/project
-/path/to/narratage/narratage runtime use svml.runtime.json
-/path/to/narratage/narratage packages sync build.svrun
-/path/to/narratage/narratage check main.svml
-/path/to/narratage/narratage plan build.svrun
-/path/to/narratage/narratage build build.svrun --follow
-/path/to/narratage/narratage status <build-id>
-/path/to/narratage/narratage builds
-/path/to/narratage/narratage history [source-output-name] [--source ./main.svml]
-/path/to/narratage/narratage inspect <build-id>
-/path/to/narratage/narratage get <build-id> --name final.video --to ./final.mp4
-/path/to/narratage/narratage cancel <build-id>
-/path/to/narratage/narratage doctor
-/path/to/narratage/narratage gc
+narratage runtime use narratage.runtime.json
+narratage check main.svml
+narratage plan build.svrun
+narratage build build.svrun --follow
+narratage status <build-id> --watch
+narratage builds
+narratage history [source-output-name] [--source ./main.svml]
+narratage inspect <build-id>
+narratage get <build-id> --name final.video --to ./final.mp4
+narratage cancel <build-id>
+narratage doctor
+narratage gc
```
-From a separate project directory during source development, run
-`/path/to/narratage/narratage ...`. The root launcher resolves its own TypeScript loader, CLI and
-package installation, so it neither invokes pnpm per command nor requires the project directory to
-contain Narratage's `package.json`.
+Link the repository command once with `npm link`. It resolves its own TypeScript loader and CLI, so
+it neither invokes pnpm per command nor requires a separate project to contain Narratage's
+`package.json`.
`--workspace` is only the Source Workspace containment boundary. `--asset-root` may additionally admit
explicit asset bytes without widening Source imports. `--package-root` is only the Host
-override used to resolve the installed packages named by a lock; by default this Distribution uses
-its own installation location. Keeping the two concepts separate lets a video project live outside
-this checkout without weakening canonical-path source and asset containment. Runtime Profiles do
-not contain either Workspace or package-installation overrides.
+override used to resolve installed packages. By default, a project with
+`package.json` owns package resolution; a plain creative folder falls back to this Distribution's
+installation. Keeping that separate from Source containment lets a video project live outside this
+checkout without weakening canonical-path source and asset boundaries. Runtime Profiles do not
+contain either Workspace or package-installation overrides.
`check` is usable for an Author Source or a complete Run Source. `plan` and `build` require a Run
Source because an Author Graph without execution intent is not a Build. The live example executes
the explicit Vertex Gemini Caption package and real local/remote Endpoints; the CLI never
fabricates a Target, Candidate or missing fact.
-`build` compiles the locked BuildState and passes it to a trusted local Runtime Profile with a fresh,
+`build` compiles the BuildState and passes it to the selected Runtime Profile with a fresh,
automatically assigned execution id. Source or Plan identity never reclaims an earlier Build; reuse
across Builds exists only through explicit Run Source Candidates. JSON Profiles resolve only adapters in their separately
-verified `runtimePackageLock` and contain no executable callback. The CLI imports no Provider;
-loaded Runtime implementation identity is rebound to the actual package bytes. A TypeScript config
+selected `use` fields and contain no executable callback. The CLI imports no Provider. A TypeScript config
module remains trusted deployment code with normal Node authority. Neither form is discovered from
a source import.
Without `--follow`, `build` returns after durable submission and the detached Worker continues.
With `--follow`, the CLI observes dispatch and Operation facts until terminal state or
-`--max-wait-ms`; Ctrl-C only detaches that observer. `status` reads durable verified state. The CLI
+`--max-wait-ms`; Ctrl-C only detaches that observer. `status` reads durable verified state, and
+`status --watch` reattaches the same kind of observer to an existing Build. The CLI
controls Builds, not individual Operations. Cancelling a Build atomically withdraws it before claim,
or closes admission and continues Provider cancellation reconciliation after claim. It never selects
another Candidate. None of these commands creates or stores a ready-Command queue.
@@ -84,12 +82,10 @@ output. Upstream work behind the selected Candidate is pruned by reverse reachab
unbound reachable output follows the ordinary graph. This is a new Build identity and never resumes
or copies the prior Build's outstanding Commands.
-`@narratage/package-loader-node` supports explicitly trusted installed implementation packages. It
-verifies the complete physical dependency closure before executing an activation entry, then checks
-exact Module, Host-facet, Producer and Validator identities. Frontends are ordinary
-`svml.source-frontend@1` Host facets, so the Loader does not
-select a syntax; each Source Header selects among Frontends trusted by this Distribution and its
-locked packages. Run Fragment libraries enter only through the `svml.run-fragment-host@1` facet.
-`plan` and `build` bind the lock digest into `BuildRequest.implementationClosure`. Source cannot
+`@narratage/package-loader-node` loads explicitly selected installed implementation packages and checks
+their Module, Host-facet, Producer and Validator contributions. Frontends are ordinary
+`narratage.source-frontend@1` Host facets, so the Loader does not
+select a syntax; each Source Header selects among installed Frontends. Run Fragment libraries enter
+only through the `narratage.run-fragment-host@1` facet. Source cannot
install a package or activate Provider/Runtime authority. Arbitrary untrusted community execution
remains absent until an isolated Worker and real permission boundary exist.
diff --git a/packages/video-cli/package.json b/packages/video-cli/package.json
index e727ec46..830e778e 100644
--- a/packages/video-cli/package.json
+++ b/packages/video-cli/package.json
@@ -12,7 +12,7 @@
"@narratage/compiler-markup-node": "workspace:*",
"@narratage/markup": "workspace:*",
"@narratage/package-loader-node": "workspace:*",
- "@narratage/runtime-adapter-node": "workspace:*",
+ "@narratage/runtime-host-node": "workspace:*",
"@narratage/workspace-fs-node": "workspace:*"
}
}
diff --git a/packages/video-cli/src/distribution.ts b/packages/video-cli/src/distribution.ts
index 5e9dd353..cac2a6fd 100644
--- a/packages/video-cli/src/distribution.ts
+++ b/packages/video-cli/src/distribution.ts
@@ -1,30 +1,34 @@
import type { CliDistribution } from "@narratage/cli";
-import { loadNodeRuntimeHost } from "@narratage/runtime-adapter-node";
+import { loadNodeRuntimeHost } from "@narratage/runtime-host-node";
import { fileURLToPath } from "node:url";
import {
createVideoCompiler,
} from "./compiler.js";
-const packageRoot = import.meta.dirname;
+const fallbackPackageRoot = import.meta.dirname;
+const installedLauncher = process.env.NARRATAGE_CLI_LAUNCHER;
/** Official video authoring assembly for the generic CLI engine. */
export const videoCliDistribution: CliDistribution = {
- packageRoot,
+ fallbackPackageRoot,
bootstrapPackages: [],
createCompiler: createVideoCompiler,
discoverSourcePackages: async (path, options) => {
const { discoverVideoSourcePackages } = await import("./package-selection.js");
return await discoverVideoSourcePackages(path, options);
},
- openRuntimeHost: async (path) => await loadNodeRuntimeHost(path, {
- packageRoot,
+ openRuntimeHost: async (path, options) => await loadNodeRuntimeHost(path, {
+ packageRoot: options.packageRoot,
workerLaunch: {
command: process.execPath,
- // A test runner's --test flags must never leak into the detached CLI.
- args: [
- ...process.execArgv.filter((item) => !item.startsWith("--test")),
- fileURLToPath(new URL("./cli.ts", import.meta.url)),
- ],
+ // The installed cross-platform bin is self-bootstrapping. Tests and direct
+ // source imports retain the explicit TypeScript loader fallback.
+ args: installedLauncher === undefined
+ ? [
+ ...process.execArgv.filter((item) => !item.startsWith("--test")),
+ fileURLToPath(new URL("./cli.ts", import.meta.url)),
+ ]
+ : [installedLauncher],
},
}),
};
diff --git a/packages/video-cli/src/index.ts b/packages/video-cli/src/index.ts
index 30a4180e..895b4239 100644
--- a/packages/video-cli/src/index.ts
+++ b/packages/video-cli/src/index.ts
@@ -4,7 +4,7 @@ import {
runCli,
} from "@narratage/cli";
import type { CliIo } from "@narratage/cli";
-import type { NodePackageBinding } from "@narratage/package-loader-node";
+import type { LoadedPackage } from "@narratage/package-loader-node";
import { videoCliDistribution } from "./distribution.js";
@@ -13,11 +13,12 @@ export {
createVideoCompiler,
} from "./compiler.js";
export { videoCliDistribution } from "./distribution.js";
+export { discoverVideoSourcePackages } from "./package-selection.js";
export function runVideoCli(
argv: readonly string[],
io: CliIo,
- packages: readonly NodePackageBinding[] = [],
+ packages: readonly LoadedPackage[] = [],
): Promise<void> {
return runCli(argv, io, {
...videoCliDistribution,
diff --git a/packages/video-cli/src/package-selection.ts b/packages/video-cli/src/package-selection.ts
index efcb64b8..c9944ab4 100644
--- a/packages/video-cli/src/package-selection.ts
+++ b/packages/video-cli/src/package-selection.ts
@@ -3,7 +3,7 @@ import {
createMarkupAuthorFrontend,
MarkupSurfaceRegistry,
} from "@narratage/markup";
-import type { NodePackageBinding } from "@narratage/package-loader-node";
+import type { LoadedPackage } from "@narratage/package-loader-node";
const markupFrontend = createMarkupAuthorFrontend({
registry: new MarkupSurfaceRegistry(),
@@ -17,7 +17,7 @@ export async function discoverVideoSourcePackages(
sourcePath: string,
options: {
readonly workspaceRoot?: string;
- readonly packages?: readonly NodePackageBinding[];
+ readonly packages?: readonly LoadedPackage[];
} = {},
) {
return await discoverSourcePackages(sourcePath, {
diff --git a/packages/video-cli/test/cli.test.ts b/packages/video-cli/test/cli.test.ts
index a1234ae7..baf8570f 100644
--- a/packages/video-cli/test/cli.test.ts
+++ b/packages/video-cli/test/cli.test.ts
@@ -1,15 +1,11 @@
import assert from "node:assert/strict";
import { createHash } from "node:crypto";
-import { mkdir, mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import test from "node:test";
-import { createNodePackageLock, writeNodePackageLock } from "@narratage/package-loader-node";
-import { runCli as runCoreCli } from "@narratage/cli";
-import type { CliDistribution } from "@narratage/cli";
-import { materializeRecord, runVideoCli } from "@narratage/video-cli";
-import { videoCliDistribution } from "@narratage/video-cli";
+import { materializeRecord, runVideoCli, videoCliDistribution } from "@narratage/video-cli";
import { videoTestPackages } from "./packages.js";
@@ -18,8 +14,8 @@ const runCli = (
io: { readonly write: (text: string) => void },
) => runVideoCli([...argv, "--json"], io, videoTestPackages);
-test("source package selection is derived from Run and Author imports", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-package-selection-"));
+test("source package selection follows Run and Author imports", async () => {
+ const root = await mkdtemp(join(tmpdir(), "narratage-cli-package-selection-"));
try {
await writeFile(join(root, "style.svs"), `<?svml using="@narratage/svs@1"?>\n<sheet version="1"/>`, "utf8");
await writeFile(join(root, "main.svml"), `<?svml using="@narratage/markup@1"?>
@@ -28,7 +24,12 @@ test("source package selection is derived from Run and Author imports", async ()
<import as="style" source="./style.svs"/>
<script id="story"><line><HOST>Hello.</line></script>
</svml>`, "utf8");
- const run = await writeRun(root, "build.svrun", [{ output: "story" }]);
+ const run = join(root, "build.svrun");
+ await writeFile(run, `<?svml using="@narratage/run-markup@1"?>
+<svrun version="1">
+ <author source="./main.svml"/>
+ <target output="story"/>
+</svrun>`, "utf8");
const discovered = await videoCliDistribution.discoverSourcePackages!(run, {
workspaceRoot: root,
packages: videoTestPackages,
@@ -39,956 +40,50 @@ test("source package selection is derived from Run and Author imports", async ()
}
});
-test("production video CLI has no implicit author or Run packages", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-empty-distribution-"));
- const file = join(root, "main.svml");
- await writeFile(file, `<?svml using="@narratage/markup@1"?>
-<svml>
- <import from="@narratage/script@1"/>
- <script id="story"><opening><HOST>No hidden package.</opening></script>
-</svml>`, "utf8");
-
- await assert.rejects(
- async () => await runVideoCli(["check", file], { write() {} }),
- /No registered module satisfies @narratage\/script@1/u,
- );
-});
-
-async function writeRun(
- root: string,
- name: string,
- targets: readonly { readonly output: string }[],
-): Promise<string> {
- const path = join(root, name);
- await writeFile(path, `<?svml using="@narratage/run-markup@1"?>
-<svrun version="1">
- <author source="./main.svml"/>
- ${targets.map((target) => `<target output="${target.output}"/>`).join("\n ")}
-</svrun>`, "utf8");
- return path;
-}
-
-test("official video CLI checks a real Script source through the Node compiler host", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-"));
- const file = join(root, "main.svml");
- await writeFile(join(root, "studio.svs"), `<?svml using="@narratage/svs@1"?>
-<sheet version="1">
- caption.host {
- color: #ffffff;
- font-size: 72;
- }
- </sheet>`, "utf8");
- await writeFile(file, `<?svml using="@narratage/markup@1"?>
-<svml>
- <import from="@narratage/script@1"/>
- <import as="studio" source="./studio.svs"/>
- <script id="story">
- <opening>
- <ALICE>Meaning becomes the source.
- </opening>
- </script>
- </svml>`, "utf8");
- let output = "";
- await runCli(["check", file], { write: (text) => { output += text; } });
- const result = JSON.parse(output) as {
- readonly ok: boolean;
- readonly units: number;
- readonly modules: readonly string[];
- readonly exports: readonly { readonly name: string; readonly kind: string }[];
- };
- assert.equal(result.ok, true);
- assert.equal(result.units, 2);
- assert.deepEqual([...result.modules].sort(), [
- "@narratage/narrative@1",
- "@narratage/script@1",
- "@narratage/svs@1",
- "@narratage/text@1",
- ]);
- assert.deepEqual(result.exports, [
- { name: "story", type: {
- module: { name: "@narratage/narrative", version: "1" },
- name: "Narrative",
- }, kind: "record" },
- { name: "story.caption", type: {
- module: { name: "@narratage/narrative", version: "1" },
- name: "CaptionDisplaySequence",
- }, kind: "record" },
- { name: "story.caption.correspondence", type: {
- module: { name: "@narratage/narrative", version: "1" },
- name: "CaptionCorrespondence",
- }, kind: "record" },
- { name: "story.segment.opening", type: {
- module: { name: "@narratage/narrative", version: "1" },
- name: "NarrativeExcerpt",
- }, kind: "record" },
- { name: "story.segment.opening.dialogue", type: {
- module: { name: "@narratage/text", version: "1" },
- name: "Text",
- }, kind: "record" },
- { name: "story.segment.opening.speech", type: {
- module: { name: "@narratage/text", version: "1" },
- name: "Text",
- }, kind: "record" },
- ]);
-});
-
-test("author source binds an ordered exact Font stack to a Fine Caption Style", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-caption-font-"));
- const file = join(root, "main.svml");
- const fontBytes = new Uint8Array([119, 79, 70, 50, 0, 1, 0, 0]);
- await writeFile(join(root, "caption.woff2"), fontBytes);
- await writeFile(join(root, "caption-fallback.woff2"), new Uint8Array([...fontBytes, 1]));
- await writeFile(join(root, "studio.svs"), `<?svml using="@narratage/svs@1"?>
-<sheet version="1">
- caption.primary {
- cue-min-words: 1; cue-max-words: 4;
- stack-order: 20; x: 0.5; y: 0.9; width: 0.8;
- align: center; size: 48; line-height: 1.1;
- fill: #ffffff; background: #00000000; padding: 0 0; radius: 0;
- }
-</sheet>`, "utf8");
- await writeFile(file, `<?svml using="@narratage/markup@1"?>
-<svml>
- <import as="media" from="@narratage/media@1"/>
- <import as="caption-fine" from="@narratage/caption-fine@1"/>
- <import as="studio" source="./studio.svs"/>
-
- <media:Font id="caption-font" src="./caption.woff2" weight="600" style="normal"/>
- <media:Font id="caption-fallback" src="./caption-fallback.woff2" weight="600" style="normal"/>
- <caption-fine:Style id="primary-caption" recipe={studio.caption.primary} font={caption-font}>
- <caption-fine:Fallback font={caption-fallback}/>
- </caption-fine:Style>
-</svml>`, "utf8");
-
- let output = "";
- await runCli(["check", file], { write: (text) => { output += text; } });
- const result = JSON.parse(output) as {
- readonly ok: boolean;
- readonly exports: readonly { readonly name: string; readonly kind: string }[];
- };
- assert.equal(result.ok, true);
- assert.equal(result.exports.some((item) => item.name === "caption-font" && item.kind === "record"), true);
- assert.equal(result.exports.some((item) => item.name === "caption-fallback" && item.kind === "record"), true);
- assert.equal(result.exports.some((item) => item.name === "primary-caption" && item.kind === "record"), true);
-});
-
-test("an installed open-font package supplies a multilingual exact stack without system fonts", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-installed-fonts-"));
- const file = join(root, "main.svml");
- await writeFile(join(root, "studio.svs"), `<?svml using="@narratage/svs@1"?>
-<sheet version="1">
- caption.primary {
- cue-min-words: 1; cue-max-words: 4;
- stack-order: 20; x: 0.5; y: 0.9; width: 0.8;
- align: center; size: 48; line-height: 1.1;
- fill: #ffffff; background: #00000000; padding: 0 0; radius: 0;
- }
-</sheet>`, "utf8");
- await writeFile(file, `<?svml using="@narratage/markup@1"?>
-<svml>
- <import as="fonts" from="@narratage/fonts-open@1"/>
- <import as="caption-fine" from="@narratage/caption-fine@1"/>
- <import as="studio" source="./studio.svs"/>
-
- <fonts:Stack id="caption-fonts" family="inter" weight="700" style="normal" emoji="color">
- <fonts:Fallback family="noto-sans-sc" weight="700" style="normal"/>
- </fonts:Stack>
- <caption-fine:Style id="primary-caption" recipe={studio.caption.primary} font={caption-fonts}/>
-</svml>`, "utf8");
-
- let output = "";
- await runCli(["check", file], { write: (text) => { output += text; } });
- const result = JSON.parse(output) as {
- readonly ok: boolean;
- readonly exports: readonly { readonly name: string; readonly kind: string }[];
- };
- assert.equal(result.ok, true);
- assert.deepEqual(
- result.exports.map((item) => item.name).sort(),
- ["caption-fonts", "primary-caption"],
- );
-});
-
-test("Text Template and exact Seedance keep speaker prompt assembly visible in the Run Graph", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-text-template-"));
- const file = join(root, "main.svml");
- const kitSource = await readFile(
- new URL("../../seedance-kits/kits/speaker-v1.svs", import.meta.url),
- "utf8",
- );
- await writeFile(join(root, "speaker-v1.svs"), kitSource, "utf8");
- await writeFile(join(root, "studio.svs"), `<?svml using="@narratage/svs@1"?>
-<sheet version="1">
- speech.normal { language: en; pace: normal; min: 4; max: 15; rounding: round; }
- speaker.default {
- composition-stability: soft-locked; camera-motion: none;
- edit-rhythm: continuous-take; performance: natural-explainer; gesture: natural;
- }
-</sheet>`, "utf8");
- await writeFile(join(root, "host.png"), new Uint8Array([137, 80, 78, 71]));
- await writeFile(file, `<?svml using="@narratage/markup@1"?>
-<svml>
- <import from="@narratage/script@1"/>
- <import as="text" from="@narratage/text@1"/>
- <import as="media" from="@narratage/media@1"/>
- <import as="estimate" from="@narratage/estimate@1"/>
- <import as="seedance" from="@narratage/seedance@1"/>
- <import as="studio" source="./studio.svs"/>
- <import as="speaker-kit" source="./speaker-v1.svs"/>
-
- <script id="story"><opening><HOST>Meaning becomes the source.</opening></script>
- <media:Image id="host" src="./host.png"/>
- <media:Audio id="voice" src="./voice.mp3"/>
- <text:Value id="action">Hold direct eye contact and use one compact gesture.</text:Value>
- <estimate:Speech id="duration" source={story.segment.opening.speech} policy={studio.speech.normal}/>
- <text:Render id="take-prompt" template={speaker-kit.speaker-v1} recipe={studio.speaker.default}>
- <text:Set name="dialogue" text={story.segment.opening.dialogue}/>
- <text:Set name="action" text={action}/>
- </text:Render>
- <seedance:ReferenceVideo id="take" model="mini" prompt={take-prompt}
- duration={duration.duration} resolution="720p" aspect-ratio="9:16" generate-audio="true">
- <seedance:Reference image={host}/>
- <seedance:Reference audio={voice}/>
- </seedance:ReferenceVideo>
-</svml>`, "utf8");
- await writeFile(join(root, "voice.mp3"), new Uint8Array([73, 68, 51]));
-
- let checkedOutput = "";
- await runCli(["check", file], { write: (text) => { checkedOutput += text; } });
- const checked = JSON.parse(checkedOutput) as {
- readonly exports: readonly { readonly name: string }[];
- };
- const names = checked.exports.map((item) => item.name);
- assert.equal(names.includes("take-prompt"), true);
- assert.equal(names.includes("take.video"), true);
-
- const run = await writeRun(root, "build.svrun", [{ output: "take.video" }]);
- let planOutput = "";
- await runCli(["plan", run], { write: (text) => { planOutput += text; } });
- const plan = (JSON.parse(planOutput) as { readonly plan: {
- readonly steps: readonly { readonly producer: { readonly name: string } }[];
- } }).plan;
- assert.deepEqual(plan.steps.map((step) => step.producer.name).sort(), [
- "bind-request-seedance-2-mini-referenceImage",
- "bind-request-seedance-2-mini-referenceAudio",
- "bind-request-seedance-2-mini-prompt-text",
- "bind-text",
- "bind-text",
- "compile-seedance-2-mini-duration-request",
- "estimate-speech-duration",
- "finalize-request-seedance-2-mini",
- "request-seedance-2-mini",
- "render",
- "select-primary-video",
- ].sort());
-});
-
-test("CLI delegates a declarative Runtime Profile by content, not filename suffix", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-runtime-profile-"));
- const profile = join(root, "deployment.profile");
- const runtimePackageLock = join(root, "runtime.packages.lock");
- await writeNodePackageLock(
- runtimePackageLock,
- await createNodePackageLock([
- "@narratage/local",
- "@narratage/store-sqlite",
- "@narratage/artifact-store-fs",
- "@narratage/credential-store-env",
- "@narratage/provider-kie",
- ], process.cwd()),
- );
- await writeFile(profile, JSON.stringify({
- format: "narratage.runtime-profile@1",
- runtimePackageLock,
- runtime: {
- use: "@narratage/local",
- config: {
- dataRoot: ".",
- components: {
- execution: { use: "@narratage/local" },
- state: { use: "@narratage/store-sqlite", config: { path: "state.sqlite" } },
- artifacts: { use: "@narratage/artifact-store-fs", config: { path: "artifacts" } },
- credentials: { use: "@narratage/credential-store-env", config: {} },
- },
- bindings: {
- scheduler: "execution.scheduler",
- worker: "execution.worker",
- stores: {
- build: "state.builds",
- operations: "state.operations",
- dispatch: "state.dispatch",
- artifacts: "artifacts",
- credentials: ["credentials"],
- },
- },
- endpoints: {
- "kie.cli-test": {
- use: "@narratage/provider-kie",
- authority: "kie.cli-test",
- config: { apiKey: { store: "env", key: "SVML_TEST_MISSING_KIE_KEY" }, defaultConcurrency: 2 },
- },
- },
- limits: { maxOperations: 4, resources: { "authority:kie.cli-test": 2 } },
- },
- },
- }), "utf8");
- let output = "";
- await runCli(["status", "missing-build", "--runtime", profile], {
- write: (text) => { output += text; },
- });
- const status = JSON.parse(output) as { readonly operations: readonly unknown[] };
- assert.deepEqual(status.operations, []);
- output = "";
- await runCli(["doctor", profile], { write: (text) => { output += text; } });
- const diagnosis = JSON.parse(output) as {
- readonly ok: boolean;
- readonly diagnostics: readonly { readonly code: string; readonly subject?: string }[];
- };
- assert.equal(diagnosis.ok, false);
- assert.deepEqual(diagnosis.diagnostics.map((item) => ({ code: item.code, subject: item.subject })), [{
- code: "RUNTIME_CREDENTIAL_MISSING",
- subject: "kie.cli-test.apiKey",
- }]);
- output = "";
- await runCli(["auth", "status", "kie.cli-test", "--runtime", profile], {
- write: (text) => { output += text; },
- });
- const auth = JSON.parse(output) as {
- readonly credentials: readonly { readonly slot: string; readonly configured: boolean; readonly writable: boolean }[];
- };
- assert.deepEqual(auth.credentials.map((item) => ({
- slot: item.slot, configured: item.configured, writable: item.writable,
- })), [{ slot: "apiKey", configured: false, writable: false }]);
-});
-
-test("one checked-in fixture closes the complete provider-free video plan", async () => {
+test("provider-free example plans from installed Source packages", async () => {
const fixture = join(process.cwd(), "examples", "talking-film-graph-check");
let output = "";
await runCli([
"plan",
join(fixture, "build.svrun"),
- "--package-lock",
- join(fixture, "svml.packages.lock"),
"--workspace",
process.cwd(),
], { write: (text) => { output += text; } });
const plan = (JSON.parse(output) as { readonly plan: {
readonly goals: readonly unknown[];
- readonly steps: readonly {
- readonly producer: { readonly name: string };
- }[];
+ readonly steps: readonly { readonly producer: { readonly name: string } }[];
} }).plan;
const producers = new Set(plan.steps.map((step) => step.producer.name));
- for (const name of [
- "request-seedance-2-mini",
- "assemble-speech-basis",
- "request-whisperx-alignment",
- "request-caption-gemini-plan",
- "request-media-inspection",
- "request-media-normalization",
- "project-media-visual-track",
- "render-fine-caption",
- "render-typography-track",
- "compile-composition",
- "request-visual-render",
- "request-audio-render",
- "request-media-mux",
- "project-muxed-media",
- ]) {
- assert.equal(producers.has(name), true, name);
- }
+ assert.equal(producers.has("assemble-speech-basis"), true);
+ assert.equal(producers.has("compile-composition"), true);
+ assert.equal(producers.has("project-muxed-media"), true);
assert.equal(plan.goals.length, 1);
});
-test("one locked provider-free Build executes the checked-in Frame graph", async () => {
- const fixture = join(process.cwd(), "examples", "talking-film-graph-check");
- const runtimeRoot = await mkdtemp(join(tmpdir(), "narratage-frame-smoke-"));
- const profile = join(runtimeRoot, "svml.runtime.json");
- const runtimePackageLock = join(runtimeRoot, "svml.runtime-packages.lock");
- await writeNodePackageLock(runtimePackageLock, await createNodePackageLock([
- "@narratage/local",
- "@narratage/store-sqlite",
- "@narratage/artifact-store-fs",
- ], process.cwd()));
- await writeFile(profile, JSON.stringify({
- format: "narratage.runtime-profile@1",
- runtimePackageLock,
- runtime: {
- use: "@narratage/local",
- config: {
- dataRoot: ".",
- components: {
- execution: { use: "@narratage/local" },
- state: { use: "@narratage/store-sqlite", config: { path: "state.sqlite" } },
- artifacts: { use: "@narratage/artifact-store-fs", config: { path: "artifacts" } },
- },
- bindings: {
- scheduler: "execution.scheduler",
- worker: "execution.worker",
- stores: {
- build: "state.builds",
- operations: "state.operations",
- dispatch: "state.dispatch",
- artifacts: "artifacts",
- credentials: [],
- },
- },
- endpoints: {},
- limits: { maxOperations: 2, resources: {} },
- },
- },
- }), "utf8");
-
- let output = "";
+test("materializeRecord copies an archived Artifact without rerunning a Build", async () => {
+ const root = await mkdtemp(join(tmpdir(), "narratage-cli-get-"));
try {
- await runVideoCli([
- "build", join(fixture, "frame-smoke.svrun"),
- "--runtime", profile,
- "--workspace", fixture,
- "--follow",
- "--max-wait-ms", "60000",
- "--json",
- ], { write: (text) => { output += text; } });
- const result = JSON.parse(output) as {
- readonly status: string;
- readonly goals: readonly { readonly value?: {
- readonly kind: string;
- readonly value?: { readonly widthPx?: number; readonly heightPx?: number };
- } }[];
- };
- assert.equal(result.status, "complete");
- assert.ok((result.goals[0]?.value?.value?.widthPx ?? 0) > 0);
- assert.ok((result.goals[0]?.value?.value?.heightPx ?? 0) > 0);
+ const bytes = Buffer.from("final-video-bytes");
+ const artifactDigest = `sha256:${createHash("sha256").update(bytes).digest("hex")}`;
+ const output = join(root, "final.mp4");
+ const runtime = {
+ async openArtifact(digest: string) {
+ return digest === artifactDigest ? (async function* () { yield bytes; })() : undefined;
+ },
+ } as Parameters<typeof materializeRecord>[0];
+ const record = {
+ id: "final.video",
+ value: { kind: "inline", value: { digest: artifactDigest, size: bytes.byteLength, mediaType: "video/mp4" } },
+ } as unknown as Parameters<typeof materializeRecord>[1];
+ const result = await materializeRecord(runtime, record, output);
+ assert.deepEqual(result, {
+ kind: "artifact",
+ digest: artifactDigest,
+ mediaType: "video/mp4",
+ size: bytes.byteLength,
+ path: output,
+ });
} finally {
- await runVideoCli(["runtime", "down", "--runtime", profile, "--json"], { write() {} });
- await rm(runtimeRoot, { recursive: true, force: true });
+ await rm(root, { recursive: true, force: true });
}
});
-
-test("CLI package lock activates an installed package without changing the official host", async () => {
- const directory = await mkdtemp(join(tmpdir(), "svml-cli-package-lock-"));
- const projectRoot = join(directory, "external-video-project");
- const installedPackage = join(directory, "narratage-install", "node_modules", "example-empty");
- const installedExtra = join(directory, "narratage-install", "node_modules", "example-extra");
- const packageRoot = join(directory, "narratage-install");
- await mkdir(projectRoot, { recursive: true });
- await mkdir(installedPackage, { recursive: true });
- await mkdir(installedExtra, { recursive: true });
- const implementationDigest = `sha256:${"2".repeat(64)}`;
- await writeFile(join(installedPackage, "package.json"), JSON.stringify({
- name: "example-empty",
- version: "1.0.0",
- type: "module",
- exports: "./activation.mjs",
- svml: { activation: "./activation.mjs" },
- }), "utf8");
- await writeFile(join(installedPackage, "activation.mjs"), `
- const module = { name: "example.empty", version: "1" };
- const digest = ${JSON.stringify(implementationDigest)};
- export default {
- format: "svml.node-package@1",
- modules: [{ manifest: {
- format: "svml.module@1", name: module.name, version: module.version,
- dependencies: [], types: [], capabilities: [], producers: [],
- }, specifiers: ["example.empty@1"] }],
- hostFacets: [{
- abi: "svml.markup-surface-host@1",
- identity: { module, surface: "empty",
- tag: "Empty", outputs: [], mode: "structured", implementationDigest: digest },
- implementation() { return { records: [], components: [], fragments: [] }; },
- }],
- };
- `, "utf8");
- await writeFile(join(installedExtra, "package.json"), JSON.stringify({
- name: "example-extra",
- version: "1.0.0",
- type: "module",
- exports: "./activation.mjs",
- svml: { activation: "./activation.mjs" },
- }), "utf8");
- await writeFile(join(installedExtra, "activation.mjs"), `
- export default { format: "svml.node-package@1" };
- `, "utf8");
- const file = join(projectRoot, "main.svml");
- const lockPath = join(projectRoot, "svml.packages.lock");
- await writeFile(file, `<?svml using="@narratage/markup@1"?>
-<svml>
- <import as="example" from="example.empty@1"/>
- <example:Empty/>
- </svml>`, "utf8");
-
- await assert.rejects(
- async () => await runCli(["check", file], { write() {} }),
- /No registered module satisfies example\.empty@1/,
- );
-
- let lockOutput = "";
- await runCli(["lock-packages", lockPath, "--package", "example-empty", "--package-root", packageRoot], {
- write: (text) => { lockOutput += text; },
- });
- assert.equal(JSON.parse(lockOutput).ok, true);
-
- let checkOutput = "";
- await runCli(["check", file, "--package-lock", lockPath, "--package-root", packageRoot], {
- write: (text) => { checkOutput += text; },
- });
- const checked = JSON.parse(checkOutput) as { readonly ok: boolean; readonly modules: readonly string[] };
- assert.equal(checked.ok, true);
- assert.deepEqual(checked.modules, ["example.empty@1"]);
-
- const editSentinel = `${lockPath}.editing`;
- await writeFile(editSentinel, JSON.stringify({ pid: 999, host: "test" }), "utf8");
- await assert.rejects(
- async () => await runCli(["lock-packages", lockPath, "--add", "example-extra", "--package-root", packageRoot], {
- write() {},
- }),
- /already being edited.*pid.*999/u,
- );
- await runCli(["lock-packages", lockPath, "--verify", "--package-root", packageRoot], { write() {} });
- await rm(editSentinel);
-
- const trustedActivation = await readFile(join(installedPackage, "activation.mjs"), "utf8");
- const trustedLockDigest = (JSON.parse(await readFile(lockPath, "utf8")) as { readonly digest: string }).digest;
- await writeFile(join(installedPackage, "activation.mjs"), `${trustedActivation}\n// unreviewed retained change\n`, "utf8");
- await assert.rejects(
- async () => await runCli(["lock-packages", lockPath, "--add", "example-extra", "--package-root", packageRoot], {
- write() {},
- }),
- /retained package bytes changed.*use --refresh or an exact --package selection/u,
- );
- assert.equal((JSON.parse(await readFile(lockPath, "utf8")) as { readonly digest: string }).digest, trustedLockDigest);
- await writeFile(join(installedPackage, "activation.mjs"), trustedActivation, "utf8");
-
- let mutationOutput = "";
- await runCli(["lock-packages", lockPath, "--add", "example-extra", "--package-root", packageRoot], {
- write: (text) => { mutationOutput += text; },
- });
- const added = JSON.parse(mutationOutput) as {
- readonly changed: boolean;
- readonly mode: string;
- readonly selected: readonly string[];
- readonly added: readonly string[];
- readonly closureChanges: {
- readonly physical: { readonly added: readonly string[]; readonly removed: readonly string[] };
- readonly activated: { readonly added: readonly string[]; readonly removed: readonly string[] };
- };
- };
- assert.equal(added.changed, true);
- assert.equal(added.mode, "mutate");
- assert.deepEqual(added.selected, ["example-empty", "example-extra"]);
- assert.deepEqual(added.added, ["example-extra"]);
- assert.deepEqual(added.closureChanges, {
- physical: { added: ["[email protected]"], removed: [] },
- activated: { added: ["[email protected]"], removed: [] },
- });
- assert.equal((await readdir(projectRoot)).some((name) => name.endsWith(".editing")), false);
-
- mutationOutput = "";
- await runCli(["lock-packages", lockPath, "--add", "example-extra", "--package-root", packageRoot], {
- write: (text) => { mutationOutput += text; },
- });
- const unchanged = JSON.parse(mutationOutput) as { readonly changed: boolean; readonly digest: string };
- assert.equal(unchanged.changed, false);
-
- let verifyOutput = "";
- await runCli(["lock-packages", lockPath, "--verify", "--package-root", packageRoot], {
- write: (text) => { verifyOutput += text; },
- });
- const verified = JSON.parse(verifyOutput) as { readonly ok: boolean; readonly mode: string; readonly digest: string };
- assert.equal(verified.ok, true);
- assert.equal(verified.mode, "verify");
- assert.equal(verified.digest, unchanged.digest);
-
- await assert.rejects(
- async () => await runCli(["lock-packages", lockPath, "--remove", "example-missing", "--package-root", packageRoot], {
- write() {},
- }),
- /example-missing is not selected.*no package authority was removed/u,
- );
- assert.equal((JSON.parse(await readFile(lockPath, "utf8")) as { readonly digest: string }).digest, unchanged.digest);
-
- mutationOutput = "";
- await writeFile(join(installedExtra, "activation.mjs"), `
- export default { format: "svml.node-package@1" };
- // Changed bytes do not prevent revoking this now-unreachable root.
- `, "utf8");
- await runCli(["lock-packages", lockPath, "--remove", "example-extra", "--package-root", packageRoot], {
- write: (text) => { mutationOutput += text; },
- });
- const removed = JSON.parse(mutationOutput) as {
- readonly changed: boolean;
- readonly selected: readonly string[];
- readonly removed: readonly string[];
- };
- assert.equal(removed.changed, true);
- assert.deepEqual(removed.selected, ["example-empty"]);
- assert.deepEqual(removed.removed, ["example-extra"]);
-
- await assert.rejects(
- async () => await runCli([
- "lock-packages", lockPath,
- "--add", "example-extra", "--remove", "example-extra",
- "--package-root", packageRoot,
- ], { write() {} }),
- /cannot be added and removed in the same package-lock transaction/u,
- );
-
- let replaceOutput = "";
- await runCli([
- "lock-packages", lockPath,
- "--package", "example-empty", "--package", "example-extra",
- "--package-root", packageRoot,
- ], { write: (text) => { replaceOutput += text; } });
- const replaced = JSON.parse(replaceOutput) as { readonly mode: string; readonly selected: readonly string[] };
- assert.equal(replaced.mode, "replace");
- assert.deepEqual(replaced.selected, ["example-empty", "example-extra"]);
-
- await runCli([
- "lock-packages", lockPath,
- "--package", "example-empty",
- "--package-root", packageRoot,
- ], { write() {} });
-
- const originalLock = JSON.parse(await readFile(lockPath, "utf8")) as { readonly digest: string };
- await writeFile(join(installedPackage, "activation.mjs"),
- `${await readFile(join(installedPackage, "activation.mjs"), "utf8")}\n// refreshed physical bytes\n`, "utf8");
- let refreshOutput = "";
- await runCli(["lock-packages", lockPath, "--refresh", "--package-root", packageRoot], {
- write: (text) => { refreshOutput += text; },
- });
- const refreshed = JSON.parse(refreshOutput) as { readonly ok: boolean; readonly digest: string };
- assert.equal(refreshed.ok, true);
- assert.notEqual(refreshed.digest, originalLock.digest);
-
- let emptyOutput = "";
- await runCli(["lock-packages", lockPath, "--remove", "example-empty", "--package-root", packageRoot], {
- write: (text) => { emptyOutput += text; },
- });
- const empty = JSON.parse(emptyOutput) as { readonly selected: readonly string[]; readonly packages: readonly unknown[] };
- assert.deepEqual(empty.selected, []);
- assert.deepEqual(empty.packages, []);
- await runCli(["lock-packages", lockPath, "--verify", "--package-root", packageRoot], { write() {} });
-});
-
-test("materializeRecord copies an archived Artifact without requiring a completed Build", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-get-"));
- const bytes = Buffer.from("final-video-bytes");
- const artifactDigest = `sha256:${createHash("sha256").update(bytes).digest("hex")}`;
- const output = join(root, "out", "final.mp4");
- const runtime = {
- async openArtifact(digest: string) {
- return digest === artifactDigest ? (async function* () { yield bytes; })() : undefined;
- },
- } as Parameters<typeof materializeRecord>[0];
- const record = {
- id: "final.video",
- value: { kind: "inline", value: { digest: artifactDigest, size: bytes.byteLength, mediaType: "video/mp4" } },
- } as unknown as Parameters<typeof materializeRecord>[1];
- const result = await materializeRecord(runtime, record, output);
- assert.deepEqual(await readFile(output), bytes);
- assert.deepEqual(result, {
- kind: "artifact",
- path: output,
- digest: artifactDigest,
- size: bytes.byteLength,
- mediaType: "video/mp4",
- });
-});
-
-test("materializeRecord writes structured intermediate facts as JSON", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-get-json-"));
- const output = join(root, "evidence.json");
- const record = {
- id: "whisperx.evidence",
- value: { kind: "inline", value: { words: [{ text: "hello", start: 0, end: 0.4 }] } },
- } as unknown as Parameters<typeof materializeRecord>[1];
- const result = await materializeRecord({ async openArtifact() { return undefined; } }, record, output);
- assert.equal(result.kind, "json");
- if (record.value.kind !== "inline") assert.fail("fixture must be inline");
- assert.deepEqual(JSON.parse(await readFile(output, "utf8")), record.value.value);
-});
-
-test("streaming materialization verifies bytes before replacing an existing destination", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-get-verified-"));
- const output = join(root, "final.mp4");
- const expected = Buffer.from("expected");
- const corrupt = Buffer.from("corrupt!");
- const artifactDigest = `sha256:${createHash("sha256").update(expected).digest("hex")}`;
- await writeFile(output, "keep-me", "utf8");
- const record = {
- id: "final.video",
- value: { kind: "inline", value: { digest: artifactDigest, size: expected.byteLength, mediaType: "video/mp4" } },
- } as unknown as Parameters<typeof materializeRecord>[1];
-
- await assert.rejects(async () => await materializeRecord({
- async openArtifact() { return (async function* () { yield corrupt; })(); },
- }, record, output), /bytes differ/u);
-
- assert.equal(await readFile(output, "utf8"), "keep-me");
- assert.deepEqual(await readdir(root), ["final.mp4"]);
-});
-
-test("CLI inspect and get read the durable Build archive independently of build execution", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-archive-"));
- const runtimePath = join(root, "svml.runtime.json");
- const destination = join(root, "final.mp4");
- const rawDestination = join(root, "whisperx-raw.json");
- const bytes = Buffer.from("archived-video");
- const rawBytes = Buffer.from('{"segments":[]}');
- const artifactDigest = `sha256:${createHash("sha256").update(bytes).digest("hex")}`;
- const rawDigest = `sha256:${createHash("sha256").update(rawBytes).digest("hex")}`;
- const recordDigest = `sha256:${"1".repeat(64)}`;
- const buildDigest = `sha256:${"2".repeat(64)}`;
- const requestDigest = `sha256:${"3".repeat(64)}`;
- const operationId = `sha256:${"7".repeat(64)}`;
- const state = {
- id: buildDigest,
- status: "active",
- graph: {
- id: `sha256:${"4".repeat(64)}`,
- outputs: [{
- id: "logical:unused",
- type: { module: { name: "example", version: "1" }, name: "Image" },
- }],
- },
- request: {
- digest: requestDigest,
- targets: [{ output: "logical:final" }],
- },
- plan: {
- goals: [{ record: "record:final" }],
- selections: [{
- output: "logical:final",
- candidate: "candidate:render",
- record: "record:final",
- }],
- },
- records: [{
- id: "record:final",
- type: { module: { name: "example", version: "1" }, name: "Artifact" },
- value: { kind: "inline", value: { digest: artifactDigest, size: bytes.byteLength, mediaType: "video/mp4" } },
- digest: recordDigest,
- origin: { kind: "authored", module: "example" },
- }, {
- id: "record:whisperx",
- type: { module: { name: "example", version: "1" }, name: "Evidence" },
- value: { kind: "inline", value: {
- words: [],
- explicitReferenceArtifact: { kind: "blob", digest: rawDigest, size: rawBytes.byteLength, mediaType: "application/json" },
- } },
- digest: `sha256:${"5".repeat(64)}`,
- origin: { kind: "authored", module: "example" },
- }],
- receipts: [],
- derivations: [],
- diagnostics: [],
- };
- const catalog = {
- format: "svml.build-catalog-descriptor@1",
- build: "archive-1",
- core: buildDigest,
- source: { path: join(root, "main.svml"), closure: `sha256:${"6".repeat(64)}` },
- run: { path: join(root, "delivery.svrun") },
- aliases: [{
- name: "final.video",
- ref: { kind: "logical-output", id: "logical:final" },
- }, {
- name: "timing.rawEvidence",
- ref: { kind: "record", id: "record:whisperx" },
- }, {
- name: "unused.image",
- ref: { kind: "logical-output", id: "logical:unused" },
- }],
- createdAt: 100,
- updatedAt: 100,
- };
- const operation = {
- id: operationId,
- build: "archive-1",
- command: `sha256:${"8".repeat(64)}`,
- endpoint: "example.endpoint",
- attempt: 1,
- status: "pending",
- };
- const dispatch = { build: "archive-1", phase: "waiting", admission: "open" };
- const control = {
- async builds() { return [catalog]; },
- async queue() { return { dispatches: [dispatch], capacity: [], operations: [] }; },
- async cancel(id: string) {
- return id === "archive-1"
- ? { build: id, phase: "terminal", admission: "closed", terminal: "complete" }
- : undefined;
- },
- async status(id: string) {
- return {
- build: id === "archive-1" ? { build: id, revision: 7, state } : undefined,
- catalog: id === "archive-1" ? catalog : undefined,
- operations: id === "archive-1" ? [operation] : [],
- dispatch: id === "archive-1" ? dispatch : undefined,
- };
- },
- async readArtifact(digest: string) {
- if (digest === artifactDigest) return bytes;
- if (digest === rawDigest) return rawBytes;
- return undefined;
- },
- async openArtifact(digest: string) {
- const value = digest === artifactDigest ? bytes : digest === rawDigest ? rawBytes : undefined;
- return value === undefined ? undefined : (async function* () { yield value; })();
- },
- async close() {},
- };
- const selected = {
- openRuntimeHost: async (path: string) => ({
- profile: path,
- openArchive: async () => control,
- openArtifacts: async () => control,
- controller: async () => ({
- worker: { status: async () => ({ state: "stopped", profile: path, logPath: "/tmp/worker.log" }) },
- }),
- }),
- } as unknown as CliDistribution;
- const runArchiveCli = (
- argv: readonly string[],
- io: { readonly write: (text: string) => void },
- ) => runCoreCli([...argv, "--json"], io, selected);
-
- let inspectedOutput = "";
- await runArchiveCli(["inspect", "archive-1", "--runtime", runtimePath], {
- write: (text) => { inspectedOutput += text; },
- });
- const inspected = JSON.parse(inspectedOutput) as {
- readonly archive: {
- readonly status: string;
- readonly targets: readonly { readonly accepted: boolean }[];
- readonly records: readonly { readonly artifacts: readonly { readonly digest: string }[] }[];
- readonly presentation: { readonly aliases: readonly { readonly name: string; readonly accepted: boolean }[] };
- };
- };
- assert.equal(inspected.archive.status, "active");
- assert.equal(inspected.archive.targets[0]?.accepted, true);
- assert.equal(inspected.archive.records[0]?.artifacts[0]?.digest, artifactDigest);
- assert.deepEqual(inspected.archive.presentation.aliases.map((item) => [item.name, item.accepted]), [
- ["final.video", true],
- ["timing.rawEvidence", true],
- ["unused.image", false],
- ]);
-
- let buildsOutput = "";
- await runArchiveCli(["builds", "--runtime", runtimePath], { write: (text) => { buildsOutput += text; } });
- const listed = JSON.parse(buildsOutput) as {
- readonly builds: readonly {
- readonly build: string;
- readonly aliasCount: number;
- readonly targets: readonly string[];
- }[];
- };
- assert.deepEqual(listed.builds, [{
- build: "archive-1",
- core: buildDigest,
- createdAt: 100,
- updatedAt: 100,
- status: "waiting",
- coreStatus: "active",
- source: catalog.source,
- run: catalog.run,
- aliasCount: 3,
- targets: ["final.video"],
- }]);
-
- let historyOutput = "";
- await runArchiveCli(["history", "final.video", "--runtime", runtimePath], {
- write: (text) => { historyOutput += text; },
- });
- const history = JSON.parse(historyOutput) as {
- readonly query: { readonly output: string };
- readonly entries: readonly {
- readonly build: string;
- readonly source: { readonly path: string };
- readonly output: { readonly name: string; readonly record: { readonly digest: string } };
- }[];
- };
- assert.equal(history.query.output, "final.video");
- assert.equal(history.entries.length, 1);
- assert.equal(history.entries[0]?.build, "archive-1");
- assert.equal(history.entries[0]?.source.path, catalog.source.path);
- assert.equal(history.entries[0]?.output.name, "final.video");
- assert.equal(history.entries[0]?.output.record.digest, recordDigest);
-
- let sourceHistoryOutput = "";
- await runArchiveCli(["history", "--source", catalog.source.path, "--runtime", runtimePath], {
- write: (text) => { sourceHistoryOutput += text; },
- });
- const sourceHistory = JSON.parse(sourceHistoryOutput) as {
- readonly entries: readonly { readonly output: { readonly name: string } }[];
- };
- assert.deepEqual(sourceHistory.entries.map((item) => item.output.name), ["final.video"]);
-
- let absentHistoryOutput = "";
- await runArchiveCli(["history", "unused.image", "--runtime", runtimePath], {
- write: (text) => { absentHistoryOutput += text; },
- });
- assert.deepEqual((JSON.parse(absentHistoryOutput) as { readonly entries: readonly unknown[] }).entries, []);
-
- let statusOutput = "";
- await runArchiveCli(["status", "archive-1", "--runtime", runtimePath], {
- write: (text) => { statusOutput += text; },
- });
- const status = JSON.parse(statusOutput) as {
- readonly build: { readonly status: string; readonly coreStatus: string };
- readonly catalog: { readonly aliasCount: number; readonly targets: readonly string[] };
- };
- assert.equal(status.build.status, "waiting");
- assert.equal(status.build.coreStatus, "active");
- assert.deepEqual(status.catalog, {
- source: catalog.source,
- run: catalog.run,
- aliasCount: 3,
- targets: ["final.video"],
- });
-
- let queueOutput = "";
- await runArchiveCli(["queue", "--runtime", runtimePath], { write: (text) => { queueOutput += text; } });
- const queue = JSON.parse(queueOutput) as { readonly dispatches: readonly { readonly phase: string }[] };
- assert.equal(queue.dispatches[0]?.phase, "waiting");
-
- let getOutput = "";
- await runArchiveCli([
- "get", "archive-1", "--runtime", runtimePath,
- "--name", "final.video", "--to", destination,
- ], { write: (text) => { getOutput += text; } });
- assert.deepEqual(await readFile(destination), bytes);
- const got = JSON.parse(getOutput) as { readonly materialized: { readonly kind: string; readonly digest: string } };
- assert.equal(got.materialized.kind, "artifact");
- assert.equal(got.materialized.digest, artifactDigest);
-
- await runArchiveCli([
- "get", "archive-1", "--runtime", runtimePath,
- "--artifact", rawDigest, "--to", rawDestination,
- ], { write() {} });
- assert.deepEqual(await readFile(rawDestination), rawBytes);
-
- const human = async (argv: readonly string[]) => {
- let output = "";
- await runCoreCli([...argv, "--color", "never"], { write: (text) => { output += text; } }, selected);
- return output;
- };
- assert.match(await human(["queue", "--runtime", runtimePath]), /Runtime queue[\s\S]*archive-1: waiting/u);
- assert.match(await human(["status", "archive-1", "--runtime", runtimePath]), /Build status[\s\S]*Dispatch\s+waiting/u);
- assert.match(await human(["inspect", "archive-1", "--runtime", runtimePath]),
- /Build archive detail[\s\S]*Target\s+final\.video[\s\S]*example@1\/Artifact/u);
- assert.match(await human(["cancel", "archive-1", "--runtime", runtimePath]),
- /Build already finished[\s\S]*No running work was changed; this Build is already complete/u);
- await assert.rejects(
- runArchiveCli(["status", "archive-1", "--runtime", runtimePath, "--watch"], { write() {} }),
- /--watch applies only to queue/u,
- );
- await assert.rejects(
- runArchiveCli(["queue", "--runtime", runtimePath, "--jsonl"], { write() {} }),
- /--jsonl applies only to queue --watch/u,
- );
- await assert.rejects(
- runArchiveCli(["queue", "--runtime", runtimePath, "--watch", "--json"], { write() {} }),
- /use --jsonl instead of --json/u,
- );
-});
diff --git a/packages/video-cli/test/packages.ts b/packages/video-cli/test/packages.ts
index 6b6d27be..4a4869c4 100644
--- a/packages/video-cli/test/packages.ts
+++ b/packages/video-cli/test/packages.ts
@@ -31,8 +31,13 @@ import svs from "../../svs/src/activation.js";
import typographyTrack from "../../typography-track/src/activation.js";
import whisperX from "../../whisperx/src/activation.js";
import type { NodePackageContribution } from "@narratage/package-loader-node";
+import { digestOf } from "@narratage/protocol";
-const bind = (specifier: string, contribution: NodePackageContribution) => ({ specifier, contribution });
+const bind = (specifier: string, contribution: NodePackageContribution) => ({
+ specifier,
+ digest: digestOf(specifier),
+ contribution,
+});
/** Test-only explicit environment; production video CLI starts with no author packages. */
export const videoTestPackages = [
diff --git a/packages/visual-ir/package.json b/packages/visual-ir/package.json
index e3ff6bca..12c14d2f 100644
--- a/packages/visual-ir/package.json
+++ b/packages/visual-ir/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/visual-ir/src/activation.ts b/packages/visual-ir/src/activation.ts
index 06aa118a..cda440de 100644
--- a/packages/visual-ir/src/activation.ts
+++ b/packages/visual-ir/src/activation.ts
@@ -1,3 +1,3 @@
import { visualIrManifest } from "./index.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: visualIrManifest }] };
-export default svmlPackage;
+export const narratagePackage = { format: "narratage.node-package@1" as const, modules: [{ manifest: visualIrManifest }] };
+export default narratagePackage;
diff --git a/packages/visual-ir/src/index.ts b/packages/visual-ir/src/index.ts
index 1e10b64a..b06153fe 100644
--- a/packages/visual-ir/src/index.ts
+++ b/packages/visual-ir/src/index.ts
@@ -3,7 +3,6 @@ import type { ModuleManifest } from "@narratage/protocol";
export { assertVisualStyleV1, VISUAL_IR_V1, VISUAL_STYLE_ENUM_VALUES_V1, VISUAL_STYLE_NAMES_V1 } from "./style.js";
export type * from "./style.js";
export const visualIrModuleRef = { name: "@narratage/visual-ir", version: "1" } as const;
-export const visualIrManifest: ModuleManifest = { format: "svml.module@1", name: visualIrModuleRef.name, version: visualIrModuleRef.version,
+export const visualIrManifest: ModuleManifest = { format: "narratage.module@1", name: visualIrModuleRef.name, version: visualIrModuleRef.version,
dependencies: [], types: [], capabilities: [], producers: [] };
-export const visualIrManifestDigest = digestOf(visualIrManifest);
-export const visualIrDependency = { module: visualIrModuleRef, digest: visualIrManifestDigest } as const;
+export const visualIrDependency = { module: visualIrModuleRef } as const;
diff --git a/packages/visual-ir/src/style.ts b/packages/visual-ir/src/style.ts
index abf606b1..ec6b0192 100644
--- a/packages/visual-ir/src/style.ts
+++ b/packages/visual-ir/src/style.ts
@@ -6,7 +6,7 @@
*
* This is a video contract, not a Core concept and not an author component.
*/
-export const VISUAL_IR_V1 = "svml.visual-ir@1" as const;
+export const VISUAL_IR_V1 = "narratage.visual-ir@1" as const;
/**
* Closed CSS-shaped vocabulary for public visual Visual IR v1.
diff --git a/packages/whisperx/package.json b/packages/whisperx/package.json
index 209375d6..c80857b9 100644
--- a/packages/whisperx/package.json
+++ b/packages/whisperx/package.json
@@ -7,7 +7,7 @@
"exports": {
".": "./src/index.ts"
},
- "svml": {
+ "narratage": {
"activation": "./src/activation.ts"
},
"dependencies": {
diff --git a/packages/whisperx/src/activation.ts b/packages/whisperx/src/activation.ts
index e22d65ed..7cd0eb8b 100644
--- a/packages/whisperx/src/activation.ts
+++ b/packages/whisperx/src/activation.ts
@@ -5,8 +5,8 @@ import {
whisperXMarkupSurfaces,
} from "./index.js";
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
+export const narratagePackage = {
+ format: "narratage.node-package@1" as const,
modules: [{ manifest: whisperXManifest }],
components: [whisperXComponent],
hostFacets: [createMarkupSurfaceHostFacet({
@@ -15,4 +15,4 @@ export const svmlPackage = {
handler: decodeWhisperXAlignmentSurface,
})],
};
-export default svmlPackage;
+export default narratagePackage;
diff --git a/packages/whisperx/src/component.ts b/packages/whisperx/src/component.ts
index dce87687..4034c8ef 100644
--- a/packages/whisperx/src/component.ts
+++ b/packages/whisperx/src/component.ts
@@ -4,10 +4,7 @@ import type { CanonicalValue, StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
import { whisperXRequestForEvidenceAudio } from "./evidence.js";
-import {
- whisperXImplementationDigests,
- whisperXProducers,
-} from "./manifest.js";
+import { whisperXProducers } from "./manifest.js";
function inline(value: StoredValue, subject: string): CanonicalValue {
if (value.kind !== "inline") throw new Error(`${subject} must be inline`);
@@ -18,7 +15,6 @@ export const whisperXComponent = {
producers: [
{
producer: whisperXProducers.request,
- implementationDigest: whisperXImplementationDigests.request,
handler: ({ inputs }) => {
const evidence = inline(inputs.evidence!.value, "SpeechEvidenceAudio") as unknown as SpeechEvidenceAudio;
return {
diff --git a/packages/whisperx/src/index.ts b/packages/whisperx/src/index.ts
index 4357351e..35a5d0a7 100644
--- a/packages/whisperx/src/index.ts
+++ b/packages/whisperx/src/index.ts
@@ -3,12 +3,6 @@ export {
} from "./component.js";
export { whisperXSpeechAlignmentFragment } from "./fragment.js";
export { whisperXRequestForEvidenceAudio } from "./evidence.js";
-export {
- whisperXCapabilities,
- whisperXImplementationDigests,
- whisperXManifest, whisperXMarkupSurfaces,
- whisperXModuleRef,
- whisperXProducers,
-} from "./manifest.js";
+export { whisperXCapabilities, whisperXManifest, whisperXMarkupSurfaces, whisperXModuleRef, whisperXProducers } from "./manifest.js";
export { decodeWhisperXAlignmentSurface } from "./surface.js";
export type * from "./types.js";
diff --git a/packages/whisperx/src/manifest.ts b/packages/whisperx/src/manifest.ts
index 250459cb..ef90b9f3 100644
--- a/packages/whisperx/src/manifest.ts
+++ b/packages/whisperx/src/manifest.ts
@@ -13,32 +13,25 @@ export const whisperXCapabilities = {
export const whisperXProducers = {
request: { module: whisperXModuleRef, name: "request-whisperx-alignment" },
} satisfies Record<string, ProducerRef>;
-export const whisperXImplementationDigests = {
- request: digestOf("@narratage/whisperx/request@1"),
- surface: digestOf("@narratage/whisperx/alignment-surface@1"),
-};
export const whisperXMarkupSurfaces = [{
name: "alignment",
tag: "Alignment",
mode: "structured",
outputs: [speechEvidenceTypes.alignedTranscript, semanticMapTypes.complete],
- implementation: {
- digest: whisperXImplementationDigests.surface,
- },
}] as const;
export const whisperXManifest: ModuleManifest = {
- format: "svml.module@1",
+ format: "narratage.module@1",
name: whisperXModuleRef.name,
version: whisperXModuleRef.version,
dependencies: [
speechDependency,
speechEvidenceDependency,
semanticMapDependency,
- { module: mediaPipelineModuleRef, digest: digestOf(mediaPipelineManifest) },
- { module: speechAlignmentModuleRef, digest: digestOf(speechAlignmentManifest) },
+ { module: mediaPipelineModuleRef },
+ { module: speechAlignmentModuleRef },
],
types: [],
capabilities: [{
@@ -55,9 +48,6 @@ export const whisperXManifest: ModuleManifest = {
capability: whisperXCapabilities.alignment,
returns: speechEvidenceTypes.alignedTranscript,
}],
- implementation: {
- digest: whisperXImplementationDigests.request,
- },
},
],
};
diff --git a/packages/whisperx/test/whisperx.test.ts b/packages/whisperx/test/whisperx.test.ts
index 2677137e2..29db9a43 100644
--- a/packages/whisperx/test/whisperx.test.ts
+++ b/packages/whisperx/test/whisperx.test.ts
@@ -51,14 +51,14 @@ test("WhisperX receives normalized bytes without authored Segment truth", () =>
});
test("WhisperX installs into the host-neutral compute port without a Node Driver", () => {
- const registrations: { readonly producer: ProducerRef; readonly digest: Digest }[] = [];
+ const registrations: ProducerRef[] = [];
const registrar: ProducerRegistrar = {
- registerProducer(producer, implementationDigest) {
- registrations.push({ producer, digest: implementationDigest });
+ registerProducer(producer) {
+ registrations.push(producer);
},
};
registerProducerFacets(registrar, whisperXComponent.producers);
- assert.deepEqual(registrations.map((item) => item.producer), [whisperXProducers.request]);
+ assert.deepEqual(registrations, [whisperXProducers.request]);
});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3a3610db..b3ca53b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -77,9 +77,6 @@ importers:
'@narratage/image-transform':
specifier: workspace:*
version: link:packages/image-transform
- '@narratage/local':
- specifier: workspace:*
- version: link:packages/local
'@narratage/media':
specifier: workspace:*
version: link:packages/media
@@ -146,12 +143,15 @@ importers:
'@narratage/run-markup':
specifier: workspace:*
version: link:packages/run-markup
- '@narratage/runtime-adapter':
+ '@narratage/runtime-host-node':
+ specifier: workspace:*
+ version: link:packages/runtime-host-node
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:packages/runtime-adapter
- '@narratage/runtime-adapter-node':
+ version: link:packages/runtime-kit
+ '@narratage/runtime-local':
specifier: workspace:*
- version: link:packages/runtime-adapter-node
+ version: link:packages/runtime-local
'@narratage/screen-overlay':
specifier: workspace:*
version: link:packages/screen-overlay
@@ -239,9 +239,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
packages/artifact-store-s3:
dependencies:
@@ -254,9 +254,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
packages/audio-track:
dependencies:
@@ -456,9 +456,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter-node':
+ '@narratage/runtime-host-node':
specifier: workspace:*
- version: link:../runtime-adapter-node
+ version: link:../runtime-host-node
'@narratage/source':
specifier: workspace:*
version: link:../source
@@ -466,9 +466,9 @@ importers:
specifier: workspace:*
version: link:../workspace
devDependencies:
- '@narratage/local':
+ '@narratage/runtime-local':
specifier: workspace:*
- version: link:../local
+ version: link:../runtime-local
packages/comment-sticker:
dependencies:
@@ -647,9 +647,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
packages/credential-store-keychain:
dependencies:
@@ -659,9 +659,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
packages/deck-track:
dependencies:
@@ -1406,52 +1406,6 @@ importers:
specifier: workspace:*
version: link:../raster
- packages/local:
- dependencies:
- '@narratage/component-kit':
- specifier: workspace:*
- version: link:../component-kit
- '@narratage/driver-node':
- specifier: workspace:*
- version: link:../driver-node
- '@narratage/endpoint-kit':
- specifier: workspace:*
- version: link:../endpoint-kit
- '@narratage/package-loader-node':
- specifier: workspace:*
- version: link:../package-loader-node
- '@narratage/protocol':
- specifier: workspace:*
- version: link:../protocol
- '@narratage/runtime':
- specifier: workspace:*
- version: link:../runtime
- '@narratage/runtime-adapter':
- specifier: workspace:*
- version: link:../runtime-adapter
- '@narratage/runtime-adapter-node':
- specifier: workspace:*
- version: link:../runtime-adapter-node
- '@narratage/validation':
- specifier: workspace:*
- version: link:../validation
- '@narratage/workspace':
- specifier: workspace:*
- version: link:../workspace
- devDependencies:
- '@narratage/artifact-store-fs':
- specifier: workspace:*
- version: link:../artifact-store-fs
- '@narratage/core':
- specifier: workspace:*
- version: link:../core
- '@narratage/credential-store-env':
- specifier: workspace:*
- version: link:../credential-store-env
- '@narratage/store-sqlite':
- specifier: workspace:*
- version: link:../store-sqlite
-
packages/markup:
dependencies:
'@narratage/core':
@@ -1680,9 +1634,9 @@ importers:
specifier: workspace:*
version: link:../protocol
devDependencies:
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
'@narratage/validation':
specifier: workspace:*
version: link:../validation
@@ -1715,12 +1669,12 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-host-node':
specifier: workspace:*
- version: link:../runtime-adapter
- '@narratage/runtime-adapter-node':
+ version: link:../runtime-host-node
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter-node
+ version: link:../runtime-kit
devDependencies:
'@narratage/driver-node':
specifier: workspace:*
@@ -1758,9 +1712,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
devDependencies:
'@narratage/composition':
specifier: workspace:*
@@ -1795,12 +1749,12 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-host-node':
specifier: workspace:*
- version: link:../runtime-adapter
- '@narratage/runtime-adapter-node':
+ version: link:../runtime-host-node
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter-node
+ version: link:../runtime-kit
hyperframes:
specifier: 0.7.101
version: 0.7.101(@types/[email protected])
@@ -1829,12 +1783,12 @@ importers:
'@narratage/raster':
specifier: workspace:*
version: link:../raster
- '@narratage/runtime-adapter':
+ '@narratage/runtime-host-node':
specifier: workspace:*
- version: link:../runtime-adapter
- '@narratage/runtime-adapter-node':
+ version: link:../runtime-host-node
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter-node
+ version: link:../runtime-kit
devDependencies:
'@narratage/driver-node':
specifier: workspace:*
@@ -1863,9 +1817,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
devDependencies:
'@narratage/artifact-store-fs':
specifier: workspace:*
@@ -1894,9 +1848,6 @@ importers:
'@narratage/grok-imagine':
specifier: workspace:*
version: link:../grok-imagine
- '@narratage/local':
- specifier: workspace:*
- version: link:../local
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -1912,6 +1863,9 @@ importers:
'@narratage/narrative':
specifier: workspace:*
version: link:../narrative
+ '@narratage/runtime-local':
+ specifier: workspace:*
+ version: link:../runtime-local
'@narratage/seedance':
specifier: workspace:*
version: link:../seedance
@@ -1948,9 +1902,9 @@ importers:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
'@narratage/speech':
specifier: workspace:*
version: link:../speech
@@ -1988,12 +1942,12 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-host-node':
specifier: workspace:*
- version: link:../runtime-adapter
- '@narratage/runtime-adapter-node':
+ version: link:../runtime-host-node
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter-node
+ version: link:../runtime-kit
'@narratage/speech':
specifier: workspace:*
version: link:../speech
@@ -2010,9 +1964,9 @@ importers:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
'@narratage/speech-evidence':
specifier: workspace:*
version: link:../speech-evidence
@@ -2041,9 +1995,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
devDependencies:
'@narratage/driver-node':
specifier: workspace:*
@@ -2202,7 +2156,28 @@ importers:
specifier: workspace:*
version: link:../protocol
- packages/runtime-adapter:
+ packages/runtime-host-node:
+ dependencies:
+ '@narratage/host':
+ specifier: workspace:*
+ version: link:../host
+ '@narratage/package-loader-node':
+ specifier: workspace:*
+ version: link:../package-loader-node
+ '@narratage/protocol':
+ specifier: workspace:*
+ version: link:../protocol
+ '@narratage/runtime':
+ specifier: workspace:*
+ version: link:../runtime
+ '@narratage/runtime-kit':
+ specifier: workspace:*
+ version: link:../runtime-kit
+ '@narratage/workspace':
+ specifier: workspace:*
+ version: link:../workspace
+
+ packages/runtime-kit:
dependencies:
'@narratage/endpoint-kit':
specifier: workspace:*
@@ -2217,11 +2192,17 @@ importers:
specifier: workspace:*
version: link:../runtime
- packages/runtime-adapter-node:
+ packages/runtime-local:
dependencies:
- '@narratage/host':
+ '@narratage/component-kit':
specifier: workspace:*
- version: link:../host
+ version: link:../component-kit
+ '@narratage/driver-node':
+ specifier: workspace:*
+ version: link:../driver-node
+ '@narratage/endpoint-kit':
+ specifier: workspace:*
+ version: link:../endpoint-kit
'@narratage/package-loader-node':
specifier: workspace:*
version: link:../package-loader-node
@@ -2231,12 +2212,31 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-host-node':
+ specifier: workspace:*
+ version: link:../runtime-host-node
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
+ '@narratage/validation':
+ specifier: workspace:*
+ version: link:../validation
'@narratage/workspace':
specifier: workspace:*
version: link:../workspace
+ devDependencies:
+ '@narratage/artifact-store-fs':
+ specifier: workspace:*
+ version: link:../artifact-store-fs
+ '@narratage/core':
+ specifier: workspace:*
+ version: link:../core
+ '@narratage/credential-store-env':
+ specifier: workspace:*
+ version: link:../credential-store-env
+ '@narratage/store-sqlite':
+ specifier: workspace:*
+ version: link:../store-sqlite
packages/screen-overlay:
dependencies:
@@ -2570,9 +2570,9 @@ importers:
'@narratage/runtime':
specifier: workspace:*
version: link:../runtime
- '@narratage/runtime-adapter':
+ '@narratage/runtime-kit':
specifier: workspace:*
- version: link:../runtime-adapter
+ version: link:../runtime-kit
packages/svs:
dependencies:
@@ -2722,9 +2722,9 @@ importers:
'@narratage/package-loader-node':
specifier: workspace:*
version: link:../package-loader-node
- '@narratage/runtime-adapter-node':
+ '@narratage/runtime-host-node':
specifier: workspace:*
- version: link:../runtime-adapter-node
+ version: link:../runtime-host-node
'@narratage/workspace-fs-node':
specifier: workspace:*
version: link:../workspace-fs-node
diff --git a/services/image-opencv/pyproject.toml b/services/image-opencv/pyproject.toml
index 6f7dcef3..b08405b3 100644
--- a/services/image-opencv/pyproject.toml
+++ b/services/image-opencv/pyproject.toml
@@ -1,5 +1,5 @@
[project]
-name = "svml-image-opencv-runtime"
+name = "narratage-image-opencv-runtime"
version = "0.1.0"
description = "Locked Python runtime for the SVML local OpenCV image Provider"
requires-python = ">=3.13,<3.14"
diff --git a/services/image-opencv/uv.lock b/services/image-opencv/uv.lock
index 095f14d7..3fb0fb5e 100644
--- a/services/image-opencv/uv.lock
+++ b/services/image-opencv/uv.lock
@@ -41,7 +41,7 @@ wheels = [
]
[[package]]
-name = "svml-image-opencv-runtime"
+name = "narratage-image-opencv-runtime"
version = "0.1.0"
source = { virtual = "." }
dependencies = [
diff --git a/services/media-lambda/src/handler.ts b/services/media-lambda/src/handler.ts
index 5f78b2f5..548b202e 100644
--- a/services/media-lambda/src/handler.ts
+++ b/services/media-lambda/src/handler.ts
@@ -181,8 +181,8 @@ export function createMediaLambdaHandler(options: MediaLambdaHandlerOptions = {}
ffmpegPath,
ffprobePath,
...(sharedLibraryPath === undefined ? {} : { sharedLibraryPath }),
- processTimeoutMs: positiveInteger(process.env.SVML_MEDIA_TIMEOUT_MS, 14 * 60_000),
- maxProbeOutputBytes: positiveInteger(process.env.SVML_MEDIA_MAX_PROBE_BYTES, 256 * 1024 * 1024),
+ processTimeoutMs: positiveInteger(process.env.NARRATAGE_MEDIA_TIMEOUT_MS, 14 * 60_000),
+ maxProbeOutputBytes: positiveInteger(process.env.NARRATAGE_MEDIA_MAX_PROBE_BYTES, 256 * 1024 * 1024),
};
const result = await OPERATIONS[operation](env, request.constraints);
return {
diff --git a/services/media-lambda/test/handler.test.ts b/services/media-lambda/test/handler.test.ts
index 34068b16..6812b661 100644
--- a/services/media-lambda/test/handler.test.ts
+++ b/services/media-lambda/test/handler.test.ts
@@ -43,7 +43,7 @@ async function ffmpegAvailable(): Promise<boolean> {
test("the function answers a real Need with real media, over a bucket it addresses like the store does",
{ skip: (await ffmpegAvailable()) ? false : "ffmpeg and ffprobe are not on PATH" },
async () => {
- const work = await mkdtemp(join(tmpdir(), "svml-media-lambda-"));
+ const work = await mkdtemp(join(tmpdir(), "narratage-media-lambda-"));
try {
// One second of real audio, so ffprobe has something true to report.
const path = join(work, "source.wav");
@@ -58,7 +58,7 @@ test("the function answers a real Need with real media, over a bucket it address
const handle = createMediaLambdaHandler({ client: bucket, ffmpegPath: "ffmpeg", ffprobePath: "ffprobe" });
const reply = await handle({
- contract: "svml.media-lambda-request@1",
+ contract: "narratage.media-lambda-request@1",
operation: "inspect",
artifacts: { bucket: "fixture", prefix: "svml" },
constraints: {
@@ -83,7 +83,7 @@ test("the function answers a real Need with real media, over a bucket it address
test("a source the bucket does not hold is a typed failure, never a throw", async () => {
const handle = createMediaLambdaHandler({ client: new Bucket() });
const reply = await handle({
- contract: "svml.media-lambda-request@1",
+ contract: "narratage.media-lambda-request@1",
operation: "inspect",
artifacts: { bucket: "fixture" },
constraints: {
@@ -97,9 +97,9 @@ test("a source the bucket does not hold is a typed failure, never a throw", asyn
test("an envelope from another contract is refused before any media is touched", async () => {
const handle = createMediaLambdaHandler({ client: new Bucket() });
- const reply = await handle({ contract: "svml.media-lambda-request@invalid" }) as Record<string, unknown>;
+ const reply = await handle({ contract: "narratage.media-lambda-request@invalid" }) as Record<string, unknown>;
assert.equal(reply.ok, false);
- assert.match(String(reply.message), /contract must be svml\.media-lambda-request@1/u);
+ assert.match(String(reply.message), /contract must be narratage\.media-lambda-request@1/u);
});
test("a Layer that lies about its FFmpeg version fails before reading an Artifact",
@@ -112,7 +112,7 @@ test("a Layer that lies about its FFmpeg version fails before reading an Artifac
expectedFfmpegVersion: "0.0.0-impossible",
});
const reply = await handle({
- contract: "svml.media-lambda-request@1",
+ contract: "narratage.media-lambda-request@1",
operation: "inspect",
artifacts: { bucket: "fixture" },
constraints: {
diff --git a/services/whisperx/README.md b/services/whisperx/README.md
index e8116d9a..8659032a 100644
--- a/services/whisperx/README.md
+++ b/services/whisperx/README.md
@@ -22,19 +22,19 @@ WhisperX 3.8.6 supports Python 3.10 through 3.13. The checked-in lock selects Py
```bash
uv python install 3.13
uv sync --project services/whisperx --frozen
-uv run --project services/whisperx --frozen svml-whisperx-prepare
-uv run --project services/whisperx --frozen svml-whisperx-check
+uv run --project services/whisperx --frozen narratage-whisperx-prepare
+uv run --project services/whisperx --frozen narratage-whisperx-check
```
The first model start may download ASR and alignment weights. Production should put the relevant
-Hugging Face cache on persistent storage. `svml-whisperx-prepare` separately installs NLTK's
+Hugging Face cache on persistent storage. `narratage-whisperx-prepare` separately installs NLTK's
`punkt_tab` sentence data from a commit-pinned official archive after verifying its SHA-256. This
resource is required by WhisperX alignment and is never downloaded inside an inference request.
## Run
```bash
-uv run --project services/whisperx --frozen svml-whisperx-service
+uv run --project services/whisperx --frozen narratage-whisperx-service
curl http://127.0.0.1:8765/health
```
@@ -45,22 +45,22 @@ model small
device cpu
compute int8
batch size 8
-protocol svml.whisperx-service@1
+protocol narratage.whisperx-service@1
```
Configuration is deployment state:
| Variable | Default | Meaning |
|---|---:|---|
-| `SVML_WHISPERX_PORT` | `8765` | loopback port |
-| `SVML_WHISPERX_MODEL` | `small` | faster-whisper model |
-| `SVML_WHISPERX_DEVICE` | `cpu` | `cpu` or the deployed accelerator |
-| `SVML_WHISPERX_COMPUTE` | `int8` on CPU | CTranslate2 compute type |
-| `SVML_WHISPERX_BATCH_SIZE` | `8` | bounded ASR batch size |
-| `SVML_WHISPERX_INPUT_ROOTS` | OS temp directory | path-separated roots the service may read |
-| `SVML_WHISPERX_NLTK_DATA` | user SVML cache | prepared, identity-checked NLTK data root |
-| `SVML_WHISPERX_MAX_REQUEST_BYTES` | `65536` | HTTP JSON bound |
-| `SVML_WHISPERX_MAX_AUDIO_BYTES` | `536870912` | staged canonical WAV bound |
+| `NARRATAGE_WHISPERX_PORT` | `8765` | loopback port |
+| `NARRATAGE_WHISPERX_MODEL` | `small` | faster-whisper model |
+| `NARRATAGE_WHISPERX_DEVICE` | `cpu` | `cpu` or the deployed accelerator |
+| `NARRATAGE_WHISPERX_COMPUTE` | `int8` on CPU | CTranslate2 compute type |
+| `NARRATAGE_WHISPERX_BATCH_SIZE` | `8` | bounded ASR batch size |
+| `NARRATAGE_WHISPERX_INPUT_ROOTS` | OS temp directory | path-separated roots the service may read |
+| `NARRATAGE_WHISPERX_NLTK_DATA` | user SVML cache | prepared, identity-checked NLTK data root |
+| `NARRATAGE_WHISPERX_MAX_REQUEST_BYTES` | `65536` | HTTP JSON bound |
+| `NARRATAGE_WHISPERX_MAX_AUDIO_BYTES` | `536870912` | staged canonical WAV bound |
The Node Provider must configure the same model, device, compute, batch size, service version and
WhisperX version. A mismatch fails before transcription results are accepted.
diff --git a/services/whisperx/deploy/narratage-whisperx.service.example b/services/whisperx/deploy/narratage-whisperx.service.example
new file mode 100644
index 00000000..bbe7799e
--- /dev/null
+++ b/services/whisperx/deploy/narratage-whisperx.service.example
@@ -0,0 +1,28 @@
+[Unit]
+Description=SVML WhisperX alignment service
+After=network.target
+
+[Service]
+Type=simple
+User=narratage
+WorkingDirectory=/opt/narratage
+Environment=NARRATAGE_WHISPERX_PORT=8765
+Environment=NARRATAGE_WHISPERX_MODEL=small
+Environment=NARRATAGE_WHISPERX_DEVICE=cpu
+Environment=NARRATAGE_WHISPERX_COMPUTE=int8
+Environment=NARRATAGE_WHISPERX_BATCH_SIZE=8
+Environment=NARRATAGE_WHISPERX_INPUT_ROOTS=/tmp
+Environment=NARRATAGE_WHISPERX_NLTK_DATA=/var/cache/narratage/whisperx/nltk_data
+Environment=OMP_NUM_THREADS=2
+Environment=TORCH_FORCE_NO_WEIGHTS_ONLY_LOAD=1
+Environment=HTTP_PROXY=
+Environment=HTTPS_PROXY=
+Environment=ALL_PROXY=
+ExecStartPre=/opt/narratage/services/whisperx/.venv/bin/narratage-whisperx-check
+ExecStart=/opt/narratage/services/whisperx/.venv/bin/narratage-whisperx-service
+Restart=on-failure
+RestartSec=5
+TimeoutStopSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/services/whisperx/deploy/svml-whisperx.service.example b/services/whisperx/deploy/svml-whisperx.service.example
deleted file mode 100644
index 0956791e..00000000
--- a/services/whisperx/deploy/svml-whisperx.service.example
+++ /dev/null
@@ -1,28 +0,0 @@
-[Unit]
-Description=SVML WhisperX alignment service
-After=network.target
-
-[Service]
-Type=simple
-User=svml
-WorkingDirectory=/opt/svml
-Environment=SVML_WHISPERX_PORT=8765
-Environment=SVML_WHISPERX_MODEL=small
-Environment=SVML_WHISPERX_DEVICE=cpu
-Environment=SVML_WHISPERX_COMPUTE=int8
-Environment=SVML_WHISPERX_BATCH_SIZE=8
-Environment=SVML_WHISPERX_INPUT_ROOTS=/tmp
-Environment=SVML_WHISPERX_NLTK_DATA=/var/cache/svml/whisperx/nltk_data
-Environment=OMP_NUM_THREADS=2
-Environment=TORCH_FORCE_NO_WEIGHTS_ONLY_LOAD=1
-Environment=HTTP_PROXY=
-Environment=HTTPS_PROXY=
-Environment=ALL_PROXY=
-ExecStartPre=/opt/svml/services/whisperx/.venv/bin/svml-whisperx-check
-ExecStart=/opt/svml/services/whisperx/.venv/bin/svml-whisperx-service
-Restart=on-failure
-RestartSec=5
-TimeoutStopSec=30
-
-[Install]
-WantedBy=multi-user.target
diff --git a/services/whisperx/pyproject.toml b/services/whisperx/pyproject.toml
index 6d1887e8..e1d04386 100644
--- a/services/whisperx/pyproject.toml
+++ b/services/whisperx/pyproject.toml
@@ -1,5 +1,5 @@
[project]
-name = "svml-whisperx-service"
+name = "narratage-whisperx-service"
version = "0.1.0"
description = "Warm, loopback-only WhisperX alignment service for the SVML local Provider"
readme = "README.md"
@@ -11,9 +11,9 @@ dependencies = [
]
[project.scripts]
-svml-whisperx-service = "svml_whisperx_service.__main__:main"
-svml-whisperx-check = "svml_whisperx_service.check:main"
-svml-whisperx-prepare = "svml_whisperx_service.prepare:main"
+narratage-whisperx-service = "narratage_whisperx_service.__main__:main"
+narratage-whisperx-check = "narratage_whisperx_service.check:main"
+narratage-whisperx-prepare = "narratage_whisperx_service.prepare:main"
[build-system]
requires = ["setuptools>=77"]
diff --git a/services/whisperx/src/svml_whisperx_service/__init__.py b/services/whisperx/src/narratage_whisperx_service/__init__.py
similarity index 74%
rename from services/whisperx/src/svml_whisperx_service/__init__.py
rename to services/whisperx/src/narratage_whisperx_service/__init__.py
index 784e4e8a..ad64ef80 100644
--- a/services/whisperx/src/svml_whisperx_service/__init__.py
+++ b/services/whisperx/src/narratage_whisperx_service/__init__.py
@@ -1,6 +1,6 @@
"""SVML's trusted local WhisperX process boundary."""
SERVICE_VERSION = "0.1.0"
-PROTOCOL = "svml.whisperx-service@1"
+PROTOCOL = "narratage.whisperx-service@1"
__all__ = ["PROTOCOL", "SERVICE_VERSION"]
diff --git a/services/whisperx/src/svml_whisperx_service/__main__.py b/services/whisperx/src/narratage_whisperx_service/__main__.py
similarity index 93%
rename from services/whisperx/src/svml_whisperx_service/__main__.py
rename to services/whisperx/src/narratage_whisperx_service/__main__.py
index 085e5457..d26f4af4 100644
--- a/services/whisperx/src/svml_whisperx_service/__main__.py
+++ b/services/whisperx/src/narratage_whisperx_service/__main__.py
@@ -14,7 +14,7 @@ def main() -> None:
format="%(asctime)s %(levelname)s [%(name)s] %(message)s",
)
config = ServiceConfig.from_environment()
- logging.getLogger("svml.whisperx").info(
+ logging.getLogger("narratage.whisperx").info(
"loading model=%s device=%s compute=%s batch=%d",
config.model,
config.device,
diff --git a/services/whisperx/src/svml_whisperx_service/application.py b/services/whisperx/src/narratage_whisperx_service/application.py
similarity index 100%
rename from services/whisperx/src/svml_whisperx_service/application.py
rename to services/whisperx/src/narratage_whisperx_service/application.py
diff --git a/services/whisperx/src/svml_whisperx_service/audio.py b/services/whisperx/src/narratage_whisperx_service/audio.py
similarity index 92%
rename from services/whisperx/src/svml_whisperx_service/audio.py
rename to services/whisperx/src/narratage_whisperx_service/audio.py
index 152bf8ea..f24f3574 100644
--- a/services/whisperx/src/svml_whisperx_service/audio.py
+++ b/services/whisperx/src/narratage_whisperx_service/audio.py
@@ -40,11 +40,11 @@ def read_canonical_audio(
except OSError as error:
raise AudioInputError("audio_path does not identify a readable file") from error
if not _inside(path, roots):
- raise AudioInputError("audio_path is outside SVML_WHISPERX_INPUT_ROOTS")
+ raise AudioInputError("audio_path is outside NARRATAGE_WHISPERX_INPUT_ROOTS")
if not path.is_file():
raise AudioInputError("audio_path must identify a regular file")
if path.stat().st_size > max_audio_bytes:
- raise AudioInputError("audio input exceeds SVML_WHISPERX_MAX_AUDIO_BYTES")
+ raise AudioInputError("audio input exceeds NARRATAGE_WHISPERX_MAX_AUDIO_BYTES")
try:
with wave.open(str(path), "rb") as source:
diff --git a/services/whisperx/src/svml_whisperx_service/check.py b/services/whisperx/src/narratage_whisperx_service/check.py
similarity index 92%
rename from services/whisperx/src/svml_whisperx_service/check.py
rename to services/whisperx/src/narratage_whisperx_service/check.py
index 1a59c384..272fac85 100644
--- a/services/whisperx/src/svml_whisperx_service/check.py
+++ b/services/whisperx/src/narratage_whisperx_service/check.py
@@ -22,7 +22,7 @@ def main() -> None:
raise RuntimeError(f"installed WhisperX is missing required API: {name}")
versions = {
name: metadata.version(name)
- for name in ("svml-whisperx-service", "whisperx", "faster-whisper", "numpy", "torch")
+ for name in ("narratage-whisperx-service", "whisperx", "faster-whisper", "numpy", "torch")
}
if versions["whisperx"] != "3.8.6":
raise RuntimeError(f"expected whisperx 3.8.6, got {versions['whisperx']}")
diff --git a/services/whisperx/src/svml_whisperx_service/config.py b/services/whisperx/src/narratage_whisperx_service/config.py
similarity index 60%
rename from services/whisperx/src/svml_whisperx_service/config.py
rename to services/whisperx/src/narratage_whisperx_service/config.py
index a1910b99..2e49c8c2 100644
--- a/services/whisperx/src/svml_whisperx_service/config.py
+++ b/services/whisperx/src/narratage_whisperx_service/config.py
@@ -35,47 +35,47 @@ class ServiceConfig:
@classmethod
def from_environment(cls, environment: Mapping[str, str] | None = None) -> "ServiceConfig":
env = os.environ if environment is None else environment
- device = env.get("SVML_WHISPERX_DEVICE", "cpu").strip()
- model = env.get("SVML_WHISPERX_MODEL", "small").strip()
+ device = env.get("NARRATAGE_WHISPERX_DEVICE", "cpu").strip()
+ model = env.get("NARRATAGE_WHISPERX_MODEL", "small").strip()
compute = env.get(
- "SVML_WHISPERX_COMPUTE",
+ "NARRATAGE_WHISPERX_COMPUTE",
"int8" if device == "cpu" else "float16",
).strip()
if not model:
- raise ValueError("SVML_WHISPERX_MODEL must not be empty")
+ raise ValueError("NARRATAGE_WHISPERX_MODEL must not be empty")
if not device:
- raise ValueError("SVML_WHISPERX_DEVICE must not be empty")
+ raise ValueError("NARRATAGE_WHISPERX_DEVICE must not be empty")
if not compute:
- raise ValueError("SVML_WHISPERX_COMPUTE must not be empty")
+ raise ValueError("NARRATAGE_WHISPERX_COMPUTE must not be empty")
- raw_roots = env.get("SVML_WHISPERX_INPUT_ROOTS", tempfile.gettempdir())
+ raw_roots = env.get("NARRATAGE_WHISPERX_INPUT_ROOTS", tempfile.gettempdir())
roots = tuple(
Path(item).expanduser().resolve()
for item in raw_roots.split(os.pathsep)
if item.strip()
)
if not roots:
- raise ValueError("SVML_WHISPERX_INPUT_ROOTS must contain at least one path")
+ raise ValueError("NARRATAGE_WHISPERX_INPUT_ROOTS must contain at least one path")
return cls(
- port=_positive_integer(env.get("SVML_WHISPERX_PORT", "8765"), "SVML_WHISPERX_PORT", 65535),
+ port=_positive_integer(env.get("NARRATAGE_WHISPERX_PORT", "8765"), "NARRATAGE_WHISPERX_PORT", 65535),
model=model,
device=device,
compute=compute,
batch_size=_positive_integer(
- env.get("SVML_WHISPERX_BATCH_SIZE", "8"),
- "SVML_WHISPERX_BATCH_SIZE",
+ env.get("NARRATAGE_WHISPERX_BATCH_SIZE", "8"),
+ "NARRATAGE_WHISPERX_BATCH_SIZE",
),
input_roots=roots,
nltk_data_root=Path(
- env.get("SVML_WHISPERX_NLTK_DATA", str(default_nltk_data_root()))
+ env.get("NARRATAGE_WHISPERX_NLTK_DATA", str(default_nltk_data_root()))
).expanduser().resolve(),
max_request_bytes=_positive_integer(
- env.get("SVML_WHISPERX_MAX_REQUEST_BYTES", str(64 * 1024)),
- "SVML_WHISPERX_MAX_REQUEST_BYTES",
+ env.get("NARRATAGE_WHISPERX_MAX_REQUEST_BYTES", str(64 * 1024)),
+ "NARRATAGE_WHISPERX_MAX_REQUEST_BYTES",
),
max_audio_bytes=_positive_integer(
- env.get("SVML_WHISPERX_MAX_AUDIO_BYTES", str(512 * 1024 * 1024)),
- "SVML_WHISPERX_MAX_AUDIO_BYTES",
+ env.get("NARRATAGE_WHISPERX_MAX_AUDIO_BYTES", str(512 * 1024 * 1024)),
+ "NARRATAGE_WHISPERX_MAX_AUDIO_BYTES",
),
)
diff --git a/services/whisperx/src/svml_whisperx_service/engine.py b/services/whisperx/src/narratage_whisperx_service/engine.py
similarity index 100%
rename from services/whisperx/src/svml_whisperx_service/engine.py
rename to services/whisperx/src/narratage_whisperx_service/engine.py
diff --git a/services/whisperx/src/svml_whisperx_service/prepare.py b/services/whisperx/src/narratage_whisperx_service/prepare.py
similarity index 100%
rename from services/whisperx/src/svml_whisperx_service/prepare.py
rename to services/whisperx/src/narratage_whisperx_service/prepare.py
diff --git a/services/whisperx/src/svml_whisperx_service/resources.py b/services/whisperx/src/narratage_whisperx_service/resources.py
similarity index 92%
rename from services/whisperx/src/svml_whisperx_service/resources.py
rename to services/whisperx/src/narratage_whisperx_service/resources.py
index 0353658a..70084e14 100644
--- a/services/whisperx/src/svml_whisperx_service/resources.py
+++ b/services/whisperx/src/narratage_whisperx_service/resources.py
@@ -17,11 +17,11 @@ PUNKT_TAB_URL = (
f"{PUNKT_TAB_COMMIT}/packages/tokenizers/punkt_tab.zip"
)
MAX_ARCHIVE_BYTES = 32 * 1024 * 1024
-MARKER_NAME = ".svml-resource.json"
+MARKER_NAME = ".narratage-resource.json"
def default_nltk_data_root() -> Path:
- return Path.home() / ".cache" / "svml" / "whisperx" / "nltk_data"
+ return Path.home() / ".cache" / "narratage" / "whisperx" / "nltk_data"
def _marker(root: Path) -> Path:
@@ -34,7 +34,7 @@ def assert_punkt_tab(root: Path) -> None:
value = json.loads(marker.read_text(encoding="utf-8"))
except (OSError, json.JSONDecodeError) as error:
raise RuntimeError(
- "locked NLTK punkt_tab data is unavailable; run `svml-whisperx-prepare`"
+ "locked NLTK punkt_tab data is unavailable; run `narratage-whisperx-prepare`"
) from error
if value != {"commit": PUNKT_TAB_COMMIT, "sha256": PUNKT_TAB_SHA256}:
raise RuntimeError("installed NLTK punkt_tab identity differs from the service lock")
@@ -90,7 +90,7 @@ def prepare_punkt_tab(root: Path, payload: bytes | None = None) -> Path:
raise RuntimeError(f"punkt_tab archive digest mismatch: expected {PUNKT_TAB_SHA256}, got {digest}")
target.parent.mkdir(parents=True, exist_ok=True)
- with tempfile.TemporaryDirectory(prefix="svml-punkt-tab-", dir=target.parent) as temporary:
+ with tempfile.TemporaryDirectory(prefix="narratage-punkt-tab-", dir=target.parent) as temporary:
staging = Path(temporary)
_extract(archive, staging)
extracted = staging / "punkt_tab"
diff --git a/services/whisperx/src/svml_whisperx_service/server.py b/services/whisperx/src/narratage_whisperx_service/server.py
similarity index 97%
rename from services/whisperx/src/svml_whisperx_service/server.py
rename to services/whisperx/src/narratage_whisperx_service/server.py
index fe7c66c2..b1e50d20 100644
--- a/services/whisperx/src/svml_whisperx_service/server.py
+++ b/services/whisperx/src/narratage_whisperx_service/server.py
@@ -7,7 +7,7 @@ import threading
from .application import RequestError, WhisperXApplication
-LOGGER = logging.getLogger("svml.whisperx")
+LOGGER = logging.getLogger("narratage.whisperx")
class WhisperXHttpServer(ThreadingHTTPServer):
@@ -21,7 +21,7 @@ class WhisperXHttpServer(ThreadingHTTPServer):
class WhisperXRequestHandler(BaseHTTPRequestHandler):
protocol_version = "HTTP/1.1"
- server_version = "svml-whisperx"
+ server_version = "narratage-whisperx"
sys_version = ""
@property
diff --git a/services/whisperx/tests/test_service.py b/services/whisperx/tests/test_service.py
index 1f8ae323..54b86ab3 100644
--- a/services/whisperx/tests/test_service.py
+++ b/services/whisperx/tests/test_service.py
@@ -11,12 +11,12 @@ import wave
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
-from svml_whisperx_service import PROTOCOL, SERVICE_VERSION # noqa: E402
-from svml_whisperx_service.application import RequestError, WhisperXApplication # noqa: E402
-from svml_whisperx_service.audio import AudioInputError, CanonicalAudio, read_canonical_audio # noqa: E402
-from svml_whisperx_service.config import ServiceConfig # noqa: E402
-from svml_whisperx_service.engine import InferenceBusyError, normalize_alignment, normalize_language # noqa: E402
-from svml_whisperx_service.resources import assert_punkt_tab # noqa: E402
+from narratage_whisperx_service import PROTOCOL, SERVICE_VERSION # noqa: E402
+from narratage_whisperx_service.application import RequestError, WhisperXApplication # noqa: E402
+from narratage_whisperx_service.audio import AudioInputError, CanonicalAudio, read_canonical_audio # noqa: E402
+from narratage_whisperx_service.config import ServiceConfig # noqa: E402
+from narratage_whisperx_service.engine import InferenceBusyError, normalize_alignment, normalize_language # noqa: E402
+from narratage_whisperx_service.resources import assert_punkt_tab # noqa: E402
def write_wav(path: Path, frames: int = 32_000, rate: int = 16_000, channels: int = 1) -> None:
@@ -61,7 +61,7 @@ class BusyEngine(FakeEngine):
def config(root: Path, **environment: str) -> ServiceConfig:
return ServiceConfig.from_environment({
- "SVML_WHISPERX_INPUT_ROOTS": str(root),
+ "NARRATAGE_WHISPERX_INPUT_ROOTS": str(root),
**environment,
})
@@ -79,7 +79,7 @@ class ConfigurationTests(unittest.TestCase):
def test_invalid_limits_fail_before_loading_model_weights(self) -> None:
with tempfile.TemporaryDirectory() as directory:
with self.assertRaisesRegex(ValueError, "PORT"):
- config(Path(directory), SVML_WHISPERX_PORT="70000")
+ config(Path(directory), NARRATAGE_WHISPERX_PORT="70000")
class AudioTests(unittest.TestCase):
@@ -108,7 +108,7 @@ class AudioTests(unittest.TestCase):
class ResourceTests(unittest.TestCase):
def test_locked_sentence_data_is_required_before_model_start(self) -> None:
with tempfile.TemporaryDirectory() as directory:
- with self.assertRaisesRegex(RuntimeError, "svml-whisperx-prepare"):
+ with self.assertRaisesRegex(RuntimeError, "narratage-whisperx-prepare"):
assert_punkt_tab(Path(directory))
diff --git a/services/whisperx/uv.lock b/services/whisperx/uv.lock
index 7ff36dcf..18dd1cf3 100644
--- a/services/whisperx/uv.lock
+++ b/services/whisperx/uv.lock
@@ -2908,7 +2908,7 @@ wheels = [
]
[[package]]
-name = "svml-whisperx-service"
+name = "narratage-whisperx-service"
version = "0.1.0"
source = { editable = "." }
dependencies = [
diff --git a/tools/caption-playground/README.md b/tools/caption-playground/README.md
index b698ecfa..4a5777f8 100644
--- a/tools/caption-playground/README.md
+++ b/tools/caption-playground/README.md
@@ -6,7 +6,6 @@ not a generic component inspector.
```bash
pnpm caption:playground -- \
--source examples/talking-film-graph-check/main.svml \
- --package-lock examples/talking-film-graph-check/svml.packages.lock \
--style base-caption \
--display story.caption \
--recipe examples/talking-film-graph-check/studio.svs#caption.base \
@@ -20,7 +19,7 @@ component registry, preview default or private Playground document.
The author Source, SVS and font-source files may live outside this repository. Installed packages
resolve from this tool's own installation by default; pass `--package-root <directory>` only when
-the lock names packages installed somewhere else. Source containment and package resolution remain
+the Source imports packages installed somewhere else. Source containment and package resolution remain
separate boundaries, just as they are in the CLI.
## Source of truth
@@ -38,7 +37,7 @@ sections in memory.
## What is real and what is preview-only
-The Node side loads the selected package lock and runs the ordinary author
+The Node side loads the packages selected by the Source and runs the ordinary author
compiler. The browser receives the real `CaptionStyleIntent`,
`CaptionDisplaySequence` and exact font attachments, then calls the real Fine
Caption renderer and Hyperframes document compiler.
diff --git a/tools/caption-playground/src/preview/runtime-shim.ts b/tools/caption-playground/src/preview/runtime-shim.ts
index bf30f068..c01e072e 100644
--- a/tools/caption-playground/src/preview/runtime-shim.ts
+++ b/tools/caption-playground/src/preview/runtime-shim.ts
@@ -10,7 +10,7 @@ export const RUNTIME_SHIM = String.raw`
root.style.height = (root.getAttribute('data-height') || '0') + 'px';
}
function seek(seconds) {
- var clips = document.querySelectorAll('.svml-visual-present');
+ var clips = document.querySelectorAll('.narratage-visual-present');
for (var i = 0; i < clips.length; i++) {
var clip = clips[i];
var start = parseFloat(clip.getAttribute('data-start') || '0') || 0;
diff --git a/tools/caption-playground/src/server.ts b/tools/caption-playground/src/server.ts
index fb6bd7e1..497153f1 100644
--- a/tools/caption-playground/src/server.ts
+++ b/tools/caption-playground/src/server.ts
@@ -7,11 +7,12 @@ import { dirname, relative, resolve } from "node:path";
import { fineCaptionRecipeSchema, FINE_CAPTION_FAMILY } from "@narratage/caption-fine";
import { openFontFamilies } from "@narratage/fonts-open";
import type { OpenFontFamily, OpenFontStyle } from "@narratage/fonts-open";
-import { loadNodePackageSet } from "@narratage/package-loader-node";
+import { loadNodePackageSelection } from "@narratage/package-loader-node";
+import type { LoadedPackage } from "@narratage/package-loader-node";
import type { ArtifactAttachment } from "@narratage/workspace";
import type { CanonicalValue, TypedRecord } from "@narratage/protocol";
import { parseSvs } from "@narratage/svs";
-import { createVideoCompiler } from "@narratage/video-cli";
+import { createVideoCompiler, discoverVideoSourcePackages } from "@narratage/video-cli";
import type { Plugin, ViteDevServer } from "vite";
import type {
@@ -28,8 +29,7 @@ const require = createRequire(new URL("../../../packages/fonts-open/src/surface.
export type CaptionPlaygroundOptions = {
readonly source: string;
- readonly packageLock: string;
- /** Host directory whose installed packages are named by packageLock. */
+ /** Host directory whose package manager installation supplies Source imports. */
readonly packageRoot: string;
readonly styleExport: string;
readonly displayExport: string;
@@ -197,12 +197,25 @@ export function captionPlaygroundPlugin(options: CaptionPlaygroundOptions): Plug
let server: ViteDevServer | undefined;
let compileTimer: ReturnType<typeof setTimeout> | undefined;
const galleryFiles = new Map<string, string>();
- const loaded = loadNodePackageSet(options.packageLock, options.packageRoot);
+ const loaded = (async () => {
+ let packages: readonly LoadedPackage[] = [];
+ let previous = "";
+ while (true) {
+ const selection = await discoverVideoSourcePackages(options.source, {
+ workspaceRoot: dirname(options.source),
+ packages,
+ });
+ packages = await loadNodePackageSelection(selection, options.packageRoot);
+ const key = JSON.stringify(packages.map((item) => item.specifier));
+ if (key === previous) return packages;
+ previous = key;
+ }
+ })();
const compile = async (): Promise<CurrentState> => {
- const packageSet = await loaded;
+ const packages = await loaded;
const compiler = createVideoCompiler({
- packageContributions: packageSet.packages.map((item) => item.contribution),
+ packageContributions: packages.map((item) => item.contribution),
workspaceRoot: dirname(options.source),
});
const [result, fontText, recipeText] = await Promise.all([
@@ -212,8 +225,8 @@ export function captionPlaygroundPlugin(options: CaptionPlaygroundOptions): Plug
]);
const style = inlineExport(result, options.styleExport);
const display = inlineExport(result, options.displayExport);
- assertRecord(style, "svml.caption-style@1", options.styleExport);
- assertRecord(display, "svml.caption-display-sequence@1", options.displayExport);
+ assertRecord(style, "narratage.caption-style@1", options.styleExport);
+ assertRecord(display, "narratage.caption-display-sequence@1", options.displayExport);
if ((style.rendering as Record<string, unknown> | undefined)?.family !== FINE_CAPTION_FAMILY) {
throw new Error(`${options.styleExport} is not a Fine Caption Style`);
}
diff --git a/tools/caption-playground/start.ts b/tools/caption-playground/start.ts
index e9f976fa..2e1b95e5 100644
--- a/tools/caption-playground/start.ts
+++ b/tools/caption-playground/start.ts
@@ -13,7 +13,7 @@ function usage(message?: string): never {
if (message !== undefined) process.stderr.write(`${message}\n\n`);
process.stderr.write(`Usage:
pnpm caption:playground -- \\
- --source <main.svml> --package-lock <svml.packages.lock> \\
+ --source <main.svml> \\
--style <export> --display <export> --recipe <file.svs#recipe.path> \\
--font <file.svml#font-stack-id> --canvas <width>x<height> --fps <number> \
[--package-root <directory>] [--port <number>]
@@ -88,7 +88,6 @@ const server = await createServer({
},
plugins: [captionPlaygroundPlugin({
source,
- packageLock: resolve(required(values, "package-lock")),
packageRoot,
styleExport: required(values, "style"),
displayExport: required(values, "display"),
diff --git a/tools/caption-playground/test/runtime-shim.test.ts b/tools/caption-playground/test/runtime-shim.test.ts
index 8688c754..b41ef297 100644
--- a/tools/caption-playground/test/runtime-shim.test.ts
+++ b/tools/caption-playground/test/runtime-shim.test.ts
@@ -17,7 +17,7 @@ function document_() {
id: "caption-preview",
canvas: { width: 1080, height: 1920, clearColor: "#09090b" },
tracks: [sealVisualTrack({
- visualIr: "svml.visual-ir@1",
+ visualIr: "narratage.visual-ir@1",
id: "caption",
presents: [{
id: "one", span: { startFrame: 0, endFrameExclusive: 30 },
diff --git a/tools/svml-playground/README.md b/tools/svml-playground/README.md
index 20cd1b1e..1811c2b6 100644
--- a/tools/svml-playground/README.md
+++ b/tools/svml-playground/README.md
@@ -10,7 +10,7 @@ pnpm svml:playground -- --source examples/talking-film-broll-preview/main.svml
Optional arguments:
- `--run <build.svrun>` reads material and timings explicitly selected by a Run Source.
-- `--runtime <svml.runtime.json>` opens earlier Build records and Artifacts read-only.
+- `--runtime <narratage.runtime.json>` opens earlier Build records and Artifacts read-only.
- `--port <number>` changes the listening port from `5179`.
The Playground never writes a Source, Recipe, Build or Artifact and never calls
diff --git a/tools/svml-playground/src/official-video.ts b/tools/svml-playground/src/official-video.ts
index 34f0216b..0b40dc1f 100644
--- a/tools/svml-playground/src/official-video.ts
+++ b/tools/svml-playground/src/official-video.ts
@@ -19,7 +19,7 @@ import {
MarkupSurfaceRegistry,
} from "@narratage/markup";
import type { MarkupSurfaceRegistryLike } from "@narratage/markup";
-import { createNodePackageInventory } from "@narratage/package-loader-node";
+import { loadNodePackageSelection } from "@narratage/package-loader-node";
import type { ModuleRef, ResolvedModuleClosure } from "@narratage/protocol";
import { TypeValidatorRegistry } from "@narratage/validation";
@@ -71,8 +71,8 @@ type OfficialVideoDomain = {
let loading: Promise<OfficialVideoDomain> | undefined;
async function loadOfficialVideoDomain(): Promise<OfficialVideoDomain> {
- const loaded = await createNodePackageInventory(OFFICIAL_VIDEO_PACKAGES, import.meta.dirname);
- const contributions = loaded.packages.map((item) => item.contribution);
+ const loaded = await loadNodePackageSelection(OFFICIAL_VIDEO_PACKAGES, import.meta.dirname);
+ const contributions = loaded.map((item) => item.contribution);
const manifests = contributions.flatMap((item) =>
(item.modules ?? []).map((module) => module.manifest));
const closure = createResolvedClosure(manifests);
diff --git a/tools/svml-playground/src/pipeline/archive.ts b/tools/svml-playground/src/pipeline/archive.ts
index a35f07fd..1b5a65bb 100644
--- a/tools/svml-playground/src/pipeline/archive.ts
+++ b/tools/svml-playground/src/pipeline/archive.ts
@@ -8,7 +8,7 @@
*/
import {
createRuntimeArchiveFromConfig, createRuntimeArtifactAccessFromConfig,
-} from "@narratage/local/config";
+} from "@narratage/runtime-local/config";
import type { BuildState } from "@narratage/protocol";
export type Archive = {
diff --git a/tools/svml-playground/src/pipeline/execute.ts b/tools/svml-playground/src/pipeline/execute.ts
index 263e4005..98623f6d 100644
--- a/tools/svml-playground/src/pipeline/execute.ts
+++ b/tools/svml-playground/src/pipeline/execute.ts
@@ -35,9 +35,9 @@ export type Executed = {
function localProviders(): readonly EndpointPackage[] {
const built: EndpointPackage[] = [];
for (const create of [
- () => createLocalMediaProvider({ instance: "media.local", authority: "media.local" }),
- () => createLocalHyperframesProvider({ instance: "hyperframes.local", authority: "hyperframes.local" }),
- () => createLocalWhisperXProvider({ instance: "whisperx.local", authority: "whisperx.local" }),
+ () => createLocalMediaProvider({ instance: "media.local", pool: "media.local" }),
+ () => createLocalHyperframesProvider({ instance: "hyperframes.local", pool: "hyperframes.local" }),
+ () => createLocalWhisperXProvider({ instance: "whisperx.local", pool: "whisperx.local" }),
]) {
// A Provider whose tool is not installed is simply one the preview does
// not have, which is the same as any other unserved Capability.
diff --git a/tools/svml-playground/src/pipeline/observe.ts b/tools/svml-playground/src/pipeline/observe.ts
index 12e6b522..57c1ebb9 100644
--- a/tools/svml-playground/src/pipeline/observe.ts
+++ b/tools/svml-playground/src/pipeline/observe.ts
@@ -195,7 +195,7 @@ function harvestScript(input: RawInput, into: Record<string, unknown>[]): void {
input.contentStart,
);
into.push({
- format: "svml.script-source-map@1",
+ format: "narratage.script-source-map@1",
record: id,
range: { start: input.openingStart, end: end + closing.length },
segments: parsed.segments.map((segment) => ({ id: segment.id, range: segment.range })),
diff --git a/tools/svml-playground/src/pipeline/preview.ts b/tools/svml-playground/src/pipeline/preview.ts
index 7e49d990..0cb4af1c 100644
--- a/tools/svml-playground/src/pipeline/preview.ts
+++ b/tools/svml-playground/src/pipeline/preview.ts
@@ -98,7 +98,7 @@ function authoredCanvas(compiled: unknown): { width: number; height: number } {
for (const record of records) {
if (record.value.kind !== "inline") continue;
const canvas = record.value.value as { widthPx?: number; heightPx?: number; contract?: string };
- if (canvas.contract === "svml.canvas-space@1"
+ if (canvas.contract === "narratage.canvas-space@1"
&& typeof canvas.widthPx === "number" && typeof canvas.heightPx === "number") {
return { width: canvas.widthPx, height: canvas.heightPx };
}
diff --git a/tools/svml-playground/src/pipeline/snapshot.ts b/tools/svml-playground/src/pipeline/snapshot.ts
index cb557c0d..8c6c662b 100644
--- a/tools/svml-playground/src/pipeline/snapshot.ts
+++ b/tools/svml-playground/src/pipeline/snapshot.ts
@@ -84,7 +84,7 @@ function scriptMap(
maps: readonly Record<string, unknown>[],
built: Preview,
): ScriptMap | undefined {
- const found = maps.find((map) => map.format === "svml.script-source-map@1");
+ const found = maps.find((map) => map.format === "narratage.script-source-map@1");
if (found === undefined) return undefined;
const selections = (found.selections ?? []) as ScriptMap["selections"];
const segments = (found.segments ?? []) as ScriptMap["segments"];
diff --git a/tools/svml-playground/src/preview/runtime-shim.ts b/tools/svml-playground/src/preview/runtime-shim.ts
index 2c7dffbd..3a232d8e 100644
--- a/tools/svml-playground/src/preview/runtime-shim.ts
+++ b/tools/svml-playground/src/preview/runtime-shim.ts
@@ -40,7 +40,7 @@ function shim(audibleTrack: string | undefined): string {
* while the transport insisted it was keeping time.
*/
function apply(seconds, scrubbing) {
- var clips = document.querySelectorAll('.svml-visual-present');
+ var clips = document.querySelectorAll('.narratage-visual-present');
for (var i = 0; i < clips.length; i++) {
var clip = clips[i];
var start = parseFloat(clip.getAttribute('data-start') || '0') || 0;
@@ -58,7 +58,7 @@ function shim(audibleTrack: string | undefined): string {
// separate Track the media pipeline muxes in. A preview is not a
// render, and placing B-roll against speech means hearing the speech,
// so the Spine's own material is allowed to sound.
- var track = clip.getAttribute('data-svml-track-id');
+ var track = clip.getAttribute('data-narratage-track-id');
element.muted = muted || scrubbing || audible === null || track !== audible;
try {
if (!inside) { element.pause(); continue; }
diff --git a/tools/svml-playground/src/server.ts b/tools/svml-playground/src/server.ts
index 13cb0abf..31416fba 100644
--- a/tools/svml-playground/src/server.ts
+++ b/tools/svml-playground/src/server.ts
@@ -94,7 +94,7 @@ export function svmlPlaygroundPlugin(options: SvmlPlaygroundOptions): Plugin {
if (changed === options.source || changed === options.run || path.endsWith(".svs")) schedule();
});
value.middlewares.use((request, response, next) => {
- const url = new URL(request.url ?? "/", "http://svml.local");
+ const url = new URL(request.url ?? "/", "http://narratage.local");
if (request.method !== "GET" && request.method !== "HEAD") {
next();
return;
diff --git a/tools/svml-playground/src/shared.ts b/tools/svml-playground/src/shared.ts
index 03ee4890..c67a9c58 100644
--- a/tools/svml-playground/src/shared.ts
+++ b/tools/svml-playground/src/shared.ts
@@ -13,7 +13,7 @@ export type Range = { readonly start: number; readonly end: number };
* moves it and only the picture knows where it ended up.
*/
export type Clip = {
- /** The Present's own id, identical to the preview's data-svml-present-id. */
+ /** The Present's own id, identical to the preview's data-narratage-present-id. */
readonly id: string;
/** The authored id this Present is named after, when it names one. */
readonly authoredId: string;
diff --git a/tools/svml-playground/src/ui/stage.ts b/tools/svml-playground/src/ui/stage.ts
index 51b98ea8..8d5bddd0 100644
--- a/tools/svml-playground/src/ui/stage.ts
+++ b/tools/svml-playground/src/ui/stage.ts
@@ -50,10 +50,10 @@ export function createStage(store: Store): Stage {
const measure = (clipId: string): { xPx: number; yPx: number; widthPx: number; heightPx: number } | undefined => {
const document_ = iframe.contentDocument;
if (document_ === null) return undefined;
- const present = document_.querySelector(`[data-svml-present-id="${CSS.escape(clipId)}"]`);
+ const present = document_.querySelector(`[data-narratage-present-id="${CSS.escape(clipId)}"]`);
// The present spans the whole canvas; the drawn box is its frame element.
- const drawn = present?.querySelector(`[data-svml-element-id="${CSS.escape(`${clipId}:frame`)}"]`)
- ?? present?.querySelector("[data-svml-element-id]");
+ const drawn = present?.querySelector(`[data-narratage-element-id="${CSS.escape(`${clipId}:frame`)}"]`)
+ ?? present?.querySelector("[data-narratage-element-id]");
if (drawn === null || drawn === undefined) return undefined;
const box = drawn.getBoundingClientRect();
if (box.width === 0 && box.height === 0) return undefined;
diff --git a/tools/svml-playground/start.ts b/tools/svml-playground/start.ts
index 22d75f6e..dfd4b431 100644
--- a/tools/svml-playground/start.ts
+++ b/tools/svml-playground/start.ts
@@ -12,7 +12,7 @@ function usage(message?: string): never {
if (message !== undefined) process.stderr.write(`${message}\n\n`);
process.stderr.write(`Usage:
pnpm svml:playground -- --source <main.svml> [--run <build.svrun>]
- [--runtime <svml.runtime.json>] [--port <number>]
+ [--runtime <narratage.runtime.json>] [--port <number>]
The Playground reads the Source. It never writes to it, and it never runs a
Provider: with no build present it estimates timings from the Script text.
diff --git a/tools/svml-playground/test/pipeline.test.ts b/tools/svml-playground/test/pipeline.test.ts
index 2b7c79ae..0b7e6053 100644
--- a/tools/svml-playground/test/pipeline.test.ts
+++ b/tools/svml-playground/test/pipeline.test.ts
@@ -165,7 +165,7 @@ test("a snapshot points its clips back at the tags that placed them", async () =
}
// Every Present the picture draws must be addressable, or selecting a clip
// could not box it.
- assert.match(snapshot.preview.srcdoc, /data-svml-present-id/u);
+ assert.match(snapshot.preview.srcdoc, /data-narratage-present-id/u);
});
test("the Script's markers carry the frames its words are said on", async () => {
diff --git a/tsconfig.cli.json b/tsconfig.cli.json
new file mode 100644
index 00000000..c4faf784
--- /dev/null
+++ b/tsconfig.cli.json
@@ -0,0 +1,18 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "noEmit": false,
+ "declaration": false,
+ "sourceMap": false,
+ "outDir": "./dist/cli",
+ "incremental": true,
+ "tsBuildInfoFile": "./dist/cli.tsbuildinfo"
+ },
+ "include": [
+ "packages/*/src/**/*.ts"
+ ],
+ "exclude": [
+ "node_modules",
+ "packages/*/test/**"
+ ]
+}