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 modular compilation and runtime state

kashorin849ac2a76f95
diff --git a/docs/guide/author-packages.md b/docs/guide/author-packages.md
index 3c50f0ed..aa071104 100644
--- a/docs/guide/author-packages.md
+++ b/docs/guide/author-packages.md
@@ -49,14 +49,26 @@ import type { ModuleManifest, ModuleRef } from "@narratage/protocol";
export const myComponentModuleRef: ModuleRef = {
name: "@narratage/my-component",
- version: 1,
+ version: "1",
};
export const myComponentManifest: ModuleManifest = {
- module: myComponentModuleRef,
+ format: "svml.module@1",
+ name: myComponentModuleRef.name,
+ version: myComponentModuleRef.version,
+ dependencies: [],
types: [ /* your nominal Types */ ],
+ capabilities: [],
producers: [ /* your deterministic Producers */ ],
};
+
+export const myComponentMarkupSurfaces = [{
+ name: "widget",
+ tag: "Widget",
+ mode: "structured",
+ outputs: [ /* Types this syntax may author */ ],
+ implementation: { digest: "sha256:..." },
+}] as const;
```
Types are nominally owned by Modules. Core does not maintain a central union of every domain
@@ -68,9 +80,9 @@ The Surface handler decodes the Markup Frontend's XML elements into typed author
```typescript
// src/surface.ts
-import type { MarkupSurfaceDecoder } from "@narratage/markup";
+import type { StructuredSurfaceHandler } from "@narratage/markup";
-export const decodeMyComponentSurface: MarkupSurfaceDecoder = (element, context) => {
+export const decodeMyComponentSurface: StructuredSurfaceHandler = ({ element }) => {
// Read attributes and children from the XML element
// Validate inputs
// Emit typed Records and Operations into context
@@ -90,23 +102,20 @@ Look at existing Surface implementations for reference:
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
myComponentManifest,
+ myComponentMarkupSurfaces,
myComponentModuleRef,
decodeMyComponentSurface,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/my-component",
modules: [{
manifest: myComponentManifest,
- specifiers: ["@narratage/my-component", "@narratage/my-component@1"],
}],
hostFacets: [
createMarkupSurfaceHostFacet({
module: myComponentModuleRef,
- surface: "my-widget",
- mode: "structured",
- implementationDigest: "sha256:...",
+ declaration: myComponentMarkupSurfaces[0],
handler: decodeMyComponentSurface,
}),
],
@@ -115,8 +124,11 @@ export const svmlPackage = {
export default svmlPackage;
```
-The `specifiers` array lists the strings that an `<import from="..."/>` will match against. The
-`surface` string determines the XML element prefix (`<mine:my-widget>` when imported as `mine`).
+The Module automatically offers its exact `[email protected]`, so authors import
+`@narratage/my-component@1` without a duplicate alias declaration. Use optional `specifiers` only
+when the package intentionally owns a genuinely different logical alias. The Surface declaration
+determines the accepted tag (`<mine:Widget>` when imported as `mine`). It is a Markup Host facet,
+not part of the semantic Module Manifest or Core.
## 6. Declare package dependencies
diff --git a/docs/guide/packages.md b/docs/guide/packages.md
index 1695c9cf..5556a5b8 100644
--- a/docs/guide/packages.md
+++ b/docs/guide/packages.md
@@ -26,7 +26,8 @@ Script, Seedance, Film or any video concept.
@narratage/elaborator author declarations and Fragment expansion
@narratage/run syntax-neutral Run Graph
@narratage/validation semantic admission
-@narratage/host Host-facing interfaces
+@narratage/host opaque Host-facet envelope
+@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
@@ -249,3 +250,32 @@ Two independent package inventories serve different authority scopes:
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.
+
+### 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.
+
+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,
+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
+Runtime Adapters advertise their own Host ABIs. Only the Source Host interprets that facet.
+
+Runtime Profiles follow the same rule. Each `use` selects either an Endpoint Adapter ABI or a
+Runtime Service 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
+does not contain a Provider registry, and an Endpoint adapter and Runtime-service adapter 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.
diff --git a/docs/guide/providers.md b/docs/guide/providers.md
index 1c77481e..5286480f 100644
--- a/docs/guide/providers.md
+++ b/docs/guide/providers.md
@@ -109,7 +109,6 @@ const adapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-my-service",
hostFacets: [adapter],
};
diff --git a/docs/guide/runtime-profile.md b/docs/guide/runtime-profile.md
index 33e4454b..dbc4036b 100644
--- a/docs/guide/runtime-profile.md
+++ b/docs/guide/runtime-profile.md
@@ -29,7 +29,6 @@ creative content—it never enters Author or Run graph identity.
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.keychain"]
}
@@ -89,7 +88,7 @@ store name.
`runtimeServices` activates installed service adapters. `services` selects every required role by
its exact instance id: Scheduler, Worker, BuildStore, OperationStore, DispatchStore,
-RuntimeJournal, ArtifactStore and one or more CredentialStores. No role is inferred from package
+ArtifactStore and one or more CredentialStores. No role is inferred from package
presence or filled by `@narratage/local`.
### Filesystem fields
@@ -121,10 +120,10 @@ and resource controls.
## Embedding API
-The CLI deliberately accepts only declarative JSON Profiles. A server or application embedding
-Narratage may assemble the same Scheduler, Worker, Store and Endpoint roles directly through
-`@narratage/local`. That assembly is application code—not another Profile syntax and not a
-source-language escape hatch.
+The official video Distribution currently parses declarative Runtime Profiles as JSON. The generic
+CLI assigns no meaning to `.json`; it delegates the selected document to the Distribution. A server
+or application embedding Narratage may assemble the same Scheduler, Worker, Store and Endpoint
+roles directly through `@narratage/local`.
## Diagnostics
diff --git a/docs/guide/services.md b/docs/guide/services.md
index a6332a02..6a833867 100644
--- a/docs/guide/services.md
+++ b/docs/guide/services.md
@@ -34,8 +34,10 @@ A stopped idle Runtime is a valid observation, not a failed command. `runtime st
successfully after a successful query and reports `ready: false`; it becomes an attention warning
when unfinished dispatch exists but the Worker or a required declared program is unavailable.
-The Worker record binds an effective Profile revision covering the Profile bytes plus both package
-locks it names. Editing the same Profile path or regenerating either lock makes the old process
+The Worker record binds an opaque Profile revision supplied by the selected Distribution. The
+official JSON Profile implementation covers the Profile bytes plus both package locks it names;
+the generic CLI neither parses that document nor assumes what belongs to a revision. Editing the
+same Profile path or regenerating either lock therefore makes the official Worker process
`stale`. The next `runtime up` or `build` first checks the DispatchStore: unfinished work from the
old revision rejects the new revision without stopping the old Worker or starting external
programs. Once old work is terminal, replacement is allowed.
diff --git a/docs/quickstart/run.md b/docs/quickstart/run.md
index 7716f823..a105435e 100644
--- a/docs/quickstart/run.md
+++ b/docs/quickstart/run.md
@@ -181,7 +181,7 @@ A local file is the simplest zero-input Candidate. The Run Source names the byte
to one current Logical Output:
```svml
-<file id="approved-opening" from="./approved-opening.mp4" media-type="video/mp4"/>
+<file id="approved-opening" type="@narratage/artifact@1#BlobArtifact" from="./approved-opening.mp4" media-type="video/mp4"/>
<satisfy output="opening-shot.video" candidate="approved-opening"/>
```
@@ -192,8 +192,9 @@ human-supplied result uses the same mechanism.
## Runtime Profile
The declarative Runtime Profile (`svml.runtime.json`) tells the CLI **where** to run each type of
-work. Applications embedding Narratage may assemble the same Runtime roles through
-`@narratage/local`, but executable modules are not CLI Profiles. See the complete
+work. The official video Distribution parses this document as JSON; the command delegates to that
+Distribution instead of assigning semantics from the filename suffix. Applications embedding
+Narratage may assemble the same Runtime roles through `@narratage/local`. See the complete
[Runtime Profile guide](../guide/runtime-profile.md).
```json
@@ -214,7 +215,6 @@ work. Applications embedding Narratage may assemble the same Runtime roles throu
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.env"]
}
@@ -408,7 +408,6 @@ Runtime Profile, so the Profile remains portable:
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.env"]
}
diff --git a/docs/zh/guide/author-packages.md b/docs/zh/guide/author-packages.md
index a208c461..5273cf4f 100644
--- a/docs/zh/guide/author-packages.md
+++ b/docs/zh/guide/author-packages.md
@@ -46,14 +46,26 @@ import type { ModuleManifest, ModuleRef } from "@narratage/protocol";
export const myComponentModuleRef: ModuleRef = {
name: "@narratage/my-component",
- version: 1,
+ version: "1",
};
export const myComponentManifest: ModuleManifest = {
- module: myComponentModuleRef,
+ format: "svml.module@1",
+ name: myComponentModuleRef.name,
+ version: myComponentModuleRef.version,
+ dependencies: [],
types: [ /* your nominal Types */ ],
+ capabilities: [],
producers: [ /* your deterministic Producers */ ],
};
+
+export const myComponentMarkupSurfaces = [{
+ name: "widget",
+ tag: "Widget",
+ mode: "structured",
+ outputs: [ /* 这段语法可以创作的 Type */ ],
+ implementation: { digest: "sha256:..." },
+}] as const;
```
Type 在名义上归属于 Module。Core 并不维护一个包含所有领域类型的中央联合类型 —— 安装一个新包就能添加新的 Type,无需发布新的 Core 版本。
@@ -64,9 +76,9 @@ Surface handler 把 Markup Frontend 的 XML 元素解码成带类型的作者声
```typescript
// src/surface.ts
-import type { MarkupSurfaceDecoder } from "@narratage/markup";
+import type { StructuredSurfaceHandler } from "@narratage/markup";
-export const decodeMyComponentSurface: MarkupSurfaceDecoder = (element, context) => {
+export const decodeMyComponentSurface: StructuredSurfaceHandler = ({ element }) => {
// Read attributes and children from the XML element
// Validate inputs
// Emit typed Records and Operations into context
@@ -86,23 +98,20 @@ export const decodeMyComponentSurface: MarkupSurfaceDecoder = (element, context)
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
myComponentManifest,
+ myComponentMarkupSurfaces,
myComponentModuleRef,
decodeMyComponentSurface,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/my-component",
modules: [{
manifest: myComponentManifest,
- specifiers: ["@narratage/my-component", "@narratage/my-component@1"],
}],
hostFacets: [
createMarkupSurfaceHostFacet({
module: myComponentModuleRef,
- surface: "my-widget",
- mode: "structured",
- implementationDigest: "sha256:...",
+ declaration: myComponentMarkupSurfaces[0],
handler: decodeMyComponentSurface,
}),
],
@@ -111,7 +120,10 @@ export const svmlPackage = {
export default svmlPackage;
```
-`specifiers` 数组列出了 `<import from="..."/>` 会去匹配的字符串。`surface` 字符串决定 XML 元素前缀(以 `mine` 导入时即为 `<mine:my-widget>`)。
+Module 会自动提供精确的 `[email protected]`,所以作者直接导入
+`@narratage/my-component@1`,无需再声明一份重复别名。只有包确实拥有另一个逻辑名称时
+才使用可选的 `specifiers`。Surface declaration 决定可接受的标签(以 `mine` 导入时即为
+`<mine:Widget>`)。它属于 Markup Host facet,不属于语义 Module Manifest,更不属于 Core。
## 6. 声明包依赖
diff --git a/docs/zh/guide/packages.md b/docs/zh/guide/packages.md
index 52828aa9..c00f081e 100644
--- a/docs/zh/guide/packages.md
+++ b/docs/zh/guide/packages.md
@@ -22,7 +22,8 @@ Loader 能解析任意被显式锁定的包;但 TypeScript 不维护会掩盖
@narratage/elaborator author declarations and Fragment expansion
@narratage/run syntax-neutral Run Graph
@narratage/validation semantic admission
-@narratage/host Host-facing interfaces
+@narratage/host opaque Host-facet envelope
+@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
@@ -227,3 +228,28 @@ SVML 使用按字节锁定的受信任代码执行。加载器会记录每个包
`packages sync` 只增长或刷新库存,不会删除其他 Run 的根包。每次编译只激活当前 Source
请求的精确子集,并把该子集摘要绑定进 Build;Runtime adapter 同样只激活 Profile 声明的
精确子集。包字节改变后必须显式刷新库存。
+
+### 逻辑包地址与 Source 发现
+
+Source 写的是逻辑语言能力,不是 npm 位置。项目库存通过 `(Host ABI, 逻辑名)` 这对地址,
+把逻辑能力绑定到一个按字节锁定的物理包。因此 Module 与 Run Fragment 可以故意使用同一
+个名字而不会变成同一种能力;一个物理包也可以提供多个逻辑名字。
+
+编译首先只读取强制 Source Header,从可信库存解析对应 Frontend,调用该 Frontend 自己的
+`discover()`,继续解析它报告的 Module、Run Fragment 与子 Source,直到本次需要的精确包
+子集不再增长,然后才开始语义解码。Markup 是 video Distribution 的启动 Frontend;除此
+之外,Script、SVS、Run Markup 和第三方 Frontend 都走同一套发现协议,包选择器不再含有
+针对某种解析器的分支。
+
+Frontend 实现不是物理包格式里的特权字段。它们与 Run Fragment、Markup Surface、Runtime
+Adapter 一样,通过自己的 Host ABI 发布普通 facet;Frontend 使用
+`svml.source-frontend@1`,只有 Source Host 会解释它。
+
+Runtime Profile 也遵循同一规则。每个 `use` 选择的是 Endpoint Adapter ABI 或 Runtime Service
+Adapter ABI 加逻辑名;物理 npm 包只负责声明它提供这个逻辑能力。包名只是首次纳入库存的提示
+和 lockfile 事实,通用 CLI 不维护 Provider 注册表;同名的 Endpoint Adapter 与 Runtime
+Service Adapter 也不会互相冲突。
+
+逻辑名与物理 npm 包根同名时,`packages sync` 可以直接完成首次纳入。若一个物理合集包
+使用不同名字,开发者需先把它显式加入项目库存;此后 Source 仍只依赖逻辑名。系统绝不会
+仅因为 Source Header 写出了某个名字,就下载或执行一份尚未受信任的代码。
diff --git a/docs/zh/guide/providers.md b/docs/zh/guide/providers.md
index 3a16db31..271a6c08 100644
--- a/docs/zh/guide/providers.md
+++ b/docs/zh/guide/providers.md
@@ -105,7 +105,6 @@ const adapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-my-service",
hostFacets: [adapter],
};
diff --git a/docs/zh/guide/runtime-profile.md b/docs/zh/guide/runtime-profile.md
index 0a704dd6..0df066b9 100644
--- a/docs/zh/guide/runtime-profile.md
+++ b/docs/zh/guide/runtime-profile.md
@@ -27,7 +27,6 @@ Runtime Profile 声明冻结后的 Build *在哪里*执行:Scheduler、Worker
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.keychain"]
}
@@ -47,7 +46,7 @@ Runtime Profile 声明冻结后的 Build *在哪里*执行:Scheduler、Worker
```
`runtimeServices` 激活已安装的实现;`services` 按实例 id 逐项选择 Scheduler、Worker、
-BuildStore、OperationStore、DispatchStore、RuntimeJournal、ArtifactStore 和一个或多个
+BuildStore、OperationStore、DispatchStore、ArtifactStore 和一个或多个
CredentialStore。不存在“因为只装了一个所以自动选中”,`@narratage/local` 也不补 SQLite、文件系统或凭据默认值。
凭据只写地址:`{ "store": "…", "key": "…" }`,秘密字节不进 Profile。多个 Store 可以并存,每个 Store 只响应属于自己命名空间的引用。
@@ -87,7 +86,7 @@ node --run narratage -- runtime logs svml.runtime.json
node --run narratage -- runtime down svml.runtime.json
```
-`runtime up` 管理耐久 Worker 与声明的外部程序。`services up/status/down` 只管理外部程序,不会启动 Worker。`build` 会确保 Runtime 已启动,但 Build 所在终端从不拥有执行权。后台进程绑定覆盖 Profile 与两份 package lock 的有效修订摘要;任一文件变化后状态变为
+`runtime up` 管理耐久 Worker 与声明的外部程序。`services up/status/down` 只管理外部程序,不会启动 Worker。`build` 会确保 Runtime 已启动,但 Build 所在终端从不拥有执行权。Distribution 提供一个不透明 Runtime 修订;官方 JSON Profile 让它覆盖 Profile 与两份 package lock,通用 CLI 不解释其语法。任一文件变化后状态变为
`stale`,下一次启动或提交会按新执行闭包替换进程,而不是继续复用旧装配。
`doctor` 会求值 Endpoint Adapter 唯一的纯 `activate()` 声明,并直接从产生的 Endpoint package
@@ -124,4 +123,6 @@ Build 取消先关闭准入;Operation 取消只抑制那个精确实现。`acc
## 嵌入 API
-CLI 只接受声明式 JSON Profile。嵌入 Narratage 的应用可以通过 `@narratage/local` 直接组装相同的 Runtime 角色;这属于应用代码,而不是第二种 CLI Profile 文件。
+官方 video Distribution 目前按 JSON 解析声明式 Runtime Profile;通用 CLI 不给 `.json`
+后缀任何语义,只把文档交给 Distribution。嵌入 Narratage 的应用可以通过
+`@narratage/local` 直接组装相同的 Runtime 角色。
diff --git a/docs/zh/guide/services.md b/docs/zh/guide/services.md
index d14dceca..091d9201 100644
--- a/docs/zh/guide/services.md
+++ b/docs/zh/guide/services.md
@@ -21,7 +21,7 @@ node --run narratage -- runtime down svml.runtime.json
彼此独立的外部程序会并行准备。人类可读输出会显示 `Checking`、`Preparing`、`Starting`、
`Waiting`、`Ready`,首次准备 WhisperX 模型或浏览器时不会像命令卡死;JSON 模式仍只输出一份干净的最终文档。
-后台进程同时绑定 Profile 路径,以及覆盖 Profile 与两份 package lock 的有效修订摘要。任一文件变化后,旧进程会显示为 `stale`;下一次 `runtime up` 或 `build` 会先替换旧进程,不会让新 Dispatch 偷偷进入旧执行闭包。
+后台进程同时绑定 Profile 路径与 Distribution 提供的不透明修订值。官方 JSON Profile 的实现让该修订覆盖 Profile 与两份 package lock;通用 CLI 不解析配置文档,也不假定哪些文件属于修订。任一文件变化后,官方 Worker 会显示为 `stale`;下一次 `runtime up` 或 `build` 会先替换旧进程,不会让新 Dispatch 偷偷进入旧执行闭包。
`runtime down` 停止 Worker 和由该 Profile 管理的程序,但不会取消 Build 或远端 Provider
任务。队列仍在 Store 中,下次启动后继续。
diff --git a/docs/zh/quickstart/run.md b/docs/zh/quickstart/run.md
index 84f24cd6..55f22e07 100644
--- a/docs/zh/quickstart/run.md
+++ b/docs/zh/quickstart/run.md
@@ -160,7 +160,7 @@ Core 不再给 Candidate 标注 `exact` 或 `substitute`。选择 Candidate 本
本地文件就是最简单的零输入 Candidate:
```svml
-<file id="approved-opening" from="./approved-opening.mp4" media-type="video/mp4"/>
+<file id="approved-opening" type="@narratage/artifact@1#BlobArtifact" from="./approved-opening.mp4" media-type="video/mp4"/>
<satisfy output="opening-shot.video" candidate="approved-opening"/>
```
@@ -170,8 +170,9 @@ Core 不再给 Candidate 标注 `exact` 或 `substitute`。选择 Candidate 本
Runtime Profile(`svml.runtime.json`)告诉系统**在哪里**执行每种类型的工作:
-CLI 只接受声明式 `svml.runtime.json`。嵌入 Narratage 的应用可以通过 `@narratage/local`
-直接组装相同的 Runtime 角色;应用代码不是另一种 CLI Profile。完整说明见
+官方 video Distribution 目前按 JSON 解析这份文档;CLI 根据命令把它交给 Distribution,
+不会根据文件后缀赋予语义。嵌入 Narratage 的应用可以通过 `@narratage/local` 直接组装
+相同的 Runtime 角色。完整说明见
[Runtime Profile 指南](../guide/runtime-profile.md)。
```json
@@ -192,7 +193,6 @@ CLI 只接受声明式 `svml.runtime.json`。嵌入 Narratage 的应用可以通
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.env"]
}
@@ -373,7 +373,6 @@ node --run narratage -- plan /work/my-film/build.svrun \
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.env"]
}
diff --git a/examples/talking-film-graph-check/svml.packages.lock b/examples/talking-film-graph-check/svml.packages.lock
index 99e017fe..9009c46f 100644
--- a/examples/talking-film-graph-check/svml.packages.lock
+++ b/examples/talking-film-graph-check/svml.packages.lock
@@ -582,573 +582,647 @@
{
"name": "@narratage/artifact",
"version": "0.0.0-dev",
- "digest": "sha256:e1839b39b3ec1bc560ad7d0876e72cef09903f40ba3e0669b355f54a39d2fc82"
+ "digest": "sha256:d2973201574fc3aa340357223bbda6328122b24e4597d0869166f91597186e95"
},
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:cb8fdd4207865c201e83e6a843a85322b73b96cc7a2c40130d439bbc960daed6"
+ "digest": "sha256:31027d41a18bf640ae801c387c2c03139482c8ab47f4dfd54cae5b413461989c"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:2411d92a3eec5dac75ef53d9a9715f88d6cec8241e6b752c802537c18e91bf3a"
+ "digest": "sha256:dc76638426d8e3b1ee64dac6d5c9345b43174e19a91873bbac8c6e6a97c961c9"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:c43dcd0defd89f3079c81075859a7c63179a58911f9fb43c78e499bf8c9073e8"
+ "digest": "sha256:3f7899629c23005ca059ff2ada2b9b0d69916d2d04eb0549d045b536eac6387c"
},
{
"name": "@narratage/component-kit",
"version": "0.0.0-dev",
- "digest": "sha256:0a42292eed0b924b9f2bc4d22187818bb7136ea8f5f122f97962a27f10a30dd1"
+ "digest": "sha256:f67949d59b628490e2a371bc4fb42f546ee33648d2a82d439875757b0909f6ab"
},
{
"name": "@narratage/composition",
"version": "0.0.0-dev",
- "digest": "sha256:af8c81e17a6c90b292c37ac3577a43263dab7cfbe30d0a84a4d507d68ffc4d9e"
+ "digest": "sha256:b452b85d6afc21402bcc1e3c888d17dab83b7069980b36f541c50ad2ba19a1eb"
},
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:9ade54b00fd6728287f036aaa1ae38f3f7c756be9e2e1015b74c29ee3339c95b"
+ "digest": "sha256:9150672b3de23a42d4af156798b30b711a5b40154e9136c0ce2a09835025b304"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:7f2d21ae5e0c8c113e82dcc7169aa7f20b2062ffb79a0db86861c8ab069cb219"
+ "digest": "sha256:b5211ec5b360ad562b82dec2545a579b5aa72dd307b6669f9734ed6a6d556ae1"
},
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:40d71029ce8d1fceeb5f6cc03dddebb1e0179f692a855647750150cf1efd8aa3"
+ "digest": "sha256:1a3eee83d2568c34aa5cd8979068ccbc8084de99a2a7b3259d7f977e1c7201f7"
},
{
"name": "@narratage/fonts-open",
"version": "0.0.0-dev",
- "digest": "sha256:e145b8fe1ab5dca02f91b60d4ec3301c9a8022f5bf46ffe47a2284cdb3dcc0d0"
+ "digest": "sha256:230cef42eb5f36c4adf9b36460e3d524b88ff2463e8428923bc17110b573a10b"
},
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:fa629ce58731fb544aec83f10348352af019a5c8f441699e1b0035ec489dac6e"
+ "digest": "sha256:bf7f8997580cf8b1352ea337fada4e2f72608c0f1f9083cffed6b35d79592604"
},
{
"name": "@narratage/host",
"version": "0.0.0-dev",
- "digest": "sha256:4fb020ec30c6024e74994eae5492fb98c75eb2e055a4a289a16afa26d84fcb4e"
+ "digest": "sha256:ba250954090c44a88ada96680e61c89d1c376227923a7cd2eba81ad95bb81650"
},
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:9a736f281f46eeb4a1998ae9438b0869722f00cdef9b53e219d94ac04497231d"
+ "digest": "sha256:f695df17048daef3b86888824543a5910d75e0a8f717db14d86add13151c0825"
},
{
"name": "@narratage/markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d54f0d3a0947f628d406628ec78f441b8cb5da633ebc4a7fbb5ef176d68924b"
+ "digest": "sha256:da12c183459098dbfab7db1878311e5bac886a60f472f858f91f0fb1e23ea0a0"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:d30dfe6cf81b969e77678d870a34eb13ae48d8e486bfa5b300b452e79cc3d83e"
+ "digest": "sha256:caa37152c7f21a66287fef701d73ab179430c76bcb728726836812daed2e261a"
},
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:49af374a0b3d235c6e0f675d16c80ae5bf4bcdb8b9fc125f910391b4362dbede"
+ "digest": "sha256:2c5ee5df2467eb64986e692db669bdca1c19ba0888ff4a489ecb8dc06c608094"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:3517862f3a4d8fcb5225b00a2295264feff9baed0f08b49e5894bb9f8a6100a1"
+ "digest": "sha256:ff7379074c1a07898bad6b467daaa884852a9778860d3d35ebf75bb68d61fdf6"
},
{
"name": "@narratage/model-kit",
"version": "0.0.0-dev",
- "digest": "sha256:ccc8c4bee06bea96d57400fc348a16b0c149e9acd5152ca331d2b0cfe85d1f15"
+ "digest": "sha256:7ee53615cec344fc8866832be4ccf2fee88077871557cc98e7d539b78ba7d565"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:5823b08047e4d1b099675112b6a58243a563d4ea1bcdb592fdcb10e6e3ef73ab"
+ "digest": "sha256:48c1af0278fa9d69709bad7c9363486c8214933429c4b5ab2ac214175e53bd06"
},
{
"name": "@narratage/program-space",
"version": "0.0.0-dev",
- "digest": "sha256:b0b6413c2dd0fbd2894250b5d79d927a92bae8a3fbe755a5f3f7b18424504e03"
+ "digest": "sha256:a190a71dbff8e3a1a70fcc01af88bf4f4e0e21f34cc8678df75c1ae8fef20a7a"
},
{
"name": "@narratage/protocol",
"version": "0.0.0-dev",
- "digest": "sha256:8bec54ebf8fc9c8ac8ae8e24a3fce912267039d666183d16e7485c072923e462"
+ "digest": "sha256:3167ce3b4534ee4df885e1ae9a24dc1cf067fdb9bb851ab1983f195b020933b1"
},
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:6a436385accd1290988cf6e424e0b9b67b8c758045092281a41844284d135643"
+ "digest": "sha256:7b072e7bc231f940016a18277a936afc4568511141a85916b16b1e01431fd734"
},
{
"name": "@narratage/run-markup",
"version": "0.0.0-dev",
- "digest": "sha256:3ec93949ccc358327c63229f0bfd9ee3ebca487943dba544e70eb87a8a1d33ab"
+ "digest": "sha256:33de32d54d225d381b7804c59644b6a19f87b11208c6301411f376ce8dc09430"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:eed752e2b89f5611a75e7c90e13c142059faf6e5155bce8140ae45dfb1e04e91"
+ "digest": "sha256:8d7a3b0b98c8dbda0d182a154eb99f90f2f9b9a2055c1ec18909e80a21417721"
},
{
"name": "@narratage/script",
"version": "0.0.0-dev",
- "digest": "sha256:77ebf0d0b25d6e71a5abc40eb0b05517e713901231caf56fbd6d4064c84a5942"
+ "digest": "sha256:e87cb6d28660f956e808d97c012a5a765726591d12975a2680472ce681638594"
},
{
"name": "@narratage/seedance",
"version": "0.0.0-dev",
- "digest": "sha256:5d44f162719a383284cbb62c860d9bbee7aa7af5c693f57c22f31a63f5d3e309"
+ "digest": "sha256:509b2aef3b2dd340561a6906bccfa202683b4f81ac1217a2d3b7779f4519994f"
},
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:cc3b158e95dae35f5c67dbc926f0c69389f0ccc0260425cd6491f5c927510657"
+ "digest": "sha256:1df8ad135529bb16e2a5fd3ebfba92e305c67bfe0391c45410cb0e1cf909ca6c"
},
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:f35e680ec01059de899247b7ec5d550e0641a7b880d0bfd75d34b2c930947a7e"
+ "digest": "sha256:92aa671a7253f5ae34d16584b950b45e0035df0cf454f8112bf48e3b2c8a5268"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:13305323045486cf9526bf51951467427c93f63e53be0ed4504c542349fc4a21"
+ "digest": "sha256:d615ab7dbb3a42b21279cc765d34041339e0bb1a6e43292271fa8073e3b3916f"
},
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:70dabc2dfc7603791cd0291e7e507d29837ed4ab1cdf386a46bd1fc3661aadb3"
+ "digest": "sha256:51edbdf62b45a3f6212b931d57be1d24fb97a8e0299f1da23275a2009452d41c"
},
{
"name": "@narratage/speech-basis",
"version": "0.0.0-dev",
- "digest": "sha256:1b76c55aedf45de5cd9ec3fe4f523b97f08d600cf375ce0b7d65de41d857d934"
+ "digest": "sha256:27c7ce76b7fea0e02c7d8ec667d0832afb26663729c63ccbd11eecd5b54196b8"
},
{
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev",
- "digest": "sha256:8112726350bf8ccb13883f8268490b4119f4821097222517d5101c14ed46d6d5"
+ "digest": "sha256:60fefc5dfca2e227efe04d94220c06e4baa3482fb83f7e558436b070052b6431"
},
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:a3dc6eac1d4415bd169180dcfea631619c97c1d6e75eb4ba71bb5959cabfbe20"
+ "digest": "sha256:b99b8d10a7aeaf3bb07d47a2fc280fba85d7fddcd59d2b0e214ddd2b50a49d18"
},
{
"name": "@narratage/speech",
"version": "0.0.0-dev",
- "digest": "sha256:76b8c81a6a78ae392991a21eed847f5f0d1f6ba1f0a6fa41538c78ff96a2a2d2"
+ "digest": "sha256:263a86f1542c58f5e4b04299b1660fc9cdf4d3dbc6d693739f900e6190bdcd5e"
},
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:7dce3e185ebf3d1f56b3e934fe79c804c6a67640468be65991cceeab25fd04a9"
+ "digest": "sha256:d18cdad6feb5a08bef01f54d80fd90f3447ade8504f32265ed85af00786273d4"
},
{
"name": "@narratage/temporal",
"version": "0.0.0-dev",
- "digest": "sha256:5566cc222d97435a2072b626183b90f592fb20a09d72f207cd9222a413b4e172"
+ "digest": "sha256:ef34acb71edb8faf59483012480516b1b82eb6ce13dceb70bafa9747ecf5f8ee"
},
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:bb58dc8de88a8a70f7597e6f578a6b4d90d43e99638110d2b367a68992f234ae"
+ "digest": "sha256:60168cbfa687559288f014dbe159b6fab94f2b75de8b31c7a30c28860f2fe2ac"
},
{
"name": "@narratage/typography-track",
"version": "0.0.0-dev",
- "digest": "sha256:09c00d85038e22b00ffa68f4393c9f6869471deb8524a210ce7cde424c40361f"
- },
- {
- "name": "@narratage/validation",
- "version": "0.0.0-dev",
- "digest": "sha256:0808de7090f09bab5e762833b8fa19b357908e72778394bd994d4db9b377fd32"
+ "digest": "sha256:bac4d75a8496be748f933366e6c46a51a674ad075a18f5bed4f3c2c9e712bbdc"
},
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:cd133df7e104188444ad34ad76f33d3674f5d12ba8aa5d942a8db145aba7415a"
+ "digest": "sha256:2c5b5f746333e3fb1e2585d1fa96fcd532eb307ca92fd6f5a51c061cc078295a"
},
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:ed7b57ad0a47e7f788fd087918e06c20b8cb58a68e149b34fcfa9687fcf3f03a"
+ "digest": "sha256:e05affb90cf46bf572b21f162653f6943692c3e31c636e97be86397e650adec6"
}
],
"packages": [
{
- "specifier": "@narratage/artifact",
"package": {
"name": "@narratage/artifact",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:72524ad8d5599450b4ab199680a6382c72c40cbf760f9c0265687f340aa60650",
- "closureDigest": "sha256:62a2d8a5788671adf06df7347da70df41d5cbfc9651f330bbb05f4f163f77846"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/artifact@1"
+ }
+ ],
+ "facetsDigest": "sha256:a56f39df98f2bff5caf339a427586e73be079eb26697c2313612bf7c07d78e2c",
+ "closureDigest": "sha256:964875842b2aab623bd64759c3b549eb6536cf046f825344939a01e890c8d586"
},
{
- "specifier": "@narratage/caption",
"package": {
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption",
- "@narratage/caption@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption@1"
+ }
],
- "facetsDigest": "sha256:1b7b07dfb828c3f95e321841a956e371c044dad8f39c117d92096e9be19b0032",
- "closureDigest": "sha256:563563ad6da139632b43318d170ce714e055014786a344d656f81c94f51d9ca9"
+ "facetsDigest": "sha256:ca39ffa5e3fe8377e0ce892ae06dd1c5a5071ce8b09f976a6688fcb4d4f4ba25",
+ "closureDigest": "sha256:0b4306b0e025d760b6d7a2fde7211a4b9c09e5edad7a96a96f8008b17de77ad0"
},
{
- "specifier": "@narratage/caption-fine",
"package": {
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption-fine",
- "@narratage/caption-fine@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption-fine@1"
+ }
],
- "facetsDigest": "sha256:cb9fb74a5edc730f01772e4819f7d7a55ecf914984d48116f72f64a1837cf128",
- "closureDigest": "sha256:adeba9eee745b343d1e058fe48a8e8d346d72a6c0ec4c7ca3878643a29aee75d"
+ "facetsDigest": "sha256:a088cf31f0d34fb602ca35bec2cc6b79552f51c31c7c4b51fa130c02545caa84",
+ "closureDigest": "sha256:bc44cd61dfe0fa2f306e5c2677baa4b6d66717a73f238c2c09c047fb7cddd7ad"
},
{
- "specifier": "@narratage/caption-gemini",
"package": {
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption-gemini",
- "@narratage/caption-gemini@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption-gemini@1"
+ }
],
- "facetsDigest": "sha256:733cd8ac6415d69fffe460f77870787e7d3146fe11c937461bc9d849edc94106",
- "closureDigest": "sha256:41b6986b13c5c99906127e05e4f6e3cbc232a2133f5aa811472ee2450512a1c9"
+ "facetsDigest": "sha256:bd0bf15f5502346bdf912611ed7d1e12adb199aedececacb105ec084b1a886c3",
+ "closureDigest": "sha256:3a754106255922e51341336ede1fdb159c10717336e646baa6534b0d9e8d1c4a"
},
{
- "specifier": "@narratage/composition",
"package": {
"name": "@narratage/composition",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b86fe5e147a331d36843aecbe7c64a4e83ad98b755242d8d1a1ba6c62551f509",
- "closureDigest": "sha256:ddfbaf79774806fa3cf79b85a7f8765ec77fa888a7c1b9e9d91b7424f7e5201b"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/composition@1"
+ }
+ ],
+ "facetsDigest": "sha256:359770b8802b23de618eb0de967b755976b780cd486f947cd05eb43a3b1d6525",
+ "closureDigest": "sha256:de69234604891117bfe4d93c25a96102d2d0ce0c8cbdf30be1c447c319211cc9"
},
{
- "specifier": "@narratage/film",
"package": {
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/film",
- "@narratage/film@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/film@1"
+ }
],
- "facetsDigest": "sha256:8e6a1a585e853ef9b621feb918c15a2925da4ea1f05467e652d41f9202f10025",
- "closureDigest": "sha256:7870bcb9f57c04a05a75f1c99bc3e868051057a8eda6799ac63f2daf2af721d0"
+ "facetsDigest": "sha256:7bf1195a32b4985c89debb5c07923162c25f39532f985c0726c4640f41c9879f",
+ "closureDigest": "sha256:8f4d19981e64d7bb8f2fe333360ff95d57935d3b5430f69cb24b68631bc18018"
},
{
- "specifier": "@narratage/fonts-open",
"package": {
"name": "@narratage/fonts-open",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/fonts-open",
- "@narratage/fonts-open@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/fonts-open@1"
+ }
],
- "facetsDigest": "sha256:2117122b06d7c1cd6bee519e72aff22bc3b50f179b50da21dcc84ddf7014457f",
- "closureDigest": "sha256:4f4efe9e75e162bf26ac50cdade55ccac665cd3a208eeb8b011e482a3f20a617"
+ "facetsDigest": "sha256:7528bc7200ecfeeb87526cc82941f698f0f3fe2e1cb7dfa7da3931212e446681",
+ "closureDigest": "sha256:b43e8b97463ec07d98bb8aec8307682b4bd712d4d5f87d704a3947bcac973ff8"
},
{
- "specifier": "@narratage/generation",
"package": {
"name": "@narratage/generation",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:d74a57a3210267e665366513324db5c313b3ca0f770da66e74cc38aee5048efb",
- "closureDigest": "sha256:3638f93e6a983a5a44768eef160a6dbf49e80d065f890bc5bd14555ad023b7ec"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/generation@1"
+ }
+ ],
+ "facetsDigest": "sha256:65e792d683c414afbacac57887c99fa4647c7c9819eb85f7262833f0cb1e0c15",
+ "closureDigest": "sha256:a1b141eccf9d17a5b02143d6af99b870c544246eb052fa60c826a4949792c247"
},
{
- "specifier": "@narratage/hyperframes",
"package": {
"name": "@narratage/hyperframes",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:4b2a86382c5d544fac8c194047f6e18ff554361d97d62e165533061b03b94ae9",
- "closureDigest": "sha256:3d288affb92c4b81527cb167947dd96a448b5091bf9c4c057e417be50a4b2623"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/hyperframes@1"
+ }
+ ],
+ "facetsDigest": "sha256:5bbb886657ff3922bdb86e0e66fd95ab402681924e295aa8e6d0966bd013b8c1",
+ "closureDigest": "sha256:3ce37a75ff0e5ee0778de66430cb82c2573e4cd5770eab49d628240f268c22cd"
},
{
- "specifier": "@narratage/media",
"package": {
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/media",
- "@narratage/media@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/media@1"
+ }
],
- "facetsDigest": "sha256:f0974c7d88918ca4796dbb86dea24b6d29f8f5f44430c4845f9928f1df5b22e5",
- "closureDigest": "sha256:8ceaff731f4c0d5c4b88f708bdd75c5d6a4a00abe71607c6ddf0b8fe0da400c3"
+ "facetsDigest": "sha256:5fdb06f92ddd600dca998f5ef196980398c7c35d52727bf358c963ab71b39c37",
+ "closureDigest": "sha256:0feb2ded6c2cc21fc22d9614f195d14e86ca81cbbc2dd9ed5aae919a7369b63b"
},
{
- "specifier": "@narratage/media-pipeline",
"package": {
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/media-pipeline",
- "@narratage/media-pipeline@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/media-pipeline@1"
+ }
],
- "facetsDigest": "sha256:6df6afa9661002801d95b5075309a7cf31484d7ad300a5ab3f90119d34042224",
- "closureDigest": "sha256:020673ebf48c557a7c318b5cd1e97e096bf8e4681a459fa4fbd2b352fb6ff402"
+ "facetsDigest": "sha256:bc81746c11271eb7c77d842df99127448c618d7afab0e9f4e4a3e8d52d527e89",
+ "closureDigest": "sha256:2591dd13b3d354190a2849bf2456985ce51171b36f0c1bf4f7b4c0ad4df9d0b7"
},
{
- "specifier": "@narratage/media-track",
"package": {
"name": "@narratage/media-track",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/media-track",
- "@narratage/media-track@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/media-track@1"
+ }
],
- "facetsDigest": "sha256:c7cea22dcf6e37c4359284d4c2bd2a146d752aa6bf65b944a9eaa13c895675be",
- "closureDigest": "sha256:49a71bacc460de88b692194fad37c63d39734c3423e3f624dd0178a8d836d5ca"
+ "facetsDigest": "sha256:99aca70e00d269e26d727501871e530247dd91a00aa93a329d75610337acde8e",
+ "closureDigest": "sha256:e7754e2e8e5fd2c6337d69d816c494191e9cbb23867c754ae4998f5e2bab555d"
},
{
- "specifier": "@narratage/narrative",
"package": {
"name": "@narratage/narrative",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:703db7ad343b00701dc39e3b316992dc371307f0c6c2ad15d1e0269257ffb326",
- "closureDigest": "sha256:c197675dfd711b5ac42fc0f084b1b7574de4f4061fda2fbabe69352faff1cd01"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/narrative@1"
+ }
+ ],
+ "facetsDigest": "sha256:53b0ff4baa9d85ab8c53bdd6585afdcba26262be2e149b7ae8f4c7cbc1dcfae8",
+ "closureDigest": "sha256:7e7227e29b215d3d1f17409b2b69a69f0a372ef6ab41c138c827535d1cf4f2dc"
},
{
- "specifier": "@narratage/program-space",
"package": {
"name": "@narratage/program-space",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b1e4eab41a135914556872f0f47a0c02b8ce76920366cbf86121b720af069052",
- "closureDigest": "sha256:d732dd805f1577ff3b7aaea5d05722d43bb03958095861a3eae7bf47d5f2504c"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/program-space@1"
+ }
+ ],
+ "facetsDigest": "sha256:83b9191a4c78858c669b64675d333aaf44b8930209724793bf6c64a874203d6c",
+ "closureDigest": "sha256:c6dd1d4310d07543a7a61f56803d93e1e621a1743dcfd3f42b35382cccca7e07"
},
{
- "specifier": "@narratage/render-hyperframes",
"package": {
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/render-hyperframes",
- "@narratage/render-hyperframes@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/render-hyperframes@1"
+ }
],
- "facetsDigest": "sha256:2b5edae659a7d3e92e19ed591ca7d5f784f4a3b6164d33c0e201c9b180ef0323",
- "closureDigest": "sha256:53134fcfc4451213e40f207ed42f8b465b7090f617b835398cb06ec0b23db32d"
+ "facetsDigest": "sha256:a884236bb8d08577ad66a3b9dd144108b8161106a71633f07ae851b984bb9d57",
+ "closureDigest": "sha256:2b738d2d5917cc4ab2ed46cf549f71270cb00049b5bd0077c8159674a57cfba3"
},
{
- "specifier": "@narratage/run-markup",
"package": {
"name": "@narratage/run-markup",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/run-markup@1"
+ "offers": [
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/run-markup@1"
+ }
],
- "facetsDigest": "sha256:fb3a8a5be9a0ef0aa914026a199be641f4e20df27f9b284be196f52fd260be55",
- "closureDigest": "sha256:fbe76b58961bf0dba04cb91194c7756e0940e61b18a219510b90f97438f3dae2"
+ "facetsDigest": "sha256:c38a4e2e76a2f87b6a401bf0cad4b18f04274689ffae22c09f8f520046a7123e",
+ "closureDigest": "sha256:f4f247f39f53bb79b46ba41aee3f027b5c0a58dd34a4207d0e72a37fa2c92b69"
},
{
- "specifier": "@narratage/script",
"package": {
"name": "@narratage/script",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/script",
- "@narratage/script@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/script@1"
+ }
],
- "facetsDigest": "sha256:69e1c08a5f07c73a506ca8286426a0386485738649e86463cca0b291f319ee4e",
- "closureDigest": "sha256:ee9962537eafe56bb339574fbb9bdba9c00dab39ce8c5b9da89aabdc41c64d22"
+ "facetsDigest": "sha256:1ecc0ce99508f9b36b6745f2031187c4f7a055644213d9d2618563f2c141287a",
+ "closureDigest": "sha256:304d3e61367190ef1291675804e09230e7ffe71de79a936610c38c8b7e0ad95c"
},
{
- "specifier": "@narratage/seedance",
"package": {
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/seedance",
- "@narratage/seedance@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/seedance@1"
+ }
],
- "facetsDigest": "sha256:df015abfb273de3629eec0da456a6fa90e7a55a5ed092d76a74c3d1dc4a5f705",
- "closureDigest": "sha256:51da9127b77edc1c46c7a9c88786c49df3c8d91eeec0bca236b8554ef16709b1"
+ "facetsDigest": "sha256:695ac38d561581bea511f85838dc2a71eefb2f6eedbfb63d95774ac08ce33e0c",
+ "closureDigest": "sha256:e3a921e2b316c056d23dbd7475d14d72a7c9df940107cbefc58e649201dc8902"
},
{
- "specifier": "@narratage/semantic-map",
"package": {
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:510a57287945426449c8b2580d22a2d7f90ccaf1cb5bdd4fa5071b5b05ee91c0",
- "closureDigest": "sha256:8b6838a4057fcec08cbb74c66d405f8be9a93234ce20df5cdd94fd8d9a5ae914"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/semantic-map@1"
+ }
+ ],
+ "facetsDigest": "sha256:de253bd0e4968c2a6a9dca67d6d9c815973a7274b2e61aec643d51ce8c3225e0",
+ "closureDigest": "sha256:098e0924229f284f2bc60dae2e6d1cd0a76282e7e154027e15661c56d5d2163f"
},
{
- "specifier": "@narratage/spatial",
"package": {
"name": "@narratage/spatial",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/spatial",
- "@narratage/spatial@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/spatial@1"
+ }
],
- "facetsDigest": "sha256:5062281ffadb46495ec12e1a67185b57fe13879e90f03bcf544e93fd1d273716",
- "closureDigest": "sha256:73d113e95dd6cbd1feb6f45070e244850e6737fa5c09c23f68c5ecfb8a377d36"
+ "facetsDigest": "sha256:235c4e6f0a070869d6ae321b1033b9cf8cff91fafda43f5fee683a988d5ace78",
+ "closureDigest": "sha256:7bcd21198dd38738a2cabb12055a2fdc21cea0cd69b33c767e288bac19ae9d13"
},
{
- "specifier": "@narratage/speech",
"package": {
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:6d1be76a2ee9486146436fde148c99eccdc055948a39c5098de2ff4122d80c7a",
- "closureDigest": "sha256:8d6d71bf808b4aeceed1f500f68ff648e19131940d3da0e0e0426e48c179e100"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech@1"
+ }
+ ],
+ "facetsDigest": "sha256:96c70b41141d0d46b6731810629d195a5b7349ecba9d10269b046cceecdabb56",
+ "closureDigest": "sha256:e1dd70278beca5619bd75032bee14a56f73cd5557e596f7d013c2735bc8ec428"
},
{
- "specifier": "@narratage/speech-alignment",
"package": {
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:78162875012523865df9c69770127a1db6ef9a8f5fc5af72255360af2a9c4370",
- "closureDigest": "sha256:c3dece181c80c8cfbf3186dd55a2654d6114765384188df4e6b6e21b1bf45c77"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-alignment@1"
+ }
+ ],
+ "facetsDigest": "sha256:0be3cdf2b26373c950d0421554ffe8beda3a9b19c4c8e5b2880a3f0788ef60e1",
+ "closureDigest": "sha256:229f94603df7799aa5eaaccde7e52ccf4244f556402124cb2d509d4b8d3977a8"
},
{
- "specifier": "@narratage/speech-basis",
"package": {
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:97aaeabe85b3e4d6a8715ea9a41ac27ef71804ae99359b631546a4382bbac9df",
- "closureDigest": "sha256:0fea160882535c9746d56d1f668607aa9d1a46a40c60bbb2859f8b307145a0e4"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-basis@1"
+ }
+ ],
+ "facetsDigest": "sha256:cc2f44ed596c9f02085920100f37a691d9a8496710c5a949b8111b398597d8f8",
+ "closureDigest": "sha256:7d15c3c45943c070cf66f6b8927b801e414641a0860cbf9364ebde3b3eb2dcc4"
},
{
- "specifier": "@narratage/speech-evidence",
"package": {
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:989d191644ea472a3cbd386bd4a6992f1f7f5ef82f1f8da53c9a4efa99d3d2d1",
- "closureDigest": "sha256:fed18a41121b44960b5a9cd2a6cd6f6954bc3016d7abbc7bf4b0a26798f28742"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-evidence@1"
+ }
+ ],
+ "facetsDigest": "sha256:8028258f3c87642711029d5ec77b085297cb271e9c93b42dae2c939c3ee8f92f",
+ "closureDigest": "sha256:f4b37c669298e291c4393ea3a16adf7bfe7909c6217043954cfa0c9bb9f84d5b"
},
{
- "specifier": "@narratage/speech-spine",
"package": {
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/speech-spine",
- "@narratage/speech-spine@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-spine@1"
+ }
],
- "facetsDigest": "sha256:81a038765324b7a48ceb44c638faf128df31573a122989116d649dca3b3cb6d3",
- "closureDigest": "sha256:f6e6f346541422f115905fe77b967ae113dcff0e77905d1876f9353810e61234"
+ "facetsDigest": "sha256:72bf8ff092a815c9ee2b87588c9330c8bf916460c55ca963c6a42f804317dc8c",
+ "closureDigest": "sha256:33a07e226471a359e5461f8fedbaca493373a9fa2dfdc8efe533b42907d68c20"
},
{
- "specifier": "@narratage/svs",
"package": {
"name": "@narratage/svs",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/svs@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/svs@1"
+ },
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/svs@1"
+ }
],
- "facetsDigest": "sha256:9cc7c397d2cd97b5a3e814886b6553b6d236fd8825df0d056e328b7f0cf20163",
- "closureDigest": "sha256:43a43083ff729f30cc31edf9ddf2b44722430bde9a9ad6e73cc0ae1114d5d522"
+ "facetsDigest": "sha256:72fe7996774d83a734e48f600412c15f08fa3671ac3e4e27586a7e99deaec050",
+ "closureDigest": "sha256:a63f616a28f3e4d0f4e9276f7e2ff9678f1b785b18a96a92c61b83767c4babbe"
},
{
- "specifier": "@narratage/temporal",
"package": {
"name": "@narratage/temporal",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:2e9c4804f142e08e87b2e11af79aa17770109fb573e865397bed14ed7a4f1d0e",
- "closureDigest": "sha256:23665c9c41bf398eeb83164f0541b48e6bb10c1e2c886c351ee72c9d42d2cddd"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/temporal@1"
+ }
+ ],
+ "facetsDigest": "sha256:f3cf535add0b1746dc5beb7920935bc36cca953ee044961d35c5c89fe6b7a746",
+ "closureDigest": "sha256:efa8c338a54680b44914e4abe5d0dfff8f7e2e0b942e5d79dcfa346e683c2155"
},
{
- "specifier": "@narratage/text",
"package": {
"name": "@narratage/text",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/text",
- "@narratage/text/svs@1",
- "@narratage/text@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/text@1"
+ },
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/text/svs@1"
+ }
],
- "facetsDigest": "sha256:4435dd4bd38e5e017013f775e28e379e3e235211649ee8f3913378f7f9e60b58",
- "closureDigest": "sha256:4e1ae6017ad16c4d27128f858b83ff04fabd33a03e6d015f010b543f154e7e1a"
+ "facetsDigest": "sha256:a9ae364f8549243764ceb4c5d881c89c116b088187dd6b688bffaae1f0eb420f",
+ "closureDigest": "sha256:0cc4669f4cdd749a01ced4d1425f38abcf96102cbda38e767ad6822e3bb62ba5"
},
{
- "specifier": "@narratage/typography-track",
"package": {
"name": "@narratage/typography-track",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/typography-track",
- "@narratage/typography-track@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/typography-track@1"
+ }
],
- "facetsDigest": "sha256:feacd6f8891a8792935a81fd0251f6c42c470067cf68bd4532e202c0a387e72d",
- "closureDigest": "sha256:360436ecefd6f299a0c22675db347a60bc48035fd8e3dec930b769959ecb8e5b"
+ "facetsDigest": "sha256:e04bcfde4a80fe0226ee211d7ca1074570e29bfeee30835ec16c81cd8ee54c15",
+ "closureDigest": "sha256:62058b0ae656f385c02e78dae2bf9714b26e2e3b8b2347489ed0167f4c5eb96b"
},
{
- "specifier": "@narratage/visual-ir",
"package": {
"name": "@narratage/visual-ir",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:8c577a635a48ee04441068df1f3dc2c18a602bff091fddca8883a3843ce4ce37",
- "closureDigest": "sha256:4606d4ea45276ed1a5a34ed109e545961ca3d72787a13bf85e976e20082528f0"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/visual-ir@1"
+ }
+ ],
+ "facetsDigest": "sha256:039735354a109969a18b2c26ab8b02bb6d09a7a35f993336e8e8711e6d429f14",
+ "closureDigest": "sha256:dc9323f4881edd20e0ad93ec18e72321871a271b924fc8fbca8ad9c15c2c60a6"
},
{
- "specifier": "@narratage/whisperx",
"package": {
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/whisperx",
- "@narratage/whisperx@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/whisperx@1"
+ }
],
- "facetsDigest": "sha256:ed9ebd9eea0b92c20357ec67dc14c4aa211836dc815c3edcb48e4946972f94c5",
- "closureDigest": "sha256:74176a63a7a62d4de6896a66f0e2883466defce32fed33dbe9d9688beccdff13"
+ "facetsDigest": "sha256:a9f5fa2a709d91b006ee59cfd88c4392cc77df31c0f76d58f2d5dee8e7ae8f49",
+ "closureDigest": "sha256:b6848c21bb13a66408cfe6ddf43d4ceca91aa24b9df7237383d517ee4b56c620"
}
],
- "digest": "sha256:59cea527279ac5da6153cf0d99b241f89fac8d61f2391568f879da2936ba68e6"
+ "digest": "sha256:de5bcdaf199b578c23f6a8cbf96e9420d827dfd9cb37c6fd12aa77db4b157ee7"
}
diff --git a/examples/talking-film-live/svml.packages.lock b/examples/talking-film-live/svml.packages.lock
index 33dc6199..97877328 100644
--- a/examples/talking-film-live/svml.packages.lock
+++ b/examples/talking-film-live/svml.packages.lock
@@ -568,22 +568,22 @@
{
"name": "@narratage/artifact",
"version": "0.0.0-dev",
- "digest": "sha256:e1839b39b3ec1bc560ad7d0876e72cef09903f40ba3e0669b355f54a39d2fc82"
+ "digest": "sha256:4fc7d9a345c2c082a2b6d4beb63f791eade0d2e57d565aa15cb0d2ad31e30c4d"
},
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:cb8fdd4207865c201e83e6a843a85322b73b96cc7a2c40130d439bbc960daed6"
+ "digest": "sha256:3d12b106c69a882128c9cc50f113daffc0f7868e95891c7dda8d91f25761e126"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:2411d92a3eec5dac75ef53d9a9715f88d6cec8241e6b752c802537c18e91bf3a"
+ "digest": "sha256:9ea663f4932cb232204c92bb9492bc429799717cd220eb63c0bd276e8c4307c0"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:c43dcd0defd89f3079c81075859a7c63179a58911f9fb43c78e499bf8c9073e8"
+ "digest": "sha256:b1466bdfdca5774487be11e957c3c15e393eef47729505567f56f0728f93af29"
},
{
"name": "@narratage/component-kit",
@@ -593,172 +593,172 @@
{
"name": "@narratage/composition",
"version": "0.0.0-dev",
- "digest": "sha256:af8c81e17a6c90b292c37ac3577a43263dab7cfbe30d0a84a4d507d68ffc4d9e"
+ "digest": "sha256:8f46299e2e5dbde593e34d5ee5a68604577f118f5eced786e3dd0b67003f94f8"
},
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:9ade54b00fd6728287f036aaa1ae38f3f7c756be9e2e1015b74c29ee3339c95b"
+ "digest": "sha256:8e119a659795a674705884971fe7a77a1e890a5415f911f967fbebbf508f7bb0"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:7f2d21ae5e0c8c113e82dcc7169aa7f20b2062ffb79a0db86861c8ab069cb219"
+ "digest": "sha256:ae89027241ab0ac3e274fc5b650967611696b6735c0cd23fd0b010ea7cf68ea1"
},
{
"name": "@narratage/estimate",
"version": "0.0.0-dev",
- "digest": "sha256:cb246a16554f7ebcf75298518968956292035e833b931f0c082029003f557474"
+ "digest": "sha256:4574864e8b9edc400d82726cd35cd3b40471335041abbe8e10bacfe4dd8b6a79"
},
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:40d71029ce8d1fceeb5f6cc03dddebb1e0179f692a855647750150cf1efd8aa3"
+ "digest": "sha256:6358b904d4dc354532e7a33bea24f8027f030c0a047fcafc4ee56687dac2c767"
},
{
"name": "@narratage/fonts-open",
"version": "0.0.0-dev",
- "digest": "sha256:e145b8fe1ab5dca02f91b60d4ec3301c9a8022f5bf46ffe47a2284cdb3dcc0d0"
+ "digest": "sha256:f3c5efec04ae87f4493e40c033b13101033dcf630ca1b2e1ca1648d19561ed8d"
},
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:fa629ce58731fb544aec83f10348352af019a5c8f441699e1b0035ec489dac6e"
+ "digest": "sha256:b36ca0d63c776885b31d72b58df0b788e96fc53fdab08796d9e75e8dce58ab7c"
},
{
"name": "@narratage/host",
"version": "0.0.0-dev",
- "digest": "sha256:4fb020ec30c6024e74994eae5492fb98c75eb2e055a4a289a16afa26d84fcb4e"
+ "digest": "sha256:936e4a224e3be5c4a44d5c830cc0e33c0dc19dbddcff361ef223ce575723a747"
},
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:9a736f281f46eeb4a1998ae9438b0869722f00cdef9b53e219d94ac04497231d"
+ "digest": "sha256:f7ebf4c69b907014933f4f99ffeda87348ded8153efe204033a1c914090c5e15"
},
{
"name": "@narratage/markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d54f0d3a0947f628d406628ec78f441b8cb5da633ebc4a7fbb5ef176d68924b"
+ "digest": "sha256:d470d43fe41379ab0e8e229e0b3d67256bd72f00a7bec2e838c9c2e799f9986f"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:d30dfe6cf81b969e77678d870a34eb13ae48d8e486bfa5b300b452e79cc3d83e"
+ "digest": "sha256:a817f13daaed06fee119773ae67cd7e6cf6e5c62bf76b0e9b7b6bf78adfdf62e"
},
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:49af374a0b3d235c6e0f675d16c80ae5bf4bcdb8b9fc125f910391b4362dbede"
+ "digest": "sha256:f1a38d75fb9b168a3fde9144370ef93e6aa2354503b9c8b2d31f6f8c0ca47098"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:3517862f3a4d8fcb5225b00a2295264feff9baed0f08b49e5894bb9f8a6100a1"
+ "digest": "sha256:39de7df174f7d007d81757f30259bf1f553e6091b81d32ade9fc7acb439c76b3"
},
{
"name": "@narratage/model-kit",
"version": "0.0.0-dev",
- "digest": "sha256:ccc8c4bee06bea96d57400fc348a16b0c149e9acd5152ca331d2b0cfe85d1f15"
+ "digest": "sha256:9b73580cf309c1b83ec757d9d2c60964b192c2dc94a6cdfde7af4925d0efc024"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:5823b08047e4d1b099675112b6a58243a563d4ea1bcdb592fdcb10e6e3ef73ab"
+ "digest": "sha256:673e6f2ecded178a4dd2df92c766ae8bc5dc6c542038bac4a0cad47efb9f1e34"
},
{
"name": "@narratage/program-space",
"version": "0.0.0-dev",
- "digest": "sha256:b0b6413c2dd0fbd2894250b5d79d927a92bae8a3fbe755a5f3f7b18424504e03"
+ "digest": "sha256:9189eb40a95a9a003be41cc009391cef6965acbf587e45983d0a9f2faae7ad20"
},
{
"name": "@narratage/protocol",
"version": "0.0.0-dev",
- "digest": "sha256:8bec54ebf8fc9c8ac8ae8e24a3fce912267039d666183d16e7485c072923e462"
+ "digest": "sha256:617d291685b9dd2ce279cc48eef57cbc5c2c83eb031463aa98c9d6530664b63e"
},
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:6a436385accd1290988cf6e424e0b9b67b8c758045092281a41844284d135643"
+ "digest": "sha256:55a9c889b006a9235b2ad7275867003c2d1d5feff895ac064f9b6695b7bf9ab4"
},
{
"name": "@narratage/run-markup",
"version": "0.0.0-dev",
- "digest": "sha256:3ec93949ccc358327c63229f0bfd9ee3ebca487943dba544e70eb87a8a1d33ab"
+ "digest": "sha256:cd94dcbd931cae3cc9a850b288749c4af94b87b3c554df5d2809296bbcb904ce"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:eed752e2b89f5611a75e7c90e13c142059faf6e5155bce8140ae45dfb1e04e91"
+ "digest": "sha256:7ca029d7e63c3fcbb6450c32d93b4f5a50b6d137e9c67e5aa9476f5cc7099067"
},
{
"name": "@narratage/script",
"version": "0.0.0-dev",
- "digest": "sha256:77ebf0d0b25d6e71a5abc40eb0b05517e713901231caf56fbd6d4064c84a5942"
+ "digest": "sha256:cf43e33bd4f3b7fdc06f74080fe4b81626f3628bc008fd788b50d537b251b311"
},
{
"name": "@narratage/seedance",
"version": "0.0.0-dev",
- "digest": "sha256:5d44f162719a383284cbb62c860d9bbee7aa7af5c693f57c22f31a63f5d3e309"
+ "digest": "sha256:b3c899d6e9b2a7cd780f43fc67e134238a9b77ae46cb84334f99f921c1523764"
},
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:cc3b158e95dae35f5c67dbc926f0c69389f0ccc0260425cd6491f5c927510657"
+ "digest": "sha256:433e735c4e2a98f3d410552a1464aaa8d117f9b27dc891195bd6dfefe78ac98e"
},
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:f35e680ec01059de899247b7ec5d550e0641a7b880d0bfd75d34b2c930947a7e"
+ "digest": "sha256:358ee474b6b6be9231b0a2a19c1af21456ba244c3ace1d3110ef6a4072f5c133"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:13305323045486cf9526bf51951467427c93f63e53be0ed4504c542349fc4a21"
+ "digest": "sha256:9dd08e9216cd115e2650fa64684fe8b16188f1fc2ef29b4255ce97e9cc1bd251"
},
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:70dabc2dfc7603791cd0291e7e507d29837ed4ab1cdf386a46bd1fc3661aadb3"
+ "digest": "sha256:ad918c25a3e634bb7ef1b974269fb18948c2a3667fb12246f3e3b9b6886695e9"
},
{
"name": "@narratage/speech-basis",
"version": "0.0.0-dev",
- "digest": "sha256:1b76c55aedf45de5cd9ec3fe4f523b97f08d600cf375ce0b7d65de41d857d934"
+ "digest": "sha256:a328b78a2fd04fe0283515989bd03401441098a52884d36a9a7d5349265b79ce"
},
{
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev",
- "digest": "sha256:8112726350bf8ccb13883f8268490b4119f4821097222517d5101c14ed46d6d5"
+ "digest": "sha256:48ddfc5b8fd3c09366963058e6a0b6e7893f4ab2e095e68ec9c1033f06c39078"
},
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:a3dc6eac1d4415bd169180dcfea631619c97c1d6e75eb4ba71bb5959cabfbe20"
+ "digest": "sha256:482b7f59f56ca48a4222e505ca47801ba8631b486ac9c9c2af40a6f07edb68a8"
},
{
"name": "@narratage/speech",
"version": "0.0.0-dev",
- "digest": "sha256:76b8c81a6a78ae392991a21eed847f5f0d1f6ba1f0a6fa41538c78ff96a2a2d2"
+ "digest": "sha256:27b1a5fdf2e9b87c22ae3cefa36c47a6b87a3f9db8092cf8734f01b1ee007a9b"
},
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:7dce3e185ebf3d1f56b3e934fe79c804c6a67640468be65991cceeab25fd04a9"
+ "digest": "sha256:438b75d328bd2c4e8caa2ca659d3b7ca44f0ec0ed7540aff820284af43276faa"
},
{
"name": "@narratage/temporal",
"version": "0.0.0-dev",
- "digest": "sha256:5566cc222d97435a2072b626183b90f592fb20a09d72f207cd9222a413b4e172"
+ "digest": "sha256:7afa4b7f56e048613e1d4f0b4e910d2aa6cf462884dd093ef698da39ec4510c7"
},
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:bb58dc8de88a8a70f7597e6f578a6b4d90d43e99638110d2b367a68992f234ae"
+ "digest": "sha256:b33565f0c8393c465c9d86624eff56f2137c01cf97ed84c28212a6c36bc04e5f"
},
{
"name": "@narratage/typography-track",
"version": "0.0.0-dev",
- "digest": "sha256:09c00d85038e22b00ffa68f4393c9f6869471deb8524a210ce7cde424c40361f"
+ "digest": "sha256:7bbdea07d4ff1c1f6964aead4e616f2c859772ba34b6c63175dcd546b3673fdc"
},
{
"name": "@narratage/validation",
@@ -768,12 +768,12 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:cd133df7e104188444ad34ad76f33d3674f5d12ba8aa5d942a8db145aba7415a"
+ "digest": "sha256:310b8ff7de9456f1af8a7a63f609ebb3348e2a1358afcf6d50e7f5c80e2ee45b"
},
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:ed7b57ad0a47e7f788fd087918e06c20b8cb58a68e149b34fcfa9687fcf3f03a"
+ "digest": "sha256:585d4856540211f1590ee1682c611264a19b67499ea4f33554d83e6bd9b71fe5"
},
{
"name": "cmu-pronouncing-dictionary",
@@ -788,9 +788,14 @@
"name": "@narratage/artifact",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:72524ad8d5599450b4ab199680a6382c72c40cbf760f9c0265687f340aa60650",
- "closureDigest": "sha256:62a2d8a5788671adf06df7347da70df41d5cbfc9651f330bbb05f4f163f77846"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/artifact@1"
+ }
+ ],
+ "facetsDigest": "sha256:2884ff49b47225ed6464a75fac1a1ff5d0be43b0ef8d94cd669d5e6e1c9d4ad1",
+ "closureDigest": "sha256:c407816b1ae99b4ee14a4af223a2124cf2a77c72cf0d96c97993d44b14110d7f"
},
{
"specifier": "@narratage/caption",
@@ -798,12 +803,14 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption",
- "@narratage/caption@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption@1"
+ }
],
- "facetsDigest": "sha256:1b7b07dfb828c3f95e321841a956e371c044dad8f39c117d92096e9be19b0032",
- "closureDigest": "sha256:563563ad6da139632b43318d170ce714e055014786a344d656f81c94f51d9ca9"
+ "facetsDigest": "sha256:933a4e5757cf1f2df61cd556970a154cb57fd8062e9add09f391adfd2847e91b",
+ "closureDigest": "sha256:6b4252de4ff593b60f6b9e92c3bea2fdd493bca2e9f27f5019c684e428fae794"
},
{
"specifier": "@narratage/caption-fine",
@@ -811,12 +818,14 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption-fine",
- "@narratage/caption-fine@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption-fine@1"
+ }
],
- "facetsDigest": "sha256:cb9fb74a5edc730f01772e4819f7d7a55ecf914984d48116f72f64a1837cf128",
- "closureDigest": "sha256:adeba9eee745b343d1e058fe48a8e8d346d72a6c0ec4c7ca3878643a29aee75d"
+ "facetsDigest": "sha256:28135290bf848de466c883363d1ce7428059d00bcfc9cc702da8eacfead4ec84",
+ "closureDigest": "sha256:b7b39df22b21d05de192a3bc484ea086d9b353cc111dbe137636fc1c47596ab8"
},
{
"specifier": "@narratage/caption-gemini",
@@ -824,12 +833,14 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption-gemini",
- "@narratage/caption-gemini@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption-gemini@1"
+ }
],
- "facetsDigest": "sha256:733cd8ac6415d69fffe460f77870787e7d3146fe11c937461bc9d849edc94106",
- "closureDigest": "sha256:41b6986b13c5c99906127e05e4f6e3cbc232a2133f5aa811472ee2450512a1c9"
+ "facetsDigest": "sha256:dfc2ffc1d70df96231dedbdbe4c5ca1d1cc63a51f019198682ab5249303bd54a",
+ "closureDigest": "sha256:ac8fe257d2d5d180c1ccf1525bceaad3ba2a0cd3727d58f698b811e1f16b88b8"
},
{
"specifier": "@narratage/composition",
@@ -837,9 +848,14 @@
"name": "@narratage/composition",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b86fe5e147a331d36843aecbe7c64a4e83ad98b755242d8d1a1ba6c62551f509",
- "closureDigest": "sha256:ddfbaf79774806fa3cf79b85a7f8765ec77fa888a7c1b9e9d91b7424f7e5201b"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/composition@1"
+ }
+ ],
+ "facetsDigest": "sha256:0feb85478548d3f5d73e0a6acf1000194ca90848aa1ccd2e8b8717168ac5e2d8",
+ "closureDigest": "sha256:530e8599969f729664c9c7d4533156f9d712a1b89b01f71be7bba0595cd2ed98"
},
{
"specifier": "@narratage/estimate",
@@ -847,12 +863,14 @@
"name": "@narratage/estimate",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/estimate",
- "@narratage/estimate@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/estimate@1"
+ }
],
- "facetsDigest": "sha256:824e38fe102d9d6862642df2113d094002f02ab31b1f7e844883863ea8c777fa",
- "closureDigest": "sha256:906bb3a509716df0b045947a5cda7eba959f347b473a4f6ce0c389e385f4db41"
+ "facetsDigest": "sha256:a1ec11994f4025782b86b9b83747fdb3cffc022f127794c19cc0afa7756fd817",
+ "closureDigest": "sha256:321fd793678942716e5acdcfda0a151e74b0d25759a66ce425f73dd5af0061e1"
},
{
"specifier": "@narratage/film",
@@ -860,12 +878,14 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/film",
- "@narratage/film@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/film@1"
+ }
],
- "facetsDigest": "sha256:8e6a1a585e853ef9b621feb918c15a2925da4ea1f05467e652d41f9202f10025",
- "closureDigest": "sha256:7870bcb9f57c04a05a75f1c99bc3e868051057a8eda6799ac63f2daf2af721d0"
+ "facetsDigest": "sha256:06ac3b7ab5a06a31d3cf94915d329e71539c65047ffa8b4a01ab3e8479cfbb78",
+ "closureDigest": "sha256:29f76d42e05d5765c31822faf167270fba92f4411cbe5fd4912fc3635a4d5d3d"
},
{
"specifier": "@narratage/fonts-open",
@@ -873,12 +893,14 @@
"name": "@narratage/fonts-open",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/fonts-open",
- "@narratage/fonts-open@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/fonts-open@1"
+ }
],
- "facetsDigest": "sha256:2117122b06d7c1cd6bee519e72aff22bc3b50f179b50da21dcc84ddf7014457f",
- "closureDigest": "sha256:4f4efe9e75e162bf26ac50cdade55ccac665cd3a208eeb8b011e482a3f20a617"
+ "facetsDigest": "sha256:8fa0bec98f32bda4615c55145917c42c7b2f3817537fa9e16672a6f9e13b5871",
+ "closureDigest": "sha256:9959d91138062af8736092bee6ba34245adbc330ecabcc87ba8b279871a2fda1"
},
{
"specifier": "@narratage/generation",
@@ -886,9 +908,14 @@
"name": "@narratage/generation",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:d74a57a3210267e665366513324db5c313b3ca0f770da66e74cc38aee5048efb",
- "closureDigest": "sha256:3638f93e6a983a5a44768eef160a6dbf49e80d065f890bc5bd14555ad023b7ec"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/generation@1"
+ }
+ ],
+ "facetsDigest": "sha256:aa37fdf154010f0f029a43ec9c1ccae67a1da024fe69c456a4f37cac1aa2b811",
+ "closureDigest": "sha256:b58ad589421b370b7b7491fe9d391b94d8eeca6edcf53035320469b7c2b92158"
},
{
"specifier": "@narratage/hyperframes",
@@ -896,9 +923,14 @@
"name": "@narratage/hyperframes",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:4b2a86382c5d544fac8c194047f6e18ff554361d97d62e165533061b03b94ae9",
- "closureDigest": "sha256:3d288affb92c4b81527cb167947dd96a448b5091bf9c4c057e417be50a4b2623"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/hyperframes@1"
+ }
+ ],
+ "facetsDigest": "sha256:6ee5fccb93e741de0b7bcf9612a66a91d75932b22553f5d32c9055edef4ccda5",
+ "closureDigest": "sha256:122f5f3978fba14506f2d40363bdbb1cbd387177f11e950f66895ae663f109fc"
},
{
"specifier": "@narratage/media",
@@ -906,12 +938,14 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/media",
- "@narratage/media@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/media@1"
+ }
],
- "facetsDigest": "sha256:f0974c7d88918ca4796dbb86dea24b6d29f8f5f44430c4845f9928f1df5b22e5",
- "closureDigest": "sha256:8ceaff731f4c0d5c4b88f708bdd75c5d6a4a00abe71607c6ddf0b8fe0da400c3"
+ "facetsDigest": "sha256:209a74b7a1a87455b182e499f4f40cbf47d80d75805a6efbaec2169f8e424086",
+ "closureDigest": "sha256:83a3e69629a356eda04da94ed995f61688b7a1e5dab1de23be77cce65b8c3263"
},
{
"specifier": "@narratage/media-pipeline",
@@ -919,12 +953,14 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/media-pipeline",
- "@narratage/media-pipeline@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/media-pipeline@1"
+ }
],
- "facetsDigest": "sha256:6df6afa9661002801d95b5075309a7cf31484d7ad300a5ab3f90119d34042224",
- "closureDigest": "sha256:020673ebf48c557a7c318b5cd1e97e096bf8e4681a459fa4fbd2b352fb6ff402"
+ "facetsDigest": "sha256:bfd2adca42b96d588b8f26c8e800c94aa75ffdac5617846259775ae0f8bf1b03",
+ "closureDigest": "sha256:e7708f70f60fdee81d3defcd538b7af1bb394c408ccbe9ff50c0db6c312bf653"
},
{
"specifier": "@narratage/narrative",
@@ -932,9 +968,14 @@
"name": "@narratage/narrative",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:703db7ad343b00701dc39e3b316992dc371307f0c6c2ad15d1e0269257ffb326",
- "closureDigest": "sha256:c197675dfd711b5ac42fc0f084b1b7574de4f4061fda2fbabe69352faff1cd01"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/narrative@1"
+ }
+ ],
+ "facetsDigest": "sha256:79e65e538ae1e7631780b6f0dce1fb34afa837e07ba369ffebafaa84234a9fb7",
+ "closureDigest": "sha256:7d549f1884a730680f59e590b8d6cc4e0dfdd610ce3c3d7324dcc8a719d2f480"
},
{
"specifier": "@narratage/program-space",
@@ -942,9 +983,14 @@
"name": "@narratage/program-space",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b1e4eab41a135914556872f0f47a0c02b8ce76920366cbf86121b720af069052",
- "closureDigest": "sha256:d732dd805f1577ff3b7aaea5d05722d43bb03958095861a3eae7bf47d5f2504c"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/program-space@1"
+ }
+ ],
+ "facetsDigest": "sha256:098323539bb9d27c1a2f805d74a6373a6ee9e8e0c5ceb566697738aea5c47557",
+ "closureDigest": "sha256:ae836f049ad02ebf06ca86ffb5ba5adbb6f82f9a6de341470e2cc2db9dc5bf44"
},
{
"specifier": "@narratage/render-hyperframes",
@@ -952,12 +998,14 @@
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/render-hyperframes",
- "@narratage/render-hyperframes@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/render-hyperframes@1"
+ }
],
- "facetsDigest": "sha256:2b5edae659a7d3e92e19ed591ca7d5f784f4a3b6164d33c0e201c9b180ef0323",
- "closureDigest": "sha256:53134fcfc4451213e40f207ed42f8b465b7090f617b835398cb06ec0b23db32d"
+ "facetsDigest": "sha256:e9584dd9a7c6b3f3f089605a3dfd9321159ca9dfb8de0b61ca993a71406abc26",
+ "closureDigest": "sha256:e52e7238548deaa7cd87636cbbb7b6535121079c786444b29f107e0ff17a696e"
},
{
"specifier": "@narratage/run-markup",
@@ -965,11 +1013,14 @@
"name": "@narratage/run-markup",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/run-markup@1"
+ "offers": [
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/run-markup@1"
+ }
],
- "facetsDigest": "sha256:fb3a8a5be9a0ef0aa914026a199be641f4e20df27f9b284be196f52fd260be55",
- "closureDigest": "sha256:fbe76b58961bf0dba04cb91194c7756e0940e61b18a219510b90f97438f3dae2"
+ "facetsDigest": "sha256:afc9baeb3ce3355c5d94affdcf9159a3fc2b6f9378575240a4ecd8bdea3fe4c6",
+ "closureDigest": "sha256:2e8993d99c94ba9a73f0cd1bf480d91d07413fd22fef29acd83c652e9f0d5b39"
},
{
"specifier": "@narratage/script",
@@ -977,12 +1028,14 @@
"name": "@narratage/script",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/script",
- "@narratage/script@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/script@1"
+ }
],
- "facetsDigest": "sha256:69e1c08a5f07c73a506ca8286426a0386485738649e86463cca0b291f319ee4e",
- "closureDigest": "sha256:ee9962537eafe56bb339574fbb9bdba9c00dab39ce8c5b9da89aabdc41c64d22"
+ "facetsDigest": "sha256:d7928d30462c64cc79599db6df9249ad6a726178c62dee672c6292275d702f70",
+ "closureDigest": "sha256:389a09bfb2ac469e82cf9271d3b037054fd593a521330b51e3b37e373cbbb0df"
},
{
"specifier": "@narratage/seedance",
@@ -990,12 +1043,14 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/seedance",
- "@narratage/seedance@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/seedance@1"
+ }
],
- "facetsDigest": "sha256:df015abfb273de3629eec0da456a6fa90e7a55a5ed092d76a74c3d1dc4a5f705",
- "closureDigest": "sha256:51da9127b77edc1c46c7a9c88786c49df3c8d91eeec0bca236b8554ef16709b1"
+ "facetsDigest": "sha256:e90f12731ecc6e8eb88168a156b954e9d5e806d55299a76ddddf51f22f719028",
+ "closureDigest": "sha256:8e34aa210706740bff98cf32fc22fe7dfd19b8cf1e7642acd4f2aa47ca1d392b"
},
{
"specifier": "@narratage/semantic-map",
@@ -1003,9 +1058,14 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:510a57287945426449c8b2580d22a2d7f90ccaf1cb5bdd4fa5071b5b05ee91c0",
- "closureDigest": "sha256:8b6838a4057fcec08cbb74c66d405f8be9a93234ce20df5cdd94fd8d9a5ae914"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/semantic-map@1"
+ }
+ ],
+ "facetsDigest": "sha256:b271401518709cf036a19450f7ae2adfd39e4f2526017aaa8141934446cc8529",
+ "closureDigest": "sha256:fa3959375c231b6702affbe835392339c7fa468fb2b324438e7c55b9c79221d4"
},
{
"specifier": "@narratage/spatial",
@@ -1013,12 +1073,14 @@
"name": "@narratage/spatial",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/spatial",
- "@narratage/spatial@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/spatial@1"
+ }
],
- "facetsDigest": "sha256:5062281ffadb46495ec12e1a67185b57fe13879e90f03bcf544e93fd1d273716",
- "closureDigest": "sha256:73d113e95dd6cbd1feb6f45070e244850e6737fa5c09c23f68c5ecfb8a377d36"
+ "facetsDigest": "sha256:0fcf12887d2400c547e93488618c1d29141466568ca8d4bb5ec6ffc646fc3a5f",
+ "closureDigest": "sha256:d15c67972a2378c71f6917543c9a14046b78c72380ace6d02c214e572d7c13b5"
},
{
"specifier": "@narratage/speech",
@@ -1026,9 +1088,14 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:6d1be76a2ee9486146436fde148c99eccdc055948a39c5098de2ff4122d80c7a",
- "closureDigest": "sha256:8d6d71bf808b4aeceed1f500f68ff648e19131940d3da0e0e0426e48c179e100"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech@1"
+ }
+ ],
+ "facetsDigest": "sha256:e666730deca2fd85bd3d70fe8eba70c9d3c416a572084f3605a75f349abb466a",
+ "closureDigest": "sha256:d4dfec50fa63e51a7bfdfd03ab7d93e9ed74c29d93d8d034eadc23c873f6a0f4"
},
{
"specifier": "@narratage/speech-alignment",
@@ -1036,9 +1103,14 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:78162875012523865df9c69770127a1db6ef9a8f5fc5af72255360af2a9c4370",
- "closureDigest": "sha256:c3dece181c80c8cfbf3186dd55a2654d6114765384188df4e6b6e21b1bf45c77"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-alignment@1"
+ }
+ ],
+ "facetsDigest": "sha256:f363bb3eac94f01f3ec99806f72e9c6c3ce2008c2e0cfe0dc815b4e6bfb1d033",
+ "closureDigest": "sha256:7707427f8e6263ea676125266f47099829bca8c899ba6c58362164e96c7cfb4b"
},
{
"specifier": "@narratage/speech-basis",
@@ -1046,9 +1118,14 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:97aaeabe85b3e4d6a8715ea9a41ac27ef71804ae99359b631546a4382bbac9df",
- "closureDigest": "sha256:0fea160882535c9746d56d1f668607aa9d1a46a40c60bbb2859f8b307145a0e4"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-basis@1"
+ }
+ ],
+ "facetsDigest": "sha256:33918e70f368a6888b37549fd40f7d751b564fcd6569b8e68c3a1468ad51d991",
+ "closureDigest": "sha256:b615dedcc8111911626f2ffe729e0ad394f772f8278f6cd1758a035adcc2a69d"
},
{
"specifier": "@narratage/speech-evidence",
@@ -1056,9 +1133,14 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:989d191644ea472a3cbd386bd4a6992f1f7f5ef82f1f8da53c9a4efa99d3d2d1",
- "closureDigest": "sha256:fed18a41121b44960b5a9cd2a6cd6f6954bc3016d7abbc7bf4b0a26798f28742"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-evidence@1"
+ }
+ ],
+ "facetsDigest": "sha256:6469ee9ae21f4f68f81d3ad873fa3d3bc3ad4863ce20626b38b62759c2983658",
+ "closureDigest": "sha256:c6620b224444672418863e84476c76ffcf5aaa94af07ef9e3396e773bf522a1d"
},
{
"specifier": "@narratage/speech-spine",
@@ -1066,12 +1148,14 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/speech-spine",
- "@narratage/speech-spine@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-spine@1"
+ }
],
- "facetsDigest": "sha256:81a038765324b7a48ceb44c638faf128df31573a122989116d649dca3b3cb6d3",
- "closureDigest": "sha256:f6e6f346541422f115905fe77b967ae113dcff0e77905d1876f9353810e61234"
+ "facetsDigest": "sha256:723a8981b4a4d8e46c476ebb4390cca81a7eada8559cee092cb11e9744c45e17",
+ "closureDigest": "sha256:1cc8eddeeedd16292ec597bbf1705328be7fc78ef1c888c5d770cd3d122aec63"
},
{
"specifier": "@narratage/svs",
@@ -1079,11 +1163,18 @@
"name": "@narratage/svs",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/svs@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/svs@1"
+ },
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/svs@1"
+ }
],
- "facetsDigest": "sha256:9cc7c397d2cd97b5a3e814886b6553b6d236fd8825df0d056e328b7f0cf20163",
- "closureDigest": "sha256:43a43083ff729f30cc31edf9ddf2b44722430bde9a9ad6e73cc0ae1114d5d522"
+ "facetsDigest": "sha256:85966f0c7d52d4c8772662ba25f066a0b1fc71cad8992995170f98188903f3d6",
+ "closureDigest": "sha256:2a98b715890867096f98121082311f89712fea0132b1ef395186a53aa4e71841"
},
{
"specifier": "@narratage/text",
@@ -1091,13 +1182,18 @@
"name": "@narratage/text",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/text",
- "@narratage/text/svs@1",
- "@narratage/text@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/text@1"
+ },
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/text/svs@1"
+ }
],
- "facetsDigest": "sha256:4435dd4bd38e5e017013f775e28e379e3e235211649ee8f3913378f7f9e60b58",
- "closureDigest": "sha256:4e1ae6017ad16c4d27128f858b83ff04fabd33a03e6d015f010b543f154e7e1a"
+ "facetsDigest": "sha256:f49f923d295bd538c6abbe9641252ca850249df3d0863c8d765d531ade612649",
+ "closureDigest": "sha256:b2b28724a122378cdb7a2acef9a379bf3d02b59c01dca0dc1116cb1ffb140f1b"
},
{
"specifier": "@narratage/typography-track",
@@ -1105,12 +1201,14 @@
"name": "@narratage/typography-track",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/typography-track",
- "@narratage/typography-track@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/typography-track@1"
+ }
],
- "facetsDigest": "sha256:feacd6f8891a8792935a81fd0251f6c42c470067cf68bd4532e202c0a387e72d",
- "closureDigest": "sha256:360436ecefd6f299a0c22675db347a60bc48035fd8e3dec930b769959ecb8e5b"
+ "facetsDigest": "sha256:2bd9f5eac84a9582d0723b2afb54c55768f9640a00f8bb0da2976a7babbd7e60",
+ "closureDigest": "sha256:a194ea3c8b3e26acafc5e120e341f05354c1d35435355e80b7e0d0dc89c0c37f"
},
{
"specifier": "@narratage/visual-ir",
@@ -1118,9 +1216,14 @@
"name": "@narratage/visual-ir",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:8c577a635a48ee04441068df1f3dc2c18a602bff091fddca8883a3843ce4ce37",
- "closureDigest": "sha256:4606d4ea45276ed1a5a34ed109e545961ca3d72787a13bf85e976e20082528f0"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/visual-ir@1"
+ }
+ ],
+ "facetsDigest": "sha256:491c61ee6504e7eb48e0ad53db597986f22721d6d21f1c7cd9631efe2b80eb0c",
+ "closureDigest": "sha256:4ac70be9af32dcf944bb49f0be4ef1864b63503c07909989bb0a5ac6a838a59c"
},
{
"specifier": "@narratage/whisperx",
@@ -1128,13 +1231,15 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/whisperx",
- "@narratage/whisperx@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/whisperx@1"
+ }
],
- "facetsDigest": "sha256:ed9ebd9eea0b92c20357ec67dc14c4aa211836dc815c3edcb48e4946972f94c5",
- "closureDigest": "sha256:74176a63a7a62d4de6896a66f0e2883466defce32fed33dbe9d9688beccdff13"
+ "facetsDigest": "sha256:e81e9541ed9a878dd175ee5b6b892344a5a238fff157d2a8ec034e4d3e47ac76",
+ "closureDigest": "sha256:fd6c1c23e895a1e27552687a57dc6342c4dd4a2dc462f4274c8c5ba94eca86fa"
}
],
- "digest": "sha256:c3528b83e6a073fd68339d8e14b4fcd918223429c34a74f1059afa051ec7cdd6"
+ "digest": "sha256:402fb7da617a6b1cada6fe20b4a0cf7fd8228d469048c91d6ddc223c78343f40"
}
diff --git a/examples/talking-film-live/svml.runtime-packages.lock b/examples/talking-film-live/svml.runtime-packages.lock
index e23a5f2b..2b01275b 100644
--- a/examples/talking-film-live/svml.runtime-packages.lock
+++ b/examples/talking-film-live/svml.runtime-packages.lock
@@ -45,27 +45,27 @@
{
"name": "@narratage/artifact",
"version": "0.0.0-dev",
- "digest": "sha256:e1839b39b3ec1bc560ad7d0876e72cef09903f40ba3e0669b355f54a39d2fc82"
+ "digest": "sha256:4fc7d9a345c2c082a2b6d4beb63f791eade0d2e57d565aa15cb0d2ad31e30c4d"
},
{
"name": "@narratage/background-removal",
"version": "0.0.0-dev",
- "digest": "sha256:2d2d25c858b60b066f662ed3c8b1c9bc694894afed42ff9aa6c4ddce5ce5bb55"
+ "digest": "sha256:039e85baa8a59134712b9b2549bf615a47c72098a3455f04b56df3644d08d5ac"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:2411d92a3eec5dac75ef53d9a9715f88d6cec8241e6b752c802537c18e91bf3a"
+ "digest": "sha256:9ea663f4932cb232204c92bb9492bc429799717cd220eb63c0bd276e8c4307c0"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:c43dcd0defd89f3079c81075859a7c63179a58911f9fb43c78e499bf8c9073e8"
+ "digest": "sha256:b1466bdfdca5774487be11e957c3c15e393eef47729505567f56f0728f93af29"
},
{
"name": "@narratage/compiler-node",
"version": "0.0.0-dev",
- "digest": "sha256:f85b4b0cc1f28ab2d9caf4e472590e4effc53406f69ef344ac724395a22cb266"
+ "digest": "sha256:f05bf79573f60f05bc5403086d5503e01602fe6031e0de0c50351084c2502446"
},
{
"name": "@narratage/component-kit",
@@ -75,12 +75,12 @@
{
"name": "@narratage/composition",
"version": "0.0.0-dev",
- "digest": "sha256:af8c81e17a6c90b292c37ac3577a43263dab7cfbe30d0a84a4d507d68ffc4d9e"
+ "digest": "sha256:8f46299e2e5dbde593e34d5ee5a68604577f118f5eced786e3dd0b67003f94f8"
},
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:9ade54b00fd6728287f036aaa1ae38f3f7c756be9e2e1015b74c29ee3339c95b"
+ "digest": "sha256:8e119a659795a674705884971fe7a77a1e890a5415f911f967fbebbf508f7bb0"
},
{
"name": "@narratage/credential-store-env",
@@ -95,7 +95,7 @@
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:7f2d21ae5e0c8c113e82dcc7169aa7f20b2062ffb79a0db86861c8ab069cb219"
+ "digest": "sha256:ae89027241ab0ac3e274fc5b650967611696b6735c0cd23fd0b010ea7cf68ea1"
},
{
"name": "@narratage/endpoint-kit",
@@ -105,62 +105,62 @@
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:fa629ce58731fb544aec83f10348352af019a5c8f441699e1b0035ec489dac6e"
+ "digest": "sha256:b36ca0d63c776885b31d72b58df0b788e96fc53fdab08796d9e75e8dce58ab7c"
},
{
"name": "@narratage/host",
"version": "0.0.0-dev",
- "digest": "sha256:4fb020ec30c6024e74994eae5492fb98c75eb2e055a4a289a16afa26d84fcb4e"
+ "digest": "sha256:936e4a224e3be5c4a44d5c830cc0e33c0dc19dbddcff361ef223ce575723a747"
},
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:9a736f281f46eeb4a1998ae9438b0869722f00cdef9b53e219d94ac04497231d"
+ "digest": "sha256:f7ebf4c69b907014933f4f99ffeda87348ded8153efe204033a1c914090c5e15"
},
{
"name": "@narratage/local",
"version": "0.0.0-dev",
- "digest": "sha256:c7c87cc87778678a72e0323f220eacc0f33fe0a42d81fce9d5a9aaec9f1f08dd"
+ "digest": "sha256:25bdfa41740d3aa1ae050dca0258aa6c88ede1a574cb526b36b0c78bf8bfe615"
},
{
"name": "@narratage/markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d54f0d3a0947f628d406628ec78f441b8cb5da633ebc4a7fbb5ef176d68924b"
+ "digest": "sha256:d470d43fe41379ab0e8e229e0b3d67256bd72f00a7bec2e838c9c2e799f9986f"
},
{
"name": "@narratage/media-execution",
"version": "0.0.0-dev",
- "digest": "sha256:7ae1fb05418962f1403c99ecc02622f6b1e9f5fa2451c29177a5a1acfe6a6fe5"
+ "digest": "sha256:89c688f6cf5ac687c898a16c781abd1d672a9fe70e13c3d19783c985ec4df1fc"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:d30dfe6cf81b969e77678d870a34eb13ae48d8e486bfa5b300b452e79cc3d83e"
+ "digest": "sha256:a817f13daaed06fee119773ae67cd7e6cf6e5c62bf76b0e9b7b6bf78adfdf62e"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:3517862f3a4d8fcb5225b00a2295264feff9baed0f08b49e5894bb9f8a6100a1"
+ "digest": "sha256:39de7df174f7d007d81757f30259bf1f553e6091b81d32ade9fc7acb439c76b3"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:5823b08047e4d1b099675112b6a58243a563d4ea1bcdb592fdcb10e6e3ef73ab"
+ "digest": "sha256:673e6f2ecded178a4dd2df92c766ae8bc5dc6c542038bac4a0cad47efb9f1e34"
},
{
"name": "@narratage/package-loader-node",
"version": "0.0.0-dev",
- "digest": "sha256:4ac8289e175f4a3e4fb2f40d4e2115404835fc640e8d4d971ed96a5d8b9bd72a"
+ "digest": "sha256:49a3bbf24edc3660d76d60f1636a25441683e5133670782abdf5f26e7b67c950"
},
{
"name": "@narratage/program-space",
"version": "0.0.0-dev",
- "digest": "sha256:b0b6413c2dd0fbd2894250b5d79d927a92bae8a3fbe755a5f3f7b18424504e03"
+ "digest": "sha256:9189eb40a95a9a003be41cc009391cef6965acbf587e45983d0a9f2faae7ad20"
},
{
"name": "@narratage/protocol",
"version": "0.0.0-dev",
- "digest": "sha256:8bec54ebf8fc9c8ac8ae8e24a3fce912267039d666183d16e7485c072923e462"
+ "digest": "sha256:617d291685b9dd2ce279cc48eef57cbc5c2c83eb031463aa98c9d6530664b63e"
},
{
"name": "@narratage/provider-google-vertex",
@@ -170,7 +170,7 @@
{
"name": "@narratage/provider-hyperframes-local",
"version": "0.0.0-dev",
- "digest": "sha256:e8ecf79ffa7eb54a3fa801f6430d1c7b241db7f2a3f9fd15511bd05f0f2f7a94"
+ "digest": "sha256:7bbe93af52489e3a21306a94ba7d09ed1a91c7e145ce88d31d0b612ec4a2aa70"
},
{
"name": "@narratage/provider-kie",
@@ -180,22 +180,22 @@
{
"name": "@narratage/provider-media-local",
"version": "0.0.0-dev",
- "digest": "sha256:660c667d2dbce0e0bb3385fa2766e1562c921dee3279aa4e3a76d67cd725f67f"
+ "digest": "sha256:30e84e0a95beecd0dde1d1f763e2f0120bc2e4563ae2d404df18da240f92f37c"
},
{
"name": "@narratage/provider-whisperx-local",
"version": "0.0.0-dev",
- "digest": "sha256:0a7e334a3c38fcf26307d5fb963826c0589f451c071765c7218997a58f10e914"
+ "digest": "sha256:d6b30bd8de3e28010d087c7f9ff7aa22fdfaa2e3f5d5d8162470648e2b86c62e"
},
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:6a436385accd1290988cf6e424e0b9b67b8c758045092281a41844284d135643"
+ "digest": "sha256:55a9c889b006a9235b2ad7275867003c2d1d5feff895ac064f9b6695b7bf9ab4"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:eed752e2b89f5611a75e7c90e13c142059faf6e5155bce8140ae45dfb1e04e91"
+ "digest": "sha256:7ca029d7e63c3fcbb6450c32d93b4f5a50b6d137e9c67e5aa9476f5cc7099067"
},
{
"name": "@narratage/runtime-adapter-node",
@@ -205,57 +205,57 @@
{
"name": "@narratage/runtime-adapter",
"version": "0.0.0-dev",
- "digest": "sha256:4135319241131dcbda85c94c136bdaf2427007638d6577baa2f5c379589202c2"
+ "digest": "sha256:ee0043ee8c6f593bcba507d24df5173d1d827b50040ffbd207898953f51eb0de"
},
{
"name": "@narratage/runtime",
"version": "0.0.0-dev",
- "digest": "sha256:ba12544fdca923e0b61139302e70411f0555276ae8c6735e29aa81681e9ac491"
+ "digest": "sha256:9e271ac72a3011d70b358fac3cde0bf95b318d20b8a716365acb9bece36703e2"
},
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:cc3b158e95dae35f5c67dbc926f0c69389f0ccc0260425cd6491f5c927510657"
+ "digest": "sha256:433e735c4e2a98f3d410552a1464aaa8d117f9b27dc891195bd6dfefe78ac98e"
},
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:f35e680ec01059de899247b7ec5d550e0641a7b880d0bfd75d34b2c930947a7e"
+ "digest": "sha256:358ee474b6b6be9231b0a2a19c1af21456ba244c3ace1d3110ef6a4072f5c133"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:13305323045486cf9526bf51951467427c93f63e53be0ed4504c542349fc4a21"
+ "digest": "sha256:9dd08e9216cd115e2650fa64684fe8b16188f1fc2ef29b4255ce97e9cc1bd251"
},
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:70dabc2dfc7603791cd0291e7e507d29837ed4ab1cdf386a46bd1fc3661aadb3"
+ "digest": "sha256:ad918c25a3e634bb7ef1b974269fb18948c2a3667fb12246f3e3b9b6886695e9"
},
{
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev",
- "digest": "sha256:8112726350bf8ccb13883f8268490b4119f4821097222517d5101c14ed46d6d5"
+ "digest": "sha256:48ddfc5b8fd3c09366963058e6a0b6e7893f4ab2e095e68ec9c1033f06c39078"
},
{
"name": "@narratage/speech",
"version": "0.0.0-dev",
- "digest": "sha256:76b8c81a6a78ae392991a21eed847f5f0d1f6ba1f0a6fa41538c78ff96a2a2d2"
+ "digest": "sha256:27b1a5fdf2e9b87c22ae3cefa36c47a6b87a3f9db8092cf8734f01b1ee007a9b"
},
{
"name": "@narratage/store-sqlite",
"version": "0.0.0-dev",
- "digest": "sha256:5c07e38f6b4fc747dfd43c63011d8644a050bb5f8537fd63c7f625bf8a9543ef"
+ "digest": "sha256:7ea3148573caa35f2f08d291f2edd938ea17214f704a93fab66e0a247b267c10"
},
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:7dce3e185ebf3d1f56b3e934fe79c804c6a67640468be65991cceeab25fd04a9"
+ "digest": "sha256:438b75d328bd2c4e8caa2ca659d3b7ca44f0ec0ed7540aff820284af43276faa"
},
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:bb58dc8de88a8a70f7597e6f578a6b4d90d43e99638110d2b367a68992f234ae"
+ "digest": "sha256:b33565f0c8393c465c9d86624eff56f2137c01cf97ed84c28212a6c36bc04e5f"
},
{
"name": "@narratage/validation",
@@ -265,17 +265,22 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:cd133df7e104188444ad34ad76f33d3674f5d12ba8aa5d942a8db145aba7415a"
+ "digest": "sha256:310b8ff7de9456f1af8a7a63f609ebb3348e2a1358afcf6d50e7f5c80e2ee45b"
},
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:ed7b57ad0a47e7f788fd087918e06c20b8cb58a68e149b34fcfa9687fcf3f03a"
+ "digest": "sha256:585d4856540211f1590ee1682c611264a19b67499ea4f33554d83e6bd9b71fe5"
},
{
"name": "@narratage/workspace-fs-node",
"version": "0.0.0-dev",
- "digest": "sha256:078b83eec447cb0624057e9db3b37fc1ece5b6bca64b03c6ed1a8c9113f95ecd"
+ "digest": "sha256:9a9e37598589410ffff6d3f364a061a19adaafb6740b6da50e9200e6a29f5925"
+ },
+ {
+ "name": "@narratage/workspace",
+ "version": "0.0.0-dev",
+ "digest": "sha256:aaff22e672f87b6dfeb3e29dc7ebf092b935dd5e7b4b76aef42f839863e301a7"
},
{
"name": "@protobufjs/aspromise",
@@ -925,9 +930,14 @@
"name": "@narratage/artifact-store-fs",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:914018276b9218afc13940ca5c362dc95fa19d574fc07b06b6fe005c5eb30315",
- "closureDigest": "sha256:d883017faf93520a745a27456cb5f81fce6dff9b0787214b2ba0a51028e9d948"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/artifact-store-fs"
+ }
+ ],
+ "facetsDigest": "sha256:7b67d203b78bc126194c966d9200c8002f51d59e56e0b63a768b1edc3bdcd423",
+ "closureDigest": "sha256:e1f490b3391c7dd6d3c1a49d270985c17b9272f1cc62f220bcffbcfa7eef3a49"
},
{
"specifier": "@narratage/credential-store-env",
@@ -935,9 +945,14 @@
"name": "@narratage/credential-store-env",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:ee33ba638bbf2f88eee8f34a2f3179f435a0af9ccbae3fbb7d2a81bd6aeac612",
- "closureDigest": "sha256:d8c0a576a247ad8bdc3771c6bccc1c842fb086dc36700c6680c8656fec88b1f9"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/credential-store-env"
+ }
+ ],
+ "facetsDigest": "sha256:f43b206c618ace8481dbafcc2fcd0c82da9c62fd54bca7bcc480fdad504b4181",
+ "closureDigest": "sha256:cda5aed4905de16a3cbd63a36c0be44f5a675e8e7e7aa2c3db0b26719cd15517"
},
{
"specifier": "@narratage/local",
@@ -945,9 +960,14 @@
"name": "@narratage/local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:6689aed79b0947c7315aef65e46806ce73da01de3d73b454e1497b8d847ffa61",
- "closureDigest": "sha256:302f4d817cead3171fc77e36084e3a16e427329c308e7d7c79fdb204f24ad830"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/local"
+ }
+ ],
+ "facetsDigest": "sha256:6cd2efb261cc9f69def05c15fd71485f6a2ea9d130dd414089efb0bb700da6be",
+ "closureDigest": "sha256:e49c61755202599e6d2af2f23e795a4b90ac3ee4491b502f3a2eb196a354b3ad"
},
{
"specifier": "@narratage/provider-google-vertex",
@@ -955,9 +975,14 @@
"name": "@narratage/provider-google-vertex",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",
- "closureDigest": "sha256:57fe88c1e75a3cab8ee1d771f948d285d6ea3edb8e88d6b89146adb5418e6f13"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-google-vertex"
+ }
+ ],
+ "facetsDigest": "sha256:5e830b098688f92c8b5b02a97ac59a108c229733cf727370a25b7cdbd80d524c",
+ "closureDigest": "sha256:e22345632163f846f3ca05ebd58d2e335295730e4a3ef39db05242dfd81d2b10"
},
{
"specifier": "@narratage/provider-hyperframes-local",
@@ -965,9 +990,14 @@
"name": "@narratage/provider-hyperframes-local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",
- "closureDigest": "sha256:0c92ab5304359875e3dfb9d8a45cab140954e9dcc023d349347cd221493f35c1"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-hyperframes-local"
+ }
+ ],
+ "facetsDigest": "sha256:238058ce8ab6abdf3697e4417813ea00cc2def58a361849b1033a39442a3f1f3",
+ "closureDigest": "sha256:b42ae8fcbf15756e14d6ac728474ac7a7ded15b67533dc4eaed3d96ef43e193a"
},
{
"specifier": "@narratage/provider-kie",
@@ -975,9 +1005,14 @@
"name": "@narratage/provider-kie",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:e61ebb911a33d4c5d0e4e4ee4fb69cdb790f4ced050ef35f7472bfbd72013d9b",
- "closureDigest": "sha256:3d7389bce84a29a20d795a2ecd62078516e42963b456e34186dcb2df10631c0e"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-kie"
+ }
+ ],
+ "facetsDigest": "sha256:6adb7e38bc18f62828a08eb05549cf35cf6aed137a62e04d5bc86ff96e19d29d",
+ "closureDigest": "sha256:2d23cab849deccc7b16b33abe00d296c089f822fd7c49fc6dfe8658ab3b34f25"
},
{
"specifier": "@narratage/provider-media-local",
@@ -985,9 +1020,14 @@
"name": "@narratage/provider-media-local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",
- "closureDigest": "sha256:4e6c4b8d9049775087bea1e59464a80e7944b6452a034f5bf439cdb8b06250c5"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-media-local"
+ }
+ ],
+ "facetsDigest": "sha256:9e262adf3bd804f924b2ec5193f937f87e81109eb0756beb98d268455c6400de",
+ "closureDigest": "sha256:c7b0098bdd959b78174cb33ef58c8ba6db30128a22cf5d3e36584acc40964ce3"
},
{
"specifier": "@narratage/provider-whisperx-local",
@@ -995,9 +1035,14 @@
"name": "@narratage/provider-whisperx-local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",
- "closureDigest": "sha256:9aacef85c04d31f412a4d4cc8881879b949f8bba422dadacf72b2fcffd1ce1e0"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-whisperx-local"
+ }
+ ],
+ "facetsDigest": "sha256:71cff41644704b1e0097a16310b713f590745ed503ba8a1969cfb4d23ee65de6",
+ "closureDigest": "sha256:49d46f35b8f384c009df583be6694f870cf55bb2eef1b858bcf658a7c93f33b8"
},
{
"specifier": "@narratage/store-sqlite",
@@ -1005,10 +1050,15 @@
"name": "@narratage/store-sqlite",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:5bccf73cd953710fc31ef44672fef1bfc396fd4aa2eff4b53108e8ff87e749c3",
- "closureDigest": "sha256:01b21eab61e3f11067d7c25dbc0b1644e71d3c599d0bc64f37bb0ba7a7b9d10e"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/store-sqlite"
+ }
+ ],
+ "facetsDigest": "sha256:cf1234bc9e6087a42d8a4db4cf8521785acc59166d43dbb6f4ea12761b4233a3",
+ "closureDigest": "sha256:ddb88d38e33ad77e102a4372712fb39a225766e55d2d0a67c76ee35118a630bd"
}
],
- "digest": "sha256:cd34acfbc846ee6d2a986ef8221163b97b330ac1a1aac44a970e61418c157a66"
+ "digest": "sha256:937377f72a9531eec95f80c8833ef8763471127ef66ae04ab7d06d2cd4c6f8f8"
}
diff --git a/examples/talking-film-live/svml.runtime.json b/examples/talking-film-live/svml.runtime.json
index eae5c250..8afae13c 100644
--- a/examples/talking-film-live/svml.runtime.json
+++ b/examples/talking-film-live/svml.runtime.json
@@ -15,7 +15,6 @@
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.env"]
}
diff --git a/examples/talking-head-aroll/svml.packages.lock b/examples/talking-head-aroll/svml.packages.lock
index 1aa8c873..c2bf4786 100644
--- a/examples/talking-head-aroll/svml.packages.lock
+++ b/examples/talking-head-aroll/svml.packages.lock
@@ -567,22 +567,22 @@
{
"name": "@narratage/artifact",
"version": "0.0.0-dev",
- "digest": "sha256:e1839b39b3ec1bc560ad7d0876e72cef09903f40ba3e0669b355f54a39d2fc82"
+ "digest": "sha256:4fc7d9a345c2c082a2b6d4beb63f791eade0d2e57d565aa15cb0d2ad31e30c4d"
},
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:cb8fdd4207865c201e83e6a843a85322b73b96cc7a2c40130d439bbc960daed6"
+ "digest": "sha256:3d12b106c69a882128c9cc50f113daffc0f7868e95891c7dda8d91f25761e126"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:2411d92a3eec5dac75ef53d9a9715f88d6cec8241e6b752c802537c18e91bf3a"
+ "digest": "sha256:9ea663f4932cb232204c92bb9492bc429799717cd220eb63c0bd276e8c4307c0"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:c43dcd0defd89f3079c81075859a7c63179a58911f9fb43c78e499bf8c9073e8"
+ "digest": "sha256:b1466bdfdca5774487be11e957c3c15e393eef47729505567f56f0728f93af29"
},
{
"name": "@narratage/component-kit",
@@ -592,167 +592,167 @@
{
"name": "@narratage/composition",
"version": "0.0.0-dev",
- "digest": "sha256:af8c81e17a6c90b292c37ac3577a43263dab7cfbe30d0a84a4d507d68ffc4d9e"
+ "digest": "sha256:8f46299e2e5dbde593e34d5ee5a68604577f118f5eced786e3dd0b67003f94f8"
},
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:9ade54b00fd6728287f036aaa1ae38f3f7c756be9e2e1015b74c29ee3339c95b"
+ "digest": "sha256:8e119a659795a674705884971fe7a77a1e890a5415f911f967fbebbf508f7bb0"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:7f2d21ae5e0c8c113e82dcc7169aa7f20b2062ffb79a0db86861c8ab069cb219"
+ "digest": "sha256:ae89027241ab0ac3e274fc5b650967611696b6735c0cd23fd0b010ea7cf68ea1"
},
{
"name": "@narratage/estimate",
"version": "0.0.0-dev",
- "digest": "sha256:cb246a16554f7ebcf75298518968956292035e833b931f0c082029003f557474"
+ "digest": "sha256:4574864e8b9edc400d82726cd35cd3b40471335041abbe8e10bacfe4dd8b6a79"
},
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:40d71029ce8d1fceeb5f6cc03dddebb1e0179f692a855647750150cf1efd8aa3"
+ "digest": "sha256:6358b904d4dc354532e7a33bea24f8027f030c0a047fcafc4ee56687dac2c767"
},
{
"name": "@narratage/fonts-open",
"version": "0.0.0-dev",
- "digest": "sha256:e145b8fe1ab5dca02f91b60d4ec3301c9a8022f5bf46ffe47a2284cdb3dcc0d0"
+ "digest": "sha256:f3c5efec04ae87f4493e40c033b13101033dcf630ca1b2e1ca1648d19561ed8d"
},
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:fa629ce58731fb544aec83f10348352af019a5c8f441699e1b0035ec489dac6e"
+ "digest": "sha256:b36ca0d63c776885b31d72b58df0b788e96fc53fdab08796d9e75e8dce58ab7c"
},
{
"name": "@narratage/host",
"version": "0.0.0-dev",
- "digest": "sha256:4fb020ec30c6024e74994eae5492fb98c75eb2e055a4a289a16afa26d84fcb4e"
+ "digest": "sha256:936e4a224e3be5c4a44d5c830cc0e33c0dc19dbddcff361ef223ce575723a747"
},
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:9a736f281f46eeb4a1998ae9438b0869722f00cdef9b53e219d94ac04497231d"
+ "digest": "sha256:f7ebf4c69b907014933f4f99ffeda87348ded8153efe204033a1c914090c5e15"
},
{
"name": "@narratage/markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d54f0d3a0947f628d406628ec78f441b8cb5da633ebc4a7fbb5ef176d68924b"
+ "digest": "sha256:d470d43fe41379ab0e8e229e0b3d67256bd72f00a7bec2e838c9c2e799f9986f"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:d30dfe6cf81b969e77678d870a34eb13ae48d8e486bfa5b300b452e79cc3d83e"
+ "digest": "sha256:a817f13daaed06fee119773ae67cd7e6cf6e5c62bf76b0e9b7b6bf78adfdf62e"
},
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:49af374a0b3d235c6e0f675d16c80ae5bf4bcdb8b9fc125f910391b4362dbede"
+ "digest": "sha256:f1a38d75fb9b168a3fde9144370ef93e6aa2354503b9c8b2d31f6f8c0ca47098"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:3517862f3a4d8fcb5225b00a2295264feff9baed0f08b49e5894bb9f8a6100a1"
+ "digest": "sha256:39de7df174f7d007d81757f30259bf1f553e6091b81d32ade9fc7acb439c76b3"
},
{
"name": "@narratage/model-kit",
"version": "0.0.0-dev",
- "digest": "sha256:ccc8c4bee06bea96d57400fc348a16b0c149e9acd5152ca331d2b0cfe85d1f15"
+ "digest": "sha256:9b73580cf309c1b83ec757d9d2c60964b192c2dc94a6cdfde7af4925d0efc024"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:5823b08047e4d1b099675112b6a58243a563d4ea1bcdb592fdcb10e6e3ef73ab"
+ "digest": "sha256:673e6f2ecded178a4dd2df92c766ae8bc5dc6c542038bac4a0cad47efb9f1e34"
},
{
"name": "@narratage/program-space",
"version": "0.0.0-dev",
- "digest": "sha256:b0b6413c2dd0fbd2894250b5d79d927a92bae8a3fbe755a5f3f7b18424504e03"
+ "digest": "sha256:9189eb40a95a9a003be41cc009391cef6965acbf587e45983d0a9f2faae7ad20"
},
{
"name": "@narratage/protocol",
"version": "0.0.0-dev",
- "digest": "sha256:8bec54ebf8fc9c8ac8ae8e24a3fce912267039d666183d16e7485c072923e462"
+ "digest": "sha256:617d291685b9dd2ce279cc48eef57cbc5c2c83eb031463aa98c9d6530664b63e"
},
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:6a436385accd1290988cf6e424e0b9b67b8c758045092281a41844284d135643"
+ "digest": "sha256:55a9c889b006a9235b2ad7275867003c2d1d5feff895ac064f9b6695b7bf9ab4"
},
{
"name": "@narratage/run-markup",
"version": "0.0.0-dev",
- "digest": "sha256:3ec93949ccc358327c63229f0bfd9ee3ebca487943dba544e70eb87a8a1d33ab"
+ "digest": "sha256:cd94dcbd931cae3cc9a850b288749c4af94b87b3c554df5d2809296bbcb904ce"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:eed752e2b89f5611a75e7c90e13c142059faf6e5155bce8140ae45dfb1e04e91"
+ "digest": "sha256:7ca029d7e63c3fcbb6450c32d93b4f5a50b6d137e9c67e5aa9476f5cc7099067"
},
{
"name": "@narratage/script",
"version": "0.0.0-dev",
- "digest": "sha256:77ebf0d0b25d6e71a5abc40eb0b05517e713901231caf56fbd6d4064c84a5942"
+ "digest": "sha256:cf43e33bd4f3b7fdc06f74080fe4b81626f3628bc008fd788b50d537b251b311"
},
{
"name": "@narratage/seedance",
"version": "0.0.0-dev",
- "digest": "sha256:5d44f162719a383284cbb62c860d9bbee7aa7af5c693f57c22f31a63f5d3e309"
+ "digest": "sha256:b3c899d6e9b2a7cd780f43fc67e134238a9b77ae46cb84334f99f921c1523764"
},
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:cc3b158e95dae35f5c67dbc926f0c69389f0ccc0260425cd6491f5c927510657"
+ "digest": "sha256:433e735c4e2a98f3d410552a1464aaa8d117f9b27dc891195bd6dfefe78ac98e"
},
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:f35e680ec01059de899247b7ec5d550e0641a7b880d0bfd75d34b2c930947a7e"
+ "digest": "sha256:358ee474b6b6be9231b0a2a19c1af21456ba244c3ace1d3110ef6a4072f5c133"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:13305323045486cf9526bf51951467427c93f63e53be0ed4504c542349fc4a21"
+ "digest": "sha256:9dd08e9216cd115e2650fa64684fe8b16188f1fc2ef29b4255ce97e9cc1bd251"
},
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:70dabc2dfc7603791cd0291e7e507d29837ed4ab1cdf386a46bd1fc3661aadb3"
+ "digest": "sha256:ad918c25a3e634bb7ef1b974269fb18948c2a3667fb12246f3e3b9b6886695e9"
},
{
"name": "@narratage/speech-basis",
"version": "0.0.0-dev",
- "digest": "sha256:1b76c55aedf45de5cd9ec3fe4f523b97f08d600cf375ce0b7d65de41d857d934"
+ "digest": "sha256:a328b78a2fd04fe0283515989bd03401441098a52884d36a9a7d5349265b79ce"
},
{
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev",
- "digest": "sha256:8112726350bf8ccb13883f8268490b4119f4821097222517d5101c14ed46d6d5"
+ "digest": "sha256:48ddfc5b8fd3c09366963058e6a0b6e7893f4ab2e095e68ec9c1033f06c39078"
},
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:a3dc6eac1d4415bd169180dcfea631619c97c1d6e75eb4ba71bb5959cabfbe20"
+ "digest": "sha256:482b7f59f56ca48a4222e505ca47801ba8631b486ac9c9c2af40a6f07edb68a8"
},
{
"name": "@narratage/speech",
"version": "0.0.0-dev",
- "digest": "sha256:76b8c81a6a78ae392991a21eed847f5f0d1f6ba1f0a6fa41538c78ff96a2a2d2"
+ "digest": "sha256:27b1a5fdf2e9b87c22ae3cefa36c47a6b87a3f9db8092cf8734f01b1ee007a9b"
},
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:7dce3e185ebf3d1f56b3e934fe79c804c6a67640468be65991cceeab25fd04a9"
+ "digest": "sha256:438b75d328bd2c4e8caa2ca659d3b7ca44f0ec0ed7540aff820284af43276faa"
},
{
"name": "@narratage/temporal",
"version": "0.0.0-dev",
- "digest": "sha256:5566cc222d97435a2072b626183b90f592fb20a09d72f207cd9222a413b4e172"
+ "digest": "sha256:7afa4b7f56e048613e1d4f0b4e910d2aa6cf462884dd093ef698da39ec4510c7"
},
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:bb58dc8de88a8a70f7597e6f578a6b4d90d43e99638110d2b367a68992f234ae"
+ "digest": "sha256:b33565f0c8393c465c9d86624eff56f2137c01cf97ed84c28212a6c36bc04e5f"
},
{
"name": "@narratage/validation",
@@ -762,12 +762,12 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:cd133df7e104188444ad34ad76f33d3674f5d12ba8aa5d942a8db145aba7415a"
+ "digest": "sha256:310b8ff7de9456f1af8a7a63f609ebb3348e2a1358afcf6d50e7f5c80e2ee45b"
},
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:ed7b57ad0a47e7f788fd087918e06c20b8cb58a68e149b34fcfa9687fcf3f03a"
+ "digest": "sha256:585d4856540211f1590ee1682c611264a19b67499ea4f33554d83e6bd9b71fe5"
},
{
"name": "cmu-pronouncing-dictionary",
@@ -782,9 +782,14 @@
"name": "@narratage/artifact",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:72524ad8d5599450b4ab199680a6382c72c40cbf760f9c0265687f340aa60650",
- "closureDigest": "sha256:62a2d8a5788671adf06df7347da70df41d5cbfc9651f330bbb05f4f163f77846"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/artifact@1"
+ }
+ ],
+ "facetsDigest": "sha256:2884ff49b47225ed6464a75fac1a1ff5d0be43b0ef8d94cd669d5e6e1c9d4ad1",
+ "closureDigest": "sha256:c407816b1ae99b4ee14a4af223a2124cf2a77c72cf0d96c97993d44b14110d7f"
},
{
"specifier": "@narratage/caption",
@@ -792,12 +797,14 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption",
- "@narratage/caption@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption@1"
+ }
],
- "facetsDigest": "sha256:1b7b07dfb828c3f95e321841a956e371c044dad8f39c117d92096e9be19b0032",
- "closureDigest": "sha256:563563ad6da139632b43318d170ce714e055014786a344d656f81c94f51d9ca9"
+ "facetsDigest": "sha256:933a4e5757cf1f2df61cd556970a154cb57fd8062e9add09f391adfd2847e91b",
+ "closureDigest": "sha256:6b4252de4ff593b60f6b9e92c3bea2fdd493bca2e9f27f5019c684e428fae794"
},
{
"specifier": "@narratage/caption-fine",
@@ -805,12 +812,14 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption-fine",
- "@narratage/caption-fine@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption-fine@1"
+ }
],
- "facetsDigest": "sha256:cb9fb74a5edc730f01772e4819f7d7a55ecf914984d48116f72f64a1837cf128",
- "closureDigest": "sha256:adeba9eee745b343d1e058fe48a8e8d346d72a6c0ec4c7ca3878643a29aee75d"
+ "facetsDigest": "sha256:28135290bf848de466c883363d1ce7428059d00bcfc9cc702da8eacfead4ec84",
+ "closureDigest": "sha256:b7b39df22b21d05de192a3bc484ea086d9b353cc111dbe137636fc1c47596ab8"
},
{
"specifier": "@narratage/caption-gemini",
@@ -818,12 +827,14 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/caption-gemini",
- "@narratage/caption-gemini@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/caption-gemini@1"
+ }
],
- "facetsDigest": "sha256:733cd8ac6415d69fffe460f77870787e7d3146fe11c937461bc9d849edc94106",
- "closureDigest": "sha256:41b6986b13c5c99906127e05e4f6e3cbc232a2133f5aa811472ee2450512a1c9"
+ "facetsDigest": "sha256:dfc2ffc1d70df96231dedbdbe4c5ca1d1cc63a51f019198682ab5249303bd54a",
+ "closureDigest": "sha256:ac8fe257d2d5d180c1ccf1525bceaad3ba2a0cd3727d58f698b811e1f16b88b8"
},
{
"specifier": "@narratage/composition",
@@ -831,9 +842,14 @@
"name": "@narratage/composition",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b86fe5e147a331d36843aecbe7c64a4e83ad98b755242d8d1a1ba6c62551f509",
- "closureDigest": "sha256:ddfbaf79774806fa3cf79b85a7f8765ec77fa888a7c1b9e9d91b7424f7e5201b"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/composition@1"
+ }
+ ],
+ "facetsDigest": "sha256:0feb85478548d3f5d73e0a6acf1000194ca90848aa1ccd2e8b8717168ac5e2d8",
+ "closureDigest": "sha256:530e8599969f729664c9c7d4533156f9d712a1b89b01f71be7bba0595cd2ed98"
},
{
"specifier": "@narratage/estimate",
@@ -841,12 +857,14 @@
"name": "@narratage/estimate",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/estimate",
- "@narratage/estimate@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/estimate@1"
+ }
],
- "facetsDigest": "sha256:824e38fe102d9d6862642df2113d094002f02ab31b1f7e844883863ea8c777fa",
- "closureDigest": "sha256:906bb3a509716df0b045947a5cda7eba959f347b473a4f6ce0c389e385f4db41"
+ "facetsDigest": "sha256:a1ec11994f4025782b86b9b83747fdb3cffc022f127794c19cc0afa7756fd817",
+ "closureDigest": "sha256:321fd793678942716e5acdcfda0a151e74b0d25759a66ce425f73dd5af0061e1"
},
{
"specifier": "@narratage/film",
@@ -854,12 +872,14 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/film",
- "@narratage/film@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/film@1"
+ }
],
- "facetsDigest": "sha256:8e6a1a585e853ef9b621feb918c15a2925da4ea1f05467e652d41f9202f10025",
- "closureDigest": "sha256:7870bcb9f57c04a05a75f1c99bc3e868051057a8eda6799ac63f2daf2af721d0"
+ "facetsDigest": "sha256:06ac3b7ab5a06a31d3cf94915d329e71539c65047ffa8b4a01ab3e8479cfbb78",
+ "closureDigest": "sha256:29f76d42e05d5765c31822faf167270fba92f4411cbe5fd4912fc3635a4d5d3d"
},
{
"specifier": "@narratage/fonts-open",
@@ -867,12 +887,14 @@
"name": "@narratage/fonts-open",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/fonts-open",
- "@narratage/fonts-open@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/fonts-open@1"
+ }
],
- "facetsDigest": "sha256:2117122b06d7c1cd6bee519e72aff22bc3b50f179b50da21dcc84ddf7014457f",
- "closureDigest": "sha256:4f4efe9e75e162bf26ac50cdade55ccac665cd3a208eeb8b011e482a3f20a617"
+ "facetsDigest": "sha256:8fa0bec98f32bda4615c55145917c42c7b2f3817537fa9e16672a6f9e13b5871",
+ "closureDigest": "sha256:9959d91138062af8736092bee6ba34245adbc330ecabcc87ba8b279871a2fda1"
},
{
"specifier": "@narratage/generation",
@@ -880,9 +902,14 @@
"name": "@narratage/generation",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:d74a57a3210267e665366513324db5c313b3ca0f770da66e74cc38aee5048efb",
- "closureDigest": "sha256:3638f93e6a983a5a44768eef160a6dbf49e80d065f890bc5bd14555ad023b7ec"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/generation@1"
+ }
+ ],
+ "facetsDigest": "sha256:aa37fdf154010f0f029a43ec9c1ccae67a1da024fe69c456a4f37cac1aa2b811",
+ "closureDigest": "sha256:b58ad589421b370b7b7491fe9d391b94d8eeca6edcf53035320469b7c2b92158"
},
{
"specifier": "@narratage/hyperframes",
@@ -890,9 +917,14 @@
"name": "@narratage/hyperframes",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:4b2a86382c5d544fac8c194047f6e18ff554361d97d62e165533061b03b94ae9",
- "closureDigest": "sha256:3d288affb92c4b81527cb167947dd96a448b5091bf9c4c057e417be50a4b2623"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/hyperframes@1"
+ }
+ ],
+ "facetsDigest": "sha256:6ee5fccb93e741de0b7bcf9612a66a91d75932b22553f5d32c9055edef4ccda5",
+ "closureDigest": "sha256:122f5f3978fba14506f2d40363bdbb1cbd387177f11e950f66895ae663f109fc"
},
{
"specifier": "@narratage/media",
@@ -900,12 +932,14 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/media",
- "@narratage/media@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/media@1"
+ }
],
- "facetsDigest": "sha256:f0974c7d88918ca4796dbb86dea24b6d29f8f5f44430c4845f9928f1df5b22e5",
- "closureDigest": "sha256:8ceaff731f4c0d5c4b88f708bdd75c5d6a4a00abe71607c6ddf0b8fe0da400c3"
+ "facetsDigest": "sha256:209a74b7a1a87455b182e499f4f40cbf47d80d75805a6efbaec2169f8e424086",
+ "closureDigest": "sha256:83a3e69629a356eda04da94ed995f61688b7a1e5dab1de23be77cce65b8c3263"
},
{
"specifier": "@narratage/media-pipeline",
@@ -913,12 +947,14 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/media-pipeline",
- "@narratage/media-pipeline@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/media-pipeline@1"
+ }
],
- "facetsDigest": "sha256:6df6afa9661002801d95b5075309a7cf31484d7ad300a5ab3f90119d34042224",
- "closureDigest": "sha256:020673ebf48c557a7c318b5cd1e97e096bf8e4681a459fa4fbd2b352fb6ff402"
+ "facetsDigest": "sha256:bfd2adca42b96d588b8f26c8e800c94aa75ffdac5617846259775ae0f8bf1b03",
+ "closureDigest": "sha256:e7708f70f60fdee81d3defcd538b7af1bb394c408ccbe9ff50c0db6c312bf653"
},
{
"specifier": "@narratage/narrative",
@@ -926,9 +962,14 @@
"name": "@narratage/narrative",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:703db7ad343b00701dc39e3b316992dc371307f0c6c2ad15d1e0269257ffb326",
- "closureDigest": "sha256:c197675dfd711b5ac42fc0f084b1b7574de4f4061fda2fbabe69352faff1cd01"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/narrative@1"
+ }
+ ],
+ "facetsDigest": "sha256:79e65e538ae1e7631780b6f0dce1fb34afa837e07ba369ffebafaa84234a9fb7",
+ "closureDigest": "sha256:7d549f1884a730680f59e590b8d6cc4e0dfdd610ce3c3d7324dcc8a719d2f480"
},
{
"specifier": "@narratage/program-space",
@@ -936,9 +977,14 @@
"name": "@narratage/program-space",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b1e4eab41a135914556872f0f47a0c02b8ce76920366cbf86121b720af069052",
- "closureDigest": "sha256:d732dd805f1577ff3b7aaea5d05722d43bb03958095861a3eae7bf47d5f2504c"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/program-space@1"
+ }
+ ],
+ "facetsDigest": "sha256:098323539bb9d27c1a2f805d74a6373a6ee9e8e0c5ceb566697738aea5c47557",
+ "closureDigest": "sha256:ae836f049ad02ebf06ca86ffb5ba5adbb6f82f9a6de341470e2cc2db9dc5bf44"
},
{
"specifier": "@narratage/render-hyperframes",
@@ -946,12 +992,14 @@
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/render-hyperframes",
- "@narratage/render-hyperframes@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/render-hyperframes@1"
+ }
],
- "facetsDigest": "sha256:2b5edae659a7d3e92e19ed591ca7d5f784f4a3b6164d33c0e201c9b180ef0323",
- "closureDigest": "sha256:53134fcfc4451213e40f207ed42f8b465b7090f617b835398cb06ec0b23db32d"
+ "facetsDigest": "sha256:e9584dd9a7c6b3f3f089605a3dfd9321159ca9dfb8de0b61ca993a71406abc26",
+ "closureDigest": "sha256:e52e7238548deaa7cd87636cbbb7b6535121079c786444b29f107e0ff17a696e"
},
{
"specifier": "@narratage/run-markup",
@@ -959,11 +1007,14 @@
"name": "@narratage/run-markup",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/run-markup@1"
+ "offers": [
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/run-markup@1"
+ }
],
- "facetsDigest": "sha256:fb3a8a5be9a0ef0aa914026a199be641f4e20df27f9b284be196f52fd260be55",
- "closureDigest": "sha256:fbe76b58961bf0dba04cb91194c7756e0940e61b18a219510b90f97438f3dae2"
+ "facetsDigest": "sha256:afc9baeb3ce3355c5d94affdcf9159a3fc2b6f9378575240a4ecd8bdea3fe4c6",
+ "closureDigest": "sha256:2e8993d99c94ba9a73f0cd1bf480d91d07413fd22fef29acd83c652e9f0d5b39"
},
{
"specifier": "@narratage/script",
@@ -971,12 +1022,14 @@
"name": "@narratage/script",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/script",
- "@narratage/script@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/script@1"
+ }
],
- "facetsDigest": "sha256:69e1c08a5f07c73a506ca8286426a0386485738649e86463cca0b291f319ee4e",
- "closureDigest": "sha256:ee9962537eafe56bb339574fbb9bdba9c00dab39ce8c5b9da89aabdc41c64d22"
+ "facetsDigest": "sha256:d7928d30462c64cc79599db6df9249ad6a726178c62dee672c6292275d702f70",
+ "closureDigest": "sha256:389a09bfb2ac469e82cf9271d3b037054fd593a521330b51e3b37e373cbbb0df"
},
{
"specifier": "@narratage/seedance",
@@ -984,12 +1037,14 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/seedance",
- "@narratage/seedance@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/seedance@1"
+ }
],
- "facetsDigest": "sha256:df015abfb273de3629eec0da456a6fa90e7a55a5ed092d76a74c3d1dc4a5f705",
- "closureDigest": "sha256:51da9127b77edc1c46c7a9c88786c49df3c8d91eeec0bca236b8554ef16709b1"
+ "facetsDigest": "sha256:e90f12731ecc6e8eb88168a156b954e9d5e806d55299a76ddddf51f22f719028",
+ "closureDigest": "sha256:8e34aa210706740bff98cf32fc22fe7dfd19b8cf1e7642acd4f2aa47ca1d392b"
},
{
"specifier": "@narratage/semantic-map",
@@ -997,9 +1052,14 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:510a57287945426449c8b2580d22a2d7f90ccaf1cb5bdd4fa5071b5b05ee91c0",
- "closureDigest": "sha256:8b6838a4057fcec08cbb74c66d405f8be9a93234ce20df5cdd94fd8d9a5ae914"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/semantic-map@1"
+ }
+ ],
+ "facetsDigest": "sha256:b271401518709cf036a19450f7ae2adfd39e4f2526017aaa8141934446cc8529",
+ "closureDigest": "sha256:fa3959375c231b6702affbe835392339c7fa468fb2b324438e7c55b9c79221d4"
},
{
"specifier": "@narratage/spatial",
@@ -1007,12 +1067,14 @@
"name": "@narratage/spatial",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/spatial",
- "@narratage/spatial@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/spatial@1"
+ }
],
- "facetsDigest": "sha256:5062281ffadb46495ec12e1a67185b57fe13879e90f03bcf544e93fd1d273716",
- "closureDigest": "sha256:73d113e95dd6cbd1feb6f45070e244850e6737fa5c09c23f68c5ecfb8a377d36"
+ "facetsDigest": "sha256:0fcf12887d2400c547e93488618c1d29141466568ca8d4bb5ec6ffc646fc3a5f",
+ "closureDigest": "sha256:d15c67972a2378c71f6917543c9a14046b78c72380ace6d02c214e572d7c13b5"
},
{
"specifier": "@narratage/speech",
@@ -1020,9 +1082,14 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:6d1be76a2ee9486146436fde148c99eccdc055948a39c5098de2ff4122d80c7a",
- "closureDigest": "sha256:8d6d71bf808b4aeceed1f500f68ff648e19131940d3da0e0e0426e48c179e100"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech@1"
+ }
+ ],
+ "facetsDigest": "sha256:e666730deca2fd85bd3d70fe8eba70c9d3c416a572084f3605a75f349abb466a",
+ "closureDigest": "sha256:d4dfec50fa63e51a7bfdfd03ab7d93e9ed74c29d93d8d034eadc23c873f6a0f4"
},
{
"specifier": "@narratage/speech-alignment",
@@ -1030,9 +1097,14 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:78162875012523865df9c69770127a1db6ef9a8f5fc5af72255360af2a9c4370",
- "closureDigest": "sha256:c3dece181c80c8cfbf3186dd55a2654d6114765384188df4e6b6e21b1bf45c77"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-alignment@1"
+ }
+ ],
+ "facetsDigest": "sha256:f363bb3eac94f01f3ec99806f72e9c6c3ce2008c2e0cfe0dc815b4e6bfb1d033",
+ "closureDigest": "sha256:7707427f8e6263ea676125266f47099829bca8c899ba6c58362164e96c7cfb4b"
},
{
"specifier": "@narratage/speech-basis",
@@ -1040,9 +1112,14 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:97aaeabe85b3e4d6a8715ea9a41ac27ef71804ae99359b631546a4382bbac9df",
- "closureDigest": "sha256:0fea160882535c9746d56d1f668607aa9d1a46a40c60bbb2859f8b307145a0e4"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-basis@1"
+ }
+ ],
+ "facetsDigest": "sha256:33918e70f368a6888b37549fd40f7d751b564fcd6569b8e68c3a1468ad51d991",
+ "closureDigest": "sha256:b615dedcc8111911626f2ffe729e0ad394f772f8278f6cd1758a035adcc2a69d"
},
{
"specifier": "@narratage/speech-evidence",
@@ -1050,9 +1127,14 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:989d191644ea472a3cbd386bd4a6992f1f7f5ef82f1f8da53c9a4efa99d3d2d1",
- "closureDigest": "sha256:fed18a41121b44960b5a9cd2a6cd6f6954bc3016d7abbc7bf4b0a26798f28742"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-evidence@1"
+ }
+ ],
+ "facetsDigest": "sha256:6469ee9ae21f4f68f81d3ad873fa3d3bc3ad4863ce20626b38b62759c2983658",
+ "closureDigest": "sha256:c6620b224444672418863e84476c76ffcf5aaa94af07ef9e3396e773bf522a1d"
},
{
"specifier": "@narratage/speech-spine",
@@ -1060,12 +1142,14 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/speech-spine",
- "@narratage/speech-spine@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/speech-spine@1"
+ }
],
- "facetsDigest": "sha256:81a038765324b7a48ceb44c638faf128df31573a122989116d649dca3b3cb6d3",
- "closureDigest": "sha256:f6e6f346541422f115905fe77b967ae113dcff0e77905d1876f9353810e61234"
+ "facetsDigest": "sha256:723a8981b4a4d8e46c476ebb4390cca81a7eada8559cee092cb11e9744c45e17",
+ "closureDigest": "sha256:1cc8eddeeedd16292ec597bbf1705328be7fc78ef1c888c5d770cd3d122aec63"
},
{
"specifier": "@narratage/svs",
@@ -1073,11 +1157,18 @@
"name": "@narratage/svs",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/svs@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/svs@1"
+ },
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/svs@1"
+ }
],
- "facetsDigest": "sha256:9cc7c397d2cd97b5a3e814886b6553b6d236fd8825df0d056e328b7f0cf20163",
- "closureDigest": "sha256:43a43083ff729f30cc31edf9ddf2b44722430bde9a9ad6e73cc0ae1114d5d522"
+ "facetsDigest": "sha256:85966f0c7d52d4c8772662ba25f066a0b1fc71cad8992995170f98188903f3d6",
+ "closureDigest": "sha256:2a98b715890867096f98121082311f89712fea0132b1ef395186a53aa4e71841"
},
{
"specifier": "@narratage/text",
@@ -1085,13 +1176,18 @@
"name": "@narratage/text",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/text",
- "@narratage/text/svs@1",
- "@narratage/text@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/text@1"
+ },
+ {
+ "abi": "svml.source-frontend@1",
+ "name": "@narratage/text/svs@1"
+ }
],
- "facetsDigest": "sha256:4435dd4bd38e5e017013f775e28e379e3e235211649ee8f3913378f7f9e60b58",
- "closureDigest": "sha256:4e1ae6017ad16c4d27128f858b83ff04fabd33a03e6d015f010b543f154e7e1a"
+ "facetsDigest": "sha256:f49f923d295bd538c6abbe9641252ca850249df3d0863c8d765d531ade612649",
+ "closureDigest": "sha256:b2b28724a122378cdb7a2acef9a379bf3d02b59c01dca0dc1116cb1ffb140f1b"
},
{
"specifier": "@narratage/visual-ir",
@@ -1099,9 +1195,14 @@
"name": "@narratage/visual-ir",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:8c577a635a48ee04441068df1f3dc2c18a602bff091fddca8883a3843ce4ce37",
- "closureDigest": "sha256:4606d4ea45276ed1a5a34ed109e545961ca3d72787a13bf85e976e20082528f0"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/visual-ir@1"
+ }
+ ],
+ "facetsDigest": "sha256:491c61ee6504e7eb48e0ad53db597986f22721d6d21f1c7cd9631efe2b80eb0c",
+ "closureDigest": "sha256:4ac70be9af32dcf944bb49f0be4ef1864b63503c07909989bb0a5ac6a838a59c"
},
{
"specifier": "@narratage/whisperx",
@@ -1109,13 +1210,15 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "provides": [
- "@narratage/whisperx",
- "@narratage/whisperx@1"
+ "offers": [
+ {
+ "abi": "svml.module@1",
+ "name": "@narratage/whisperx@1"
+ }
],
- "facetsDigest": "sha256:ed9ebd9eea0b92c20357ec67dc14c4aa211836dc815c3edcb48e4946972f94c5",
- "closureDigest": "sha256:74176a63a7a62d4de6896a66f0e2883466defce32fed33dbe9d9688beccdff13"
+ "facetsDigest": "sha256:e81e9541ed9a878dd175ee5b6b892344a5a238fff157d2a8ec034e4d3e47ac76",
+ "closureDigest": "sha256:fd6c1c23e895a1e27552687a57dc6342c4dd4a2dc462f4274c8c5ba94eca86fa"
}
],
- "digest": "sha256:2faff3567b635871c5581be48d6f6b21504a9ea5f3974b502480dcfb4db37ed3"
+ "digest": "sha256:4f19ddee3b938e98ad17fd3e68b40f9c816e1c745d368c7ff1b9d56709c44fc4"
}
diff --git a/examples/talking-head-aroll/svml.runtime-packages.lock b/examples/talking-head-aroll/svml.runtime-packages.lock
index e23a5f2b..2b01275b 100644
--- a/examples/talking-head-aroll/svml.runtime-packages.lock
+++ b/examples/talking-head-aroll/svml.runtime-packages.lock
@@ -45,27 +45,27 @@
{
"name": "@narratage/artifact",
"version": "0.0.0-dev",
- "digest": "sha256:e1839b39b3ec1bc560ad7d0876e72cef09903f40ba3e0669b355f54a39d2fc82"
+ "digest": "sha256:4fc7d9a345c2c082a2b6d4beb63f791eade0d2e57d565aa15cb0d2ad31e30c4d"
},
{
"name": "@narratage/background-removal",
"version": "0.0.0-dev",
- "digest": "sha256:2d2d25c858b60b066f662ed3c8b1c9bc694894afed42ff9aa6c4ddce5ce5bb55"
+ "digest": "sha256:039e85baa8a59134712b9b2549bf615a47c72098a3455f04b56df3644d08d5ac"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:2411d92a3eec5dac75ef53d9a9715f88d6cec8241e6b752c802537c18e91bf3a"
+ "digest": "sha256:9ea663f4932cb232204c92bb9492bc429799717cd220eb63c0bd276e8c4307c0"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:c43dcd0defd89f3079c81075859a7c63179a58911f9fb43c78e499bf8c9073e8"
+ "digest": "sha256:b1466bdfdca5774487be11e957c3c15e393eef47729505567f56f0728f93af29"
},
{
"name": "@narratage/compiler-node",
"version": "0.0.0-dev",
- "digest": "sha256:f85b4b0cc1f28ab2d9caf4e472590e4effc53406f69ef344ac724395a22cb266"
+ "digest": "sha256:f05bf79573f60f05bc5403086d5503e01602fe6031e0de0c50351084c2502446"
},
{
"name": "@narratage/component-kit",
@@ -75,12 +75,12 @@
{
"name": "@narratage/composition",
"version": "0.0.0-dev",
- "digest": "sha256:af8c81e17a6c90b292c37ac3577a43263dab7cfbe30d0a84a4d507d68ffc4d9e"
+ "digest": "sha256:8f46299e2e5dbde593e34d5ee5a68604577f118f5eced786e3dd0b67003f94f8"
},
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:9ade54b00fd6728287f036aaa1ae38f3f7c756be9e2e1015b74c29ee3339c95b"
+ "digest": "sha256:8e119a659795a674705884971fe7a77a1e890a5415f911f967fbebbf508f7bb0"
},
{
"name": "@narratage/credential-store-env",
@@ -95,7 +95,7 @@
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:7f2d21ae5e0c8c113e82dcc7169aa7f20b2062ffb79a0db86861c8ab069cb219"
+ "digest": "sha256:ae89027241ab0ac3e274fc5b650967611696b6735c0cd23fd0b010ea7cf68ea1"
},
{
"name": "@narratage/endpoint-kit",
@@ -105,62 +105,62 @@
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:fa629ce58731fb544aec83f10348352af019a5c8f441699e1b0035ec489dac6e"
+ "digest": "sha256:b36ca0d63c776885b31d72b58df0b788e96fc53fdab08796d9e75e8dce58ab7c"
},
{
"name": "@narratage/host",
"version": "0.0.0-dev",
- "digest": "sha256:4fb020ec30c6024e74994eae5492fb98c75eb2e055a4a289a16afa26d84fcb4e"
+ "digest": "sha256:936e4a224e3be5c4a44d5c830cc0e33c0dc19dbddcff361ef223ce575723a747"
},
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:9a736f281f46eeb4a1998ae9438b0869722f00cdef9b53e219d94ac04497231d"
+ "digest": "sha256:f7ebf4c69b907014933f4f99ffeda87348ded8153efe204033a1c914090c5e15"
},
{
"name": "@narratage/local",
"version": "0.0.0-dev",
- "digest": "sha256:c7c87cc87778678a72e0323f220eacc0f33fe0a42d81fce9d5a9aaec9f1f08dd"
+ "digest": "sha256:25bdfa41740d3aa1ae050dca0258aa6c88ede1a574cb526b36b0c78bf8bfe615"
},
{
"name": "@narratage/markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d54f0d3a0947f628d406628ec78f441b8cb5da633ebc4a7fbb5ef176d68924b"
+ "digest": "sha256:d470d43fe41379ab0e8e229e0b3d67256bd72f00a7bec2e838c9c2e799f9986f"
},
{
"name": "@narratage/media-execution",
"version": "0.0.0-dev",
- "digest": "sha256:7ae1fb05418962f1403c99ecc02622f6b1e9f5fa2451c29177a5a1acfe6a6fe5"
+ "digest": "sha256:89c688f6cf5ac687c898a16c781abd1d672a9fe70e13c3d19783c985ec4df1fc"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:d30dfe6cf81b969e77678d870a34eb13ae48d8e486bfa5b300b452e79cc3d83e"
+ "digest": "sha256:a817f13daaed06fee119773ae67cd7e6cf6e5c62bf76b0e9b7b6bf78adfdf62e"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:3517862f3a4d8fcb5225b00a2295264feff9baed0f08b49e5894bb9f8a6100a1"
+ "digest": "sha256:39de7df174f7d007d81757f30259bf1f553e6091b81d32ade9fc7acb439c76b3"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:5823b08047e4d1b099675112b6a58243a563d4ea1bcdb592fdcb10e6e3ef73ab"
+ "digest": "sha256:673e6f2ecded178a4dd2df92c766ae8bc5dc6c542038bac4a0cad47efb9f1e34"
},
{
"name": "@narratage/package-loader-node",
"version": "0.0.0-dev",
- "digest": "sha256:4ac8289e175f4a3e4fb2f40d4e2115404835fc640e8d4d971ed96a5d8b9bd72a"
+ "digest": "sha256:49a3bbf24edc3660d76d60f1636a25441683e5133670782abdf5f26e7b67c950"
},
{
"name": "@narratage/program-space",
"version": "0.0.0-dev",
- "digest": "sha256:b0b6413c2dd0fbd2894250b5d79d927a92bae8a3fbe755a5f3f7b18424504e03"
+ "digest": "sha256:9189eb40a95a9a003be41cc009391cef6965acbf587e45983d0a9f2faae7ad20"
},
{
"name": "@narratage/protocol",
"version": "0.0.0-dev",
- "digest": "sha256:8bec54ebf8fc9c8ac8ae8e24a3fce912267039d666183d16e7485c072923e462"
+ "digest": "sha256:617d291685b9dd2ce279cc48eef57cbc5c2c83eb031463aa98c9d6530664b63e"
},
{
"name": "@narratage/provider-google-vertex",
@@ -170,7 +170,7 @@
{
"name": "@narratage/provider-hyperframes-local",
"version": "0.0.0-dev",
- "digest": "sha256:e8ecf79ffa7eb54a3fa801f6430d1c7b241db7f2a3f9fd15511bd05f0f2f7a94"
+ "digest": "sha256:7bbe93af52489e3a21306a94ba7d09ed1a91c7e145ce88d31d0b612ec4a2aa70"
},
{
"name": "@narratage/provider-kie",
@@ -180,22 +180,22 @@
{
"name": "@narratage/provider-media-local",
"version": "0.0.0-dev",
- "digest": "sha256:660c667d2dbce0e0bb3385fa2766e1562c921dee3279aa4e3a76d67cd725f67f"
+ "digest": "sha256:30e84e0a95beecd0dde1d1f763e2f0120bc2e4563ae2d404df18da240f92f37c"
},
{
"name": "@narratage/provider-whisperx-local",
"version": "0.0.0-dev",
- "digest": "sha256:0a7e334a3c38fcf26307d5fb963826c0589f451c071765c7218997a58f10e914"
+ "digest": "sha256:d6b30bd8de3e28010d087c7f9ff7aa22fdfaa2e3f5d5d8162470648e2b86c62e"
},
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:6a436385accd1290988cf6e424e0b9b67b8c758045092281a41844284d135643"
+ "digest": "sha256:55a9c889b006a9235b2ad7275867003c2d1d5feff895ac064f9b6695b7bf9ab4"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:eed752e2b89f5611a75e7c90e13c142059faf6e5155bce8140ae45dfb1e04e91"
+ "digest": "sha256:7ca029d7e63c3fcbb6450c32d93b4f5a50b6d137e9c67e5aa9476f5cc7099067"
},
{
"name": "@narratage/runtime-adapter-node",
@@ -205,57 +205,57 @@
{
"name": "@narratage/runtime-adapter",
"version": "0.0.0-dev",
- "digest": "sha256:4135319241131dcbda85c94c136bdaf2427007638d6577baa2f5c379589202c2"
+ "digest": "sha256:ee0043ee8c6f593bcba507d24df5173d1d827b50040ffbd207898953f51eb0de"
},
{
"name": "@narratage/runtime",
"version": "0.0.0-dev",
- "digest": "sha256:ba12544fdca923e0b61139302e70411f0555276ae8c6735e29aa81681e9ac491"
+ "digest": "sha256:9e271ac72a3011d70b358fac3cde0bf95b318d20b8a716365acb9bece36703e2"
},
{
"name": "@narratage/semantic-map",
"version": "0.0.0-dev",
- "digest": "sha256:cc3b158e95dae35f5c67dbc926f0c69389f0ccc0260425cd6491f5c927510657"
+ "digest": "sha256:433e735c4e2a98f3d410552a1464aaa8d117f9b27dc891195bd6dfefe78ac98e"
},
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:f35e680ec01059de899247b7ec5d550e0641a7b880d0bfd75d34b2c930947a7e"
+ "digest": "sha256:358ee474b6b6be9231b0a2a19c1af21456ba244c3ace1d3110ef6a4072f5c133"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:13305323045486cf9526bf51951467427c93f63e53be0ed4504c542349fc4a21"
+ "digest": "sha256:9dd08e9216cd115e2650fa64684fe8b16188f1fc2ef29b4255ce97e9cc1bd251"
},
{
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev",
- "digest": "sha256:70dabc2dfc7603791cd0291e7e507d29837ed4ab1cdf386a46bd1fc3661aadb3"
+ "digest": "sha256:ad918c25a3e634bb7ef1b974269fb18948c2a3667fb12246f3e3b9b6886695e9"
},
{
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev",
- "digest": "sha256:8112726350bf8ccb13883f8268490b4119f4821097222517d5101c14ed46d6d5"
+ "digest": "sha256:48ddfc5b8fd3c09366963058e6a0b6e7893f4ab2e095e68ec9c1033f06c39078"
},
{
"name": "@narratage/speech",
"version": "0.0.0-dev",
- "digest": "sha256:76b8c81a6a78ae392991a21eed847f5f0d1f6ba1f0a6fa41538c78ff96a2a2d2"
+ "digest": "sha256:27b1a5fdf2e9b87c22ae3cefa36c47a6b87a3f9db8092cf8734f01b1ee007a9b"
},
{
"name": "@narratage/store-sqlite",
"version": "0.0.0-dev",
- "digest": "sha256:5c07e38f6b4fc747dfd43c63011d8644a050bb5f8537fd63c7f625bf8a9543ef"
+ "digest": "sha256:7ea3148573caa35f2f08d291f2edd938ea17214f704a93fab66e0a247b267c10"
},
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:7dce3e185ebf3d1f56b3e934fe79c804c6a67640468be65991cceeab25fd04a9"
+ "digest": "sha256:438b75d328bd2c4e8caa2ca659d3b7ca44f0ec0ed7540aff820284af43276faa"
},
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:bb58dc8de88a8a70f7597e6f578a6b4d90d43e99638110d2b367a68992f234ae"
+ "digest": "sha256:b33565f0c8393c465c9d86624eff56f2137c01cf97ed84c28212a6c36bc04e5f"
},
{
"name": "@narratage/validation",
@@ -265,17 +265,22 @@
{
"name": "@narratage/visual-ir",
"version": "0.0.0-dev",
- "digest": "sha256:cd133df7e104188444ad34ad76f33d3674f5d12ba8aa5d942a8db145aba7415a"
+ "digest": "sha256:310b8ff7de9456f1af8a7a63f609ebb3348e2a1358afcf6d50e7f5c80e2ee45b"
},
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:ed7b57ad0a47e7f788fd087918e06c20b8cb58a68e149b34fcfa9687fcf3f03a"
+ "digest": "sha256:585d4856540211f1590ee1682c611264a19b67499ea4f33554d83e6bd9b71fe5"
},
{
"name": "@narratage/workspace-fs-node",
"version": "0.0.0-dev",
- "digest": "sha256:078b83eec447cb0624057e9db3b37fc1ece5b6bca64b03c6ed1a8c9113f95ecd"
+ "digest": "sha256:9a9e37598589410ffff6d3f364a061a19adaafb6740b6da50e9200e6a29f5925"
+ },
+ {
+ "name": "@narratage/workspace",
+ "version": "0.0.0-dev",
+ "digest": "sha256:aaff22e672f87b6dfeb3e29dc7ebf092b935dd5e7b4b76aef42f839863e301a7"
},
{
"name": "@protobufjs/aspromise",
@@ -925,9 +930,14 @@
"name": "@narratage/artifact-store-fs",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:914018276b9218afc13940ca5c362dc95fa19d574fc07b06b6fe005c5eb30315",
- "closureDigest": "sha256:d883017faf93520a745a27456cb5f81fce6dff9b0787214b2ba0a51028e9d948"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/artifact-store-fs"
+ }
+ ],
+ "facetsDigest": "sha256:7b67d203b78bc126194c966d9200c8002f51d59e56e0b63a768b1edc3bdcd423",
+ "closureDigest": "sha256:e1f490b3391c7dd6d3c1a49d270985c17b9272f1cc62f220bcffbcfa7eef3a49"
},
{
"specifier": "@narratage/credential-store-env",
@@ -935,9 +945,14 @@
"name": "@narratage/credential-store-env",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:ee33ba638bbf2f88eee8f34a2f3179f435a0af9ccbae3fbb7d2a81bd6aeac612",
- "closureDigest": "sha256:d8c0a576a247ad8bdc3771c6bccc1c842fb086dc36700c6680c8656fec88b1f9"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/credential-store-env"
+ }
+ ],
+ "facetsDigest": "sha256:f43b206c618ace8481dbafcc2fcd0c82da9c62fd54bca7bcc480fdad504b4181",
+ "closureDigest": "sha256:cda5aed4905de16a3cbd63a36c0be44f5a675e8e7e7aa2c3db0b26719cd15517"
},
{
"specifier": "@narratage/local",
@@ -945,9 +960,14 @@
"name": "@narratage/local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:6689aed79b0947c7315aef65e46806ce73da01de3d73b454e1497b8d847ffa61",
- "closureDigest": "sha256:302f4d817cead3171fc77e36084e3a16e427329c308e7d7c79fdb204f24ad830"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/local"
+ }
+ ],
+ "facetsDigest": "sha256:6cd2efb261cc9f69def05c15fd71485f6a2ea9d130dd414089efb0bb700da6be",
+ "closureDigest": "sha256:e49c61755202599e6d2af2f23e795a4b90ac3ee4491b502f3a2eb196a354b3ad"
},
{
"specifier": "@narratage/provider-google-vertex",
@@ -955,9 +975,14 @@
"name": "@narratage/provider-google-vertex",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",
- "closureDigest": "sha256:57fe88c1e75a3cab8ee1d771f948d285d6ea3edb8e88d6b89146adb5418e6f13"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-google-vertex"
+ }
+ ],
+ "facetsDigest": "sha256:5e830b098688f92c8b5b02a97ac59a108c229733cf727370a25b7cdbd80d524c",
+ "closureDigest": "sha256:e22345632163f846f3ca05ebd58d2e335295730e4a3ef39db05242dfd81d2b10"
},
{
"specifier": "@narratage/provider-hyperframes-local",
@@ -965,9 +990,14 @@
"name": "@narratage/provider-hyperframes-local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",
- "closureDigest": "sha256:0c92ab5304359875e3dfb9d8a45cab140954e9dcc023d349347cd221493f35c1"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-hyperframes-local"
+ }
+ ],
+ "facetsDigest": "sha256:238058ce8ab6abdf3697e4417813ea00cc2def58a361849b1033a39442a3f1f3",
+ "closureDigest": "sha256:b42ae8fcbf15756e14d6ac728474ac7a7ded15b67533dc4eaed3d96ef43e193a"
},
{
"specifier": "@narratage/provider-kie",
@@ -975,9 +1005,14 @@
"name": "@narratage/provider-kie",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:e61ebb911a33d4c5d0e4e4ee4fb69cdb790f4ced050ef35f7472bfbd72013d9b",
- "closureDigest": "sha256:3d7389bce84a29a20d795a2ecd62078516e42963b456e34186dcb2df10631c0e"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-kie"
+ }
+ ],
+ "facetsDigest": "sha256:6adb7e38bc18f62828a08eb05549cf35cf6aed137a62e04d5bc86ff96e19d29d",
+ "closureDigest": "sha256:2d23cab849deccc7b16b33abe00d296c089f822fd7c49fc6dfe8658ab3b34f25"
},
{
"specifier": "@narratage/provider-media-local",
@@ -985,9 +1020,14 @@
"name": "@narratage/provider-media-local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",
- "closureDigest": "sha256:4e6c4b8d9049775087bea1e59464a80e7944b6452a034f5bf439cdb8b06250c5"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-media-local"
+ }
+ ],
+ "facetsDigest": "sha256:9e262adf3bd804f924b2ec5193f937f87e81109eb0756beb98d268455c6400de",
+ "closureDigest": "sha256:c7b0098bdd959b78174cb33ef58c8ba6db30128a22cf5d3e36584acc40964ce3"
},
{
"specifier": "@narratage/provider-whisperx-local",
@@ -995,9 +1035,14 @@
"name": "@narratage/provider-whisperx-local",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",
- "closureDigest": "sha256:9aacef85c04d31f412a4d4cc8881879b949f8bba422dadacf72b2fcffd1ce1e0"
+ "offers": [
+ {
+ "abi": "svml.runtime-endpoint-adapter-host@1",
+ "name": "@narratage/provider-whisperx-local"
+ }
+ ],
+ "facetsDigest": "sha256:71cff41644704b1e0097a16310b713f590745ed503ba8a1969cfb4d23ee65de6",
+ "closureDigest": "sha256:49d46f35b8f384c009df583be6694f870cf55bb2eef1b858bcf658a7c93f33b8"
},
{
"specifier": "@narratage/store-sqlite",
@@ -1005,10 +1050,15 @@
"name": "@narratage/store-sqlite",
"version": "0.0.0-dev"
},
- "provides": [],
- "facetsDigest": "sha256:5bccf73cd953710fc31ef44672fef1bfc396fd4aa2eff4b53108e8ff87e749c3",
- "closureDigest": "sha256:01b21eab61e3f11067d7c25dbc0b1644e71d3c599d0bc64f37bb0ba7a7b9d10e"
+ "offers": [
+ {
+ "abi": "svml.runtime-service-adapter-host@1",
+ "name": "@narratage/store-sqlite"
+ }
+ ],
+ "facetsDigest": "sha256:cf1234bc9e6087a42d8a4db4cf8521785acc59166d43dbb6f4ea12761b4233a3",
+ "closureDigest": "sha256:ddb88d38e33ad77e102a4372712fb39a225766e55d2d0a67c76ee35118a630bd"
}
],
- "digest": "sha256:cd34acfbc846ee6d2a986ef8221163b97b330ac1a1aac44a970e61418c157a66"
+ "digest": "sha256:937377f72a9531eec95f80c8833ef8763471127ef66ae04ab7d06d2cd4c6f8f8"
}
diff --git a/examples/talking-head-aroll/svml.runtime.json b/examples/talking-head-aroll/svml.runtime.json
index 196cc5fa..3b6446d9 100644
--- a/examples/talking-head-aroll/svml.runtime.json
+++ b/examples/talking-head-aroll/svml.runtime.json
@@ -15,7 +15,6 @@
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials.env"]
}
diff --git a/package.json b/package.json
index a4748d19..25294dd8 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "@narratage/workspace",
+ "name": "@narratage/repository",
"version": "0.0.1",
"license": "SEE LICENSE IN LICENSE",
"private": true,
diff --git a/packages/artifact-store-fs/src/activation.ts b/packages/artifact-store-fs/src/activation.ts
index df3aac8d..bd42addc 100644
--- a/packages/artifact-store-fs/src/activation.ts
+++ b/packages/artifact-store-fs/src/activation.ts
@@ -29,7 +29,6 @@ const fileArtifactStoreAdapter = createRuntimeServiceAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/artifact-store-fs",
hostFacets: [fileArtifactStoreAdapter],
};
diff --git a/packages/artifact-store-fs/src/store.ts b/packages/artifact-store-fs/src/store.ts
index 19fc950d..9a759b3a 100644
--- a/packages/artifact-store-fs/src/store.ts
+++ b/packages/artifact-store-fs/src/store.ts
@@ -191,14 +191,12 @@ export function createFileArtifactStorePackage(
): RuntimeServicePackage {
const instance = options.instance ?? "artifacts.fs";
return defineRuntimeServicePackage({
- name: instance,
module: fileArtifactStoreModuleRef,
services: [{
role: "artifact-store",
facet: "artifact-store",
instance,
implementation: {
- locator: "@narratage/artifact-store-fs/artifact-store",
digest: fileArtifactStoreImplementationDigest,
},
configuration: { root: resolve(options.root) },
diff --git a/packages/artifact-store-s3/src/activation.ts b/packages/artifact-store-s3/src/activation.ts
index b8f39399..05f9eb3c 100644
--- a/packages/artifact-store-s3/src/activation.ts
+++ b/packages/artifact-store-s3/src/activation.ts
@@ -98,7 +98,6 @@ const s3ArtifactStoreRuntimeAdapter = createRuntimeServiceAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/artifact-store-s3",
hostFacets: [s3ArtifactStoreRuntimeAdapter],
};
diff --git a/packages/artifact-store-s3/src/store.ts b/packages/artifact-store-s3/src/store.ts
index bbae44b5..c0fa6726 100644
--- a/packages/artifact-store-s3/src/store.ts
+++ b/packages/artifact-store-s3/src/store.ts
@@ -402,14 +402,12 @@ export function createS3ArtifactStorePackage(
...(options.forcePathStyle === undefined ? {} : { forcePathStyle: options.forcePathStyle }),
});
return defineRuntimeServicePackage({
- name: instance,
module: s3ArtifactStoreModuleRef,
services: [{
role: "artifact-store",
facet: "artifact-store",
instance,
implementation: {
- locator: "@narratage/artifact-store-s3/artifact-store",
digest: s3ArtifactStoreImplementationDigest,
},
configuration,
diff --git a/packages/artifact/src/activation.ts b/packages/artifact/src/activation.ts
index d887c8ce..9cc28ba7 100644
--- a/packages/artifact/src/activation.ts
+++ b/packages/artifact/src/activation.ts
@@ -2,7 +2,6 @@ import { artifactManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/artifact",
modules: [{ manifest: artifactManifest }],
};
diff --git a/packages/artifact/src/index.ts b/packages/artifact/src/index.ts
index b9fe1c51..f92ead67 100644
--- a/packages/artifact/src/index.ts
+++ b/packages/artifact/src/index.ts
@@ -21,7 +21,6 @@ export const artifactManifest: ModuleManifest = {
dependencies: [],
types: [{ name: artifactTypes.blob.name, schema: blobArtifactValueSchema }],
capabilities: [],
- surfaces: [],
producers: [],
};
diff --git a/packages/audio-track/src/activation.ts b/packages/audio-track/src/activation.ts
index a6171b47..3a0866b8 100644
--- a/packages/audio-track/src/activation.ts
+++ b/packages/audio-track/src/activation.ts
@@ -3,20 +3,17 @@ import {
audioTrackComponent,
audioTrackManifest,
audioTrackModuleRef,
- audioTrackSurfaceImplementationDigest,
decodeAudioTrackSurface,
+ audioTrackMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/audio-track",
- modules: [{ manifest: audioTrackManifest, specifiers: [audioTrackModuleRef.name, `${audioTrackModuleRef.name}@1`] }],
+ modules: [{ manifest: audioTrackManifest }],
components: [audioTrackComponent],
hostFacets: [createMarkupSurfaceHostFacet({
module: audioTrackModuleRef,
- surface: "track",
- mode: "structured",
- implementationDigest: audioTrackSurfaceImplementationDigest,
+ declaration: audioTrackMarkupSurfaces.find((item) => item.name === "track")!,
handler: decodeAudioTrackSurface,
})],
};
diff --git a/packages/audio-track/src/component.ts b/packages/audio-track/src/component.ts
index b1f52da2..b7b8b121 100644
--- a/packages/audio-track/src/component.ts
+++ b/packages/audio-track/src/component.ts
@@ -29,7 +29,6 @@ const output = (value: unknown) => ({ kind: "inline" as const, value: canonicali
const base = (inputs: Parameters<typeof appendProgramAudioItem>) => output(appendProgramAudioItem(...inputs));
export const audioTrackComponent = {
- name: "@narratage/audio-track",
producers: [
{ producer: audioTrackProducers.createSet, implementationDigest: audioTrackImplementationDigests.createSet, handler: () => ({ outputs: { set: output(createAudioTrackSet()) }, needs: {} }) },
{ producer: audioTrackProducers.appendProgram, implementationDigest: audioTrackImplementationDigests.appendProgram, handler: ({ inputs }) => ({ outputs: { set: base([
diff --git a/packages/audio-track/src/fragment.ts b/packages/audio-track/src/fragment.ts
index 6cd7d3cd..f5626738 100644
--- a/packages/audio-track/src/fragment.ts
+++ b/packages/audio-track/src/fragment.ts
@@ -16,7 +16,7 @@ export type AudioTrackFragmentItem =
const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
-export function createAudioTrackFragment(items: readonly AudioTrackFragmentItem[], name: string) {
+export function createAudioTrackFragment(items: readonly AudioTrackFragmentItem[]) {
if (items.length === 0) throw new Error("Audio Track Fragment requires at least one Item.");
const inputTypes = new Map<string, (typeof audioTrackTypes.clipSpec | typeof mediaTypes.synchronized | typeof semanticMapTypes.complete | typeof narrativeTypes.selection | typeof narrativeTypes.moment)>();
const operations: FragmentOperation[] = [
@@ -55,7 +55,6 @@ export function createAudioTrackFragment(items: readonly AudioTrackFragmentItem[
{ id: "audio:track", producer: audioTrackProducers.render, inputs: { space: input("space"), program: operation("audio:program") }, result: { kind: "output", name: "track" } },
);
return sealGraphFragment({
- name,
inputs: [
{ name: "header", type: audioTrackTypes.header },
{ name: "space", type: programSpaceTypes.programSpace },
@@ -71,4 +70,4 @@ export function createAudioTrackFragment(items: readonly AudioTrackFragmentItem[
export const programAudioTrackFragment = createAudioTrackFragment([
{ kind: "program", mediaName: "media", specName: "spec" },
-], "@narratage/audio-track/one-program-item@1");
+]);
diff --git a/packages/audio-track/src/index.ts b/packages/audio-track/src/index.ts
index 6de66c55..93f19085 100644
--- a/packages/audio-track/src/index.ts
+++ b/packages/audio-track/src/index.ts
@@ -6,6 +6,7 @@ export {
audioTrackDependency,
audioTrackHeaderSchema,
audioTrackManifest,
+ audioTrackMarkupSurfaces,
audioTrackManifestDigest,
audioTrackModuleRef,
audioTrackProducers,
diff --git a/packages/audio-track/src/manifest.ts b/packages/audio-track/src/manifest.ts
index a5ed2c90..bb7ca3a2 100644
--- a/packages/audio-track/src/manifest.ts
+++ b/packages/audio-track/src/manifest.ts
@@ -1,8 +1,8 @@
import { compositionDependency, compositionTypes } from "@narratage/composition";
-import { mediaArtifactSchema, mediaDependency, mediaTypes } from "@narratage/media";
+import { mediaDependency, mediaTypes } from "@narratage/media";
import { narrativeDependency, narrativeTypes } from "@narratage/narrative";
import { programSpaceDependency, programSpaceTypes } from "@narratage/program-space";
-import { digestOf } from "@narratage/protocol";
+import { blobRefObjectSchema, digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
import { temporalDependency } from "@narratage/temporal";
@@ -64,8 +64,8 @@ const clipSpec = object({
const frameSpan = object({ startFrame: { schema: integer }, endFrameExclusive: { schema: integer } });
const resolvedOccupancy = occupancy;
const item = object({
- id: { schema: string }, sourceOccurrenceId: { schema: string }, window: { schema: frameSpan },
- source: { schema: object({ artifact: { schema: mediaArtifactSchema }, sampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } } }) },
+ id: { schema: string }, window: { schema: frameSpan },
+ source: { schema: object({ artifact: { schema: blobRefObjectSchema(["audio/wav"]) }, sampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } } }) },
trim: { schema: object({ startSample: { schema: integer }, endSampleExclusive: { schema: { kind: "number", integer: true, minimum: 1 } } }) },
occupancy: { schema: resolvedOccupancy },
mix: { schema: object({ gain: { schema: number }, fadeInSamples: { schema: integer }, fadeOutSamples: { schema: integer } }) },
@@ -84,9 +84,8 @@ export const audioTrackProgramSchema: ValueSchema = object({
export const audioTrackSurfaceImplementationDigest = digestOf("@narratage/audio-track/track-surface@1");
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({
- abi: "svml.type-validator@1" as const,
- implementation: { kind: "registered" as const, locator, digest },
+const validator = (digest: ReturnType<typeof digestOf>) => ({
+ implementation: { digest },
});
const baseInputs = [
{ name: "set", type: audioTrackTypes.set }, { name: "header", type: audioTrackTypes.header },
@@ -94,6 +93,15 @@ const baseInputs = [
{ name: "spec", type: audioTrackTypes.clipSpec },
] as const;
+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",
name: audioTrackModuleRef.name,
@@ -103,25 +111,16 @@ export const audioTrackManifest: ModuleManifest = {
{ 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("@narratage/audio-track/validate-program", audioTrackValidatorDigests.program) },
+ { name: audioTrackTypes.program.name, schema: audioTrackProgramSchema, validator: validator(audioTrackValidatorDigests.program) },
],
capabilities: [],
- surfaces: [{
- name: "track", tag: "Track", mode: "structured",
- outputs: [audioTrackTypes.header, audioTrackTypes.clipSpec, audioTrackTypes.program, compositionTypes.audioTrack],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/audio-track/track-surface",
- digest: audioTrackSurfaceImplementationDigest,
- },
- }],
producers: [
- { name: audioTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [], implementation: { kind: "registered", locator: "@narratage/audio-track/create-set", digest: audioTrackImplementationDigests.createSet } },
- { name: audioTrackProducers.appendProgram.name, inputs: [...baseInputs], outputs: [{ name: "set", type: audioTrackTypes.set }], needs: [], implementation: { kind: "registered", locator: "@narratage/audio-track/append-program", 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: { kind: "registered", locator: "@narratage/audio-track/append-selection", 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: { kind: "registered", locator: "@narratage/audio-track/append-moment", 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: { kind: "registered", locator: "@narratage/audio-track/finalize", 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: { kind: "registered", locator: "@narratage/audio-track/render", digest: audioTrackImplementationDigests.render } },
+ { 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 } },
],
};
export const audioTrackManifestDigest = digestOf(audioTrackManifest);
diff --git a/packages/audio-track/src/program.ts b/packages/audio-track/src/program.ts
index 0b914d0a..55ec2db1 100644
--- a/packages/audio-track/src/program.ts
+++ b/packages/audio-track/src/program.ts
@@ -141,7 +141,6 @@ function realizedItems(
const fadeOutSamples = temporalDurationInSamples(spec.mix.fadeOut, space);
const additions = occurrences.map((occurrence) => ({
id: occurrence.id,
- sourceOccurrenceId: occurrence.sourceOccurrenceId,
window: { ...occurrence.span },
source: structuredClone(source),
trim: { startSample: trimStart, endSampleExclusive: trimEnd },
@@ -229,7 +228,6 @@ export function assertAudioTrackProgram(value: AudioTrackProgram): void {
assertIdentity(item.id, "AudioItemProgram.id");
assert(!ids.has(item.id), `AudioTrackProgram contains duplicate Item ${item.id}.`);
ids.add(item.id);
- assert(item.sourceOccurrenceId.length > 0, `Audio Item ${item.id} has no occurrence identity.`);
assert(Number.isSafeInteger(item.window.startFrame) && item.window.startFrame >= 0
&& Number.isSafeInteger(item.window.endFrameExclusive)
&& item.window.endFrameExclusive > item.window.startFrame, `Audio Item ${item.id} window is invalid.`);
diff --git a/packages/audio-track/src/surface.ts b/packages/audio-track/src/surface.ts
index 0ac8df8a..09705647 100644
--- a/packages/audio-track/src/surface.ts
+++ b/packages/audio-track/src/surface.ts
@@ -254,7 +254,7 @@ export const decodeAudioTrackSurface: StructuredSurfaceHandler = ({ element, res
}
}
if (fragmentItems.length === 0) throw new Error(`${element.name} requires at least one Clip.`);
- const fragment = createAudioTrackFragment(fragmentItems, `@narratage/audio-track/surface/${id}@1`);
+ const fragment = createAudioTrackFragment(fragmentItems);
return {
records,
components: [{
diff --git a/packages/audio-track/src/types.ts b/packages/audio-track/src/types.ts
index ebfa18bb..adb5e5f8 100644
--- a/packages/audio-track/src/types.ts
+++ b/packages/audio-track/src/types.ts
@@ -1,4 +1,4 @@
-import type { AudioTrack, FrameSpan } from "@narratage/composition";
+import type { FrameSpan } from "@narratage/composition";
import type { BlobRef } from "@narratage/protocol";
import type {
OccurrenceExpansion,
@@ -39,7 +39,6 @@ export type AudioTrackHeader = {
export type AudioItemProgram = {
readonly id: string;
- readonly sourceOccurrenceId: string;
readonly window: FrameSpan;
readonly source: {
readonly artifact: BlobRef;
@@ -67,8 +66,3 @@ export type AudioTrackSet = {
readonly contract: "svml.audio-track-set@1";
readonly items: readonly AudioItemProgram[];
};
-
-export type AudioTrackProduct = {
- readonly contract: "svml.audio-track-product@1";
- readonly track: AudioTrack;
-};
diff --git a/packages/audio-track/test/audio-track.test.ts b/packages/audio-track/test/audio-track.test.ts
index 7619cbcb..0196f036 100644
--- a/packages/audio-track/test/audio-track.test.ts
+++ b/packages/audio-track/test/audio-track.test.ts
@@ -3,9 +3,9 @@ import test from "node:test";
import {
audioTrackManifest,
+ audioTrackMarkupSurfaces,
audioTrackModuleRef,
audioTrackProducers,
- audioTrackSurfaceImplementationDigest,
appendMomentAudioItem,
appendProgramAudioItem,
appendSelectionAudioItem,
@@ -153,10 +153,10 @@ const map: CompleteSemanticMap = {
contract: "svml.complete-semantic-map@1",
tokens: [],
anchors: [
- { identity: "a", timeSec: 1, frame: 30 },
- { identity: "b", timeSec: 2, frame: 60 },
- { identity: "c", timeSec: 3, frame: 90 },
- { identity: "d", timeSec: 4, frame: 120 },
+ { identity: "a", frame: 30 },
+ { identity: "b", frame: 60 },
+ { identity: "c", frame: 90 },
+ { identity: "d", frame: 120 },
],
};
@@ -225,7 +225,7 @@ test("dynamic Fragment keeps every material and temporal dependency as an explic
{ kind: "program", mediaName: "music", specName: "music-spec" },
{ kind: "selection", mediaName: "voice", specName: "voice-spec", mapName: "map", sourceName: "selection" },
{ kind: "moment", mediaName: "impact", specName: "impact-spec", mapName: "map", sourceName: "moment" },
- ], "example.audio@1");
+ ]);
assert.deepEqual(fragment.inputs.map((input) => input.name), [
"header", "impact", "impact-spec", "map", "moment", "music", "music-spec", "selection", "space", "voice", "voice-spec",
]);
@@ -235,6 +235,11 @@ test("dynamic Fragment keeps every material and temporal dependency as an explic
test("the self-described Audio Surface parses into the same finite Producer graph", async () => {
const fixtureModule = { name: "example.audio-inputs", version: "1" } as const;
const fixtureSurfaceDigest = digestOf("example.audio-inputs/surface@1");
+ 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",
name: fixtureModule.name,
@@ -242,17 +247,6 @@ test("the self-described Audio Surface parses into the same finite Producer grap
dependencies: [mediaDependency, programSpaceDependency],
types: [],
capabilities: [],
- surfaces: [{
- name: "inputs",
- tag: "Inputs",
- mode: "structured",
- outputs: [mediaTypes.synchronized, programSpaceTypes.programSpace],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.audio-inputs/surface",
- digest: fixtureSurfaceDigest,
- },
- }],
producers: [],
};
const closure = createResolvedClosure([
@@ -271,20 +265,19 @@ test("the self-described Audio Surface parses into the same finite Producer grap
fixtureManifest,
]);
const registry = new MarkupSurfaceRegistry();
- registry.registerStructured(fixtureModule, "inputs", fixtureSurfaceDigest, ({ element }) => ({
+ registry.registerStructured({ module: fixtureModule, declaration: fixtureSurface, handler: ({ element }) => ({
records: [
{ id: "source", type: mediaTypes.synchronized, value: { kind: "inline", value: media("surface", 48_000) }, range: element.range },
{ id: "space", type: programSpaceTypes.programSpace, value: { kind: "inline", value: space }, range: element.range },
],
components: [],
fragments: [],
- }));
- registry.registerStructured(
- audioTrackModuleRef,
- "track",
- audioTrackSurfaceImplementationDigest,
- decodeAudioTrackSurface,
- );
+ }) });
+ registry.registerStructured({
+ module: audioTrackModuleRef,
+ declaration: audioTrackMarkupSurfaces.find((item) => item.name === "track")!,
+ handler: decodeAudioTrackSurface,
+ });
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({
registry,
@@ -313,8 +306,8 @@ test("the self-described Audio Surface parses into the same finite Producer grap
});
const trackExport = resolveCompiledSourceExport(compiled, "sound.track", compositionTypes.audioTrack);
assert.equal(trackExport.ref.kind, "logical-output");
- const build = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const build = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [{ output: trackExport.ref.kind === "logical-output" ? trackExport.ref.id : "" }],
}));
assert.deepEqual(build.plan.steps.map((step) => step.producer.name).sort(), [
diff --git a/packages/background-removal/src/activation.ts b/packages/background-removal/src/activation.ts
index f1da53ef..80ef08f9 100644
--- a/packages/background-removal/src/activation.ts
+++ b/packages/background-removal/src/activation.ts
@@ -1,18 +1,18 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
- backgroundRemovalComponent, backgroundRemovalImplementationDigests, backgroundRemovalManifest,
+ backgroundRemovalComponent, backgroundRemovalManifest,
backgroundRemovalModuleRef, decodeBackgroundRemovalSurface,
+ backgroundRemovalMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/background-removal",
- modules: [{ manifest: backgroundRemovalManifest, specifiers: ["@narratage/background-removal", "@narratage/background-removal@1"] }],
+ modules: [{ manifest: backgroundRemovalManifest }],
components: [backgroundRemovalComponent],
hostFacets: [{ ...createMarkupSurfaceHostFacet({
- module: backgroundRemovalModuleRef, surface: "background", mode: "structured",
- implementationDigest: backgroundRemovalImplementationDigests.surface, handler: decodeBackgroundRemovalSurface,
+ module: backgroundRemovalModuleRef,
+ declaration: backgroundRemovalMarkupSurfaces.find((item) => item.name === "background")!, handler: decodeBackgroundRemovalSurface,
}) }],
};
export default svmlPackage;
diff --git a/packages/background-removal/src/component.ts b/packages/background-removal/src/component.ts
index 69f3dc44..a8aa1bfd 100644
--- a/packages/background-removal/src/component.ts
+++ b/packages/background-removal/src/component.ts
@@ -10,7 +10,6 @@ function blob(value: StoredValue | undefined) {
}
export const backgroundRemovalComponent = {
- name: "@narratage/background-removal",
producers: [{
producer: backgroundRemovalProducers.request,
implementationDigest: backgroundRemovalImplementationDigests.request,
@@ -18,5 +17,4 @@ export const backgroundRemovalComponent = {
outputs: {}, needs: { image: { constraints: backgroundRemovalRequest(blob(inputs.source?.value)) as never } },
}),
}],
- validators: [],
} satisfies ComponentPackage;
diff --git a/packages/background-removal/src/fragment.ts b/packages/background-removal/src/fragment.ts
index 6d9b56e1..0f6883b3 100644
--- a/packages/background-removal/src/fragment.ts
+++ b/packages/background-removal/src/fragment.ts
@@ -7,7 +7,6 @@ const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
export const backgroundRemovalFragment = sealGraphFragment({
- name: "@narratage/background-removal/remove@1",
inputs: [{ name: "source", type: artifactTypes.blob }],
operations: [{
id: "image:remove-background", producer: backgroundRemovalProducers.request,
diff --git a/packages/background-removal/src/index.ts b/packages/background-removal/src/index.ts
index 8892f4e9..1c8dd073 100644
--- a/packages/background-removal/src/index.ts
+++ b/packages/background-removal/src/index.ts
@@ -2,7 +2,7 @@ export { backgroundRemovalComponent } from "./component.js";
export { backgroundRemovalFragment } from "./fragment.js";
export {
backgroundRemovalCapabilities, backgroundRemovalDependency, backgroundRemovalImplementationDigests,
- backgroundRemovalManifest, backgroundRemovalManifestDigest, backgroundRemovalModuleRef, backgroundRemovalProducers,
+ backgroundRemovalManifest, backgroundRemovalMarkupSurfaces, backgroundRemovalManifestDigest, backgroundRemovalModuleRef, backgroundRemovalProducers,
} from "./manifest.js";
export { assertBackgroundRemovalRequest, backgroundRemovalRequest } from "./program.js";
export { decodeBackgroundRemovalSurface } from "./surface.js";
diff --git a/packages/background-removal/src/manifest.ts b/packages/background-removal/src/manifest.ts
index 073b8717..96ed2f08 100644
--- a/packages/background-removal/src/manifest.ts
+++ b/packages/background-removal/src/manifest.ts
@@ -14,6 +14,12 @@ export const backgroundRemovalImplementationDigests = {
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,
dependencies: [artifactDependency], types: [],
@@ -22,11 +28,7 @@ export const backgroundRemovalManifest: ModuleManifest = {
name: backgroundRemovalProducers.request.name,
inputs: [{ name: "source", type: artifactTypes.blob }], outputs: [],
needs: [{ name: "image", capability: backgroundRemovalCapabilities.remove, returns: artifactTypes.blob }],
- implementation: { kind: "registered", locator: "@narratage/background-removal/request", digest: backgroundRemovalImplementationDigests.request },
- }],
- surfaces: [{
- name: "background", tag: "Background", mode: "structured", outputs: [artifactTypes.blob],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/background-removal/background-surface", digest: backgroundRemovalImplementationDigests.surface },
+ implementation: { digest: backgroundRemovalImplementationDigests.request },
}],
};
export const backgroundRemovalManifestDigest = digestOf(backgroundRemovalManifest);
diff --git a/packages/caption-fine/src/activation.ts b/packages/caption-fine/src/activation.ts
index a7dfc68c..4cafcc84 100644
--- a/packages/caption-fine/src/activation.ts
+++ b/packages/caption-fine/src/activation.ts
@@ -4,33 +4,26 @@ import {
captionFineComponent,
captionFineManifest,
captionFineModuleRef,
- captionFineStyleSurfaceImplementationDigest,
- captionFineTrackSurfaceImplementationDigest,
decodeFineCaptionStyleSurface,
decodeFineCaptionTrackSurface,
+ captionFineMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/caption-fine",
modules: [{
manifest: captionFineManifest,
- specifiers: ["@narratage/caption-fine", "@narratage/caption-fine@1"],
}],
components: [captionFineComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
module: captionFineModuleRef,
- surface: "style",
- mode: "structured",
- implementationDigest: captionFineStyleSurfaceImplementationDigest,
+ declaration: captionFineMarkupSurfaces.find((item) => item.name === "style")!,
handler: decodeFineCaptionStyleSurface,
}),
createMarkupSurfaceHostFacet({
module: captionFineModuleRef,
- surface: "track",
- mode: "structured",
- implementationDigest: captionFineTrackSurfaceImplementationDigest,
+ declaration: captionFineMarkupSurfaces.find((item) => item.name === "track")!,
handler: decodeFineCaptionTrackSurface,
}),
],
diff --git a/packages/caption-fine/src/component.ts b/packages/caption-fine/src/component.ts
index d0e126e8..458ac0fd 100644
--- a/packages/caption-fine/src/component.ts
+++ b/packages/caption-fine/src/component.ts
@@ -14,7 +14,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
}
export const captionFineComponent = {
- name: "@narratage/caption-fine",
producers: [{
producer: captionFineProducers.render,
implementationDigest: renderFineCaptionImplementationDigest,
diff --git a/packages/caption-fine/src/fragment.ts b/packages/caption-fine/src/fragment.ts
index 19987457..369f1701 100644
--- a/packages/caption-fine/src/fragment.ts
+++ b/packages/caption-fine/src/fragment.ts
@@ -12,7 +12,6 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
/** One timing join plus one Style-family render operation, regardless of how many Styles are used. */
export const fineCaptionTrackFragment = sealGraphFragment({
- name: "@narratage/caption-fine/track@1",
inputs: [
{ name: "display", type: narrativeTypes.captionDisplay },
{ name: "correspondence", type: narrativeTypes.captionCorrespondence },
diff --git a/packages/caption-fine/src/index.ts b/packages/caption-fine/src/index.ts
index 24c29776..d50718e2 100644
--- a/packages/caption-fine/src/index.ts
+++ b/packages/caption-fine/src/index.ts
@@ -1,7 +1,7 @@
export { captionFineComponent } from "./component.js";
export { fineCaptionTrackFragment } from "./fragment.js";
export {
- captionFineManifest,
+ captionFineManifest, captionFineMarkupSurfaces,
captionFineModuleRef,
captionFineProducers,
captionFineStyleSurfaceImplementationDigest,
diff --git a/packages/caption-fine/src/manifest.ts b/packages/caption-fine/src/manifest.ts
index 37aaad18..c94695bf 100644
--- a/packages/caption-fine/src/manifest.ts
+++ b/packages/caption-fine/src/manifest.ts
@@ -16,6 +16,18 @@ export const captionFineProducers = {
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",
name: captionFineModuleRef.name,
@@ -30,18 +42,6 @@ export const captionFineManifest: ModuleManifest = {
],
types: [],
capabilities: [],
- surfaces: [
- {
- name: "style", tag: "Style", mode: "structured", outputs: [captionTypes.style],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/caption-fine/style-surface",
- digest: captionFineStyleSurfaceImplementationDigest },
- },
- {
- name: "track", tag: "Track", mode: "structured", outputs: [compositionTypes.visualTrack],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/caption-fine/track-surface",
- digest: captionFineTrackSurfaceImplementationDigest },
- },
- ],
producers: [{
name: captionFineProducers.render.name,
inputs: [
@@ -52,7 +52,6 @@ export const captionFineManifest: ModuleManifest = {
],
outputs: [{ name: "track", type: compositionTypes.visualTrack }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/caption-fine/render",
- digest: renderFineCaptionImplementationDigest },
+ implementation: { digest: renderFineCaptionImplementationDigest },
}],
};
diff --git a/packages/caption-fine/src/render.ts b/packages/caption-fine/src/render.ts
index 4be7cea4..596ea66f 100644
--- a/packages/caption-fine/src/render.ts
+++ b/packages/caption-fine/src/render.ts
@@ -26,10 +26,6 @@ import type {
export const renderFineCaptionImplementationDigest = digestOf("@narratage/caption-fine/full-orthogonal-renderer-with-mute@1");
-function frameAt(space: ProgramSpace, seconds: number): number {
- return Math.round(seconds * space.frameRate.numerator / space.frameRate.denominator);
-}
-
function clamp(value: number, minimum: number, maximum: number): number {
return Math.max(minimum, Math.min(maximum, value));
}
@@ -748,14 +744,14 @@ export function renderFineCaption(
if (style === undefined) throw new Error(`Fine Caption Cue ${cue.id} references unknown Style ${cue.styleId}`);
const parameters = style.rendering.parameters as unknown as FineCaptionParameters;
if (cue.fields.length > 0) throw new Error(`Fine Caption Cue ${cue.id} contains unsupported fields`);
- const startFrame = Math.max(0, frameAt(space, cue.startSec));
- const measuredEnd = Math.min(totalFrames, frameAt(space, cue.endSec));
+ const startFrame = Math.max(0, cue.startFrame);
+ const measuredEnd = Math.min(totalFrames, cue.endFrameExclusive);
const endFrameExclusive = Math.min(totalFrames, Math.max(startFrame + 1, measuredEnd));
if (startFrame >= totalFrames || endFrameExclusive <= startFrame) return [];
const durationFrames = endFrameExclusive - startFrame;
const atomFrames = new Map(cue.atoms.map((atom) => [atom.atomId, {
- start: clamp(frameAt(space, atom.startSec) - startFrame, 0, durationFrames),
- end: clamp(Math.max(frameAt(space, atom.endSec) - startFrame, frameAt(space, atom.startSec) - startFrame + 1), 0, durationFrames),
+ start: clamp(atom.startFrame - startFrame, 0, durationFrames),
+ end: clamp(Math.max(atom.endFrameExclusive - startFrame, atom.startFrame - startFrame + 1), 0, durationFrames),
}]));
return [{
id: cue.id,
diff --git a/packages/caption-fine/test/caption-fine.test.ts b/packages/caption-fine/test/caption-fine.test.ts
index dcf3c970..9b535e61 100644
--- a/packages/caption-fine/test/caption-fine.test.ts
+++ b/packages/caption-fine/test/caption-fine.test.ts
@@ -47,12 +47,10 @@ test("one Fine renderer handles uniform Cue appearance as one peer VisualTrack",
displaySequenceId: display.id,
cues: [{
id: "cue:1",
- runId: program.runs[0]!.id,
styleId: style.id,
- segmentId: "line",
- startSec: 0,
- endSec: 2,
- atoms: display.atoms.map((atom) => ({ atomId: atom.id, startSec: 0, endSec: 2 })),
+ startFrame: 0,
+ endFrameExclusive: 60,
+ atoms: display.atoms.map((atom) => ({ atomId: atom.id, startFrame: 0, endFrameExclusive: 60 })),
fields: [],
}],
};
@@ -94,15 +92,13 @@ test("Fine applies Caption Mute after planning without regrouping Cues", () => {
displaySequenceId: display.id,
cues: [{
id: "cue:1",
- runId: program.runs[0]!.id,
styleId: style.id,
- segmentId: "line",
- startSec: 0,
- endSec: 2,
+ startFrame: 0,
+ endFrameExclusive: 60,
atoms: display.atoms.map((atom, index) => ({
atomId: atom.id,
- startSec: index * 0.4,
- endSec: index * 0.4 + 0.3,
+ startFrame: index * 12,
+ endFrameExclusive: index * 12 + 9,
})),
fields: [],
}],
@@ -140,12 +136,10 @@ test("Fine emits no Present for a fully muted Cue", () => {
displaySequenceId: display.id,
cues: [{
id: "cue:1",
- runId: program.runs[0]!.id,
styleId: style.id,
- segmentId: "line",
- startSec: 0,
- endSec: 1,
- atoms: display.atoms.map((atom) => ({ atomId: atom.id, startSec: 0, endSec: 1 })),
+ startFrame: 0,
+ endFrameExclusive: 30,
+ atoms: display.atoms.map((atom) => ({ atomId: atom.id, startFrame: 0, endFrameExclusive: 30 })),
fields: [],
}],
};
@@ -298,12 +292,10 @@ test("karaoke uses one active overlay per whole Atom and never invents Dual Text
displaySequenceId: display.id,
cues: [{
id: "cue:karaoke",
- runId: program.runs[0]!.id,
styleId: style.id,
- segmentId: "line",
- startSec: 0,
- endSec: 3,
- atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ startFrame: 0,
+ endFrameExclusive: 90,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startFrame: index * 30, endFrameExclusive: (index + 1) * 30 })),
fields: [],
}],
};
@@ -352,9 +344,9 @@ test("an exact Font is explicit Style input and reaches every base and active gl
contract: "svml.timed-caption-projection@1",
displaySequenceId: display.id,
cues: [{
- id: "cue:font", runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
- startSec: 0, endSec: 1,
- atoms: display.atoms.map((atom) => ({ atomId: atom.id, startSec: 0, endSec: 1 })),
+ id: "cue:font", styleId: style.id,
+ startFrame: 0, endFrameExclusive: 30,
+ atoms: display.atoms.map((atom) => ({ atomId: atom.id, startFrame: 0, endFrameExclusive: 30 })),
fields: [],
}],
};
@@ -402,12 +394,10 @@ test("current/trail by step/wipe have four distinct frame-exact Atom histories",
displaySequenceId: display.id,
cues: [{
id: "cue:modes",
- runId: program.runs[0]!.id,
styleId: style.id,
- segmentId: "line",
- startSec: 0,
- endSec: 2,
- atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ startFrame: 0,
+ endFrameExclusive: 20,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startFrame: index * 10, endFrameExclusive: (index + 1) * 10 })),
fields: [],
}],
};
@@ -462,9 +452,9 @@ test("full Fine Paint and layered motion lower to terminal Visual IR without cha
contract: "svml.timed-caption-projection@1",
displaySequenceId: display.id,
cues: [{
- id: "cue:full", runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
- startSec: 0, endSec: 4,
- atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ id: "cue:full", styleId: style.id,
+ startFrame: 0, endFrameExclusive: 40,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startFrame: index * 10, endFrameExclusive: (index + 1) * 10 })),
fields: [],
}],
};
@@ -515,9 +505,9 @@ test("glyph, underline and Pill activation are independent channels", () => {
const projection: TimedCaptionProjection = {
contract: "svml.timed-caption-projection@1", displaySequenceId: display.id,
cues: [{
- id: "cue:channels", runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
- startSec: 0, endSec: 3,
- atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ id: "cue:channels", styleId: style.id,
+ startFrame: 0, endFrameExclusive: 30,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startFrame: index * 10, endFrameExclusive: (index + 1) * 10 })),
fields: [],
}],
};
@@ -547,9 +537,9 @@ test("every declared one-shot and loop motion lowers through the same wrapper vo
const projection: TimedCaptionProjection = {
contract: "svml.timed-caption-projection@1", displaySequenceId: display.id,
cues: [{
- id: `cue:${id}`, runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
- startSec: 0, endSec: 3,
- atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ id: `cue:${id}`, styleId: style.id,
+ startFrame: 0, endFrameExclusive: 30,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startFrame: index * 10, endFrameExclusive: (index + 1) * 10 })),
fields: [],
}],
};
diff --git a/packages/caption-gemini/src/activation.ts b/packages/caption-gemini/src/activation.ts
index c1cc8315..1642150e 100644
--- a/packages/caption-gemini/src/activation.ts
+++ b/packages/caption-gemini/src/activation.ts
@@ -1,17 +1,17 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
- captionGeminiComponent, captionGeminiImplementationDigests, captionGeminiManifest,
+ captionGeminiComponent, captionGeminiManifest,
captionGeminiModuleRef, decodeCaptionGeminiPlannerSurface,
+ captionGeminiMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/caption-gemini",
- modules: [{ manifest: captionGeminiManifest, specifiers: ["@narratage/caption-gemini", "@narratage/caption-gemini@1"] }],
+ modules: [{ manifest: captionGeminiManifest }],
components: [captionGeminiComponent],
hostFacets: [createMarkupSurfaceHostFacet({
- module: captionGeminiModuleRef, surface: "planner", mode: "structured",
- implementationDigest: captionGeminiImplementationDigests.plannerSurface,
+ module: captionGeminiModuleRef,
+ declaration: captionGeminiMarkupSurfaces.find((item) => item.name === "planner")!,
handler: decodeCaptionGeminiPlannerSurface,
})],
};
diff --git a/packages/caption-gemini/src/component.ts b/packages/caption-gemini/src/component.ts
index c1204f18..a6ae456c 100644
--- a/packages/caption-gemini/src/component.ts
+++ b/packages/caption-gemini/src/component.ts
@@ -15,7 +15,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
}
export const captionGeminiComponent = {
- name: "@narratage/caption-gemini",
producers: [
{
producer: captionGeminiProducers.compile,
diff --git a/packages/caption-gemini/src/fragment.ts b/packages/caption-gemini/src/fragment.ts
index e601165d..dbd29031 100644
--- a/packages/caption-gemini/src/fragment.ts
+++ b/packages/caption-gemini/src/fragment.ts
@@ -8,7 +8,6 @@ const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
export const captionGeminiPlanningFragment = sealGraphFragment({
- name: "@narratage/caption-gemini/planning@1",
inputs: [
{ name: "display", type: narrativeTypes.captionDisplay },
{ name: "captionProgram", type: captionTypes.program },
diff --git a/packages/caption-gemini/src/index.ts b/packages/caption-gemini/src/index.ts
index 1901561a..87136ffa 100644
--- a/packages/caption-gemini/src/index.ts
+++ b/packages/caption-gemini/src/index.ts
@@ -3,7 +3,7 @@ export { captionGeminiPlanningFragment } from "./fragment.js";
export {
captionGeminiCapabilities,
captionGeminiImplementationDigests,
- captionGeminiManifest,
+ captionGeminiManifest, captionGeminiMarkupSurfaces,
captionGeminiManifestDigest,
captionGeminiModuleRef,
captionGeminiProducers,
diff --git a/packages/caption-gemini/src/manifest.ts b/packages/caption-gemini/src/manifest.ts
index 4029589a..9512b8db 100644
--- a/packages/caption-gemini/src/manifest.ts
+++ b/packages/caption-gemini/src/manifest.ts
@@ -75,12 +75,22 @@ function ownedType(name: string, schema: ValueSchema, digestValue: ReturnType<ty
name,
schema,
validator: {
- abi: "svml.type-validator@1" as const,
- implementation: { kind: "registered" as const, locator: `@narratage/caption-gemini/validate-${name}`, digest: digestValue },
+ 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",
name: captionGeminiModuleRef.name,
@@ -94,17 +104,6 @@ export const captionGeminiManifest: ModuleManifest = {
ownedType(captionGeminiTypes.request.name, captionGeminiRequestSchema, captionGeminiImplementationDigests.requestValidator),
],
capabilities: [{ name: captionGeminiCapabilities.plan.name, returns: captionTypes.plan }],
- surfaces: [{
- name: "planner",
- tag: "Planner",
- mode: "structured",
- outputs: [captionGeminiTypes.program, captionTypes.plan],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/caption-gemini/planner-surface",
- digest: captionGeminiImplementationDigests.plannerSurface,
- },
- }],
producers: [
{
name: captionGeminiProducers.compile.name,
@@ -116,7 +115,7 @@ export const captionGeminiManifest: ModuleManifest = {
outputs: [{ name: "request", type: captionGeminiTypes.request }],
needs: [],
implementation: {
- kind: "registered", locator: "@narratage/caption-gemini/compile-request", digest: captionGeminiImplementationDigests.compile,
+ digest: captionGeminiImplementationDigests.compile,
},
},
{
@@ -125,7 +124,7 @@ export const captionGeminiManifest: ModuleManifest = {
outputs: [],
needs: [{ name: "plan", capability: captionGeminiCapabilities.plan, returns: captionTypes.plan }],
implementation: {
- kind: "registered", locator: "@narratage/caption-gemini/request-plan", digest: captionGeminiImplementationDigests.request,
+ digest: captionGeminiImplementationDigests.request,
},
},
],
diff --git a/packages/caption/src/activation.ts b/packages/caption/src/activation.ts
index 125ce697..38ded202 100644
--- a/packages/caption/src/activation.ts
+++ b/packages/caption/src/activation.ts
@@ -1,16 +1,17 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
captionComponent, captionManifest, captionModuleRef,
- captionProgramSurfaceImplementationDigest, decodeCaptionProgramSurface,
+ decodeCaptionProgramSurface,
+ captionMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/caption",
- modules: [{ manifest: captionManifest, specifiers: ["@narratage/caption", "@narratage/caption@1"] }],
+ modules: [{ manifest: captionManifest }],
components: [captionComponent],
hostFacets: [
- createMarkupSurfaceHostFacet({ module: captionModuleRef, surface: "program", mode: "structured", implementationDigest: captionProgramSurfaceImplementationDigest, handler: decodeCaptionProgramSurface }),
+ createMarkupSurfaceHostFacet({ module: captionModuleRef,
+ declaration: captionMarkupSurfaces.find((item) => item.name === "program")!, handler: decodeCaptionProgramSurface }),
],
};
export default svmlPackage;
diff --git a/packages/caption/src/component.ts b/packages/caption/src/component.ts
index f0c621eb..06282d53 100644
--- a/packages/caption/src/component.ts
+++ b/packages/caption/src/component.ts
@@ -28,7 +28,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
/** Deterministic timing joins only; cue generation, Style meaning and visual lowering stay outside. */
export const captionComponent = {
- name: "@narratage/caption",
producers: [
{
producer: captionProducers.temporalizePlan,
diff --git a/packages/caption/src/display.ts b/packages/caption/src/display.ts
index 35d920d4..679a5711 100644
--- a/packages/caption/src/display.ts
+++ b/packages/caption/src/display.ts
@@ -15,8 +15,8 @@ export function assertCaptionDisplaySequence(value: CaptionDisplaySequence): voi
assert(value.atoms.length > 0 && value.words.length > 0,
"CaptionDisplaySequence is empty");
const words = new Map<string, CaptionDisplayWord>();
- value.words.forEach((word, index) => {
- assert(word.id.length > 0 && !words.has(word.id) && word.index === index,
+ value.words.forEach((word) => {
+ assert(word.id.length > 0 && !words.has(word.id),
"Caption display-word identity is invalid or repeated");
assert(word.atomId.length > 0 && word.segmentId.length > 0 && word.turnId.length > 0 && word.text.length > 0,
`Caption display word ${word.id} context is invalid`);
@@ -24,8 +24,8 @@ export function assertCaptionDisplaySequence(value: CaptionDisplaySequence): voi
});
const planned: string[] = [];
const atomIds = new Set<string>();
- value.atoms.forEach((atom, index) => {
- assert(atom.id.length > 0 && !atomIds.has(atom.id) && atom.index === index,
+ value.atoms.forEach((atom) => {
+ assert(atom.id.length > 0 && !atomIds.has(atom.id),
"Caption Atom identity is invalid or repeated");
atomIds.add(atom.id);
assert(atom.segmentId.length > 0 && atom.turnId.length > 0 && atom.wordIds.length > 0,
@@ -74,7 +74,7 @@ export function assertCaptionDisplayWordSubset(
"CaptionDisplayWordSubset identity is invalid");
assert(value.sequenceId === sequence.id,
`CaptionDisplayWordSubset ${value.id} belongs to another display sequence`);
- const positions = new Map(sequence.words.map((word) => [word.id, word.index]));
+ const positions = new Map(sequence.words.map((word, index) => [word.id, index]));
let previous = -1;
const seen = new Set<string>();
for (const id of value.wordIds) {
diff --git a/packages/caption/src/fragment.ts b/packages/caption/src/fragment.ts
index 622cbcbe..0fb95a14 100644
--- a/packages/caption/src/fragment.ts
+++ b/packages/caption/src/fragment.ts
@@ -9,7 +9,6 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
/** Cue and field facts meet only proven whole-Atom speech time here. */
export const plannedCaptionTimingFragment = sealGraphFragment({
- name: "@narratage/caption/planned-timing@1",
inputs: [
{ name: "display", type: narrativeTypes.captionDisplay },
{ name: "correspondence", type: narrativeTypes.captionCorrespondence },
diff --git a/packages/caption/src/index.ts b/packages/caption/src/index.ts
index 41573b39..cc1fa78b 100644
--- a/packages/caption/src/index.ts
+++ b/packages/caption/src/index.ts
@@ -13,7 +13,7 @@ export {
captionPlanImplementationDigest,
captionPlanSchema,
captionStyleSchema,
- captionManifest,
+ captionManifest, captionMarkupSurfaces,
captionModuleRef,
captionProducers,
captionTypes,
diff --git a/packages/caption/src/manifest.ts b/packages/caption/src/manifest.ts
index 34cd385f..4e3c73ee 100644
--- a/packages/caption/src/manifest.ts
+++ b/packages/caption/src/manifest.ts
@@ -13,12 +13,12 @@ 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-with-mute@1");
+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-timed-atoms@1"),
+ timedProjection: digestOf("@narratage/caption/validate-frame-timed-atoms@1"),
} as const;
export const captionProgramSurfaceImplementationDigest = digestOf("@narratage/caption/display-program-surface-with-mute@1");
@@ -47,11 +47,11 @@ export const captionPlanSchema: ValueSchema = object({
});
const timedCaptionAtom = object({
- atomId: { schema: string }, startSec: { schema: number }, endSec: { schema: number },
+ atomId: { schema: string }, startFrame: { schema: integer }, endFrameExclusive: { schema: integer },
});
const timedCaptionCue = object({
- id: { schema: string }, runId: { schema: string }, styleId: { schema: string }, segmentId: { schema: string },
- startSec: { schema: number }, endSec: { schema: number },
+ id: { schema: string }, styleId: { schema: string },
+ startFrame: { schema: integer }, endFrameExclusive: { schema: integer },
atoms: { schema: { kind: "array", minItems: 1, items: timedCaptionAtom } },
fields: { schema: { kind: "array", items: captionFieldAssignment } },
});
@@ -96,39 +96,39 @@ const captionProgramRun = object({
});
export const captionProgramSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.caption-program@1" } },
- id: { schema: string }, displaySequenceId: { schema: string }, defaultStyleId: { schema: string },
+ id: { schema: string }, displaySequenceId: { schema: string },
styles: { schema: { kind: "array", minItems: 1, items: captionStyleSchema } },
runs: { schema: { kind: "array", minItems: 1, items: captionProgramRun } },
mutedWordIds: { schema: { kind: "array", items: string } },
});
+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",
name: captionModuleRef.name,
version: captionModuleRef.version,
dependencies: [narrativeDependency, semanticMapDependency],
types: [
- { name: captionTypes.style.name, schema: captionStyleSchema, validator: { abi: "svml.type-validator@1", implementation: {
- kind: "registered", locator: "@narratage/caption/validate-style", digest: captionValidatorDigests.style,
+ { name: captionTypes.style.name, schema: captionStyleSchema, validator: { implementation: {
+ digest: captionValidatorDigests.style,
} } },
- { name: captionTypes.program.name, schema: captionProgramSchema, validator: { abi: "svml.type-validator@1", implementation: {
- kind: "registered", locator: "@narratage/caption/validate-program", digest: captionValidatorDigests.program,
+ { name: captionTypes.program.name, schema: captionProgramSchema, validator: { implementation: {
+ digest: captionValidatorDigests.program,
} } },
- { name: captionTypes.plan.name, schema: captionPlanSchema, validator: { abi: "svml.type-validator@1", implementation: {
- kind: "registered", locator: "@narratage/caption/validate-plan", digest: captionValidatorDigests.plan,
+ { name: captionTypes.plan.name, schema: captionPlanSchema, validator: { implementation: {
+ digest: captionValidatorDigests.plan,
} } },
{ name: captionTypes.timedProjection.name, schema: timedCaptionProjectionSchema,
- validator: { abi: "svml.type-validator@1", implementation: {
- kind: "registered", locator: "@narratage/caption/validate-timed-projection",
+ validator: { implementation: {
digest: captionValidatorDigests.timedProjection,
} } },
],
capabilities: [],
- surfaces: [{
- name: "program", tag: "Program", mode: "structured", outputs: [captionTypes.program],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/caption/program-surface",
- digest: captionProgramSurfaceImplementationDigest },
- }],
producers: [
{
name: captionProducers.temporalizePlan.name,
@@ -140,8 +140,7 @@ export const captionManifest: ModuleManifest = {
{ name: "plan", type: captionTypes.plan },
],
outputs: [{ name: "caption", type: captionTypes.timedProjection }], needs: [],
- implementation: { kind: "registered", locator: "@narratage/caption/temporalize-plan",
- digest: captionPlanImplementationDigest },
+ implementation: { digest: captionPlanImplementationDigest },
},
],
};
diff --git a/packages/caption/src/style.ts b/packages/caption/src/style.ts
index 519b6d25..24274104 100644
--- a/packages/caption/src/style.ts
+++ b/packages/caption/src/style.ts
@@ -118,7 +118,7 @@ export function assertCaptionProgram(value: CaptionProgram): void {
assert(value.displaySequenceId.length > 0 && value.runs.length > 0 && value.styles.length > 0,
"Caption Program is empty");
const styles = new Map(value.styles.map((style) => [style.id, style]));
- assert(styles.size === value.styles.length && styles.has(value.defaultStyleId), "Caption Program styles are invalid");
+ assert(styles.size === value.styles.length, "Caption Program styles are invalid");
value.styles.forEach(assertCaptionStyle);
const families = new Set(value.styles.map((style) => style.rendering.family));
assert(families.size === 1, "One Caption Program must use one Style rendering family");
@@ -128,6 +128,8 @@ export function assertCaptionProgram(value: CaptionProgram): void {
assert(new Set(planned).size === planned.length, "Caption Program runs repeat a display word");
assert(value.runs.every((run) => styles.has(run.styleId) && run.wordIds.length > 0),
"Caption Program run style is invalid");
+ assert(new Set(value.runs.map((run) => run.styleId)).size === value.styles.length,
+ "Caption Program carries an unused Style");
assert(Array.isArray(value.mutedWordIds)
&& value.mutedWordIds.every((wordId) => typeof wordId === "string" && wordId.length > 0)
&& new Set(value.mutedWordIds).size === value.mutedWordIds.length,
@@ -215,8 +217,7 @@ export function resolveCaptionProgram(
contract: "svml.caption-program@1",
id,
displaySequenceId: sequence.id,
- defaultStyleId: defaultStyle.id,
- styles: [...styles.values()],
+ styles: [...styles.values()].filter((style) => assignments.some((assignment) => assignment.styleId === style.id)),
runs: runs.map(({ turnId: _turn, segmentId: _segment, ...run }) => run),
mutedWordIds: sequence.words
.filter((word) => mutes.some((mute) => mute.words.wordIds.includes(word.id)))
diff --git a/packages/caption/src/temporalize.ts b/packages/caption/src/temporalize.ts
index 8e24c662..eb5c554a 100644
--- a/packages/caption/src/temporalize.ts
+++ b/packages/caption/src/temporalize.ts
@@ -1,5 +1,5 @@
import type { CaptionCorrespondence, CaptionDisplaySequence } from "@narratage/narrative";
-import { tokenSpanSeconds } from "@narratage/semantic-map";
+import { tokenFrameSpan } from "@narratage/semantic-map";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import { CaptionTimingError } from "./error.js";
@@ -64,25 +64,30 @@ export function temporalizeCaptionPlan(
if (atom === undefined || sourceTokenIds === undefined) {
throw new CaptionTimingError("CAPTION_ATOM", `Caption Cue ${cue.id} references unknown Atom ${atomId}.`);
}
- const window = tokenSpanSeconds(map, sourceTokenIds);
+ const window = tokenFrameSpan(map, sourceTokenIds);
if (window === undefined) {
throw new CaptionTimingError(
"CAPTION_SPEECH_COVERAGE",
`Caption Atom ${atomId} is absent from the complete speech map.`,
);
}
- return { atom, timing: { atomId, startSec: window.startSec, endSec: window.endSec } };
+ return {
+ atom,
+ timing: {
+ atomId,
+ startFrame: window.startFrame,
+ endFrameExclusive: window.endFrameExclusive,
+ },
+ };
});
if (new Set(atoms.map((item) => item.atom.segmentId)).size !== 1) {
throw new CaptionTimingError("CAPTION_PLAN_SEGMENT", `Caption Cue ${cue.id} crosses a Script Segment.`);
}
return {
id: cue.id,
- runId: run.id,
styleId: run.styleId,
- segmentId: atoms[0]!.atom.segmentId,
- startSec: atoms[0]!.timing.startSec,
- endSec: atoms.at(-1)!.timing.endSec,
+ startFrame: atoms[0]!.timing.startFrame,
+ endFrameExclusive: atoms.at(-1)!.timing.endFrameExclusive,
atoms: atoms.map((item) => item.timing),
fields: cue.fields.map((field) => ({ ...field })),
};
@@ -102,15 +107,16 @@ export function assertTimedCaptionProjection(projection: TimedCaptionProjection)
const cueIds = new Set<string>();
const atomIds = new Set<string>();
for (const cue of projection.cues) {
- if (cue.id.length === 0 || cueIds.has(cue.id) || cue.runId.length === 0 || cue.styleId.length === 0
- || cue.segmentId.length === 0 || cue.atoms.length === 0
- || !Number.isFinite(cue.startSec) || !Number.isFinite(cue.endSec) || cue.endSec < cue.startSec) {
+ if (cue.id.length === 0 || cueIds.has(cue.id) || cue.styleId.length === 0 || cue.atoms.length === 0
+ || !Number.isSafeInteger(cue.startFrame) || !Number.isSafeInteger(cue.endFrameExclusive)
+ || cue.startFrame < 0 || cue.endFrameExclusive <= cue.startFrame) {
throw new Error("TimedCaptionProjection contains an invalid Cue");
}
cueIds.add(cue.id);
for (const atom of cue.atoms) {
if (atom.atomId.length === 0 || atomIds.has(atom.atomId)
- || !Number.isFinite(atom.startSec) || !Number.isFinite(atom.endSec) || atom.endSec < atom.startSec) {
+ || !Number.isSafeInteger(atom.startFrame) || !Number.isSafeInteger(atom.endFrameExclusive)
+ || atom.startFrame < 0 || atom.endFrameExclusive <= atom.startFrame) {
throw new Error("TimedCaptionProjection contains an invalid or repeated Atom timing");
}
atomIds.add(atom.atomId);
diff --git a/packages/caption/src/types.ts b/packages/caption/src/types.ts
index b417286c..81858616 100644
--- a/packages/caption/src/types.ts
+++ b/packages/caption/src/types.ts
@@ -70,7 +70,6 @@ export type CaptionProgram = {
readonly contract: "svml.caption-program@1";
readonly id: string;
readonly displaySequenceId: string;
- readonly defaultStyleId: string;
readonly styles: readonly CaptionStyleIntent[];
readonly runs: readonly CaptionProgramRun[];
/** Ordered display-word ids hidden by the renderer. They remain present in CaptionPlan. */
@@ -79,16 +78,14 @@ export type CaptionProgram = {
export type TimedCaptionCue = {
readonly id: string;
- readonly runId: string;
readonly styleId: string;
- readonly segmentId: string;
- readonly startSec: number;
- readonly endSec: number;
+ readonly startFrame: number;
+ readonly endFrameExclusive: number;
/** Only whole-Atom timing is proven. No display-word timing exists here. */
readonly atoms: readonly {
readonly atomId: string;
- readonly startSec: number;
- readonly endSec: number;
+ readonly startFrame: number;
+ readonly endFrameExclusive: number;
}[];
readonly fields: readonly CaptionFieldAssignment[];
};
diff --git a/packages/caption/test/caption.test.ts b/packages/caption/test/caption.test.ts
index 7e1125d2..fcc13cf3 100644
--- a/packages/caption/test/caption.test.ts
+++ b/packages/caption/test/caption.test.ts
@@ -38,8 +38,8 @@ function locate(narrative: Narrative, durationSec: number, segments: readonly Al
const audio = { kind: "blob" as const, digest: digestOf("caption:test-audio"), size: 1, mediaType: "audio/wav" };
const basisSegments = narrative.segments.map((segment, index) => ({
segmentId: segment.id,
- startSec: segments[index]!.startSec,
- endSec: segments[index]!.endSec,
+ startSec: durationSec * index / narrative.segments.length,
+ endSec: durationSec * (index + 1) / narrative.segments.length,
}));
const basis = sealSpeechBasis({
contract: "svml.speech-basis@1",
@@ -48,7 +48,7 @@ function locate(narrative: Narrative, durationSec: number, segments: readonly Al
visualTrack: { clips: [] },
segments: basisSegments,
});
- const evidence = sealAlignedTranscriptEvidence({ contract: "svml.aligned-transcript-evidence@1", durationSec, segments });
+ const evidence = sealAlignedTranscriptEvidence({ contract: "svml.aligned-transcript-evidence@1", segments });
const audioBasis: SpeechAudioBasis = {
contract: "svml.speech-audio-basis@1",
programSpace: basis.programSpace,
@@ -152,8 +152,6 @@ test("Caption timing applies Mute after planning and preserves the original Cue
});
const map = locate(parsed, 2, [{
sourceSegmentId: "line",
- startSec: 0,
- endSec: 2,
words: ["Keep", "this", "hidden", "phrase", "visible"].map((text, index) => ({
text,
startSec: index * 0.3,
@@ -167,8 +165,8 @@ test("Caption timing applies Mute after planning and preserves the original Cue
assert.deepEqual(projection.cues[0]!.atoms.map((atom) => atom.atomId),
display.atoms.filter((atom) => !atom.wordIds.some((wordId) => mutedWordIds.includes(wordId)))
.map((atom) => atom.id));
- assert.equal(projection.cues[0]!.startSec, 0);
- assert.equal(projection.cues[0]!.endSec, 1.4);
+ assert.equal(projection.cues[0]!.startFrame, 0);
+ assert.equal(projection.cues[0]!.endFrameExclusive, 42);
});
test("caption:Program lowers explicit Mute word subsets without a temporal mask", async () => {
@@ -298,7 +296,7 @@ test("Dual Text exposes one whole timed display Atom and never invents internal
}] }],
});
const map = locate(parsed, 1, [{
- sourceSegmentId: "line", startSec: 0, endSec: 1,
+ sourceSegmentId: "line",
words: [
{ text: "what", startSec: 0.1, endSec: 0.25 },
{ text: "the", startSec: 0.3, endSec: 0.42 },
@@ -309,12 +307,10 @@ test("Dual Text exposes one whole timed display Atom and never invents internal
const projection = temporalizeCaptionPlan(display, correspondence, map, program, plan);
assert.deepEqual(projection.cues, [{
id: "cue:1",
- runId: run.id,
styleId: run.styleId,
- segmentId: "line",
- startSec: 0.1,
- endSec: 22 / 30,
- atoms: [{ atomId: display.atoms[0]!.id, startSec: 0.1, endSec: 22 / 30 }],
+ startFrame: 3,
+ endFrameExclusive: 22,
+ atoms: [{ atomId: display.atoms[0]!.id, startFrame: 3, endFrameExclusive: 22 }],
fields: [],
}]);
assert.equal("words" in projection.cues[0]!, false);
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 51f366ce..aad63b69 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -8,12 +8,11 @@ must pass one explicit `CliDistribution`:
```ts
type CliDistribution = {
- name: string;
packageRoot?: string;
- builtInPackageContributions: readonly NodePackageContribution[];
- runFrontends: readonly RunFrontend[];
+ bootstrapPackages: readonly NodePackageBinding[];
createCompiler(options): NodeCompiler;
- createRuntimeFromConfig(path): Promise<LocalRuntime>;
+ runtimeProfileRevision(path): Promise<string>;
+ createRuntimeFromConfig(path): Promise<CliRuntime>;
};
```
@@ -21,6 +20,8 @@ A Distribution is trusted application assembly, not Core data or source-import a
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.
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.
`check` accepts any self-described Author or Run Source whose Header names a trusted Frontend.
`plan` and `build` require a Run Source. Targets and Candidate selections may
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d6013e5f..a3c891b0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -9,12 +9,15 @@
},
"dependencies": {
"@narratage/compiler-node": "workspace:*",
- "@narratage/host": "workspace:*",
- "@narratage/local": "workspace:*",
+ "@narratage/elaborator": "workspace:*",
+ "@narratage/workspace": "workspace:*",
"@narratage/package-loader-node": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/run": "workspace:*",
"@narratage/runtime": "workspace:*",
"@narratage/source": "workspace:*"
+ },
+ "devDependencies": {
+ "@narratage/local": "workspace:*"
}
}
diff --git a/packages/cli/src/archive.ts b/packages/cli/src/archive.ts
index 827d613b..b4416217 100644
--- a/packages/cli/src/archive.ts
+++ b/packages/cli/src/archive.ts
@@ -2,9 +2,9 @@ import { createHash, randomUUID } from "node:crypto";
import { mkdir, open, rename, rm, writeFile } from "node:fs/promises";
import { dirname } from "node:path";
-import type { LocalRuntime } from "@narratage/local";
+import type { CliRuntime } from "./runtime-port.js";
import { isDigest } from "@narratage/protocol";
-import type { BuildState, Digest, TypedRecord } from "@narratage/protocol";
+import type { BuildState, Digest, TypedRecord, TypeRef } from "@narratage/protocol";
import type { BuildCatalogEntry } from "@narratage/runtime";
type ArtifactIdentity = {
@@ -20,7 +20,7 @@ export type ArchivedArtifactReference = ArtifactIdentity & {
export type ArchivedLogicalOutput = {
readonly name: string;
- readonly type: BuildCatalogEntry["aliases"][number]["type"];
+ readonly type: TypeRef;
readonly output: string;
readonly candidate: BuildState["plan"]["selections"][number]["candidate"];
readonly record: ReturnType<typeof summarizeRecord>;
@@ -41,7 +41,7 @@ function recordArtifact(record: TypedRecord): ArtifactIdentity | undefined {
}
export async function materializeRecord(
- runtime: Pick<LocalRuntime, "openArtifact">,
+ runtime: Pick<CliRuntime, "openArtifact">,
record: TypedRecord,
destination: string,
): Promise<
@@ -60,7 +60,7 @@ export async function materializeRecord(
}
export async function materializeArtifact(
- runtime: Pick<LocalRuntime, "openArtifact">,
+ runtime: Pick<CliRuntime, "openArtifact">,
artifact: ArtifactIdentity,
destination: string,
subject = "Build archive",
@@ -135,6 +135,17 @@ function summarizeRecord(record: TypedRecord) {
};
}
+function catalogAliasType(
+ state: BuildState,
+ ref: BuildCatalogEntry["aliases"][number]["ref"],
+): TypeRef {
+ const type = ref.kind === "record"
+ ? state.program.records.find((record) => record.id === ref.id)?.type
+ : state.graph.outputs.find((output) => output.id === ref.id)?.type;
+ if (type === undefined) throw new Error(`Build Catalog alias references unknown ${ref.kind} ${ref.id}`);
+ return type;
+}
+
/**
* Public Logical Outputs that this exact Build actually selected and accepted.
*
@@ -157,7 +168,7 @@ export function acceptedArchivedOutputs(
if (record === undefined) return [];
return [{
name: alias.name,
- type: alias.type,
+ type: record.type,
output: alias.ref.id,
candidate: selection.candidate,
record: summarizeRecord(record),
@@ -251,7 +262,7 @@ export function inspectBuild(state: BuildState, catalog?: BuildCatalogEntry) {
})();
return {
name: alias.name,
- type: alias.type,
+ type: record?.type ?? catalogAliasType(state, alias.ref),
ref: alias.ref,
...(record === undefined ? { accepted: false } : { accepted: true, record: record.id }),
};
diff --git a/packages/cli/src/distribution.ts b/packages/cli/src/distribution.ts
index 1b231238..fc46818c 100644
--- a/packages/cli/src/distribution.ts
+++ b/packages/cli/src/distribution.ts
@@ -1,10 +1,15 @@
import type { NodeCompiler } from "@narratage/compiler-node";
-import type { LocalCredentialControl, LocalRuntime, LocalRuntimeControl } from "@narratage/local";
-import type { ExternalServiceProgress, ExternalServiceReport, RuntimeConfigDoctorResult } from "@narratage/local";
-import type { NodePackageContribution } from "@narratage/package-loader-node";
+import type { NodePackageBinding, NodePackageContribution } from "@narratage/package-loader-node";
import type { LoadedNodePackageSet } from "@narratage/package-loader-node";
import type { CapabilityRef } from "@narratage/protocol";
-import type { RunFrontend } from "@narratage/run";
+import type {
+ CliCredentialControl,
+ CliExternalServiceProgress,
+ CliExternalServiceReport,
+ CliRuntime,
+ CliRuntimeControl,
+ CliRuntimeDoctorResult,
+} from "./runtime-port.js";
export type CliCompilerOptions = {
/** Canonical containment boundary for Author and Run Sources plus source assets. */
@@ -21,12 +26,10 @@ export type CliCompilerOptions = {
* It is Host configuration, never Core state or source-import authority.
*/
export type CliDistribution = {
- readonly name: string;
/** Host location from which installed locked packages resolve. A caller may explicitly override it. */
readonly packageRoot?: string;
- readonly builtInPackageContributions: readonly NodePackageContribution[];
- /** Explicitly trusted Run Frontends; source Headers select among them without suffix defaults. */
- readonly runFrontends: readonly RunFrontend[];
+ /** Explicit Host bootstrap packages; never inferred from Source contents. */
+ readonly bootstrapPackages: readonly NodePackageBinding[];
createCompiler(options: CliCompilerOptions): NodeCompiler;
/**
* Read the self-described Run Source and its Author Source closure, then return
@@ -37,7 +40,12 @@ export type CliDistribution = {
*/
discoverSourcePackages?(path: string, options?: {
readonly workspaceRoot?: string;
- }): Promise<{ readonly selected: readonly string[]; readonly logical?: readonly string[] }>;
+ /** Exact packages already trusted for the current fixed-point discovery pass. */
+ readonly packages?: readonly NodePackageBinding[];
+ }): Promise<{
+ readonly selected: readonly string[];
+ readonly logical?: readonly import("@narratage/package-loader-node").LogicalPackageAddress[];
+ }>;
/**
* Resolve the deterministic implementation lock named by a declarative
* Runtime Profile without constructing that Runtime. Trusted executable
@@ -49,28 +57,30 @@ export type CliDistribution = {
readonly packageLock?: string;
readonly runtimePackageLock?: string;
readonly packageRoot?: string;
- /** Installed Runtime package roots explicitly selected by this Profile. */
- readonly runtimePackages?: readonly string[];
+ /** ABI-qualified Runtime adapters selected by the Profile. */
+ readonly runtimeSelection?: import("@narratage/package-loader-node").NodePackageSelectionRequest;
}>;
+ /** Opaque revision of the Profile and every deployment input that requires a fresh Worker. */
+ runtimeProfileRevision(path: string): Promise<string>;
createRuntimeFromConfig(path: string, options?: {
/** Same-process package set already verified for compilation. */
readonly implementationPackages?: LoadedNodePackageSet;
- }): Promise<LocalRuntime>;
+ }): Promise<CliRuntime>;
/** Open only durable Stores for observation, cancellation, egress and maintenance. */
- createRuntimeControlFromConfig(path: string, options?: { readonly readOnly?: boolean }): Promise<LocalRuntimeControl>;
+ createRuntimeControlFromConfig(path: string, options?: { readonly readOnly?: boolean }): Promise<CliRuntimeControl>;
/** Open only the selected Endpoint declaration and configured CredentialStores. */
- createRuntimeCredentialsFromConfig(path: string, endpoint: string): Promise<LocalCredentialControl>;
+ createRuntimeCredentialsFromConfig(path: string, endpoint: string): Promise<CliCredentialControl>;
/** Re-enter this exact Distribution as the hidden durable Worker process. */
runtimeWorkerLaunch(): { readonly command: string; readonly args: readonly string[] };
doctorRuntimeConfig(path: string, options?: {
readonly capabilities?: readonly CapabilityRef[];
readonly implementationPackages?: LoadedNodePackageSet;
- }): Promise<RuntimeConfigDoctorResult>;
+ }): Promise<CliRuntimeDoctorResult>;
/** The external programs a Runtime Profile implies: probe, prepare and start them. */
readonly externalServices: {
up(path: string, options: {
readonly maxWaitMs?: number;
- readonly onProgress?: (event: ExternalServiceProgress) => void;
+ readonly onProgress?: (event: CliExternalServiceProgress) => void;
readonly capabilities?: readonly CapabilityRef[];
}): Promise<ExternalServiceResult>;
down(path: string): Promise<ExternalServiceResult>;
@@ -80,5 +90,5 @@ export type CliDistribution = {
export type ExternalServiceResult = {
readonly root: string;
- readonly services: readonly ExternalServiceReport[];
+ readonly services: readonly CliExternalServiceReport[];
};
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 55bff8c7..e0efd11e 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -1,5 +1,6 @@
export { materializeArtifact, materializeRecord } from "./archive.js";
export { runCli } from "./main.js";
+export { discoverSourcePackages } from "./source-discovery.js";
export { renderCliError, writeCliHelp, writeCliOutput } from "./output.js";
export type {
CliColorMode,
@@ -12,3 +13,4 @@ export type {
CliCompilerOptions,
CliDistribution,
} from "./distribution.js";
+export type * from "./runtime-port.js";
diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts
index abd6824b..4b5b4cbf 100644
--- a/packages/cli/src/main.ts
+++ b/packages/cli/src/main.ts
@@ -1,23 +1,18 @@
-import { dirname, extname, resolve } from "node:path";
+import { dirname, resolve } from "node:path";
import { readFile } from "node:fs/promises";
-import type {
- ExternalServiceProgress,
- ExternalServiceReport,
- LocalBuildSubmission,
- LocalRuntime,
- LocalRuntimeControl,
-} from "@narratage/local";
import type { NodeCompiledSourceClosure } from "@narratage/compiler-node";
+import { plannedNeeds } from "@narratage/runtime";
import type { BuildCatalogDescriptor, CapacityReservation, OperationProgress } from "@narratage/runtime";
import { isDigest } from "@narratage/protocol";
import type { BuildState, CapabilityRef, TypeRef } from "@narratage/protocol";
import { parseSourceHeader } from "@narratage/source";
import {
createNodePackageLock,
+ createNodePackageInventory,
loadNodePackageSet,
- loadNodePackageSelection,
readNodePackageLock,
+ selectNodePackageSpecifiers,
writeNodePackageLock,
} from "@narratage/package-loader-node";
import type { LoadedNodePackageSet, NodePackageLock } from "@narratage/package-loader-node";
@@ -34,9 +29,20 @@ import {
} from "./archive.js";
import { checkRunFile, collectRunFrontends, loadRunFile } from "./run-file.js";
import type { CliDistribution } from "./distribution.js";
+import type {
+ CliBuildSubmission,
+ CliExternalServiceProgress,
+ CliExternalServiceReport,
+ CliRuntime,
+ CliRuntimeControl,
+} 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 {
+ createDiscoveredSourceInventory,
+ loadDiscoveredSourcePackages,
+} from "./source-packages.js";
import {
ensureRuntimeProcess,
markRuntimeProcessReady,
@@ -230,7 +236,7 @@ function parseArgs(argv: readonly string[]): ParsedArgs {
}
if (item === "--runtime") {
const value = rest[index + 1];
- if (value === undefined || value.startsWith("--")) throw new Error("--runtime requires a declarative JSON Runtime Profile");
+ if (value === undefined || value.startsWith("--")) throw new Error("--runtime requires a Runtime Profile");
runtime = resolve(value);
index += 1;
continue;
@@ -449,12 +455,12 @@ function usage(): string {
" 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.json> [--root workspace]",
- " narratage doctor <runtime-profile.json>",
- " narratage services up|down|status <runtime-profile.json> [--max-wait-ms milliseconds]",
- " narratage runtime up|status|logs|down <runtime-profile.json>",
+ " narratage packages sync <run-source> --runtime <runtime-profile> [--root workspace]",
+ " narratage doctor <runtime-profile>",
+ " narratage services up|down|status <runtime-profile> [--max-wait-ms milliseconds]",
+ " narratage runtime up|status|logs|down <runtime-profile>",
" narratage queue --runtime profile.json [--watch]",
- " narratage gc <runtime-profile.json> [--apply]",
+ " narratage gc <runtime-profile> [--apply]",
" narratage check <self-described-source> [--runtime profile.json] [--package-lock file] [--root workspace] [--asset-root directory]",
" narratage plan <run-source> [--runtime profile.json] [--package-lock file] [--root workspace] [--asset-root directory]",
" narratage build <run-source> --runtime profile.json [--root workspace] [--asset-root directory] [--follow] [--no-services]",
@@ -474,15 +480,6 @@ function usage(): string {
].join("\n");
}
-function requireJsonRuntimeProfile(path: string): void {
- if (extname(path) !== ".json") {
- throw new Error(
- `Narratage CLI Runtime Profiles are declarative JSON files; ${path} is not .json. `
- + "Programmatic Runtime assembly belongs in an application that embeds @narratage/local.",
- );
- }
-}
-
function createCatalogDescriptor(options: {
readonly core: BuildCatalogDescriptor["core"];
readonly source: string;
@@ -493,7 +490,7 @@ function createCatalogDescriptor(options: {
if (item.ref.kind === "operation-result") {
throw new Error(`public output ${item.name} was not lowered to a stable Record or Logical Output`);
}
- return { name: item.name, type: item.type, ref: item.ref };
+ return { name: item.name, ref: item.ref };
});
return {
format: "svml.build-catalog-descriptor@1",
@@ -515,10 +512,6 @@ function createCatalogDescriptor(options: {
* running otherwise surfaces as a refused connection partway through, after the
* paid generation ahead of it has already been spent.
*
- * Only a JSON Profile declares Endpoints this can read. A trusted `.ts` module
- * builds its Runtime itself and owns whatever its Endpoints talk to, so there is
- * nothing here to start on its behalf.
- *
* Services are started and left running: a developer submits several Builds
* against one warm program, and stopping it between them would pay the model
* load every time. `narratage services down` ends them.
@@ -527,9 +520,8 @@ async function startDeclaredServices(
path: string,
distribution: CliDistribution,
capabilities: readonly CapabilityRef[],
- onProgress?: (event: ExternalServiceProgress) => void,
-): Promise<readonly ExternalServiceReport[] | undefined> {
- if (extname(path) !== ".json") return undefined;
+ onProgress?: (event: CliExternalServiceProgress) => void,
+): Promise<readonly CliExternalServiceReport[] | undefined> {
const result = await distribution.externalServices.up(resolve(path), {
capabilities,
...(onProgress === undefined ? {} : { onProgress }),
@@ -551,19 +543,7 @@ async function startDeclaredServices(
}
function demandedCapabilities(state: BuildState): readonly CapabilityRef[] {
- const found = new Map<string, CapabilityRef>();
- for (const step of state.plan.steps) {
- const module = state.program.closure.modules.find((item) =>
- item.ref.name === step.producer.module.name && item.ref.version === step.producer.module.version);
- const producer = module?.manifest.producers.find((item) => item.name === step.producer.name);
- if (producer === undefined) {
- throw new Error(`BuildPlan refers to undeclared Producer ${step.producer.module.name}@${step.producer.module.version}#${step.producer.name}`);
- }
- for (const need of producer.needs) {
- const key = `${need.capability.module.name}@${need.capability.module.version}#${need.capability.name}`;
- found.set(key, need.capability);
- }
- }
+ const found = new Map(plannedNeeds(state).map((need) => [capabilityName(need.capability), need.capability]));
return [...found.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([, value]) => value);
}
@@ -577,7 +557,6 @@ async function preflightPlan(
state: BuildState,
implementationPackages?: LoadedNodePackageSet,
) {
- if (extname(runtimeProfile) !== ".json") return undefined;
const capabilities = demandedCapabilities(state);
const result = await distribution.doctorRuntimeConfig(runtimeProfile, {
capabilities,
@@ -606,12 +585,11 @@ function assertPreflight(
].join("\n"));
}
-async function loadLocalRuntime(
+async function loadRuntime(
path: string,
distribution: CliDistribution,
implementationPackages?: LoadedNodePackageSet,
-): Promise<LocalRuntime> {
- requireJsonRuntimeProfile(path);
+): Promise<CliRuntime> {
return await distribution.createRuntimeFromConfig(path, {
...(implementationPackages === undefined ? {} : { implementationPackages }),
});
@@ -621,8 +599,7 @@ async function loadRuntimeControl(
path: string,
distribution: CliDistribution,
readOnly = true,
-): Promise<LocalRuntimeControl> {
- requireJsonRuntimeProfile(path);
+): Promise<CliRuntimeControl> {
return await distribution.createRuntimeControlFromConfig(path, { readOnly });
}
@@ -631,8 +608,8 @@ function displayType(type: TypeRef): string {
}
function submissionStatus(
- dispatch: NonNullable<Awaited<ReturnType<LocalRuntime["status"]>>["dispatch"]>,
-): LocalBuildSubmission["status"] {
+ dispatch: NonNullable<Awaited<ReturnType<CliRuntime["status"]>>["dispatch"]>,
+): CliBuildSubmission["status"] {
return dispatch.phase === "terminal"
? dispatch.terminal!
: dispatch.phase === "leased" ? "running" : dispatch.phase;
@@ -689,7 +666,7 @@ function queueRouteLines(groups: readonly QueueRouteSummary[]): readonly string[
return lines;
}
-function externalServiceLine(service: ExternalServiceReport): string {
+function externalServiceLine(service: CliExternalServiceReport): string {
const stateDetail = "detail" in service.state ? ` — ${service.state.detail}` : "";
const action = service.action === undefined ? "" : ` · ${service.action}`;
const detail = service.detail === undefined ? "" : ` · ${service.detail}`;
@@ -704,11 +681,12 @@ function inlineValuePreview(value: unknown, limit = 240): string {
}
async function observeBuild(
- runtime: LocalRuntime,
- initial: LocalBuildSubmission,
+ runtime: CliRuntime,
+ initial: CliBuildSubmission,
options: {
readonly maxWaitMs?: number;
readonly workerProfile?: string;
+ readonly workerProfileDigest?: string;
readonly onProgress?: (value: {
readonly build: string;
readonly phase: string;
@@ -716,7 +694,7 @@ async function observeBuild(
readonly activity: readonly string[];
}) => void;
},
-): Promise<LocalBuildSubmission> {
+): Promise<CliBuildSubmission> {
let current = initial;
let fingerprint: string | undefined;
let pollDelayMs = 100;
@@ -744,8 +722,9 @@ async function observeBuild(
dispatch: status.dispatch,
};
if (!["complete", "failed", "cancelled"].includes(current.status)
- && options.workerProfile !== undefined) {
- const worker = await runtimeProcessStatus(options.workerProfile);
+ && options.workerProfile !== undefined
+ && options.workerProfileDigest !== undefined) {
+ const worker = await runtimeProcessStatus(options.workerProfile, options.workerProfileDigest);
if (worker.state !== "running") {
throw new Error(
`Runtime Worker is ${worker.state}; Build ${current.id} remains durable. `
@@ -800,7 +779,7 @@ async function observeBuild(
return current;
}
-type RuntimeArchiveView = Pick<LocalRuntimeControl, "status" | "close">;
+type RuntimeArchiveView = Pick<CliRuntimeControl, "status" | "close">;
/**
* A Run Source needs the archive only when it names a historical Build Candidate.
@@ -811,8 +790,8 @@ function lazyRuntimeArchive(
path: string,
distribution: CliDistribution,
): RuntimeArchiveView {
- let loading: Promise<LocalRuntimeControl> | undefined;
- const open = (): Promise<LocalRuntimeControl> => {
+ let loading: Promise<CliRuntimeControl> | undefined;
+ const open = (): Promise<CliRuntimeControl> => {
loading ??= loadRuntimeControl(path, distribution);
return loading;
};
@@ -851,7 +830,7 @@ export async function runCli(
}, { kind: "operational", machine, title, status, facts, lines });
const reportServiceProgress = args.json || args.jsonl
? undefined
- : (event: ExternalServiceProgress): void => {
+ : (event: CliExternalServiceProgress): void => {
const verb = {
checking: "Checking",
preparing: "Preparing",
@@ -863,7 +842,7 @@ export async function runCli(
};
if (args.command === "_worker") {
if (args.file === undefined || args.readyFile === undefined) throw new Error("internal Worker launch is incomplete");
- const runtime = await loadLocalRuntime(resolve(args.file), distribution);
+ const runtime = await loadRuntime(resolve(args.file), distribution);
const abort = new AbortController();
const stop = (): void => abort.abort();
process.once("SIGTERM", stop);
@@ -907,7 +886,6 @@ export async function runCli(
throw new Error("history requires an output name or --source path");
}
assertCommandOptions(args);
- if (args.runtime !== undefined) requireJsonRuntimeProfile(args.runtime);
if (args.command === "lock-packages") {
const exact = args.packages.length > 0;
const mutation = args.addPackages.length > 0 || args.removePackages.length > 0;
@@ -1042,29 +1020,22 @@ export async function runCli(
}
if (args.command === "packages") {
if (args.action !== "sync") {
- throw new Error("packages takes one action: packages sync <run-source> --runtime <runtime-profile.json>");
+ throw new Error("packages takes one action: packages sync <run-source> --runtime <runtime-profile>");
}
if (args.runtime === undefined) {
- throw new Error("packages sync requires --runtime <runtime-profile.json>");
+ throw new Error("packages sync requires --runtime <runtime-profile>");
}
const source = resolve(args.file!);
const profile = resolve(args.runtime);
- if (extname(profile) !== ".json") throw new Error("packages sync requires a declarative JSON Runtime Profile");
const selection = await distribution.resolveCompilationPackages?.(profile);
if (selection?.packageLock === undefined || selection.runtimePackageLock === undefined) {
throw new Error("packages sync requires the Runtime Profile to declare both packageLock and runtimePackageLock");
}
- if (selection.runtimePackages === undefined) {
+ if (selection.runtimeSelection === undefined) {
throw new Error("this Distribution cannot discover Runtime packages from the selected Profile");
}
- const runtimePackages = selection.runtimePackages;
+ const runtimeSelection = selection.runtimeSelection;
const syncWorkspaceRoot = args.workspaceRoot ?? selection.root;
- const sourceSelection = await distribution.discoverSourcePackages?.(source, {
- ...(syncWorkspaceRoot === undefined ? {} : { workspaceRoot: syncWorkspaceRoot }),
- });
- if (sourceSelection === undefined) {
- throw new Error("this Distribution cannot discover packages from the selected Run Source");
- }
const packageRoot = args.packageRoot ?? selection.packageRoot ?? distribution.packageRoot ?? dirname(profile);
const locks = [resolve(selection.packageLock), resolve(selection.runtimePackageLock)].sort();
if (locks[0] === locks[1]) throw new Error("packageLock and runtimePackageLock must be different files");
@@ -1091,18 +1062,34 @@ export async function runCli(
await withPackageLockEdit(locks[0]!, async () => await withPackageLockEdit(locks[1]!, async () => {
const authorBefore = await readExistingLock(selection.packageLock!);
const runtimeBefore = await readExistingLock(selection.runtimePackageLock!);
- const authorSelected = [...new Set([
- ...(authorBefore?.selected ?? []),
- ...sourceSelection.selected,
- ])].sort();
- const runtimeSelected = [...new Set([
- ...(runtimeBefore?.selected ?? []),
- ...runtimePackages,
- ])].sort();
- const [authorAfter, runtimeAfter] = await Promise.all([
- createNodePackageLock(authorSelected, packageRoot),
- createNodePackageLock(runtimeSelected, packageRoot),
- ]);
+ 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(selection.packageLock!, authorAfter);
if (runtimeBefore?.digest !== runtimeAfter.digest) await writeNodePackageLock(selection.runtimePackageLock!, runtimeAfter);
const author = summarizeDifference(authorBefore, authorAfter);
@@ -1126,13 +1113,13 @@ export async function runCli(
changed ? "success" : "info", [
["Run", source], ["Profile", profile],
["Author packages", String(sourceSelection.selected.length)],
- ["Runtime packages", String(runtimePackages.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}`),
- ...runtimePackages.map((item) => `Runtime 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}`),
@@ -1149,7 +1136,6 @@ export async function runCli(
throw new Error("doctor reads all deployment selection from the Runtime Profile itself");
}
const profile = resolve(args.file!);
- requireJsonRuntimeProfile(profile);
const result = await distribution.doctorRuntimeConfig(profile);
const machine = {
format: "narratage.cli-doctor@1" as const,
@@ -1173,7 +1159,6 @@ export async function runCli(
throw new Error("--max-wait-ms applies to services up");
}
const profile = resolve(args.file!);
- requireJsonRuntimeProfile(profile);
const result = args.action === "up"
? await distribution.externalServices.up(profile, {
...(args.maxWaitMs === undefined ? {} : { maxWaitMs: args.maxWaitMs }),
@@ -1209,11 +1194,10 @@ export async function runCli(
throw new Error("runtime takes up, down, status or logs");
}
const profile = resolve(args.file!);
- requireJsonRuntimeProfile(profile);
if (args.action === "up") {
- // Validate the exact Runtime Revision against unfinished work before replacing a stale Worker
+ // 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 validated = await loadLocalRuntime(profile, distribution);
+ const validated = await loadRuntime(profile, distribution);
await validated.close();
const external = await distribution.externalServices.up(profile, {
...(args.maxWaitMs === undefined ? {} : { maxWaitMs: args.maxWaitMs }),
@@ -1222,6 +1206,7 @@ export async function runCli(
const processState = await ensureRuntimeProcess(
profile,
distribution.runtimeWorkerLaunch(),
+ await distribution.runtimeProfileRevision(profile),
args.maxWaitMs ?? 10_000,
);
const ok = processState.state === "running"
@@ -1260,10 +1245,11 @@ export async function runCli(
// 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.
const runtimeLoading = loadRuntimeControl(profile, distribution);
- let runtime: LocalRuntimeControl | undefined;
+ let runtime: CliRuntimeControl | undefined;
try {
const loaded = await Promise.all([
- runtimeProcessStatus(profile),
+ distribution.runtimeProfileRevision(profile)
+ .then(async (digest) => await runtimeProcessStatus(profile, digest)),
distribution.externalServices.report(profile),
runtimeLoading,
]);
@@ -1312,9 +1298,6 @@ export async function runCli(
}
const runtime = await loadRuntimeControl(resolve(args.file!), distribution, !args.apply);
try {
- if (!("garbageCollectArtifacts" in runtime) || typeof runtime.garbageCollectArtifacts !== "function") {
- throw new Error("selected Runtime does not expose Artifact maintenance");
- }
const report = await runtime.garbageCollectArtifacts({ apply: args.apply });
const machine = {
applied: args.apply,
@@ -1339,9 +1322,6 @@ export async function runCli(
}
if (args.runtime === undefined) throw new Error("auth requires --runtime");
if (args.from !== undefined && args.action !== "login") throw new Error("--from applies only to auth login");
- if (extname(args.runtime) !== ".json") {
- throw new Error("auth requires a declarative JSON Runtime Profile so credentials can be opened without executing the whole deployment");
- }
const runtime = await distribution.createRuntimeCredentialsFromConfig(args.runtime, args.file!);
try {
let credentials = await runtime.credentials(args.file!);
@@ -1418,7 +1398,8 @@ export async function runCli(
const writeQueue = async (): Promise<void> => {
const [queue, worker] = await Promise.all([
runtime.queue(),
- runtimeProcessStatus(args.runtime!),
+ distribution.runtimeProfileRevision(args.runtime!)
+ .then(async (digest) => await runtimeProcessStatus(args.runtime!, digest)),
]);
const fingerprint = JSON.stringify({
dispatches: queue.dispatches,
@@ -1788,25 +1769,22 @@ export async function runCli(
if (effectivePackageRoot !== undefined && effectivePackageLock === undefined) {
throw new Error("--package-root locates the installed packages named by --package-lock; provide both options");
}
- const exactSourceSelection = effectivePackageLock === undefined
- ? undefined
- : await distribution.discoverSourcePackages?.(args.file!, {
- ...(effectiveWorkspaceRoot === undefined ? {} : { workspaceRoot: effectiveWorkspaceRoot }),
- });
const loadedPackageSet = effectivePackageLock === undefined
? undefined
- : exactSourceSelection === undefined
+ : distribution.discoverSourcePackages === undefined
? await loadNodePackageSet(
effectivePackageLock,
effectivePackageRoot ?? distribution.packageRoot ?? dirname(effectivePackageLock),
)
- : await loadNodePackageSelection(
- effectivePackageLock,
- exactSourceSelection,
- effectivePackageRoot ?? distribution.packageRoot ?? dirname(effectivePackageLock),
- );
- const packageContributions = loadedPackageSet?.contributions ?? distribution.builtInPackageContributions;
- const runFrontends = collectRunFrontends(distribution.runFrontends, packageContributions);
+ : await loadDiscoveredSourcePackages(distribution, {
+ source: args.file!,
+ ...(effectiveWorkspaceRoot === undefined ? {} : { workspaceRoot: effectiveWorkspaceRoot }),
+ packageLock: effectivePackageLock,
+ packageRoot: effectivePackageRoot ?? distribution.packageRoot ?? dirname(effectivePackageLock),
+ });
+ const packageContributions = (loadedPackageSet?.packages ?? distribution.bootstrapPackages)
+ .map((item) => item.contribution);
+ const runFrontends = collectRunFrontends(packageContributions);
const compiler = distribution.createCompiler({
...(effectiveWorkspaceRoot === undefined ? {} : { workspaceRoot: effectiveWorkspaceRoot }),
...(args.assetRoots.length === 0 ? {} : { assetRoots: args.assetRoots }),
@@ -1845,7 +1823,7 @@ export async function runCli(
runSourceClosure: loaded.closure.id,
authorModuleClosure: loaded.author.program.closure.digest,
executionModuleClosure: loaded.program.closure.digest,
- authorGraph: loaded.author.elaboration.graph.id,
+ authorGraph: loaded.author.graph.id,
targets: loaded.document.targets,
candidates: Object.fromEntries(loaded.document.candidates.map((item) => [item.id, item.kind])),
satisfactions: loaded.document.satisfactions,
@@ -1866,7 +1844,7 @@ export async function runCli(
ok: true,
sourceClosure: result.closure.id,
moduleClosure: result.program.closure.digest,
- graph: result.elaboration.graph.id,
+ graph: result.graph.id,
units: result.closure.units.length,
sourceAssets: result.attachments.map((item) => item.artifact),
modules: result.program.closure.modules.map((item) => `${item.ref.name}@${item.ref.version}`),
@@ -1882,7 +1860,7 @@ export async function runCli(
}
}
if (args.command === "build") {
- if (args.runtime === undefined) throw new Error("build requires --runtime with a declarative JSON Runtime Profile");
+ if (args.runtime === undefined) throw new Error("build requires --runtime with a Runtime Profile");
const archive = lazyRuntimeArchive(args.runtime, distribution);
let loadedRun;
try {
@@ -1904,7 +1882,7 @@ export async function runCli(
assertPreflight(preflight, args.noServices
? new Set()
: new Set(["EXTERNAL_SERVICE_DOWN", "EXTERNAL_SERVICE_MISMATCH"]));
- const runtime = await loadLocalRuntime(args.runtime, distribution, loadedPackageSet);
+ const runtime = await loadRuntime(args.runtime, distribution, loadedPackageSet);
try {
const catalog = createCatalogDescriptor({
core: result.state.id,
@@ -1928,9 +1906,11 @@ export async function runCli(
demandedCapabilities(result.state),
reportServiceProgress,
);
+ const workerProfileDigest = await distribution.runtimeProfileRevision(args.runtime);
const worker = await ensureRuntimeProcess(
args.runtime,
distribution.runtimeWorkerLaunch(),
+ workerProfileDigest,
args.maxWaitMs ?? 10_000,
);
let built = await runtime.build(request);
@@ -1938,6 +1918,7 @@ export async function runCli(
built = await observeBuild(runtime, built, {
...(args.maxWaitMs === undefined ? {} : { maxWaitMs: args.maxWaitMs }),
workerProfile: args.runtime,
+ workerProfileDigest,
...(args.json || args.jsonl ? {} : {
onProgress: (progress) => {
const operations = Object.entries(progress.operations)
diff --git a/packages/cli/src/output.ts b/packages/cli/src/output.ts
index fcd23502..1ea2b8ae 100644
--- a/packages/cli/src/output.ts
+++ b/packages/cli/src/output.ts
@@ -454,7 +454,7 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
colors.accent(colors.strong("narratage doctor")),
colors.dim("Diagnose one complete declarative Runtime Profile without submitting work."),
"",
- " narratage doctor <runtime-profile.json>",
+ " narratage doctor <runtime-profile>",
],
plan: [
colors.accent(colors.strong("narratage plan")),
@@ -479,7 +479,7 @@ function commandHelp(topic: string, colors: Palette): readonly string[] | undefi
colors.accent(colors.strong("narratage runtime")),
colors.dim("Operate the Worker selected by one Runtime Profile."),
"",
- " narratage runtime up <profile> validate the Runtime Revision, start services and Worker",
+ " narratage runtime up <profile> validate the Runtime Closure, start services and Worker",
" narratage runtime status <profile> inspect Worker, queue capacity and declared services",
" narratage runtime logs <profile> read Worker logs",
" narratage runtime down <profile> stop the owned Worker and external programs",
diff --git a/packages/cli/src/run-file.ts b/packages/cli/src/run-file.ts
index 2cca295f..525f86ea 100644
--- a/packages/cli/src/run-file.ts
+++ b/packages/cli/src/run-file.ts
@@ -5,11 +5,12 @@ import type {
NodeCompiledRun,
NodeCompiler,
} from "@narratage/compiler-node";
-import type { LocalRuntime } from "@narratage/local";
+import type { CliRuntime } from "./runtime-port.js";
import type { NodePackageContribution } from "@narratage/package-loader-node";
-import type { WorkspaceSession } from "@narratage/host";
+import type { WorkspaceSession } from "@narratage/workspace";
import {
installRunFragmentHostFacets,
+ runFrontendsFromHostFacets,
RunFragmentRegistry,
RunFrontendRegistry,
} from "@narratage/run";
@@ -34,7 +35,7 @@ function createRunCompiler(options: {
readonly authorCompiler: NodeCompiler;
readonly frontends: readonly RunFrontend[];
readonly packageContributions: readonly NodePackageContribution[];
- readonly runtime?: Pick<LocalRuntime, "status">;
+ readonly runtime?: Pick<CliRuntime, "status">;
}): NodeRunCompiler {
const fragments = new RunFragmentRegistry();
for (const item of options.packageContributions) {
@@ -42,7 +43,7 @@ function createRunCompiler(options: {
}
const frontends = new RunFrontendRegistry();
for (const frontend of options.frontends) frontends.register(frontend);
- const archive = new Map<string, Awaited<ReturnType<LocalRuntime["status"]>>>();
+ const archive = new Map<string, Awaited<ReturnType<CliRuntime["status"]>>>();
const archived = async (id: string) => {
const existing = archive.get(id);
if (existing !== undefined) return existing;
@@ -71,13 +72,9 @@ function createRunCompiler(options: {
}
export function collectRunFrontends(
- builtIns: readonly RunFrontend[],
packages: readonly NodePackageContribution[],
): readonly RunFrontend[] {
- return [
- ...builtIns,
- ...packages.flatMap((item) => item.runFrontends ?? []),
- ];
+ return packages.flatMap((item) => runFrontendsFromHostFacets(item.hostFacets ?? []));
}
export async function loadRunFile(options: {
@@ -85,7 +82,7 @@ export async function loadRunFile(options: {
readonly authorCompiler: NodeCompiler;
readonly frontends: readonly RunFrontend[];
readonly packageContributions: readonly NodePackageContribution[];
- readonly runtime?: Pick<LocalRuntime, "status">;
+ readonly runtime?: Pick<CliRuntime, "status">;
}): Promise<LoadedRunFile> {
const compiler = createRunCompiler(options);
const compiled = await compiler.compileSource(options.workspace.entry, options.workspace);
diff --git a/packages/cli/src/runtime-port.ts b/packages/cli/src/runtime-port.ts
new file mode 100644
index 00000000..de86be6f
--- /dev/null
+++ b/packages/cli/src/runtime-port.ts
@@ -0,0 +1,118 @@
+import type { ArtifactAttachment } from "@narratage/workspace";
+import type { BuildState, Digest } from "@narratage/protocol";
+import type {
+ BuildCatalogDescriptor,
+ BuildCatalogEntry,
+ BuildDispatchSnapshot,
+ BuildSnapshot,
+ CapacityReservation,
+ CredentialRef,
+ OperationSnapshot,
+ RuntimeWorkerRunOptions,
+} from "@narratage/runtime";
+
+export type CliBuildSubmission = {
+ readonly id: string;
+ readonly state: BuildState;
+ readonly status: "queued" | "running" | "waiting" | "blocked" | "settling" | "complete" | "failed" | "cancelled";
+ readonly dispatch: BuildDispatchSnapshot;
+};
+
+export type CliRuntimeStatus = {
+ readonly build: BuildSnapshot | undefined;
+ readonly catalog: BuildCatalogEntry | undefined;
+ readonly operations: readonly OperationSnapshot[];
+ readonly dispatch: BuildDispatchSnapshot | undefined;
+};
+
+export type CliCredentialStatus = {
+ readonly endpoint: string;
+ readonly slot: string;
+ readonly label: string;
+ readonly kind: "secret" | "json";
+ readonly ref: CredentialRef;
+ readonly configured: boolean;
+ readonly writable: boolean;
+};
+
+export type CliArtifactGarbageCollection = {
+ readonly reachable: readonly Digest[];
+ readonly unreachable: readonly Digest[];
+ readonly deleted: readonly Digest[];
+};
+
+export type CliRuntimeControl = {
+ status(build: string): Promise<CliRuntimeStatus>;
+ activity(build: string): Promise<{
+ readonly operations: readonly OperationSnapshot[];
+ readonly dispatch: BuildDispatchSnapshot | undefined;
+ }>;
+ queue(): Promise<{
+ readonly dispatches: readonly BuildDispatchSnapshot[];
+ readonly capacity: readonly CapacityReservation[];
+ readonly operations: readonly OperationSnapshot[];
+ }>;
+ operation(id: Digest): Promise<OperationSnapshot | undefined>;
+ builds(): Promise<readonly BuildCatalogEntry[]>;
+ cancel(build: string, reason?: string): Promise<BuildDispatchSnapshot | undefined>;
+ cancelOperation(id: Digest, reason?: string): Promise<OperationSnapshot | undefined>;
+ readArtifact(digest: Digest): Promise<Uint8Array | undefined>;
+ openArtifact(digest: Digest): Promise<AsyncIterable<Uint8Array> | undefined>;
+ garbageCollectArtifacts(options?: { readonly apply?: boolean }): Promise<CliArtifactGarbageCollection>;
+ close(): void | Promise<void>;
+};
+
+export type CliCredentialControl = {
+ credentials(endpoint?: string): Promise<readonly CliCredentialStatus[]>;
+ putCredential(endpoint: string, slot: string, secret: string): Promise<CliCredentialStatus>;
+ deleteCredential(endpoint: string, slot: string): Promise<{
+ readonly deleted: boolean;
+ readonly credential: CliCredentialStatus;
+ }>;
+ close(): void | Promise<void>;
+};
+
+export type CliRuntime = CliRuntimeControl & CliCredentialControl & {
+ build(request: {
+ readonly id: string;
+ readonly state: BuildState;
+ readonly catalog?: BuildCatalogDescriptor;
+ readonly attachments?: readonly ArtifactAttachment[];
+ }, options?: {
+ readonly follow?: boolean;
+ readonly pollIntervalMs?: number;
+ readonly maxWaitMs?: number;
+ readonly signal?: AbortSignal;
+ }): Promise<CliBuildSubmission>;
+ work(options: RuntimeWorkerRunOptions): Promise<void>;
+};
+
+export type CliRuntimeDoctorDiagnostic = {
+ readonly severity: "error" | "warning" | "info";
+ readonly code: string;
+ readonly message: string;
+ readonly subject?: string;
+};
+
+export type CliRuntimeDoctorResult = {
+ readonly root: string;
+ readonly diagnostics: readonly CliRuntimeDoctorDiagnostic[];
+};
+
+export type CliExternalServiceProgress = {
+ readonly id: string;
+ readonly phase: "checking" | "preparing" | "starting" | "waiting" | "ready";
+};
+
+export type CliExternalServiceReport = {
+ readonly id: string;
+ readonly instances: readonly string[];
+ readonly action?: "already-running" | "prepared" | "started" | "stopped" | "not-ours" | "nothing-to-stop" | "unchanged";
+ readonly state:
+ | { readonly state: "ready" }
+ | { readonly state: "down"; readonly detail: string }
+ | { readonly state: "mismatch"; readonly detail: string };
+ readonly detail?: string;
+ readonly logPath?: string;
+ readonly pid?: number;
+};
diff --git a/packages/cli/src/runtime-process.ts b/packages/cli/src/runtime-process.ts
index 70f7f137..5ee704a9 100644
--- a/packages/cli/src/runtime-process.ts
+++ b/packages/cli/src/runtime-process.ts
@@ -23,8 +23,7 @@ type ProcessRecord = {
readonly profile: string;
readonly pid: number;
readonly startedAt: number;
- /** Optional only so a pre-digest development record can still be stopped safely. */
- readonly profileDigest?: string;
+ readonly profileDigest: string;
};
const LOG_TAIL_BYTES = 1024 * 1024;
@@ -103,37 +102,13 @@ async function rotateLog(path: string): Promise<void> {
await rename(path, previous);
}
-async function digestProfile(profile: string): Promise<string> {
- const absolute = resolve(profile);
- const bytes = await readFile(absolute);
- const hash = createHash("sha256");
- hash.update("profile\0");
- hash.update(bytes);
- if (absolute.endsWith(".json")) {
- const document = JSON.parse(bytes.toString("utf8")) as {
- readonly root?: unknown;
- readonly packageLock?: unknown;
- readonly runtimePackageLock?: unknown;
- };
- const root = resolve(dirname(absolute), typeof document.root === "string" ? document.root : ".");
- for (const [name, value] of [
- ["packageLock", document.packageLock],
- ["runtimePackageLock", document.runtimePackageLock],
- ] as const) {
- if (typeof value !== "string") continue;
- hash.update(`\0${name}\0${resolve(root, value)}\0`);
- hash.update(await readFile(resolve(root, value)));
- }
- }
- return `sha256:${hash.digest("hex")}`;
-}
-
async function record(profile: string): Promise<ProcessRecord | undefined> {
const path = paths(profile).pid;
try {
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) return undefined;
+ || !Number.isSafeInteger(value.pid) || value.pid < 1
+ || typeof value.profileDigest !== "string" || value.profileDigest.length === 0) return undefined;
return value;
} catch (error) {
if (error instanceof Error && "code" in error && error.code === "ENOENT") return undefined;
@@ -141,21 +116,23 @@ async function record(profile: string): Promise<ProcessRecord | undefined> {
}
}
-export async function runtimeProcessStatus(profile: string): Promise<RuntimeProcessState> {
+export async function runtimeProcessStatus(
+ profile: string,
+ currentProfileDigest: string,
+): Promise<RuntimeProcessState> {
const location = paths(profile);
const current = await record(profile);
if (current === undefined || !alive(current.pid)) {
return { state: "stopped", profile: resolve(profile), logPath: location.log };
}
- const currentProfileDigest = await digestProfile(profile).catch(() => undefined);
- if (current.profileDigest === undefined || current.profileDigest !== currentProfileDigest) {
+ if (current.profileDigest !== currentProfileDigest) {
return {
state: "stale",
profile: current.profile,
pid: current.pid,
startedAt: current.startedAt,
- ...(current.profileDigest === undefined ? {} : { profileDigest: current.profileDigest }),
- ...(currentProfileDigest === undefined ? {} : { currentProfileDigest }),
+ profileDigest: current.profileDigest,
+ currentProfileDigest,
logPath: location.log,
};
}
@@ -170,11 +147,15 @@ export async function runtimeProcessStatus(profile: string): Promise<RuntimeProc
};
}
-async function waitForReady(profile: string, timeoutMs: number): Promise<RuntimeProcessState> {
+async function waitForReady(
+ profile: string,
+ profileDigest: string,
+ timeoutMs: number,
+): Promise<RuntimeProcessState> {
const location = paths(profile);
const deadline = Date.now() + timeoutMs;
while (Date.now() <= deadline) {
- const state = await runtimeProcessStatus(profile);
+ const state = await runtimeProcessStatus(profile, profileDigest);
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)}`}`);
@@ -188,15 +169,15 @@ async function waitForReady(profile: string, timeoutMs: number): Promise<Runtime
export async function ensureRuntimeProcess(
profile: string,
launch: RuntimeWorkerLaunch,
+ profileDigest: string,
timeoutMs = 10_000,
): Promise<RuntimeProcessState> {
return await withLifecycleLock(profile, timeoutMs, async () => {
- const current = await runtimeProcessStatus(profile);
+ const current = await runtimeProcessStatus(profile, profileDigest);
if (current.state === "running") return current;
if (current.state === "stale") await stopRuntimeProcessUnlocked(profile, timeoutMs);
const absolute = resolve(profile);
const location = paths(absolute);
- const profileDigest = await digestProfile(absolute);
await mkdir(location.root, { recursive: true });
await unlink(location.ready).catch(() => undefined);
await rotateLog(location.log);
@@ -224,7 +205,7 @@ export async function ensureRuntimeProcess(
} satisfies ProcessRecord), "utf8");
child.unref();
await log.close();
- return await waitForReady(absolute, timeoutMs);
+ return await waitForReady(absolute, profileDigest, timeoutMs);
});
}
diff --git a/packages/cli/src/source-discovery.ts b/packages/cli/src/source-discovery.ts
new file mode 100644
index 00000000..3f2e25de
--- /dev/null
+++ b/packages/cli/src/source-discovery.ts
@@ -0,0 +1,132 @@
+import { readFile, realpath } from "node:fs/promises";
+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 { modulePackageAbi } from "@narratage/protocol";
+import { prepareRunSource, runFragmentHostAbi, runFrontendsFromHostFacets } from "@narratage/run";
+import type { RunFrontend } from "@narratage/run";
+import { parseSourceHeader, sourceFrontendPackageAbi } from "@narratage/source";
+
+function isWithin(root: string, path: string): boolean {
+ const relation = relative(root, path);
+ return relation === "" || (!relation.startsWith("..") && !isAbsolute(relation));
+}
+
+/** Conventional physical hint used only when the trusted inventory has no binding yet. */
+function physicalPackage(request: string): string {
+ const version = request.lastIndexOf("@");
+ if (version <= 0) throw new Error(`Package request ${request} must end in @version`);
+ const logical = request.slice(0, version);
+ if (logical.startsWith("@")) {
+ const slash = logical.indexOf("/", 1);
+ if (slash < 0) throw new Error(`Scoped package request ${request} is invalid`);
+ const subpath = logical.indexOf("/", slash + 1);
+ return subpath < 0 ? logical : logical.slice(0, subpath);
+ }
+ const subpath = logical.indexOf("/");
+ return subpath < 0 ? logical : logical.slice(0, subpath);
+}
+
+function relativeSource(importer: string, request: string): string {
+ if (!request.startsWith("./") && !request.startsWith("../")) {
+ throw new Error(`Source import ${request} in ${importer} must be relative`);
+ }
+ return resolve(dirname(importer), request);
+}
+
+function addressKey(value: LogicalPackageAddress): string {
+ return `${value.abi}\u0000${value.name}`;
+}
+
+/**
+ * Discover the package requirements reachable from a self-described Source closure.
+ * A Distribution supplies only its bootstrap Frontends; every further language,
+ * Module and Run Fragment is resolved from package-owned logical offers.
+ */
+export async function discoverSourcePackages(
+ sourcePath: string,
+ options: {
+ readonly workspaceRoot?: string;
+ readonly packages?: readonly NodePackageBinding[];
+ readonly bootstrapAuthorFrontends?: readonly AuthorFrontend[];
+ readonly bootstrapRunFrontends?: readonly RunFrontend[];
+ } = {},
+): Promise<{ readonly selected: readonly string[]; readonly logical: readonly LogicalPackageAddress[] }> {
+ const canonicalSource = await realpath(resolve(sourcePath));
+ const root = await realpath(resolve(options.workspaceRoot ?? dirname(canonicalSource)));
+ if (!isWithin(root, canonicalSource)) throw new Error(`Source ${canonicalSource} is outside workspace root ${root}`);
+
+ const packages = options.packages ?? [];
+ const authorFrontends = [
+ ...(options.bootstrapAuthorFrontends ?? []).map((frontend) => ({ frontend, physical: undefined as string | undefined })),
+ ...packages.flatMap((item) => authorFrontendsFromHostFacets(item.contribution.hostFacets ?? [])
+ .map((frontend) => ({ frontend, physical: item.specifier as string | undefined }))),
+ ];
+ const runFrontends = [
+ ...(options.bootstrapRunFrontends ?? []).map((frontend) => ({ frontend, physical: undefined as string | undefined })),
+ ...packages.flatMap((item) => runFrontendsFromHostFacets(item.contribution.hostFacets ?? [])
+ .map((frontend) => ({ frontend, physical: item.specifier as string | undefined }))),
+ ];
+ const selected = new Set<string>();
+ const logical = new Map<string, LogicalPackageAddress>();
+ const visited = new Set<string>();
+
+ const requireLogical = (address: LogicalPackageAddress, physical: string | undefined): void => {
+ logical.set(addressKey(address), address);
+ selected.add(physical ?? physicalPackage(address.name));
+ };
+ const moduleOwner = (request: string): string | undefined => packages.find((item) =>
+ (item.contribution.modules ?? []).some((module) => [
+ `${module.manifest.name}@${module.manifest.version}`,
+ ...(module.specifiers ?? []),
+ ].includes(request)))?.specifier;
+ const fragmentOwner = (request: string): string | undefined => packages.find((item) =>
+ (item.contribution.hostFacets ?? []).some((facet) => facet.abi === runFragmentHostAbi
+ && (facet.offers ?? []).includes(request)))?.specifier;
+
+ const discover = async (path: string): Promise<void> => {
+ const canonical = await realpath(path);
+ if (!isWithin(root, canonical)) throw new Error(`Source ${canonical} is outside workspace root ${root}`);
+ if (visited.has(canonical)) return;
+ visited.add(canonical);
+ const text = await readFile(canonical, "utf8");
+ const name = relative(root, canonical);
+ const header = parseSourceHeader(name, text);
+ const authors = authorFrontends.filter((item) => item.frontend.id === header.using);
+ const runs = runFrontends.filter((item) => item.frontend.id === header.using);
+ if (authors.length + runs.length > 1) throw new Error(`Source Frontend ${header.using} is ambiguously provided`);
+ if (authors.length + runs.length === 0) {
+ requireLogical({ abi: sourceFrontendPackageAbi, name: header.using }, undefined);
+ return;
+ }
+ if (authors.length === 1) {
+ const owner = authors[0]!;
+ if (owner.physical !== undefined) {
+ requireLogical({ abi: sourceFrontendPackageAbi, name: owner.frontend.id }, owner.physical);
+ }
+ const discovery = await owner.frontend.discover(prepareAuthorSource({ id: canonical, name, text }));
+ for (const request of discovery.modules) {
+ requireLogical({ abi: modulePackageAbi, name: request }, moduleOwner(request));
+ }
+ for (const child of discovery.sources) await discover(relativeSource(canonical, child.from));
+ return;
+ }
+ const owner = runs[0]!;
+ if (owner.physical !== undefined) {
+ requireLogical({ abi: sourceFrontendPackageAbi, name: owner.frontend.id }, owner.physical);
+ }
+ const discovery = await owner.frontend.discover(prepareRunSource({ id: canonical, name, text }));
+ for (const item of discovery.imports) {
+ requireLogical({ abi: runFragmentHostAbi, name: item.from }, fragmentOwner(item.from));
+ }
+ await discover(relativeSource(canonical, discovery.author.source));
+ };
+
+ await discover(canonicalSource);
+ return {
+ selected: [...selected].sort(),
+ logical: [...logical.values()].sort((left, right) => addressKey(left).localeCompare(addressKey(right))),
+ };
+}
diff --git a/packages/cli/src/source-packages.ts b/packages/cli/src/source-packages.ts
new file mode 100644
index 00000000..a462c79c
--- /dev/null
+++ b/packages/cli/src/source-packages.ts
@@ -0,0 +1,85 @@
+import {
+ createNodePackageInventory,
+ loadNodePackageSelection,
+ selectNodePackageSpecifiers,
+} from "@narratage/package-loader-node";
+import type {
+ LoadedNodePackageSet,
+ NodePackageBinding,
+} from "@narratage/package-loader-node";
+
+import type { CliDistribution } from "./distribution.js";
+
+type DiscoveryOptions = {
+ readonly source: string;
+ readonly workspaceRoot?: string;
+ readonly packageRoot: string;
+};
+
+function selectedKey(value: LoadedNodePackageSet): string {
+ return JSON.stringify(value.lock.selected);
+}
+
+function mergePackages(
+ ...groups: readonly (readonly NodePackageBinding[])[]
+): readonly NodePackageBinding[] {
+ return [...new Map(groups.flat().map((item) => [item.specifier, item])).values()];
+}
+
+async function discover(
+ distribution: CliDistribution,
+ options: DiscoveryOptions,
+ packages: readonly NodePackageBinding[],
+) {
+ const selection = await distribution.discoverSourcePackages?.(options.source, {
+ ...(options.workspaceRoot === undefined ? {} : { workspaceRoot: options.workspaceRoot }),
+ packages,
+ });
+ if (selection === undefined) throw new Error("this Distribution cannot discover Source packages");
+ return selection;
+}
+
+/** Select only the trusted inventory subset reached by recursive Frontend discovery. */
+export async function loadDiscoveredSourcePackages(
+ distribution: CliDistribution,
+ options: DiscoveryOptions & { readonly packageLock: string },
+): Promise<LoadedNodePackageSet> {
+ 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 };
+ }
+ roots = next;
+ inventory = await createNodePackageInventory(roots, options.packageRoot);
+ }
+}
diff --git a/packages/cli/test/build-services.test.ts b/packages/cli/test/build-services.test.ts
index 12bd767b..3033e6bb 100644
--- a/packages/cli/test/build-services.test.ts
+++ b/packages/cli/test/build-services.test.ts
@@ -5,6 +5,7 @@ import { join } from "node:path";
import test from "node:test";
import { digestOf } from "@narratage/protocol";
+import { createRunFrontendHostFacet } from "@narratage/run";
import { runCli } from "../src/main.js";
import type { CliDistribution, ExternalServiceResult } from "../src/distribution.js";
@@ -22,12 +23,17 @@ function distribution(
): CliDistribution {
return {
name: "test",
- builtInPackageContributions: [],
- runFrontends: [{
- id: "@narratage/run-markup@1",
- implementationDigest: digestOf("test-run-frontend"),
- discover() { throw new Error("createRuntimeFromConfig is unavailable"); },
- decode() { throw new Error("createRuntimeFromConfig is unavailable"); },
+ bootstrapPackages: [{
+ specifier: "@example/run-frontend",
+ contribution: {
+ format: "svml.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"); },
+ })],
+ },
}],
createCompiler: () => ({
openFile: async (path: string) => ({
diff --git a/packages/cli/test/control-commands.test.ts b/packages/cli/test/control-commands.test.ts
index a3aa6110..c8c0bf68 100644
--- a/packages/cli/test/control-commands.test.ts
+++ b/packages/cli/test/control-commands.test.ts
@@ -1,10 +1,9 @@
import assert from "node:assert/strict";
import test from "node:test";
-import type { LocalCredentialControl, LocalRuntimeControl } from "@narratage/local";
-
import type { CliDistribution } from "../src/distribution.js";
import { runCli } from "../src/main.js";
+import type { CliCredentialControl, CliRuntimeControl } from "../src/runtime-port.js";
test("queue opens durable control without constructing execution Providers", async () => {
const calls: string[] = [];
@@ -16,8 +15,9 @@ test("queue opens durable control without constructing execution Providers", asy
async close() {
calls.push("control.close");
},
- } as unknown as LocalRuntimeControl;
+ } as unknown as CliRuntimeControl;
const distribution = {
+ runtimeProfileRevision: async () => "test-revision",
createRuntimeControlFromConfig: async () => {
calls.push("control.create");
return control;
@@ -51,7 +51,11 @@ test("queue opens durable control without constructing execution Providers", asy
});
test("command options fail closed instead of being silently ignored", async () => {
- const distribution = {} as CliDistribution;
+ const distribution = {
+ createRuntimeControlFromConfig: async (path: string) => {
+ throw new Error(`profile delegated: ${path}`);
+ },
+ } as unknown as CliDistribution;
const io = { write() {} };
await assert.rejects(
async () => await runCli([
@@ -75,7 +79,7 @@ test("command options fail closed instead of being silently ignored", async () =
async () => await runCli([
"queue", "--runtime", "/tmp/svml.runtime.ts",
], io, distribution),
- /CLI Runtime Profiles are declarative JSON files/u,
+ /profile delegated: .*svml\.runtime\.ts/u,
);
});
@@ -95,7 +99,7 @@ test("auth opens only one Endpoint credential control, never the execution Runti
}];
},
async close() { calls.push("credentials.close"); },
- } as unknown as LocalCredentialControl;
+ } as unknown as CliCredentialControl;
const distribution = {
createRuntimeCredentialsFromConfig: async (_path: string, endpoint: string) => {
calls.push(`credentials.create:${endpoint}`);
@@ -136,7 +140,7 @@ test("auth login rejects a read-only CredentialStore before asking for a secret"
}];
},
async close() { closed = true; },
- } as unknown as LocalCredentialControl;
+ } as unknown as CliCredentialControl;
const distribution = {
createRuntimeCredentialsFromConfig: async () => credentials,
} as unknown as CliDistribution;
diff --git a/packages/cli/test/output.test.ts b/packages/cli/test/output.test.ts
index 1f66173c..07a4622a 100644
--- a/packages/cli/test/output.test.ts
+++ b/packages/cli/test/output.test.ts
@@ -164,7 +164,6 @@ test("plan keeps named Run choices visible and leaves graph internals to verbose
id: digest,
graph: digest,
request: digest,
- initialValues: [],
steps: [{
id: "step-1",
producer: { module: { name: "@narratage/media", version: "1" }, name: "inspect" },
@@ -213,7 +212,6 @@ test("a plan with no Needs stays compact without knowing any Provider names", ()
id: digest,
graph: digest,
request: digest,
- initialValues: [],
steps: [],
goals: [],
selections: [],
@@ -233,7 +231,6 @@ test("plan runtime preflight presents only demanded capabilities", () => {
id: digest,
graph: digest,
request: digest,
- initialValues: [],
steps: [],
goals: [],
selections: [],
diff --git a/packages/cli/test/runtime-build-process.test.ts b/packages/cli/test/runtime-build-process.test.ts
index c6ff2fbe..b0ff3912 100644
--- a/packages/cli/test/runtime-build-process.test.ts
+++ b/packages/cli/test/runtime-build-process.test.ts
@@ -10,6 +10,7 @@ import {
createNodePackageLock,
writeNodePackageLock,
} from "@narratage/package-loader-node";
+import { runtimeConfigRevision } from "@narratage/local/config";
import {
ensureRuntimeProcess,
@@ -130,7 +131,6 @@ test("CLI exits after durable submission and a restarted detached Worker complet
build: "state.builds",
operations: "state.operations",
dispatch: "state.dispatch",
- journal: "state.journal",
artifacts: "artifacts",
credentials: ["credentials.env"],
},
@@ -151,7 +151,7 @@ test("CLI exits after durable submission and a restarted detached Worker complet
process.on("SIGTERM", () => process.exit(0));
setInterval(() => {}, 1000);
`],
- }, 5_000);
+ }, await runtimeConfigRevision(profile), 5_000);
const submitted = await cli(project, [
"build", run,
"--build-id", build,
@@ -161,7 +161,7 @@ test("CLI exits after durable submission and a restarted detached Worker complet
]);
assert.equal(submitted.status, "queued", "the foreground CLI reports durable admission, not execution ownership");
assert.equal((submitted.dispatch as { readonly phase?: string }).phase, "queued");
- const originalProcess = await runtimeProcessStatus(profile);
+ const originalProcess = await runtimeProcessStatus(profile, await runtimeConfigRevision(profile));
assert.equal(originalProcess.state, "running", "the detached Runtime process outlives the submitting CLI process");
assert.equal(originalProcess.pid, parked.pid, "build reuses one profile-scoped Runtime process");
diff --git a/packages/cli/test/runtime-process.test.ts b/packages/cli/test/runtime-process.test.ts
index 5d93fde8..9c1894ef 100644
--- a/packages/cli/test/runtime-process.test.ts
+++ b/packages/cli/test/runtime-process.test.ts
@@ -34,16 +34,17 @@ test("one detached Runtime Worker is observable, reusable and explicitly stoppab
setInterval(() => {}, 1000);
`;
try {
- const first = await ensureRuntimeProcess(profile, { command: process.execPath, args: ["-e", program] }, 5_000);
+ const first = await ensureRuntimeProcess(
+ profile, { command: process.execPath, args: ["-e", program] }, "revision-1", 5_000);
assert.equal(first.state, "running");
assert.ok(first.pid);
- const second = await ensureRuntimeProcess(profile, { command: "must-not-run", args: [] }, 5_000);
+ const second = await ensureRuntimeProcess(profile, { command: "must-not-run", args: [] }, "revision-1", 5_000);
assert.equal(second.pid, first.pid);
const concurrent = await Promise.all(Array.from({ length: 8 }, async () =>
- await ensureRuntimeProcess(profile, { command: "must-not-run", args: [] }, 5_000)));
+ await ensureRuntimeProcess(profile, { command: "must-not-run", args: [] }, "revision-1", 5_000)));
assert.deepEqual([...new Set(concurrent.map((item) => item.pid))], [first.pid],
"concurrent clients share one atomically launched Worker");
- assert.equal((await runtimeProcessStatus(profile)).state, "running");
+ assert.equal((await runtimeProcessStatus(profile, "revision-1")).state, "running");
assert.match((await runtimeProcessLogs(profile)).text, /worker-ready/u);
const logPath = (await runtimeProcessLogs(profile)).path;
await appendFile(logPath, `${"x".repeat(1024 * 1024 + 64)}\ntail-marker\n`, "utf8");
@@ -51,8 +52,9 @@ test("one detached Runtime Worker is observable, reusable and explicitly stoppab
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)).state, "stale");
- const replaced = await ensureRuntimeProcess(profile, { command: process.execPath, args: ["-e", program] }, 5_000);
+ assert.equal((await runtimeProcessStatus(profile, "revision-2")).state, "stale");
+ const replaced = await ensureRuntimeProcess(
+ profile, { 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({
@@ -60,12 +62,13 @@ test("one detached Runtime Worker is observable, reusable and explicitly stoppab
packageLock: "./author.lock",
runtimePackageLock: "./runtime.lock",
}), "utf8");
- assert.equal((await runtimeProcessStatus(profile)).state, "stale");
- const replacedAgain = await ensureRuntimeProcess(profile, { command: process.execPath, args: ["-e", program] }, 5_000);
+ assert.equal((await runtimeProcessStatus(profile, "revision-3")).state, "stale");
+ const replacedAgain = await ensureRuntimeProcess(
+ profile, { command: process.execPath, args: ["-e", program] }, "revision-3", 5_000);
assert.notEqual(replacedAgain.pid, replaced.pid);
assert.equal(replacedAgain.state, "running");
assert.equal((await stopRuntimeProcess(profile, 5_000)).state, "stopped");
- assert.equal((await runtimeProcessStatus(profile)).state, "stopped");
+ assert.equal((await runtimeProcessStatus(profile, "revision-3")).state, "stopped");
} finally {
await stopRuntimeProcess(profile, 1_000).catch(() => undefined);
await rm(root, { recursive: true, force: true });
diff --git a/packages/cli/test/services-command.test.ts b/packages/cli/test/services-command.test.ts
index 87e9dad0..05cd37c6 100644
--- a/packages/cli/test/services-command.test.ts
+++ b/packages/cli/test/services-command.test.ts
@@ -9,8 +9,8 @@ const empty: ExternalServiceResult = { root: "/tmp", services: [] };
function distribution(calls: string[]): CliDistribution {
return {
name: "test",
- builtInPackageContributions: [],
- runFrontends: [],
+ bootstrapPackages: [],
+ runtimeProfileRevision: async () => "test-revision",
externalServices: {
up: async (path: string, options: { maxWaitMs?: number }) => {
calls.push(`up ${path} ${JSON.stringify(options)}`);
@@ -68,12 +68,12 @@ test("runtime up validates its Revision before starting any external program", a
...selected,
createRuntimeFromConfig: async () => {
calls.push("runtime.validate");
- throw new Error("Runtime Revision conflict");
+ throw new Error("Runtime Closure conflict");
},
} as CliDistribution;
await assert.rejects(
async () => await runCli(["runtime", "up", "/p/svml.runtime.json"], io, failing),
- /Runtime Revision conflict/u,
+ /Runtime Closure conflict/u,
);
assert.deepEqual(calls, ["runtime.validate"]);
});
diff --git a/packages/cli/test/source-discovery.test.ts b/packages/cli/test/source-discovery.test.ts
new file mode 100644
index 00000000..7ff1cfa1
--- /dev/null
+++ b/packages/cli/test/source-discovery.test.ts
@@ -0,0 +1,88 @@
+import assert from "node:assert/strict";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+
+import { digestOf, modulePackageAbi } from "@narratage/protocol";
+import { createAuthorFrontendHostFacet } from "@narratage/elaborator";
+import { createRunFrontendHostFacet, runFragmentHostAbi } from "@narratage/run";
+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-"));
+ 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");
+ await writeFile(join(root, "child.svml"), `<?svml using="@unknown/child@1"?>\nchild`, "utf8");
+ const packages = [
+ {
+ specifier: "@physical/run-suite",
+ contribution: { format: "svml.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" }],
+ }),
+ decode: () => { throw new Error("discovery must not decode Run Source"); },
+ })] },
+ },
+ {
+ specifier: "@physical/story-suite",
+ contribution: { format: "svml.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" }],
+ }),
+ decode: () => { throw new Error("discovery must not decode Author Source"); },
+ })] },
+ },
+ {
+ specifier: "@physical/module-suite",
+ contribution: { format: "svml.node-package@1" as const, modules: [{
+ manifest: {
+ format: "svml.module@1" as const,
+ name: "@logical/shared",
+ version: "1",
+ dependencies: [], types: [], capabilities: [], producers: [],
+ },
+ specifiers: ["@logical/shared@1"],
+ }] },
+ },
+ {
+ specifier: "@physical/fragment-suite",
+ contribution: { format: "svml.node-package@1" as const, hostFacets: [{
+ abi: runFragmentHostAbi,
+ offers: ["@logical/shared@1"],
+ identity: { contract: "example.fragment@1" },
+ implementation: {},
+ }] },
+ },
+ ];
+ const discovered = await discoverSourcePackages(join(root, "build.svrun"), {
+ workspaceRoot: root,
+ packages,
+ });
+ assert.deepEqual(discovered.selected, [
+ "@physical/fragment-suite",
+ "@physical/module-suite",
+ "@physical/run-suite",
+ "@physical/story-suite",
+ "@unknown/child",
+ ]);
+ assert.deepEqual(discovered.logical, [
+ { abi: modulePackageAbi, name: "@logical/shared@1" },
+ { abi: runFragmentHostAbi, name: "@logical/shared@1" },
+ { abi: sourceFrontendPackageAbi, name: "@logical/run@1" },
+ { abi: sourceFrontendPackageAbi, name: "@logical/story@1" },
+ { abi: sourceFrontendPackageAbi, name: "@unknown/child@1" },
+ ].sort((left, right) => `${left.abi}\u0000${left.name}`.localeCompare(`${right.abi}\u0000${right.name}`)));
+ } finally {
+ await rm(root, { recursive: true, force: true });
+ }
+});
diff --git a/packages/comment-sticker/src/activation.ts b/packages/comment-sticker/src/activation.ts
index ef9f7b43..6d8e760d 100644
--- a/packages/comment-sticker/src/activation.ts
+++ b/packages/comment-sticker/src/activation.ts
@@ -4,33 +4,26 @@ import {
commentStickerComponent,
commentStickerManifest,
commentStickerModuleRef,
- commentStickerStyleSurfaceImplementationDigest,
- commentStickerTrackSurfaceImplementationDigest,
decodeCommentStickerStyleSurface,
decodeCommentStickerTrackSurface,
+ commentStickerMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/comment-sticker",
modules: [{
manifest: commentStickerManifest,
- specifiers: [commentStickerModuleRef.name, `${commentStickerModuleRef.name}@1`],
}],
components: [commentStickerComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
module: commentStickerModuleRef,
- surface: "style",
- mode: "structured",
- implementationDigest: commentStickerStyleSurfaceImplementationDigest,
+ declaration: commentStickerMarkupSurfaces.find((item) => item.name === "style")!,
handler: decodeCommentStickerStyleSurface,
}),
createMarkupSurfaceHostFacet({
module: commentStickerModuleRef,
- surface: "track",
- mode: "structured",
- implementationDigest: commentStickerTrackSurfaceImplementationDigest,
+ declaration: commentStickerMarkupSurfaces.find((item) => item.name === "track")!,
handler: decodeCommentStickerTrackSurface,
}),
],
diff --git a/packages/comment-sticker/src/component.ts b/packages/comment-sticker/src/component.ts
index 590e287d..a559b902 100644
--- a/packages/comment-sticker/src/component.ts
+++ b/packages/comment-sticker/src/component.ts
@@ -50,7 +50,6 @@ function common(inputs: Record<string, { readonly value: StoredValue } | undefin
}
export const commentStickerComponent = {
- name: "@narratage/comment-sticker",
producers: [
{
producer: commentStickerProducers.createContent,
diff --git a/packages/comment-sticker/src/fragment.ts b/packages/comment-sticker/src/fragment.ts
index 11ad174a..4a8a1a34 100644
--- a/packages/comment-sticker/src/fragment.ts
+++ b/packages/comment-sticker/src/fragment.ts
@@ -40,7 +40,7 @@ function appendProducer(item: CommentStickerFragmentItem) {
return item.avatarName === undefined ? commentStickerProducers.appendMoment : commentStickerProducers.appendMomentAvatar;
}
-export function createCommentStickerFragment(items: readonly CommentStickerFragmentItem[], name: string) {
+export function createCommentStickerFragment(items: readonly CommentStickerFragmentItem[]) {
if (items.length === 0) throw new Error("Comment Sticker Fragment requires at least one Item.");
const types = new Map<string, TypeRef>();
const operations: FragmentOperation[] = [{
@@ -124,7 +124,6 @@ export function createCommentStickerFragment(items: readonly CommentStickerFragm
},
);
return sealGraphFragment({
- name,
inputs: [
{ name: "canvas", type: spatialTypes.canvas },
{ name: "header", type: commentStickerTypes.header },
diff --git a/packages/comment-sticker/src/index.ts b/packages/comment-sticker/src/index.ts
index 854cfad7..aaa89cfe 100644
--- a/packages/comment-sticker/src/index.ts
+++ b/packages/comment-sticker/src/index.ts
@@ -6,7 +6,7 @@ export {
commentStickerDependency,
commentStickerHeaderSchema,
commentStickerItemSpecSchema,
- commentStickerManifest,
+ commentStickerManifest, commentStickerMarkupSurfaces,
commentStickerManifestDigest,
commentStickerModuleRef,
commentStickerProducers,
diff --git a/packages/comment-sticker/src/manifest.ts b/packages/comment-sticker/src/manifest.ts
index a6982aee..ad455459 100644
--- a/packages/comment-sticker/src/manifest.ts
+++ b/packages/comment-sticker/src/manifest.ts
@@ -119,7 +119,7 @@ const itemSpec = object({
});
const frameSpan = object({ startFrame: { schema: unsignedInteger }, endFrameExclusive: { schema: positiveInteger } });
const item = object({
- id: { schema: string }, sourceOccurrenceId: { schema: string }, span: { schema: frameSpan },
+ id: { schema: string }, span: { schema: frameSpan },
frame: { schema: spatialFrameSchema }, style: { schema: style }, content: { schema: content },
avatar: { schema: blobRef, optional: true }, tieBreak: { schema: string },
});
@@ -139,8 +139,8 @@ export const commentStickerProgramSchema: ValueSchema = object({
export const commentStickerStyleSurfaceImplementationDigest = digestOf("@narratage/comment-sticker/style-surface@1");
export const commentStickerTrackSurfaceImplementationDigest = digestOf("@narratage/comment-sticker/track-surface@1");
-const registered = (locator: string, digest: ReturnType<typeof digestOf>) => ({ kind: "registered" as const, locator, digest });
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({ abi: "svml.type-validator@1" as const, implementation: registered(locator, digest) });
+const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
+const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: registered(digest) });
const appendInputs = [
{ name: "set", type: commentStickerTypes.set }, { name: "header", type: commentStickerTypes.header },
{ name: "frame", type: spatialTypes.frame }, { name: "style", type: commentStickerTypes.style },
@@ -148,6 +148,12 @@ const appendInputs = [
{ name: "content", type: commentStickerTypes.content },
] 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 } },
+ ] as const;
+
+
export const commentStickerManifest: ModuleManifest = {
format: "svml.module@1",
name: commentStickerModuleRef.name,
@@ -159,15 +165,11 @@ export const commentStickerManifest: ModuleManifest = {
{ 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("@narratage/comment-sticker/validate-program", commentStickerValidatorDigests.program) },
+ { name: commentStickerTypes.program.name, schema: commentStickerProgramSchema, validator: validator(commentStickerValidatorDigests.program) },
],
capabilities: [],
- surfaces: [
- { name: "style", tag: "Style", mode: "structured", outputs: [commentStickerTypes.style], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/comment-sticker/style-surface", digest: commentStickerStyleSurfaceImplementationDigest } },
- { name: "track", tag: "Track", mode: "structured", outputs: [textTypes.text, commentStickerTypes.header, commentStickerTypes.itemSpec, commentStickerTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/comment-sticker/track-surface", digest: commentStickerTrackSurfaceImplementationDigest } },
- ],
producers: [
- { name: commentStickerProducers.createContent.name, inputs: [{ name: "comment", type: textTypes.text }], outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [], implementation: registered("@narratage/comment-sticker/create-content", commentStickerImplementationDigests.createContent) },
+ { name: commentStickerProducers.createContent.name, inputs: [{ name: "comment", type: textTypes.text }], outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [], implementation: registered(commentStickerImplementationDigests.createContent) },
...([
[commentStickerProducers.setContentAuthor, commentStickerImplementationDigests.setContentAuthor, "author"],
[commentStickerProducers.setContentHeader, commentStickerImplementationDigests.setContentHeader, "header"],
@@ -176,25 +178,25 @@ export const commentStickerManifest: ModuleManifest = {
name: producer.name,
inputs: [{ name: "content", type: commentStickerTypes.content }, { name: field, type: textTypes.text }],
outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [],
- implementation: registered(`@narratage/comment-sticker/set-content-${field}`, implementationDigest),
+ implementation: registered(implementationDigest),
})),
- { name: commentStickerProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: commentStickerTypes.set }], needs: [], implementation: registered("@narratage/comment-sticker/create-set", commentStickerImplementationDigests.createSet) },
+ { name: commentStickerProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: commentStickerTypes.set }], needs: [], implementation: registered(commentStickerImplementationDigests.createSet) },
...([
- [commentStickerProducers.appendProgram, commentStickerImplementationDigests.appendProgram, "@narratage/comment-sticker/append-program", []],
- [commentStickerProducers.appendProgramAvatar, commentStickerImplementationDigests.appendProgramAvatar, "@narratage/comment-sticker/append-program-avatar", [{ name: "avatar", type: artifactTypes.blob }]],
- [commentStickerProducers.appendSelection, commentStickerImplementationDigests.appendSelection, "@narratage/comment-sticker/append-selection", [{ name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }]],
- [commentStickerProducers.appendSelectionAvatar, commentStickerImplementationDigests.appendSelectionAvatar, "@narratage/comment-sticker/append-selection-avatar", [{ name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }, { name: "avatar", type: artifactTypes.blob }]],
- [commentStickerProducers.appendMoment, commentStickerImplementationDigests.appendMoment, "@narratage/comment-sticker/append-moment", [{ name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }]],
- [commentStickerProducers.appendMomentAvatar, commentStickerImplementationDigests.appendMomentAvatar, "@narratage/comment-sticker/append-moment-avatar", [{ name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }, { name: "avatar", type: artifactTypes.blob }]],
- ] as const).map(([producer, implementationDigest, locator, extra]) => ({
+ [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]) => ({
name: producer.name,
inputs: [...appendInputs, ...extra],
outputs: [{ name: "set", type: commentStickerTypes.set }],
needs: [],
- implementation: registered(locator, implementationDigest),
+ 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("@narratage/comment-sticker/finalize", 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("@narratage/comment-sticker/render", commentStickerImplementationDigests.render) },
+ { 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) },
],
};
diff --git a/packages/comment-sticker/src/program.ts b/packages/comment-sticker/src/program.ts
index 7805f2cb..69dbc6a1 100644
--- a/packages/comment-sticker/src/program.ts
+++ b/packages/comment-sticker/src/program.ts
@@ -235,7 +235,6 @@ function realized(
if (avatar !== undefined) assertAvatar(avatar);
const additions = occurrences.map((occurrence, index): CommentStickerItemProgram => ({
id: occurrence.id,
- sourceOccurrenceId: occurrence.sourceOccurrenceId,
span: { ...occurrence.span },
frame: structuredClone(frame),
style: structuredClone(style),
@@ -306,7 +305,6 @@ export function assertCommentStickerProgram(value: CommentStickerProgram): void
identity(item.id, "CommentStickerItemProgram.id");
assert(!ids.has(item.id), `Duplicate Comment Sticker Item ${item.id}.`);
ids.add(item.id);
- assert(item.sourceOccurrenceId.length > 0, `Comment Sticker Item ${item.id} source occurrence is empty.`);
assert(item.span.startFrame >= 0 && item.span.endFrameExclusive > item.span.startFrame,
`Comment Sticker Item ${item.id} timing is invalid.`);
assertSpatialFrame(item.frame);
diff --git a/packages/comment-sticker/src/surface.ts b/packages/comment-sticker/src/surface.ts
index 96d59418..cfad5d18 100644
--- a/packages/comment-sticker/src/surface.ts
+++ b/packages/comment-sticker/src/surface.ts
@@ -244,7 +244,7 @@ export const decodeCommentStickerTrackSurface: StructuredSurfaceHandler = ({ ele
if (items.length === 0) throw new Error(`${element.name} requires at least one Sticker.`);
if (usesMap) inputs.map = reference(element.attributes.map, `${element.name}.map`, semanticMapTypes.complete, resolveReference).ref;
else if (element.attributes.map !== undefined) throw new Error(`${element.name}.map is unused.`);
- const fragment = createCommentStickerFragment(items, `@narratage/comment-sticker/surface/${id}@1`);
+ const fragment = createCommentStickerFragment(items);
return {
records,
components: [{ id, fragment: fragment.id, inputs, outputs: { program: `${id}.program`, track: `${id}.track` }, range: element.range }],
diff --git a/packages/comment-sticker/src/types.ts b/packages/comment-sticker/src/types.ts
index f50e9c2d..a8fbbfcc 100644
--- a/packages/comment-sticker/src/types.ts
+++ b/packages/comment-sticker/src/types.ts
@@ -96,7 +96,6 @@ export type CommentStickerHeader = {
export type CommentStickerItemProgram = {
readonly id: string;
- readonly sourceOccurrenceId: string;
readonly span: FrameSpan;
readonly frame: SpatialFrame;
readonly style: CommentStickerStyle;
diff --git a/packages/compiler-markup-node/package.json b/packages/compiler-markup-node/package.json
index 38287d12..150610a7 100644
--- a/packages/compiler-markup-node/package.json
+++ b/packages/compiler-markup-node/package.json
@@ -11,12 +11,13 @@
"@narratage/compiler-node": "workspace:*",
"@narratage/component-kit": "workspace:*",
"@narratage/elaborator": "workspace:*",
- "@narratage/host": "workspace:*",
+ "@narratage/workspace": "workspace:*",
"@narratage/package-loader-node": "workspace:*",
"@narratage/markup": "workspace:*",
"@narratage/validation": "workspace:*"
},
"devDependencies": {
- "@narratage/protocol": "workspace:*"
+ "@narratage/protocol": "workspace:*",
+ "@narratage/workspace-fs-node": "workspace:*"
}
}
diff --git a/packages/compiler-markup-node/src/index.ts b/packages/compiler-markup-node/src/index.ts
index 0ec1361a..05107f16 100644
--- a/packages/compiler-markup-node/src/index.ts
+++ b/packages/compiler-markup-node/src/index.ts
@@ -3,8 +3,8 @@ import {
ModulePackageRegistry,
NodeCompiler,
} from "@narratage/compiler-node";
-import { AuthorFrontendRegistry } from "@narratage/elaborator";
-import type { Workspace } from "@narratage/host";
+import { AuthorFrontendRegistry, installAuthorFrontendHostFacets } from "@narratage/elaborator";
+import type { Workspace } from "@narratage/workspace";
import {
assertNodePackageContribution,
collectNodePackageComponents,
@@ -19,17 +19,14 @@ import {
import { TypeValidatorRegistry } from "@narratage/validation";
export type CreateMarkupNodeCompilerOptions = {
- readonly root?: string;
- readonly assetRoots?: readonly string[];
- readonly workspace?: Workspace;
+ readonly workspace: Workspace;
};
/** Assemble the official Markup authoring environment from already trusted package facets. */
export function createMarkupNodeCompiler(
packages: readonly NodePackageContribution[],
- options: CreateMarkupNodeCompilerOptions = {},
+ options: CreateMarkupNodeCompilerOptions,
): NodeCompiler {
- const names = new Set<string>();
const modules = new ModulePackageRegistry();
const surfaces = new MarkupSurfaceRegistry();
const frontends = new AuthorFrontendRegistry();
@@ -37,11 +34,9 @@ export function createMarkupNodeCompiler(
for (const item of packages) {
assertNodePackageContribution(item);
- if (names.has(item.name)) throw new Error(`Node package contribution ${item.name} is listed twice`);
- names.add(item.name);
for (const module of item.modules ?? []) modules.register(module);
installMarkupSurfaceHostFacets(item.hostFacets ?? [], surfaces);
- for (const frontend of item.authorFrontends ?? []) frontends.register(frontend);
+ installAuthorFrontendHostFacets(item.hostFacets ?? [], frontends);
}
for (const component of collectNodePackageComponents(packages)) {
@@ -61,8 +56,6 @@ export function createMarkupNodeCompiler(
modules,
frontends,
validators,
- ...(options.root === undefined ? {} : { root: options.root }),
- ...(options.assetRoots === undefined ? {} : { assetRoots: options.assetRoots }),
- ...(options.workspace === undefined ? {} : { workspace: options.workspace }),
+ workspace: options.workspace,
});
}
diff --git a/packages/compiler-markup-node/test/compiler.test.ts b/packages/compiler-markup-node/test/compiler.test.ts
index cab8bc26..80ce7b53 100644
--- a/packages/compiler-markup-node/test/compiler.test.ts
+++ b/packages/compiler-markup-node/test/compiler.test.ts
@@ -12,14 +12,21 @@ 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",
- name: "example-card",
modules: [{
manifest: {
format: "svml.module@1",
@@ -28,17 +35,6 @@ const installedPackage: NodePackageContribution = {
dependencies: [],
types: [{ name: resultType.name, schema: { kind: "string", minLength: 1 } }],
capabilities: [],
- surfaces: [{
- name: "card",
- tag: "Card",
- mode: "structured",
- outputs: [resultType],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.card/card",
- digest: implementationDigest,
- },
- }],
producers: [],
},
specifiers: ["example.card@1"],
@@ -46,9 +42,7 @@ const installedPackage: NodePackageContribution = {
hostFacets: [
createMarkupSurfaceHostFacet({
module,
- surface: "card",
- mode: "structured",
- implementationDigest,
+ declaration: cardSurface,
handler({ element }) {
return {
records: [{
@@ -81,12 +75,14 @@ test("Markup compiler alone selects Markup Surface Host facets from a generic pa
<import as="example" from="example.card@1"/>
<example:Card/>
</svml>`, "utf8");
- const compiler = createMarkupNodeCompiler([installedPackage], { root });
+ const compiler = createMarkupNodeCompiler([installedPackage], {
+ workspace: new NodeFilesystemWorkspace({ root }),
+ });
const result = await compiler.compileFile(source);
assert.deepEqual(result.program.closure.modules.map((item) => item.ref), [module]);
- assert.equal(result.module.records[0]?.value.kind, "inline");
- assert.equal(result.elaboration.graph.operations.length, 0);
+ assert.equal(result.program.records[0]?.value.kind, "inline");
+ assert.equal(result.graph.operations.length, 0);
} finally {
await rm(root, { recursive: true, force: true });
}
diff --git a/packages/compiler-node/README.md b/packages/compiler-node/README.md
index cd880459..54f70e28 100644
--- a/packages/compiler-node/README.md
+++ b/packages/compiler-node/README.md
@@ -21,10 +21,10 @@ their digest-bound dependencies. It does not install npm packages or execute mod
embedding application must register the manifests and matching Frontend/Surface implementations it
has chosen to trust.
-`NodeCompiler` accepts the host-neutral `Workspace` contract. With no explicit Workspace it creates
-the convenient `@narratage/workspace-fs-node` default: relative recursive Source imports are confined to
-one canonical root, symlink escapes are rejected and each edge is locked to the first bytes read for
-that compilation. A browser, Git, memory or remote Host can inject another Workspace without
+`NodeCompiler` requires the host-neutral `Workspace` contract. The reference CLI explicitly selects
+`@narratage/workspace-fs-node`, where relative recursive Source imports are confined to one canonical
+root, symlink escapes are rejected and each edge is locked to the first bytes read for that
+compilation. A browser, Git, memory or remote Host can supply another Workspace without
changing Frontends, Surfaces, Source Closure identity or Core.
The Workspace session owns a separate Source Asset capability. A Frontend/Surface may request an
diff --git a/packages/compiler-node/package.json b/packages/compiler-node/package.json
index 4726fff2..0784f1df 100644
--- a/packages/compiler-node/package.json
+++ b/packages/compiler-node/package.json
@@ -10,15 +10,15 @@
"dependencies": {
"@narratage/core": "workspace:*",
"@narratage/elaborator": "workspace:*",
- "@narratage/host": "workspace:*",
+ "@narratage/workspace": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/run": "workspace:*",
"@narratage/source": "workspace:*",
- "@narratage/validation": "workspace:*",
- "@narratage/workspace-fs-node": "workspace:*"
+ "@narratage/validation": "workspace:*"
},
"devDependencies": {
"@narratage/run-markup": "workspace:*",
- "@narratage/markup": "workspace:*"
+ "@narratage/markup": "workspace:*",
+ "@narratage/workspace-fs-node": "workspace:*"
}
}
diff --git a/packages/compiler-node/src/compiler.ts b/packages/compiler-node/src/compiler.ts
index 95530e49..d814907b 100644
--- a/packages/compiler-node/src/compiler.ts
+++ b/packages/compiler-node/src/compiler.ts
@@ -1,5 +1,4 @@
import { createHash } from "node:crypto";
-import { resolve } from "node:path";
import {
compileSourceClosure,
@@ -12,24 +11,23 @@ import {
import type {
AuthorFrontendRegistryLike,
AuthorSourceDiscovery,
- AuthorSourceUnit,
CompiledSourceClosure,
AuthorRecordAdmitter,
} from "@narratage/elaborator";
-import type { ArtifactAttachment, Workspace, WorkspaceSession } from "@narratage/host";
+import type { SourceUnit } from "@narratage/source";
+import type { ArtifactAttachment, Workspace, WorkspaceSession } from "@narratage/workspace";
import type { BlobRef, LinkedProgram } from "@narratage/protocol";
import {
TypeValidatorRegistry,
createRecordAdmitter,
} from "@narratage/validation";
import type { TypeValidatorRegistryLike } from "@narratage/validation";
-import { NodeFilesystemWorkspace } from "@narratage/workspace-fs-node";
import { NodeCompilerError } from "./error.js";
import type { ModulePackageRegistryLike } from "./modules.js";
type DiscoveredUnit = {
- readonly source: AuthorSourceUnit;
+ readonly source: SourceUnit;
readonly frontend: string;
readonly discovery: AuthorSourceDiscovery;
};
@@ -63,13 +61,13 @@ function mergeAttachments(groups: readonly (readonly ArtifactAttachment[])[]): r
}
async function discoverClosure(
- entry: AuthorSourceUnit,
+ entry: SourceUnit,
frontends: AuthorFrontendRegistryLike,
workspace: WorkspaceSession,
): Promise<readonly DiscoveredUnit[]> {
const units = new Map<string, DiscoveredUnit>();
const visiting = new Set<string>();
- const visit = async (source: AuthorSourceUnit): Promise<void> => {
+ const visit = async (source: SourceUnit): Promise<void> => {
const prepared = prepareAuthorSource(source);
const selectedFrontend = prepared.header.using;
const key = `${source.id}\u0000${selectedFrontend}`;
@@ -96,12 +94,8 @@ async function discoverClosure(
export type NodeCompilerOptions = {
readonly modules: ModulePackageRegistryLike;
readonly frontends: AuthorFrontendRegistryLike;
- /** Files reachable through source imports must resolve inside this root. Defaults to entry dirname. */
- readonly root?: string;
- /** Additional Host-authorized roots for asset bytes, never Source imports. */
- readonly assetRoots?: readonly string[];
- /** Replaces the default Node filesystem definition environment. */
- readonly workspace?: Workspace;
+ /** Explicit definition environment selected by the Host. */
+ readonly workspace: Workspace;
/** Trusted Type-owner validators used to admit authored Records before linking. */
readonly validators?: TypeValidatorRegistryLike;
/** Low-level Host hook for a sandboxed or remote admission implementation. */
@@ -125,12 +119,6 @@ export class NodeCompiler {
"NodeCompiler accepts validators or a custom Record admitter, not both",
);
}
- if (options.workspace !== undefined && (options.root !== undefined || options.assetRoots !== undefined)) {
- throw new NodeCompilerError(
- "AMBIGUOUS_WORKSPACE",
- "NodeCompiler accepts a Workspace or the root option for its default filesystem Workspace, not both",
- );
- }
this.#options = options;
this.#admitRecord = options.admitRecord
?? createRecordAdmitter(options.validators ?? new TypeValidatorRegistry());
@@ -142,12 +130,7 @@ export class NodeCompiler {
/** Open one read-once Workspace session so a Host can inspect the Source Header and compile it once. */
async openFile(file: string): Promise<WorkspaceSession> {
- return this.#options.workspace === undefined
- ? await new NodeFilesystemWorkspace({
- ...(this.#options.root === undefined ? {} : { root: this.#options.root }),
- ...(this.#options.assetRoots === undefined ? {} : { assetRoots: this.#options.assetRoots }),
- }).open(resolve(file))
- : await this.#options.workspace.open(file);
+ return await this.#options.workspace.open(file);
}
async compileFile(file: string): Promise<NodeCompiledSourceClosure> {
@@ -156,7 +139,7 @@ export class NodeCompiler {
}
/** Compile an explicitly resolved self-describing SourceUnit inside one already isolated Workspace. */
- async compileSource(entry: AuthorSourceUnit, workspace: WorkspaceSession): Promise<NodeCompiledSourceClosure> {
+ async compileSource(entry: SourceUnit, workspace: WorkspaceSession): Promise<NodeCompiledSourceClosure> {
const embeddedAttachments = new Map<string, ArtifactAttachment>();
const discovered = await discoverClosure(
entry,
@@ -166,10 +149,25 @@ export class NodeCompiler {
const closure = this.#options.modules.createClosure(
discovered.flatMap((unit) => unit.discovery.modules),
);
+ const discoveries = new Map(discovered.map((unit) => [
+ `${unit.source.id}\u0000${unit.frontend}`,
+ unit.discovery,
+ ]));
const compilation = await compileSourceClosure({
entry,
closure,
frontends: this.#options.frontends,
+ discover(source, frontend) {
+ const discovery = discoveries.get(`${source.id}\u0000${frontend.id}`);
+ if (discovery === undefined) {
+ throw new NodeCompilerError(
+ "SOURCE_DISCOVERY_MISSING",
+ `Source ${source.name} was not present in the frozen discovery closure`,
+ source.id,
+ );
+ }
+ return discovery;
+ },
resolveSource: workspace.resolveSource,
async resolveAsset(importer, request) {
if (request.bytes === undefined) return await workspace.resolveAsset(importer, request);
@@ -211,11 +209,9 @@ export class NodeCompiler {
const existing = program.closure.modules.map((item) => `${item.ref.name}@${item.ref.version}`);
const closure = this.#options.modules.createClosure([...existing, ...requests]);
if (closure.digest === program.closure.digest) return program;
- const rebound = program.modules.map((module) => sealTypedModule({
- id: module.id,
- closureDigest: closure.digest,
- records: module.records,
- }));
+ const rebound = program.records.length === 0 ? [] : [sealTypedModule({
+ records: program.records,
+ })];
const extended = link(closure, rebound);
if (extended.semanticDigest !== program.semanticDigest) {
throw new NodeCompilerError(
diff --git a/packages/compiler-node/src/run.ts b/packages/compiler-node/src/run.ts
index d33a5436..5debb9b0 100644
--- a/packages/compiler-node/src/run.ts
+++ b/packages/compiler-node/src/run.ts
@@ -1,24 +1,20 @@
-import type { Workspace, WorkspaceSession } from "@narratage/host";
+import type { WorkspaceSession } from "@narratage/workspace";
import { resolveCompiledSourceExport } from "@narratage/elaborator";
import {
- compileBuild,
- createResolvedClosure,
- link,
sealBuildRequest,
sealCompiledGraph,
- sealTypedModule,
+ sliceExecution,
start,
} from "@narratage/core";
import type {
ArtifactAttachment,
-} from "@narratage/host";
+} from "@narratage/workspace";
import type {
BuildPlan,
BuildRequest,
BuildState,
BuildState as ArchivedBuildState,
Digest,
- ModuleRef,
StoredValue,
} from "@narratage/protocol";
import {
@@ -33,8 +29,6 @@ import type {
RunSourceUnit,
} from "@narratage/run";
import type { LinkedProgram } from "@narratage/protocol";
-import { NodeFilesystemWorkspace } from "@narratage/workspace-fs-node";
-import { resolve } from "node:path";
import type { NodeCompiledSourceClosure } from "./compiler.js";
import { NodeCompiler } from "./compiler.js";
@@ -43,8 +37,6 @@ export type NodeRunCompilerOptions = {
readonly authorCompiler: NodeCompiler;
readonly frontends: RunFrontendRegistryLike;
readonly fragments: RunFragmentRegistryLike;
- readonly root?: string;
- readonly workspace?: Workspace;
readonly readBuild?: (id: string) => Promise<ArchivedBuildState | undefined> | ArchivedBuildState | undefined;
readonly resolveBuildOutput?: (
build: string,
@@ -79,110 +71,13 @@ export type NodeCheckedRun = {
export type PlannedBuild = {
readonly compilation: NodeCompiledRun;
+ /** Convenience view of `state.request`; `state` remains the sole durable authority. */
readonly request: BuildRequest;
+ /** Convenience view of `state.plan`; `state` remains the sole durable authority. */
readonly plan: BuildPlan;
readonly state: BuildState;
};
-function moduleKey(ref: ModuleRef): string {
- return `${ref.name}\u0000${ref.version}`;
-}
-
-/**
- * Materialize the exact execution slice selected by one BuildRequest.
- *
- * Author compilation deliberately keeps the whole document available. A durable
- * Build does not need unrelated Tracks, renderers and their schemas merely
- * because the Author Source imported them. Keeping those bytes in every state
- * revision made a four-node estimate Build carry megabytes of unrelated video
- * declarations. The Build graph below retains only the realized Candidates and
- * their reachable executable branches.
- */
-function executionSlice(
- program: LinkedProgram,
- graph: ReturnType<typeof sealCompiledGraph>,
- request: BuildRequest,
-): { readonly program: LinkedProgram; readonly graph: ReturnType<typeof sealCompiledGraph> } {
- const preliminary = compileBuild(program, graph, request);
- const outputById = new Map(graph.outputs.map((item) => [item.id, item]));
- const candidateById = new Map(graph.candidates.map((item) => [item.id, item]));
- const operationById = new Map(graph.operations.map((item) => [item.id, item]));
- const selectionByOutput = new Map(preliminary.selections.map((item) => [item.output, item]));
- const outputs = new Set<string>();
- const candidates = new Set<string>();
- const operations = new Set<string>();
- const records = new Set<string>();
-
- const visitRef = (ref: import("@narratage/protocol").GraphValueRef): void => {
- if (ref.kind === "record") {
- records.add(ref.id);
- } else if (ref.kind === "logical-output") {
- visitOutput(ref.id);
- } else {
- visitOperation(ref.operation);
- }
- };
- const visitOperation = (id: string): void => {
- if (operations.has(id)) return;
- const operation = operationById.get(id);
- if (operation === undefined) throw new Error(`execution slice refers to absent Operation ${id}`);
- operations.add(id);
- Object.values(operation.inputs).forEach(visitRef);
- };
- const visitCandidate = (id: string): void => {
- if (candidates.has(id)) return;
- const candidate = candidateById.get(id);
- if (candidate === undefined) throw new Error(`execution slice refers to absent Candidate ${id}`);
- candidates.add(id);
- if (candidate.root.kind === "operation") visitOperation(candidate.root.result.operation);
- };
- const visitOutput = (id: string): void => {
- if (outputs.has(id)) return;
- const output = outputById.get(id);
- if (output === undefined) throw new Error(`execution slice refers to absent Logical Output ${id}`);
- outputs.add(id);
- visitCandidate(selectionByOutput.get(id)?.candidate ?? output.primary);
- };
- request.targets.forEach((target) => visitOutput(target.output));
-
- const selectedOutputs = graph.outputs.filter((item) => outputs.has(item.id));
- const selectedCandidates = graph.candidates.filter((item) => candidates.has(item.id));
- const selectedOperations = graph.operations.filter((item) => operations.has(item.id));
- const authoredRecords = program.records.filter((record) => records.has(record.id));
-
- const requiredModules = new Set<string>();
- const requireModule = (ref: ModuleRef): void => {
- const key = moduleKey(ref);
- if (requiredModules.has(key)) return;
- const resolved = program.closure.modules.find((item) => moduleKey(item.ref) === key);
- if (resolved === undefined) throw new Error(`execution slice refers to absent module ${ref.name}@${ref.version}`);
- requiredModules.add(key);
- resolved.manifest.dependencies.forEach((item) => requireModule(item.module));
- };
- selectedOperations.forEach((item) => requireModule(item.producer.module));
- selectedOutputs.forEach((item) => requireModule(item.type.module));
- selectedCandidates.forEach((item) => requireModule(item.type.module));
- authoredRecords.forEach((item) => requireModule(item.type.module));
-
- const closure = createResolvedClosure(program.closure.modules
- .filter((item) => requiredModules.has(moduleKey(item.ref)))
- .map((item) => item.manifest));
- const typedModules = program.modules.flatMap((item) => {
- const selected = item.records.filter((record) => records.has(record.id));
- return selected.length === 0
- ? []
- : [sealTypedModule({ id: item.id, closureDigest: closure.digest, records: selected })];
- });
- const slicedProgram = link(closure, typedModules);
- const slicedGraph = sealCompiledGraph({
- program: slicedProgram.semanticDigest,
- outputs: selectedOutputs,
- candidates: selectedCandidates,
- operations: selectedOperations,
- });
- return { program: slicedProgram, graph: slicedGraph };
-}
-
function decodeStoredValue(bytes: Uint8Array, from: string): StoredValue {
let parsed: unknown;
try {
@@ -237,9 +132,6 @@ export class NodeRunCompiler {
readonly #options: NodeRunCompilerOptions;
constructor(options: NodeRunCompilerOptions) {
- if (options.workspace !== undefined && options.root !== undefined) {
- throw new Error("NodeRunCompiler accepts a Workspace or root, not both");
- }
this.#options = options;
}
@@ -248,11 +140,7 @@ export class NodeRunCompiler {
}
async compileFile(file: string): Promise<NodeCompiledRun> {
- const workspace = this.#options.workspace === undefined
- ? await new NodeFilesystemWorkspace({
- ...(this.#options.root === undefined ? {} : { root: this.#options.root }),
- }).open(resolve(file))
- : await this.#options.workspace.open(file);
+ const workspace = await this.#options.authorCompiler.openFile(file);
return await this.compileSource(workspace.entry, workspace);
}
@@ -389,7 +277,7 @@ export class NodeRunCompiler {
}
planCompilation(compilation: NodeCompiledRun, implementationClosure?: Digest): PlannedBuild {
- const authorGraph = compilation.author.elaboration.graph;
+ const authorGraph = compilation.author.graph;
const selected = new Map(compilation.run.graph.satisfactions.map((item) => [item.output, item.candidate]));
const fullGraph = sealCompiledGraph({
program: compilation.program.semanticDigest,
@@ -405,14 +293,14 @@ export class NodeRunCompiler {
...(implementationClosure === undefined ? {} : { implementationClosure }),
targets: compilation.run.graph.targets,
});
- const sliced = executionSlice(compilation.program, fullGraph, fullRequest);
+ 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, plan: state.plan, state };
+ return { compilation, request: state.request, plan: state.plan, state };
}
async planFile(file: string, implementationClosure?: Digest): Promise<PlannedBuild> {
diff --git a/packages/compiler-node/test/compiler.test.ts b/packages/compiler-node/test/compiler.test.ts
index 11de35fe..895042ea 100644
--- a/packages/compiler-node/test/compiler.test.ts
+++ b/packages/compiler-node/test/compiler.test.ts
@@ -24,7 +24,6 @@ import {
import {
AuthorFrontendRegistry,
sealGraphFragment,
- verifySourceClosure,
} from "@narratage/elaborator";
import type {
AuthorSourceAssetRequest,
@@ -44,8 +43,8 @@ import {
RunFrontendRegistry,
} from "@narratage/run";
import { runMarkupFrontend } from "@narratage/run-markup";
-import type { ArtifactAttachment, Workspace } from "@narratage/host";
-import { WorkspaceError } from "@narratage/host";
+import type { ArtifactAttachment, Workspace } from "@narratage/workspace";
+import { WorkspaceError } from "@narratage/workspace";
import {
createMarkupAuthorFrontend,
MarkupSurfaceRegistry,
@@ -60,7 +59,6 @@ function emptyManifest(name: string, version = "1"): ModuleManifest {
dependencies: [],
types: [],
capabilities: [],
- surfaces: [],
producers: [],
};
}
@@ -115,6 +113,10 @@ const laboratory = { name: "example.compiler-lab", version: "1" } as const;
const resultType = { module: laboratory, name: "Result" } satisfies TypeRef;
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",
name: laboratory.name,
@@ -122,31 +124,17 @@ const laboratoryManifest: ModuleManifest = {
dependencies: [],
types: [{ name: resultType.name, schema: { kind: "string", minLength: 1 } }],
capabilities: [],
- surfaces: [{
- name: "result",
- tag: "Result",
- mode: "structured",
- outputs: [],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.compiler-lab/surface",
- digest: surfaceDigest,
- },
- }],
producers: [{
name: producer.name,
inputs: [],
outputs: [{ name: "result", type: resultType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.compiler-lab/produce",
digest: digestOf("example.compiler-lab/produce@1"),
},
}],
};
const fragment = sealGraphFragment({
- name: "example.compiler-lab/result@1",
inputs: [],
operations: [{
id: "produce",
@@ -164,28 +152,28 @@ const fragment = sealGraphFragment({
const assetLaboratory = { name: "example.asset-lab", version: "1" } as const;
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" } }],
- surfaces: [{
- name: "asset",
- tag: "Asset",
- mode: "structured",
- outputs: [assetType],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.asset-lab/surface",
- digest: assetSurfaceDigest,
- },
- }],
};
-function compiler(root: string, additional: readonly ModuleManifest[] = []): NodeCompiler {
+function compiler(
+ root: string,
+ additional: readonly ModuleManifest[] = [],
+ onDiscover?: () => void,
+): NodeCompiler {
const modules = new ModulePackageRegistry();
modules.register({ manifest: laboratoryManifest });
for (const manifest of additional) modules.register({ manifest });
const surfaces = new MarkupSurfaceRegistry();
- surfaces.registerStructured(laboratory, "result", surfaceDigest, ({ element }) => {
+ surfaces.registerStructured({
+ module: laboratory,
+ declaration: resultSurface,
+ handler: ({ element }) => {
const id = element.attributes.id;
if (typeof id !== "string") throw new Error("Result id is required");
return {
@@ -199,17 +187,25 @@ function compiler(root: string, additional: readonly ModuleManifest[] = []): Nod
}],
fragments: [fragment],
};
+ },
});
const frontends = new AuthorFrontendRegistry();
- frontends.register(createMarkupAuthorFrontend({
+ const frontend = createMarkupAuthorFrontend({
registry: surfaces,
resolveModule(request): ModuleRef {
const resolved = modules.resolve(request.from);
if (resolved === undefined) throw new Error(`unknown module ${request.from}`);
return resolved;
},
- }));
- return new NodeCompiler({ modules, frontends, root });
+ });
+ frontends.register({
+ ...frontend,
+ discover(source) {
+ onDiscover?.();
+ return frontend.discover(source);
+ },
+ });
+ return new NodeCompiler({ modules, frontends, workspace: new NodeFilesystemWorkspace({ root }) });
}
const previewModule = { name: "example.compiler-preview", version: "1" } as const;
@@ -226,14 +222,11 @@ const previewManifest: ModuleManifest = {
outputs: [{ name: "result", type: resultType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.compiler-preview/preview",
digest: digestOf("example.compiler-preview/preview@1"),
},
}],
};
const previewFragment = sealGraphFragment({
- name: "example.compiler-preview/preview@1",
inputs: [],
operations: [{
id: "preview",
@@ -252,7 +245,10 @@ function assetCompiler(environment: { readonly root: string } | { readonly works
const modules = new ModulePackageRegistry();
modules.register({ manifest: assetManifest });
const surfaces = new MarkupSurfaceRegistry();
- surfaces.registerStructured(assetLaboratory, "asset", assetSurfaceDigest, async ({ element, resolveAsset }) => {
+ surfaces.registerStructured({
+ module: assetLaboratory,
+ declaration: assetSurface,
+ handler: async ({ element, resolveAsset }) => {
const id = element.attributes.id;
const src = element.attributes.src;
if (typeof id !== "string" || typeof src !== "string") throw new Error("Asset id and src are required");
@@ -269,6 +265,7 @@ function assetCompiler(environment: { readonly root: string } | { readonly works
components: [],
fragments: [],
};
+ },
});
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({
@@ -279,7 +276,13 @@ function assetCompiler(environment: { readonly root: string } | { readonly works
return resolved;
},
}));
- return new NodeCompiler({ modules, frontends, ...environment });
+ return new NodeCompiler({
+ modules,
+ frontends,
+ workspace: "workspace" in environment
+ ? environment.workspace
+ : new NodeFilesystemWorkspace({ root: environment.root }),
+ });
}
function memoryWorkspace(sourceText: string, assetBytes: Uint8Array): Workspace {
@@ -342,9 +345,11 @@ test("Node Compiler discovers real imports and emits a named public Author Graph
<lab:Result id="hello"/>
</svml>`, "utf8");
- const compiled = await compiler(root).compileFile(file);
+ let discoveries = 0;
+ const compiled = await compiler(root, [], () => { discoveries += 1; }).compileFile(file);
assert.equal(compiled.exports[0]?.name, "hello.result");
- assert.equal(compiled.elaboration.graph.outputs.length, 1);
+ assert.equal(compiled.graph.outputs.length, 1);
+ assert.equal(discoveries, 1, "the frozen Import Prologue must not execute Frontend discovery twice");
});
@@ -362,7 +367,7 @@ test("Author Frontend identity comes only from the mandatory Source Header, neve
const first = await compiler(root).compileFile(svml);
const second = await compiler(root).compileFile(arbitrary);
assert.equal(first.closure.id, second.closure.id);
- assert.equal(first.elaboration.graph.id, second.elaboration.graph.id);
+ assert.equal(first.graph.id, second.graph.id);
const missing = join(root, "missing.svml");
await writeFile(missing, "<svml/>", "utf8");
@@ -397,7 +402,7 @@ test("Run-only Fragment modules extend the execution closure without polluting t
frontends.register(runMarkupFrontend);
const fragments = new RunFragmentRegistry();
fragments.register({ name: "@example/preview", fragments: { result: previewFragment } });
- const runCompiler = new NodeRunCompiler({ authorCompiler, frontends, fragments, root });
+ const runCompiler = new NodeRunCompiler({ authorCompiler, frontends, fragments });
const compiled = await runCompiler.compileFile(runFile);
const planned = runCompiler.planCompilation(compiled);
@@ -414,7 +419,8 @@ test("Run-only Fragment modules extend the execution closure without polluting t
[laboratory.name, previewModule.name].sort(),
"the durable Build keeps only modules needed by its selected execution slice",
);
- assert.equal(compiled.run.graph.authorGraph, compiled.author.elaboration.graph.id);
+ assert.equal(planned.plan, planned.state.plan);
+ assert.equal(planned.request, planned.state.request);
assert.equal(planned.plan.steps.length, 1);
assert.equal(planned.plan.steps[0]?.producer.name, previewProducer.name);
});
@@ -442,7 +448,6 @@ test("static Run checking accepts a future BuildRecord without opening a BuildAr
authorCompiler,
frontends,
fragments: new RunFragmentRegistry(),
- root,
});
const workspace = await new NodeFilesystemWorkspace({ root }).open(runFile);
const checked = await runCompiler.checkSource(workspace.entry, workspace);
@@ -477,7 +482,6 @@ test("static Run checking suggests the nearest Author export", async () => {
authorCompiler: compiler(root),
frontends,
fragments: new RunFragmentRegistry(),
- root,
});
const workspace = await new NodeFilesystemWorkspace({ root }).open(runFile);
await assert.rejects(
@@ -486,7 +490,7 @@ test("static Run checking suggests the nearest Author export", async () => {
);
});
-test("source assets are content addressed, closure-bound and returned as a Host transfer bundle", 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 file = join(root, "main.svml");
const asset = join(root, "reference.bin");
@@ -498,27 +502,10 @@ test("source assets are content addressed, closure-bound and returned as a Host
await writeFile(asset, new Uint8Array([1, 2, 3, 4]));
const first = await assetCompiler({ root }).compileFile(file);
- const unit = first.closure.units.find((item) => item.assets.length > 0);
const attachment = first.attachments[0];
- assert.equal(unit?.assets[0]?.from, "./reference.bin");
- assert.equal(unit?.assets[0]?.artifact.digest, attachment?.artifact.digest);
assert.deepEqual(await readAttachment(attachment), new Uint8Array([1, 2, 3, 4]));
- assert.equal(first.module.records[0]?.value.kind, "blob");
- assert.equal(first.module.records[0]?.value.kind === "blob" ? first.module.records[0].value.digest : undefined, attachment?.artifact.digest);
- const tamperedUnit = first.closure.units.map((item) => item === unit
- ? {
- ...item,
- assets: item.assets.map((sourceAsset) => ({
- ...sourceAsset,
- artifact: { ...sourceAsset.artifact, size: sourceAsset.artifact.size + 1 },
- })),
- }
- : item);
- assert.throws(
- () => verifySourceClosure({ ...first.closure, units: tamperedUnit }),
- /digest differs/u,
- );
-
+ assert.equal(first.program.records[0]?.value.kind, "blob");
+ assert.equal(first.program.records[0]?.value.kind === "blob" ? first.program.records[0].value.digest : undefined, attachment?.artifact.digest);
await writeFile(asset, new Uint8Array([9, 8, 7]));
const second = await assetCompiler({ root }).compileFile(file);
assert.notEqual(second.closure.id, first.closure.id);
@@ -537,11 +524,9 @@ test("an installed package Surface can contribute locked bytes without an author
const compiled = await assetCompiler({ root }).compileFile(file);
const attachment = compiled.attachments[0];
assert.deepEqual(await readAttachment(attachment), new Uint8Array([8, 6, 7, 5, 3, 0, 9]));
- assert.equal(compiled.closure.units[0]?.assets[0]?.from, "package:example.asset-lab/embedded.bin");
- assert.equal(compiled.closure.units[0]?.assets[0]?.artifact.digest, attachment?.artifact.digest);
- assert.equal(compiled.module.records[0]?.value.kind, "blob");
- assert.equal(compiled.module.records[0]?.value.kind === "blob"
- ? compiled.module.records[0].value.digest
+ assert.equal(compiled.program.records[0]?.value.kind, "blob");
+ assert.equal(compiled.program.records[0]?.value.kind === "blob"
+ ? compiled.program.records[0].value.digest
: undefined, attachment?.artifact.digest);
});
@@ -632,8 +617,8 @@ test("filesystem and in-memory Workspaces compile identical source and bytes to
const memory = await assetCompiler({ workspace: memoryWorkspace(source, bytes) }).compileFile("memory:main");
assert.equal(memory.closure.id, filesystem.closure.id);
- assert.equal(memory.module.semanticDigest, filesystem.module.semanticDigest);
- assert.equal(memory.elaboration.graph.id, filesystem.elaboration.graph.id);
+ assert.equal(memory.program.semanticDigest, filesystem.program.semanticDigest);
+ assert.equal(memory.graph.id, filesystem.graph.id);
assert.deepEqual(memory.attachments.map((item) => item.artifact),
filesystem.attachments.map((item) => item.artifact));
assert.deepEqual(await readAttachment(memory.attachments[0]),
diff --git a/packages/component-kit/package.json b/packages/component-kit/package.json
index 47a537fa..25e7d889 100644
--- a/packages/component-kit/package.json
+++ b/packages/component-kit/package.json
@@ -8,7 +8,6 @@
".": "./src/index.ts"
},
"dependencies": {
- "@narratage/protocol": "workspace:*",
- "@narratage/validation": "workspace:*"
+ "@narratage/protocol": "workspace:*"
}
}
diff --git a/packages/component-kit/src/index.ts b/packages/component-kit/src/index.ts
index 098a6b96..ce81a8d0 100644
--- a/packages/component-kit/src/index.ts
+++ b/packages/component-kit/src/index.ts
@@ -7,13 +7,27 @@ import type {
TypeRef,
TypedRecord,
} from "@narratage/protocol";
-import type {
- TypeValidatorHandler,
- TypeValidatorRegistrar,
-} from "@narratage/validation";
export type Awaitable<T> = T | Promise<T>;
+export type TypeValidatorContext = {
+ readonly type: TypeRef;
+ readonly value: StoredValue;
+};
+
+export type TypeValidatorHandler = (
+ context: TypeValidatorContext,
+) => void | Promise<void>;
+
+/** Minimal structural port implemented by a validation Host. */
+export interface TypeValidatorRegistrar {
+ register(
+ type: TypeRef,
+ implementationDigest: Digest,
+ handler: TypeValidatorHandler,
+ ): void;
+}
+
export type ProducerHandlerResult = {
readonly outputs: Readonly<Record<string, StoredValue>>;
readonly needs: Readonly<Record<string, CanonicalValue>>;
@@ -76,7 +90,6 @@ export function registerTypeValidatorFacets(
/** Trusted deterministic implementation package; it selects no Provider or Runtime service. */
export type ComponentPackage = {
- readonly name: string;
readonly producers?: readonly ProducerFacet[];
readonly validators?: readonly TypeValidatorFacet[];
};
diff --git a/packages/composition/src/activation.ts b/packages/composition/src/activation.ts
index 304ca233..f878387a 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, name: "@narratage/composition", modules: [{ manifest: compositionManifest }], components: [compositionComponent] };
+export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: compositionManifest }], components: [compositionComponent] };
export default svmlPackage;
diff --git a/packages/composition/src/component.ts b/packages/composition/src/component.ts
index 57224923..27cc1f67 100644
--- a/packages/composition/src/component.ts
+++ b/packages/composition/src/component.ts
@@ -3,7 +3,7 @@ import { compositionTypes, compositionValidatorDigests } 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 = { name: "@narratage/composition", validators: [
+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) },
diff --git a/packages/composition/src/manifest.ts b/packages/composition/src/manifest.ts
index e64e7bd1..658bfe22 100644
--- a/packages/composition/src/manifest.ts
+++ b/packages/composition/src/manifest.ts
@@ -6,12 +6,12 @@ import { audioTrackSchema, compositionSchema, visualTrackSchema } from "./schema
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 = (locator: string, digest: ReturnType<typeof digestOf>) => ({ abi: "svml.type-validator@1" as const, implementation: { kind: "registered" as const, locator, digest } });
+const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: { digest } });
export const compositionManifest: ModuleManifest = { format: "svml.module@1", name: compositionModuleRef.name, version: compositionModuleRef.version,
dependencies: [mediaDependency, programSpaceDependency, visualIrDependency], types: [
- { name: compositionTypes.visualTrack.name, schema: visualTrackSchema, validator: validator("@narratage/composition/validate-visual-track", compositionValidatorDigests.visualTrack) },
- { name: compositionTypes.audioTrack.name, schema: audioTrackSchema, validator: validator("@narratage/composition/validate-audio-track", compositionValidatorDigests.audioTrack) },
- { name: compositionTypes.composition.name, schema: compositionSchema, validator: validator("@narratage/composition/validate-composition", compositionValidatorDigests.composition) },
- ], capabilities: [], surfaces: [], producers: [] };
+ { 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) },
+ ], capabilities: [], producers: [] };
export const compositionManifestDigest = digestOf(compositionManifest);
export const compositionDependency = { module: compositionModuleRef, digest: compositionManifestDigest } as const;
diff --git a/packages/composition/src/schema.ts b/packages/composition/src/schema.ts
index 47556d73..32c87c2d 100644
--- a/packages/composition/src/schema.ts
+++ b/packages/composition/src/schema.ts
@@ -1,4 +1,4 @@
-import { compositableSurfaceSchema, fontArtifactSchema, mediaArtifactSchema, mediaDependency } from "@narratage/media";
+import { compositableSurfaceSchema, fontArtifactSchema, mediaDependency } from "@narratage/media";
import { programSpaceDependency } from "@narratage/program-space";
import type { ValueSchema } from "@narratage/protocol";
import { VISUAL_IR_V1, VISUAL_STYLE_ENUM_VALUES_V1, VISUAL_STYLE_NAMES_V1 } from "@narratage/visual-ir";
diff --git a/packages/composition/test/track.test.ts b/packages/composition/test/track.test.ts
index 017cabb6..1ff04d3d 100644
--- a/packages/composition/test/track.test.ts
+++ b/packages/composition/test/track.test.ts
@@ -7,7 +7,7 @@ import { canonicalize, digestOf } from "@narratage/protocol";
import type { BlobRef } from "@narratage/protocol";
import { TypeValidatorRegistry, validateValue } from "@narratage/validation";
import { artifactManifest } from "@narratage/artifact";
-import type { FontArtifactRef, MediaArtifactRef } from "@narratage/media";
+import type { FontArtifactRef } from "@narratage/media";
import { mediaManifest } from "@narratage/media";
import { narrativeManifest } from "@narratage/narrative";
import { programSpaceManifest, sealProgramSpace } from "@narratage/program-space";
@@ -32,12 +32,6 @@ import type { VisualTrack } from "../src/index.js";
const videoContractManifests = [artifactManifest, narrativeManifest, mediaManifest, programSpaceManifest,
speechManifest, speechEvidenceManifest, semanticMapManifest, spatialManifest, visualIrManifest, compositionManifest] as const;
-const image: MediaArtifactRef = {
- digest: digestOf("image"),
- size: 12,
- mediaType: "image/png",
- durationSec: 0,
-};
const font: FontArtifactRef = {
contract: "svml.font-artifact@1",
sources: [{ artifact: { kind: "blob", digest: digestOf("track:test-font"), size: 1_024, mediaType: "font/woff2" } }],
diff --git a/packages/core/README.md b/packages/core/README.md
index 813fd2c3..5153cb21 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -22,8 +22,8 @@ receipt bound to the exact Type, value digest and locked validator digest. Core
receipt uniformly but never executes the validator; trusted Host admission lives in
`@narratage/validation`.
-It generically verifies Surface declarations in the same immutable module closure, but never
-parses or dispatches one. It does not parse source, resolve package locations, execute
+It does not know whether author source has tags, indentation, prose or any other syntax. It does not
+parse source, resolve package locations, execute
implementations, access artifact bytes, select Provider endpoints or discover undeclared graph
structure. Those responsibilities remain outside Core.
diff --git a/packages/core/src/graph.ts b/packages/core/src/graph.ts
index 77829935..805ec70f 100644
--- a/packages/core/src/graph.ts
+++ b/packages/core/src/graph.ts
@@ -42,7 +42,6 @@ function normalizeRoot(root: CandidateRoot): CandidateRoot {
const value = {
id: root.value.id,
value: normalizedStoredValue(root.value.value),
- ...(root.value.validation === undefined ? {} : { validation: root.value.validation }),
};
return { kind: "value", value };
}
@@ -241,9 +240,6 @@ function verifyCandidateValue(program: LinkedProgram, graph: CompiledGraph, cand
origin: {
kind: "provided",
},
- ...(candidate.root.value.validation === undefined
- ? {}
- : { validation: candidate.root.value.validation }),
});
verifyRecord(program.closure, provisional);
}
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index df584b74..fa33dd64 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -8,12 +8,10 @@ export {
resolveProducer,
resolveType,
sealRecord,
- sealTypeValidationReceipt,
sealTypedModule,
verifyClosure,
verifyRecord,
verifyRecordStructure,
- verifyTypeValidationReceipt,
} from "./link.js";
export {
operationResultRecord,
@@ -28,7 +26,9 @@ export {
verifyBuildRequest,
verifyCompiledGraph,
} from "./graph.js";
-export { compileBuild, validatePlan } from "./plan.js";
+export { compileBuild, plannedNeeds, validatePlan } from "./plan.js";
+export type { PlannedNeed } from "./plan.js";
+export { sliceExecution } from "./slice.js";
export { reduce, start } from "./reducer.js";
export { verifyBuildState } from "./verify.js";
export { validateStoredValue } from "./schema.js";
diff --git a/packages/core/src/link.ts b/packages/core/src/link.ts
index 5a66a629..1c74e316 100644
--- a/packages/core/src/link.ts
+++ b/packages/core/src/link.ts
@@ -13,18 +13,15 @@ import type {
TypeRef,
TypedModule,
TypedRecord,
- TypeValidationReceipt,
} from "@narratage/protocol";
import { digestOf, isDigest, recordDigest, semanticRecordsDigest } from "./canonical.js";
-import { CoreError, invariant } from "./error.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">;
-type TypeValidationReceiptDraft = Omit<TypeValidationReceipt, "format" | "id">;
-
function manifestRef(manifest: ModuleManifest): ModuleRef {
return { name: manifest.name, version: manifest.version };
}
@@ -94,8 +91,6 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
);
ensureUniqueNames(module.manifest.types.map((item) => item.name), "type", key);
ensureUniqueNames(module.manifest.capabilities.map((item) => item.name), "capability", key);
- ensureUniqueNames(module.manifest.surfaces.map((item) => item.name), "surface", key);
- ensureUniqueNames(module.manifest.surfaces.map((item) => item.tag), "surface tag", key);
ensureUniqueNames(module.manifest.producers.map((item) => item.name), "producer", key);
ensureUniqueNames(
module.manifest.dependencies.map((item) => moduleKey(item.module)),
@@ -104,17 +99,6 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
);
for (const type of module.manifest.types) {
if (type.validator === undefined) continue;
- invariant(
- type.validator.abi === "svml.type-validator@1",
- "UNSUPPORTED_TYPE_VALIDATOR",
- `${key}#${type.name} validator ABI is unsupported`,
- );
- invariant(
- type.validator.implementation.kind.length > 0
- && type.validator.implementation.locator.length > 0,
- "INVALID_TYPE_VALIDATOR",
- `${key}#${type.name} validator implementation is incomplete`,
- );
invariant(
isDigest(type.validator.implementation.digest),
"INVALID_DIGEST",
@@ -136,24 +120,6 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
`${key}#${producer.name} implementation digest is invalid`,
);
}
- for (const surface of module.manifest.surfaces) {
- invariant(surface.tag.length > 0, "EMPTY_NAME", `${key} surface tag is empty`);
- ensureUniqueNames(
- surface.outputs.map((output) => typeKey(output)),
- "Surface output type",
- `${key}#${surface.name}`,
- );
- invariant(
- surface.mode === "raw" || surface.mode === "structured",
- "UNSUPPORTED_SURFACE_MODE",
- `${key}#${surface.name} has unsupported Surface mode ${surface.mode}`,
- );
- invariant(
- isDigest(surface.implementation.digest),
- "INVALID_DIGEST",
- `${key}#${surface.name} Surface implementation digest is invalid`,
- );
- }
modules.set(key, module);
}
@@ -184,21 +150,6 @@ export function verifyClosure(closure: ResolvedModuleClosure): void {
moduleKey(module.ref),
...module.manifest.dependencies.map((dependency) => moduleKey(dependency.module)),
]);
- for (const surface of module.manifest.surfaces) {
- for (const output of surface.outputs) {
- invariant(
- allowed.has(moduleKey(output.module)),
- "UNDECLARED_TYPE_DEPENDENCY",
- `${moduleKey(module.ref)}#${surface.name} Surface outputs ${typeKey(output)} without a dependency`,
- );
- const target = modules.get(moduleKey(output.module));
- invariant(
- target?.manifest.types.some((type) => type.name === output.name),
- "UNKNOWN_TYPE",
- `${moduleKey(module.ref)}#${surface.name} Surface outputs unknown type ${typeKey(output)}`,
- );
- }
- }
for (const producer of module.manifest.producers) {
for (const port of [...producer.inputs, ...producer.outputs]) {
invariant(
@@ -299,37 +250,6 @@ export function sealRecord(record: TypedRecordDraft): TypedRecord {
return { ...record, digest: recordDigest(record.type, record.value) };
}
-export function sealTypeValidationReceipt(
- receipt: TypeValidationReceiptDraft,
-): TypeValidationReceipt {
- const content = {
- format: "svml.type-validation@1" as const,
- type: receipt.type,
- recordDigest: receipt.recordDigest,
- validatorDigest: receipt.validatorDigest,
- };
- return { ...content, id: digestOf(content) };
-}
-
-export function verifyTypeValidationReceipt(
- receipt: TypeValidationReceipt,
- type: TypeRef,
- record: Digest,
- validator: Digest,
-): void {
- invariant(receipt.format === "svml.type-validation@1", "UNSUPPORTED_TYPE_VALIDATION", "unsupported validation receipt");
- invariant(isDigest(receipt.id), "INVALID_DIGEST", "validation receipt id is invalid");
- invariant(sameType(receipt.type, type), "TYPE_VALIDATION_TYPE_MISMATCH", "validation receipt belongs to another type");
- invariant(receipt.recordDigest === record, "TYPE_VALIDATION_RECORD_MISMATCH", "validation receipt belongs to another value");
- invariant(
- receipt.validatorDigest === validator,
- "TYPE_VALIDATOR_DIGEST_MISMATCH",
- "validation receipt was issued by another validator",
- );
- const { id: _id, ...content } = receipt;
- invariant(receipt.id === digestOf(content), "TYPE_VALIDATION_DIGEST_MISMATCH", "validation receipt content differs");
-}
-
export function verifyRecordStructure(
closure: ResolvedModuleClosure,
record: TypedRecord,
@@ -344,20 +264,6 @@ export function verifyRecordStructure(
);
const declaration = resolveType(closure, record.type);
validateStoredValue(record.value, declaration.schema, `$record.${record.id}`);
- if (record.validation !== undefined) {
- invariant(
- declaration.validator !== undefined,
- "UNEXPECTED_TYPE_VALIDATION",
- `${record.id} carries validation for a type with no validator`,
- record.id,
- );
- verifyTypeValidationReceipt(
- record.validation,
- record.type,
- record.digest,
- declaration.validator.implementation.digest,
- );
- }
}
export function verifyRecord(
@@ -365,26 +271,14 @@ export function verifyRecord(
record: TypedRecord,
): void {
verifyRecordStructure(closure, record);
- const declaration = resolveType(closure, record.type);
- invariant(
- declaration.validator === undefined || record.validation !== undefined,
- "TYPE_VALIDATION_REQUIRED",
- `${record.id} requires ${declaration.validator?.implementation.locator ?? "type validation"}`,
- record.id,
- );
}
export function sealTypedModule(input: {
- readonly id: string;
- readonly closureDigest: Digest;
readonly records: readonly TypedRecord[];
}): TypedModule {
return {
format: "svml.typed-module@1",
- id: input.id,
- closureDigest: input.closureDigest,
records: input.records,
- semanticDigest: semanticRecordsDigest(input.records),
};
}
@@ -393,7 +287,6 @@ export function link(
typedModules: readonly TypedModule[],
): LinkedProgram {
verifyClosure(closure);
- const moduleIds = new Set<string>();
const recordIds = new Set<string>();
const records: TypedRecord[] = [];
@@ -401,26 +294,14 @@ export function link(
invariant(
typedModule.format === "svml.typed-module@1",
"UNSUPPORTED_TYPED_MODULE",
- `${typedModule.id} has an unsupported format`,
- );
- invariant(!moduleIds.has(typedModule.id), "DUPLICATE_TYPED_MODULE", typedModule.id, typedModule.id);
- moduleIds.add(typedModule.id);
- invariant(
- typedModule.closureDigest === closure.digest,
- "TYPED_MODULE_CLOSURE_MISMATCH",
- `${typedModule.id} was decoded against another module closure`,
- );
- invariant(
- typedModule.semanticDigest === semanticRecordsDigest(typedModule.records),
- "SEMANTIC_DIGEST_MISMATCH",
- `${typedModule.id} semantic digest does not match`,
+ "typed record set has an unsupported format",
);
for (const record of typedModule.records) {
invariant(!recordIds.has(record.id), "DUPLICATE_RECORD", `duplicate record ${record.id}`, record.id);
invariant(
record.origin.kind === "authored",
"NON_AUTHORED_MODULE_RECORD",
- `${typedModule.id} contains a non-authored input record`,
+ "typed records contain a non-authored input record",
record.id,
);
verifyRecord(closure, record);
@@ -429,23 +310,25 @@ export function link(
}
}
- return {
+ const program: LinkedProgram = {
closure,
- modules: typedModules,
records,
- semanticDigest: digestOf(
- [...typedModules]
- .sort((left, right) => left.id.localeCompare(right.id))
- .map((module) => ({ id: module.id, semanticDigest: module.semanticDigest })),
- ),
+ semanticDigest: semanticRecordsDigest(records),
};
+ verifyLinkedProgram(program);
+ return program;
}
-export function assertKnownType(closure: ResolvedModuleClosure, ref: TypeRef): void {
- try {
- resolveType(closure, ref);
- } catch (error) {
- if (error instanceof CoreError) throw error;
- throw error;
+export function verifyLinkedProgram(program: LinkedProgram): void {
+ verifyClosure(program.closure);
+ const ids = new Set<string>();
+ for (const record of program.records) {
+ invariant(!ids.has(record.id), "DUPLICATE_RECORD", `duplicate record ${record.id}`, record.id);
+ ids.add(record.id);
+ invariant(record.origin.kind === "authored", "NON_AUTHORED_PROGRAM_RECORD",
+ `${record.id} is not an authored input record`, record.id);
+ verifyRecord(program.closure, record);
}
+ invariant(program.semanticDigest === semanticRecordsDigest(program.records),
+ "PROGRAM_SEMANTIC_DIGEST_MISMATCH", "linked program semantic digest does not match");
}
diff --git a/packages/core/src/plan.ts b/packages/core/src/plan.ts
index 83c7031b..7ce61b15 100644
--- a/packages/core/src/plan.ts
+++ b/packages/core/src/plan.ts
@@ -1,6 +1,8 @@
import type {
BuildPlan,
BuildRequest,
+ BuildState,
+ CapabilityRef,
CompiledGraph,
GraphValueRef,
LinkedProgram,
@@ -64,10 +66,35 @@ type ProducedRecord = {
readonly step?: string;
};
+export type PlannedNeed = {
+ readonly capability: CapabilityRef;
+ readonly returns: TypeRef;
+};
+
+function plannedNeedKey(need: PlannedNeed): string {
+ const ref = (value: { readonly module: { readonly name: string; readonly version: string }; readonly name: string }) =>
+ `${value.module.name}@${value.module.version}#${value.name}`;
+ return `${ref(need.capability)} -> ${ref(need.returns)}`;
+}
+
+/** External requirements declared by the exact finite BuildPlan. */
+export function plannedNeeds(state: BuildState): readonly PlannedNeed[] {
+ const found = new Map<string, PlannedNeed>();
+ for (const step of state.plan.steps) {
+ const producer = resolveProducer(state.program.closure, step.producer);
+ for (const need of producer.needs) {
+ const item = { capability: need.capability, returns: need.returns };
+ found.set(plannedNeedKey(item), item);
+ }
+ }
+ return [...found.entries()]
+ .sort(([left], [right]) => left.localeCompare(right))
+ .map(([, value]) => structuredClone(value));
+}
+
function planContent(
graph: CompiledGraph,
request: BuildRequest,
- initialValues: readonly TypedRecord[],
steps: readonly ProducerStep[],
goals: BuildPlan["goals"],
selections: BuildPlan["selections"],
@@ -76,7 +103,6 @@ function planContent(
format: "svml.plan@1",
graph: graph.id,
request: request.digest,
- initialValues,
steps,
goals,
selections,
@@ -91,7 +117,6 @@ export function compileBuild(
verifyBuildRequest(program, graph, request);
const authored = new Map(program.records.map((record) => [record.id, record]));
- const initialValues = new Map<string, TypedRecord>();
const demanded = new Map<string, DemandedOperation>();
const resolvedOutputs = new Map<string, ResolvedSource>();
const resolvingOutputs = new Set<string>();
@@ -151,23 +176,9 @@ export function compileBuild(
origin: {
kind: "provided",
},
- ...(candidate.root.value.validation === undefined
- ? {}
- : { validation: candidate.root.value.validation }),
});
verifyRecord(program.closure, record);
invariant(!authored.has(record.id), "PROVIDED_RECORD_CONFLICT", `${record.id} conflicts with authored input`);
- const previous = initialValues.get(record.id);
- if (previous === undefined) {
- initialValues.set(record.id, record);
- } else {
- invariant(
- canonicalStringify(previous) === canonicalStringify(record),
- "PROVIDED_RECORD_CONFLICT",
- `${record.id} has conflicting Provided Values`,
- record.id,
- );
- }
resolved = { record: record.id, type: record.type };
} else {
resolved = demandOperation(candidate.root.result.operation);
@@ -208,9 +219,8 @@ export function compileBuild(
const goals = targetSources
.map(({ source }) => ({ record: source.record, type: source.type }))
.sort((a, b) => a.record.localeCompare(b.record));
- const sortedInitial = [...initialValues.values()].sort((a, b) => a.id.localeCompare(b.id));
const sortedSelections = [...selections.values()].sort((a, b) => a.output.localeCompare(b.output));
- const content = planContent(graph, request, sortedInitial, steps, goals, sortedSelections);
+ const content = planContent(graph, request, steps, goals, sortedSelections);
const plan: BuildPlan = { ...content, id: digestOf(content) };
validatePlanStructure(program, graph, request, plan);
return plan;
@@ -231,8 +241,7 @@ function validatePlanStructure(
const records = new Map<RecordId, ProducedRecord>();
for (const record of program.records) records.set(record.id, { type: record.type });
- for (const record of plan.initialValues) {
- verifyRecord(program.closure, record);
+ for (const record of selectedProvidedRecords(program, graph, plan)) {
invariant(!records.has(record.id), "DUPLICATE_RECORD", `record ${record.id} has multiple sources`, record.id);
records.set(record.id, { type: record.type });
}
@@ -312,6 +321,39 @@ export function validatePlan(
);
}
+/** Materialize selected zero-input values from their sole source of truth: the Run Graph. */
+export function selectedProvidedRecords(
+ program: LinkedProgram,
+ graph: CompiledGraph,
+ plan: BuildPlan,
+): readonly TypedRecord[] {
+ const authored = new Set(program.records.map((record) => record.id));
+ const records = new Map<string, TypedRecord>();
+ for (const selection of plan.selections) {
+ const candidate = graph.candidates.find((item) => item.id === selection.candidate);
+ invariant(candidate !== undefined, "UNKNOWN_CANDIDATE", `unknown Candidate ${selection.candidate}`, selection.candidate);
+ if (candidate.root.kind !== "value") continue;
+ const record = sealRecord({
+ id: candidate.root.value.id,
+ type: candidate.type,
+ value: candidate.root.value.value,
+ origin: { kind: "provided" },
+ });
+ verifyRecord(program.closure, record);
+ invariant(selection.record === record.id, "SELECTION_RECORD_MISMATCH", `${selection.output} does not select ${record.id}`);
+ invariant(!authored.has(record.id), "PROVIDED_RECORD_CONFLICT", `${record.id} conflicts with authored input`, record.id);
+ const previous = records.get(record.id);
+ invariant(
+ previous === undefined || canonicalStringify(previous) === canonicalStringify(record),
+ "PROVIDED_RECORD_CONFLICT",
+ `${record.id} has conflicting Provided Values`,
+ record.id,
+ );
+ records.set(record.id, record);
+ }
+ return [...records.values()].sort((left, right) => left.id.localeCompare(right.id));
+}
+
function assertAcyclic(plan: BuildPlan, records: ReadonlyMap<RecordId, ProducedRecord>): void {
const dependencies = new Map<string, Set<string>>();
for (const step of plan.steps) dependencies.set(step.id, new Set());
diff --git a/packages/core/src/reducer.ts b/packages/core/src/reducer.ts
index 157c5118..c5bb9962 100644
--- a/packages/core/src/reducer.ts
+++ b/packages/core/src/reducer.ts
@@ -4,7 +4,6 @@ import type {
BuildRequest,
BuildState,
CoreCommand,
- CoreTransition,
CompiledGraph,
Derivation,
FulfillNeedCommand,
@@ -21,7 +20,7 @@ import type {
import { canonicalize, digestOf, recordDigest } from "./canonical.js";
import { CoreError, invariant } from "./error.js";
import { resolveProducer, resolveType, sealRecord, verifyRecord } from "./link.js";
-import { compileBuild, producerStep } from "./plan.js";
+import { compileBuild, producerStep, selectedProvidedRecords } from "./plan.js";
import {
commandId,
derivationId,
@@ -29,7 +28,6 @@ import {
needRequestDigest,
receiptId,
} from "./provenance.js";
-import { producerKey } from "./reference.js";
import { validateStoredValue } from "./schema.js";
import { verifyBuildState } from "./verify.js";
@@ -83,13 +81,6 @@ function acceptProducerEvent(
const producer = resolveProducer(state.program.closure, step.producer);
exactPortKeys(event.outputs, producer.outputs.map((port) => port.name), `${step.id}.outputs`);
exactPortKeys(event.needs, producer.needs.map((port) => port.name), `${step.id}.needs`);
- exactPortKeys(
- event.validations ?? {},
- producer.outputs
- .filter((port) => resolveType(state.program.closure, port.type).validator !== undefined)
- .map((port) => port.name),
- `${step.id}.validations`,
- );
const inputs = inputRecords(state, command);
const outputDrafts = producer.outputs
@@ -106,9 +97,6 @@ function acceptProducerEvent(
type: port.type,
value,
digest: recordDigest(port.type, value),
- ...(event.validations?.[port.name] === undefined
- ? {}
- : { validation: event.validations[port.name] }),
};
});
@@ -149,7 +137,6 @@ function acceptProducerEvent(
type: output.type,
value: output.value,
origin: { kind: "derived", derivation: id },
- ...(output.validation === undefined ? {} : { validation: output.validation }),
}));
outputs.forEach((record) => verifyRecord(state.program.closure, record));
const needs: Need[] = needDrafts.map((need) => ({ ...need, requestedBy: id }));
@@ -205,7 +192,6 @@ function acceptNeedEvent(
value,
digest: outputDigest,
origin: { kind: "observed", receipt: receipt.id },
- ...(event.validation === undefined ? {} : { validation: event.validation }),
};
verifyRecord(state.program.closure, record);
@@ -265,25 +251,15 @@ function goalsComplete(state: BuildState): boolean {
return state.plan.goals.every((goal) => state.records.some((record) => record.id === goal.record));
}
-function schedule(state: BuildState): CoreTransition {
- if (state.status !== "active") return { state, commands: [] };
- if (state.outstanding.length > 0) return { state, commands: state.outstanding };
+function schedule(state: BuildState): BuildState {
+ if (state.status !== "active" || state.outstanding.length > 0) return state;
if (goalsComplete(state)) {
const complete = {
...state,
status: "complete" as const,
};
- return {
- state: complete,
- commands: [
- {
- kind: "complete",
- id: commandId(state.id, "complete", state.plan.id),
- goals: state.plan.goals.map((goal) => goal.record),
- },
- ],
- };
+ return complete;
}
const commands: CoreCommand[] = [];
@@ -324,11 +300,11 @@ function schedule(state: BuildState): CoreTransition {
},
],
};
- return { state: failed, commands: [] };
+ return failed;
}
const scheduled: BuildState = { ...state, outstanding: commands };
- return { state: scheduled, commands };
+ return scheduled;
}
export function start(
@@ -351,7 +327,7 @@ export function start(
request,
plan,
status: "active",
- records: [...program.records, ...plan.initialValues],
+ records: [...program.records, ...selectedProvidedRecords(program, graph, plan)],
steps: plan.steps.map((step) => ({ id: step.id, status: "pending" })),
needs: [],
receipts: [],
@@ -364,16 +340,10 @@ export function start(
return state;
}
-export function reduce(state: BuildState, event?: BuildEvent): CoreTransition {
+export function reduce(state: BuildState, event?: BuildEvent): BuildState {
verifyBuildState(state);
const next = event === undefined ? state : applyEvent(state, event);
- const transition = schedule(next);
- verifyBuildState(transition.state);
- return transition;
-}
-
-export function buildCommandKey(command: CoreCommand): string {
- if (command.kind === "invoke-producer") return producerKey(command.producer);
- if (command.kind === "fulfill-need") return command.need.id;
- return command.id;
+ const scheduled = schedule(next);
+ verifyBuildState(scheduled);
+ return scheduled;
}
diff --git a/packages/core/src/reference.ts b/packages/core/src/reference.ts
index f124c1d1..8f78b5cc 100644
--- a/packages/core/src/reference.ts
+++ b/packages/core/src/reference.ts
@@ -27,7 +27,3 @@ export function sameType(left: TypeRef, right: TypeRef): boolean {
export function sameCapability(left: CapabilityRef, right: CapabilityRef): boolean {
return sameModule(left.module, right.module) && left.name === right.name;
}
-
-export function sameProducer(left: ProducerRef, right: ProducerRef): boolean {
- return sameModule(left.module, right.module) && left.name === right.name;
-}
diff --git a/packages/core/src/schema.ts b/packages/core/src/schema.ts
index 3199e11c..9795ea5f 100644
--- a/packages/core/src/schema.ts
+++ b/packages/core/src/schema.ts
@@ -10,10 +10,9 @@ function fail(path: string, message: string): never {
/**
* Prove that an object-shaped union branch cannot match by looking only at its
* literal fields. This is a semantic no-op: a branch skipped here would fail
- * the normal object validation at the same field. It matters for large IRs,
- * where validating every word/style node against every named union variant
- * otherwise constructs thousands of exceptions just to discover that their
- * discriminator literals differ.
+ * the normal object validation at the same field. It matters for large
+ * discriminated IRs, where trying every named union variant would otherwise
+ * construct thousands of exceptions before finding a literal mismatch.
*/
function objectLiteralMismatch(value: CanonicalValue, schema: ValueSchema): boolean {
if (schema.kind !== "object" || value === null || Array.isArray(value) || typeof value !== "object") {
diff --git a/packages/core/src/slice.ts b/packages/core/src/slice.ts
new file mode 100644
index 00000000..31b9fbc8
--- /dev/null
+++ b/packages/core/src/slice.ts
@@ -0,0 +1,101 @@
+import type {
+ BuildRequest,
+ CompiledGraph,
+ GraphValueRef,
+ LinkedProgram,
+ ModuleRef,
+} from "@narratage/protocol";
+
+import { sealCompiledGraph } from "./graph.js";
+import { createResolvedClosure, link, sealTypedModule } from "./link.js";
+import { compileBuild } from "./plan.js";
+
+function moduleKey(ref: ModuleRef): string {
+ return `${ref.name}\u0000${ref.version}`;
+}
+
+/**
+ * Materialize exactly the execution graph selected by one BuildRequest.
+ *
+ * Candidate choice is Core semantics: once an alternate Candidate satisfies an
+ * output, only that Candidate's reachable upstream graph survives. Hosts must
+ * not reproduce this traversal independently.
+ */
+export function sliceExecution(
+ program: LinkedProgram,
+ graph: CompiledGraph,
+ request: BuildRequest,
+): { readonly program: LinkedProgram; readonly graph: CompiledGraph } {
+ const preliminary = compileBuild(program, graph, request);
+ const outputById = new Map(graph.outputs.map((item) => [item.id, item]));
+ const candidateById = new Map(graph.candidates.map((item) => [item.id, item]));
+ const operationById = new Map(graph.operations.map((item) => [item.id, item]));
+ const selectionByOutput = new Map(preliminary.selections.map((item) => [item.output, item]));
+ const outputs = new Set<string>();
+ const candidates = new Set<string>();
+ const operations = new Set<string>();
+ const records = new Set<string>();
+
+ const visitRef = (ref: GraphValueRef): void => {
+ if (ref.kind === "record") records.add(ref.id);
+ else if (ref.kind === "logical-output") visitOutput(ref.id);
+ else visitOperation(ref.operation);
+ };
+ const visitOperation = (id: string): void => {
+ if (operations.has(id)) return;
+ const operation = operationById.get(id);
+ if (operation === undefined) throw new Error(`execution slice refers to absent Operation ${id}`);
+ operations.add(id);
+ Object.values(operation.inputs).forEach(visitRef);
+ };
+ const visitCandidate = (id: string): void => {
+ if (candidates.has(id)) return;
+ const candidate = candidateById.get(id);
+ if (candidate === undefined) throw new Error(`execution slice refers to absent Candidate ${id}`);
+ candidates.add(id);
+ if (candidate.root.kind === "operation") visitOperation(candidate.root.result.operation);
+ };
+ const visitOutput = (id: string): void => {
+ if (outputs.has(id)) return;
+ const output = outputById.get(id);
+ if (output === undefined) throw new Error(`execution slice refers to absent Logical Output ${id}`);
+ outputs.add(id);
+ visitCandidate(selectionByOutput.get(id)?.candidate ?? output.primary);
+ };
+ request.targets.forEach((target) => visitOutput(target.output));
+
+ const selectedOutputs = graph.outputs.filter((item) => outputs.has(item.id));
+ const selectedCandidates = graph.candidates.filter((item) => candidates.has(item.id));
+ const selectedOperations = graph.operations.filter((item) => operations.has(item.id));
+ const authoredRecords = program.records.filter((record) => records.has(record.id));
+
+ const requiredModules = new Set<string>();
+ const requireModule = (ref: ModuleRef): void => {
+ const key = moduleKey(ref);
+ if (requiredModules.has(key)) return;
+ const resolved = program.closure.modules.find((item) => moduleKey(item.ref) === key);
+ if (resolved === undefined) throw new Error(`execution slice refers to absent module ${ref.name}@${ref.version}`);
+ requiredModules.add(key);
+ resolved.manifest.dependencies.forEach((item) => requireModule(item.module));
+ };
+ selectedOperations.forEach((item) => requireModule(item.producer.module));
+ selectedOutputs.forEach((item) => requireModule(item.type.module));
+ selectedCandidates.forEach((item) => requireModule(item.type.module));
+ authoredRecords.forEach((item) => requireModule(item.type.module));
+
+ const closure = createResolvedClosure(program.closure.modules
+ .filter((item) => requiredModules.has(moduleKey(item.ref)))
+ .map((item) => item.manifest));
+ const slicedProgram = link(closure, authoredRecords.length === 0 ? [] : [sealTypedModule({
+ records: authoredRecords,
+ })]);
+ return {
+ program: slicedProgram,
+ graph: sealCompiledGraph({
+ program: slicedProgram.semanticDigest,
+ outputs: selectedOutputs,
+ candidates: selectedCandidates,
+ operations: selectedOperations,
+ }),
+ };
+}
diff --git a/packages/core/src/verify.ts b/packages/core/src/verify.ts
index 3fe408c5..66a1abf6 100644
--- a/packages/core/src/verify.ts
+++ b/packages/core/src/verify.ts
@@ -9,8 +9,8 @@ import type {
import { digestOf, isDigest } from "./canonical.js";
import { invariant } from "./error.js";
-import { link, resolveProducer, verifyRecord } from "./link.js";
-import { producerStep, validatePlan } from "./plan.js";
+import { resolveProducer, verifyLinkedProgram, verifyRecord } from "./link.js";
+import { producerStep, selectedProvidedRecords, validatePlan } from "./plan.js";
import { commandId, derivationId, needRequestDigest, receiptId } from "./provenance.js";
import { sameCapability, sameType } from "./reference.js";
@@ -107,12 +107,6 @@ function verifyReceipt(state: BuildState, receipt: Receipt): void {
"INVALID_CONFIGURATION_DIGEST",
receipt.id,
);
- invariant(
- receipt.implementation.runtimeClosure === undefined
- || isDigest(receipt.implementation.runtimeClosure),
- "INVALID_RUNTIME_CLOSURE_DIGEST",
- receipt.id,
- );
}
invariant(
receipt.requestDigest === need.requestDigest,
@@ -143,9 +137,6 @@ function verifyReceipt(state: BuildState, receipt: Receipt): void {
}
function verifyOutstanding(state: BuildState, command: CoreCommand): void {
- if (command.kind === "complete") {
- invariant(false, "STORED_COMPLETE_COMMAND", "complete commands must not remain outstanding");
- }
if (command.kind === "invoke-producer") {
const step = state.steps.find((item) => item.id === command.step);
invariant(step?.status === "pending", "OUTSTANDING_STEP_COMPLETE", `${command.step} is complete`);
@@ -180,26 +171,7 @@ export function verifyBuildState(state: BuildState): void {
);
invariant(isDigest(state.id), "INVALID_DIGEST", "build id is invalid");
- const linked = link(state.program.closure, state.program.modules);
- invariant(
- linked.semanticDigest === state.program.semanticDigest,
- "PROGRAM_SEMANTIC_DIGEST_MISMATCH",
- "linked program semantic digest does not match",
- );
- invariant(
- JSON.stringify(
- [...linked.records]
- .sort((left, right) => left.id.localeCompare(right.id))
- .map((record) => ({ id: record.id, digest: record.digest })),
- ) ===
- JSON.stringify(
- [...state.program.records]
- .sort((left, right) => left.id.localeCompare(right.id))
- .map((record) => ({ id: record.id, digest: record.digest })),
- ),
- "PROGRAM_RECORD_MISMATCH",
- "linked program records do not match its typed modules",
- );
+ verifyLinkedProgram(state.program);
invariant(
state.id ===
digestOf({
@@ -234,7 +206,8 @@ export function verifyBuildState(state: BuildState): void {
const record = findRecord(state, authored.id);
invariant(record?.digest === authored.digest, "AUTHORED_RECORD_CHANGED", `${authored.id} changed`);
}
- for (const provided of state.plan.initialValues) {
+ const providedRecords = selectedProvidedRecords(state.program, state.graph, state.plan);
+ for (const provided of providedRecords) {
const record = findRecord(state, provided.id);
invariant(
record !== undefined && digestOf(record) === digestOf(provided),
@@ -272,7 +245,7 @@ export function verifyBuildState(state: BuildState): void {
invariant(receipt?.output === record.id, "OBSERVED_ORIGIN_MISMATCH", `${record.id} has no receipt`);
} else {
const origin = record.origin;
- const expected = state.plan.initialValues.find((item) => item.id === record.id);
+ const expected = providedRecords.find((item) => item.id === record.id);
invariant(
expected !== undefined && digestOf(expected) === digestOf(record),
"INJECTED_PROVIDED_RECORD",
diff --git a/packages/core/test/core.test.ts b/packages/core/test/core.test.ts
index 1c420ce8..2e32064d 100644
--- a/packages/core/test/core.test.ts
+++ b/packages/core/test/core.test.ts
@@ -21,11 +21,11 @@ import type {
import { createGreetingBuild, producers } from "./greeting-fixture.js";
function onlyProducer(state: BuildState): { state: BuildState; command: InvokeProducerCommand } {
- const transition = reduce(state);
- assert.equal(transition.commands.length, 1);
- const command = transition.commands[0];
+ const next = reduce(state);
+ assert.equal(next.outstanding.length, 1);
+ const command = next.outstanding[0];
assert.equal(command?.kind, "invoke-producer");
- return { state: transition.state, command: command as InvokeProducerCommand };
+ return { state: next, command: command as InvokeProducerCommand };
}
function producerEvent(
@@ -48,30 +48,30 @@ function reachNeed(initial = createGreetingBuild()): {
command: FulfillNeedCommand;
} {
let current = onlyProducer(initial);
- let transition = reduce(
+ let state = reduce(
current.state,
producerEvent(current.command, "event:prompt", {
prompt: { kind: "inline", value: "Greet Ada" },
}),
);
- const request = transition.commands.find(
+ const request = state.outstanding.find(
(command): command is InvokeProducerCommand => command.kind === "invoke-producer",
);
assert.ok(request);
- transition = reduce(
- transition.state,
+ state = reduce(
+ state,
producerEvent(request, "event:request", {}, { generation: { prompt: "Greet Ada" } }),
);
- const command = transition.commands.find(
+ const command = state.outstanding.find(
(item): item is FulfillNeedCommand => item.kind === "fulfill-need",
);
assert.ok(command);
- return { state: transition.state, command };
+ return { state, command };
}
test("Core executes its derived finite plan through Need, Receipt and completion", () => {
let current = reachNeed();
- let transition = reduce(current.state, {
+ let state = reduce(current.state, {
kind: "need-fulfilled",
id: "event:fulfill",
command: current.command.id,
@@ -79,23 +79,23 @@ test("Core executes its derived finite plan through Need, Receipt and completion
requestDigest: current.command.need.requestDigest,
fulfiller: "test:greeting",
});
- const assemble = transition.commands.find(
+ const assemble = state.outstanding.find(
(command): command is InvokeProducerCommand => command.kind === "invoke-producer",
);
assert.ok(assemble);
- transition = reduce(
- transition.state,
+ state = reduce(
+ state,
producerEvent(assemble, "event:assemble", {
document: { kind: "inline", value: { text: "Hello, Ada!" } },
}),
);
- assert.equal(transition.state.status, "complete");
- assert.equal(transition.commands[0]?.kind, "complete");
- assert.equal(transition.state.derivations.length, 3);
- assert.equal(transition.state.receipts.length, 1);
- assert.equal(transition.state.records.at(-1)?.origin.kind, "derived");
- verifyBuildState(transition.state);
+ assert.equal(state.status, "complete");
+ assert.deepEqual(state.outstanding, []);
+ assert.equal(state.derivations.length, 3);
+ assert.equal(state.receipts.length, 1);
+ assert.equal(state.records.at(-1)?.origin.kind, "derived");
+ verifyBuildState(state);
});
test("accepted events are idempotent and conflicting reuse is rejected", () => {
@@ -104,14 +104,13 @@ test("accepted events are idempotent and conflicting reuse is rejected", () => {
prompt: { kind: "inline", value: "Greet Ada" },
});
const accepted = reduce(initial.state, event);
- const replayed = reduce(accepted.state, event);
- assert.deepEqual(replayed.state, accepted.state);
- assert.deepEqual(replayed.commands, accepted.commands);
+ const replayed = reduce(accepted, event);
+ assert.deepEqual(replayed, accepted);
assert.throws(
() =>
reduce(
- accepted.state,
+ accepted,
producerEvent(initial.command, "event:stable", {
prompt: { kind: "inline", value: "Different" },
}),
@@ -168,7 +167,7 @@ test("serialized BuildState survives a JSON round trip", () => {
const current = reachNeed();
const restored = JSON.parse(JSON.stringify(current.state)) as BuildState;
verifyBuildState(restored);
- assert.deepEqual(reduce(restored).commands, reduce(current.state).commands);
+ assert.deepEqual(reduce(restored).outstanding, reduce(current.state).outstanding);
});
test("a recomputed Need cannot change the capability locked by its Producer port", () => {
diff --git a/packages/core/test/demand.test.ts b/packages/core/test/demand.test.ts
index a2100de1..1285abfe 100644
--- a/packages/core/test/demand.test.ts
+++ b/packages/core/test/demand.test.ts
@@ -64,8 +64,6 @@ const producers = {
const seedanceCapability = { module: moduleRef, name: "seedance-media" } as const;
const implementation = (name: string) => ({
- kind: "test",
- locator: name,
digest: digestOf(`${name}@1`),
});
@@ -95,7 +93,6 @@ const manifest: ModuleManifest = {
})),
],
capabilities: [{ name: seedanceCapability.name, returns: types.image }],
- surfaces: [],
producers: [
{
name: producers.p1.name,
@@ -271,7 +268,7 @@ function createProgram(): LinkedProgram {
origin: { kind: "authored" },
}),
];
- return link(closure, [sealTypedModule({ id: "author:demand", closureDigest: closure.digest, records: authored })]);
+ return link(closure, [sealTypedModule({ records: authored })]);
}
function createImageGraph(program: LinkedProgram): CompiledGraph {
@@ -396,11 +393,10 @@ test("an Existing Value is a normal Candidate root and prevents the paid Need fr
const state = fixture(["media"], [choose("media", "existing-media")]);
const transition = reduce(state);
assert.deepEqual(stepIds(state), []);
- assert.equal(state.plan.initialValues.length, 1);
- assert.equal(state.plan.initialValues[0]?.origin.kind, "provided");
- assert.equal(transition.state.status, "complete");
- assert.equal(transition.state.needs.length, 0);
- assert.equal(transition.commands[0]?.kind, "complete");
+ assert.deepEqual(state.records.filter((record) => record.origin.kind === "provided").map((record) => record.id), ["provided:media"]);
+ assert.equal(transition.status, "complete");
+ assert.equal(transition.needs.length, 0);
+ assert.deepEqual(transition.outstanding, []);
});
test("Provided Values are checked against the Logical Output Contract", () => {
@@ -424,9 +420,9 @@ test("Provided state survives JSON round-trip and regenerates identical ready Co
choose("image2", "existing-image2"),
]);
const scheduled = reduce(state);
- const restored = JSON.parse(JSON.stringify({ ...scheduled.state, outstanding: [] })) as BuildState;
+ const restored = JSON.parse(JSON.stringify({ ...scheduled, outstanding: [] })) as BuildState;
verifyBuildState(restored);
- assert.deepEqual(reduce(restored).commands, scheduled.commands);
+ assert.deepEqual(reduce(restored).outstanding, scheduled.outstanding);
});
function createCaseGGraph(program: LinkedProgram, roots: "value" | "operation"): CompiledGraph {
@@ -467,7 +463,7 @@ test("Case G: two single-output full-input Candidates share both upstream Values
const graph = createCaseGGraph(program, "value");
const state = start(program, graph, request(graph, ["c.result"]));
assert.deepEqual(stepIds(state), ["b1", "b2", "c"]);
- assert.deepEqual(state.plan.initialValues.map((record) => record.id), ["provided:A", "provided:B"]);
+ assert.deepEqual(state.records.filter((record) => record.origin.kind === "provided").map((record) => record.id), ["provided:A", "provided:B"]);
const b1 = state.plan.steps.find((step) => step.id === "b1");
const b2 = state.plan.steps.find((step) => step.id === "b2");
assert.deepEqual(b1?.inputs, { A: "provided:A", B: "provided:B" });
diff --git a/packages/core/test/greeting-fixture.ts b/packages/core/test/greeting-fixture.ts
index b2aca4c6..87ca4bac 100644
--- a/packages/core/test/greeting-fixture.ts
+++ b/packages/core/test/greeting-fixture.ts
@@ -73,7 +73,6 @@ export const manifest: ModuleManifest = {
},
],
capabilities: [{ name: capabilities.generation.name, returns: types.generated }],
- surfaces: [],
producers: [
{
name: producers.makePrompt.name,
@@ -81,8 +80,6 @@ export const manifest: ModuleManifest = {
outputs: [{ name: "prompt", type: types.prompt }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.greeting/make-prompt",
digest: implementationDigests.makePrompt,
},
},
@@ -96,8 +93,6 @@ export const manifest: ModuleManifest = {
returns: types.generated,
}],
implementation: {
- kind: "registered",
- locator: "example.greeting/request-text",
digest: implementationDigests.requestText,
},
},
@@ -107,8 +102,6 @@ export const manifest: ModuleManifest = {
outputs: [{ name: "generated", type: types.generated }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.greeting/placeholder-text",
digest: implementationDigests.placeholderText,
},
},
@@ -118,8 +111,6 @@ export const manifest: ModuleManifest = {
outputs: [{ name: "document", type: types.document }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.greeting/assemble",
digest: implementationDigests.assemble,
},
},
@@ -218,8 +209,6 @@ export function createGreetingBuild(options?: {
origin: { kind: "authored" },
});
const typedModule = sealTypedModule({
- id: "author:greeting",
- closureDigest: closure.digest,
records: [authored],
});
const program = link(closure, [typedModule]);
diff --git a/packages/credential-store-env/src/activation.ts b/packages/credential-store-env/src/activation.ts
index 8a1f0d77..49570df1 100644
--- a/packages/credential-store-env/src/activation.ts
+++ b/packages/credential-store-env/src/activation.ts
@@ -19,7 +19,6 @@ const environmentCredentialStoreAdapter = createRuntimeServiceAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/credential-store-env",
hostFacets: [environmentCredentialStoreAdapter],
};
diff --git a/packages/credential-store-env/src/index.ts b/packages/credential-store-env/src/index.ts
index 8eadf0e8..28ae7a2b 100644
--- a/packages/credential-store-env/src/index.ts
+++ b/packages/credential-store-env/src/index.ts
@@ -44,14 +44,12 @@ export function createEnvironmentCredentialStorePackage(
): RuntimeServicePackage {
const instance = options.instance ?? "credentials.env";
return defineRuntimeServicePackage({
- name: instance,
module: environmentCredentialStoreModuleRef,
services: [{
role: "credential-store",
facet: "credential-store",
instance,
implementation: {
- locator: "@narratage/credential-store-env",
digest: environmentCredentialStoreImplementationDigest,
},
configuration: { source: "process-environment", explicitKeysOnly: true },
diff --git a/packages/credential-store-keychain/src/activation.ts b/packages/credential-store-keychain/src/activation.ts
index 2e4b4f12..0185f7cf 100644
--- a/packages/credential-store-keychain/src/activation.ts
+++ b/packages/credential-store-keychain/src/activation.ts
@@ -27,7 +27,6 @@ const keychainCredentialStoreRuntimeAdapter = createRuntimeServiceAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/credential-store-keychain",
hostFacets: [keychainCredentialStoreRuntimeAdapter],
};
diff --git a/packages/credential-store-keychain/src/store.ts b/packages/credential-store-keychain/src/store.ts
index 656a9d1e..30b75256 100644
--- a/packages/credential-store-keychain/src/store.ts
+++ b/packages/credential-store-keychain/src/store.ts
@@ -142,14 +142,12 @@ export function createKeychainCredentialStorePackage(
const instance = options.instance ?? "credentials.keychain";
const service = options.service ?? DEFAULT_SERVICE;
return defineRuntimeServicePackage({
- name: instance,
module: keychainCredentialStoreModuleRef,
services: [{
role: "credential-store",
facet: "credential-store",
instance,
implementation: {
- locator: "@narratage/credential-store-keychain",
digest: keychainCredentialStoreImplementationDigest,
},
configuration: { source: "os-keychain", service, explicitKeysOnly: true },
diff --git a/packages/deck-track/src/activation.ts b/packages/deck-track/src/activation.ts
index cb3cc837..648e3896 100644
--- a/packages/deck-track/src/activation.ts
+++ b/packages/deck-track/src/activation.ts
@@ -6,30 +6,24 @@ import {
depthStackComponent,
depthStackManifest,
depthStackModuleRef,
- depthStackSurfaceImplementationDigests,
+ depthStackMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/deck-track",
modules: [{
manifest: depthStackManifest,
- specifiers: [depthStackModuleRef.name, `${depthStackModuleRef.name}@1`],
}],
components: [depthStackComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
module: depthStackModuleRef,
- surface: "label",
- mode: "structured",
- implementationDigest: depthStackSurfaceImplementationDigests.label,
+ declaration: depthStackMarkupSurfaces.find((item) => item.name === "label")!,
handler: decodeDepthStackLabelSurface,
}),
createMarkupSurfaceHostFacet({
module: depthStackModuleRef,
- surface: "track",
- mode: "structured",
- implementationDigest: depthStackSurfaceImplementationDigests.track,
+ declaration: depthStackMarkupSurfaces.find((item) => item.name === "track")!,
handler: decodeDepthStackSurface,
}),
],
diff --git a/packages/deck-track/src/component.ts b/packages/deck-track/src/component.ts
index 1329883e..91334264 100644
--- a/packages/deck-track/src/component.ts
+++ b/packages/deck-track/src/component.ts
@@ -48,7 +48,6 @@ function finalizeInputs(inputs: ProducerHandlerContext["inputs"]) {
}
export const depthStackComponent = {
- name: "@narratage/deck-track",
producers: [
{
producer: depthStackProducers.bindLabelText,
diff --git a/packages/deck-track/src/fragment.ts b/packages/deck-track/src/fragment.ts
index 40ef94f2..363fadb6 100644
--- a/packages/deck-track/src/fragment.ts
+++ b/packages/deck-track/src/fragment.ts
@@ -41,7 +41,6 @@ function sourceInput(card: DepthStackFragmentCard): GraphFragment["inputs"][numb
export function createDepthStackFragment(
cards: readonly DepthStackFragmentCard[],
terminal: DepthStackFragmentTerminal,
- name = "@narratage/deck-track/dynamic-depth-stack@1",
) {
if (cards.length === 0) throw new Error("DepthStack Fragment requires Cards.");
const inputs: Array<GraphFragment["inputs"][number]> = [
@@ -157,7 +156,6 @@ export function createDepthStackFragment(
result: { kind: "output", name: "track" },
});
return sealGraphFragment({
- name,
inputs,
operations,
exports: [
diff --git a/packages/deck-track/src/index.ts b/packages/deck-track/src/index.ts
index 8eccefd5..58690fac 100644
--- a/packages/deck-track/src/index.ts
+++ b/packages/deck-track/src/index.ts
@@ -18,7 +18,7 @@ export {
depthStackCardSpecSchema,
depthStackDependency,
depthStackHeaderSchema,
- depthStackManifest,
+ depthStackManifest, depthStackMarkupSurfaces,
depthStackManifestDigest,
depthStackModuleRef,
depthStackProducers,
diff --git a/packages/deck-track/src/lower.ts b/packages/deck-track/src/lower.ts
index cd12666f..8564fcd5 100644
--- a/packages/deck-track/src/lower.ts
+++ b/packages/deck-track/src/lower.ts
@@ -328,7 +328,6 @@ export function renderDepthStack(
}
const mediaItem: MediaItemProgram = {
id: "deck-material",
- sourceOccurrenceId: card.id,
span: { startFrame: stageStart, endFrameExclusive: stageEnd },
frame: localFrame(program.frame),
presentation: structuredClone(program.spec.presentation),
diff --git a/packages/deck-track/src/manifest.ts b/packages/deck-track/src/manifest.ts
index 80056b53..6bf90c10 100644
--- a/packages/deck-track/src/manifest.ts
+++ b/packages/deck-track/src/manifest.ts
@@ -114,14 +114,20 @@ export const depthStackSurfaceImplementationDigests = {
label: digestOf("@narratage/deck-track/label-surface@1"),
track: digestOf("@narratage/deck-track/depth-stack-surface@1"),
} as const;
-const registered = (locator: string, digest: ReturnType<typeof digestOf>) => ({ kind: "registered" as const, locator, digest });
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({ abi: "svml.type-validator@1" as const, implementation: registered(locator, digest) });
+const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
+const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: registered(digest) });
const finalizeInputs = [
{ name: "set", type: depthStackTypes.cardSet }, { name: "header", type: depthStackTypes.header },
{ name: "frame", type: spatialTypes.frame }, { name: "spec", type: depthStackTypes.spec },
{ name: "space", type: programSpaceTypes.programSpace },
] as const;
+export const depthStackMarkupSurfaces = [
+ { name: "label", tag: "Label", mode: "structured", outputs: [textTypes.text, depthStackTypes.cardLabelStyle, depthStackTypes.cardLabel], implementation: { digest: depthStackSurfaceImplementationDigests.label } },
+ { name: "track", tag: "DepthStack", mode: "structured", outputs: [depthStackTypes.header, depthStackTypes.spec, depthStackTypes.cardSpec, depthStackTypes.program, compositionTypes.visualTrack], implementation: { digest: depthStackSurfaceImplementationDigests.track } },
+ ] as const;
+
+
export const depthStackManifest: ModuleManifest = {
format: "svml.module@1", name: depthStackModuleRef.name, version: depthStackModuleRef.version,
dependencies: [narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, mediaDependency, mediaTrackDependency, compositionDependency, textDependency],
@@ -132,34 +138,30 @@ export const depthStackManifest: ModuleManifest = {
{ 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("@narratage/deck-track/validate-program", depthStackValidatorDigests.program) },
+ { name: depthStackTypes.program.name, schema: depthStackProgramSchema, validator: validator(depthStackValidatorDigests.program) },
], capabilities: [],
- surfaces: [
- { name: "label", tag: "Label", mode: "structured", outputs: [textTypes.text, depthStackTypes.cardLabelStyle, depthStackTypes.cardLabel], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/deck-track/label-surface", digest: depthStackSurfaceImplementationDigests.label } },
- { name: "track", tag: "DepthStack", mode: "structured", outputs: [depthStackTypes.header, depthStackTypes.spec, depthStackTypes.cardSpec, depthStackTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/deck-track/depth-stack-surface", digest: depthStackSurfaceImplementationDigests.track } },
- ],
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("@narratage/deck-track/bind-label-text", depthStackImplementationDigests.bindLabelText) },
- { name: depthStackProducers.createCards.name, inputs: [], outputs: [{ name: "set", type: depthStackTypes.cardSet }], needs: [], implementation: registered("@narratage/deck-track/create-cards", depthStackImplementationDigests.createCards) },
+ { 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.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("@narratage/deck-track/append-moment-card", depthStackImplementationDigests.appendMomentCard) },
- { name: depthStackProducers.finalizeProgramEnd.name, inputs: finalizeInputs, outputs: [{ name: "program", type: depthStackTypes.program }], needs: [], implementation: registered("@narratage/deck-track/finalize-program-end", depthStackImplementationDigests.finalizeProgramEnd) },
+ ], 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) },
...([
- [depthStackProducers.finalizeUntilMoment, narrativeTypes.moment, depthStackImplementationDigests.finalizeUntilMoment, "@narratage/deck-track/finalize-until-moment"],
- [depthStackProducers.finalizeUntilSelectionStart, narrativeTypes.selection, depthStackImplementationDigests.finalizeUntilSelectionStart, "@narratage/deck-track/finalize-until-selection-start"],
- [depthStackProducers.finalizeUntilSelectionEnd, narrativeTypes.selection, depthStackImplementationDigests.finalizeUntilSelectionEnd, "@narratage/deck-track/finalize-until-selection-end"],
- ] as const).map(([producer, terminalType, implementationDigest, locator]) => ({
+ [depthStackProducers.finalizeUntilMoment, narrativeTypes.moment, depthStackImplementationDigests.finalizeUntilMoment],
+ [depthStackProducers.finalizeUntilSelectionStart, narrativeTypes.selection, depthStackImplementationDigests.finalizeUntilSelectionStart],
+ [depthStackProducers.finalizeUntilSelectionEnd, narrativeTypes.selection, depthStackImplementationDigests.finalizeUntilSelectionEnd],
+ ] as const).map(([producer, terminalType, implementationDigest]) => ({
name: producer.name, inputs: [...finalizeInputs, { name: "map", type: semanticMapTypes.complete }, { name: "terminal", type: terminalType }],
- outputs: [{ name: "program", type: depthStackTypes.program }], needs: [], implementation: registered(locator, implementationDigest),
+ outputs: [{ name: "program", type: depthStackTypes.program }], needs: [], implementation: registered(implementationDigest),
})),
{ 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("@narratage/deck-track/render", depthStackImplementationDigests.render) },
+ ], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered(depthStackImplementationDigests.render) },
],
};
export const depthStackManifestDigest = digestOf(depthStackManifest);
diff --git a/packages/deck-track/src/surface.ts b/packages/deck-track/src/surface.ts
index 20e36d24..872753ef 100644
--- a/packages/deck-track/src/surface.ts
+++ b/packages/deck-track/src/surface.ts
@@ -126,7 +126,6 @@ function labelFragment(id: string) {
const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = { kind: "fragment-operation" as const, operation: "bind" };
return sealGraphFragment({
- name: `@narratage/deck-track/label-surface/${id}@1`,
inputs: [{ name: "style", type: depthStackTypes.cardLabelStyle }, { name: "content", type: textTypes.text }],
operations: [{
id: "bind", producer: depthStackProducers.bindLabelText,
@@ -295,7 +294,7 @@ export const decodeDepthStackSurface: StructuredSurfaceHandler = ({ element, res
});
}
if (cards.length === 0) throw new Error(`${element.name} requires at least one Card.`);
- const fragment = createDepthStackFragment(cards, terminalValue.terminal, `@narratage/deck-track/surface/${id}@1`);
+ const fragment = createDepthStackFragment(cards, terminalValue.terminal);
return {
records,
components: [{ id, fragment: fragment.id, inputs, outputs: { program: `${id}.program`, track: `${id}.track` }, range: element.range }],
diff --git a/packages/deck-track/test/deck-track.test.ts b/packages/deck-track/test/deck-track.test.ts
index b8b6cf57..23cfc5f5 100644
--- a/packages/deck-track/test/deck-track.test.ts
+++ b/packages/deck-track/test/deck-track.test.ts
@@ -461,14 +461,12 @@ test("another Deck family can coexist by contributing only the existing VisualTr
name: "example.carousel",
version: "1",
dependencies: [compositionDependency],
- types: [], capabilities: [], surfaces: [], producers: [{
+ types: [], capabilities: [], producers: [{
name: "render-carousel",
inputs: [],
outputs: [{ name: "track", type: compositionTypes.visualTrack }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.carousel/render",
digest: digestOf("example.carousel/render@1"),
},
}],
diff --git a/packages/driver-node/README.md b/packages/driver-node/README.md
index 43d362cd..b45202be 100644
--- a/packages/driver-node/README.md
+++ b/packages/driver-node/README.md
@@ -22,11 +22,11 @@ Manifest JSON parsing belongs to `@narratage/protocol`.
Legacy direct `bind()` remains only as the low-level trusted test/embedding API.
- 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 journaled completion without another external
+ `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
`OperationStore` are present.
- Endpoint credentials are resolved only for the slots declared by that locked endpoint, immediately
- before `start/resume/cancel`; secret bytes never become Driver journal or Core state.
+ 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
failure that Core accepts through its ordinary command-failed Event.
@@ -44,7 +44,7 @@ Build state is serializable. Missing Endpoints, generation latency and transient
build without replaying completed Producers.
`start()` and `resume()` receive the same stable Operation id. `resume(undefined)` is intentional:
-it covers a stop after submission intent was journaled but before a remote job checkpoint was saved.
+it covers a stop after submission intent was persisted but before a remote job checkpoint was saved.
The Endpoint must use that key to find-or-submit idempotently; the Driver cannot manufacture remote
exactly-once semantics for an API that does not provide them.
diff --git a/packages/driver-node/src/driver.ts b/packages/driver-node/src/driver.ts
index 7b6f8ec4..75c63658 100644
--- a/packages/driver-node/src/driver.ts
+++ b/packages/driver-node/src/driver.ts
@@ -43,7 +43,7 @@ import {
import type {
ArtifactStore,
BlockedCommand,
- DriverJournalEntry,
+ DriverExecutionOutcome,
DriverRunResult,
EndpointRegistration,
} from "./types.js";
@@ -54,7 +54,6 @@ export type NodeDriverOptions = {
readonly artifacts?: ArtifactStore;
readonly operations?: OperationStore;
readonly credentials?: CredentialStore;
- readonly maxEvents?: number;
readonly validators?: TypeValidatorRegistryLike;
};
@@ -78,7 +77,6 @@ export class NodeDriver {
readonly artifacts: ArtifactStore;
readonly operations: OperationStore | undefined;
readonly credentials: CredentialStore | undefined;
- readonly maxEvents: number;
readonly validators: TypeValidatorRegistryLike;
constructor(options: NodeDriverOptions = {}) {
@@ -87,7 +85,6 @@ export class NodeDriver {
this.artifacts = options.artifacts ?? new MemoryArtifactStore();
this.operations = options.operations;
this.credentials = options.credentials;
- this.maxEvents = options.maxEvents ?? 1_000;
this.validators = options.validators ?? new TypeValidatorRegistry();
}
@@ -130,7 +127,6 @@ export class NodeDriver {
state: BuildState,
command: CoreCommand,
): { readonly executable?: Executable; readonly blocked?: BlockedCommand } {
- if (command.kind === "complete") return {};
if (command.kind === "invoke-producer") {
const registration = this.producers.producer(command.producer);
if (registration === undefined) {
@@ -230,20 +226,18 @@ export class NodeDriver {
executable: Extract<Executable, { readonly endpointId: string }>,
result: EndpointFulfillment,
): Promise<BuildEvent> {
- const validation = await validateValue(
+ await validateValue(
state.program.closure,
executable.command.need.returns,
result.value,
this.validators,
);
const runtimeImplementation = executable.registration.runtimeImplementation;
- const runtimeClosure = this.endpoints.runtimeClosureDigest();
const implementation = runtimeImplementation === undefined
? undefined
: {
digest: runtimeImplementation.digest,
configurationDigest: runtimeImplementation.configurationDigest,
- ...(runtimeClosure === undefined ? {} : { runtimeClosure }),
};
const content = {
kind: "need-fulfilled",
@@ -252,7 +246,6 @@ export class NodeDriver {
requestDigest: executable.command.need.requestDigest,
fulfiller: executable.endpointId,
...(implementation === undefined ? {} : { implementation }),
- ...(validation === undefined ? {} : { validation }),
} as const;
return { ...content, id: `event:${digestOf(content)}` };
}
@@ -326,9 +319,7 @@ export class NodeDriver {
|| snapshot.endpoint !== expected.endpoint
|| snapshot.authority !== expected.authority
|| snapshot.route !== expected.route
- || snapshot.implementationDigest !== expected.implementationDigest
- || snapshot.runtimeClosure !== expected.runtimeClosure
- || snapshot.requestDigest !== expected.requestDigest) {
+ || snapshot.runtimeClosure !== expected.runtimeClosure) {
throw new Error(`Operation history for ${expected.command} is not one contiguous retry chain`);
}
});
@@ -353,9 +344,7 @@ export class NodeDriver {
endpoint: executable.endpointId,
authority: executable.queue.authority,
route: executable.queue.route,
- implementationDigest: implementation.digest,
runtimeClosure,
- requestDigest: executable.command.need.requestDigest,
} as const;
const maxAttempts = executable.registration.retry?.maxAttempts ?? 1;
const history = await operations.list({
@@ -363,7 +352,6 @@ export class NodeDriver {
command: base.command,
endpoint: base.endpoint,
runtimeClosure: base.runtimeClosure,
- requestDigest: base.requestDigest,
});
this.#assertOperationHistory(history, base);
let latest = history.at(-1);
@@ -456,19 +444,16 @@ export class NodeDriver {
if (!("endpointId" in executable)) {
const result = (await executable.run()) as ProducerHandlerResult;
const producer = resolveProducer(state.program.closure, executable.command.producer);
- const validations: Record<string, NonNullable<Awaited<ReturnType<typeof validateValue>>>> = {};
for (const port of producer.outputs) {
const value = result.outputs[port.name];
if (value === undefined) continue;
- const validation = await validateValue(state.program.closure, port.type, value, this.validators);
- if (validation !== undefined) validations[port.name] = validation;
+ await validateValue(state.program.closure, port.type, value, this.validators);
}
const content = {
kind: "producer-completed",
command: executable.command.id,
outputs: result.outputs,
needs: result.needs,
- validations,
} as const;
return {
status: "completed",
@@ -490,12 +475,11 @@ export class NodeDriver {
/** Regenerate Core commands, then classify only what this Host can execute. */
prepare(initial: BuildState): RuntimePreparation {
- const transition = reduce(initial);
- const state = transition.state;
+ const state = reduce(initial);
if (state.status === "complete" || state.status === "failed") {
return { state, runnable: [], blocked: [] };
}
- const classifications = transition.commands.map((command) => ({
+ const classifications = state.outstanding.map((command) => ({
command,
...this.#classify(state, command),
}));
@@ -529,7 +513,7 @@ export class NodeDriver {
return await this.#execute(prepared.state, classified.executable, context);
}
- /** Cancel one journaled external Operation without trusting serialized Command content. */
+ /** Cancel one persisted external Operation without trusting serialized Command content. */
async cancelOperation(
initial: BuildState,
operation: OperationSnapshot,
@@ -574,9 +558,7 @@ export class NodeDriver {
endpoint: operation.endpoint,
authority: operation.authority,
route: operation.route,
- implementationDigest: operation.implementationDigest,
runtimeClosure: operation.runtimeClosure,
- requestDigest: operation.requestDigest,
attempt: operation.attempt,
};
const endpointContext = {
@@ -663,19 +645,18 @@ export class NodeDriver {
async run(initial: BuildState, context?: RuntimeExecutionContext): Promise<DriverRunResult> {
let state = initial;
- const journal: DriverJournalEntry[] = [];
+ const outcomes: DriverExecutionOutcome[] = [];
- for (let processed = 0; processed < this.maxEvents; processed += 1) {
- const transition = reduce(state);
- state = transition.state;
+ while (true) {
+ state = reduce(state);
if (state.status === "complete") {
- return { status: "complete", state, journal, blocked: [] };
+ return { status: "complete", state, outcomes, blocked: [] };
}
if (state.status === "failed") {
- return { status: "failed", state, journal, blocked: [] };
+ return { status: "failed", state, outcomes, blocked: [] };
}
- const classifications = transition.commands.map((command) => ({
+ const classifications = state.outstanding.map((command) => ({
command,
...this.#classify(state, command),
}));
@@ -684,52 +665,41 @@ export class NodeDriver {
const blocked = classifications
.map((item) => item.blocked)
.filter((item): item is BlockedCommand => item !== undefined);
- journal.push(
- ...blocked.map((item) => ({
- command: item.command,
- kind: transition.commands.find((command) => command.id === item.command)?.kind ?? "fulfill-need",
- status: "blocked" as const,
- message: `${item.reason}: ${item.subject}`,
- })),
- );
- return { status: "paused", state, journal, blocked };
+ return { status: "paused", state, outcomes, blocked };
}
try {
const execution = await this.#execute(state, selected, context);
if (execution.status === "pending") {
- journal.push({
+ outcomes.push({
command: selected.command.id,
kind: selected.command.kind,
status: "pending",
operation: execution.operation,
...(execution.wakeAt === undefined ? {} : { wakeAt: execution.wakeAt }),
});
- return { status: "paused", state, journal, blocked: [] };
+ return { status: "paused", state, outcomes, blocked: [] };
}
if (execution.status === "deferred") {
throw new Error("direct NodeDriver execution has no Runtime capacity admission to defer");
}
const event = execution.event;
- const accepted = reduce(state, event);
- state = accepted.state;
- journal.push({
+ state = reduce(state, event);
+ outcomes.push({
command: selected.command.id,
kind: selected.command.kind,
status: "completed",
event: event.id,
});
} catch (error) {
- journal.push({
+ outcomes.push({
command: selected.command.id,
kind: selected.command.kind,
status: "error",
message: error instanceof Error ? error.message : String(error),
});
- return { status: "paused", state, journal, blocked: [] };
+ return { status: "paused", state, outcomes, blocked: [] };
}
}
-
- return { status: "paused", state, journal, blocked: [] };
}
}
diff --git a/packages/driver-node/src/types.ts b/packages/driver-node/src/types.ts
index 8e466172..0aa7a066 100644
--- a/packages/driver-node/src/types.ts
+++ b/packages/driver-node/src/types.ts
@@ -20,10 +20,10 @@ export type {
ProducerRegistrar,
} from "@narratage/component-kit";
-export type DriverJournalEntry = {
+export type DriverExecutionOutcome = {
readonly command: string;
readonly kind: CoreCommand["kind"];
- readonly status: "completed" | "pending" | "blocked" | "error";
+ readonly status: "completed" | "pending" | "error";
readonly event?: string;
readonly operation?: Digest;
readonly wakeAt?: number;
@@ -45,7 +45,7 @@ export type BlockedCommand = {
export type DriverRunResult = {
readonly status: "complete" | "paused" | "failed";
readonly state: BuildState;
- readonly journal: readonly DriverJournalEntry[];
+ readonly outcomes: readonly DriverExecutionOutcome[];
readonly blocked: readonly BlockedCommand[];
};
diff --git a/packages/driver-node/test/driver.test.ts b/packages/driver-node/test/driver.test.ts
index 8e7cd473..bc755a48 100644
--- a/packages/driver-node/test/driver.test.ts
+++ b/packages/driver-node/test/driver.test.ts
@@ -112,7 +112,6 @@ test("Driver pauses at an unbound Need, serializes, then resumes without rerunni
assert.deepEqual(need.constraints, { prompt: "Greet Ada" });
return {
value: { kind: "inline", value: "Hello, Ada!" },
- metadata: { endpoint: "fixture" },
};
}, { runtimeImplementation: endpointImplementation });
@@ -162,7 +161,6 @@ test("an Endpoint receives only declared credential slots and secrets never ente
assert.equal(credentials.apiKey?.secret, "top-secret-value");
return {
value: { kind: "inline", value: "Credentialed result" },
- metadata: { authenticated: true },
};
},
{ credentials: { apiKey: credentialRef("test", "endpoint-key") } },
@@ -272,27 +270,11 @@ test("Driver reads static manifests without executing package code", async () =>
const directory = await mkdtemp(join(tmpdir(), "svml-driver-"));
const path = join(directory, "svml.module.json");
try {
- const withSurface = {
- ...manifest,
- surfaces: [
- {
- name: "greeting",
- tag: "greeting",
- mode: "structured" as const,
- outputs: [types.intent],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.greeting/surface",
- digest: digestOf("example.greeting/surface@0"),
- },
- },
- ],
- };
- await writeFile(path, JSON.stringify(withSurface), "utf8");
+ await writeFile(path, JSON.stringify(manifest), "utf8");
const closure = await loadResolvedClosure([path]);
assert.equal(closure.modules.length, 1);
assert.equal(closure.modules[0]?.manifest.name, "example.greeting");
- assert.equal(closure.modules[0]?.manifest.surfaces[0]?.mode, "structured");
+ assert.equal(closure.modules[0]?.manifest.producers[0]?.name, greetingProducers.makePrompt.name);
} finally {
await rm(directory, { recursive: true, force: true });
}
@@ -304,7 +286,7 @@ test("Core still owns scheduling when Driver has every implementation", async ()
value: { kind: "inline", value: "Hello, Ada!" },
}));
const start = createGreetingBuild();
- assert.equal(reduce(start).commands[0]?.kind, "invoke-producer");
+ assert.equal(reduce(start).outstanding[0]?.kind, "invoke-producer");
const result = await new NodeDriver({ producers, endpoints }).run(start);
assert.equal(result.status, "complete");
});
@@ -361,14 +343,13 @@ test("a transient Handler failure pauses and can resume without replaying comple
if (attempts === 1) throw new Error("temporary outage");
return {
value: { kind: "inline", value: "Hello after retry" },
- metadata: { attempt: attempts },
};
});
const driver = new NodeDriver({ producers, endpoints });
const paused = await driver.run(createGreetingBuild());
assert.equal(paused.status, "paused");
- assert.match(paused.journal.at(-1)?.message ?? "", /temporary outage/u);
+ assert.match(paused.outcomes.at(-1)?.message ?? "", /temporary outage/u);
assert.deepEqual(calls, { prompt: 1, request: 1, assemble: 0, fulfill: 1 });
const completed = await driver.run(paused.state);
diff --git a/packages/driver-node/test/scheduler.test.ts b/packages/driver-node/test/scheduler.test.ts
index d3cf6a54..86076372 100644
--- a/packages/driver-node/test/scheduler.test.ts
+++ b/packages/driver-node/test/scheduler.test.ts
@@ -59,8 +59,6 @@ function createParallelGreetingBuild(generationCount = 2) {
},
});
const program = link(closure, [sealTypedModule({
- id: "author:parallel-greeting",
- closureDigest: closure.digest,
records: [authored],
})]);
const graph = sealCompiledGraph({
@@ -196,7 +194,6 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
name: "scheduler",
role: "scheduler",
implementation: {
- locator: "example.scheduler-runtime/scheduler",
digest: digestOf("example.scheduler-runtime/scheduler@1"),
},
},
@@ -204,7 +201,6 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
name: "operations",
role: "operation-store",
implementation: {
- locator: "example.scheduler-runtime/operations",
digest: digestOf("example.scheduler-runtime/operations@1"),
},
},
@@ -212,14 +208,12 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
["worker", "worker"],
["builds", "build-store"],
["dispatch", "dispatch-store"],
- ["journal", "runtime-journal"],
["artifacts", "artifact-store"],
["credentials", "credential-store"],
] as const).map(([name, role]) => ({
name,
role,
implementation: {
- locator: `example.scheduler-runtime/${name}`,
digest: digestOf(`example.scheduler-runtime/${name}@1`),
},
})),
@@ -227,7 +221,6 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
name: providerFacet.name,
role: "capability-endpoint",
implementation: {
- locator: "example.scheduler-runtime/generation-endpoint",
digest: providerImplementationDigest,
},
fulfills: [{ capability: capabilities.generation, returns: types.generated }],
@@ -239,25 +232,22 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl
const modules = new RuntimeModuleRegistry();
modules.register(manifest);
const closure = resolveRuntimeProfile(modules, sealRuntimeProfile({
- name: "scheduler-test",
instances: [
{ id: "scheduler.local", facet: { module: runtimeModule, name: "scheduler" } },
{ id: "worker.local", facet: { module: runtimeModule, name: "worker" } },
{ id: "builds.memory", facet: { module: runtimeModule, name: "builds" } },
{ id: "operations.memory", facet: { module: runtimeModule, name: "operations" } },
{ id: "dispatch.memory", facet: { module: runtimeModule, name: "dispatch" } },
- { id: "journal.memory", facet: { module: runtimeModule, name: "journal" } },
{ 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({}) })),
scheduler: "scheduler.local",
worker: "worker.local",
stores: {
build: "builds.memory",
operations: "operations.memory",
dispatch: "dispatch.memory",
- journal: "journal.memory",
artifacts: "artifacts.memory",
credentials: ["credentials.memory"],
},
@@ -329,7 +319,7 @@ 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.journal.some((entry) => entry.resources.includes("authority:fixture.account"))), true);
+ result.outcomes.some((entry) => entry.resources.includes("authority:fixture.account"))), true);
});
test("a Runtime Profile resource override changes parallelism without changing either Build", async () => {
@@ -399,7 +389,7 @@ test("durable scheduling keeps the rest of an in-flight command batch after one
assert.equal(result?.status, "complete");
assert.equal(getCalls(), 2);
assert.equal(maximumActive, 2);
- assert.equal(result?.journal.some((entry) =>
+ assert.equal(result?.outcomes.some((entry) =>
entry.status === "error" && entry.message?.includes("event references command")), false);
assert.equal((await store.read("durable-two-shots"))?.state.status, "complete");
});
@@ -430,9 +420,9 @@ test("durable scheduling can drain successful sibling commands after another sib
assert.equal(result?.status, "paused");
assert.equal(calls, 3);
- assert.equal(result?.journal.filter((entry) => entry.status === "completed"
+ assert.equal(result?.outcomes.filter((entry) => entry.status === "completed"
&& entry.kind === "invoke-producer").length, 3, "the prompt and both successful requests are accepted");
- assert.equal(result?.journal.some((entry) =>
+ assert.equal(result?.outcomes.some((entry) =>
entry.status === "error" && entry.message?.includes("event references command")), false);
assert.equal(result?.state.derivations.filter((item) =>
item.producer.name === greetingProducers.requestText.name).length, 2);
@@ -530,7 +520,7 @@ test("BuildStore CAS prevents two Scheduler revisions from silently overwriting
assert.equal(read?.revision, 1);
});
-test("a recoverable Endpoint resumes its journaled Operation after restart without submitting twice", async () => {
+test("a recoverable Endpoint resumes its persisted Operation after restart without submitting twice", async () => {
const operations = new MemoryOperationStore();
const runtime = resolvedRuntime(1, "recoverable");
let starts = 0;
@@ -550,7 +540,6 @@ test("a recoverable Endpoint resumes its journaled Operation after restart witho
status: "completed",
result: {
value: { kind: "inline", value: "Hello after restart" },
- metadata: { remoteJob: "job-1" },
},
};
},
@@ -565,7 +554,7 @@ test("a recoverable Endpoint resumes its journaled Operation after restart witho
assert.equal(starts, 1);
assert.equal(resumes, 0);
assert.equal(first?.state.receipts.length, 0, "pending external work is not a Core event");
- const pending = first?.journal.find((entry) => entry.status === "pending");
+ const pending = first?.outcomes.find((entry) => entry.status === "pending");
assert.ok(pending?.operation);
assert.equal((await operations.read(pending.operation))?.status, "pending");
@@ -577,11 +566,9 @@ test("a recoverable Endpoint resumes its journaled Operation after restart witho
).run([{ id: "video", state: restored }]);
assert.equal(second?.status, "complete");
- assert.equal(starts, 1, "the already journaled Operation must not call start again");
+ assert.equal(starts, 1, "the already persisted Operation must not call start again");
assert.equal(resumes, 1);
assert.equal((await operations.read(pending.operation))?.status, "completed");
- const completion = (await operations.read(pending.operation))?.completion;
- assert.deepEqual(completion?.metadata, { remoteJob: "job-1" });
});
test("a crash after Operation intent but before checkpoint resumes with the same Operation id", async () => {
@@ -604,7 +591,6 @@ test("a crash after Operation intent but before checkpoint resumes with the same
status: "completed",
result: {
value: { kind: "inline", value: "Recovered by idempotency key" },
- metadata: { recovered: true },
},
};
},
@@ -616,7 +602,7 @@ test("a crash after Operation intent but before checkpoint resumes with the same
localSchedulerOptionsFromClosure(runtime.closure),
).run([{ id: "video", state: createGreetingBuild() }]);
assert.equal(first?.status, "paused");
- assert.match(first?.journal.at(-1)?.message ?? "", /process stopped/u);
+ assert.match(first?.outcomes.at(-1)?.message ?? "", /process stopped/u);
assert.equal(starts, 1);
// An exception happens before the Scheduler sees the Operation id, but OperationStore already has it.
assert.ok(operationId);
@@ -635,7 +621,7 @@ test("a crash after Operation intent but before checkpoint resumes with the same
assert.equal(resumes, 1);
});
-test("a completion journaled before a crash is replayed into Core without calling the Endpoint again", async () => {
+test("a completion persisted before a crash is replayed into Core without calling the Endpoint again", async () => {
const operations = new MemoryOperationStore();
const runtime = resolvedRuntime(1, "recoverable");
let starts = 0;
@@ -649,7 +635,7 @@ test("a completion journaled before a crash is replayed into Core without callin
const result = await operations.compareAndSwap(id, revision, update);
if (update.status === "completed" && crashOnce) {
crashOnce = false;
- throw new Error("process stopped after completion was journaled");
+ throw new Error("process stopped after completion was persisted");
}
return result;
},
@@ -660,8 +646,7 @@ test("a completion journaled before a crash is replayed into Core without callin
return {
status: "completed",
result: {
- value: { kind: "inline", value: "Journaled completion" },
- metadata: { remoteJob: "job-complete" },
+ value: { kind: "inline", value: "Persisted completion" },
},
};
},
@@ -677,7 +662,7 @@ test("a completion journaled before a crash is replayed into Core without callin
).run([{ id: "video", state: createGreetingBuild() }]);
assert.equal(first?.status, "paused");
assert.equal(first?.state.receipts.length, 0);
- assert.match(first?.journal.at(-1)?.message ?? "", /completion was journaled/u);
+ assert.match(first?.outcomes.at(-1)?.message ?? "", /completion was persisted/u);
assert.equal(starts, 1);
const [second] = await new LocalBuildScheduler(
@@ -761,11 +746,11 @@ test("wakeAt prevents early polling and Runtime cancellation becomes a terminal
const executor = recoverableExecutor(endpoint, operations, runtime).executor;
const scheduler = new LocalBuildScheduler(executor, localSchedulerOptionsFromClosure(runtime.closure));
const [first] = await scheduler.run([{ id: "cancel-video", state: createGreetingBuild() }]);
- const operationId = first?.journal.find((item) => item.status === "pending")?.operation;
+ const operationId = first?.outcomes.find((item) => item.status === "pending")?.operation;
assert.ok(operationId);
const [early] = await scheduler.run([{ id: "cancel-video", state: first!.state }]);
- assert.equal(early?.journal.at(-1)?.wakeAt, wakeAt);
+ assert.equal(early?.outcomes.at(-1)?.wakeAt, wakeAt);
assert.equal(resumes, 0);
const operation = await operations.read(operationId);
@@ -796,7 +781,7 @@ test("cancellation acknowledgement never invents a remote terminal fact", async
const executor = recoverableExecutor(endpoint, operations, runtime).executor;
const scheduler = new LocalBuildScheduler(executor, localSchedulerOptionsFromClosure(runtime.closure));
const [first] = await scheduler.run([{ id: "accepted-cancel", state: createGreetingBuild() }]);
- const operationId = first?.journal.find((item) => item.status === "pending")?.operation;
+ const operationId = first?.outcomes.find((item) => item.status === "pending")?.operation;
assert.ok(operationId);
const operation = await operations.read(operationId);
assert.ok(operation);
@@ -848,7 +833,7 @@ test("a completion racing with cancellation is recorded as too late instead of o
const executor = recoverableExecutor(endpoint, operations, runtime).executor;
const scheduler = new LocalBuildScheduler(executor, localSchedulerOptionsFromClosure(runtime.closure));
const [first] = await scheduler.run([{ id: "cancel-completion-race", state: createGreetingBuild() }]);
- const operationId = first?.journal.find((item) => item.status === "pending")?.operation;
+ const operationId = first?.outcomes.find((item) => item.status === "pending")?.operation;
assert.ok(operationId);
const operation = await operations.read(operationId);
assert.ok(operation);
@@ -878,7 +863,7 @@ test("an Endpoint without cancellation stays observable instead of changing Cand
const executor = recoverableExecutor(endpoint, operations, runtime).executor;
const scheduler = new LocalBuildScheduler(executor, localSchedulerOptionsFromClosure(runtime.closure));
const [first] = await scheduler.run([{ id: "unsupported-cancel", state: createGreetingBuild() }]);
- const operationId = first?.journal.find((item) => item.status === "pending")?.operation;
+ const operationId = first?.outcomes.find((item) => item.status === "pending")?.operation;
assert.ok(operationId);
const operation = await operations.read(operationId);
assert.ok(operation);
diff --git a/packages/driver-node/test/validation.test.ts b/packages/driver-node/test/validation.test.ts
index 0c721290..d95296a8 100644
--- a/packages/driver-node/test/validation.test.ts
+++ b/packages/driver-node/test/validation.test.ts
@@ -72,16 +72,12 @@ const contractManifest: ModuleManifest = {
},
},
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "example.measurement-contract/even-integer-validator",
digest: validatorDigest,
},
},
}],
capabilities: [],
- surfaces: [],
producers: [],
};
@@ -97,7 +93,6 @@ const sensorManifest: ModuleManifest = {
dependencies: [contractDependency],
types: [],
capabilities: [{ name: measurementCapability.name, returns: measurementType }],
- surfaces: [],
producers: [
{
name: measureProducer.name,
@@ -105,8 +100,6 @@ const sensorManifest: ModuleManifest = {
outputs: [{ name: "measurement", type: measurementType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.sensor/measure",
digest: producerDigests.measure,
},
},
@@ -120,8 +113,6 @@ const sensorManifest: ModuleManifest = {
returns: measurementType,
}],
implementation: {
- kind: "registered",
- locator: "example.sensor/request-measurement",
digest: producerDigests.request,
},
},
@@ -135,15 +126,12 @@ const reportManifest: ModuleManifest = {
dependencies: [contractDependency],
types: [{ name: reportType.name, schema: { kind: "string", minLength: 1 } }],
capabilities: [],
- surfaces: [],
producers: [{
name: reportProducer.name,
inputs: [{ name: "measurement", type: measurementType }],
outputs: [{ name: "report", type: reportType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.report/write-report",
digest: producerDigests.report,
},
}],
@@ -167,8 +155,6 @@ function registry(digest = validatorDigest): TypeValidatorRegistry {
function program(): LinkedProgram {
const closure = createResolvedClosure([contractManifest, sensorManifest, reportManifest]);
return link(closure, [sealTypedModule({
- id: "author:empty",
- closureDigest: closure.digest,
records: [],
})]);
}
@@ -251,15 +237,11 @@ test("three independent packages communicate through an owner-validated nominal
assert.equal(result.status, "complete");
const measurement = result.state.records.find((record) => record.id === "measurement:root");
- assert.equal(measurement?.validation?.validatorDigest, validatorDigest);
- assert.equal(measurement?.validation?.recordDigest, measurement?.digest);
+ assert.equal(measurement?.value.kind, "inline");
assert.equal(result.state.records.find((record) => record.id === "report:root")?.type.name, "Report");
const restored = parseBuildState(serializeBuildState(result.state));
- assert.equal(
- restored.records.find((record) => record.id === "measurement:root")?.validation?.id,
- measurement?.validation?.id,
- );
+ assert.equal(restored.records.find((record) => record.id === "measurement:root")?.digest, measurement?.digest);
});
test("a structurally valid but semantically invalid Producer value never enters BuildState", async () => {
@@ -270,7 +252,7 @@ test("a structurally valid but semantically invalid Producer value never enters
}).run(outputBuild(linked));
assert.equal(result.status, "paused");
- assert.match(result.journal[0]?.message ?? "", /measurement must be even/u);
+ assert.match(result.outcomes[0]?.message ?? "", /measurement must be even/u);
assert.equal(result.state.records.some((record) => record.id === "measurement:root"), false);
assert.equal(result.state.acceptedEvents.length, 0);
});
@@ -282,14 +264,14 @@ test("missing or digest-mismatched validator implementations fail before record
validators: new TypeValidatorRegistry(),
}).run(outputBuild(linked));
assert.equal(missing.status, "paused");
- assert.match(missing.journal[0]?.message ?? "", /validator is not registered/u);
+ 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.journal[0]?.message ?? "", /does not match the locked Manifest/u);
+ assert.match(mismatched.outcomes[0]?.message ?? "", /does not match the locked Manifest/u);
});
function providerGraph(linked: LinkedProgram): CompiledGraph {
@@ -349,15 +331,15 @@ async function providerBuild(measured: number) {
test("Endpoint results pass the same Type-owner validation gate as Producer results", async () => {
const valid = await providerBuild(8);
assert.equal(valid.status, "complete");
- assert.equal(valid.state.records[0]?.validation?.validatorDigest, validatorDigest);
+ assert.equal(valid.state.records[0]?.value.kind, "inline");
const invalid = await providerBuild(7);
assert.equal(invalid.status, "paused");
- assert.match(invalid.journal.at(-1)?.message ?? "", /measurement must be even/u);
+ assert.match(invalid.outcomes.at(-1)?.message ?? "", /measurement must be even/u);
assert.equal(invalid.state.records.some((record) => record.id === "measurement:endpoint"), false);
});
-test("authored values require a receipt bound to their exact Type and content", async () => {
+test("authored values cross the Type owner's validation gate without carrying validation metadata", async () => {
const linked = program();
const raw = sealRecord({
id: "measurement:authored",
@@ -367,28 +349,15 @@ test("authored values require a receipt bound to their exact Type and content",
kind: "authored",
},
});
- assert.throws(() => verifyRecord(linked.closure, raw), /requires .*validator/u);
+ verifyRecord(linked.closure, raw);
const admitted = await admitRecord(linked.closure, raw, registry());
verifyRecord(linked.closure, admitted);
- assert.equal(admitted.validation?.recordDigest, admitted.digest);
+ 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);
- assert.throws(
- () => parseModuleManifestText(JSON.stringify({
- ...contractManifest,
- types: [{
- ...contractManifest.types[0],
- validator: {
- ...contractManifest.types[0]?.validator,
- abi: "arbitrary-javascript@1",
- },
- }],
- })),
- /validator.*abi must be svml\.type-validator@1/u,
- );
});
test("Type validation errors remain machine distinguishable", async () => {
diff --git a/packages/elaborator/README.md b/packages/elaborator/README.md
index 68fb1b1d..f535788e 100644
--- a/packages/elaborator/README.md
+++ b/packages/elaborator/README.md
@@ -43,8 +43,8 @@ into Source Closure identity. It does not know whether a Host obtained the bytes
browser upload, repository object or remote content store.
Frontend output passes a Host-owned Record admission hook before linking. The hook is permitted to
-attach validation evidence but is forbidden to rewrite Record identity, Type, value, digest,
-or origin. `@narratage/compiler-node` wires this to `@narratage/validation` by default, so authored
+reject a Record but is forbidden to rewrite Record identity, Type, value, digest, or origin.
+`@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
diff --git a/packages/elaborator/src/author.ts b/packages/elaborator/src/author.ts
index a663c984..6a1cd767 100644
--- a/packages/elaborator/src/author.ts
+++ b/packages/elaborator/src/author.ts
@@ -1,5 +1,4 @@
import {
- digestOf,
isDigest,
sealCompiledGraph,
verifyCompiledGraph,
@@ -55,8 +54,6 @@ export type AuthorComponent = {
*/
export type AuthorModule = {
readonly format: "svml.author-module@1";
- readonly id: Digest;
- readonly name: string;
readonly components: readonly AuthorComponent[];
};
@@ -67,13 +64,6 @@ export type AuthorOutputBinding = {
readonly type: TypeRef;
};
-export type AuthorElaboration = {
- readonly format: "svml.author-elaboration@1";
- readonly author: Digest;
- readonly graph: CompiledGraph;
- readonly outputs: readonly AuthorOutputBinding[];
-};
-
/** Resolve a locked Graph Fragment without executing package code. */
export type GraphFragmentResolver = (id: Digest) => GraphFragment | undefined;
@@ -152,10 +142,9 @@ function normalizeComponent(component: AuthorComponent): AuthorComponent {
};
}
-function authorModuleContent(module: AuthorModule): Omit<AuthorModule, "id"> {
+function authorModuleContent(module: AuthorModule): AuthorModule {
return {
format: "svml.author-module@1",
- name: module.name,
components: [...module.components]
.map(normalizeComponent)
.sort((left, right) => left.id.localeCompare(right.id)),
@@ -163,15 +152,13 @@ function authorModuleContent(module: AuthorModule): Omit<AuthorModule, "id"> {
}
export function sealAuthorModule(
- module: Omit<AuthorModule, "format" | "id">,
+ module: Omit<AuthorModule, "format">,
): AuthorModule {
- const draft = {
+ const draft: AuthorModule = {
format: "svml.author-module@1" as const,
- id: digestOf("unsealed-author-module"),
...module,
};
- const content = authorModuleContent(draft);
- return { ...content, id: digestOf(content) };
+ return authorModuleContent(draft);
}
type CollectedComponent = {
@@ -196,14 +183,6 @@ function collectAuthorModule(
resolveFragment: GraphFragmentResolver,
): CollectedAuthorModule {
assert(module.format === "svml.author-module@1", "UNSUPPORTED_AUTHOR_MODULE", "unsupported Author Module format");
- assert(isDigest(module.id), "INVALID_AUTHOR_MODULE_DIGEST", "Author Module id is not a digest");
- assert(
- module.id === digestOf(authorModuleContent(module)),
- "AUTHOR_MODULE_DIGEST_MISMATCH",
- "Author Module digest differs",
- );
- assert(module.name.length > 0, "EMPTY_AUTHOR_MODULE_NAME", "Author Module name is empty");
-
const components = new Map<string, CollectedComponent>();
const outputs = new Map<string, AuthorOutputBinding>();
const outputIds = new Set<string>();
@@ -213,7 +192,7 @@ function collectAuthorModule(
assert(
!components.has(declaration.id),
"DUPLICATE_AUTHOR_COMPONENT",
- `${module.name} repeats component ${declaration.id}`,
+ `Author Module repeats component ${declaration.id}`,
declaration.id,
);
assert(isDigest(declaration.fragment), "INVALID_FRAGMENT_DIGEST", `${declaration.id} Fragment digest is invalid`);
@@ -242,7 +221,7 @@ function collectAuthorModule(
assert(
!outputIds.has(id),
"DUPLICATE_LOGICAL_OUTPUT_ID",
- `${module.name} binds Logical Output ${id} more than once`,
+ `Author Module binds Logical Output ${id} more than once`,
id,
);
outputIds.add(id);
@@ -267,7 +246,7 @@ export function elaborateAuthorModule(
program: LinkedProgram,
module: AuthorModule,
resolveFragment: GraphFragmentResolver,
-): AuthorElaboration {
+): CompiledGraph {
const collected = collectAuthorModule(program, module, resolveFragment);
const records = new Map(program.records.map((record) => [record.id, record]));
const visiting: string[] = [];
@@ -353,10 +332,5 @@ export function elaborateAuthorModule(
);
const graph = sealCompiledGraph({ program: program.semanticDigest, ...merged });
verifyCompiledGraph(program, graph);
- return {
- format: "svml.author-elaboration@1",
- author: module.id,
- graph,
- outputs: [...collected.outputs.values()].sort((left, right) => left.id.localeCompare(right.id)),
- };
+ return graph;
}
diff --git a/packages/elaborator/src/fragment.ts b/packages/elaborator/src/fragment.ts
index 6e87a296..3cb704b6 100644
--- a/packages/elaborator/src/fragment.ts
+++ b/packages/elaborator/src/fragment.ts
@@ -50,7 +50,6 @@ export type FragmentExport = {
export type GraphFragment = {
readonly format: "svml.fragment@1";
readonly id: Digest;
- readonly name: string;
readonly inputs: readonly { readonly name: string; readonly type: TypeRef }[];
readonly operations: readonly FragmentOperation[];
readonly exports: readonly FragmentExport[];
@@ -174,10 +173,9 @@ function normalizeExport(item: FragmentExport): FragmentExport {
};
}
-function fragmentContent(fragment: GraphFragment): Omit<GraphFragment, "id"> {
+function fragmentContent(fragment: Omit<GraphFragment, "id">): Omit<GraphFragment, "id"> {
return {
format: "svml.fragment@1",
- name: fragment.name,
inputs: [...fragment.inputs]
.map((input) => ({ name: input.name, type: input.type }))
.sort((left, right) => left.name.localeCompare(right.name)),
@@ -189,8 +187,7 @@ function fragmentContent(fragment: GraphFragment): Omit<GraphFragment, "id"> {
export function sealGraphFragment(
fragment: Omit<GraphFragment, "format" | "id">,
): GraphFragment {
- const draft = { format: "svml.fragment@1" as const, id: digestOf("unsealed-fragment"), ...fragment };
- const content = fragmentContent(draft);
+ const content = fragmentContent({ format: "svml.fragment@1", ...fragment });
return { ...content, id: digestOf(content) };
}
@@ -220,32 +217,31 @@ export function verifyGraphFragment(program: LinkedProgram, fragment: GraphFragm
assert(fragment.format === "svml.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.name.length > 0, "EMPTY_FRAGMENT_NAME", "Graph Fragment name is empty");
- assert(fragment.exports.length > 0, "EMPTY_FRAGMENT_EXPORTS", `${fragment.name} has no exports`);
+ assert(fragment.exports.length > 0, "EMPTY_FRAGMENT_EXPORTS", `${fragment.id} has no exports`);
const inputs = new Map<string, TypeRef>();
for (const input of fragment.inputs) {
- assert(input.name.length > 0, "EMPTY_FRAGMENT_INPUT", `${fragment.name} has an empty input name`);
- assert(!inputs.has(input.name), "DUPLICATE_FRAGMENT_INPUT", `${fragment.name} repeats input ${input.name}`);
+ assert(input.name.length > 0, "EMPTY_FRAGMENT_INPUT", `${fragment.id} has an empty input name`);
+ assert(!inputs.has(input.name), "DUPLICATE_FRAGMENT_INPUT", `${fragment.id} repeats input ${input.name}`);
inputs.set(input.name, input.type);
}
const operations = new Map<string, FragmentOperation>();
for (const operation of fragment.operations) {
- assert(operation.id.length > 0, "EMPTY_FRAGMENT_OPERATION", `${fragment.name} has an empty Operation id`);
- assert(!operations.has(operation.id), "DUPLICATE_FRAGMENT_OPERATION", `${fragment.name} repeats ${operation.id}`);
+ assert(operation.id.length > 0, "EMPTY_FRAGMENT_OPERATION", `${fragment.id} has an empty Operation id`);
+ assert(!operations.has(operation.id), "DUPLICATE_FRAGMENT_OPERATION", `${fragment.id} repeats ${operation.id}`);
operations.set(operation.id, operation);
const producer = resolveProducer(program.closure, operation.producer);
- exactKeys(operation.inputs, producer.inputs.map((port) => port.name), `${fragment.name}.${operation.id}`);
+ exactKeys(operation.inputs, producer.inputs.map((port) => port.name), `${fragment.id}.${operation.id}`);
}
const visiting = new Set<string>();
const visited = new Set<string>();
const operationType = (id: string): TypeRef => {
const operation = operations.get(id);
- assert(operation !== undefined, "UNKNOWN_FRAGMENT_OPERATION", `${fragment.name} references ${id}`, id);
+ assert(operation !== undefined, "UNKNOWN_FRAGMENT_OPERATION", `${fragment.id} references ${id}`, id);
if (visited.has(id)) return resultType(program, operation);
- assert(!visiting.has(id), "FRAGMENT_CYCLE", `${fragment.name} cycles through ${id}`, id);
+ assert(!visiting.has(id), "FRAGMENT_CYCLE", `${fragment.id} cycles through ${id}`, id);
visiting.add(id);
const producer = resolveProducer(program.closure, operation.producer);
for (const port of producer.inputs) {
@@ -254,7 +250,7 @@ export function verifyGraphFragment(program: LinkedProgram, fragment: GraphFragm
const supplied = ref.kind === "fragment-input"
? inputs.get(ref.name)
: operationType(ref.operation);
- assert(supplied !== undefined, "UNKNOWN_FRAGMENT_INPUT", `${fragment.name} references input ${ref.kind === "fragment-input" ? ref.name : ref.operation}`);
+ assert(supplied !== undefined, "UNKNOWN_FRAGMENT_INPUT", `${fragment.id} references input ${ref.kind === "fragment-input" ? ref.name : ref.operation}`);
assert(
sameType(supplied, port.type),
"FRAGMENT_INPUT_TYPE_MISMATCH",
@@ -274,24 +270,24 @@ export function verifyGraphFragment(program: LinkedProgram, fragment: GraphFragm
seen.add(ref.operation);
reachableOperations.add(ref.operation);
const operation = operations.get(ref.operation);
- assert(operation !== undefined, "UNKNOWN_FRAGMENT_OPERATION", `${fragment.name} references ${ref.operation}`);
+ assert(operation !== undefined, "UNKNOWN_FRAGMENT_OPERATION", `${fragment.id} references ${ref.operation}`);
Object.values(operation.inputs).forEach((input) => collectDependencies(input, seen));
};
for (const item of fragment.exports) {
- assert(item.name.length > 0, "EMPTY_FRAGMENT_EXPORT", `${fragment.name} has an empty export name`);
- assert(!exports.has(item.name), "DUPLICATE_FRAGMENT_EXPORT", `${fragment.name} repeats export ${item.name}`);
+ assert(item.name.length > 0, "EMPTY_FRAGMENT_EXPORT", `${fragment.id} has an empty export name`);
+ assert(!exports.has(item.name), "DUPLICATE_FRAGMENT_EXPORT", `${fragment.id} repeats export ${item.name}`);
exports.add(item.name);
assert(
item.root.kind === "fragment-operation",
"INVALID_FRAGMENT_EXPORT_ROOT",
- `${fragment.name}.${item.name} must export a local Operation result`,
+ `${fragment.id}.${item.name} must export a local Operation result`,
);
const supplied = operationType(item.root.operation);
assert(
sameType(supplied, item.type),
"FRAGMENT_EXPORT_TYPE_MISMATCH",
- `${fragment.name}.${item.name} declares ${typeName(item.type)} but returns ${typeName(supplied)}`,
+ `${fragment.id}.${item.name} declares ${typeName(item.type)} but returns ${typeName(supplied)}`,
);
collectDependencies(item.root, new Set());
}
@@ -299,7 +295,7 @@ export function verifyGraphFragment(program: LinkedProgram, fragment: GraphFragm
assert(
reachableOperations.has(id),
"UNREACHABLE_FRAGMENT_OPERATION",
- `${fragment.name}.${id} contributes to no export`,
+ `${fragment.id}.${id} contributes to no export`,
id,
);
}
@@ -345,7 +341,7 @@ export function elaborateGraphFragment(
return bound;
}
const operation = operationIds.get(ref.operation);
- assert(operation !== undefined, "UNKNOWN_FRAGMENT_OPERATION", `${fragment.name} references ${ref.operation}`);
+ assert(operation !== undefined, "UNKNOWN_FRAGMENT_OPERATION", `${fragment.id} references ${ref.operation}`);
return { kind: "operation-result", operation };
};
const operations: OperationNode[] = fragment.operations.map((operation) => {
diff --git a/packages/elaborator/src/frontend-facet.ts b/packages/elaborator/src/frontend-facet.ts
new file mode 100644
index 00000000..0bf940c8
--- /dev/null
+++ b/packages/elaborator/src/frontend-facet.ts
@@ -0,0 +1,56 @@
+import { canonicalStringify, isDigest } from "@narratage/protocol";
+import { sourceFrontendPackageAbi } from "@narratage/source";
+
+import type { AuthorFrontend } from "./source.js";
+
+export type AuthorFrontendHostFacet = {
+ readonly abi: typeof sourceFrontendPackageAbi;
+ readonly offers: readonly [string];
+ readonly identity: {
+ readonly kind: "author";
+ readonly implementationDigest: string;
+ };
+ readonly implementation: AuthorFrontend;
+};
+
+export function createAuthorFrontendHostFacet(frontend: AuthorFrontend): AuthorFrontendHostFacet {
+ if (frontend.id.trim().length === 0 || !isDigest(frontend.implementationDigest)) {
+ throw new Error("Author Frontend Host facet has an invalid implementation identity");
+ }
+ return {
+ abi: sourceFrontendPackageAbi,
+ offers: [frontend.id],
+ identity: {
+ kind: "author",
+ implementationDigest: frontend.implementationDigest,
+ },
+ implementation: frontend,
+ };
+}
+
+export function authorFrontendsFromHostFacets(facets: readonly unknown[]): readonly AuthorFrontend[] {
+ const values: AuthorFrontend[] = [];
+ for (const opaque of facets) {
+ if (opaque === null || typeof opaque !== "object" || Array.isArray(opaque)) continue;
+ const candidate = opaque as { readonly abi?: unknown; readonly identity?: unknown };
+ if (candidate.abi !== sourceFrontendPackageAbi
+ || candidate.identity === null || typeof candidate.identity !== "object" || Array.isArray(candidate.identity)
+ || (candidate.identity as { readonly kind?: unknown }).kind !== "author") continue;
+ const facet = opaque as AuthorFrontendHostFacet;
+ const frontend = facet.implementation;
+ const expected = createAuthorFrontendHostFacet(frontend);
+ if (canonicalStringify(facet.offers) !== canonicalStringify(expected.offers)
+ || canonicalStringify(facet.identity) !== canonicalStringify(expected.identity)) {
+ throw new Error(`Author Frontend Host facet ${frontend.id} differs from its locked identity`);
+ }
+ values.push(frontend);
+ }
+ return values;
+}
+
+export function installAuthorFrontendHostFacets(
+ facets: readonly unknown[],
+ registry: { register(frontend: AuthorFrontend): void },
+): void {
+ for (const frontend of authorFrontendsFromHostFacets(facets)) registry.register(frontend);
+}
diff --git a/packages/elaborator/src/index.ts b/packages/elaborator/src/index.ts
index e5068306..a3ac32a9 100644
--- a/packages/elaborator/src/index.ts
+++ b/packages/elaborator/src/index.ts
@@ -6,7 +6,6 @@ export {
export type {
AuthorComponent,
AuthorComponentOutputRef,
- AuthorElaboration,
AuthorModule,
AuthorOutputBinding,
AuthorRecordRef,
@@ -21,6 +20,12 @@ export {
resolveCompiledSourceExport,
verifySourceClosure,
} from "./source.js";
+export {
+ authorFrontendsFromHostFacets,
+ createAuthorFrontendHostFacet,
+ installAuthorFrontendHostFacets,
+} from "./frontend-facet.js";
+export type { AuthorFrontendHostFacet } from "./frontend-facet.js";
export type {
AuthorFrontend,
AuthorFrontendSourceUnit,
@@ -42,7 +47,6 @@ export type {
ResolvedAuthorSourceAsset,
ResolvedAuthorSourceImport,
SourceClosure,
- SourceClosureAsset,
SourceClosureUnit,
} from "./source.js";
export {
diff --git a/packages/elaborator/src/source.ts b/packages/elaborator/src/source.ts
index eb8bb37c..dcc85b0c 100644
--- a/packages/elaborator/src/source.ts
+++ b/packages/elaborator/src/source.ts
@@ -8,12 +8,11 @@ import {
verifyRecord,
} from "@narratage/core";
import type {
- BlobRef,
Digest,
+ CompiledGraph,
GraphValueRef,
LinkedProgram,
ResolvedModuleClosure,
- SourceRange,
TypeRef,
TypedModule,
TypedRecord,
@@ -22,7 +21,15 @@ import {
maskSourceHeader,
parseSourceHeader,
} from "@narratage/source";
-import type { SourceHeader } from "@narratage/source";
+import type {
+ ResolvedSourceAsset,
+ SourceAssetRequest,
+ SourceAssetResolver,
+ SourceHeader,
+ SourceImportRequest,
+ SourceResolver,
+ SourceUnit,
+} from "@narratage/source";
import {
elaborateAuthorModule,
@@ -30,30 +37,19 @@ import {
} from "./author.js";
import type {
AuthorComponent,
- AuthorElaboration,
AuthorModule,
AuthorValueRef,
} from "./author.js";
import type { GraphFragment } from "./fragment.js";
-export type AuthorSourceUnit = {
- /** Host-canonical identity used only for recursion/cache diagnostics, never semantic identity. */
- readonly id: string;
- readonly name: string;
- readonly text: string;
-};
+export type AuthorSourceUnit = SourceUnit;
/** Source presented to a Frontend after the mandatory Header has been admitted and masked. */
export type AuthorFrontendSourceUnit = AuthorSourceUnit & {
readonly header: SourceHeader;
- readonly sourceDigest: Digest;
};
-export type AuthorSourceImport = {
- readonly from: string;
- readonly alias: string;
- readonly range?: SourceRange;
-};
+export type AuthorSourceImport = SourceImportRequest;
export type AuthorSourceDiscovery = {
readonly modules: readonly string[];
@@ -61,22 +57,9 @@ export type AuthorSourceDiscovery = {
};
/** A semantic source dependency requested by a Frontend or package-owned Surface. */
-export type AuthorSourceAssetRequest = {
- /** Author-written path or Host-specific asset locator. */
- readonly from: string;
- /** Exact media type the consuming Surface assigns to these bytes. */
- readonly mediaType: string;
- /**
- * Bytes already carried by a trusted installed package Surface. The Host still hashes and
- * stages them; they never enter SourceClosure or Core state. Ordinary author assets omit this.
- */
- readonly bytes?: Uint8Array;
- readonly range?: SourceRange;
-};
+export type AuthorSourceAssetRequest = SourceAssetRequest;
-export type ResolvedAuthorSourceAsset = {
- readonly artifact: BlobRef;
-};
+export type ResolvedAuthorSourceAsset = ResolvedSourceAsset;
export type AuthorSourceExport = {
/** Relative public name. The importing source contributes its own alias. */
@@ -88,9 +71,6 @@ export type AuthorSourceExport = {
export type ResolvedAuthorSourceImport = {
readonly request: AuthorSourceImport;
readonly source: Digest;
- readonly frontendRequest: string;
- readonly frontend: string;
- readonly frontendDigest: Digest;
readonly exports: readonly AuthorSourceExport[];
/** Public record exports available to a package-owned Surface during author compilation. */
readonly records: readonly TypedRecord[];
@@ -142,22 +122,11 @@ export class AuthorFrontendRegistry implements AuthorFrontendRegistryLike {
}
}
-export type AuthorSourceResolver = (
- importer: AuthorSourceUnit,
- request: AuthorSourceImport,
-) => Awaitable<AuthorSourceUnit>;
-
-export type AuthorSourceAssetResolver = (
- importer: AuthorSourceUnit,
- request: AuthorSourceAssetRequest,
-) => Awaitable<ResolvedAuthorSourceAsset>;
+export type AuthorSourceResolver = SourceResolver;
-export type SourceClosureAsset = {
- readonly from: string;
- readonly artifact: BlobRef;
-};
+export type AuthorSourceAssetResolver = SourceAssetResolver;
-/** Host-owned admission hook; it may attach validation evidence but cannot rewrite author meaning. */
+/** Host-owned admission gate; it may reject a Record but cannot rewrite author meaning. */
export type AuthorRecordAdmitter = (
closure: ResolvedModuleClosure,
record: TypedRecord,
@@ -166,20 +135,13 @@ export type AuthorRecordAdmitter = (
export type SourceClosureUnit = {
readonly format: "svml.source-unit@1";
readonly id: Digest;
- readonly frontendRequest: string;
readonly frontend: string;
readonly frontendDigest: Digest;
readonly sourceDigest: Digest;
readonly semanticDigest: Digest;
- readonly modules: readonly string[];
- readonly assets: readonly SourceClosureAsset[];
readonly imports: readonly {
readonly alias: string;
- readonly from: string;
readonly source: Digest;
- readonly frontendRequest: string;
- readonly frontend: string;
- readonly frontendDigest: Digest;
}[];
};
@@ -198,11 +160,8 @@ export type CompiledSourceExport = {
export type CompiledSourceClosure = {
readonly closure: SourceClosure;
- readonly module: TypedModule;
- readonly author: AuthorModule;
- readonly fragments: readonly GraphFragment[];
readonly program: LinkedProgram;
- readonly elaboration: AuthorElaboration;
+ readonly graph: CompiledGraph;
readonly exports: readonly CompiledSourceExport[];
};
@@ -210,6 +169,14 @@ export type CompileSourceClosureRequest = {
readonly entry: AuthorSourceUnit;
readonly closure: ResolvedModuleClosure;
readonly frontends: AuthorFrontendRegistryLike;
+ /**
+ * Optional Host-frozen discovery result. A Host that used discovery to construct `closure`
+ * should pass that exact result back instead of executing Frontend discovery a second time.
+ */
+ readonly discover?: (
+ source: AuthorFrontendSourceUnit,
+ frontend: AuthorFrontend,
+ ) => Awaitable<AuthorSourceDiscovery>;
readonly resolveSource: AuthorSourceResolver;
readonly resolveAsset?: AuthorSourceAssetResolver;
readonly admitRecord?: AuthorRecordAdmitter;
@@ -230,23 +197,14 @@ export class SourceClosureError extends Error {
function sourceUnitContent(unit: SourceClosureUnit): Omit<SourceClosureUnit, "id"> {
return {
format: "svml.source-unit@1",
- frontendRequest: unit.frontendRequest,
frontend: unit.frontend,
frontendDigest: unit.frontendDigest,
sourceDigest: unit.sourceDigest,
semanticDigest: unit.semanticDigest,
- modules: [...unit.modules].sort(),
- assets: [...unit.assets]
- .map((item) => ({ from: item.from, artifact: item.artifact }))
- .sort((left, right) => left.from.localeCompare(right.from)),
imports: [...unit.imports]
.map((item) => ({
alias: item.alias,
- from: item.from,
source: item.source,
- frontendRequest: item.frontendRequest,
- frontend: item.frontend,
- frontendDigest: item.frontendDigest,
}))
.sort((left, right) => left.alias.localeCompare(right.alias)),
};
@@ -289,7 +247,6 @@ export function prepareAuthorSource(source: AuthorSourceUnit): AuthorFrontendSou
...source,
text: maskSourceHeader(source.text, header),
header,
- sourceDigest: digestOf(source.text),
};
}
@@ -307,13 +264,11 @@ function hygienicId(kind: string, unit: Digest, local: string): string {
function hygienizeSource(
source: AuthorFrontendSourceUnit,
+ sourceDigest: Digest,
frontend: AuthorFrontend,
- discovery: AuthorSourceDiscovery,
decoded: DecodedAuthorSource,
imports: readonly ResolvedAuthorSourceImport[],
- assets: readonly SourceClosureAsset[],
): HygienicSource {
- assert(decoded.module.closureDigest.length > 0, "INVALID_SOURCE_MODULE", `${source.name} returned no closure identity`);
const fragmentIds = new Set<string>();
for (const fragment of decoded.fragments) {
assert(!fragmentIds.has(fragment.id), "DUPLICATE_SOURCE_FRAGMENT", `${source.name} repeats Fragment ${fragment.id}`);
@@ -359,7 +314,6 @@ function hygienizeSource(
components: decoded.author.components,
fragments: [...decoded.fragments].map((fragment) => fragment.id).sort(),
exports: [...decoded.exports].sort((left, right) => left.name.localeCompare(right.name)),
- assets: [...assets].sort((left, right) => left.from.localeCompare(right.from)),
});
const recordIds = new Map(decoded.module.records.map((record) => [
record.id,
@@ -401,39 +355,25 @@ function hygienizeSource(
const exports = decoded.exports.map((item) => ({ ...item, ref: mapRef(item.ref) }));
const unitContent = {
format: "svml.source-unit@1" as const,
- frontendRequest: source.header.using,
frontend: frontend.id,
frontendDigest: frontend.implementationDigest,
- sourceDigest: source.sourceDigest,
+ sourceDigest,
semanticDigest,
- modules: [...discovery.modules].sort(),
- assets: [...assets].sort((left, right) => left.from.localeCompare(right.from)),
- imports: discovery.sources
- .map((request) => {
- const resolved = imports.find((item) => item.request === request);
- assert(resolved !== undefined, "UNRESOLVED_SOURCE_IMPORT", `${source.name} did not resolve ${request.from}`);
- return {
- alias: request.alias,
- from: request.from,
- source: resolved.source,
- frontendRequest: resolved.frontendRequest,
- frontend: resolved.frontend,
- frontendDigest: resolved.frontendDigest,
- };
- })
+ imports: imports
+ .map((item) => ({
+ alias: item.request.alias,
+ source: item.source,
+ }))
.sort((left, right) => left.alias.localeCompare(right.alias)),
};
return {
unit: {
id: digestOf(unitContent),
format: "svml.source-unit@1",
- frontendRequest: unitContent.frontendRequest,
frontend: frontend.id,
frontendDigest: frontend.implementationDigest,
sourceDigest: unitContent.sourceDigest,
semanticDigest,
- modules: unitContent.modules,
- assets: unitContent.assets,
imports: unitContent.imports,
},
records,
@@ -480,7 +420,9 @@ export async function compileSourceClosure(
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 frontend.discover(source);
+ const discovery = await (request.discover === undefined
+ ? frontend.discover(source)
+ : request.discover(source, frontend));
const aliases = new Set<string>();
const imports: ResolvedAuthorSourceImport[] = [];
for (const dependency of discovery.sources) {
@@ -495,14 +437,11 @@ export async function compileSourceClosure(
imports.push({
request: dependency,
source: compiled.unit.id,
- frontendRequest: compiled.unit.frontendRequest,
- frontend: compiled.unit.frontend,
- frontendDigest: compiled.unit.frontendDigest,
exports: compiled.exports,
records: compiled.records.filter((record) => publicRecordIds.has(record.id)),
});
}
- const assets = new Map<string, SourceClosureAsset>();
+ const assets = new Map<string, ResolvedAuthorSourceAsset>();
const rawDecoded = await frontend.decode(source, {
closure: request.closure,
imports: canonicalize(imports) as unknown as readonly ResolvedAuthorSourceImport[],
@@ -553,16 +492,10 @@ export async function compileSourceClosure(
`${assetRequest.from} resolved as ${artifact.mediaType}, expected ${assetRequest.mediaType}`,
assetRequest.from,
);
- const item = { from: assetRequest.from, artifact } as const;
- assets.set(assetRequest.from, item);
+ assets.set(assetRequest.from, { artifact });
return { artifact };
},
});
- assert(
- rawDecoded.module.closureDigest === request.closure.digest,
- "SOURCE_MODULE_CLOSURE_MISMATCH",
- `${source.name} decoded against another module closure`,
- );
const admittedRecords: TypedRecord[] = [];
for (const record of rawDecoded.module.records) {
const admitted = request.admitRecord === undefined
@@ -592,13 +525,11 @@ export async function compileSourceClosure(
const decoded: DecodedAuthorSource = {
...rawDecoded,
module: sealTypedModule({
- id: rawDecoded.module.id,
- closureDigest: rawDecoded.module.closureDigest,
records: admittedRecords,
}),
};
link(request.closure, [decoded.module]);
- const result = hygienizeSource(source, frontend, discovery, decoded, imports, [...assets.values()]);
+ const result = hygienizeSource(source, digestOf(rawSource.text), frontend, decoded, imports);
visiting.pop();
cache.set(key, result);
ordered.push(result);
@@ -624,17 +555,13 @@ export async function compileSourceClosure(
fragments.set(fragment.id, fragment);
}
const author = sealAuthorModule({
- name: "source-closure",
components: ordered.flatMap((unit) => unit.components),
});
const module = sealTypedModule({
- id: `source-closure:${digestOf(ordered.map((unit) => unit.unit.semanticDigest)).slice("sha256:".length)}`,
- closureDigest: request.closure.digest,
records,
});
const program = link(request.closure, [module]);
- const catalog = [...fragments.values()].sort((left, right) => left.id.localeCompare(right.id));
- const elaboration = elaborateAuthorModule(program, author, (id) => fragments.get(id));
+ const graph = elaborateAuthorModule(program, author, (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,
@@ -646,11 +573,8 @@ export async function compileSourceClosure(
verifySourceClosure(sourceClosure);
return {
closure: sourceClosure,
- module,
- author,
- fragments: catalog,
program,
- elaboration,
+ graph,
exports: entry.exports
.map((item) => ({
name: item.name,
@@ -673,20 +597,6 @@ export function verifySourceClosure(closure: SourceClosure): void {
assert(isDigest(unit.frontendDigest), "INVALID_FRONTEND_DIGEST", `${unit.id} Frontend digest is invalid`);
assert(isDigest(unit.sourceDigest), "INVALID_SOURCE_DIGEST", `${unit.id} source digest is invalid`);
assert(isDigest(unit.semanticDigest), "INVALID_SOURCE_SEMANTIC_DIGEST", `${unit.id} semantic digest is invalid`);
- const assetPaths = new Set<string>();
- for (const asset of unit.assets) {
- assert(asset.from.length > 0, "EMPTY_SOURCE_ASSET", `${unit.id} contains an empty asset path`);
- assert(!assetPaths.has(asset.from), "DUPLICATE_SOURCE_ASSET", `${unit.id} repeats asset ${asset.from}`);
- assetPaths.add(asset.from);
- assert(asset.artifact.kind === "blob", "INVALID_SOURCE_ASSET", `${unit.id}:${asset.from} is not a BlobRef`);
- assert(isDigest(asset.artifact.digest), "INVALID_SOURCE_ASSET_DIGEST", `${unit.id}:${asset.from} digest is invalid`);
- assert(
- Number.isSafeInteger(asset.artifact.size) && asset.artifact.size >= 0,
- "INVALID_SOURCE_ASSET_SIZE",
- `${unit.id}:${asset.from} size is invalid`,
- );
- assert(asset.artifact.mediaType.length > 0, "EMPTY_SOURCE_ASSET_MEDIA_TYPE", `${unit.id}:${asset.from} media type is empty`);
- }
units.set(unit.id, unit);
}
assert(units.has(closure.entry), "UNKNOWN_SOURCE_ENTRY", `Source Closure entry ${closure.entry} is absent`);
diff --git a/packages/elaborator/test/author.test.ts b/packages/elaborator/test/author.test.ts
index db161c4d..17ec6ce8 100644
--- a/packages/elaborator/test/author.test.ts
+++ b/packages/elaborator/test/author.test.ts
@@ -43,7 +43,6 @@ const manifest: ModuleManifest = {
{ name: reportType.name, schema: { kind: "string", minLength: 1 } },
],
capabilities: [],
- surfaces: [],
producers: [
{
name: measureProducer.name,
@@ -51,8 +50,6 @@ const manifest: ModuleManifest = {
outputs: [{ name: "measurement", type: measurementType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.laboratory/measure",
digest: digestOf("example.laboratory/measure@1"),
},
},
@@ -62,8 +59,6 @@ const manifest: ModuleManifest = {
outputs: [{ name: "report", type: reportType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.laboratory/write-report",
digest: digestOf("example.laboratory/write-report@1"),
},
},
@@ -73,8 +68,6 @@ const manifest: ModuleManifest = {
outputs: [{ name: "sample", type: sampleType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.laboratory/echo-sample",
digest: digestOf("example.laboratory/echo-sample@1"),
},
},
@@ -88,8 +81,6 @@ function program(): LinkedProgram {
kind: "authored" as const,
};
return link(closure, [sealTypedModule({
- id: "laboratory-inputs",
- closureDigest: closure.digest,
records: [sealRecord({
id: "sample:soil",
type: sampleType,
@@ -100,7 +91,6 @@ function program(): LinkedProgram {
}
function singleOperationFragment(
- name: string,
inputName: string,
inputType: TypeRef,
producer: ProducerRef,
@@ -108,7 +98,6 @@ function singleOperationFragment(
resultType: TypeRef,
): GraphFragment {
return sealGraphFragment({
- name,
inputs: [{ name: inputName, type: inputType }],
operations: [{
id: "produce",
@@ -125,7 +114,6 @@ function singleOperationFragment(
}
const measureFragment = singleOperationFragment(
- "measure-sample",
"sample",
sampleType,
measureProducer,
@@ -133,7 +121,6 @@ const measureFragment = singleOperationFragment(
measurementType,
);
const reportFragment = singleOperationFragment(
- "write-report",
"measurement",
measurementType,
reportProducer,
@@ -141,7 +128,6 @@ const reportFragment = singleOperationFragment(
reportType,
);
const echoFragment = singleOperationFragment(
- "echo-sample",
"sample",
sampleType,
echoProducer,
@@ -157,7 +143,6 @@ const fragments = new Map([
test("Author linking resolves forward component references without Text or video contracts", () => {
const linked = program();
const author = sealAuthorModule({
- name: "soil-analysis",
components: [
{
id: "final-report",
@@ -181,12 +166,12 @@ test("Author linking resolves forward component references without Text or video
});
const elaborated = elaborateAuthorModule(linked, author, (id) => fragments.get(id));
- assert.equal(elaborated.graph.outputs.length, 2);
+ assert.equal(elaborated.outputs.length, 2);
assert.deepEqual(
- elaborated.graph.outputs.map((output) => output.id),
+ elaborated.outputs.map((output) => output.id),
["measurement:soil", "report:final"],
);
- const reportOperation = elaborated.graph.operations.find((operation) =>
+ const reportOperation = elaborated.operations.find((operation) =>
operation.producer.name === reportProducer.name);
assert.deepEqual(reportOperation?.inputs.measurement, {
kind: "logical-output",
@@ -194,10 +179,10 @@ test("Author linking resolves forward component references without Text or video
});
const request = sealBuildRequest({
- graph: elaborated.graph.id,
+ graph: elaborated.id,
targets: [{ output: "report:final" }],
});
- const state = start(linked, elaborated.graph, request);
+ const state = start(linked, elaborated, request);
assert.deepEqual(
state.plan.steps.map((step) => step.producer.name).sort(),
[measureProducer.name, reportProducer.name].sort(),
@@ -209,7 +194,6 @@ test("Author linking resolves forward component references without Text or video
test("Author linking rejects cycles before producing a Core graph", () => {
const author = sealAuthorModule({
- name: "cyclic-laboratory",
components: [
{
id: "left",
@@ -237,7 +221,6 @@ test("Author linking rejects cycles before producing a Core graph", () => {
test("Author linking checks symbolic input types before Graph verification", () => {
const author = sealAuthorModule({
- name: "invalid-laboratory",
components: [{
id: "final-report",
fragment: reportFragment.id,
diff --git a/packages/elaborator/test/fragment.test.ts b/packages/elaborator/test/fragment.test.ts
index 13a3fa55..8ab088d7 100644
--- a/packages/elaborator/test/fragment.test.ts
+++ b/packages/elaborator/test/fragment.test.ts
@@ -1,7 +1,7 @@
import { videoContractManifests } from "../../../test/support/video-domain.js";
import { speechDependency, speechTypes } from "@narratage/speech";
import { compositionTypes } from "@narratage/composition";
-import { spatialTypes, spatialValidatorDigests } from "@narratage/spatial";
+import { spatialTypes } from "@narratage/spatial";
import assert from "node:assert/strict";
import test from "node:test";
@@ -12,7 +12,6 @@ import {
sealBuildRequest,
sealCompiledGraph,
sealRecord,
- sealTypeValidationReceipt,
sealTypedModule,
start,
} from "@narratage/core";
@@ -51,7 +50,6 @@ const manifest: ModuleManifest = {
dependencies: [speechDependency],
types: [{ name: requestType.name, schema: { kind: "string", minLength: 1 } }],
capabilities: [],
- surfaces: [],
producers: [{
name: generateProducer.name,
inputs: [
@@ -61,8 +59,6 @@ const manifest: ModuleManifest = {
outputs: [{ name: "take", type: speechTypes.basis }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.fragment-speech/generate",
digest: digestOf("example.fragment-speech/generate@1"),
},
}],
@@ -83,14 +79,8 @@ function program(): LinkedProgram {
} },
origin,
});
- const canvas = { ...rawCanvas, validation: sealTypeValidationReceipt({
- type: rawCanvas.type,
- recordDigest: rawCanvas.digest,
- validatorDigest: spatialValidatorDigests.canvas,
- }) };
+ const canvas = rawCanvas;
return link(closure, [sealTypedModule({
- id: "author:fragment",
- closureDigest: closure.digest,
records: [
sealRecord({
id: "request:root",
@@ -113,7 +103,6 @@ function speechFragment(): GraphFragment {
const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
return sealGraphFragment({
- name: "official-speech-basis",
inputs: [
{ name: "request", type: requestType },
{ name: "style", type: requestType },
@@ -255,7 +244,6 @@ test("Fragment references cannot escape through a raw Graph reference", () => {
const valid = speechFragment();
assert.throws(
() => sealGraphFragment({
- name: valid.name,
inputs: valid.inputs,
operations: valid.operations.map((item) => item.id === "generate"
? {
diff --git a/packages/endpoint-kit/src/index.ts b/packages/endpoint-kit/src/index.ts
index 1dcabf02..4c81882a 100644
--- a/packages/endpoint-kit/src/index.ts
+++ b/packages/endpoint-kit/src/index.ts
@@ -31,8 +31,6 @@ export type Awaitable<T> = T | Promise<T>;
export type EndpointFulfillment = {
readonly value: StoredValue;
- /** Provider-specific operational detail retained by OperationStore, never forwarded into Core data. */
- readonly metadata?: CanonicalValue;
};
export type EndpointInvocationContext = {
@@ -62,7 +60,7 @@ export type EndpointStartContext = EndpointInvocationContext & {
};
export type EndpointResumeContext = EndpointStartContext & {
- /** Undefined means the process stopped after intent was journaled but before a checkpoint existed. */
+ /** Undefined means the process stopped after intent was persisted but before a checkpoint existed. */
readonly checkpoint: CanonicalValue | undefined;
};
@@ -135,7 +133,6 @@ export interface EndpointRegistrar {
}
export type EndpointPackage = {
- readonly name: string;
readonly manifest: RuntimeModuleManifest;
readonly instance: RuntimeProfileInstance;
readonly bindings: readonly RuntimeEndpointBinding[];
@@ -178,7 +175,6 @@ export type DefineEndpointPackageOptions = {
/** Explicit non-secret account, deployment or compute-pool identity. */
readonly authority: string;
readonly implementation: {
- readonly locator: string;
readonly digest: Digest;
};
/** Non-secret deployment facts such as base URL, region and credential references. */
@@ -212,7 +208,6 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En
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(options.implementation.locator.trim().length > 0, "Endpoint implementation locator is empty");
assert(isDigest(options.implementation.digest), "Endpoint implementation digest is invalid");
assert(options.capabilities.length > 0, "Endpoint package declares no capability");
const lifecycle = options.capabilities[0]!.lifecycle;
@@ -285,7 +280,6 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En
endpoint: options.instance,
}));
return {
- name: options.instance,
manifest,
instance,
bindings,
diff --git a/packages/endpoint-kit/test/endpoint.test.ts b/packages/endpoint-kit/test/endpoint.test.ts
index 0438abd3..45b3bb9d 100644
--- a/packages/endpoint-kit/test/endpoint.test.ts
+++ b/packages/endpoint-kit/test/endpoint.test.ts
@@ -18,7 +18,6 @@ import { credentialRef } from "@narratage/runtime";
import { capabilities, types } from "../../core/test/greeting-fixture.js";
const implementation = {
- locator: "example.provider/http-json",
digest: digestOf("example.provider/http-json@1"),
} as const;
diff --git a/packages/estimate/src/activation.ts b/packages/estimate/src/activation.ts
index 0d3005b1..77507e45 100644
--- a/packages/estimate/src/activation.ts
+++ b/packages/estimate/src/activation.ts
@@ -5,19 +5,16 @@ import {
estimateComponent,
estimateManifest,
estimateModuleRef,
- estimateSurfaceImplementationDigest,
+ estimateMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/estimate",
- modules: [{ manifest: estimateManifest, specifiers: ["@narratage/estimate", "@narratage/estimate@1"] }],
+ modules: [{ manifest: estimateManifest }],
components: [estimateComponent],
hostFacets: [createMarkupSurfaceHostFacet({
module: estimateModuleRef,
- surface: "speech",
- mode: "structured",
- implementationDigest: estimateSurfaceImplementationDigest,
+ declaration: estimateMarkupSurfaces.find((item) => item.name === "speech")!,
handler: decodeSpeechEstimateSurface,
})],
};
diff --git a/packages/estimate/src/component.ts b/packages/estimate/src/component.ts
index 9da6ce7d..fb78d38a 100644
--- a/packages/estimate/src/component.ts
+++ b/packages/estimate/src/component.ts
@@ -13,7 +13,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
}
export const estimateComponent = {
- name: "@narratage/estimate",
producers: [{
producer: estimateProducers.speech,
implementationDigest: estimateSpeechImplementationDigest,
diff --git a/packages/estimate/src/fragment.ts b/packages/estimate/src/fragment.ts
index c07164b1..364ccd5c 100644
--- a/packages/estimate/src/fragment.ts
+++ b/packages/estimate/src/fragment.ts
@@ -8,7 +8,6 @@ const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
export const speechEstimateFragment = sealGraphFragment({
- name: "@narratage/estimate/speech@1",
inputs: [
{ name: "speech", type: textTypes.text },
{ name: "policy", type: estimateTypes.speechPolicy },
diff --git a/packages/estimate/src/index.ts b/packages/estimate/src/index.ts
index c231d927..457a6d82 100644
--- a/packages/estimate/src/index.ts
+++ b/packages/estimate/src/index.ts
@@ -1,7 +1,7 @@
export { estimateComponent } from "./component.js";
export { speechEstimateFragment } from "./fragment.js";
export {
- estimateManifest,
+ estimateManifest, estimateMarkupSurfaces,
estimateManifestDigest,
estimateModuleRef,
estimateProducers,
diff --git a/packages/estimate/src/manifest.ts b/packages/estimate/src/manifest.ts
index c258b083..7f1c66f3 100644
--- a/packages/estimate/src/manifest.ts
+++ b/packages/estimate/src/manifest.ts
@@ -31,6 +31,17 @@ const speechEstimatePolicySchema: ValueSchema = {
},
};
+export const estimateMarkupSurfaces = [{
+ name: "speech",
+ tag: "Speech",
+ mode: "structured",
+ outputs: [estimateTypes.speechPolicy, speechTypes.duration],
+ implementation: {
+ digest: estimateSurfaceImplementationDigest,
+ },
+ }] as const;
+
+
export const estimateManifest: ModuleManifest = {
format: "svml.module@1",
name: estimateModuleRef.name,
@@ -42,17 +53,6 @@ export const estimateManifest: ModuleManifest = {
],
types: [{ name: estimateTypes.speechPolicy.name, schema: speechEstimatePolicySchema }],
capabilities: [],
- surfaces: [{
- name: "speech",
- tag: "Speech",
- mode: "structured",
- outputs: [estimateTypes.speechPolicy, speechTypes.duration],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/estimate/speech-surface",
- digest: estimateSurfaceImplementationDigest,
- },
- }],
producers: [{
name: estimateProducers.speech.name,
inputs: [
@@ -62,8 +62,6 @@ export const estimateManifest: ModuleManifest = {
outputs: [{ name: "duration", type: speechTypes.duration }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/estimate/estimate-speech",
digest: estimateSpeechImplementationDigest,
},
}],
diff --git a/packages/film/src/activation.ts b/packages/film/src/activation.ts
index 88c6ae0f..0d5d7a46 100644
--- a/packages/film/src/activation.ts
+++ b/packages/film/src/activation.ts
@@ -1,16 +1,16 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
- decodeFilmSurface, filmComponent, filmManifest, filmModuleRef, filmSurfaceImplementationDigest,
+ decodeFilmSurface, filmComponent, filmManifest, filmModuleRef,
+ filmMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/film",
- modules: [{ manifest: filmManifest, specifiers: ["@narratage/film", "@narratage/film@1"] }],
+ modules: [{ manifest: filmManifest }],
components: [filmComponent],
hostFacets: [createMarkupSurfaceHostFacet({
- module: filmModuleRef, surface: "film", mode: "structured",
- implementationDigest: filmSurfaceImplementationDigest, handler: decodeFilmSurface,
+ module: filmModuleRef,
+ declaration: filmMarkupSurfaces.find((item) => item.name === "film")!, handler: decodeFilmSurface,
})],
};
export default svmlPackage;
diff --git a/packages/film/src/component.ts b/packages/film/src/component.ts
index c36c7c44..cfe29f74 100644
--- a/packages/film/src/component.ts
+++ b/packages/film/src/component.ts
@@ -24,7 +24,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
}
export const filmComponent = {
- name: "@narratage/film",
producers: [
{
producer: filmProducers.createTrackSet,
diff --git a/packages/film/src/fragment.ts b/packages/film/src/fragment.ts
index f08a80c2..e486bc7e 100644
--- a/packages/film/src/fragment.ts
+++ b/packages/film/src/fragment.ts
@@ -60,7 +60,6 @@ export function createFilmAssemblyFragment(options: FilmAssemblyFragmentOptions)
result: { kind: "output" as const, name: "composition" },
});
return sealGraphFragment({
- name: options.name?.trim() || "@narratage/film/assembly@1",
inputs: [
{ name: "program", type: filmTypes.program },
{ name: "canvas", type: spatialTypes.canvas },
diff --git a/packages/film/src/index.ts b/packages/film/src/index.ts
index 7e6095a0..c365e5f0 100644
--- a/packages/film/src/index.ts
+++ b/packages/film/src/index.ts
@@ -1,7 +1,7 @@
export { createFilmAssemblyFragment } from "./fragment.js";
export { filmComponent } from "./component.js";
export {
- filmManifest,
+ filmManifest, filmMarkupSurfaces,
filmManifestDigest,
filmModuleRef,
filmProgramSchema,
diff --git a/packages/film/src/manifest.ts b/packages/film/src/manifest.ts
index 8a46ea5c..b7209193 100644
--- a/packages/film/src/manifest.ts
+++ b/packages/film/src/manifest.ts
@@ -47,6 +47,17 @@ export const filmTrackSetSchema: ValueSchema = object({
},
});
+export const filmMarkupSurfaces = [{
+ name: "film",
+ tag: "Film",
+ mode: "structured",
+ outputs: [filmTypes.program],
+ implementation: {
+ digest: filmSurfaceImplementationDigest,
+ },
+ }] as const;
+
+
export const filmManifest: ModuleManifest = {
format: "svml.module@1",
name: filmModuleRef.name,
@@ -62,17 +73,6 @@ export const filmManifest: ModuleManifest = {
{ name: filmTypes.trackSet.name, schema: filmTrackSetSchema },
],
capabilities: [],
- surfaces: [{
- name: "film",
- tag: "Film",
- mode: "structured",
- outputs: [filmTypes.program],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/film/surface",
- digest: filmSurfaceImplementationDigest,
- },
- }],
producers: [
{
name: filmProducers.createTrackSet.name,
@@ -80,8 +80,6 @@ export const filmManifest: ModuleManifest = {
outputs: [{ name: "set", type: filmTypes.trackSet }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/film/create-track-set",
digest: createFilmTrackSetImplementationDigest,
},
},
@@ -95,8 +93,6 @@ export const filmManifest: ModuleManifest = {
outputs: [{ name: "set", type: filmTypes.trackSet }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/film/append-visual-track",
digest: appendFilmVisualTrackImplementationDigest,
},
},
@@ -110,8 +106,6 @@ export const filmManifest: ModuleManifest = {
outputs: [{ name: "set", type: filmTypes.trackSet }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/film/append-audio-track",
digest: appendFilmAudioTrackImplementationDigest,
},
},
@@ -126,8 +120,6 @@ export const filmManifest: ModuleManifest = {
outputs: [{ name: "composition", type: compositionTypes.composition }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/film/compile-composition",
digest: compileFilmCompositionImplementationDigest,
},
},
diff --git a/packages/film/test/film.test.ts b/packages/film/test/film.test.ts
index d5a0e0bf..7ff34c08 100644
--- a/packages/film/test/film.test.ts
+++ b/packages/film/test/film.test.ts
@@ -124,7 +124,6 @@ const textProgram = sealTypographyTrackProgram({
id: "title-track",
items: [{
id: "title",
- sourceOccurrenceId: "program",
span: { startFrame: 10, endFrameExclusive: 100 },
tieBreak: "title",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 86.4, yPx: 192, widthPx: 907.2, heightPx: 384 } },
@@ -179,7 +178,7 @@ const records = await Promise.all([
sealRecord({ id: "background", type: compositionTypes.visualTrack, value: stored(background), origin }),
sealRecord({ id: "audio", type: compositionTypes.audioTrack, value: stored(audio), origin }),
].map(async (record) => await admitRecord(closure, record, validatorRegistry())));
-const linked = link(closure, [sealTypedModule({ id: "author:film-test", closureDigest: closure.digest, records })]);
+const linked = link(closure, [sealTypedModule({ records })]);
const textInstance = elaborateGraphFragment(linked, typographyTrackFragment, {
id: "title",
diff --git a/packages/film/test/surface.test.ts b/packages/film/test/surface.test.ts
index 265b5676..eb304de3 100644
--- a/packages/film/test/surface.test.ts
+++ b/packages/film/test/surface.test.ts
@@ -16,9 +16,9 @@ import type { AuthorSourceUnit } from "@narratage/elaborator";
import {
decodeFilmSurface,
filmManifest,
+ filmMarkupSurfaces,
filmModuleRef,
filmProducers,
- filmSurfaceImplementationDigest,
filmTypes,
} from "@narratage/film";
import type { ModuleManifest } from "@narratage/protocol";
@@ -26,8 +26,8 @@ import { svsFrontend, svsManifest } from "@narratage/svs";
import {
decodeCanvasSurface,
spatialManifest,
+ spatialMarkupSurfaces,
spatialModuleRef,
- spatialSurfaceDigests,
} from "@narratage/spatial";
import {
MarkupSurfaceRegistry,
@@ -37,6 +37,11 @@ import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validati
const fixtureModule = { name: "example.film-fixture", version: "1" } as const;
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",
name: fixtureModule.name,
@@ -47,17 +52,6 @@ const fixtureManifest: ModuleManifest = {
],
types: [],
capabilities: [],
- surfaces: [{
- name: "inputs",
- tag: "Inputs",
- mode: "structured",
- outputs: [programSpaceTypes.programSpace, compositionTypes.visualTrack, compositionTypes.audioTrack],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.film-fixture/inputs-surface",
- digest: fixtureSurfaceDigest,
- },
- }],
producers: [],
};
@@ -109,7 +103,7 @@ const validStyles = `<sheet version="1">
async function compileFilm(options: { readonly reverse?: boolean; readonly styles?: string } = {}) {
const surfaces = new MarkupSurfaceRegistry();
- surfaces.registerStructured(fixtureModule, "inputs", fixtureSurfaceDigest, ({ element }) => ({
+ surfaces.registerStructured({ module: fixtureModule, declaration: fixtureSurface, handler: ({ element }) => ({
records: [
{ id: "space", type: programSpaceTypes.programSpace, value: { kind: "inline", value: space }, range: element.range },
{ id: "visual", type: compositionTypes.visualTrack, value: { kind: "inline", value: visual }, range: element.range },
@@ -117,19 +111,17 @@ async function compileFilm(options: { readonly reverse?: boolean; readonly style
],
components: [],
fragments: [],
- }));
- surfaces.registerStructured(
- filmModuleRef,
- "film",
- filmSurfaceImplementationDigest,
- decodeFilmSurface,
- );
- surfaces.registerStructured(
- spatialModuleRef,
- "canvas",
- spatialSurfaceDigests.canvas,
- decodeCanvasSurface,
- );
+ }) });
+ surfaces.registerStructured({
+ module: filmModuleRef,
+ declaration: filmMarkupSurfaces.find((item) => item.name === "film")!,
+ handler: decodeFilmSurface,
+ });
+ surfaces.registerStructured({
+ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "canvas")!,
+ handler: decodeCanvasSurface,
+ });
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
@@ -165,7 +157,7 @@ async function compileFilm(options: { readonly reverse?: boolean; readonly style
test("the official Film Surface validates SVS and lowers dynamic peer Tracks", async () => {
const compiled = await compileFilm();
- const program = compiled.module.records.find((record) => record.type.name === filmTypes.program.name);
+ const program = compiled.program.records.find((record) => record.type.name === filmTypes.program.name);
assert.deepEqual(program?.value.kind === "inline" ? program.value.value : undefined, {
contract: "svml.film-program@1",
id: "main",
@@ -173,8 +165,8 @@ test("the official Film Surface validates SVS and lowers dynamic peer Tracks", a
});
const target = resolveCompiledSourceExport(compiled, "main.composition", compositionTypes.composition);
assert.equal(target.ref.kind, "logical-output");
- const build = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const build = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [{ output: target.ref.kind === "logical-output" ? target.ref.id : "" }],
}));
assert.deepEqual(build.plan.steps.map((step) => step.producer.name).sort(), [
@@ -188,7 +180,7 @@ test("the official Film Surface validates SVS and lowers dynamic peer Tracks", a
test("Film child order remains organizational, not graph meaning", async () => {
const normal = await compileFilm();
const reversed = await compileFilm({ reverse: true });
- assert.equal(normal.elaboration.graph.id, reversed.elaboration.graph.id);
+ assert.equal(normal.graph.id, reversed.graph.id);
});
test("Film rejects an invalid package-owned Recipe during check", async () => {
diff --git a/packages/fonts-open/src/activation.ts b/packages/fonts-open/src/activation.ts
index d808d07e..c5d7b24c 100644
--- a/packages/fonts-open/src/activation.ts
+++ b/packages/fonts-open/src/activation.ts
@@ -3,32 +3,25 @@ import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeOpenFontFaceSurface,
decodeOpenFontStackSurface,
- fontsOpenFaceSurfaceImplementationDigest,
- fontsOpenStackSurfaceImplementationDigest,
fontsOpenManifest,
fontsOpenModuleRef,
+ fontsOpenMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/fonts-open",
modules: [{
manifest: fontsOpenManifest,
- specifiers: ["@narratage/fonts-open", "@narratage/fonts-open@1"],
}],
hostFacets: [
createMarkupSurfaceHostFacet({
module: fontsOpenModuleRef,
- surface: "face",
- mode: "structured",
- implementationDigest: fontsOpenFaceSurfaceImplementationDigest,
+ declaration: fontsOpenMarkupSurfaces.find((item) => item.name === "face")!,
handler: decodeOpenFontFaceSurface,
}),
createMarkupSurfaceHostFacet({
module: fontsOpenModuleRef,
- surface: "stack",
- mode: "structured",
- implementationDigest: fontsOpenStackSurfaceImplementationDigest,
+ declaration: fontsOpenMarkupSurfaces.find((item) => item.name === "stack")!,
handler: decodeOpenFontStackSurface,
}),
],
diff --git a/packages/fonts-open/src/index.ts b/packages/fonts-open/src/index.ts
index 8eb04f19..f21526b1 100644
--- a/packages/fonts-open/src/index.ts
+++ b/packages/fonts-open/src/index.ts
@@ -12,7 +12,7 @@ export type {
export {
fontsOpenFaceSurfaceImplementationDigest,
fontsOpenStackSurfaceImplementationDigest,
- fontsOpenManifest,
+ fontsOpenManifest, fontsOpenMarkupSurfaces,
fontsOpenManifestDigest,
fontsOpenModuleRef,
} from "./manifest.js";
diff --git a/packages/fonts-open/src/manifest.ts b/packages/fonts-open/src/manifest.ts
index 9e9d6e40..a59e652c 100644
--- a/packages/fonts-open/src/manifest.ts
+++ b/packages/fonts-open/src/manifest.ts
@@ -11,21 +11,12 @@ export const fontsOpenStackSurfaceImplementationDigest = digestOf(
"@narratage/fonts-open/pinned-open-exact-stack-surface@1",
);
-export const fontsOpenManifest: ModuleManifest = {
- format: "svml.module@1",
- name: fontsOpenModuleRef.name,
- version: fontsOpenModuleRef.version,
- dependencies: [mediaDependency],
- types: [],
- capabilities: [],
- surfaces: [{
+export const fontsOpenMarkupSurfaces = [{
name: "face",
tag: "Face",
mode: "structured",
outputs: [mediaTypes.fontArtifact],
implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/fonts-open/face-surface",
digest: fontsOpenFaceSurfaceImplementationDigest,
},
}, {
@@ -34,11 +25,18 @@ export const fontsOpenManifest: ModuleManifest = {
mode: "structured",
outputs: [mediaTypes.fontStack],
implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/fonts-open/stack-surface",
digest: fontsOpenStackSurfaceImplementationDigest,
},
- }],
+ }] as const;
+
+
+export const fontsOpenManifest: ModuleManifest = {
+ format: "svml.module@1",
+ name: fontsOpenModuleRef.name,
+ version: fontsOpenModuleRef.version,
+ dependencies: [mediaDependency],
+ types: [],
+ capabilities: [],
producers: [],
};
diff --git a/packages/gemini-omni/src/activation.ts b/packages/gemini-omni/src/activation.ts
index 601ed2e1..113095e2 100644
--- a/packages/gemini-omni/src/activation.ts
+++ b/packages/gemini-omni/src/activation.ts
@@ -3,20 +3,17 @@ import {
geminiOmniComponent,
geminiOmniManifest,
geminiOmniModuleRef,
- geminiOmniSurfaceImplementationDigest,
+ geminiOmniMarkupSurfaces,
} from "./index.js";
import { decodeGeminiOmniVideoSurface } from "./surface.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/gemini-omni",
- modules: [{ manifest: geminiOmniManifest, specifiers: ["@narratage/gemini-omni", "@narratage/gemini-omni@1"] }],
+ modules: [{ manifest: geminiOmniManifest }],
components: [geminiOmniComponent],
hostFacets: [createMarkupSurfaceHostFacet({
module: geminiOmniModuleRef,
- surface: "video",
- mode: "structured",
- implementationDigest: geminiOmniSurfaceImplementationDigest,
+ declaration: geminiOmniMarkupSurfaces.find((item) => item.name === "video")!,
handler: decodeGeminiOmniVideoSurface,
})],
};
diff --git a/packages/gemini-omni/src/index.ts b/packages/gemini-omni/src/index.ts
index 76ce075b..51c53f94 100644
--- a/packages/gemini-omni/src/index.ts
+++ b/packages/gemini-omni/src/index.ts
@@ -66,9 +66,8 @@ 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 geminiOmniManifest = {
- ...geminiOmniBaseDefinition.manifest,
- surfaces: [{
+
+export const geminiOmniMarkupSurfaces = [{
name: "video",
tag: "Video",
mode: "structured" as const,
@@ -78,11 +77,12 @@ export const geminiOmniManifest = {
geminiOmniEndpoint.mediaBindings.excerpts!.type,
],
implementation: {
- kind: "trusted-frontend-surface" as const,
- locator: "@narratage/gemini-omni/video-surface",
digest: geminiOmniSurfaceImplementationDigest,
},
- }],
+ }] as const;
+
+export const geminiOmniManifest = {
+ ...geminiOmniBaseDefinition.manifest,
};
export const geminiOmniManifestDigest = digestOf(geminiOmniManifest);
export const geminiOmniDefinition = {
diff --git a/packages/generation/src/activation.ts b/packages/generation/src/activation.ts
index 207b505f..02daa23d 100644
--- a/packages/generation/src/activation.ts
+++ b/packages/generation/src/activation.ts
@@ -2,7 +2,6 @@ import { generationComponent, generationManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/generation",
modules: [{ manifest: generationManifest }],
components: [generationComponent],
};
diff --git a/packages/generation/src/component.ts b/packages/generation/src/component.ts
index 12e96c7a..705cea1c 100644
--- a/packages/generation/src/component.ts
+++ b/packages/generation/src/component.ts
@@ -36,7 +36,6 @@ function primary(
/** Host-side semantic refinements for the shared generated-media contracts. */
export const generationComponent = {
- name: "@narratage/generation",
producers: [
{
producer: generationProducers.primaryAudio,
diff --git a/packages/generation/src/manifest.ts b/packages/generation/src/manifest.ts
index 1301cac7..097535ea 100644
--- a/packages/generation/src/manifest.ts
+++ b/packages/generation/src/manifest.ts
@@ -42,10 +42,7 @@ export const generationManifest: ModuleManifest = {
name: generationTypes.audioSet.name,
schema: generatedAudioSetSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/generation/validate-generated-audio-set",
digest: generationValidatorDigests.audioSet,
},
},
@@ -54,10 +51,7 @@ export const generationManifest: ModuleManifest = {
name: generationTypes.imageSet.name,
schema: generatedImageSetSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/generation/validate-generated-image-set",
digest: generationValidatorDigests.imageSet,
},
},
@@ -66,17 +60,13 @@ export const generationManifest: ModuleManifest = {
name: generationTypes.videoSet.name,
schema: generatedVideoSetSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/generation/validate-generated-video-set",
digest: generationValidatorDigests.videoSet,
},
},
},
],
capabilities: [],
- surfaces: [],
producers: [
{
name: generationProducers.primaryAudio.name,
@@ -84,8 +74,6 @@ export const generationManifest: ModuleManifest = {
outputs: [{ name: "audio", type: artifactTypes.blob }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/generation/select-primary-audio",
digest: generationProducerDigests.primaryAudio,
},
},
@@ -98,8 +86,6 @@ export const generationManifest: ModuleManifest = {
}],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/generation/select-primary-image",
digest: generationProducerDigests.primaryImage,
},
},
@@ -112,8 +98,6 @@ export const generationManifest: ModuleManifest = {
}],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/generation/select-primary-video",
digest: generationProducerDigests.primaryVideo,
},
},
diff --git a/packages/generation/src/mapping.ts b/packages/generation/src/mapping.ts
index aacf8f87..1589fa17 100644
--- a/packages/generation/src/mapping.ts
+++ b/packages/generation/src/mapping.ts
@@ -92,8 +92,6 @@ export async function compileWireRequest(
resolve: GenerationArtifactUrlResolver,
): Promise<GenerationWireRequest> {
assert(mapping.contract === GENERATION_WIRE_MAPPING_V1, "Generation wire mapping contract is invalid");
- assert(request.model === mapping.capability.name,
- `${mapping.capability.name} mapping received a ${request.model} request`);
const present = presentPorts(request);
const input: Record<string, CanonicalValue> = { ...(mapping.constants ?? {}) };
@@ -131,7 +129,6 @@ export async function compileWireRequest(
export function mappingSupportsRequest(mapping: GenerationWireMapping, value: unknown): boolean {
const request = value as GenerationRequest | undefined;
if (request?.contract !== "svml.generation-request@1") return false;
- if (request.model !== mapping.capability.name) return false;
if (request.ports === null || typeof request.ports !== "object") return false;
return Object.keys(request.ports).every((port) => mapping.fields[port] !== undefined);
}
diff --git a/packages/generation/src/request.ts b/packages/generation/src/request.ts
index 1402b1c1..4ccbb275 100644
--- a/packages/generation/src/request.ts
+++ b/packages/generation/src/request.ts
@@ -27,7 +27,6 @@ export const GENERATION_MEDIA_BINDING_V1 = "svml.generation-media-binding@1" as
export type GenerationRequest = {
readonly contract: "svml.generation-request@1";
- readonly model: string;
/** An absent port is an omitted key. A present port always carries at least one value. */
readonly ports: Readonly<Record<string, readonly GenerationPortValue[]>>;
};
@@ -39,7 +38,6 @@ export type GenerationRequest = {
*/
export type GenerationRequestDraft = {
readonly contract: "svml.generation-request-draft@1";
- readonly model: string;
readonly ports: Readonly<Record<string, readonly GenerationPortValue[]>>;
};
@@ -159,7 +157,6 @@ export function portsObjectSchema(
export function requestSchemaFromPorts(table: GenerationPortTable): ValueSchema {
return generationObjectSchema({
contract: { schema: { kind: "literal", value: GENERATION_REQUEST_V1 } },
- model: { schema: { kind: "literal", value: table.model } },
ports: { schema: portsObjectSchema(table) },
});
}
@@ -171,7 +168,6 @@ export function requestDraftSchemaFromPorts(table: GenerationPortTable): ValueSc
.map((port) => port.name);
return generationObjectSchema({
contract: { schema: { kind: "literal", value: GENERATION_REQUEST_DRAFT_V1 } },
- model: { schema: { kind: "literal", value: table.model } },
ports: { schema: portsObjectSchema(table, { defer: deferred }) },
});
}
@@ -326,7 +322,6 @@ export function verifyRequestDraftAgainstPorts(
): asserts value is GenerationRequestDraft {
const draft = plainObject(value, `${table.model} request draft`);
assert(draft.contract === GENERATION_REQUEST_DRAFT_V1, `${table.model} request draft contract is invalid`);
- assert(draft.model === table.model, `${table.model} request draft model is invalid`);
verifyPortsAgainstTable(table, draft.ports, { defer: deferredPorts(table) });
}
@@ -336,7 +331,6 @@ export function sealGenerationRequestDraft(
): GenerationRequestDraft {
const draft = canonicalize({
contract: GENERATION_REQUEST_DRAFT_V1,
- model: table.model,
ports: Object.fromEntries(Object.entries(ports).filter(([, values]) => values.length > 0)),
}) as unknown as GenerationRequestDraft;
verifyRequestDraftAgainstPorts(table, draft);
@@ -423,7 +417,6 @@ export function verifyRequestAgainstPorts(
assertGenerationPortTable(table);
const request = plainObject(value, `${table.model} request`);
assert(request.contract === GENERATION_REQUEST_V1, `${table.model} request contract is invalid`);
- assert(request.model === table.model, `${table.model} request model is invalid`);
verifyPortsAgainstTable(table, request.ports);
}
@@ -434,7 +427,6 @@ export function sealGenerationPortRequest(
): GenerationRequest {
const content: GenerationRequest = {
contract: GENERATION_REQUEST_V1,
- model: table.model,
ports: Object.fromEntries(
Object.entries(ports).filter(([, values]) => values !== undefined && values.length > 0),
),
diff --git a/packages/generation/test/ports.test.ts b/packages/generation/test/ports.test.ts
index 62e52fc5..b4d3148f 100644
--- a/packages/generation/test/ports.test.ts
+++ b/packages/generation/test/ports.test.ts
@@ -95,7 +95,7 @@ test("a port table derives the request Schema and rejects undeclared ports", ()
const schema = requestSchemaFromPorts(table);
assert.equal(schema.kind, "object");
const fields = (schema as { fields: Record<string, { schema: { kind: string } }> }).fields;
- assert.equal(fields.model!.schema.kind, "literal");
+ assert.deepEqual(Object.keys(fields).sort(), ["contract", "ports"]);
const ports = fields.ports!.schema as { kind: string; fields: Record<string, { optional?: boolean }> };
assert.equal(ports.kind, "object");
assert.equal(ports.fields.prompt!.optional, undefined);
@@ -103,7 +103,6 @@ test("a port table derives the request Schema and rejects undeclared ports", ()
assert.throws(
() => verifyRequestAgainstPorts(table, {
contract: "svml.generation-request@1",
- model: "demo-video",
ports: { prompt: ["hi"], duration: [8], resolution: ["720p"], unknownPort: ["x"] },
}),
/undeclared port unknownPort/u,
@@ -127,7 +126,7 @@ test("a media port enforces the media type its role demands", async () => {
resolution: ["720p"],
firstFrame: [{ role: "image", artifact: image }],
});
- assert.equal(ok.model, "demo-video");
+ assert.equal("model" in ok, false);
});
test("port combination rules enforce mutually exclusive input modes", async () => {
diff --git a/packages/gpt-image/src/activation.ts b/packages/gpt-image/src/activation.ts
index 0dea6089..c678c17b 100644
--- a/packages/gpt-image/src/activation.ts
+++ b/packages/gpt-image/src/activation.ts
@@ -5,8 +5,9 @@ import {
gptImageCleanModuleRef,
gptImageComponent,
gptImageManifest,
+ gptImageMarkupSurfaces,
gptImageModuleRef,
- gptImageSurfaceImplementationDigests,
+ gptImageCleanMarkupSurfaces,
} from "./index.js";
import {
decodeCleanGptImageSurface,
@@ -14,28 +15,21 @@ import {
} from "./surface.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/gpt-image",
modules: [{
manifest: gptImageManifest,
- specifiers: ["@narratage/gpt-image", "@narratage/gpt-image@1"],
}, {
manifest: gptImageCleanManifest,
- specifiers: ["@narratage/gpt-image/clean", "@narratage/gpt-image/clean@1"],
}],
components: [gptImageComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
module: gptImageModuleRef,
- surface: "image",
- mode: "structured",
- implementationDigest: gptImageSurfaceImplementationDigests.image,
+ declaration: gptImageMarkupSurfaces.find((item) => item.name === "image")!,
handler: decodeGptImageSurface,
}),
createMarkupSurfaceHostFacet({
module: gptImageCleanModuleRef,
- surface: "image",
- mode: "structured",
- implementationDigest: gptImageSurfaceImplementationDigests.cleanImage,
+ declaration: gptImageCleanMarkupSurfaces.find((item) => item.name === "image")!,
handler: decodeCleanGptImageSurface,
}),
],
diff --git a/packages/gpt-image/src/fragment.ts b/packages/gpt-image/src/fragment.ts
index b422eb46..ba81ad46 100644
--- a/packages/gpt-image/src/fragment.ts
+++ b/packages/gpt-image/src/fragment.ts
@@ -90,7 +90,6 @@ export function createGptImageCleanFragment(
...mediaInputs.map((item) => `${item.name}=${item.port}:media`),
].join(",") || "no-dynamic-inputs";
return sealGraphFragment({
- name: `@narratage/gpt-image/clean[${shape}]@1`,
inputs,
operations,
exports: [{
diff --git a/packages/gpt-image/src/index.ts b/packages/gpt-image/src/index.ts
index d8d805dd..0aa809bc 100644
--- a/packages/gpt-image/src/index.ts
+++ b/packages/gpt-image/src/index.ts
@@ -71,14 +71,14 @@ const gptImageSurfaceDeclaration = {
mode: "structured" as const,
outputs: [gptImageEndpoints.image!.draftType, gptImageEndpoints.image!.mediaBindings.images!.type],
implementation: {
- kind: "trusted-frontend-surface" as const,
- locator: "@narratage/gpt-image/image-surface",
digest: gptImageSurfaceImplementationDigests.image,
},
};
+
+export const gptImageMarkupSurfaces = [gptImageSurfaceDeclaration] as const;
+
export const gptImageManifest = {
...gptImageBaseDefinition.manifest,
- surfaces: [gptImageSurfaceDeclaration],
};
export const gptImageManifestDigest = digestOf(gptImageManifest);
export const gptImageDefinition = {
@@ -89,17 +89,8 @@ export const gptImageDefinition = {
/** Optional authoring submodule; the exact GPT model remains independent of post-processing. */
export const gptImageCleanModuleRef = { name: "@narratage/gpt-image/clean", version: "1" } as const;
-export const gptImageCleanManifest = {
- format: "svml.module@1" as const,
- name: gptImageCleanModuleRef.name,
- version: gptImageCleanModuleRef.version,
- dependencies: [
- { module: gptImageModuleRef, digest: gptImageManifestDigest },
- { module: imageTransformModuleRef, digest: imageTransformManifestDigest },
- ],
- types: [],
- capabilities: [],
- surfaces: [{
+
+export const gptImageCleanMarkupSurfaces = [{
name: "image",
tag: "Image",
mode: "structured" as const,
@@ -109,11 +100,20 @@ export const gptImageCleanManifest = {
imageTransformTypes.program,
],
implementation: {
- kind: "trusted-frontend-surface" as const,
- locator: "@narratage/gpt-image/clean/image-surface",
digest: gptImageSurfaceImplementationDigests.cleanImage,
},
- }],
+ }] as const;
+
+export const gptImageCleanManifest = {
+ format: "svml.module@1" as const,
+ name: gptImageCleanModuleRef.name,
+ version: gptImageCleanModuleRef.version,
+ dependencies: [
+ { module: gptImageModuleRef, digest: gptImageManifestDigest },
+ { module: imageTransformModuleRef, digest: imageTransformManifestDigest },
+ ],
+ types: [],
+ capabilities: [],
producers: [],
};
export const gptImageCleanManifestDigest = digestOf(gptImageCleanManifest);
diff --git a/packages/gpt-image/test/broll-graph.test.ts b/packages/gpt-image/test/broll-graph.test.ts
index a5f2adde..d6320908 100644
--- a/packages/gpt-image/test/broll-graph.test.ts
+++ b/packages/gpt-image/test/broll-graph.test.ts
@@ -9,7 +9,6 @@ import {
sealBuildRequest,
sealCompiledGraph,
sealRecord,
- sealTypeValidationReceipt,
sealTypedModule,
start,
} from "@narratage/core";
@@ -187,28 +186,16 @@ function fixture() {
outputs: { video: "montage.video" },
}];
const typed = sealTypedModule({
- id: "broll-records",
- closureDigest: closure.digest,
- records: records.map(({ validatorDigest, ...record }) => {
- const sealed = sealRecord({ ...record, origin });
- return validatorDigest === undefined ? sealed : {
- ...sealed,
- validation: sealTypeValidationReceipt({
- type: sealed.type,
- recordDigest: sealed.digest,
- validatorDigest,
- }),
- };
- }),
+ records: records.map(({ validatorDigest: _validatorDigest, ...record }) => sealRecord({ ...record, origin })),
});
const program = link(closure, [typed]);
const fragments = new Map([
...Object.values(gptFragments).map((fragment) => [fragment.id, fragment] as const),
[seedanceFragment.id, seedanceFragment] as const,
]);
- const elaborated = elaborateAuthorModule(program, sealAuthorModule({ name: "broll", components }),
+ const elaborated = elaborateAuthorModule(program, sealAuthorModule({ components }),
(id) => fragments.get(id));
- return { program, graph: elaborated.graph };
+ return { program, graph: elaborated };
}
test("the common B-roll topology is one graph with one shared holding image", () => {
diff --git a/packages/gpt-image/test/surface.test.ts b/packages/gpt-image/test/surface.test.ts
index fdc46c7b..f83a555f 100644
--- a/packages/gpt-image/test/surface.test.ts
+++ b/packages/gpt-image/test/surface.test.ts
@@ -11,6 +11,7 @@ import {
decodeCleanGptImageSurface,
decodeGptImageSurface,
} from "../src/surface.js";
+import { gptImageCleanMarkupSurfaces, gptImageMarkupSurfaces } from "../src/index.js";
const refs = new Map<string, SurfaceResolvedReference>([
["prompt", {
@@ -85,10 +86,10 @@ test("clean GPT Image Surface adds the official denoise as one visible downstrea
});
test("the physical package carries both independently importable Surface implementations", () => {
- assert.deepEqual(gptImageNodePackage.modules.map((item) => ({
- name: item.manifest.name,
- surfaces: item.manifest.surfaces.map((surface) => surface.tag),
- })), [
+ assert.deepEqual([
+ { name: "@narratage/gpt-image", surfaces: gptImageMarkupSurfaces.map((surface) => surface.tag) },
+ { name: "@narratage/gpt-image/clean", surfaces: gptImageCleanMarkupSurfaces.map((surface) => surface.tag) },
+ ], [
{ name: "@narratage/gpt-image", surfaces: ["Image"] },
{ name: "@narratage/gpt-image/clean", surfaces: ["Image"] },
]);
diff --git a/packages/grok-imagine/src/activation.ts b/packages/grok-imagine/src/activation.ts
index 3f7ddf1e..ff8674da 100644
--- a/packages/grok-imagine/src/activation.ts
+++ b/packages/grok-imagine/src/activation.ts
@@ -3,28 +3,23 @@ import {
grokImagineComponent,
grokImagineManifest,
grokImagineModuleRef,
- grokImagineSurfaceImplementationDigests,
+ grokImagineMarkupSurfaces,
} from "./index.js";
import { decodeGrokImaginePreviewVideoSurface, decodeGrokImagineVideoSurface } from "./surface.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/grok-imagine",
- modules: [{ manifest: grokImagineManifest, specifiers: ["@narratage/grok-imagine", "@narratage/grok-imagine@1"] }],
+ modules: [{ manifest: grokImagineManifest }],
components: [grokImagineComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
module: grokImagineModuleRef,
- surface: "video",
- mode: "structured",
- implementationDigest: grokImagineSurfaceImplementationDigests.video,
+ declaration: grokImagineMarkupSurfaces.find((item) => item.name === "video")!,
handler: decodeGrokImagineVideoSurface,
}),
createMarkupSurfaceHostFacet({
module: grokImagineModuleRef,
- surface: "preview-video",
- mode: "structured",
- implementationDigest: grokImagineSurfaceImplementationDigests.previewVideo,
+ declaration: grokImagineMarkupSurfaces.find((item) => item.name === "preview-video")!,
handler: decodeGrokImaginePreviewVideoSurface,
}),
],
diff --git a/packages/grok-imagine/src/index.ts b/packages/grok-imagine/src/index.ts
index 6eed5257..43df7079 100644
--- a/packages/grok-imagine/src/index.ts
+++ b/packages/grok-imagine/src/index.ts
@@ -94,17 +94,17 @@ const surface = (
mode: "structured" as const,
outputs: [endpoint.draftType, endpoint.mediaBindings.images!.type],
implementation: {
- kind: "trusted-frontend-surface" as const,
- locator: `@narratage/grok-imagine/${name}-surface`,
digest,
},
});
-export const grokImagineManifest = {
- ...grokImagineBaseDefinition.manifest,
- surfaces: [
+
+export const grokImagineMarkupSurfaces = [
surface("video", "Video", grokImagineEndpoints.video!, grokImagineSurfaceImplementationDigests.video),
surface("preview-video", "PreviewVideo", grokImagineEndpoints["preview-1.5"]!, grokImagineSurfaceImplementationDigests.previewVideo),
- ],
+ ] as const;
+
+export const grokImagineManifest = {
+ ...grokImagineBaseDefinition.manifest,
};
export const grokImagineManifestDigest = digestOf(grokImagineManifest);
export const grokImagineDefinition = {
diff --git a/packages/host/README.md b/packages/host/README.md
index 38c6cb21..92e9d525 100644
--- a/packages/host/README.md
+++ b/packages/host/README.md
@@ -1,13 +1,5 @@
# `@narratage/host`
-Domain-neutral contracts for concrete environments surrounding Core. This package currently owns
-only the definition-time `Workspace` session and generic `ArtifactAttachment` transfer envelope.
-It contains no filesystem, parser, scheduler, store, Provider or domain implementation.
-
-A `Workspace` opens one isolated compilation session. The session supplies one entry SourceUnit,
-relative Source/Asset resolution and reopenable streams for exact content-addressed assets requested
-while decoding. The Host fixes identity during compilation; the Runtime verifies the streamed size
-and digest while admitting bytes to its selected ArtifactStore, so source mutation cannot silently
-change a Build and large media is not copied through compiler memory.
-Filesystem, browser, Git, memory and remote workspaces implement the same interface. Compiler and
-Runtime never infer environment selection from author imports.
+The minimal opaque `HostFacet` envelope: an ABI, logical offers, locked identity and inert
+implementation. Package loading can carry it without learning what it does; only the exact Host ABI
+may interpret it. Source and asset sessions live separately in `@narratage/workspace`.
diff --git a/packages/host/package.json b/packages/host/package.json
index f454c07d..543cb408 100644
--- a/packages/host/package.json
+++ b/packages/host/package.json
@@ -8,7 +8,6 @@
".": "./src/index.ts"
},
"dependencies": {
- "@narratage/elaborator": "workspace:*",
"@narratage/protocol": "workspace:*"
}
}
diff --git a/packages/host/src/facet.ts b/packages/host/src/facet.ts
index 4a9d371e..9dcb6efa 100644
--- a/packages/host/src/facet.ts
+++ b/packages/host/src/facet.ts
@@ -8,6 +8,9 @@ import type { CanonicalValue } from "@narratage/protocol";
*/
export type HostFacet = {
readonly abi: string;
- readonly identity: CanonicalValue;
+ /** Logical names this exact facet offers through its opaque Host ABI. */
+ readonly offers?: readonly string[];
+ /** ABI-owned inert declaration, present only when the ABI has facts beyond its offers. */
+ readonly identity?: CanonicalValue;
readonly implementation: unknown;
};
diff --git a/packages/host/src/index.ts b/packages/host/src/index.ts
index a47eec81..912efd39 100644
--- a/packages/host/src/index.ts
+++ b/packages/host/src/index.ts
@@ -1,44 +1 @@
-import type {
- AuthorSourceAssetResolver,
- AuthorSourceResolver,
- AuthorSourceUnit,
- Awaitable,
-} from "@narratage/elaborator";
-import type { BlobRef } from "@narratage/protocol";
-
export type { HostFacet } from "./facet.js";
-
-/**
- * Repeatably openable Host transfer bytes. Their origin is deliberately absent
- * from the Runtime contract; Runtime verifies the opened stream against the
- * declared BlobRef before admitting a Build.
- */
-export type ArtifactAttachment = {
- readonly artifact: BlobRef;
- open(): Awaitable<AsyncIterable<Uint8Array>>;
-};
-
-/** One isolated, read-once definition session for exactly one compilation. */
-export interface WorkspaceSession {
- readonly entry: AuthorSourceUnit;
- readonly resolveSource: AuthorSourceResolver;
- readonly resolveAsset: AuthorSourceAssetResolver;
- attachments(): Awaitable<readonly ArtifactAttachment[]>;
-}
-
-/** Replaceable definition environment: filesystem, browser, Git, memory or remote workspace. */
-export interface Workspace {
- open(entryLocator: string): Awaitable<WorkspaceSession>;
-}
-
-export class WorkspaceError extends Error {
- readonly code: string;
- readonly subject: string | undefined;
-
- constructor(code: string, message: string, subject?: string) {
- super(message);
- this.name = "WorkspaceError";
- this.code = code;
- this.subject = subject;
- }
-}
diff --git a/packages/hyperframes/src/activation.ts b/packages/hyperframes/src/activation.ts
index 2c4d5b89..f674d97c 100644
--- a/packages/hyperframes/src/activation.ts
+++ b/packages/hyperframes/src/activation.ts
@@ -2,7 +2,6 @@ import { hyperframesComponent, hyperframesManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/hyperframes",
modules: [{ manifest: hyperframesManifest }],
components: [hyperframesComponent],
};
diff --git a/packages/hyperframes/src/component.ts b/packages/hyperframes/src/component.ts
index 42fe8838..2c042754 100644
--- a/packages/hyperframes/src/component.ts
+++ b/packages/hyperframes/src/component.ts
@@ -17,7 +17,6 @@ function inline(value: StoredValue, subject: string): CanonicalValue {
/** Trusted deterministic lowering only; this component never renders frames or reads Artifacts. */
export const hyperframesComponent = {
- name: "@narratage/hyperframes",
producers: [{
producer: hyperframesProducers.compile,
implementationDigest: compileHyperframesImplementationDigest,
diff --git a/packages/hyperframes/src/fragment.ts b/packages/hyperframes/src/fragment.ts
index 391c0345..71bcbac2 100644
--- a/packages/hyperframes/src/fragment.ts
+++ b/packages/hyperframes/src/fragment.ts
@@ -14,7 +14,6 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
* can use this ordinary downstream Fragment.
*/
export const hyperframesDocumentFragment = sealGraphFragment({
- name: "@narratage/hyperframes/document@1",
inputs: [
{ name: "composition", type: compositionTypes.composition },
{ name: "space", type: programSpaceTypes.programSpace },
diff --git a/packages/hyperframes/src/manifest.ts b/packages/hyperframes/src/manifest.ts
index 5965ee3b..ceb536c7 100644
--- a/packages/hyperframes/src/manifest.ts
+++ b/packages/hyperframes/src/manifest.ts
@@ -59,7 +59,6 @@ export const hyperframesManifest: ModuleManifest = {
dependencies: [compositionDependency, mediaDependency, programSpaceDependency],
types: [{ name: hyperframesTypes.document.name, schema: hyperframesDocumentSchema }],
capabilities: [],
- surfaces: [],
producers: [{
name: hyperframesProducers.compile.name,
inputs: [
@@ -69,8 +68,6 @@ export const hyperframesManifest: ModuleManifest = {
outputs: [{ name: "document", type: hyperframesTypes.document }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/hyperframes/compile",
digest: compileHyperframesImplementationDigest,
},
}],
diff --git a/packages/hyperframes/src/project.ts b/packages/hyperframes/src/project.ts
index 33f9b87e..bfbaa248 100644
--- a/packages/hyperframes/src/project.ts
+++ b/packages/hyperframes/src/project.ts
@@ -3,7 +3,7 @@ import { mkdir, open, writeFile } from "node:fs/promises";
import { join } from "node:path";
import type { CompositableSurfaceRef } from "@narratage/media";
-import type { BlobRef, CanonicalValue } from "@narratage/protocol";
+import type { BlobRef } from "@narratage/protocol";
import { assertHyperframesDocument, materializeHyperframesHtml } from "./document.js";
import type { HyperframesDocument } from "./types.js";
@@ -15,7 +15,7 @@ export type HyperframesArtifactReader = (
export type HyperframesSurfaceValidator = (
surface: CompositableSurfaceRef,
bytes: Uint8Array,
-) => Promise<CanonicalValue>;
+) => Promise<void>;
const EXTENSIONS: Readonly<Record<string, string>> = {
"image/png": ".png",
@@ -51,7 +51,7 @@ export async function stageHyperframesProject(options: {
readonly directory: string;
readonly read: HyperframesArtifactReader;
readonly validateSurface?: HyperframesSurfaceValidator;
-}): Promise<{ readonly html: string; readonly surfaceValidations: readonly CanonicalValue[] }> {
+}): Promise<void> {
const { document, directory, read } = options;
assertHyperframesDocument(document);
if (document.surfaces.length > 0 && options.validateSurface === undefined) {
@@ -61,7 +61,7 @@ export async function stageHyperframesProject(options: {
await mkdir(artifactDirectory, { recursive: true });
const paths = new Map<string, string>();
const surfaces = new Map(document.surfaces.map((surface) => [surface.artifact.digest, surface]));
- const validations = await Promise.all(document.artifacts.map(async (artifact) => {
+ await Promise.all(document.artifacts.map(async (artifact) => {
const name = `${artifact.digest.slice("sha256:".length)}${extension(artifact.mediaType)}`;
const opened = await read(artifact);
const chunks = opened instanceof Uint8Array
@@ -98,11 +98,10 @@ export async function stageHyperframesProject(options: {
}
return value;
})();
- const validation = surface === undefined
- ? undefined
- : await options.validateSurface!(structuredClone(surface), bytes!.slice());
+ if (surface !== undefined) {
+ await options.validateSurface!(structuredClone(surface), bytes!.slice());
+ }
paths.set(artifact.digest, `./artifacts/${name}`);
- return validation;
}));
const html = materializeHyperframesHtml(document, (artifact) => {
const path = paths.get(artifact.digest);
@@ -110,8 +109,4 @@ export async function stageHyperframesProject(options: {
return path;
});
await writeFile(join(directory, "index.html"), html, "utf8");
- return {
- html,
- surfaceValidations: validations.filter((value): value is CanonicalValue => value !== undefined),
- };
}
diff --git a/packages/hyperframes/test/browser-visual.test.ts b/packages/hyperframes/test/browser-visual.test.ts
index 97a6d9db..f2de802f 100644
--- a/packages/hyperframes/test/browser-visual.test.ts
+++ b/packages/hyperframes/test/browser-visual.test.ts
@@ -480,10 +480,10 @@ test("Fine Caption exact font, wrapping and all karaoke modes survive real brows
contract: "svml.timed-caption-projection@1",
displaySequenceId: display.id,
cues: [{
- id: `${mode}-${transition}-cue`, runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
- startSec: 0, endSec: 4,
+ id: `${mode}-${transition}-cue`, styleId: style.id,
+ startFrame: 0, endFrameExclusive: 40,
atoms: display.atoms.map((atom, atomIndex) => ({
- atomId: atom.id, startSec: atomIndex, endSec: atomIndex + 1,
+ atomId: atom.id, startFrame: atomIndex * 10, endFrameExclusive: (atomIndex + 1) * 10,
})),
fields: [],
}],
@@ -566,9 +566,9 @@ test("Fine Caption joined trail Pill follows real wrapped browser line fragments
const projection: TimedCaptionProjection = {
contract: "svml.timed-caption-projection@1", displaySequenceId: display.id,
cues: [{
- id: "joined-pill-cue", runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
- startSec: 0, endSec: 6,
- atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startSec: index, endSec: index + 1 })),
+ id: "joined-pill-cue", styleId: style.id,
+ startFrame: 0, endFrameExclusive: 60,
+ atoms: display.atoms.map((atom, index) => ({ atomId: atom.id, startFrame: index * 10, endFrameExclusive: (index + 1) * 10 })),
fields: [],
}],
};
@@ -653,9 +653,9 @@ test("installed open fonts render CJK, emoji and independent stroke, shadow and
contract: "svml.timed-caption-projection@1",
displaySequenceId: display.id,
cues: [{
- id: `${id}-cue`, runId: program.runs[0]!.id, styleId: style.id, segmentId: "line",
- startSec: 0, endSec: durationSec,
- atoms: display.atoms.map((atom) => ({ atomId: atom.id, startSec: 0, endSec: durationSec })),
+ id: `${id}-cue`, styleId: style.id,
+ startFrame: 0, endFrameExclusive: 1,
+ atoms: display.atoms.map((atom) => ({ atomId: atom.id, startFrame: 0, endFrameExclusive: 1 })),
fields: [],
}],
};
@@ -838,12 +838,12 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
contract: "svml.typography-track-program@1", id: "complete-text",
items: [
{
- id: "point", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "point",
+ id: "point", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "point",
geometry: { kind: "point", point: { contract: "svml.spatial-point@1", xPx: 160, yPx: 56 } },
document: { paragraphs: [{ id: "point-p", inlines: [{ kind: "text", id: "point-r", text: "POINT" }] }] }, style: plain, motion: stillTextMotion(),
},
{
- id: "multilingual", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "multilingual",
+ id: "multilingual", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "multilingual",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 20, yPx: 100, widthPx: 300, heightPx: 180 } },
document: { paragraphs: [{ id: "multi-p", inlines: [
{ kind: "text", id: "latin", text: "Intent " },
@@ -854,27 +854,27 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
] }] }, style: decorated, motion: stillTextMotion(),
},
{
- id: "clip", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "clip",
+ id: "clip", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "clip",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 345, yPx: 100, widthPx: 170, heightPx: 80 } },
document: { paragraphs: [{ id: "clip-p", inlines: [{ kind: "text", id: "clip-r", text: "CLIPPED CONTENT MUST STAY INSIDE" }] }] }, style: clip, motion: stillTextMotion(),
},
{
- id: "ellipsis", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "ellipsis",
+ id: "ellipsis", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "ellipsis",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 535, yPx: 100, widthPx: 170, heightPx: 80 } },
document: { paragraphs: [{ id: "ellipsis-p", inlines: [{ kind: "text", id: "ellipsis-r", text: "ELLIPSIS KEEPS A BOUNDED TWO LINE REGION" }] }] }, style: ellipsis, motion: stillTextMotion(),
},
{
- id: "shrink", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "shrink",
+ id: "shrink", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "shrink",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 725, yPx: 100, widthPx: 215, heightPx: 100 } },
document: { paragraphs: [{ id: "shrink-p", inlines: [{ kind: "text", id: "shrink-r", text: "SHRINK PRESERVES EVERY AUTHORED WORD INSIDE ITS BOUND" }] }] }, style: shrink, motion: stillTextMotion(),
},
{
- id: "sequence", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "sequence",
+ id: "sequence", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "sequence",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 120, yPx: 490, widthPx: 360, heightPx: 100 } },
document: { paragraphs: [{ id: "sequence-p", inlines: [{ kind: "text", id: "sequence-r", text: "ONE TWO THREE" }] }] }, style: plain, motion: animated,
},
{
- id: "path", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "path",
+ id: "path", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "path",
geometry: { kind: "path", path: { contract: "svml.spatial-path@1", commands: [
{ kind: "move", xPx: 80, yPx: 390 }, { kind: "cubic", control1X: 300, control1Y: 290, control2X: 650, control2Y: 470, xPx: 900, yPx: 350 },
] } },
@@ -901,7 +901,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
const maskTrack = renderTextMaskTrack(space, sealTypographyTrackProgram({
contract: "svml.typography-track-program@1", id: "mask-shape",
items: [{
- id: "mask", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "mask",
+ id: "mask", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "mask",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 520, yPx: 500, widthPx: 380, heightPx: 120 } },
document: { paragraphs: [{ id: "mask-p", inlines: [{ kind: "text", id: "mask-r", text: "MASK" }] }] },
style: maskStyle, motion: stillTextMotion(),
@@ -1087,7 +1087,7 @@ test("Text box targets, rich runs and every sequence direction remain stable acr
...(lineUnit ? [{ kind: "break" as const, id: `${entry.id}-break` }, { kind: "text" as const, id: `${entry.id}-b`, text: "GAMMA" }] : []),
] }] };
return {
- id: entry.id, sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: entry.id,
+ id: entry.id, span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: entry.id,
geometry: {
kind: "area" as const,
frame: {
@@ -1228,7 +1228,7 @@ test("vertical Text paints in its authored direction and bounded shrink fails cl
tracks: [renderTypographyTrack(space, sealTypographyTrackProgram({
contract: "svml.typography-track-program@1", id,
items: [{
- id, sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: 1 }, tieBreak: id,
+ id, span: { startFrame: 0, endFrameExclusive: 1 }, tieBreak: id,
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", ...frame } },
document: { paragraphs: [{ id: `${id}-p`, inlines: [{ kind: "text", id: `${id}-r`, text }] }] },
style: textStyle, motion: stillTextMotion(),
@@ -1638,12 +1638,12 @@ test("all four Ranking components paint frame-pure progressive states under part
contract: "svml.complete-semantic-map@1" as const,
tokens: [],
anchors: [
- { identity: "outer-start", timeSec: 0, frame: 0 },
- { identity: "rank-1", timeSec: 2 / fps, frame: 2 },
- { identity: "rank-2", timeSec: 8 / fps, frame: 8 },
- { identity: "rank-3", timeSec: 14 / fps, frame: 14 },
- { identity: "terminal", timeSec: 20 / fps, frame: 20 },
- { identity: "outer-end", timeSec: frames / fps, frame: frames },
+ { identity: "outer-start", frame: 0 },
+ { identity: "rank-1", frame: 2 },
+ { identity: "rank-2", frame: 8 },
+ { identity: "rank-3", frame: 14 },
+ { identity: "terminal", frame: 20 },
+ { identity: "outer-end", frame: frames },
],
};
const outer = {
diff --git a/packages/image-compose/src/activation.ts b/packages/image-compose/src/activation.ts
index 28dd41e6..585aa249 100644
--- a/packages/image-compose/src/activation.ts
+++ b/packages/image-compose/src/activation.ts
@@ -3,19 +3,18 @@ import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeImageComposeSurface,
imageComposeComponent,
- imageComposeImplementationDigests,
imageComposeManifest,
imageComposeModuleRef,
+ imageComposeMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/image-compose",
- modules: [{ manifest: imageComposeManifest, specifiers: ["@narratage/image-compose", "@narratage/image-compose@1"] }],
+ modules: [{ manifest: imageComposeManifest }],
components: [imageComposeComponent],
hostFacets: [{ ...createMarkupSurfaceHostFacet({
- module: imageComposeModuleRef, surface: "image", mode: "structured",
- implementationDigest: imageComposeImplementationDigests.surface, handler: decodeImageComposeSurface,
+ module: imageComposeModuleRef,
+ declaration: imageComposeMarkupSurfaces.find((item) => item.name === "image")!, handler: decodeImageComposeSurface,
}) }],
};
diff --git a/packages/image-compose/src/component.ts b/packages/image-compose/src/component.ts
index 89c17f9a..6fd25136 100644
--- a/packages/image-compose/src/component.ts
+++ b/packages/image-compose/src/component.ts
@@ -25,7 +25,6 @@ function blob(value: StoredValue | undefined, label: string): BlobRef {
const output = (value: unknown) => ({ kind: "inline" as const, value: canonicalize(value) });
export const imageComposeComponent = {
- name: "@narratage/image-compose",
producers: [{
producer: imageComposeProducers.createLayers,
implementationDigest: imageComposeImplementationDigests.createLayers,
diff --git a/packages/image-compose/src/fragment.ts b/packages/image-compose/src/fragment.ts
index 24e8da52..fff5e374 100644
--- a/packages/image-compose/src/fragment.ts
+++ b/packages/image-compose/src/fragment.ts
@@ -14,7 +14,7 @@ export type ImageComposeFragmentLayer = {
const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
-export function createImageComposeFragment(layers: readonly ImageComposeFragmentLayer[], name: string) {
+export function createImageComposeFragment(layers: readonly ImageComposeFragmentLayer[]) {
if (layers.length === 0) throw new Error("Image Compose Fragment requires at least one Layer.");
const operations: FragmentOperation[] = [{
id: "image:layers:empty", producer: imageComposeProducers.createLayers, inputs: {},
@@ -39,7 +39,6 @@ export function createImageComposeFragment(layers: readonly ImageComposeFragment
result: { kind: "need", name: "image" },
});
return sealGraphFragment({
- name,
inputs: [
{ name: "canvas", type: spatialTypes.canvas },
{ name: "options", type: imageComposeTypes.options },
diff --git a/packages/image-compose/src/index.ts b/packages/image-compose/src/index.ts
index 71648a8d..73ec1783 100644
--- a/packages/image-compose/src/index.ts
+++ b/packages/image-compose/src/index.ts
@@ -2,7 +2,7 @@ export { imageComposeComponent } from "./component.js";
export { createImageComposeFragment } from "./fragment.js";
export {
imageComposeDependency, imageComposeImplementationDigests,
- imageComposeManifest, imageComposeManifestDigest, imageComposeModuleRef, imageComposeProducers, imageComposeTypes,
+ imageComposeManifest, imageComposeMarkupSurfaces, imageComposeManifestDigest, imageComposeModuleRef, imageComposeProducers, imageComposeTypes,
} from "./manifest.js";
export {
appendImageComposeLayer, assertImageComposeLayerSet, assertImageComposeLayerSpec, assertImageComposeOptions,
diff --git a/packages/image-compose/src/manifest.ts b/packages/image-compose/src/manifest.ts
index 06764dde..dcbbe8d6 100644
--- a/packages/image-compose/src/manifest.ts
+++ b/packages/image-compose/src/manifest.ts
@@ -53,12 +53,18 @@ export const imageComposeLayerSetSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.image-compose-layer-set@1" } },
layers: { schema: { kind: "array", maxItems: 64, items: layer } },
});
-const registered = (locator: string, digest: ReturnType<typeof digestOf>) => ({ kind: "registered" as const, locator, digest });
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({
- abi: "svml.type-validator@1" as const,
- implementation: registered(locator, digest),
+const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
+const validator = (digest: ReturnType<typeof digestOf>) => ({
+ implementation: registered(digest),
});
+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",
name: imageComposeModuleRef.name,
@@ -66,31 +72,26 @@ export const imageComposeManifest: ModuleManifest = {
dependencies: [artifactDependency, spatialDependency, rasterDependency],
types: [
{ name: imageComposeTypes.options.name, schema: imageComposeOptionsSchema,
- validator: validator("@narratage/image-compose/validate-options", imageComposeImplementationDigests.validateOptions) },
+ validator: validator(imageComposeImplementationDigests.validateOptions) },
{ name: imageComposeTypes.layerSpec.name, schema: imageComposeLayerSpecSchema,
- validator: validator("@narratage/image-compose/validate-layer-spec", imageComposeImplementationDigests.validateLayerSpec) },
+ validator: validator(imageComposeImplementationDigests.validateLayerSpec) },
{ name: imageComposeTypes.layerSet.name, schema: imageComposeLayerSetSchema,
- validator: validator("@narratage/image-compose/validate-layer-set", imageComposeImplementationDigests.validateLayerSet) },
+ validator: validator(imageComposeImplementationDigests.validateLayerSet) },
],
capabilities: [],
- surfaces: [{
- name: "image", tag: "Image", mode: "structured",
- outputs: [imageComposeTypes.options, imageComposeTypes.layerSpec, artifactTypes.blob],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/image-compose/image-surface", digest: imageComposeImplementationDigests.surface },
- }],
producers: [
{ name: imageComposeProducers.createLayers.name, inputs: [], outputs: [{ name: "layers", type: imageComposeTypes.layerSet }], needs: [],
- implementation: registered("@narratage/image-compose/create-layers", imageComposeImplementationDigests.createLayers) },
+ implementation: registered(imageComposeImplementationDigests.createLayers) },
{ 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("@narratage/image-compose/append-layer", imageComposeImplementationDigests.appendLayer) },
+ implementation: registered(imageComposeImplementationDigests.appendLayer) },
{ 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("@narratage/image-compose/request", imageComposeImplementationDigests.request) },
+ implementation: registered(imageComposeImplementationDigests.request) },
],
};
diff --git a/packages/image-compose/src/surface.ts b/packages/image-compose/src/surface.ts
index 8d535420..17dad8a0 100644
--- a/packages/image-compose/src/surface.ts
+++ b/packages/image-compose/src/surface.ts
@@ -74,7 +74,7 @@ export const decodeImageComposeSurface: StructuredSurfaceHandler = ({ element, r
inputs[sourceName] = source.ref; inputs[frameName] = frame.ref; inputs[specName] = { kind: "record", id: specId };
layers.push({ sourceName, frameName, specName });
}
- const fragment = createImageComposeFragment(layers, `${id}.__image-compose@1`);
+ const fragment = createImageComposeFragment(layers);
return {
records,
components: [{ id, fragment: fragment.id, inputs, outputs: { image: `${id}.image` }, range: element.range }],
diff --git a/packages/image-compose/test/image-compose.test.ts b/packages/image-compose/test/image-compose.test.ts
index e1eb4605..38023bde 100644
--- a/packages/image-compose/test/image-compose.test.ts
+++ b/packages/image-compose/test/image-compose.test.ts
@@ -35,7 +35,7 @@ test("Image Compose is an ordered Layer graph with no privileged base image", ()
const fragment = createImageComposeFragment([
{ sourceName: "a-source", frameName: "a-frame", specName: "a-spec" },
{ sourceName: "b-source", frameName: "b-frame", specName: "b-spec" },
- ], "test:compose");
+ ]);
assert.deepEqual(fragment.operations.map((operation) => operation.id).sort(), [
"image:compose",
"image:layers:append:0001", "image:layers:append:0002", "image:layers:empty",
diff --git a/packages/image-transform/src/activation.ts b/packages/image-transform/src/activation.ts
index 4256cf13..719971ef 100644
--- a/packages/image-transform/src/activation.ts
+++ b/packages/image-transform/src/activation.ts
@@ -4,33 +4,27 @@ import {
decodeImageTransformProgramSurface,
decodeImageTransformSurface,
imageTransformComponent,
- imageTransformImplementationDigests,
imageTransformManifest,
imageTransformModuleRef,
+ imageTransformMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/image-transform",
modules: [{
manifest: imageTransformManifest,
- specifiers: ["@narratage/image-transform", "@narratage/image-transform@1"],
}],
components: [imageTransformComponent],
hostFacets: [{
...createMarkupSurfaceHostFacet({
module: imageTransformModuleRef,
- surface: "program",
- mode: "structured",
- implementationDigest: imageTransformImplementationDigests.programSurface,
+ declaration: imageTransformMarkupSurfaces.find((item) => item.name === "program")!,
handler: decodeImageTransformProgramSurface,
}),
}, {
...createMarkupSurfaceHostFacet({
module: imageTransformModuleRef,
- surface: "transform",
- mode: "structured",
- implementationDigest: imageTransformImplementationDigests.transformSurface,
+ declaration: imageTransformMarkupSurfaces.find((item) => item.name === "transform")!,
handler: decodeImageTransformSurface,
}),
}],
diff --git a/packages/image-transform/src/component.ts b/packages/image-transform/src/component.ts
index e42b3cc2..f51025ce 100644
--- a/packages/image-transform/src/component.ts
+++ b/packages/image-transform/src/component.ts
@@ -23,7 +23,6 @@ function blob(value: StoredValue | undefined, subject: string): BlobRef {
}
export const imageTransformComponent = {
- name: "@narratage/image-transform",
validators: [{
type: imageTransformTypes.program,
implementationDigest: imageTransformImplementationDigests.validator,
diff --git a/packages/image-transform/src/fragment.ts b/packages/image-transform/src/fragment.ts
index ea7d912c..83a8ca01 100644
--- a/packages/image-transform/src/fragment.ts
+++ b/packages/image-transform/src/fragment.ts
@@ -7,7 +7,6 @@ const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
export const imageTransformFragment = sealGraphFragment({
- name: "@narratage/image-transform/transform@1",
inputs: [
{ name: "source", type: artifactTypes.blob },
{ name: "program", type: imageTransformTypes.program },
diff --git a/packages/image-transform/src/index.ts b/packages/image-transform/src/index.ts
index d06b26f4..d0fb8731 100644
--- a/packages/image-transform/src/index.ts
+++ b/packages/image-transform/src/index.ts
@@ -2,7 +2,7 @@ export { imageTransformComponent } from "./component.js";
export { imageTransformFragment } from "./fragment.js";
export {
imageTransformImplementationDigests,
- imageTransformManifest,
+ imageTransformManifest, imageTransformMarkupSurfaces,
imageTransformManifestDigest,
imageTransformModuleRef,
imageTransformProducers,
diff --git a/packages/image-transform/src/manifest.ts b/packages/image-transform/src/manifest.ts
index f2e5c2f4..f82afa08 100644
--- a/packages/image-transform/src/manifest.ts
+++ b/packages/image-transform/src/manifest.ts
@@ -27,32 +27,12 @@ export const imageTransformProgramSchema: ValueSchema = { kind: "object", fields
operations: { schema: { kind: "array", minItems: 1, items: rasterTransformOperationSchema } },
} };
-export const imageTransformManifest: ModuleManifest = {
- format: "svml.module@1",
- name: imageTransformModuleRef.name,
- version: imageTransformModuleRef.version,
- dependencies: [artifactDependency, rasterDependency],
- types: [{
- name: imageTransformTypes.program.name,
- schema: imageTransformProgramSchema,
- validator: {
- abi: "svml.type-validator@1",
- implementation: {
- kind: "registered",
- locator: "@narratage/image-transform/validate-program",
- digest: imageTransformImplementationDigests.validator,
- },
- },
- }],
- capabilities: [],
- surfaces: [{
+export const imageTransformMarkupSurfaces = [{
name: "program",
tag: "Program",
mode: "structured",
outputs: [imageTransformTypes.program],
implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/image-transform/program-surface",
digest: imageTransformImplementationDigests.programSurface,
},
}, {
@@ -61,11 +41,26 @@ export const imageTransformManifest: ModuleManifest = {
mode: "structured",
outputs: [artifactTypes.blob],
implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/image-transform/transform-surface",
digest: imageTransformImplementationDigests.transformSurface,
},
+ }] as const;
+
+
+export const imageTransformManifest: ModuleManifest = {
+ format: "svml.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: [{
name: imageTransformProducers.request.name,
inputs: [
@@ -79,8 +74,6 @@ export const imageTransformManifest: ModuleManifest = {
returns: artifactTypes.blob,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/image-transform/request-image-transform",
digest: imageTransformImplementationDigests.request,
},
}],
diff --git a/packages/local/README.md b/packages/local/README.md
index 28fd8982..54c16fb8 100644
--- a/packages/local/README.md
+++ b/packages/local/README.md
@@ -28,7 +28,6 @@ A Runtime Profile must separately select every service:
"build": "state.builds",
"operations": "state.operations",
"dispatch": "state.dispatch",
- "journal": "state.journal",
"artifacts": "artifacts",
"credentials": ["credentials"]
}
@@ -51,7 +50,7 @@ becomes its executor; interrupting the observer does not cancel the Build.
The Worker stores no serialized Core command. After every restart it reopens verified BuildState and
asks the selected Scheduler to regenerate the current commands. Recoverable Provider checkpoints
remain in `OperationStore`; dispatch lease, heartbeat, admission and shared resource capacity remain in
-`BuildDispatchStore`; operational history remains in `RuntimeJournal`.
+`BuildDispatchStore`. Queue and cancellation inspection read those authoritative stores directly.
Cancellation first closes admission. Existing Operations keep their own execution fact and a
separate cancellation-control fact. Provider acceptance is not reported as cancellation; unsupported
diff --git a/packages/local/package.json b/packages/local/package.json
index 2c031ac5..d90c8f50 100644
--- a/packages/local/package.json
+++ b/packages/local/package.json
@@ -16,7 +16,7 @@
"@narratage/component-kit": "workspace:*",
"@narratage/driver-node": "workspace:*",
"@narratage/endpoint-kit": "workspace:*",
- "@narratage/host": "workspace:*",
+ "@narratage/workspace": "workspace:*",
"@narratage/package-loader-node": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
diff --git a/packages/local/src/activation.ts b/packages/local/src/activation.ts
index 2dadaafe..92efac9d 100644
--- a/packages/local/src/activation.ts
+++ b/packages/local/src/activation.ts
@@ -19,7 +19,6 @@ const localExecutionAdapter = createRuntimeServiceAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/local",
hostFacets: [localExecutionAdapter],
};
diff --git a/packages/local/src/config.ts b/packages/local/src/config.ts
index 8b6e4a1e..377e87fc 100644
--- a/packages/local/src/config.ts
+++ b/packages/local/src/config.ts
@@ -8,11 +8,13 @@ import {
loadNodePackageSet,
readNodePackageLock,
} from "@narratage/package-loader-node";
-import type { LoadedNodePackageSet } from "@narratage/package-loader-node";
-import { canonicalize } from "@narratage/protocol";
+import type { LoadedNodePackageSet, NodePackageSelectionRequest } from "@narratage/package-loader-node";
+import { canonicalize, digestOf } from "@narratage/protocol";
import type { CanonicalValue, CapabilityRef } from "@narratage/protocol";
import {
isRuntimeAdapterHostFacet,
+ runtimeEndpointAdapterHostAbi,
+ runtimeServiceAdapterHostAbi,
RuntimeAdapterRegistry,
} from "@narratage/runtime-adapter";
import type {
@@ -54,7 +56,6 @@ export type RuntimeConfigDocument = {
readonly scheduling: {
readonly maxConcurrency: number;
readonly resources?: Readonly<Record<string, number>>;
- readonly maxEventsPerBuild?: number;
};
};
@@ -110,7 +111,7 @@ function entry(value: unknown, subject: string, authorityRequired: boolean): Run
function scheduling(value: unknown): RuntimeConfigDocument["scheduling"] {
if (value === undefined) throw new Error("$runtime.scheduling is required");
const item = object(value, "$runtime.scheduling");
- exactKeys(item, ["maxConcurrency", "resources", "maxEventsPerBuild"], "$runtime.scheduling");
+ exactKeys(item, ["maxConcurrency", "resources"], "$runtime.scheduling");
const resources = item.resources === undefined ? undefined : object(item.resources, "$runtime.scheduling.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");
@@ -121,9 +122,6 @@ function scheduling(value: unknown): RuntimeConfigDocument["scheduling"] {
return {
maxConcurrency,
...(normalizedResources === undefined ? {} : { resources: normalizedResources }),
- ...(positiveInteger(item.maxEventsPerBuild, "$runtime.scheduling.maxEventsPerBuild") === undefined
- ? {}
- : { maxEventsPerBuild: item.maxEventsPerBuild as number }),
};
}
@@ -131,7 +129,7 @@ function serviceSelection(value: unknown): RuntimeServiceSelection {
const item = object(value, "$runtime.services");
exactKeys(item, ["scheduler", "worker", "stores"], "$runtime.services");
const stores = object(item.stores, "$runtime.services.stores");
- exactKeys(stores, ["build", "operations", "dispatch", "journal", "artifacts", "credentials"],
+ exactKeys(stores, ["build", "operations", "dispatch", "artifacts", "credentials"],
"$runtime.services.stores");
const credentials = stringList(stores.credentials, "$runtime.services.stores.credentials");
return {
@@ -141,7 +139,6 @@ function serviceSelection(value: unknown): RuntimeServiceSelection {
build: requiredString(stores.build, "$runtime.services.stores.build"),
operations: requiredString(stores.operations, "$runtime.services.stores.operations"),
dispatch: requiredString(stores.dispatch, "$runtime.services.stores.dispatch"),
- journal: requiredString(stores.journal, "$runtime.services.stores.journal"),
artifacts: requiredString(stores.artifacts, "$runtime.services.stores.artifacts"),
credentials,
},
@@ -204,21 +201,25 @@ export type RuntimeConfigPackageSelection = {
readonly packageRoot: string;
readonly packageLock?: string;
readonly runtimePackageLock?: string;
- readonly runtimePackages: readonly string[];
+ /** Logical Runtime adapters selected by kind and use name. */
+ readonly runtimeSelection: NodePackageSelectionRequest;
};
-function runtimePackages(document: RuntimeConfigDocument): readonly string[] {
- return [...new Set([
- ...document.runtimeServices.map((item) => item.use),
- ...document.endpoints.map((item) => item.use),
- ])].sort();
+function runtimePackageSelection(document: RuntimeConfigDocument): NodePackageSelectionRequest {
+ return {
+ selected: [],
+ logical: [
+ ...document.runtimeServices.map((item) => ({ abi: runtimeServiceAdapterHostAbi, name: item.use })),
+ ...document.endpoints.map((item) => ({ abi: runtimeEndpointAdapterHostAbi, name: item.use })),
+ ],
+ };
}
/**
- * Resolve the deterministic implementation lock selected by a JSON Runtime
- * Profile without constructing the Runtime or executing any adapter code.
+ * 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.json` single-sourced: the
+ * The CLI uses this to keep `build --runtime <profile>` single-sourced: the
* same author package lock drives compilation and later Worker execution.
*/
export async function runtimeConfigPackageSelection(
@@ -232,7 +233,7 @@ export async function runtimeConfigPackageSelection(
return {
root,
packageRoot,
- runtimePackages: runtimePackages(document),
+ runtimeSelection: runtimePackageSelection(document),
...(document.packageLock === undefined
? {}
: { packageLock: resolve(root, document.packageLock) }),
@@ -242,34 +243,49 @@ export async function runtimeConfigPackageSelection(
};
}
+/** Deployment revision understood only by this Runtime Profile implementation. */
+export async function runtimeConfigRevision(path: string): Promise<string> {
+ const absolute = resolve(path);
+ const document = parseRuntimeConfig(JSON.parse(await readFile(absolute, "utf8")));
+ const root = resolve(dirname(absolute), document.root ?? ".");
+ const locks: Record<string, string> = {};
+ for (const [name, value] of [
+ ["packageLock", document.packageLock],
+ ["runtimePackageLock", document.runtimePackageLock],
+ ] as const) {
+ if (value === undefined) continue;
+ locks[name] = (await readNodePackageLock(resolve(root, value))).digest;
+ }
+ return digestOf(canonicalize({
+ format: "svml.runtime-config-revision@1",
+ document,
+ locks,
+ }));
+}
+
async function installLockedRuntimeAdapters(
registry: RuntimeAdapterRegistry,
path: string | undefined,
lockRoot: string,
packageRoot: string,
- selected?: readonly string[],
-): Promise<import("@narratage/protocol").Digest | undefined> {
- if (path === undefined) return undefined;
+ 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]));
- const artifacts = new Map(loaded.lock.artifacts.map((item) => [`${item.name}@${item.version}`, item]));
- for (const contribution of loaded.contributions) {
- const locked = lockedPackages.get(contribution.name);
- if (locked === undefined) throw new Error(`Runtime package ${contribution.name} is absent from its verified lock`);
- const artifact = artifacts.get(`${locked.package.name}@${locked.package.version}`);
- if (artifact === undefined) throw new Error(`Runtime package ${contribution.name} has no verified physical Artifact`);
+ for (const loadedPackage of loaded.packages) {
+ 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, {
- packageName: contribution.name,
- packageArtifactDigest: artifact.digest,
- packageClosureDigest: locked.closureDigest,
+ closureDigest: locked.closureDigest,
});
}
}
- return loaded.lock.digest;
}
/** One Endpoint's declaration of an external program its Provider drives. */
@@ -305,7 +321,7 @@ export async function declaredExternalServices(
if (options.capabilities?.length === 0) return { root, services: [] };
const packageRoot = resolve(dirname(absolute), document.packageRoot ?? options.packageRoot ?? document.root ?? ".");
const registry = options.registry ?? new RuntimeAdapterRegistry();
- await installLockedRuntimeAdapters(registry, document.runtimePackageLock, root, packageRoot, runtimePackages(document));
+ await installLockedRuntimeAdapters(registry, document.runtimePackageLock, root, packageRoot, runtimePackageSelection(document));
const services: DeclaredExternalService[] = [];
for (const item of document.endpoints) {
if (!registry.has(item.use, "endpoint")) {
@@ -365,7 +381,7 @@ export async function doctorRuntimeConfig(
document.runtimePackageLock,
root,
packageRoot,
- runtimePackages(document),
+ runtimePackageSelection(document),
);
const implementationLock = options.implementationPackages !== undefined
? (async () => {
@@ -561,13 +577,13 @@ export async function createRuntimeFromConfig(
: document.packageLock === undefined
? Promise.resolve(undefined)
: loadNodePackageSet(resolve(root, document.packageLock), packageRoot);
- const [runtimePackageClosure, implementationPackages] = await Promise.all([
+ const [, implementationPackages] = await Promise.all([
installLockedRuntimeAdapters(
registry,
document.runtimePackageLock,
root,
packageRoot,
- runtimePackages(document),
+ runtimePackageSelection(document),
),
implementationPackagesPromise,
]);
@@ -589,11 +605,10 @@ export async function createRuntimeFromConfig(
return await createProjectLocalRuntime({
root,
packageRoot,
- ...(runtimePackageClosure === undefined ? {} : { runtimePackageClosure }),
runtimeServices,
runtimeSelection: document.services,
components: [
- ...collectNodePackageComponents(implementationPackages?.contributions ?? []),
+ ...collectNodePackageComponents((implementationPackages?.packages ?? []).map((item) => item.contribution)),
...(options.components ?? []),
],
endpoints,
@@ -616,7 +631,7 @@ export async function createRuntimeControlFromConfig(
const root = resolve(dirname(absolute), document.root ?? ".");
const packageRoot = resolve(dirname(absolute), document.packageRoot ?? options.packageRoot ?? document.root ?? ".");
const registry = options.registry ?? new RuntimeAdapterRegistry();
- await installLockedRuntimeAdapters(registry, document.runtimePackageLock, root, packageRoot, runtimePackages(document));
+ await installLockedRuntimeAdapters(registry, document.runtimePackageLock, root, packageRoot, runtimePackageSelection(document));
const runtimeServices = await Promise.all(document.runtimeServices.map(async (item) => {
return await registry.createService(item.use, {
root,
@@ -675,7 +690,7 @@ export async function createRuntimeCredentialsFromConfig(
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();
- await installLockedRuntimeAdapters(registry, document.runtimePackageLock, root, packageRoot, runtimePackages(document));
+ await installLockedRuntimeAdapters(registry, document.runtimePackageLock, root, packageRoot, runtimePackageSelection(document));
const serviceEntries = runtimeEntriesForServices(
document.runtimeServices,
document.services.stores.credentials,
diff --git a/packages/local/src/control.ts b/packages/local/src/control.ts
index 39955272..5f228778 100644
--- a/packages/local/src/control.ts
+++ b/packages/local/src/control.ts
@@ -81,22 +81,12 @@ export function createLocalRuntimeControl(
async operation(id) {
return await options.operationStore.read(id);
},
- async journal(query) {
- return await options.journal.list(query);
- },
async builds() {
return await buildCatalog?.list() ?? [];
},
async cancel(build, reason) {
if (await options.dispatchStore.read(build) === undefined) return undefined;
- const dispatch = await options.dispatchStore.requestCancellation(build, reason);
- await options.journal.append({
- at: Date.now(),
- kind: "cancellation-requested",
- build,
- detail: { ...(reason === undefined ? {} : { reason }) },
- });
- return dispatch;
+ return await options.dispatchStore.requestCancellation(build, reason);
},
async cancelOperation(id, reason) {
let current = await options.operationStore.read(id);
@@ -118,13 +108,6 @@ export function createLocalRuntimeControl(
});
current = written.status === "stored" ? written.snapshot : written.current;
}
- await options.journal.append({
- at: requestedAt,
- kind: "cancellation-requested",
- build: current.build,
- operation: current.id,
- detail: { scope: "operation", ...(reason === undefined ? {} : { reason }) },
- });
}
await options.dispatchStore.wake(current.build);
return current;
@@ -177,7 +160,6 @@ export async function createProjectLocalRuntimeControl(
...(projectServices.catalog === undefined ? {} : { buildCatalog: projectServices.catalog }),
operationStore: services.operationStore,
dispatchStore: services.dispatchStore,
- journal: services.journal,
artifactStore: services.artifactStore,
close: projectServices.close,
});
diff --git a/packages/local/src/index.ts b/packages/local/src/index.ts
index 80986e05..df1f8c5b 100644
--- a/packages/local/src/index.ts
+++ b/packages/local/src/index.ts
@@ -22,6 +22,7 @@ export {
doctorRuntimeConfig,
parseRuntimeConfig,
runtimeConfigPackageSelection,
+ runtimeConfigRevision,
} from "./config.js";
export {
bringExternalServicesUp,
diff --git a/packages/local/src/project-services.ts b/packages/local/src/project-services.ts
index ce9a043e..0c6a56ff 100644
--- a/packages/local/src/project-services.ts
+++ b/packages/local/src/project-services.ts
@@ -25,20 +25,20 @@ function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
-function packageCatalog(
+function selectedBuildCatalog(
packages: readonly RuntimeServicePackage[],
buildStore: string,
): BuildCatalog | undefined {
const owner = packages.find((item) => item.services.some((service) =>
service.role === "build-store" && service.instance.id === buildStore));
- if (owner === undefined || !("catalog" in owner)) return undefined;
- const catalog = (owner as { readonly catalog?: unknown }).catalog;
+ 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 package ${owner.name} exposes an invalid Build Catalog`);
+ `Runtime service ${buildStore} exposes an invalid Build Catalog`);
return catalog as BuildCatalog;
}
@@ -54,7 +54,7 @@ export async function createProjectRuntimeServices(
try {
for (const item of packages) verifyRuntimeServicePackage(item);
const assembly = assembleRuntimeServices(packages, options.runtimeSelection);
- const catalog = options.buildCatalog ?? packageCatalog(packages, options.runtimeSelection.stores.build);
+ const catalog = selectedBuildCatalog(packages, options.runtimeSelection.stores.build);
return {
assembly,
catalog,
diff --git a/packages/local/src/runtime.ts b/packages/local/src/runtime.ts
index f06768e5..addd444c 100644
--- a/packages/local/src/runtime.ts
+++ b/packages/local/src/runtime.ts
@@ -14,10 +14,9 @@ import {
collectNodePackageComponents,
} from "@narratage/package-loader-node";
import {
- assertRuntimeRevisionAdmission,
+ assertRuntimeClosureAdmission,
RuntimeModuleRegistry,
createBuildDispatchIdentity,
- createRuntimeRevision,
isStreamingArtifactStore,
nonTerminalDispatchPhases,
resolveRuntimeProfile,
@@ -100,22 +99,18 @@ function registerManifests(
}
function verifyEndpointPackages(packages: readonly EndpointPackage[]): void {
- const names = new Set<string>();
const instances = new Set<string>();
for (const item of packages) {
- assert(item.name.trim().length > 0, "Endpoint package name must not be empty");
- assert(!names.has(item.name), `Endpoint package ${item.name} is configured twice`);
- names.add(item.name);
- assert(item.instance.id.trim().length > 0, `${item.name} Endpoint instance id is empty`);
+ assert(item.instance.id.trim().length > 0, "Endpoint instance id is empty");
assert(!instances.has(item.instance.id), `Endpoint instance ${item.instance.id} is configured twice`);
instances.add(item.instance.id);
assert(item.manifest.name === item.instance.facet.module.name
&& item.manifest.version === item.instance.facet.module.version,
- `${item.name} instance ${facetKey(item.instance)} is outside its Runtime Manifest`);
- assert(item.bindings.length > 0, `${item.name} binds no exact capability`);
+ `${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.name} binding points to ${binding.endpoint}, not ${item.instance.id}`);
+ `${item.instance.id} binding points to ${binding.endpoint}, not ${item.instance.id}`);
}
}
}
@@ -127,23 +122,15 @@ export async function createLocalRuntime(
if (options.scheduling?.maxConcurrency !== undefined || options.scheduling?.resourceLimits !== undefined) {
throw new Error("a locked Runtime Closure owns maxConcurrency and resource limits");
}
- const runtimeRevision = createRuntimeRevision({
- runtimeClosure: options.closure.value.digest,
- ...(options.runtimePackageClosure === undefined
- ? {} : { runtimePackageClosure: options.runtimePackageClosure }),
- });
- assertRuntimeRevisionAdmission(
- runtimeRevision,
+ 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();
- const componentNames = new Set<string>();
for (const component of options.components ?? []) {
- assert(component.name.trim().length > 0, "Component package name must not be empty");
- assert(!componentNames.has(component.name), `Component package ${component.name} is configured twice`);
- componentNames.add(component.name);
registerTypeValidatorFacets(validators, component.validators ?? []);
registerProducerFacets(producers, component.producers ?? []);
}
@@ -160,8 +147,6 @@ export async function createLocalRuntime(
const scheduling = {
maxConcurrency: options.closure.value.scheduling.maxConcurrency,
resourceLimits: Object.fromEntries(options.closure.value.scheduling.resources.map((resource) => [resource.id, resource.maxConcurrency])),
- ...(options.scheduling?.maxEventsPerBuild === undefined
- ? {} : { maxEventsPerBuild: options.scheduling.maxEventsPerBuild }),
};
const worker = options.worker.create(driver, {
scheduler: options.scheduler,
@@ -169,11 +154,9 @@ export async function createLocalRuntime(
builds: options.buildStore,
operations: options.operationStore,
dispatch: options.dispatchStore,
- journal: options.journal,
artifacts: options.artifactStore,
},
scheduling,
- runtimeRevision,
runtimeClosure: options.closure.value,
});
const credentialControl = createLocalCredentialControl({
@@ -185,7 +168,6 @@ export async function createLocalRuntime(
...(buildCatalog === undefined ? {} : { buildCatalog }),
operationStore: options.operationStore,
dispatchStore: options.dispatchStore,
- journal: options.journal,
artifactStore: options.artifactStore,
});
const stageAttachments = async (request: LocalBuildRequest): Promise<void> => {
@@ -246,16 +228,8 @@ export async function createLocalRuntime(
const created = await options.dispatchStore.create(createBuildDispatchIdentity({
build: request.id,
core: request.state.id,
- runtimeRevision,
+ runtimeClosure,
}));
- if (created.status === "created") {
- await options.journal.append({
- at: Date.now(),
- kind: "dispatch-created",
- build: request.id,
- detail: { dispatch: created.snapshot.id },
- });
- }
if (request.catalog !== undefined) {
assert(buildCatalog !== undefined, "Build supplied Host catalog metadata but no BuildCatalog was selected");
assert(request.catalog.core === request.state.id,
@@ -314,7 +288,7 @@ export async function createProjectLocalRuntime(
: await loadNodePackageSet(resolve(root, options.packageLock), packageRoot);
const lockedComponents = lockedPackageSet === undefined
? []
- : collectNodePackageComponents(lockedPackageSet.contributions);
+ : collectNodePackageComponents(lockedPackageSet.packages.map((item) => item.contribution));
const configuredComponents = [...lockedComponents, ...(options.components ?? [])];
const projectServices = await createProjectRuntimeServices(root, options);
const services = projectServices.assembly;
@@ -329,7 +303,6 @@ export async function createProjectLocalRuntime(
...endpointPackages.map((item) => item.manifest),
]);
const profile = sealRuntimeProfile({
- name: "svml.local.project",
instances: [
...services.instances,
...endpointPackages.map((item) => item.instance),
@@ -340,7 +313,6 @@ export async function createProjectLocalRuntime(
build: selection.stores.build,
operations: selection.stores.operations,
dispatch: selection.stores.dispatch,
- journal: selection.stores.journal,
artifacts: selection.stores.artifacts,
credentials: selection.stores.credentials,
},
@@ -359,7 +331,6 @@ export async function createProjectLocalRuntime(
...(projectServices.catalog === undefined ? {} : { buildCatalog: projectServices.catalog }),
operationStore: services.operationStore,
dispatchStore: services.dispatchStore,
- journal: services.journal,
artifactStore: services.artifactStore,
credentialStore: services.credentialStore,
scheduler: services.scheduler,
@@ -369,14 +340,7 @@ export async function createProjectLocalRuntime(
: { components: configuredComponents }),
endpoints: endpointPackages,
closure: { modules, value: closure },
- scheduling: {
- ...(options.scheduling.maxEventsPerBuild === undefined
- ? {}
- : { maxEventsPerBuild: options.scheduling.maxEventsPerBuild }),
- },
...(options.validators === undefined ? {} : { validators: options.validators }),
- ...(options.runtimePackageClosure === undefined
- ? {} : { runtimePackageClosure: options.runtimePackageClosure }),
});
return {
build: runtime.build,
@@ -385,7 +349,6 @@ export async function createProjectLocalRuntime(
activity: runtime.activity,
queue: runtime.queue,
operation: runtime.operation,
- journal: runtime.journal,
credentials: runtime.credentials,
putCredential: runtime.putCredential,
deleteCredential: runtime.deleteCredential,
diff --git a/packages/local/src/scheduler-package.ts b/packages/local/src/scheduler-package.ts
index 9ebe64f9..66382859 100644
--- a/packages/local/src/scheduler-package.ts
+++ b/packages/local/src/scheduler-package.ts
@@ -19,14 +19,12 @@ export function createLocalSchedulerPackage(
instance = "scheduler.local",
): RuntimeServicePackage {
return defineRuntimeServicePackage({
- name: instance,
module: localRuntimeModuleRef,
services: [{
role: "scheduler",
facet: "scheduler",
instance,
implementation: {
- locator: "@narratage/local/scheduler",
digest: localSchedulerImplementationDigest,
},
configuration: { algorithm: "queue-free-atomic-resources", version: 1 },
@@ -43,7 +41,6 @@ export function createLocalExecutionPackage(
instance: string,
): RuntimeServicePackage {
return defineRuntimeServicePackage({
- name: instance,
module: localRuntimeModuleRef,
services: [
{
@@ -51,7 +48,6 @@ export function createLocalExecutionPackage(
facet: "scheduler",
instance: `${instance}.scheduler`,
implementation: {
- locator: "@narratage/local/scheduler",
digest: localSchedulerImplementationDigest,
},
configuration: { algorithm: "atomic-resources", version: 1 },
@@ -66,7 +62,6 @@ export function createLocalExecutionPackage(
facet: "worker",
instance: `${instance}.worker`,
implementation: {
- locator: "@narratage/local/worker",
digest: localWorkerImplementationDigest,
},
configuration: { dispatch: "leased", capacity: "shared", version: 1 },
diff --git a/packages/local/src/types.ts b/packages/local/src/types.ts
index 78970fcd..96243a80 100644
--- a/packages/local/src/types.ts
+++ b/packages/local/src/types.ts
@@ -1,5 +1,5 @@
import type { Awaitable, ComponentPackage } from "@narratage/component-kit";
-import type { ArtifactAttachment } from "@narratage/host";
+import type { ArtifactAttachment } from "@narratage/workspace";
import type { EndpointPackage } from "@narratage/endpoint-kit";
import type { BuildState } from "@narratage/protocol";
import type { Digest } from "@narratage/protocol";
@@ -20,7 +20,6 @@ import type {
RuntimeModuleRegistry,
RuntimeServicePackage,
RuntimeServiceSelection,
- RuntimeJournal,
RuntimeWorkerFactory,
} from "@narratage/runtime";
import type { TypeValidatorRegistrar, TypeValidatorRegistryLike } from "@narratage/validation";
@@ -43,7 +42,6 @@ export type CreateLocalRuntimeOptions = {
readonly buildCatalog?: BuildCatalog;
readonly operationStore: OperationStore;
readonly dispatchStore: import("@narratage/runtime").BuildDispatchStore;
- readonly journal: RuntimeJournal;
readonly artifactStore: ArtifactStore;
readonly credentialStore: CredentialStore;
readonly scheduler: BuildSchedulerFactory;
@@ -53,8 +51,6 @@ export type CreateLocalRuntimeOptions = {
readonly closure: LocalRuntimeClosureOptions;
readonly scheduling?: Omit<BuildSchedulerOptions, "buildStore" | "runtimeClosure">;
readonly validators?: LocalTypeValidatorRegistry;
- /** Verified physical Runtime-adapter package lock; absent only for trusted direct embedding. */
- readonly runtimePackageClosure?: import("@narratage/protocol").Digest;
};
export type CreateLocalRuntimeControlOptions = {
@@ -62,7 +58,6 @@ export type CreateLocalRuntimeControlOptions = {
readonly buildCatalog?: BuildCatalog;
readonly operationStore: OperationStore;
readonly dispatchStore: BuildDispatchStore;
- readonly journal: RuntimeJournal;
readonly artifactStore: ArtifactStore;
/** Optional owner supplied by the project service assembly. */
readonly close?: () => Awaitable<void>;
@@ -79,11 +74,8 @@ export type ProjectLocalRuntimeOptions = {
readonly root?: string;
/** Host directory whose node_modules contains the packages named by packageLock. Defaults to root. */
readonly packageRoot?: string;
- readonly buildCatalog?: BuildCatalog;
/** Trusted implementation package inventory. Each compilation activates its exact Source subset. */
readonly packageLock?: string;
- /** Verified physical Runtime-adapter package lock; absent only for trusted direct embedding. */
- readonly runtimePackageClosure?: import("@narratage/protocol").Digest;
/**
* Replaceable parts of the Runtime itself. One package may fill several roles;
* every selected role is explicit, and two packages exposing the same instance
@@ -97,14 +89,12 @@ export type ProjectLocalRuntimeOptions = {
readonly scheduling: {
readonly maxConcurrency: number;
readonly resources?: Readonly<Record<string, number>>;
- readonly maxEventsPerBuild?: number;
};
readonly validators?: LocalTypeValidatorRegistry;
};
export type ProjectLocalRuntimeControlOptions = Pick<ProjectLocalRuntimeOptions,
| "root"
- | "buildCatalog"
| "runtimeServices"
| "runtimeSelection"
>;
@@ -172,7 +162,6 @@ export type LocalRuntime = {
activity(build: string): Promise<LocalRuntimeActivity>;
queue(): Promise<LocalRuntimeQueue>;
operation(id: Digest): Promise<OperationSnapshot | undefined>;
- journal(query?: import("@narratage/runtime").RuntimeJournalQuery): Promise<readonly import("@narratage/runtime").RuntimeJournalEntry[]>;
credentials(endpoint?: string): Promise<readonly LocalCredentialStatus[]>;
putCredential(endpoint: string, slot: string, secret: string): Promise<LocalCredentialStatus>;
deleteCredential(endpoint: string, slot: string): Promise<{ readonly deleted: boolean; readonly credential: LocalCredentialStatus }>;
@@ -195,7 +184,6 @@ export type LocalRuntimeControl = Pick<LocalRuntime,
| "activity"
| "queue"
| "operation"
- | "journal"
| "builds"
| "cancel"
| "cancelOperation"
diff --git a/packages/local/src/worker.ts b/packages/local/src/worker.ts
index 993c9139..8a6a0709 100644
--- a/packages/local/src/worker.ts
+++ b/packages/local/src/worker.ts
@@ -201,15 +201,6 @@ class DurableLocalWorker implements RuntimeWorker {
this.#options = options;
}
- async #journal(
- kind: import("@narratage/runtime").RuntimeJournalKind,
- build: string | undefined,
- worker: string,
- detail: import("@narratage/protocol").CanonicalValue,
- ): Promise<void> {
- await this.#options.stores.journal.append({ at: Date.now(), kind, worker, ...(build === undefined ? {} : { build }), detail });
- }
-
async #cancel(dispatch: BuildDispatchSnapshot, lease: DispatchLease): Promise<BuildDispatchSnapshot> {
const snapshot = await this.#options.stores.builds.read(dispatch.build);
assert(snapshot !== undefined, `Build ${dispatch.build} has no durable state`);
@@ -225,12 +216,7 @@ class DurableLocalWorker implements RuntimeWorker {
const requestedAt = dispatch.cancellation?.requestedAt;
assert(requestedAt !== undefined, `closing Build ${dispatch.build} has no cancellation request`);
for (const operation of active) {
- const observed = await this.#executor.cancelOperation!(snapshot.state, operation, requestedAt);
- await this.#journal("operation-control", dispatch.build, lease.owner, {
- operation: observed.id,
- execution: observed.status,
- control: observed.cancellation?.status ?? "none",
- });
+ await this.#executor.cancelOperation!(snapshot.state, operation, requestedAt);
}
const operations = await this.#options.stores.operations.list({ build: dispatch.build });
const terminal = operations.filter((item) => item.status === "completed"
@@ -282,11 +268,6 @@ class DurableLocalWorker implements RuntimeWorker {
}
if (control.retryAt !== undefined && control.retryAt > Date.now()) continue;
const observed = await executor.cancelOperation(state, operation, control.requestedAt);
- await this.#journal("operation-control", dispatch.build, lease.owner, {
- operation: observed.id,
- execution: observed.status,
- control: observed.cancellation?.status ?? "none",
- });
if (observed.status === "completed" || observed.status === "failed" || observed.status === "cancelled") {
await this.#options.stores.dispatch.clearCapacity(
capacityReservationId(dispatch.build, observed.command),
@@ -301,10 +282,9 @@ class DurableLocalWorker implements RuntimeWorker {
assert(options.owner.trim().length > 0, "Worker owner is empty");
const leaseMs = positive(options.leaseMs, "Worker leaseMs");
const runtimeClosure = this.#options.runtimeClosure;
- assert(runtimeClosure !== undefined, "durable Worker requires one exact Runtime Closure");
const token = randomUUID();
const dispatch = await this.#options.stores.dispatch.claim({
- runtimeRevision: this.#options.runtimeRevision,
+ runtimeClosure: runtimeClosure.digest,
owner: options.owner,
token,
now: Date.now(),
@@ -313,13 +293,12 @@ class DurableLocalWorker implements RuntimeWorker {
if (dispatch === undefined) return undefined;
const lease = dispatch.lease;
assert(lease !== undefined, `claimed Dispatch ${dispatch.build} has no lease`);
- await this.#journal("dispatch-claimed", dispatch.build, options.owner, { fence: lease.fence });
if (dispatch.admission !== "open") return await this.#cancel(dispatch, lease);
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(this.#options.runtimeRevision === dispatch.runtimeRevision,
- `Dispatch ${dispatch.build} Runtime Revision differs`);
+ assert(runtimeClosure.digest === dispatch.runtimeClosure,
+ `Dispatch ${dispatch.build} Runtime Closure differs`);
const suppressedCommands = new Set<string>();
const controlled = new CapacityExecutor(
this.#executor,
@@ -333,7 +312,7 @@ class DurableLocalWorker implements RuntimeWorker {
const scheduler = this.#options.scheduler.create(controlled, {
...this.#options.scheduling,
buildStore: this.#options.stores.builds,
- ...(this.#options.runtimeClosure === undefined ? {} : { runtimeClosure: this.#options.runtimeClosure }),
+ runtimeClosure,
});
let heartbeatError: unknown;
let heartbeat = Promise.resolve();
@@ -353,18 +332,14 @@ class DurableLocalWorker implements RuntimeWorker {
`Dispatch ${dispatch.build} lease was fenced before settlement`);
if (current.admission !== "open") return await this.#cancel(current, lease);
if (result.status === "complete") {
- const terminal = await this.#options.stores.dispatch.finish(dispatch.build, lease, "complete");
- await this.#journal("dispatch-terminal", dispatch.build, options.owner, { terminal: "complete" });
- return terminal;
+ return await this.#options.stores.dispatch.finish(dispatch.build, lease, "complete");
}
- if (result.status === "failed" || result.journal.some((item) => item.status === "error")) {
- const reason = result.journal.find((item) => item.status === "error")?.message ?? "Core Build failed";
- const terminal = await this.#options.stores.dispatch.finish(dispatch.build, lease, "failed", reason);
- await this.#journal("dispatch-terminal", dispatch.build, options.owner, { terminal: "failed", reason });
- return terminal;
+ if (result.status === "failed" || result.outcomes.some((item) => item.status === "error")) {
+ const reason = result.outcomes.find((item) => item.status === "error")?.message ?? "Core Build failed";
+ return await this.#options.stores.dispatch.finish(dispatch.build, lease, "failed", reason);
}
- const pending = result.journal.filter((item) => item.status === "pending");
- const deferred = result.journal.filter((item) => item.status === "deferred");
+ const pending = result.outcomes.filter((item) => item.status === "pending");
+ const deferred = result.outcomes.filter((item) => item.status === "deferred");
const controlledOperations = (await this.#options.stores.operations.list({ build: dispatch.build }))
.filter((item) => item.cancellation !== undefined)
.filter((item) => item.status === "created" || item.status === "pending");
@@ -380,18 +355,13 @@ class DurableLocalWorker implements RuntimeWorker {
const wakeAt = wakeTimes.length === 0
? result.blocked.length > 0 ? Number.MAX_SAFE_INTEGER : Date.now()
: Math.min(...wakeTimes);
- const released = await this.#options.stores.dispatch.release(dispatch.build, lease, {
+ return await this.#options.stores.dispatch.release(dispatch.build, lease, {
phase: pending.length > 0 || controlledOperations.length > 0
? "waiting"
: result.blocked.length > 0 ? "blocked" : "queued",
availableAt: wakeAt,
...(result.blocked.length === 0 ? {} : { reason: result.blocked.map((item) => item.reason).join(", ") }),
});
- await this.#journal("dispatch-released", dispatch.build, options.owner, {
- phase: released.phase,
- availableAt: released.availableAt,
- });
- return released;
} catch (error) {
clearInterval(timer);
await heartbeat;
@@ -399,9 +369,7 @@ class DurableLocalWorker implements RuntimeWorker {
if (current?.phase !== "leased" || !sameLease(current.lease, lease)) throw error;
if (current.admission !== "open") return await this.#cancel(current, lease);
const reason = error instanceof Error ? error.message : String(error);
- const terminal = await this.#options.stores.dispatch.finish(dispatch.build, lease, "failed", reason);
- await this.#journal("dispatch-terminal", dispatch.build, options.owner, { terminal: "failed", reason });
- return terminal;
+ return await this.#options.stores.dispatch.finish(dispatch.build, lease, "failed", reason);
} finally {
clearInterval(timer);
}
@@ -409,16 +377,11 @@ class DurableLocalWorker implements RuntimeWorker {
async run(options: RuntimeWorkerRunOptions): Promise<void> {
positive(options.idlePollMs, "Worker idlePollMs");
- await this.#journal("worker-started", undefined, options.owner, {});
- try {
- while (options.signal?.aborted !== true) {
- const dispatch = await this.runOnce(options);
- if (dispatch === undefined) await pause(options.idlePollMs, options.signal).catch((error: unknown) => {
- if (options.signal?.aborted !== true) throw error;
- });
- }
- } finally {
- await this.#journal("worker-stopped", undefined, options.owner, {});
+ while (options.signal?.aborted !== true) {
+ const dispatch = await this.runOnce(options);
+ if (dispatch === undefined) await pause(options.idlePollMs, options.signal).catch((error: unknown) => {
+ if (options.signal?.aborted !== true) throw error;
+ });
}
}
}
diff --git a/packages/local/test/config.test.ts b/packages/local/test/config.test.ts
index a84eb928..1cc0de4b 100644
--- a/packages/local/test/config.test.ts
+++ b/packages/local/test/config.test.ts
@@ -18,6 +18,7 @@ import {
createRuntimeFromConfig,
doctorRuntimeConfig,
parseRuntimeConfig,
+ runtimeConfigRevision,
RuntimeAdapterRegistry,
} from "@narratage/local";
@@ -28,7 +29,6 @@ const services = {
build: "state.builds",
operations: "state.operations",
dispatch: "state.dispatch",
- journal: "state.journal",
artifacts: "artifacts",
credentials: ["credentials"],
},
@@ -36,6 +36,41 @@ const services = {
const required = { runtimeServices: [], services, scheduling: { maxConcurrency: 3 } } as const;
+test("Runtime revision follows content and referenced locks, not a filename suffix", async () => {
+ const root = await mkdtemp(join(tmpdir(), "svml-runtime-revision-"));
+ const path = join(root, "deployment.profile");
+ 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(join(root, "author.lock"), lock("author-v1"), "utf8");
+ await writeFile(join(root, "runtime.lock"), lock("runtime-v1"), "utf8");
+ const profile = {
+ format: "svml.runtime-config@1",
+ root: ".",
+ packageLock: "./author.lock",
+ runtimePackageLock: "./runtime.lock",
+ endpoints: [],
+ ...required,
+ } as const;
+ await writeFile(path, JSON.stringify(profile), "utf8");
+ const first = await runtimeConfigRevision(path);
+ await writeFile(path, JSON.stringify(profile, null, 2), "utf8");
+ assert.equal(await runtimeConfigRevision(path), first);
+ await writeFile(join(root, "runtime.lock"), lock("runtime-v2"), "utf8");
+ const second = await runtimeConfigRevision(path);
+ assert.notEqual(second, first);
+ } finally {
+ await rm(root, { recursive: true, force: true });
+ }
+});
+
function endpointPackage(instance: string, credentials: readonly unknown[] = []) {
return {
name: instance,
@@ -281,13 +316,12 @@ test("doctor resolves credentials from the same Endpoint declaration used by exe
create(context) {
credentialStoreConstructions += 1;
return defineRuntimeServicePackage({
- name: context.instance,
module: { name: "example.credentials", version: "1" },
services: [{
role: "credential-store",
facet: "credentials",
instance: context.instance,
- implementation: { locator: "example.credentials", digest: digestOf("example.credentials@1") },
+ implementation: { digest: digestOf("example.credentials@1") },
service: { async resolve() { return undefined; } },
}],
close() { credentialStoreCloses += 1; },
@@ -330,7 +364,7 @@ test("plan-scoped doctor ignores unrelated Endpoints and diagnoses only demanded
facet: "endpoint",
instance,
authority: `${instance}.account`,
- implementation: { locator: `example.${instance}`, digest: digestOf(`example.${instance}@1`) },
+ implementation: { digest: digestOf(`example.${instance}@1`) },
capabilities: [{ lifecycle: "immediate" as const, capability, returns: resultType, handler: async () => ({}) as never }],
...(credential === undefined ? {} : {
credentials: { token: credentialRef("env", credential) },
@@ -353,13 +387,12 @@ test("plan-scoped doctor ignores unrelated Endpoints and diagnoses only demanded
validate() {},
create(context) {
return defineRuntimeServicePackage({
- name: context.instance,
module: { name: "example.credentials", version: "1" },
services: [{
role: "credential-store",
facet: "credentials",
instance: context.instance,
- implementation: { locator: "example.credentials", digest: digestOf("example.credentials@1") },
+ implementation: { digest: digestOf("example.credentials@1") },
service: { async resolve() { return undefined; } },
}],
});
diff --git a/packages/local/test/external-services.test.ts b/packages/local/test/external-services.test.ts
index a70b4803..fd490198 100644
--- a/packages/local/test/external-services.test.ts
+++ b/packages/local/test/external-services.test.ts
@@ -40,7 +40,6 @@ async function project(service: (root: string) => RuntimeExternalService) {
build: "state.builds",
operations: "state.operations",
dispatch: "state.dispatch",
- journal: "state.journal",
artifacts: "artifacts",
credentials: ["credentials"],
},
diff --git a/packages/local/test/local.test.ts b/packages/local/test/local.test.ts
index c5e860d6..42b481c3 100644
--- a/packages/local/test/local.test.ts
+++ b/packages/local/test/local.test.ts
@@ -49,7 +49,7 @@ const providerManifest: RuntimeModuleManifest = {
facets: [{
name: providerFacet.name,
role: "capability-endpoint",
- implementation: { locator: "example.local-endpoint/generation", digest: providerDigest },
+ implementation: { digest: providerDigest },
fulfills: [{ capability: capabilities.generation, returns: types.generated }],
lifecycle: "recoverable",
defaultConcurrency: 1,
@@ -60,11 +60,9 @@ function projectRuntimeFixture(directory: string) {
const execution = createLocalExecutionPackage("execution.local");
const state = createSqliteRuntimeServicePackage({
path: join(directory, ".svml", "runtime.sqlite"),
- name: "state.sqlite",
buildInstance: "state.builds",
operationInstance: "state.operations",
dispatchInstance: "state.dispatch",
- journalInstance: "state.journal",
});
const artifacts = createFileArtifactStorePackage({
root: join(directory, ".svml", "artifacts"),
@@ -80,7 +78,6 @@ function projectRuntimeFixture(directory: string) {
build: "state.builds",
operations: "state.operations",
dispatch: "state.dispatch",
- journal: "state.journal",
artifacts: "artifacts.fs",
credentials: ["credentials.env"],
},
@@ -89,14 +86,12 @@ function projectRuntimeFixture(directory: string) {
} as const;
}
-test("one local execution domain fences Runtime package revisions, not author package subsets", async () => {
+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 firstRuntimePackages = digestOf("runtime-packages:first");
const first = await createProjectLocalRuntime({
root: directory,
...projectRuntimeFixture(directory),
- runtimePackageClosure: firstRuntimePackages,
});
await first.build({
id: "unfinished-build",
@@ -105,11 +100,22 @@ test("one local execution domain fences Runtime package revisions, not author pa
await first.close();
const changedRuntimePackages = projectRuntimeFixture(directory);
+ const execution = changedRuntimePackages.runtimeServices[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({
root: directory,
...changedRuntimePackages,
- runtimePackageClosure: digestOf("runtime-packages:second"),
+ runtimeServices: [revisedExecution, ...changedRuntimePackages.runtimeServices.slice(1)],
}),
/cannot enter this execution domain[\s\S]*unfinished-build[\s\S]*original Runtime Profile/u,
);
@@ -146,13 +152,12 @@ test("Endpoint-declared credentials use the selected writable Store without a Pr
async delete(ref) { return values.delete(ref.key); },
};
const memoryCredentials = defineRuntimeServicePackage({
- name: "credentials.memory",
module: { name: "example.credentials-memory", version: "1" },
services: [{
role: "credential-store",
facet: "credential-store",
instance: "credentials.memory",
- implementation: { locator: "example.credentials-memory", digest: digestOf("credentials-memory@1") },
+ implementation: { digest: digestOf("credentials-memory@1") },
service: credentialStore,
}],
});
@@ -161,7 +166,7 @@ test("Endpoint-declared credentials use the selected writable Store without a Pr
facet: "generation",
instance: "generation.auth-test",
authority: "generation.auth-test",
- implementation: { locator: "example.local-endpoint/generation", digest: providerDigest },
+ implementation: { digest: providerDigest },
credentials: { apiKey: credentialRef("memory", "generation.api-key") },
credentialInputs: { apiKey: { label: "Generation API key" } },
capabilities: [{
@@ -209,7 +214,6 @@ test("project local runtime resumes durable work while component and endpoint pa
source: { path: join(directory, "main.svml"), closure: digestOf("source:greeting") },
aliases: [{
name: "final.document",
- type: initial.plan.goals[0]!.type,
ref: { kind: "logical-output" as const, id: initial.request.targets[0]!.output },
}],
};
@@ -225,7 +229,6 @@ test("project local runtime resumes durable work while component and endpoint pa
let startEntered: (() => void) | undefined;
let releaseStart: (() => void) | undefined;
const components: ComponentPackage = {
- name: "example.components",
producers: [
{
producer: producers.makePrompt,
@@ -287,7 +290,6 @@ test("project local runtime resumes durable work while component and endpoint pa
status: "completed",
result: {
value: { kind: "inline", value: "Hello from durable local Runtime" },
- metadata: { checkpoint },
},
};
},
@@ -297,9 +299,13 @@ test("project local runtime resumes durable work while component and endpoint pa
},
};
const endpointPackage: EndpointPackage = {
- name: "example.endpoint.personal",
manifest: providerManifest,
- instance: { id: "generation.personal", facet: providerFacet, authority: "generation.personal" },
+ instance: {
+ id: "generation.personal",
+ facet: providerFacet,
+ authority: "generation.personal",
+ configurationDigest: digestOf({}),
+ },
bindings: [{
capability: capabilities.generation,
returns: types.generated,
@@ -459,7 +465,6 @@ test("two durable Workers share one SQLite capacity limit across Runtime instanc
const firstEntered = new Promise<void>((resolve) => { entered = resolve; });
const holdFirst = new Promise<void>((resolve) => { release = resolve; });
const components: ComponentPackage = {
- name: "example.shared-capacity-components",
producers: [{
producer: producers.makePrompt,
implementationDigest: implementationDigests.makePrompt,
@@ -559,10 +564,8 @@ test("project local runtime activates locked compute facets without deployment s
const producer = (name) => ({ module, name });
export default {
format: "svml.node-package@1",
- name: "example-greeting-components",
modules: [{ manifest }],
components: [{
- name: "example-greeting-components/compute",
producers: [
{
producer: producer("make-prompt"),
@@ -628,7 +631,6 @@ test("project local runtime uses only the explicitly selected Scheduler", async
facet: "scheduler",
instance: "scheduler.example",
implementation: {
- locator: "example.scheduler/fair",
digest: digestOf("example.scheduler/fair@1"),
},
service: {
@@ -661,14 +663,12 @@ test("two installed Schedulers are unambiguous because the Profile selects one",
const creates = { one: 0, two: 0 };
const closes = { one: 0, two: 0 };
const scheduler = (name: "one" | "two") => defineRuntimeServicePackage({
- name: `example.scheduler.${name}`,
module: { name: `example.scheduler.${name}`, version: "1" },
services: [{
role: "scheduler",
facet: "scheduler",
instance: `scheduler.${name}`,
implementation: {
- locator: `example.scheduler.${name}/fair`,
digest: digestOf(`example.scheduler.${name}/fair@1`),
},
service: {
@@ -703,14 +703,12 @@ test("project local runtime accepts an explicitly selected replacement ArtifactS
const module = { name: "example.remote-artifacts", version: "1" } as const;
const artifactStore = new MemoryArtifactStore();
const artifacts = defineRuntimeServicePackage({
- name: "example.remote-artifacts",
module,
services: [{
facet: "artifact-store",
instance: "artifacts.remote",
role: "artifact-store",
implementation: {
- locator: "example.remote-artifacts",
digest: digestOf("example.remote-artifacts@1"),
},
configuration: { bucket: "fixture" },
diff --git a/packages/markup/README.md b/packages/markup/README.md
index 58fb8cc2..357128da 100644
--- a/packages/markup/README.md
+++ b/packages/markup/README.md
@@ -3,11 +3,11 @@
Official XML-like Author Frontend normally used by `.svml` source units. The suffix has no parser
authority; a mandatory `<?svml using="@narratage/markup@1"?>` Header selects this Frontend. It owns only the `<svml>` envelope,
the leading Import Prologue, namespace binding, generic structured elements and dispatch to
-statically declared module Surfaces.
+package-owned Markup Surface Host facets.
The package has no built-in Script, media or video vocabulary. `<script>` is accepted only when an
-imported module declares that tag and the Host explicitly registers the locked Surface
-implementation. The current registry is for trusted official/in-process use; it is not a security
+the imported package contributes that tag through a locked Markup Host facet. The semantic Module
+Manifest contains no XML or parser fact. The current registry is for trusted official/in-process use; it is not a security
sandbox for third-party parser code.
```svml
@@ -40,7 +40,7 @@ content-addressed `BlobRef`; Markup never exposes filesystem APIs or a resolved
Compiler Host, not the Surface, owns containment, read-once behavior and byte transfer. A handler
that does not request assets remains unchanged apart from being awaitable.
-Markup validates source ranges, duplicate identities, Manifest-declared Record types and complete
+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
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`
diff --git a/packages/markup/src/frontend.ts b/packages/markup/src/frontend.ts
index a1d058f1..da3a57dd 100644
--- a/packages/markup/src/frontend.ts
+++ b/packages/markup/src/frontend.ts
@@ -12,7 +12,6 @@ import type {
CanonicalValue,
ModuleRef,
ResolvedModule,
- SurfaceDeclaration,
TypedRecord,
} from "@narratage/protocol";
import { sealAuthorModule } from "@narratage/elaborator";
@@ -34,12 +33,13 @@ import {
} from "./syntax.js";
import type {
RawSurfaceHandler,
- SourceUnit,
+ MarkupSource,
StructuredSurfaceHandler,
SurfaceComponentDraft,
SurfaceDecodeOutput,
SurfaceRecordDraft,
SurfaceResolvedReference,
+ RegisteredSurface,
MarkupDecodeContext,
MarkupDecodeResult,
MarkupAuthorFrontend,
@@ -47,14 +47,13 @@ import type {
MarkupImportRequest,
} from "./types.js";
-export const markupFrontendRef = { module: "@narratage/markup", version: "1", name: "markup" } as const;
export const markupFrontendImplementationDigest = digestOf("@narratage/markup/frontend@1");
export const markupAuthorFrontendId = "@narratage/markup@1";
type BoundSurface = {
readonly tag: string;
readonly module: ResolvedModule;
- readonly declaration: SurfaceDeclaration;
+ readonly surface: RegisteredSurface;
};
function moduleKey(ref: ModuleRef): string {
@@ -65,12 +64,12 @@ function sameModule(left: ModuleRef, right: ModuleRef): boolean {
return left.name === right.name && left.version === right.version;
}
-function fail(source: SourceUnit, code: string, message: string, offset?: number): never {
+function fail(source: MarkupSource, code: string, message: string, offset?: number): never {
throw new MarkupFrontendError(code, message, source.name, offset, source.text);
}
function moduleForImport(
- source: SourceUnit,
+ source: MarkupSource,
request: MarkupImportRequest,
context: MarkupDecodeContext,
): ResolvedModule {
@@ -83,7 +82,7 @@ function moduleForImport(
}
function surfaceScope(
- source: SourceUnit,
+ source: MarkupSource,
imports: readonly MarkupImportRequest[],
context: MarkupDecodeContext,
): Map<string, BoundSurface> {
@@ -96,16 +95,29 @@ function surfaceScope(
}
if (request.kind === "source") continue;
const module = moduleForImport(source, request, context);
- for (const declaration of module.manifest.surfaces) {
+ const allowed = new Set([
+ moduleKey(module.ref),
+ ...module.manifest.dependencies.map((dependency) => moduleKey(dependency.module)),
+ ]);
+ for (const declaration of context.registry.surfaces(module.ref)) {
+ for (const output of declaration.outputs) {
+ if (!allowed.has(moduleKey(output.module))) {
+ fail(source, "MARKUP_SURFACE_DEPENDENCY", `Surface ${moduleKey(module.ref)}#${declaration.surface} outputs ${moduleKey(output.module)}#${output.name} without a Module dependency.`, request.range.start);
+ }
+ const target = context.closure.modules.find((item) => sameModule(item.ref, output.module));
+ if (!target?.manifest.types.some((type) => type.name === output.name)) {
+ fail(source, "MARKUP_SURFACE_OUTPUT_TYPE", `Surface ${moduleKey(module.ref)}#${declaration.surface} outputs unknown Type ${moduleKey(output.module)}#${output.name}.`, request.range.start);
+ }
+ }
const tag = request.alias === undefined ? declaration.tag : `${request.alias}:${declaration.tag}`;
if (scope.has(tag)) fail(source, "MARKUP_SURFACE_COLLISION", `Surface tag <${tag}> is imported more than once.`, request.range.start);
- scope.set(tag, { tag, module, declaration });
+ scope.set(tag, { tag, module, surface: declaration });
}
}
return scope;
}
-export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeContext): Promise<MarkupDecodeResult> {
+export async function decodeMarkup(source: MarkupSource, context: MarkupDecodeContext): Promise<MarkupDecodeResult> {
verifyClosure(context.closure);
const discovery = discoverMarkup(source);
const sourceImports = context.sourceImports ?? [];
@@ -119,7 +131,7 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
fail(
source,
"MARKUP_SOURCE_IMPORT_UNRESOLVED",
- `Source import "${request.from}" must be decoded before this SourceUnit.`,
+ `Source import "${request.from}" must be decoded before this source.`,
request.range.start,
);
}
@@ -142,34 +154,10 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
}
}
const scope = surfaceScope(source, discovery.imports, context);
- const sourceDigest = source.sourceDigest ?? digestOf(source.text);
- const frontendClosureDigest = digestOf({
- frontend: markupFrontendImplementationDigest,
- surfaces: [...scope.values()]
- .sort((left, right) => left.tag.localeCompare(right.tag))
- .map((surface) => ({
- tag: surface.tag,
- module: surface.module.ref,
- moduleDigest: surface.module.digest,
- name: surface.declaration.name,
- implementationDigest: surface.declaration.implementation.digest,
- })),
- sourceImports: sourceImports
- .map((item) => ({
- from: item.request.from,
- alias: item.request.alias,
- frontend: item.frontend,
- frontendDigest: item.frontendDigest,
- source: item.source,
- exports: item.exports,
- }))
- .sort((left, right) => left.alias.localeCompare(right.alias)),
- });
const records: TypedRecord[] = [];
const components: AuthorComponent[] = [];
const componentRanges = new Map<string, SurfaceComponentDraft["range"]>();
const fragments = new Map<string, GraphFragment>();
- const sourceMaps: CanonicalValue[] = [];
const recordIds = new Set<string>();
const componentIds = new Set<string>();
let cursor = discovery.bodyStart;
@@ -190,18 +178,9 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
}
const bound = scope.get(opening.name);
if (!bound) fail(source, "MARKUP_UNKNOWN_SURFACE", `No imported module declares <${opening.name}>.`, cursor);
- const registered = context.registry.resolve(bound.module.ref, bound.declaration.name);
- if (!registered) {
- fail(source, "MARKUP_SURFACE_UNREGISTERED", `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} is not registered.`, cursor);
- }
- if (
- registered.mode !== bound.declaration.mode
- || registered.implementationDigest !== bound.declaration.implementation.digest
- ) {
- fail(source, "MARKUP_SURFACE_MISMATCH", `Registered Surface ${bound.declaration.name} does not match the locked Manifest.`, cursor);
- }
+ const registered = bound.surface;
let output: SurfaceDecodeOutput;
- if (bound.declaration.mode === "raw") {
+ if (registered.mode === "raw") {
if (opening.selfClosing) fail(source, "MARKUP_RAW_SELF_CLOSING", `Raw Surface <${opening.name}> cannot be self-closing.`, cursor);
const rawOutput = await (registered.handler as RawSurfaceHandler)({
sourceName: source.name,
@@ -277,16 +256,16 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
fail(
source,
"MARKUP_SURFACE_RANGE",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid source range.`,
+ `Surface ${moduleKey(bound.module.ref)}#${registered.surface} returned an invalid source range.`,
opening.start,
);
}
if (recordIds.has(draft.id)) fail(source, "MARKUP_RECORD_DUPLICATE", `Duplicate authored record "${draft.id}".`, draft.range.start);
- if (!bound.declaration.outputs.some((output) => sameModule(output.module, draft.type.module) && output.name === draft.type.name)) {
+ if (!registered.outputs.some((output) => sameModule(output.module, draft.type.module) && output.name === draft.type.name)) {
fail(
source,
"MARKUP_SURFACE_OUTPUT",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} did not declare output type ${moduleKey(draft.type.module)}#${draft.type.name}.`,
+ `Surface ${moduleKey(bound.module.ref)}#${registered.surface} did not declare output type ${moduleKey(draft.type.module)}#${draft.type.name}.`,
draft.range.start,
);
}
@@ -311,7 +290,7 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
fail(
source,
"MARKUP_COMPONENT_RANGE",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid component source range.`,
+ `Surface ${moduleKey(bound.module.ref)}#${registered.surface} returned an invalid component source range.`,
opening.start,
);
}
@@ -338,7 +317,7 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
fail(
source,
"MARKUP_FRAGMENT_IDENTITY",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid Graph Fragment identity.`,
+ `Surface ${moduleKey(bound.module.ref)}#${registered.surface} returned an invalid Graph Fragment identity.`,
opening.start,
);
}
@@ -348,7 +327,6 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
}
fragments.set(fragment.id, fragment);
}
- sourceMaps.push(...(output.sourceMaps ?? []));
}
if (!closed) {
fail(source, "MARKUP_ROOT_UNCLOSED", "Document is missing </svml>.", source.text.length);
@@ -398,28 +376,16 @@ export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeCont
}
return {
module: sealTypedModule({
- id: `source:${source.name}`,
- closureDigest: context.closure.digest,
records,
}),
author: sealAuthorModule({
- name: `source:${source.name}`,
components: resolvedComponents,
}),
fragments: [...fragments.values()].sort((left, right) => left.id.localeCompare(right.id)),
exports: exports.sort((left, right) => left.name.localeCompare(right.name)),
- imports: discovery.imports,
- frontendClosureDigest,
- sourceMaps,
};
}
-export const markupFrontend = {
- id: markupFrontendRef,
- discover: discoverMarkup,
- decode: decodeMarkup,
-} as const;
-
/** Adapt the official Markup decoder to the domain-neutral recursive Source Closure ABI. */
export function createMarkupAuthorFrontend(options: MarkupAuthorFrontendOptions): MarkupAuthorFrontend {
return {
@@ -441,7 +407,7 @@ export function createMarkupAuthorFrontend(options: MarkupAuthorFrontendOptions)
},
async decode(source, context) {
const result = await decodeMarkup(
- { name: source.name, text: source.text, sourceDigest: source.sourceDigest },
+ { name: source.name, text: source.text },
{
closure: context.closure,
registry: options.registry,
diff --git a/packages/markup/src/host-facet.ts b/packages/markup/src/host-facet.ts
index 296be2ae..43953d87 100644
--- a/packages/markup/src/host-facet.ts
+++ b/packages/markup/src/host-facet.ts
@@ -1,44 +1,59 @@
import type { HostFacet } from "@narratage/host";
import { isDigest } from "@narratage/protocol";
-import type { Digest, ModuleRef } from "@narratage/protocol";
+import type { Digest, ModuleRef, TypeRef } from "@narratage/protocol";
import type {
RawSurfaceHandler,
+ RegisteredSurface,
StructuredSurfaceHandler,
MarkupSurfaceRegistryLike,
+ MarkupSurfaceDeclaration,
+ RawSurfaceDeclaration,
+ StructuredSurfaceDeclaration,
} from "./types.js";
export const markupSurfaceHostFacetAbi = "svml.markup-surface-host@1";
-export type MarkupSurfaceHostFacetOptions =
+type RawMarkupSurfaceHostFacetOptions =
| {
readonly module: ModuleRef;
readonly surface: string;
+ readonly tag: string;
+ readonly outputs: readonly TypeRef[];
readonly mode: "raw";
readonly implementationDigest: Digest;
readonly handler: RawSurfaceHandler;
}
+ | {
+ readonly module: ModuleRef;
+ readonly declaration: RawSurfaceDeclaration;
+ readonly handler: RawSurfaceHandler;
+ };
+
+type StructuredMarkupSurfaceHostFacetOptions =
| {
readonly module: ModuleRef;
readonly surface: string;
+ readonly tag: string;
+ readonly outputs: readonly TypeRef[];
readonly mode: "structured";
readonly implementationDigest: Digest;
readonly handler: StructuredSurfaceHandler;
+ }
+ | {
+ readonly module: ModuleRef;
+ readonly declaration: StructuredSurfaceDeclaration;
+ readonly handler: StructuredSurfaceHandler;
};
+export type { MarkupSurfaceDeclaration } from "./types.js";
+
+export type MarkupSurfaceHostFacetOptions =
+ | RawMarkupSurfaceHostFacetOptions
+ | StructuredMarkupSurfaceHostFacetOptions;
+
type MutableMarkupSurfaceRegistry = MarkupSurfaceRegistryLike & {
- registerRaw(
- module: ModuleRef,
- surface: string,
- implementationDigest: Digest,
- handler: RawSurfaceHandler,
- ): void;
- registerStructured(
- module: ModuleRef,
- surface: string,
- implementationDigest: Digest,
- handler: StructuredSurfaceHandler,
- ): void;
+ register(value: RegisteredSurface): void;
};
function assert(condition: unknown, message: string): asserts condition {
@@ -60,20 +75,47 @@ function nonEmptyString(value: unknown, subject: string): string {
return value;
}
+function typeRef(value: unknown, subject: string): TypeRef {
+ const item = object(value, subject);
+ exact(item, ["module", "name"], subject);
+ const module = object(item.module, `${subject}.module`);
+ exact(module, ["name", "version"], `${subject}.module`);
+ return {
+ module: {
+ name: nonEmptyString(module.name, `${subject}.module.name`),
+ version: nonEmptyString(module.version, `${subject}.module.version`),
+ },
+ name: nonEmptyString(item.name, `${subject}.name`),
+ };
+}
+
/** Package-owned Markup Surface declaration carried through the syntax-neutral package loader. */
+export function createMarkupSurfaceHostFacet(options: RawMarkupSurfaceHostFacetOptions): HostFacet;
+export function createMarkupSurfaceHostFacet(options: StructuredMarkupSurfaceHostFacetOptions): HostFacet;
export function createMarkupSurfaceHostFacet(options: MarkupSurfaceHostFacetOptions): HostFacet {
+ const declaration = "declaration" in options
+ ? {
+ surface: options.declaration.name,
+ 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(options.surface.trim().length > 0, "Markup Surface name is empty");
- assert(isDigest(options.implementationDigest), "Markup Surface implementation digest 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: {
- contract: "svml.markup-surface-host-facet@1",
module: options.module,
- surface: options.surface,
- mode: options.mode,
- implementationDigest: options.implementationDigest,
+ surface: declaration.surface,
+ tag: declaration.tag,
+ outputs: declaration.outputs,
+ mode: declaration.mode,
+ implementationDigest: declaration.implementationDigest,
},
implementation: options.handler,
};
@@ -87,9 +129,8 @@ 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, ["contract", "module", "surface", "mode", "implementationDigest"],
+ exact(identity, ["module", "surface", "tag", "outputs", "mode", "implementationDigest"],
"Markup Surface Host facet identity");
- assert(identity.contract === "svml.markup-surface-host-facet@1", "Markup Surface Host facet contract is invalid");
const module = object(identity.module, "Markup Surface Host facet module");
exact(module, ["name", "version"], "Markup Surface Host facet module");
const moduleRef = {
@@ -97,27 +138,36 @@ export function installMarkupSurfaceHostFacets(
version: nonEmptyString(module.version, "Markup Surface Host facet module version"),
};
const surface = nonEmptyString(identity.surface, "Markup Surface Host facet surface");
+ 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") {
- registry.registerRaw(
- moduleRef,
+ registry.register({
+ module: moduleRef,
surface,
+ tag,
+ outputs,
implementationDigest,
- facet.implementation as RawSurfaceHandler,
- );
+ mode: "raw",
+ handler: facet.implementation as RawSurfaceHandler,
+ });
} else {
- assert(identity.mode === "structured", "Markup Surface Host facet mode is invalid");
- registry.registerStructured(
- moduleRef,
+ registry.register({
+ module: moduleRef,
surface,
+ tag,
+ outputs,
implementationDigest,
- facet.implementation as StructuredSurfaceHandler,
- );
+ mode: "structured",
+ handler: facet.implementation as StructuredSurfaceHandler,
+ });
}
}
}
diff --git a/packages/markup/src/index.ts b/packages/markup/src/index.ts
index 5aaa9e5b..55fc19f8 100644
--- a/packages/markup/src/index.ts
+++ b/packages/markup/src/index.ts
@@ -3,9 +3,7 @@ export {
decodeMarkup,
createMarkupAuthorFrontend,
markupAuthorFrontendId,
- markupFrontend,
markupFrontendImplementationDigest,
- markupFrontendRef,
} from "./frontend.js";
export { MarkupSurfaceRegistry } from "./registry.js";
export {
diff --git a/packages/markup/src/registry.ts b/packages/markup/src/registry.ts
index 022c39b4..7540e36e 100644
--- a/packages/markup/src/registry.ts
+++ b/packages/markup/src/registry.ts
@@ -1,11 +1,13 @@
-import { isDigest } from "@narratage/core";
-import type { Digest, ModuleRef } from "@narratage/protocol";
+import { isDigest } from "@narratage/protocol";
+import type { ModuleRef } from "@narratage/protocol";
import type {
+ RawSurfaceDeclaration,
RawSurfaceHandler,
RegisteredSurface,
- StructuredSurfaceHandler,
MarkupSurfaceRegistryLike,
+ StructuredSurfaceDeclaration,
+ StructuredSurfaceHandler,
} from "./types.js";
function key(module: ModuleRef, surface: string): string {
@@ -15,32 +17,63 @@ function key(module: ModuleRef, surface: string): string {
export class MarkupSurfaceRegistry implements MarkupSurfaceRegistryLike {
readonly #values = new Map<string, RegisteredSurface>();
- registerRaw(
- module: ModuleRef,
- surface: string,
- implementationDigest: Digest,
- handler: RawSurfaceHandler,
- ): void {
- this.register({ module, surface, implementationDigest, mode: "raw", handler });
- }
-
- registerStructured(
- module: ModuleRef,
- surface: string,
- implementationDigest: Digest,
- handler: StructuredSurfaceHandler,
- ): void {
- this.register({ module, surface, implementationDigest, mode: "structured", handler });
- }
-
- private register(value: RegisteredSurface): void {
+ 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");
+ }
+ if (value.surface.trim().length === 0) throw new Error("Surface name is empty");
+ if (value.tag.trim().length === 0) throw new Error("Surface tag is empty");
+ if (value.mode !== "raw" && value.mode !== "structured") throw new Error("Surface mode is invalid");
const identity = key(value.module, value.surface);
if (this.#values.has(identity)) throw new Error(`Surface ${identity} is already registered`);
+ const tag = [...this.#values.values()].find((item) =>
+ item.module.name === value.module.name
+ && item.module.version === value.module.version
+ && item.tag === value.tag);
+ if (tag !== undefined) throw new Error(`Surface tag ${value.tag} is already registered for ${value.module.name}@${value.module.version}`);
this.#values.set(identity, value);
}
+ registerRaw(options: {
+ readonly module: ModuleRef;
+ readonly declaration: RawSurfaceDeclaration;
+ readonly handler: RawSurfaceHandler;
+ }): void {
+ this.register({
+ module: options.module,
+ surface: options.declaration.name,
+ tag: options.declaration.tag,
+ outputs: options.declaration.outputs,
+ implementationDigest: options.declaration.implementation.digest,
+ mode: "raw",
+ handler: options.handler,
+ });
+ }
+
+ registerStructured(options: {
+ readonly module: ModuleRef;
+ readonly declaration: StructuredSurfaceDeclaration;
+ readonly handler: StructuredSurfaceHandler;
+ }): void {
+ this.register({
+ module: options.module,
+ surface: options.declaration.name,
+ tag: options.declaration.tag,
+ outputs: options.declaration.outputs,
+ implementationDigest: options.declaration.implementation.digest,
+ mode: "structured",
+ handler: options.handler,
+ });
+ }
+
resolve(module: ModuleRef, surface: string): RegisteredSurface | undefined {
return this.#values.get(key(module, surface));
}
+
+ surfaces(module: ModuleRef): readonly RegisteredSurface[] {
+ return [...this.#values.values()]
+ .filter((item) => item.module.name === module.name && item.module.version === module.version)
+ .sort((left, right) => left.surface.localeCompare(right.surface));
+ }
}
diff --git a/packages/markup/src/syntax.ts b/packages/markup/src/syntax.ts
index cb32f65f..8df69911 100644
--- a/packages/markup/src/syntax.ts
+++ b/packages/markup/src/syntax.ts
@@ -2,7 +2,7 @@ import type { SourceRange } from "@narratage/protocol";
import { MarkupFrontendError } from "./error.js";
import type {
- SourceUnit,
+ MarkupSource,
StructuredElement,
StructuredNode,
MarkupAttributeValue,
@@ -22,11 +22,11 @@ type OpeningTag = {
readonly selfClosing: boolean;
};
-function fail(source: SourceUnit, code: string, message: string, offset?: number): never {
+function fail(source: MarkupSource, code: string, message: string, offset?: number): never {
throw new MarkupFrontendError(code, message, source.name, offset, source.text);
}
-function decodeEntities(value: string, source: SourceUnit, offset: number): string {
+function decodeEntities(value: string, source: MarkupSource, offset: number): string {
return value.replace(/&(?:lt|gt|amp|quot|apos);/gu, (entity) => {
switch (entity) {
case "&lt;": return "<";
@@ -45,7 +45,7 @@ function skipSpace(text: string, start: number): number {
return cursor;
}
-function skipTrivia(source: SourceUnit, start: number): number {
+function skipTrivia(source: MarkupSource, start: number): number {
let cursor = start;
while (cursor < source.text.length) {
const next = skipSpace(source.text, cursor);
@@ -60,14 +60,14 @@ function skipTrivia(source: SourceUnit, start: number): number {
return cursor;
}
-function parseName(source: SourceUnit, start: number): { readonly value: string; readonly end: number } {
+function parseName(source: MarkupSource, start: number): { readonly value: string; readonly end: number } {
const match = NAME.exec(source.text.slice(start));
if (!match) fail(source, "MARKUP_NAME", "Expected a name.", start);
return { value: match[0], end: start + match[0].length };
}
function parseAttributeValue(
- source: SourceUnit,
+ source: MarkupSource,
start: number,
): { readonly value: MarkupAttributeValue; readonly end: number } {
const quote = source.text[start];
@@ -89,7 +89,7 @@ function parseAttributeValue(
fail(source, "MARKUP_ATTRIBUTE", "Attribute values must be quoted strings or whole-value references.", start);
}
-export function parseOpeningTag(source: SourceUnit, start: number): OpeningTag {
+export function parseOpeningTag(source: MarkupSource, start: number): OpeningTag {
if (source.text[start] !== "<" || source.text[start + 1] === "/") {
fail(source, "MARKUP_OPEN", "Expected an opening tag.", start);
}
@@ -123,7 +123,7 @@ export function parseOpeningTag(source: SourceUnit, start: number): OpeningTag {
fail(source, "MARKUP_OPEN", `Opening tag <${parsedName.value}> is not closed.`, start);
}
-function parseClose(source: SourceUnit, start: number): { readonly name: string; readonly end: number } {
+function parseClose(source: MarkupSource, start: number): { readonly name: string; readonly end: number } {
if (!source.text.startsWith("</", start)) fail(source, "MARKUP_CLOSE", "Expected a closing tag.", start);
const name = parseName(source, start + 2);
const cursor = skipSpace(source.text, name.end);
@@ -132,7 +132,7 @@ function parseClose(source: SourceUnit, start: number): { readonly name: string;
}
export function parseStructuredElement(
- source: SourceUnit,
+ source: MarkupSource,
start: number,
): { readonly element: StructuredElement; readonly nextOffset: number } {
const opening = parseOpeningTag(source, start);
@@ -192,7 +192,7 @@ export function parseStructuredElement(
}
function stringAttribute(
- source: SourceUnit,
+ source: MarkupSource,
opening: OpeningTag,
name: string,
required = false,
@@ -206,7 +206,7 @@ function stringAttribute(
return value;
}
-function importRequest(source: SourceUnit, opening: OpeningTag): MarkupImportRequest {
+function importRequest(source: MarkupSource, opening: OpeningTag): MarkupImportRequest {
if (opening.name !== "import" || !opening.selfClosing) {
fail(source, "MARKUP_IMPORT", "Imports must use <import .../>.", opening.start);
}
@@ -230,7 +230,7 @@ function importRequest(source: SourceUnit, opening: OpeningTag): MarkupImportReq
};
}
-export function discoverMarkup(source: SourceUnit): MarkupDiscovery {
+export function discoverMarkup(source: MarkupSource): MarkupDiscovery {
let cursor = skipTrivia(source, 0);
const root = parseOpeningTag(source, cursor);
if (root.name !== "svml" || root.selfClosing) fail(source, "MARKUP_ROOT", "Document must open with <svml>.", cursor);
@@ -248,7 +248,7 @@ export function discoverMarkup(source: SourceUnit): MarkupDiscovery {
return { imports, bodyStart: cursor };
}
-export function closeDocument(source: SourceUnit, start: number): number {
+export function closeDocument(source: MarkupSource, start: number): number {
const close = parseClose(source, start);
if (close.name !== "svml") fail(source, "MARKUP_ROOT_CLOSE", `Expected </svml>, received </${close.name}>.`, start);
const end = skipTrivia(source, close.end);
@@ -256,6 +256,6 @@ export function closeDocument(source: SourceUnit, start: number): number {
return end;
}
-export function skipTextTrivia(source: SourceUnit, start: number): number {
+export function skipTextTrivia(source: MarkupSource, start: number): number {
return skipTrivia(source, start);
}
diff --git a/packages/markup/src/types.ts b/packages/markup/src/types.ts
index d36266d0..0ed418a2 100644
--- a/packages/markup/src/types.ts
+++ b/packages/markup/src/types.ts
@@ -5,7 +5,6 @@ import type {
ResolvedModuleClosure,
SourceRange,
StoredValue,
- SurfaceDeclaration,
TypeRef,
TypedModule,
TypedRecord,
@@ -22,11 +21,10 @@ import type {
ResolvedAuthorSourceImport,
} from "@narratage/elaborator";
-export type SourceUnit = {
+/** Decoder-local Markup text; Source identity and closure ownership stay outside the parser. */
+export type MarkupSource = {
readonly name: string;
readonly text: string;
- /** Whole unmasked source digest supplied by Source Closure compilation. */
- readonly sourceDigest?: Digest;
};
export type MarkupImportRequest = {
@@ -80,7 +78,6 @@ export type SurfaceDecodeOutput = {
readonly records: readonly SurfaceRecordDraft[];
readonly components: readonly SurfaceComponentDraft[];
readonly fragments: readonly GraphFragment[];
- readonly sourceMaps?: readonly CanonicalValue[];
};
export type RawSurfaceInput = {
@@ -102,7 +99,7 @@ export type StructuredSurfaceInput = {
readonly element: StructuredElement;
/**
* Resolve an explicitly written author reference. Imported record values are
- * available because their SourceUnit has already been compiled and admitted.
+ * available because their source has already been compiled and admitted.
* A component output has a ref and Type but no compile-time Record value.
*/
readonly resolveReference: (path: string) => SurfaceResolvedReference | undefined;
@@ -119,14 +116,39 @@ export type SurfaceResolvedReference = {
export type RawSurfaceHandler = (input: RawSurfaceInput) => Awaitable<RawSurfaceOutput>;
export type StructuredSurfaceHandler = (input: StructuredSurfaceInput) => Awaitable<SurfaceDecodeOutput>;
-export type RegisteredSurface = {
+type MarkupSurfaceDeclarationBase = {
+ readonly name: string;
+ readonly tag: string;
+ readonly outputs: readonly TypeRef[];
+ readonly implementation: { readonly digest: Digest };
+};
+
+export type RawSurfaceDeclaration = MarkupSurfaceDeclarationBase & { readonly mode: "raw" };
+export type StructuredSurfaceDeclaration = MarkupSurfaceDeclarationBase & { readonly mode: "structured" };
+export type MarkupSurfaceDeclaration = RawSurfaceDeclaration | StructuredSurfaceDeclaration;
+
+type RegisteredSurfaceBase = {
readonly module: ModuleRef;
readonly surface: string;
+ readonly tag: string;
+ readonly outputs: readonly TypeRef[];
readonly implementationDigest: Digest;
- readonly mode: SurfaceDeclaration["mode"];
- readonly handler: RawSurfaceHandler | StructuredSurfaceHandler;
};
+export type RegisteredRawSurface = RegisteredSurfaceBase & {
+ readonly mode: "raw";
+ readonly handler: RawSurfaceHandler;
+};
+
+export type RegisteredStructuredSurface = RegisteredSurfaceBase & {
+ readonly mode: "structured";
+ readonly handler: StructuredSurfaceHandler;
+};
+
+export type RegisteredSurface =
+ | RegisteredRawSurface
+ | RegisteredStructuredSurface;
+
export type MarkupDecodeContext = {
readonly closure: ResolvedModuleClosure;
readonly registry: MarkupSurfaceRegistryLike;
@@ -140,9 +162,6 @@ export type MarkupDecodeResult = {
readonly author: AuthorModule;
readonly fragments: readonly GraphFragment[];
readonly exports: readonly AuthorSourceExport[];
- readonly imports: readonly MarkupImportRequest[];
- readonly frontendClosureDigest: Digest;
- readonly sourceMaps: readonly CanonicalValue[];
};
export type MarkupAuthorFrontendOptions = {
@@ -154,4 +173,5 @@ export type MarkupAuthorFrontend = AuthorFrontend;
export interface MarkupSurfaceRegistryLike {
resolve(module: ModuleRef, surface: string): RegisteredSurface | undefined;
+ surfaces(module: ModuleRef): readonly RegisteredSurface[];
}
diff --git a/packages/markup/test/author-integration.test.ts b/packages/markup/test/author-integration.test.ts
index 7f06571c..6c440948 100644
--- a/packages/markup/test/author-integration.test.ts
+++ b/packages/markup/test/author-integration.test.ts
@@ -38,6 +38,11 @@ const reportProducer = { module: laboratory, name: "write-report" } satisfies Pr
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 } },
+] as const;
const manifest: ModuleManifest = {
format: "svml.module@1",
@@ -50,41 +55,6 @@ const manifest: ModuleManifest = {
{ name: reportType.name, schema: { kind: "string", minLength: 1 } },
],
capabilities: [],
- surfaces: [
- {
- name: "sample",
- tag: "Sample",
- mode: "structured",
- outputs: [sampleType],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.text-laboratory/sample-surface",
- digest: sampleSurfaceDigest,
- },
- },
- {
- name: "measure",
- tag: "Measure",
- mode: "structured",
- outputs: [],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.text-laboratory/measure-surface",
- digest: measureSurfaceDigest,
- },
- },
- {
- name: "report",
- tag: "Report",
- mode: "structured",
- outputs: [],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.text-laboratory/report-surface",
- digest: reportSurfaceDigest,
- },
- },
- ],
producers: [
{
name: measureProducer.name,
@@ -92,8 +62,6 @@ const manifest: ModuleManifest = {
outputs: [{ name: "measurement", type: measurementType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.text-laboratory/measure",
digest: digestOf("example.text-laboratory/measure@1"),
},
},
@@ -103,8 +71,6 @@ const manifest: ModuleManifest = {
outputs: [{ name: "report", type: reportType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.text-laboratory/write-report",
digest: digestOf("example.text-laboratory/write-report@1"),
},
},
@@ -112,7 +78,6 @@ const manifest: ModuleManifest = {
};
function singleOperationFragment(
- name: string,
inputName: string,
inputType: TypeRef,
producer: ProducerRef,
@@ -120,7 +85,6 @@ function singleOperationFragment(
resultType: TypeRef,
): GraphFragment {
return sealGraphFragment({
- name,
inputs: [{ name: inputName, type: inputType }],
operations: [{
id: "produce",
@@ -137,7 +101,6 @@ function singleOperationFragment(
}
const measureFragment = singleOperationFragment(
- "measure-sample",
"sample",
sampleType,
measureProducer,
@@ -145,7 +108,6 @@ const measureFragment = singleOperationFragment(
measurementType,
);
const reportFragment = singleOperationFragment(
- "write-report",
"measurement",
measurementType,
reportProducer,
@@ -175,7 +137,10 @@ function componentOutput(path: string): { readonly component: string; readonly o
function registry(options: { readonly omitMeasureFragment?: boolean } = {}): MarkupSurfaceRegistry {
const values = new MarkupSurfaceRegistry();
- values.registerStructured(laboratory, "sample", sampleSurfaceDigest, ({ element }) => ({
+ values.registerStructured({
+ module: laboratory,
+ declaration: laboratorySurfaces[0],
+ handler: ({ element }) => ({
records: [{
id: stringAttribute(element, "id"),
type: sampleType,
@@ -184,8 +149,12 @@ function registry(options: { readonly omitMeasureFragment?: boolean } = {}): Mar
}],
components: [],
fragments: [],
- }));
- values.registerStructured(laboratory, "measure", measureSurfaceDigest, ({ element }) => {
+ }),
+ });
+ values.registerStructured({
+ module: laboratory,
+ declaration: laboratorySurfaces[1],
+ handler: ({ element }) => {
const id = stringAttribute(element, "id");
return {
records: [],
@@ -198,8 +167,12 @@ function registry(options: { readonly omitMeasureFragment?: boolean } = {}): Mar
}],
fragments: options.omitMeasureFragment === true ? [] : [measureFragment],
};
+ },
});
- values.registerStructured(laboratory, "report", reportSurfaceDigest, ({ element }) => {
+ values.registerStructured({
+ module: laboratory,
+ declaration: laboratorySurfaces[2],
+ handler: ({ element }) => {
const id = stringAttribute(element, "id");
const measurement = componentOutput(referenceAttribute(element, "measurement"));
return {
@@ -219,6 +192,7 @@ function registry(options: { readonly omitMeasureFragment?: boolean } = {}): Mar
}],
fragments: [reportFragment],
};
+ },
});
return values;
}
@@ -253,8 +227,8 @@ test("Markup Surfaces compile forward author references into a Core BuildPlan",
const program = link(closure, [decoded.module]);
const catalog = new Map(decoded.fragments.map((fragment) => [fragment.id, fragment]));
const elaborated = elaborateAuthorModule(program, decoded.author, (id) => catalog.get(id));
- const state = start(program, elaborated.graph, sealBuildRequest({
- graph: elaborated.graph.id,
+ const state = start(program, elaborated, sealBuildRequest({
+ graph: elaborated.id,
targets: [{ output: "final.result" }],
}));
@@ -280,7 +254,7 @@ test("component source reflow does not change AuthorModule semantic identity", a
sample={soil}
/>
</svml>`);
- assert.equal(compact.author.id, multiline.author.id);
+ assert.deepEqual(compact.author, multiline.author);
});
test("Markup rejects a component whose Surface omits its Fragment definition", async () => {
diff --git a/packages/markup/test/markup.test.ts b/packages/markup/test/markup.test.ts
index cd0695d2..1d0b2bc0 100644
--- a/packages/markup/test/markup.test.ts
+++ b/packages/markup/test/markup.test.ts
@@ -9,8 +9,8 @@ import type { ModuleManifest } from "@narratage/protocol";
import {
decodeScriptSurface,
scriptManifest,
+ scriptMarkupSurfaces,
scriptModuleRef,
- scriptSurfaceImplementationDigest,
} from "@narratage/script";
import {
MarkupFrontendError,
@@ -22,12 +22,11 @@ import {
function scriptContext() {
const closure = createResolvedClosure([narrativeManifest, textManifest, scriptManifest]);
const registry = new MarkupSurfaceRegistry();
- registry.registerRaw(
- scriptModuleRef,
- "script",
- scriptSurfaceImplementationDigest,
- decodeScriptSurface,
- );
+ registry.registerRaw({
+ module: scriptModuleRef,
+ declaration: scriptMarkupSurfaces[0]!,
+ handler: decodeScriptSurface,
+ });
return {
closure,
registry,
@@ -66,14 +65,13 @@ test("Markup learns <script> only from an imported Script Manifest", async () =>
record.id === "story.caption" && record.type.name === "CaptionDisplaySequence"), true);
assert.equal(result.module.records.some((record) =>
record.id === "story.caption.correspondence" && record.type.name === "CaptionCorrespondence"), true);
- assert.equal(result.sourceMaps.length, 1);
});
test("the same Script meaning has the same authored Record digest across reflow", async () => {
const compact = await decodeMarkup(
{
name: "compact.svml",
- text: `<svml><import from="@narratage/script"/><script id="story"><opening><ALICE>Hello.<BOB>Hi.</opening></script></svml>`,
+ text: `<svml><import from="@narratage/script@1"/><script id="story"><opening><ALICE>Hello.<BOB>Hi.</opening></script></svml>`,
},
scriptContext(),
);
@@ -81,7 +79,7 @@ test("the same Script meaning has the same authored Record digest across reflow"
{
name: "multiline.svml",
text: `<svml>
- <import from="@narratage/script"/>
+ <import from="@narratage/script@1"/>
<script id="story">
<opening>
<ALICE>Hello.
@@ -110,22 +108,21 @@ test("without the import, Markup has no hard-coded knowledge of Script", async (
test("a raw Surface cannot consume the Markup document close", async () => {
const closure = createResolvedClosure([narrativeManifest, textManifest, scriptManifest]);
const registry = new MarkupSurfaceRegistry();
- registry.registerRaw(
- scriptModuleRef,
- "script",
- scriptSurfaceImplementationDigest,
- (input) => ({
+ registry.registerRaw({
+ module: scriptModuleRef,
+ declaration: scriptMarkupSurfaces[0]!,
+ handler: (input) => ({
nextOffset: input.source.length,
records: [],
components: [],
fragments: [],
}),
- );
+ });
await assert.rejects(
decodeMarkup(
{
name: "swallowed.svml",
- text: `<svml><import from="@narratage/script"/><script><opening>Hello.</opening></script></svml>`,
+ text: `<svml><import from="@narratage/script@1"/><script><opening>Hello.</opening></script></svml>`,
},
{ closure, registry, resolveModule: () => scriptModuleRef },
),
@@ -139,9 +136,9 @@ test("imports are frozen before body decoding", async () => {
{
name: "late.svml",
text: `<svml>
- <import from="@narratage/script"/>
+ <import from="@narratage/script@1"/>
<script><opening>Hello.</opening></script>
- <import from="@narratage/script"/>
+ <import from="@narratage/script@1"/>
</svml>`,
},
scriptContext(),
@@ -176,6 +173,13 @@ test("a module can use Markup's generic structured parser without adding another
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",
name: module.name,
@@ -191,24 +195,11 @@ test("a module can use Markup's generic structured parser without adding another
},
],
capabilities: [],
- surfaces: [
- {
- name: "card",
- tag: "card",
- mode: "structured",
- outputs: [type],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.card/surface",
- digest: implementationDigest,
- },
- },
- ],
producers: [],
};
const closure = createResolvedClosure([manifest]);
const registry = new MarkupSurfaceRegistry();
- registry.registerStructured(module, "card", implementationDigest, ({ element }) => ({
+ registry.registerStructured({ module, declaration: cardSurface, handler: ({ element }) => ({
records: [
{
id: "card",
@@ -219,7 +210,7 @@ test("a module can use Markup's generic structured parser without adding another
],
components: [],
fragments: [],
- }));
+ }) });
const result = await decodeMarkup(
{
name: "card.svml",
@@ -232,7 +223,7 @@ test("a module can use Markup's generic structured parser without adding another
assert.equal(isDigest(result.module.records[0]?.digest ?? ""), true);
const overreachingRegistry = new MarkupSurfaceRegistry();
- overreachingRegistry.registerStructured(module, "card", implementationDigest, ({ element }) => ({
+ overreachingRegistry.registerStructured({ module, declaration: cardSurface, handler: ({ element }) => ({
records: [
{
id: "other",
@@ -243,7 +234,7 @@ test("a module can use Markup's generic structured parser without adding another
],
components: [],
fragments: [],
- }));
+ }) });
await assert.rejects(
decodeMarkup(
{ name: "overreach.svml", text: `<svml><import from="example.card@1"/><card/></svml>` },
diff --git a/packages/media-execution/src/execute.ts b/packages/media-execution/src/execute.ts
index d74c8caa..b609ed7b 100644
--- a/packages/media-execution/src/execute.ts
+++ b/packages/media-execution/src/execute.ts
@@ -64,13 +64,10 @@ export type MediaExecutionEnvironment = {
readonly sharedLibraryPath?: string;
readonly processTimeoutMs: number;
readonly maxProbeOutputBytes: number;
- /** Recorded in each result's metadata, so an Operation says which Provider ran it. */
- readonly label: string;
};
export type MediaOperationResult = {
readonly value: StoredValue;
- readonly metadata: CanonicalValue;
};
/** The request contract each capability answers. Both Providers admit Needs by this table. */
@@ -449,12 +446,12 @@ async function outputInspection(args: {
...(args.sharedLibraryPath === undefined ? {} : { sharedLibraryPath: args.sharedLibraryPath }) });
}
-function inlineResult(value: CanonicalValue, metadata: CanonicalValue): MediaOperationResult {
- return { value: { kind: "inline", value }, metadata };
+function inlineResult(value: CanonicalValue): MediaOperationResult {
+ return { value: { kind: "inline", value } };
}
-function artifactResult(value: BlobRef, metadata: CanonicalValue): MediaOperationResult {
- return { value, metadata };
+function artifactResult(value: BlobRef): MediaOperationResult {
+ return { value };
}
function inspectNeed(value: CanonicalValue): InspectMediaNeed {
@@ -522,13 +519,10 @@ function evidenceAudioNeed(value: CanonicalValue): ProjectSpeechEvidenceAudioNee
const item = object(value, "ProjectSpeechEvidenceAudioNeed") as unknown as ProjectSpeechEvidenceAudioNeed;
assert(item.contract === "svml.project-speech-evidence-audio-request@1" && item.source?.kind === "blob",
"ProjectSpeechEvidenceAudioNeed is invalid");
- assert(item.sourceSampleRate === 48_000 && item.sourceChannels === 2 && item.sourceCodec === "pcm_s16le"
- && item.evidenceSampleRate === 16_000 && item.evidenceChannels === 1 && item.evidenceCodec === "pcm_s16le",
- "Speech evidence audio shape is invalid");
assert(Number.isSafeInteger(item.sourceSampleFrames) && item.sourceSampleFrames > 0
&& Number.isSafeInteger(item.evidenceSampleFrames) && item.evidenceSampleFrames > 0
&& item.evidenceSampleFrames === speechEvidenceSampleBoundary(item.sourceSampleFrames),
- "Speech evidence audio sample map is invalid");
+ "Speech evidence audio sample projection is invalid");
return item;
}
@@ -639,7 +633,7 @@ export async function executeInspectMedia(
...(env.sharedLibraryPath === undefined ? {} : { sharedLibraryPath: env.sharedLibraryPath }),
})
: animatedWebpInspection(need.source, animation);
- return inlineResult(canonicalize(inspection), canonicalize({ provider: env.label, operation: "inspect" }));
+ return inlineResult(canonicalize(inspection));
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
@@ -759,8 +753,7 @@ export async function executeNormalizeMedia(
},
}),
});
- return inlineResult(canonicalize(media), canonicalize({ provider: env.label, operation: "normalize",
- visual: visualArtifact !== undefined, audio: audioArtifact !== undefined }));
+ return inlineResult(canonicalize(media));
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
@@ -883,13 +876,7 @@ export async function executeTransformMedia(
"Transformed media audio is not 48 kHz stereo");
}
const artifact = await env.artifacts.putFile(output, "video/mp4");
- return artifactResult(artifact, canonicalize({
- provider: env.label,
- operation: "transform",
- operations: need.program.operations.length,
- frameCount: plan.frameCount,
- sampleFrames: plan.sampleFrames,
- }));
+ return artifactResult(artifact);
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
@@ -926,11 +913,7 @@ export async function executeExtractAudio(
maxProbeOutputBytes: env.maxProbeOutputBytes,
...(env.sharedLibraryPath === undefined ? {} : { sharedLibraryPath: env.sharedLibraryPath }),
});
- return artifactResult(artifact, canonicalize({
- provider: env.label,
- operation: "extract-audio",
- sourceStream: need.streamIndex,
- }));
+ return artifactResult(artifact);
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
@@ -978,12 +961,7 @@ export async function executeExtractFrame(
assert(images.length === 1 && images[0]!.decodedUnitCount === 1,
"Frame extraction output must decode to exactly one image");
const artifact = await env.artifacts.put(bytes, "image/png");
- return artifactResult(artifact, canonicalize({
- provider: env.label,
- operation: "extract-frame",
- sourceStream: need.streamIndex,
- at: need.at,
- }));
+ return artifactResult(artifact);
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
@@ -1044,29 +1022,10 @@ export async function executeProjectSpeechEvidenceAudio(
const evidence: SpeechEvidenceAudio = sealSpeechEvidenceAudio({
contract: "svml.speech-evidence-audio@1",
artifact,
- codec: "pcm_s16le",
- sampleRate: 16_000,
- channels: 1,
sampleFrames: need.evidenceSampleFrames,
- durationSec: need.durationSec,
- segments: need.segments,
- sampleMap: {
- algorithm: "rational-boundary-round@1",
- sourceSampleRate: 48_000,
- evidenceSampleRate: 16_000,
- sourceSampleFrames: need.sourceSampleFrames,
- evidenceSampleFrames: need.evidenceSampleFrames,
- sourceOriginSample: 0,
- evidenceOriginSample: 0,
- },
});
assertSpeechEvidenceAudioIdentity(evidence);
- return inlineResult(canonicalize(evidence), canonicalize({
- provider: env.label,
- operation: "project-speech-evidence-audio",
- sourceSampleFrames: need.sourceSampleFrames,
- evidenceSampleFrames: need.evidenceSampleFrames,
- }));
+ return inlineResult(canonicalize(evidence));
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
@@ -1152,17 +1111,9 @@ export async function executeRenderTimelineAudio(
const value: TimelineAudio = sealTimelineAudio({
contract: "svml.timeline-audio@1",
artifact,
- codec: "pcm_s16le",
- sampleRate: 48_000,
- channels: 2,
sampleFrames: plan.sampleFrames,
- loudness: "planned",
});
- return inlineResult(canonicalize(value), canonicalize({
- provider: env.label,
- operation: "render-audio",
- clips: plan.clips.length,
- }));
+ return inlineResult(canonicalize(value));
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
@@ -1257,12 +1208,7 @@ export async function executeMuxProgramMedia(
presentationSampleFrames: need.audio.sampleFrames,
artifact,
});
- return inlineResult(canonicalize(value), canonicalize({
- provider: env.label,
- operation: "mux",
- videoStream: finalVideo[0]!.index,
- audioStream: finalAudio[0]!.index,
- }));
+ return inlineResult(canonicalize(value));
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
diff --git a/packages/media-execution/src/index.ts b/packages/media-execution/src/index.ts
index b9e2b58c..3ff1931e 100644
--- a/packages/media-execution/src/index.ts
+++ b/packages/media-execution/src/index.ts
@@ -12,7 +12,6 @@ export {
} from "./execute.js";
export { parseMediaInspection } from "./probe.js";
export { verifyCompositableSurfaceBytes } from "./surface.js";
-export type { SurfaceByteVerification } from "./surface.js";
export { probeMediaToolchain } from "./toolchain.js";
export type { MediaToolchainState } from "./toolchain.js";
export type * from "./execute.js";
diff --git a/packages/media-execution/src/surface.ts b/packages/media-execution/src/surface.ts
index 19eb053a..07d151e9 100644
--- a/packages/media-execution/src/surface.ts
+++ b/packages/media-execution/src/surface.ts
@@ -5,7 +5,6 @@ import { join } from "node:path";
import { assertCompositableSurfaceRef } from "@narratage/media";
import type { CompositableSurfaceRef } from "@narratage/media";
-import { canonicalize, digestOf } from "@narratage/protocol";
type JsonObject = Record<string, unknown>;
@@ -35,31 +34,6 @@ type PixelFormat = {
readonly flags?: { readonly alpha?: unknown };
};
-export type SurfaceByteVerification = {
- readonly contract: "svml.compositable-surface-byte-verification@1";
- readonly surfaceDigest: string;
- readonly artifactDigest: string;
- readonly verifier: {
- readonly name: "ffprobe";
- readonly version: string;
- };
- readonly observed: {
- readonly codec: string;
- readonly width: number;
- readonly height: number;
- readonly pixelFormat: string;
- readonly colorSpace: "srgb";
- readonly alphaMode: "opaque" | "straight";
- readonly timing:
- | { readonly kind: "still" }
- | {
- readonly kind: "frames";
- readonly frameRate: { readonly numerator: number; readonly denominator: number };
- readonly frameCount: number;
- };
- };
-};
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
@@ -211,22 +185,6 @@ async function pixelFormatAlpha(
return await pending;
}
-async function ffprobeVersion(
- ffprobePath: string,
- timeoutMs: number,
- maxOutputBytes: number,
-): Promise<string> {
- const bytes = await runProcess({
- executable: ffprobePath,
- argv: ["-version"],
- timeoutMs,
- maxOutputBytes,
- });
- const version = Buffer.from(bytes).toString("utf8").split(/\r?\n/u, 1)[0]?.trim();
- assert(version !== undefined && version.length > 0, "ffprobe returned no version");
- return version;
-}
-
function suffix(mediaType: string): string {
if (mediaType === "image/png") return ".png";
if (mediaType === "image/webp") return ".webp";
@@ -238,8 +196,8 @@ function suffix(mediaType: string): string {
/**
* Decode and verify one typed Surface before its bytes enter a renderer.
*
- * The returned evidence belongs to the Runtime Receipt. It is not another media Product and must
- * not be copied through author-domain graph values.
+ * This is an admission gate, not a second media Product. Success returns no
+ * side-channel facts; anything a later graph step needs must be an explicit output.
*/
export async function verifyCompositableSurfaceBytes(options: {
readonly surface: CompositableSurfaceRef;
@@ -247,7 +205,7 @@ export async function verifyCompositableSurfaceBytes(options: {
readonly ffprobePath?: string;
readonly processTimeoutMs?: number;
readonly maxProbeOutputBytes?: number;
-}): Promise<SurfaceByteVerification> {
+}): Promise<void> {
assertCompositableSurfaceRef(options.surface);
assert(options.bytes.byteLength === options.surface.artifact.size,
`Surface ${options.surface.artifact.digest} byte size differs`);
@@ -258,7 +216,7 @@ export async function verifyCompositableSurfaceBytes(options: {
try {
const path = join(directory, `surface${suffix(options.surface.artifact.mediaType)}`);
await writeFile(path, options.bytes);
- const [probe, formats, version] = await Promise.all([
+ const [probe, formats] = await Promise.all([
runProcess({
executable: ffprobePath,
argv: ["-v", "error", "-print_format", "json", "-show_streams", "-count_frames", path],
@@ -266,7 +224,6 @@ export async function verifyCompositableSurfaceBytes(options: {
maxOutputBytes,
}),
pixelFormatAlpha(ffprobePath, timeoutMs, maxOutputBytes),
- ffprobeVersion(ffprobePath, timeoutMs, maxOutputBytes),
]);
const root = json(probe, "ffprobe Surface query");
assert(Array.isArray(root.streams) && root.streams.length === 1,
@@ -298,38 +255,15 @@ export async function verifyCompositableSurfaceBytes(options: {
}
const frameCount = positiveInteger(stream.nb_read_frames ?? stream.nb_frames, "Surface frame count");
- const observedTiming: SurfaceByteVerification["observed"]["timing"] =
- options.surface.timing.kind === "still"
- ? (() => {
- assert(frameCount === 1, "Still Surface must decode to exactly one frame");
- return { kind: "still" as const };
- })()
- : (() => {
- assert(frameCount === options.surface.timing.frameCount,
- "Surface decoded frame count differs from its declaration");
- const rate = rational(stream.avg_frame_rate ?? stream.r_frame_rate, "Surface frame rate");
- assert(sameRational(rate, options.surface.timing.frameRate),
- "Surface decoded frame rate differs from its declaration");
- return { kind: "frames" as const, frameRate: rate, frameCount };
- })();
- const codec = typeof stream.codec_name === "string" && stream.codec_name.length > 0
- ? stream.codec_name
- : "unknown";
- return canonicalize({
- contract: "svml.compositable-surface-byte-verification@1",
- surfaceDigest: digestOf(options.surface),
- artifactDigest: options.surface.artifact.digest,
- verifier: { name: "ffprobe", version },
- observed: {
- codec,
- width,
- height,
- pixelFormat: stream.pix_fmt,
- colorSpace: "srgb",
- alphaMode: options.surface.alphaMode,
- timing: observedTiming,
- },
- }) as SurfaceByteVerification;
+ if (options.surface.timing.kind === "still") {
+ assert(frameCount === 1, "Still Surface must decode to exactly one frame");
+ } else {
+ assert(frameCount === options.surface.timing.frameCount,
+ "Surface decoded frame count differs from its declaration");
+ const rate = rational(stream.avg_frame_rate ?? stream.r_frame_rate, "Surface frame rate");
+ assert(sameRational(rate, options.surface.timing.frameRate),
+ "Surface decoded frame rate differs from its declaration");
+ }
} finally {
await rm(directory, { recursive: true, force: true }).catch(() => {});
}
diff --git a/packages/media-execution/test/surface.test.ts b/packages/media-execution/test/surface.test.ts
index a2aaf152..f407e733 100644
--- a/packages/media-execution/test/surface.test.ts
+++ b/packages/media-execution/test/surface.test.ts
@@ -44,7 +44,7 @@ function surface(bytes: Uint8Array, options: {
};
}
-test("Surface byte verification proves exact still/video facts and rejects contradictory declarations", {
+test("Surface byte admission accepts matching still/video bytes and rejects contradictions", {
skip: !hasMediaTools,
}, async () => {
const directory = await mkdtemp(join(tmpdir(), "svml-surface-test-"));
@@ -72,14 +72,9 @@ test("Surface byte verification proves exact still/video facts and rejects contr
timing: { kind: "frames", frameRate: { numerator: 4, denominator: 1 }, frameCount: 4 },
});
- const evidence = await verifyCompositableSurfaceBytes({ surface: opaqueSurface, bytes: opaque });
- assert.equal(evidence.contract, "svml.compositable-surface-byte-verification@1");
- assert.equal(evidence.artifactDigest, opaqueSurface.artifact.digest);
- assert.deepEqual(evidence.observed.timing, { kind: "still" });
- assert.equal((await verifyCompositableSurfaceBytes({ surface: alphaSurface, bytes: alpha }))
- .observed.alphaMode, "straight");
- assert.deepEqual((await verifyCompositableSurfaceBytes({ surface: videoSurface, bytes: video }))
- .observed.timing, { kind: "frames", frameRate: { numerator: 4, denominator: 1 }, frameCount: 4 });
+ await verifyCompositableSurfaceBytes({ surface: opaqueSurface, bytes: opaque });
+ await verifyCompositableSurfaceBytes({ surface: alphaSurface, bytes: alpha });
+ await verifyCompositableSurfaceBytes({ surface: videoSurface, bytes: video });
await assert.rejects(
verifyCompositableSurfaceBytes({ surface: { ...opaqueSurface, width: 9 }, bytes: opaque }),
diff --git a/packages/media-pipeline/src/activation.ts b/packages/media-pipeline/src/activation.ts
index 0d6f9255..81a38fe0 100644
--- a/packages/media-pipeline/src/activation.ts
+++ b/packages/media-pipeline/src/activation.ts
@@ -4,41 +4,31 @@ import {
decodeExtractAudioSurface,
decodeExtractFrameSurface,
decodeTransformMediaSurface,
- mediaOperationSurfaceImplementationDigests,
mediaPipelineComponent,
mediaPipelineManifest,
mediaPipelineModuleRef,
- synchronizedMediaSurfaceImplementationDigest,
+ mediaPipelineMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/media-pipeline",
- modules: [{ manifest: mediaPipelineManifest, specifiers: [mediaPipelineModuleRef.name, `${mediaPipelineModuleRef.name}@1`] }],
+ modules: [{ manifest: mediaPipelineManifest }],
components: [mediaPipelineComponent],
hostFacets: [createMarkupSurfaceHostFacet({
module: mediaPipelineModuleRef,
- surface: "synchronized-media",
- mode: "structured",
- implementationDigest: synchronizedMediaSurfaceImplementationDigest,
+ declaration: mediaPipelineMarkupSurfaces.find((item) => item.name === "synchronized-media")!,
handler: decodeSynchronizedMediaSurface,
}), createMarkupSurfaceHostFacet({
module: mediaPipelineModuleRef,
- surface: "transform-media",
- mode: "structured",
- implementationDigest: mediaOperationSurfaceImplementationDigests.transform,
+ declaration: mediaPipelineMarkupSurfaces.find((item) => item.name === "transform-media")!,
handler: decodeTransformMediaSurface,
}), createMarkupSurfaceHostFacet({
module: mediaPipelineModuleRef,
- surface: "extract-audio",
- mode: "structured",
- implementationDigest: mediaOperationSurfaceImplementationDigests.extractAudio,
+ declaration: mediaPipelineMarkupSurfaces.find((item) => item.name === "extract-audio")!,
handler: decodeExtractAudioSurface,
}), createMarkupSurfaceHostFacet({
module: mediaPipelineModuleRef,
- surface: "extract-frame",
- mode: "structured",
- implementationDigest: mediaOperationSurfaceImplementationDigests.extractFrame,
+ declaration: mediaPipelineMarkupSurfaces.find((item) => item.name === "extract-frame")!,
handler: decodeExtractFrameSurface,
})],
};
diff --git a/packages/media-pipeline/src/component.ts b/packages/media-pipeline/src/component.ts
index 84217731..c6d09c2d 100644
--- a/packages/media-pipeline/src/component.ts
+++ b/packages/media-pipeline/src/component.ts
@@ -72,7 +72,6 @@ function requestForProgram(space: ProgramSpace, audio: "default" | "none"): Medi
}
export const mediaPipelineComponent = {
- name: "@narratage/media-pipeline",
validators: [
{
type: mediaPipelineTypes.selectionRequest,
@@ -270,16 +269,8 @@ export const mediaPipelineComponent = {
size: audio.audio.size,
mediaType: audio.audio.mediaType,
},
- sourceSampleRate: 48_000,
- sourceChannels: 2,
- sourceCodec: "pcm_s16le",
sourceSampleFrames,
- evidenceSampleRate: 16_000,
- evidenceChannels: 1,
- evidenceCodec: "pcm_s16le",
evidenceSampleFrames,
- durationSec: audio.programSpace.durationSec,
- segments: audio.segments,
};
return { outputs: {}, needs: { evidenceAudio: canonicalize(need) } };
},
diff --git a/packages/media-pipeline/src/fragment.ts b/packages/media-pipeline/src/fragment.ts
index 695506fd..c3359cd4 100644
--- a/packages/media-pipeline/src/fragment.ts
+++ b/packages/media-pipeline/src/fragment.ts
@@ -11,7 +11,6 @@ const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
export const synchronizedMediaFragment = sealGraphFragment({
- name: "@narratage/media-pipeline/synchronized-media@1",
inputs: [
{ name: "source", type: artifactTypes.blob },
{ name: "request", type: mediaPipelineTypes.selectionRequest },
@@ -49,7 +48,6 @@ export const synchronizedMediaFragment = sealGraphFragment({
});
export const transformMediaFragment = sealGraphFragment({
- name: "@narratage/media-pipeline/transform-media@1",
inputs: [
{ name: "source", type: artifactTypes.blob },
{ name: "selection", type: mediaPipelineTypes.selectionRequest },
@@ -94,7 +92,6 @@ export const transformMediaFragment = sealGraphFragment({
});
export const extractAudioFragment = sealGraphFragment({
- name: "@narratage/media-pipeline/extract-audio@1",
inputs: [
{ name: "source", type: artifactTypes.blob },
{ name: "request", type: mediaPipelineTypes.audioExtractionRequest },
@@ -121,7 +118,6 @@ export const extractAudioFragment = sealGraphFragment({
});
export const extractFrameFragment = sealGraphFragment({
- name: "@narratage/media-pipeline/extract-frame@1",
inputs: [
{ name: "source", type: artifactTypes.blob },
{ name: "request", type: mediaPipelineTypes.frameExtractionRequest },
diff --git a/packages/media-pipeline/src/index.ts b/packages/media-pipeline/src/index.ts
index 7f613e16..f51b85ad 100644
--- a/packages/media-pipeline/src/index.ts
+++ b/packages/media-pipeline/src/index.ts
@@ -16,7 +16,7 @@ export {
export {
mediaPipelineCapabilities,
mediaPipelineImplementationDigests,
- mediaPipelineManifest,
+ mediaPipelineManifest, mediaPipelineMarkupSurfaces,
mediaPipelineManifestDigest,
mediaPipelineModuleRef,
mediaPipelineProducers,
diff --git a/packages/media-pipeline/src/manifest.ts b/packages/media-pipeline/src/manifest.ts
index 98af6dc6..2e2c771b 100644
--- a/packages/media-pipeline/src/manifest.ts
+++ b/packages/media-pipeline/src/manifest.ts
@@ -230,6 +230,30 @@ export const audioProgramPlanSchema: ValueSchema = {
},
};
+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",
name: mediaPipelineModuleRef.name,
@@ -246,10 +270,7 @@ export const mediaPipelineManifest: ModuleManifest = {
name: mediaPipelineTypes.selectionRequest.name,
schema: mediaSelectionRequestSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/validate-selection-request",
digest: mediaPipelineImplementationDigests.requestValidator,
},
},
@@ -258,10 +279,7 @@ export const mediaPipelineManifest: ModuleManifest = {
name: mediaPipelineTypes.audioProgramPlan.name,
schema: audioProgramPlanSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/validate-audio-program-plan",
digest: mediaPipelineImplementationDigests.audioPlanValidator,
},
},
@@ -270,10 +288,7 @@ export const mediaPipelineManifest: ModuleManifest = {
name: mediaPipelineTypes.transformProgram.name,
schema: mediaTransformProgramSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/validate-media-transform-program",
digest: mediaPipelineImplementationDigests.transformProgramValidator,
},
},
@@ -282,10 +297,7 @@ export const mediaPipelineManifest: ModuleManifest = {
name: mediaPipelineTypes.audioExtractionRequest.name,
schema: audioExtractionRequestSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/validate-audio-extraction-request",
digest: mediaPipelineImplementationDigests.audioExtractionValidator,
},
},
@@ -294,10 +306,7 @@ export const mediaPipelineManifest: ModuleManifest = {
name: mediaPipelineTypes.frameExtractionRequest.name,
schema: frameExtractionRequestSchema,
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/validate-frame-extraction-request",
digest: mediaPipelineImplementationDigests.frameExtractionValidator,
},
},
@@ -313,28 +322,6 @@ export const mediaPipelineManifest: ModuleManifest = {
{ name: mediaPipelineCapabilities.renderAudio.name, returns: mediaTypes.timelineAudio },
{ name: mediaPipelineCapabilities.mux.name, returns: mediaTypes.muxed },
],
- surfaces: [
- {
- name: "synchronized-media", tag: "Normalize", mode: "structured",
- outputs: [mediaPipelineTypes.selectionRequest, mediaTypes.synchronized],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media-pipeline/synchronized-media-surface", digest: synchronizedMediaSurfaceImplementationDigest },
- },
- {
- name: "transform-media", tag: "Transform", mode: "structured",
- outputs: [mediaPipelineTypes.selectionRequest, mediaPipelineTypes.transformProgram, artifactTypes.blob],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media-pipeline/transform-media-surface", digest: mediaOperationSurfaceImplementationDigests.transform },
- },
- {
- name: "extract-audio", tag: "ExtractAudio", mode: "structured",
- outputs: [mediaPipelineTypes.audioExtractionRequest, artifactTypes.blob],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media-pipeline/extract-audio-surface", digest: mediaOperationSurfaceImplementationDigests.extractAudio },
- },
- {
- name: "extract-frame", tag: "ExtractFrame", mode: "structured",
- outputs: [mediaPipelineTypes.frameExtractionRequest, artifactTypes.blob],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media-pipeline/extract-frame-surface", digest: mediaOperationSurfaceImplementationDigests.extractFrame },
- },
- ],
producers: [
{
name: mediaPipelineProducers.bindVisualRequest.name,
@@ -342,8 +329,6 @@ export const mediaPipelineManifest: ModuleManifest = {
outputs: [{ name: "request", type: mediaPipelineTypes.selectionRequest }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/bind-visual-media-request-to-program",
digest: mediaPipelineImplementationDigests.bindVisualRequest,
},
},
@@ -353,8 +338,6 @@ export const mediaPipelineManifest: ModuleManifest = {
outputs: [{ name: "request", type: mediaPipelineTypes.selectionRequest }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/bind-av-media-request-to-program",
digest: mediaPipelineImplementationDigests.bindAvRequest,
},
},
@@ -368,8 +351,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: mediaTypes.inspection,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-media-inspection",
digest: mediaPipelineImplementationDigests.inspect,
},
},
@@ -385,8 +366,6 @@ export const mediaPipelineManifest: ModuleManifest = {
}],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/select-media-streams",
digest: mediaPipelineImplementationDigests.select,
},
},
@@ -405,8 +384,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: mediaTypes.synchronized,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-media-normalization",
digest: mediaPipelineImplementationDigests.normalize,
},
},
@@ -423,8 +400,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: artifactTypes.blob,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-media-transform",
digest: mediaPipelineImplementationDigests.transform,
},
},
@@ -442,8 +417,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: artifactTypes.blob,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-audio-extraction",
digest: mediaPipelineImplementationDigests.extractAudio,
},
},
@@ -461,8 +434,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: artifactTypes.blob,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-frame-extraction",
digest: mediaPipelineImplementationDigests.extractFrame,
},
},
@@ -476,8 +447,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: speechTypes.evidenceAudio,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-speech-evidence-audio",
digest: mediaPipelineImplementationDigests.projectSpeechEvidenceAudio,
},
},
@@ -490,8 +459,6 @@ export const mediaPipelineManifest: ModuleManifest = {
outputs: [{ name: "plan", type: mediaPipelineTypes.audioProgramPlan }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/compile-audio-program",
digest: mediaPipelineImplementationDigests.planAudio,
},
},
@@ -505,8 +472,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: mediaTypes.timelineAudio,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-audio-render",
digest: mediaPipelineImplementationDigests.renderAudio,
},
},
@@ -523,8 +488,6 @@ export const mediaPipelineManifest: ModuleManifest = {
returns: mediaTypes.muxed,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/request-media-mux",
digest: mediaPipelineImplementationDigests.mux,
},
},
@@ -534,8 +497,6 @@ export const mediaPipelineManifest: ModuleManifest = {
outputs: [{ name: "video", type: artifactTypes.blob }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/media-pipeline/project-muxed-media",
digest: mediaPipelineImplementationDigests.projectMuxed,
},
},
diff --git a/packages/media-pipeline/src/types.ts b/packages/media-pipeline/src/types.ts
index 52336473..8329fd70 100644
--- a/packages/media-pipeline/src/types.ts
+++ b/packages/media-pipeline/src/types.ts
@@ -1,6 +1,5 @@
import type { BlobRef } from "@narratage/protocol";
import type { MediaInspection, MediaRational, MediaStreamSelection, RenderedVisual, TimelineAudio } from "@narratage/media";
-import type { SpeechBasisSegment } from "@narratage/speech";
export type MediaSelectionRequest = {
readonly contract: "svml.media-selection-request@1";
@@ -112,16 +111,8 @@ export type NormalizeMediaNeed = {
export type ProjectSpeechEvidenceAudioNeed = {
readonly contract: "svml.project-speech-evidence-audio-request@1";
readonly source: BlobRef;
- readonly sourceSampleRate: 48_000;
- readonly sourceChannels: 2;
- readonly sourceCodec: "pcm_s16le";
readonly sourceSampleFrames: number;
- readonly evidenceSampleRate: 16_000;
- readonly evidenceChannels: 1;
- readonly evidenceCodec: "pcm_s16le";
readonly evidenceSampleFrames: number;
- readonly durationSec: number;
- readonly segments: readonly SpeechBasisSegment[];
};
export type AudioProgramClip = {
diff --git a/packages/media-track/src/activation.ts b/packages/media-track/src/activation.ts
index 249d5ca8..4eb355c2 100644
--- a/packages/media-track/src/activation.ts
+++ b/packages/media-track/src/activation.ts
@@ -4,19 +4,16 @@ import {
mediaTrackComponent,
mediaTrackManifest,
mediaTrackModuleRef,
- mediaTrackSurfaceImplementationDigest,
+ mediaTrackMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/media-track",
- modules: [{ manifest: mediaTrackManifest, specifiers: [mediaTrackModuleRef.name, `${mediaTrackModuleRef.name}@1`] }],
+ modules: [{ manifest: mediaTrackManifest }],
components: [mediaTrackComponent],
hostFacets: [createMarkupSurfaceHostFacet({
module: mediaTrackModuleRef,
- surface: "track",
- mode: "structured",
- implementationDigest: mediaTrackSurfaceImplementationDigest,
+ declaration: mediaTrackMarkupSurfaces.find((item) => item.name === "track")!,
handler: decodeMediaTrackSurface,
})],
};
diff --git a/packages/media-track/src/component.ts b/packages/media-track/src/component.ts
index 2bac8700..a96a1240 100644
--- a/packages/media-track/src/component.ts
+++ b/packages/media-track/src/component.ts
@@ -104,7 +104,6 @@ function sequenceInputs(inputs: ProducerHandlerContext["inputs"]) {
}
export const mediaTrackComponent = {
- name: "@narratage/media-track",
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(
diff --git a/packages/media-track/src/fragment.ts b/packages/media-track/src/fragment.ts
index 18c8b3a1..782b8848 100644
--- a/packages/media-track/src/fragment.ts
+++ b/packages/media-track/src/fragment.ts
@@ -11,7 +11,6 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
/** Minimal complete graph witness; richer Surfaces generate the same primitive operations dynamically. */
export const stillMediaTrackFragment = sealGraphFragment({
- name: "@narratage/media-track/one-full-still@1",
inputs: [
{ name: "header", type: mediaTrackTypes.header },
{ name: "space", type: programSpaceTypes.programSpace },
@@ -48,7 +47,6 @@ export const stillMediaTrackFragment = sealGraphFragment({
});
export const renderMediaTrackFragment = sealGraphFragment({
- name: "@narratage/media-track/project-visual@1",
inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: mediaTrackTypes.program }],
operations: [{ id: "visual", producer: mediaTrackProducers.projectVisual, inputs: { space: input("space"), program: input("program") }, result: { kind: "output", name: "track" } }],
exports: [{ name: "track", type: compositionTypes.visualTrack, root: operation("visual") }],
diff --git a/packages/media-track/src/index.ts b/packages/media-track/src/index.ts
index b8ff5fca..c49574af 100644
--- a/packages/media-track/src/index.ts
+++ b/packages/media-track/src/index.ts
@@ -38,7 +38,7 @@ export {
mediaSequenceSpecSchema,
mediaTrackDependency,
mediaTrackHeaderSchema,
- mediaTrackManifest,
+ mediaTrackManifest, mediaTrackMarkupSurfaces,
mediaTrackManifestDigest,
mediaTrackModuleRef,
mediaTrackProducers,
diff --git a/packages/media-track/src/manifest.ts b/packages/media-track/src/manifest.ts
index 1e85512d..69b408b9 100644
--- a/packages/media-track/src/manifest.ts
+++ b/packages/media-track/src/manifest.ts
@@ -238,7 +238,7 @@ export const mediaSequenceSpecSchema: ValueSchema = object({
});
const frameSpan = object({ startFrame: { schema: unsignedInteger }, endFrameExclusive: { schema: positiveInteger } });
const resolvedItem = object({
- id: { schema: string }, sourceOccurrenceId: { schema: string }, span: { schema: frameSpan }, frame: { schema: spatialFrameSchema },
+ id: { schema: string }, span: { schema: frameSpan }, frame: { schema: spatialFrameSchema },
presentation: { schema: mediaFramePresentationSchema }, layers: { schema: { kind: "array", minItems: 1, items: layer } }, motion: { schema: mediaLifecycleMotionSchema },
stacking: { schema: object({ order: { schema: integer }, tieBreak: { schema: string } }) },
sourceAudio: { schema: object({ fromLayer: { schema: string }, gain: { schema: unsigned } }), optional: true },
@@ -270,9 +270,8 @@ export const mediaTrackHeaderSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.media-track-header@1" } }, id: { schema: string },
});
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({
- abi: "svml.type-validator@1" as const,
- implementation: { kind: "registered" as const, locator, digest },
+const validator = (digest: ReturnType<typeof digestOf>) => ({
+ implementation: { digest },
});
const itemInputs = [
{ name: "set", type: mediaTrackTypes.set }, { name: "header", type: mediaTrackTypes.header },
@@ -293,6 +292,17 @@ const sequenceInputs = [
{ name: "sounds", type: mediaTrackTypes.soundSet },
] as const;
+export const mediaTrackMarkupSurfaces = [{
+ name: "track", tag: "Track", mode: "structured",
+ outputs: [spatialTypes.fit, mediaTrackTypes.header, mediaTrackTypes.paintLayerSpec, mediaTrackTypes.sampleLayerSpec,
+ mediaTrackTypes.layerSet, mediaTrackTypes.soundSpec, mediaTrackTypes.soundSet,
+ 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",
name: mediaTrackModuleRef.name,
@@ -321,44 +331,35 @@ export const mediaTrackManifest: ModuleManifest = {
{ 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("@narratage/media-track/validate-program", mediaTrackValidatorDigests.program) },
+ { name: mediaTrackTypes.program.name, schema: mediaTrackProgramSchema, validator: validator(mediaTrackValidatorDigests.program) },
],
capabilities: [],
- surfaces: [{
- name: "track", tag: "Track", mode: "structured",
- outputs: [spatialTypes.fit, mediaTrackTypes.header, mediaTrackTypes.paintLayerSpec, mediaTrackTypes.sampleLayerSpec,
- mediaTrackTypes.layerSet, mediaTrackTypes.soundSpec, mediaTrackTypes.soundSet,
- mediaTrackTypes.itemSpec, mediaTrackTypes.memberSpec, mediaTrackTypes.memberSet,
- mediaTrackTypes.handoffSpec, mediaTrackTypes.sequenceSpec, mediaTrackTypes.set, mediaTrackTypes.program,
- compositionTypes.visualTrack, compositionTypes.audioTrack],
- implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media-track/track-surface", digest: mediaTrackSurfaceImplementationDigest },
- }],
producers: [
- { name: mediaTrackProducers.createLayers.name, inputs: [], outputs: [{ name: "layers", type: mediaTrackTypes.layerSet }], needs: [], implementation: { kind: "registered", locator: "@narratage/media-track/create-layers", 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: { kind: "registered", locator: "@narratage/media-track/append-paint-layer", 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: { kind: "registered", locator: "@narratage/media-track/append-still-layer", 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: { kind: "registered", locator: "@narratage/media-track/append-timed-layer", 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: { kind: "registered", locator: "@narratage/media-track/append-surface-layer", digest: mediaTrackImplementationDigests.appendSurfaceLayer } },
- { name: mediaTrackProducers.createSounds.name, inputs: [], outputs: [{ name: "sounds", type: mediaTrackTypes.soundSet }], needs: [], implementation: { kind: "registered", locator: "@narratage/media-track/create-sounds", 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: { kind: "registered", locator: "@narratage/media-track/append-sound", digest: mediaTrackImplementationDigests.appendSound } },
- { name: mediaTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { kind: "registered", locator: "@narratage/media-track/create-set", digest: mediaTrackImplementationDigests.createSet } },
- { name: mediaTrackProducers.appendProgramItem.name, inputs: [...itemInputs], outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { kind: "registered", locator: "@narratage/media-track/append-program-item", 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: { kind: "registered", locator: "@narratage/media-track/append-selection-item", 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: { kind: "registered", locator: "@narratage/media-track/append-segment-item", 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: { kind: "registered", locator: "@narratage/media-track/append-moment-item", 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: { kind: "registered", locator: "@narratage/media-track/bind-item-clip-path", 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: { kind: "registered", locator: "@narratage/media-track/bind-sequence-clip-path", digest: mediaTrackImplementationDigests.bindSequenceClipPath } },
- { name: mediaTrackProducers.createMembers.name, inputs: [], outputs: [{ name: "members", type: mediaTrackTypes.memberSet }], needs: [], implementation: { kind: "registered", locator: "@narratage/media-track/create-members", 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: { kind: "registered", locator: "@narratage/media-track/append-moment-member", 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: { kind: "registered", locator: "@narratage/media-track/append-selection-start-member", 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: { kind: "registered", locator: "@narratage/media-track/append-selection-end-member", digest: mediaTrackImplementationDigests.appendSelectionEndMember } },
- { name: mediaTrackProducers.appendSequenceProgramEnd.name, inputs: sequenceInputs, outputs: [{ name: "set", type: mediaTrackTypes.set }], needs: [], implementation: { kind: "registered", locator: "@narratage/media-track/append-sequence-program-end", 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: { kind: "registered", locator: "@narratage/media-track/append-sequence-until-moment", 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: { kind: "registered", locator: "@narratage/media-track/append-sequence-until-selection-start", 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: { kind: "registered", locator: "@narratage/media-track/append-sequence-until-selection-end", 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: { kind: "registered", locator: "@narratage/media-track/finalize", 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: { kind: "registered", locator: "@narratage/media-track/project-visual", 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: { kind: "registered", locator: "@narratage/media-track/project-audio", digest: mediaTrackImplementationDigests.projectAudio } },
+ { 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 } },
],
};
diff --git a/packages/media-track/src/program.ts b/packages/media-track/src/program.ts
index f718a97d..42977c4d 100644
--- a/packages/media-track/src/program.ts
+++ b/packages/media-track/src/program.ts
@@ -220,7 +220,6 @@ function realizedItems(
const motion = resolveMediaLifecycleMotion(spec.motion, frame, canvas);
return {
id: occurrence.id,
- sourceOccurrenceId: occurrence.sourceOccurrenceId,
span: { ...occurrence.span },
frame: { ...frame },
presentation: structuredClone(spec.presentation),
@@ -325,7 +324,6 @@ function assertSampleLayerForSpace(layer: MediaSampleLayerProgram, space: Progra
function assertItem(item: MediaItemProgram, space: ProgramSpace, label: string): void {
assertMediaIdentity(item.id, `${label}.id`);
- assert(item.sourceOccurrenceId.length > 0, `${label}.sourceOccurrenceId is empty.`);
assert(Number.isSafeInteger(item.span.startFrame) && Number.isSafeInteger(item.span.endFrameExclusive)
&& item.span.startFrame >= 0 && item.span.endFrameExclusive > item.span.startFrame
&& item.span.endFrameExclusive <= programSpaceFrameCount(space), `${label}.span is invalid.`);
diff --git a/packages/media-track/src/restricted-speech.ts b/packages/media-track/src/restricted-speech.ts
index fc051b6a..9ba3ed35 100644
--- a/packages/media-track/src/restricted-speech.ts
+++ b/packages/media-track/src/restricted-speech.ts
@@ -53,7 +53,6 @@ export function lowerRestrictedSpeechVisualPresents(
}
const item: MediaItemProgram = {
id: `${trackId}:${clip.id}`,
- sourceOccurrenceId: clip.id,
span: { ...clip.span },
frame: structuredClone(clip.frame),
presentation: {
diff --git a/packages/media-track/src/sequence.ts b/packages/media-track/src/sequence.ts
index b7f57bb8..d60455e6 100644
--- a/packages/media-track/src/sequence.ts
+++ b/packages/media-track/src/sequence.ts
@@ -262,7 +262,7 @@ export function resolveMediaSequence(
`Media Sequence ${spec.id} has overlapping Handoffs.`);
}
const members: MediaSequenceMemberProgram[] = memberSet.members.map((member, index) => {
- const logicalSpan = schedule.exclusive[index]!.span;
+ const logicalSpan = schedule.exclusive[index]!;
const incoming = handoffs[index - 1];
const outgoing = handoffs[index];
const visualSpan = {
@@ -400,7 +400,6 @@ export function lowerMediaSequencePresents(
const outgoing = sequence.handoffs[index];
const item: MediaItemProgram = {
id: `${sequence.id}:${member.id}`,
- sourceOccurrenceId: member.id,
span: { ...member.visualSpan },
frame: { ...sequence.frame },
presentation: structuredClone(sequence.presentation),
diff --git a/packages/media-track/src/surface.ts b/packages/media-track/src/surface.ts
index dcd7052d..bf0e2d06 100644
--- a/packages/media-track/src/surface.ts
+++ b/packages/media-track/src/surface.ts
@@ -351,7 +351,7 @@ function appendSounds(operations: FragmentOperation[], prefix: string, sounds: r
return current;
}
-function createMediaTrackSurfaceFragment(inputTypes: readonly { readonly name: string; readonly type: TypeRef }[], items: readonly FragmentItem[], sequences: readonly FragmentSequence[], name: string, audio: boolean) {
+function createMediaTrackSurfaceFragment(inputTypes: readonly { readonly name: string; readonly type: TypeRef }[], items: readonly FragmentItem[], sequences: readonly FragmentSequence[], audio: boolean) {
const operations: FragmentOperation[] = [{ id: "track:set:empty", producer: mediaTrackProducers.createSet, inputs: {}, result: { kind: "output", name: "set" } }];
let set = "track:set:empty";
for (const item of items) {
@@ -430,7 +430,6 @@ function createMediaTrackSurfaceFragment(inputTypes: readonly { readonly name: s
);
if (audio) operations.push({ id: "track:audio", producer: mediaTrackProducers.projectAudio, inputs: { space: input("space"), program: operation("track:finalize") }, result: { kind: "output", name: "track" } });
return sealGraphFragment({
- name,
inputs: inputTypes,
operations,
exports: [
@@ -886,7 +885,7 @@ export const decodeMediaTrackSurface: StructuredSurfaceHandler = ({ element, res
} else if (element.attributes.map !== undefined) {
throw new Error(`${element.name}.map is unused because no child consumes semantic timing.`);
}
- const fragment = createMediaTrackSurfaceFragment(state.inputTypes, items, sequences, `@narratage/media-track/surface/${trackId}@1`, hasAudio);
+ const fragment = createMediaTrackSurfaceFragment(state.inputTypes, items, sequences, hasAudio);
return {
records: state.records,
components: [{ id: trackId, fragment: fragment.id, inputs: state.inputs,
diff --git a/packages/media-track/src/types.ts b/packages/media-track/src/types.ts
index 420ca5f8..eecf4c26 100644
--- a/packages/media-track/src/types.ts
+++ b/packages/media-track/src/types.ts
@@ -1,4 +1,4 @@
-import type { AudioTrack, FrameSpan, VisualTrack } from "@narratage/composition";
+import type { FrameSpan } from "@narratage/composition";
import type { CompositableSurfaceRef, MediaRational } from "@narratage/media";
import type { BlobRef } from "@narratage/protocol";
import type {
@@ -233,7 +233,6 @@ export type MediaItemSpec = {
export type MediaItemProgram = {
readonly id: string;
- readonly sourceOccurrenceId: string;
readonly span: FrameSpan;
readonly frame: SpatialFrame;
readonly presentation: MediaFramePresentation;
@@ -326,13 +325,3 @@ export type MediaTrackSet = {
readonly items: readonly MediaItemProgram[];
readonly sequences: readonly MediaSequenceProgram[];
};
-
-export type MediaVisualProjection = {
- readonly contract: "svml.media-visual-projection@1";
- readonly track: VisualTrack;
-};
-
-export type MediaAudioProjection = {
- readonly contract: "svml.media-audio-projection@1";
- readonly track: AudioTrack;
-};
diff --git a/packages/media-track/test/media-track.test.ts b/packages/media-track/test/media-track.test.ts
index 07e078ed..585bf3b6 100644
--- a/packages/media-track/test/media-track.test.ts
+++ b/packages/media-track/test/media-track.test.ts
@@ -44,6 +44,7 @@ import {
sealMediaTrackHeader,
stillMediaTrackFragment,
mediaTrackManifest,
+ mediaTrackMarkupSurfaces,
} from "@narratage/media-track";
import type {
MediaHandoffOperator,
@@ -443,10 +444,10 @@ test("Media Items consume the shared one/each temporal algebra without becoming
contract: "svml.complete-semantic-map@1",
tokens: [],
anchors: [
- { identity: "a", timeSec: 0.5, frame: 15 },
- { identity: "b", timeSec: 1.5, frame: 45 },
- { identity: "c", timeSec: 2, frame: 60 },
- { identity: "d", timeSec: 3.5, frame: 105 },
+ { identity: "a", frame: 15 },
+ { identity: "b", frame: 45 },
+ { identity: "c", frame: 60 },
+ { identity: "d", frame: 105 },
],
};
const selection: NarrativeSelectionRef = {
@@ -543,8 +544,8 @@ test("a Media Item can consume one whole Narrative Segment without a synthetic S
contract: "svml.complete-semantic-map@1",
tokens: [],
anchors: [
- { identity: "segment:answer:start", timeSec: 1, frame: 30 },
- { identity: "segment:answer:end", timeSec: 3, frame: 90 },
+ { identity: "segment:answer:start", frame: 30 },
+ { identity: "segment:answer:end", frame: 90 },
],
};
const result = appendSegmentMediaItem(
@@ -771,7 +772,7 @@ test("the Media author Surface emits explicit graph edges for layers, semantic t
? itemSpecs[2]!.value.value as unknown as MediaItemSpec
: undefined;
assert.equal(selected?.sourceAudio?.fromLayer, "video");
- assert.ok(mediaTrackManifest.surfaces.some((surface) => surface.name === "track"));
+ assert.ok(mediaTrackMarkupSurfaces.some((surface) => surface.name === "track"));
});
test("Sequence resolves strict logical phases, expanded handoffs and one uninterrupted outer lifecycle", () => {
diff --git a/packages/media/src/activation.ts b/packages/media/src/activation.ts
index 1c25a7b4..8b265320 100644
--- a/packages/media/src/activation.ts
+++ b/packages/media/src/activation.ts
@@ -4,34 +4,27 @@ import {
decodeMediaAudioSurface, decodeMediaFontSurface, decodeMediaImageSurface, mediaComponent,
mediaManifest,
mediaModuleRef,
- mediaSurfaceImplementationDigests,
+ mediaMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/media",
- modules: [{ manifest: mediaManifest, specifiers: ["@narratage/media", "@narratage/media@1"] }],
+ modules: [{ manifest: mediaManifest }],
components: [mediaComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
module: mediaModuleRef,
- surface: "image",
- mode: "structured",
- implementationDigest: mediaSurfaceImplementationDigests.image,
+ declaration: mediaMarkupSurfaces.find((item) => item.name === "image")!,
handler: decodeMediaImageSurface,
}),
createMarkupSurfaceHostFacet({
module: mediaModuleRef,
- surface: "audio",
- mode: "structured",
- implementationDigest: mediaSurfaceImplementationDigests.audio,
+ declaration: mediaMarkupSurfaces.find((item) => item.name === "audio")!,
handler: decodeMediaAudioSurface,
}),
createMarkupSurfaceHostFacet({
module: mediaModuleRef,
- surface: "font",
- mode: "structured",
- implementationDigest: mediaSurfaceImplementationDigests.font,
+ declaration: mediaMarkupSurfaces.find((item) => item.name === "font")!,
handler: decodeMediaFontSurface,
}),
],
diff --git a/packages/media/src/component.ts b/packages/media/src/component.ts
index 8414ba92..a2e458de 100644
--- a/packages/media/src/component.ts
+++ b/packages/media/src/component.ts
@@ -3,7 +3,6 @@ import { verifyMediaInspection, verifyMediaStreamSelection, verifyMuxedMedia, ve
import { mediaTypes, mediaValidatorDigests } 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 = {
- name: "@narratage/media",
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")) },
diff --git a/packages/media/src/identity.ts b/packages/media/src/identity.ts
index abe6ad57..b94fe76e 100644
--- a/packages/media/src/identity.ts
+++ b/packages/media/src/identity.ts
@@ -201,7 +201,6 @@ export function verifyRenderedVisual(value: unknown): asserts value is RenderedV
positiveInteger(item.canvas?.height, "RenderedVisual.canvas.height");
verifyBlob(item.artifact, "RenderedVisual.artifact");
assert(item.artifact.mediaType.startsWith("video/"), "RenderedVisual Artifact must be video");
- assert(item.muted === true, "RenderedVisual must be silent");
}
export function sealTimelineAudio(value: TimelineAudio): TimelineAudio {
@@ -213,10 +212,7 @@ export function verifyTimelineAudio(value: unknown): asserts value is TimelineAu
assert(item.contract === "svml.timeline-audio@1", "TimelineAudio contract is invalid");
verifyBlob(item.artifact, "TimelineAudio.artifact");
assert(item.artifact.mediaType === "audio/wav", "TimelineAudio Artifact must be WAV");
- assert(item.codec === "pcm_s16le" && item.sampleRate === 48_000 && item.channels === 2,
- "TimelineAudio PCM shape is invalid");
positiveInteger(item.sampleFrames, "TimelineAudio.sampleFrames");
- assert(item.loudness === "planned", "TimelineAudio loudness claim is invalid");
}
export function sealMuxedMedia(value: MuxedMedia): MuxedMedia {
diff --git a/packages/media/src/index.ts b/packages/media/src/index.ts
index 774077a6..9bdc35d5 100644
--- a/packages/media/src/index.ts
+++ b/packages/media/src/index.ts
@@ -5,8 +5,8 @@ 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, mediaManifestDigest, mediaModuleRef, mediaSurfaceImplementationDigests, mediaTypes, mediaValidatorDigests } from "./manifest.js";
-export { compositableSurfaceSchema, fontArtifactSchema, fontStackSchema, mediaArtifactSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
+export { mediaDependency, mediaManifest, mediaMarkupSurfaces, mediaManifestDigest, mediaModuleRef, mediaSurfaceImplementationDigests, mediaTypes, mediaValidatorDigests } 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";
export type * from "./types.js";
diff --git a/packages/media/src/manifest.ts b/packages/media/src/manifest.ts
index 64f11a52..a9ed061d 100644
--- a/packages/media/src/manifest.ts
+++ b/packages/media/src/manifest.ts
@@ -1,10 +1,10 @@
import { artifactDependency, artifactTypes } from "@narratage/artifact";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, TypeRef } from "@narratage/protocol";
-import { compositableSurfaceSchema, fontArtifactSchema, fontStackSchema, mediaArtifactSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
+import { compositableSurfaceSchema, fontArtifactSchema, fontStackSchema, mediaInspectionSchema, mediaStreamSelectionSchema, muxedMediaSchema, renderedVisualSchema, synchronizedMediaSchema, timelineAudioSchema } from "./schema.js";
export const mediaModuleRef = { name: "@narratage/media", version: "1" } as const;
export const mediaTypes = {
- artifact: { module: mediaModuleRef, name: "MediaArtifactRef" }, inspection: { module: mediaModuleRef, name: "MediaInspection" },
+ inspection: { module: mediaModuleRef, name: "MediaInspection" },
streamSelection: { module: mediaModuleRef, name: "MediaStreamSelection" }, synchronized: { module: mediaModuleRef, name: "SynchronizedMedia" },
renderedVisual: { module: mediaModuleRef, name: "RenderedVisual" }, timelineAudio: { module: mediaModuleRef, name: "TimelineAudio" },
muxed: { module: mediaModuleRef, name: "MuxedMedia" }, fontArtifact: { module: mediaModuleRef, name: "FontArtifactRef" },
@@ -21,25 +21,26 @@ export const mediaSurfaceImplementationDigests = {
audio: digestOf("@narratage/media/audio-surface@1"),
font: digestOf("@narratage/media/font-surface@1"),
} as const;
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({ abi: "svml.type-validator@1" as const, implementation: { kind: "registered" as const, locator, digest } });
+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 } },
+ ] as const;
+
export const mediaManifest: ModuleManifest = {
format: "svml.module@1", name: mediaModuleRef.name, version: mediaModuleRef.version, dependencies: [artifactDependency],
types: [
- { name: mediaTypes.artifact.name, schema: mediaArtifactSchema },
- { name: mediaTypes.inspection.name, schema: mediaInspectionSchema, validator: validator("@narratage/media/validate-media-inspection", mediaValidatorDigests.inspection) },
- { name: mediaTypes.streamSelection.name, schema: mediaStreamSelectionSchema, validator: validator("@narratage/media/validate-media-stream-selection", mediaValidatorDigests.selection) },
- { name: mediaTypes.synchronized.name, schema: synchronizedMediaSchema, validator: validator("@narratage/media/validate-synchronized-media", mediaValidatorDigests.synchronized) },
- { name: mediaTypes.renderedVisual.name, schema: renderedVisualSchema, validator: validator("@narratage/media/validate-rendered-visual", mediaValidatorDigests.renderedVisual) },
- { name: mediaTypes.timelineAudio.name, schema: timelineAudioSchema, validator: validator("@narratage/media/validate-timeline-audio", mediaValidatorDigests.timelineAudio) },
- { name: mediaTypes.muxed.name, schema: muxedMediaSchema, validator: validator("@narratage/media/validate-muxed-media", mediaValidatorDigests.muxed) },
+ { 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 },
- ], capabilities: [],
- surfaces: [
- { name: "image", tag: "Image", mode: "structured", outputs: [artifactTypes.blob], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media/image-surface", digest: mediaSurfaceImplementationDigests.image } },
- { name: "audio", tag: "Audio", mode: "structured", outputs: [artifactTypes.blob], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media/audio-surface", digest: mediaSurfaceImplementationDigests.audio } },
- { name: "font", tag: "Font", mode: "structured", outputs: [mediaTypes.fontArtifact], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/media/font-surface", digest: mediaSurfaceImplementationDigests.font } },
- ], producers: [],
+ ], capabilities: [], producers: [],
};
export const mediaManifestDigest = digestOf(mediaManifest);
export const mediaDependency = { module: mediaModuleRef, digest: mediaManifestDigest } as const;
diff --git a/packages/media/src/schema.ts b/packages/media/src/schema.ts
index 027bcdc3..502fb778 100644
--- a/packages/media/src/schema.ts
+++ b/packages/media/src/schema.ts
@@ -7,7 +7,6 @@ const integer = { kind: "number", integer: true, minimum: 0 } as const;
// content-addressed identity wherever the value carries semantic media truth.
const digest = { kind: "string", minLength: 71, maxLength: 71 } as const;
const object = (fields: Readonly<Record<string, { readonly schema: ValueSchema; readonly optional?: boolean }>>): ValueSchema => ({ kind: "object", fields });
-export const mediaArtifactSchema = object({ digest: { schema: digest }, size: { schema: integer }, mediaType: { schema: string }, durationSec: { schema: seconds } });
const blobArtifactSchema = (mediaTypes?: readonly string[]): ValueSchema => object({
kind: { schema: { kind: "literal", value: "blob" } }, digest: { schema: digest }, size: { schema: integer },
mediaType: { schema: mediaTypes === undefined ? string : { kind: "string", enum: mediaTypes } },
@@ -53,11 +52,10 @@ export const synchronizedMediaSchema: ValueSchema = object({
export const renderedVisualSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.rendered-visual@1" } },
frameRate: { schema: rational }, frameCount: { schema: { kind: "number", integer: true, minimum: 1 } },
canvas: { schema: object({ width: { schema: { kind: "number", integer: true, minimum: 1 } }, height: { schema: { kind: "number", integer: true, minimum: 1 } } }) },
- artifact: { schema: blobArtifactSchema() }, muted: { schema: { kind: "literal", value: true } } });
+ artifact: { schema: blobArtifactSchema() } });
export const timelineAudioSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.timeline-audio@1" } },
- artifact: { schema: blobArtifactSchema(["audio/wav"]) }, codec: { schema: { kind: "literal", value: "pcm_s16le" } },
- sampleRate: { schema: { kind: "literal", value: 48_000 } }, channels: { schema: { kind: "literal", value: 2 } },
- sampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } }, loudness: { schema: { kind: "literal", value: "planned" } } });
+ artifact: { schema: blobArtifactSchema(["audio/wav"]) },
+ sampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } } });
export const muxedMediaSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.muxed-media@1" } },
frameRate: { schema: rational }, frameCount: { schema: { kind: "number", integer: true, minimum: 1 } },
canvas: { schema: object({ width: { schema: { kind: "number", integer: true, minimum: 1 } }, height: { schema: { kind: "number", integer: true, minimum: 1 } } }) },
diff --git a/packages/media/src/types.ts b/packages/media/src/types.ts
index a94da3be..4133fcb2 100644
--- a/packages/media/src/types.ts
+++ b/packages/media/src/types.ts
@@ -1,11 +1,4 @@
-import type { BlobRef, Digest } from "@narratage/protocol";
-
-export type MediaArtifactRef = {
- readonly digest: Digest;
- readonly size: number;
- readonly mediaType: string;
- readonly durationSec: number;
-};
+import type { BlobRef } from "@narratage/protocol";
export type MediaRational = {
readonly numerator: number;
@@ -111,18 +104,13 @@ export type RenderedVisual = {
readonly height: number;
};
readonly artifact: BlobRef;
- readonly muted: true;
};
/** Exact 48 kHz stereo PCM result of one explicit timeline-audio plan. */
export type TimelineAudio = {
readonly contract: "svml.timeline-audio@1";
readonly artifact: BlobRef;
- readonly codec: "pcm_s16le";
- readonly sampleRate: 48_000;
- readonly channels: 2;
readonly sampleFrames: number;
- readonly loudness: "planned";
};
/** Final mux result; visual rendering and program-audio preparation remain separate facts. */
diff --git a/packages/mimo-tts/package.json b/packages/mimo-tts/package.json
index 29233fc9..67b5a221 100644
--- a/packages/mimo-tts/package.json
+++ b/packages/mimo-tts/package.json
@@ -12,7 +12,6 @@
},
"dependencies": {
"@narratage/artifact": "workspace:*",
- "@narratage/elaborator": "workspace:*",
"@narratage/generation": "workspace:*",
"@narratage/model-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
diff --git a/packages/mimo-tts/src/activation.ts b/packages/mimo-tts/src/activation.ts
index 11adaf28..a33c2be5 100644
--- a/packages/mimo-tts/src/activation.ts
+++ b/packages/mimo-tts/src/activation.ts
@@ -7,26 +7,25 @@ import {
mimoTtsComponent,
mimoTtsManifest,
mimoTtsModuleRef,
- mimoTtsSurfaceDigests,
+ mimoTtsMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/mimo-tts",
- modules: [{ manifest: mimoTtsManifest, specifiers: ["@narratage/mimo-tts", "@narratage/mimo-tts@1"] }],
+ modules: [{ manifest: mimoTtsManifest }],
components: [mimoTtsComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
- module: mimoTtsModuleRef, surface: "preset", mode: "structured",
- implementationDigest: mimoTtsSurfaceDigests.preset, handler: decodeMimoPresetSurface,
+ module: mimoTtsModuleRef,
+ declaration: mimoTtsMarkupSurfaces.find((item) => item.name === "preset")!, handler: decodeMimoPresetSurface,
}),
createMarkupSurfaceHostFacet({
- module: mimoTtsModuleRef, surface: "voiceDesign", mode: "structured",
- implementationDigest: mimoTtsSurfaceDigests.voiceDesign, handler: decodeMimoVoiceDesignSurface,
+ module: mimoTtsModuleRef,
+ declaration: mimoTtsMarkupSurfaces.find((item) => item.name === "voiceDesign")!, handler: decodeMimoVoiceDesignSurface,
}),
createMarkupSurfaceHostFacet({
- module: mimoTtsModuleRef, surface: "voiceClone", mode: "structured",
- implementationDigest: mimoTtsSurfaceDigests.voiceClone, handler: decodeMimoVoiceCloneSurface,
+ module: mimoTtsModuleRef,
+ declaration: mimoTtsMarkupSurfaces.find((item) => item.name === "voiceClone")!, handler: decodeMimoVoiceCloneSurface,
}),
],
};
diff --git a/packages/mimo-tts/src/index.ts b/packages/mimo-tts/src/index.ts
index 30c6092e..404228b9 100644
--- a/packages/mimo-tts/src/index.ts
+++ b/packages/mimo-tts/src/index.ts
@@ -96,40 +96,35 @@ export const mimoTtsSurfaceDigests = {
voiceClone: digestOf("@narratage/mimo-tts/voice-clone-surface@1"),
} as const;
-export const mimoTtsManifest = {
- ...base.manifest,
- surfaces: [
- {
- name: "preset", tag: "Preset", mode: "structured",
- outputs: [mimoTtsEndpoints.preset.draftType],
- implementation: {
- kind: "trusted-frontend-surface" as const,
- locator: "@narratage/mimo-tts/preset-surface",
- digest: mimoTtsSurfaceDigests.preset,
- },
+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: {
- kind: "trusted-frontend-surface" as const,
- locator: "@narratage/mimo-tts/voice-design-surface",
- digest: mimoTtsSurfaceDigests.voiceDesign,
- },
+ },
+ {
+ name: "voiceDesign", tag: "VoiceDesign", mode: "structured",
+ outputs: [mimoTtsEndpoints.voiceDesign.draftType],
+ implementation: {
+ digest: mimoTtsSurfaceDigests.voiceDesign,
},
- {
- name: "voiceClone", tag: "VoiceClone", mode: "structured",
- outputs: [
- mimoTtsEndpoints.voiceClone.draftType,
- ...Object.values(mimoTtsEndpoints.voiceClone.mediaBindings).map((binding) => binding.type),
- ],
- implementation: {
- kind: "trusted-frontend-surface" as const,
- locator: "@narratage/mimo-tts/voice-clone-surface",
- digest: mimoTtsSurfaceDigests.voiceClone,
- },
+ },
+ {
+ name: "voiceClone", tag: "VoiceClone", mode: "structured",
+ outputs: [
+ mimoTtsEndpoints.voiceClone.draftType,
+ ...Object.values(mimoTtsEndpoints.voiceClone.mediaBindings).map((binding) => binding.type),
+ ],
+ implementation: {
+ digest: mimoTtsSurfaceDigests.voiceClone,
},
- ],
+ },
+] as const;
+
+export const mimoTtsManifest = {
+ ...base.manifest,
} as const;
export const mimoTtsManifestDigest = digestOf(mimoTtsManifest);
diff --git a/packages/mimo-tts/test/mimo-tts.test.ts b/packages/mimo-tts/test/mimo-tts.test.ts
index 8df1cb6d..3031ab11 100644
--- a/packages/mimo-tts/test/mimo-tts.test.ts
+++ b/packages/mimo-tts/test/mimo-tts.test.ts
@@ -14,6 +14,7 @@ import {
decodeMimoVoiceCloneSurface,
decodeMimoVoiceDesignSurface,
mimoTtsEndpoints,
+ mimoTtsMarkupSurfaces,
mimoTtsPorts,
sealMimoTtsRequest,
} from "../src/index.js";
@@ -68,9 +69,9 @@ 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.name, "@narratage/mimo-tts");
+ assert.equal(mimoNodePackage.format, "svml.node-package@1");
assert.equal(mimoNodePackage.modules[0]?.manifest.version, "1");
- assert.deepEqual(mimoNodePackage.modules[0]?.manifest.surfaces.map((surface) => surface.name),
+ assert.deepEqual(mimoTtsMarkupSurfaces.map((surface) => surface.name),
["preset", "voiceDesign", "voiceClone"]);
assert.equal(JSON.stringify(mimoNodePackage).includes("MIMO_API_KEY"), false);
});
diff --git a/packages/minimax-h3/src/activation.ts b/packages/minimax-h3/src/activation.ts
index cf0fa077..1a8c6dd2 100644
--- a/packages/minimax-h3/src/activation.ts
+++ b/packages/minimax-h3/src/activation.ts
@@ -1,9 +1,13 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
-import { minimaxH3Component, minimaxH3Manifest, minimaxH3ModuleRef, minimaxH3SurfaceImplementationDigests } from "./index.js";
+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, name: "@narratage/minimax-h3", modules: [{ manifest: minimaxH3Manifest, specifiers: ["@narratage/minimax-h3", "@narratage/minimax-h3@1"] }], components: [minimaxH3Component], hostFacets: [
- createMarkupSurfaceHostFacet({ module: minimaxH3ModuleRef, surface: "text-video", mode: "structured", implementationDigest: minimaxH3SurfaceImplementationDigests.textVideo, handler: decodeMinimaxTextVideoSurface }),
- createMarkupSurfaceHostFacet({ module: minimaxH3ModuleRef, surface: "frame-video", mode: "structured", implementationDigest: minimaxH3SurfaceImplementationDigests.frameVideo, handler: decodeMinimaxFrameVideoSurface }),
- createMarkupSurfaceHostFacet({ module: minimaxH3ModuleRef, surface: "reference-video", mode: "structured", implementationDigest: minimaxH3SurfaceImplementationDigests.referenceVideo, handler: decodeMinimaxReferenceVideoSurface }),
+export const svmlPackage = { format: "svml.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,
+ declaration: minimaxH3MarkupSurfaces.find((item) => item.name === "frame-video")!, handler: decodeMinimaxFrameVideoSurface }),
+ createMarkupSurfaceHostFacet({ module: minimaxH3ModuleRef,
+ declaration: minimaxH3MarkupSurfaces.find((item) => item.name === "reference-video")!, handler: decodeMinimaxReferenceVideoSurface }),
] };
export default svmlPackage;
diff --git a/packages/minimax-h3/src/index.ts b/packages/minimax-h3/src/index.ts
index e12b7bee..c586d898 100644
--- a/packages/minimax-h3/src/index.ts
+++ b/packages/minimax-h3/src/index.ts
@@ -81,15 +81,17 @@ const declaration = (
) => ({
name, tag, mode: "structured" as const,
outputs: [endpoint.draftType, ...bindings.map((port) => endpoint.mediaBindings[port]!.type)],
- implementation: { kind: "trusted-frontend-surface" as const, locator: `@narratage/minimax-h3/${name}-surface`, digest },
+ implementation: { digest },
});
-export const minimaxH3Manifest = {
- ...minimaxH3BaseDefinition.manifest,
- surfaces: [
+
+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"]),
- ],
+ ] as const;
+
+export const minimaxH3Manifest = {
+ ...minimaxH3BaseDefinition.manifest,
};
export const minimaxH3ManifestDigest = digestOf(minimaxH3Manifest);
export const minimaxH3Definition = {
diff --git a/packages/model-kit/src/index.ts b/packages/model-kit/src/index.ts
index f34f6d76..f7f1d22a 100644
--- a/packages/model-kit/src/index.ts
+++ b/packages/model-kit/src/index.ts
@@ -216,10 +216,7 @@ export function defineExactModelModule<const Key extends string>(
name: item.requestType.name,
schema: requestSchemaFromPorts(item.spec.ports),
validator: {
- abi: "svml.type-validator@1" as const,
implementation: {
- kind: "registered" as const,
- locator: `${options.module.name}/validate-${item.spec.key}`,
digest: item.validatorDigest,
},
},
@@ -228,10 +225,7 @@ export function defineExactModelModule<const Key extends string>(
name: item.draftType.name,
schema: requestDraftSchemaFromPorts(item.spec.ports),
validator: {
- abi: "svml.type-validator@1" as const,
implementation: {
- kind: "registered" as const,
- locator: `${options.module.name}/validate-${item.spec.key}-draft`,
digest: item.draftValidatorDigest,
},
},
@@ -247,7 +241,6 @@ export function defineExactModelModule<const Key extends string>(
name: item.capability.name,
returns: item.returns,
})),
- surfaces: [],
producers: endpointData.flatMap((item) => [
{
name: item.producer.name,
@@ -259,8 +252,6 @@ export function defineExactModelModule<const Key extends string>(
returns: item.returns,
}],
implementation: {
- kind: "registered" as const,
- locator: `${options.module.name}/${item.spec.key}`,
digest: item.implementationDigest,
},
},
@@ -274,8 +265,6 @@ export function defineExactModelModule<const Key extends string>(
outputs: [{ name: "draft", type: item.draftType }],
needs: [],
implementation: {
- kind: "registered" as const,
- locator: `${options.module.name}/${item.spec.key}/bind-${binding.port}`,
digest: binding.implementationDigest,
},
})),
@@ -288,8 +277,6 @@ export function defineExactModelModule<const Key extends string>(
outputs: [{ name: "draft", type: item.draftType }],
needs: [],
implementation: {
- kind: "registered" as const,
- locator: `${options.module.name}/${item.spec.key}/bind-${binding.port}-text`,
digest: binding.implementationDigest,
},
})),
@@ -299,8 +286,6 @@ export function defineExactModelModule<const Key extends string>(
outputs: [{ name: "request", type: item.requestType }],
needs: [],
implementation: {
- kind: "registered" as const,
- locator: `${options.module.name}/${item.spec.key}/finalize`,
digest: item.finalizeImplementationDigest,
},
},
@@ -309,7 +294,6 @@ export function defineExactModelModule<const Key extends string>(
const endpoints = Object.fromEntries(endpointData.map((item): [Key, ExactModelEndpoint] => {
const fragment = sealGraphFragment({
- name: `${options.module.name}/${item.spec.key}@1`,
inputs: [{ name: "request", type: item.requestType }],
operations: [{
id: "generate",
@@ -348,7 +332,6 @@ export function defineExactModelModule<const Key extends string>(
manifestDigest: digestOf(manifest),
endpoints: endpoints as Readonly<Record<Key, ExactModelEndpoint>>,
component: {
- name: options.module.name,
validators: endpointData.flatMap((item) => [{
type: item.requestType,
implementationDigest: item.validatorDigest,
@@ -534,7 +517,6 @@ export function createExactModelPrimaryGenerationFragment(
...mediaInputs.map((item) => `${item.name}=${item.port}:media`),
].join(",") || "no-dynamic-inputs";
return sealGraphFragment({
- name: `${endpoint.producer.module.name}/${endpoint.key}-assembled-primary-${result}[${shape}]@1`,
inputs,
operations,
exports: [{
diff --git a/packages/nano-banana/src/activation.ts b/packages/nano-banana/src/activation.ts
index c4834f19..852189e5 100644
--- a/packages/nano-banana/src/activation.ts
+++ b/packages/nano-banana/src/activation.ts
@@ -1,10 +1,13 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
- nanoBananaComponent, nanoBananaManifest, nanoBananaModuleRef, nanoBananaSurfaceImplementationDigests,
+ nanoBananaComponent, nanoBananaManifest, nanoBananaModuleRef,
+ nanoBananaMarkupSurfaces,
} from "./index.js";
import { decodeNanoBananaImageSurface, decodeNanoBananaProImageSurface } from "./surface.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, name: "@narratage/nano-banana", modules: [{ manifest: nanoBananaManifest, specifiers: ["@narratage/nano-banana", "@narratage/nano-banana@1"] }], components: [nanoBananaComponent], hostFacets: [
- createMarkupSurfaceHostFacet({ module: nanoBananaModuleRef, surface: "image", mode: "structured", implementationDigest: nanoBananaSurfaceImplementationDigests.image, handler: decodeNanoBananaImageSurface }),
- createMarkupSurfaceHostFacet({ module: nanoBananaModuleRef, surface: "pro-image", mode: "structured", implementationDigest: nanoBananaSurfaceImplementationDigests.proImage, handler: decodeNanoBananaProImageSurface }),
+export const svmlPackage = { format: "svml.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;
diff --git a/packages/nano-banana/src/index.ts b/packages/nano-banana/src/index.ts
index ac73af38..6af88c91 100644
--- a/packages/nano-banana/src/index.ts
+++ b/packages/nano-banana/src/index.ts
@@ -71,17 +71,17 @@ const surface = (
mode: "structured" as const,
outputs: [endpoint!.draftType, endpoint!.mediaBindings.images!.type],
implementation: {
- kind: "trusted-frontend-surface" as const,
- locator: `@narratage/nano-banana/${name}-surface`,
digest,
},
});
-export const nanoBananaManifest = {
- ...nanoBananaBaseDefinition.manifest,
- surfaces: [
+
+export const nanoBananaMarkupSurfaces = [
surface("image", "Image", nanoBananaEndpoints.v2!, nanoBananaSurfaceImplementationDigests.image),
surface("pro-image", "ProImage", nanoBananaEndpoints.pro!, nanoBananaSurfaceImplementationDigests.proImage),
- ],
+ ] as const;
+
+export const nanoBananaManifest = {
+ ...nanoBananaBaseDefinition.manifest,
};
export const nanoBananaManifestDigest = digestOf(nanoBananaManifest);
export const nanoBananaDefinition = {
diff --git a/packages/narrative/src/activation.ts b/packages/narrative/src/activation.ts
index 0c1ff268..574fca80 100644
--- a/packages/narrative/src/activation.ts
+++ b/packages/narrative/src/activation.ts
@@ -1,7 +1,6 @@
import { narrativeManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/narrative",
modules: [{ manifest: narrativeManifest }],
};
export default svmlPackage;
diff --git a/packages/narrative/src/manifest.ts b/packages/narrative/src/manifest.ts
index 6fb90733..5976fea0 100644
--- a/packages/narrative/src/manifest.ts
+++ b/packages/narrative/src/manifest.ts
@@ -32,7 +32,7 @@ export const narrativeManifest: ModuleManifest = {
{ name: narrativeTypes.captionCorrespondence.name, schema: captionCorrespondenceSchema },
{ name: narrativeTypes.captionDisplayWordSubset.name, schema: captionDisplayWordSubsetSchema },
],
- capabilities: [], surfaces: [], producers: [],
+ capabilities: [], producers: [],
};
export const narrativeManifestDigest = digestOf(narrativeManifest);
export const narrativeDependency = { module: narrativeModuleRef, digest: narrativeManifestDigest } as const;
diff --git a/packages/narrative/src/schema.ts b/packages/narrative/src/schema.ts
index e3f2fde1..1d4998d9 100644
--- a/packages/narrative/src/schema.ts
+++ b/packages/narrative/src/schema.ts
@@ -8,12 +8,12 @@ const object = (
export const narrativeSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.narrative@1" } },
segments: { schema: { kind: "array", minItems: 1, items: object({
- id: { schema: string }, index: { schema: integer }, startAnchorId: { schema: string },
+ id: { schema: string }, startAnchorId: { schema: string },
endAnchorId: { schema: string }, tokenStart: { schema: integer }, tokenEndExclusive: { schema: integer },
}) } },
tokens: { schema: { kind: "array", items: object({
- id: { schema: string }, index: { schema: integer }, segmentId: { schema: string },
- segmentTokenIndex: { schema: integer }, startAnchorId: { schema: string }, endAnchorId: { schema: string },
+ id: { schema: string }, segmentId: { schema: string },
+ startAnchorId: { schema: string }, endAnchorId: { schema: string },
text: { schema: string }, normalized: { schema: string },
}) } },
turns: { schema: { kind: "array", items: object({
@@ -36,7 +36,6 @@ export const narrativeSchema: ValueSchema = object({
id: { schema: string },
kind: { schema: { kind: "string", enum: ["segment-start", "token-start", "token-end", "segment-end"] } },
segmentId: { schema: string }, tokenId: { schema: string, optional: true },
- segmentTokenIndex: { schema: integer, optional: true },
}) } },
}) },
});
@@ -47,11 +46,11 @@ export const narrativeExcerptSchema: ValueSchema = object({
tokenStart: { schema: integer }, tokenEndExclusive: { schema: integer },
});
const captionDisplayWord = object({
- id: { schema: string }, index: { schema: integer }, atomId: { schema: string }, segmentId: { schema: string },
+ id: { schema: string }, atomId: { schema: string }, segmentId: { schema: string },
turnId: { schema: string }, role: { schema: string, optional: true }, text: { schema: string },
});
const captionDisplayAtom = object({
- id: { schema: string }, index: { schema: integer }, segmentId: { schema: string },
+ id: { schema: string }, segmentId: { schema: string },
turnId: { schema: string }, role: { schema: string, optional: true },
wordIds: { schema: { kind: "array", minItems: 1, items: string } },
});
diff --git a/packages/narrative/src/types.ts b/packages/narrative/src/types.ts
index 20eed54b..04121596 100644
--- a/packages/narrative/src/types.ts
+++ b/packages/narrative/src/types.ts
@@ -1,6 +1,5 @@
export type NarrativeSegment = {
readonly id: string;
- readonly index: number;
readonly startAnchorId: string;
readonly endAnchorId: string;
readonly tokenStart: number;
@@ -9,9 +8,7 @@ export type NarrativeSegment = {
export type NarrativeToken = {
readonly id: string;
- readonly index: number;
readonly segmentId: string;
- readonly segmentTokenIndex: number;
readonly startAnchorId: string;
readonly endAnchorId: string;
readonly text: string;
@@ -62,7 +59,6 @@ export type NarrativeMomentRef = NarrativeMoment & {
/** One author-visible word surface. Punctuation owned by the surface is preserved. */
export type CaptionDisplayWord = {
readonly id: string;
- readonly index: number;
readonly atomId: string;
readonly segmentId: string;
readonly turnId: string;
@@ -73,7 +69,6 @@ export type CaptionDisplayWord = {
/** One indivisible Cue-planning unit. Fields may still address its ordered words. */
export type CaptionDisplayAtom = {
readonly id: string;
- readonly index: number;
readonly segmentId: string;
readonly turnId: string;
readonly role?: string;
@@ -111,7 +106,6 @@ export type SemanticAnchor = {
readonly kind: "segment-start" | "token-start" | "token-end" | "segment-end";
readonly segmentId: string;
readonly tokenId?: string;
- readonly segmentTokenIndex?: number;
};
export type Narrative = {
diff --git a/packages/package-loader-node/README.md b/packages/package-loader-node/README.md
index 87730056..1361e379 100644
--- a/packages/package-loader-node/README.md
+++ b/packages/package-loader-node/README.md
@@ -1,9 +1,9 @@
# `@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, Author/Run Frontend, Host-facet, Producer and Type
+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 verified `NodePackageContribution` values.
+against their static Manifests before returning physical-package/`NodePackageContribution` bindings.
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
@@ -19,7 +19,8 @@ This package does not select an author syntax. Syntax-specific executable facets
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
-Run-specific fragment field or interpretation branch.
+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
services. Source `<import>` can select only an already installed author contribution; trusted
diff --git a/packages/package-loader-node/package.json b/packages/package-loader-node/package.json
index 573a33e2..570c563d 100644
--- a/packages/package-loader-node/package.json
+++ b/packages/package-loader-node/package.json
@@ -8,15 +8,12 @@
".": "./src/index.ts"
},
"dependencies": {
- "@narratage/compiler-node": "workspace:*",
"@narratage/component-kit": "workspace:*",
- "@narratage/elaborator": "workspace:*",
"@narratage/host": "workspace:*",
- "@narratage/protocol": "workspace:*",
- "@narratage/run": "workspace:*",
- "@narratage/validation": "workspace:*"
+ "@narratage/protocol": "workspace:*"
},
"devDependencies": {
- "@narratage/runtime-adapter": "workspace:*"
+ "@narratage/runtime-adapter": "workspace:*",
+ "@narratage/validation": "workspace:*"
}
}
diff --git a/packages/package-loader-node/src/contribution.ts b/packages/package-loader-node/src/contribution.ts
index 371ec9b5..a1b4907c 100644
--- a/packages/package-loader-node/src/contribution.ts
+++ b/packages/package-loader-node/src/contribution.ts
@@ -5,25 +5,29 @@ import {
import type {
ComponentPackage,
ProducerRegistrar,
+ TypeValidatorRegistrar,
} from "@narratage/component-kit";
-import { ModulePackageRegistry } from "@narratage/compiler-node";
-import type { RegisteredModulePackage } from "@narratage/compiler-node";
import { canonicalize } from "@narratage/protocol";
-import type { TypeValidatorRegistrar } from "@narratage/validation";
-import type { NodePackageContribution } from "./types.js";
+import type { NodeModuleContribution, NodePackageContribution } from "./types.js";
function assertPackage(value: NodePackageContribution): void {
if (value.format !== "svml.node-package@1") {
- throw new Error(`${value.name || "Node package"} has an unsupported format`);
+ throw new Error("Node package contribution has an unsupported format");
}
- if (value.name.trim().length === 0) throw new Error("Node package name must not be empty");
const hostFacets = new Set<string>();
for (const facet of value.hostFacets ?? []) {
- if (facet.abi.trim().length === 0) throw new Error(`${value.name} has an empty Host facet ABI`);
- const identity = canonicalize(facet.identity);
- const key = `${facet.abi}:${JSON.stringify(identity)}`;
- if (hostFacets.has(key)) throw new Error(`${value.name} repeats Host facet ${facet.abi}`);
+ if (facet.abi.trim().length === 0) throw new Error("Node package contribution has an empty Host facet ABI");
+ const offers = facet.offers ?? [];
+ if (offers.some((item) => item.trim().length === 0)) {
+ throw new Error(`Node package contribution has an empty logical name for Host facet ${facet.abi}`);
+ }
+ if (new Set(offers).size !== offers.length) {
+ throw new Error(`Node package contribution repeats a logical name for Host facet ${facet.abi}`);
+ }
+ const identity = facet.identity === undefined ? undefined : canonicalize(facet.identity);
+ const key = `${facet.abi}:${JSON.stringify([...offers].sort())}:${identity === undefined ? "" : JSON.stringify(identity)}`;
+ if (hostFacets.has(key)) throw new Error(`Node package contribution repeats Host facet ${facet.abi}`);
hostFacets.add(key);
}
}
@@ -40,26 +44,26 @@ function facetKey(
export function collectNodePackageComponents(
packages: readonly NodePackageContribution[],
): readonly ComponentPackage[] {
- const packageNames = new Set<string>();
- const moduleRegistry = new ModulePackageRegistry();
- const manifests = new Map<string, RegisteredModulePackage>();
- const components = new Map<string, ComponentPackage>();
+ const manifests = new Map<string, NodeModuleContribution>();
+ const moduleSpecifiers = new Map<string, string>();
+ const components: ComponentPackage[] = [];
const producers = new Set<string>();
const validators = new Set<string>();
for (const item of packages) {
assertPackage(item);
- if (packageNames.has(item.name)) throw new Error(`Node package contribution ${item.name} is listed twice`);
- packageNames.add(item.name);
for (const module of item.modules ?? []) {
const key = `${module.manifest.name}@${module.manifest.version}`;
if (manifests.has(key)) throw new Error(`Node packages repeat Module ${key}`);
- moduleRegistry.register(module);
+ for (const specifier of new Set([key, ...(module.specifiers ?? [])])) {
+ if (specifier.trim().length === 0) throw new Error(`${key} declares an empty Module specifier`);
+ const owner = moduleSpecifiers.get(specifier);
+ if (owner !== undefined) throw new Error(`Module specifier ${specifier} is already bound to ${owner}`);
+ moduleSpecifiers.set(specifier, key);
+ }
manifests.set(key, module);
}
for (const component of item.components ?? []) {
- if (component.name.trim().length === 0) throw new Error(`${item.name} has an empty Component name`);
- if (components.has(component.name)) throw new Error(`Node packages repeat Component ${component.name}`);
- components.set(component.name, component);
+ components.push(component);
for (const producer of component.producers ?? []) {
const key = facetKey(producer.producer);
if (producers.has(key)) throw new Error(`Node packages repeat Producer facet ${key}`);
@@ -72,25 +76,25 @@ export function collectNodePackageComponents(
}
}
}
- for (const component of components.values()) {
+ for (const component of components) {
for (const facet of component.producers ?? []) {
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(`${component.name} implements undeclared Producer ${facetKey(facet.producer)}`);
+ 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(`${component.name} Producer ${facetKey(facet.producer)} differs from its Manifest`);
+ 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(`${component.name} validates undeclared Type ${facetKey(facet.type)}`);
+ 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(`${component.name} Type Validator ${facetKey(facet.type)} differs from its Manifest`);
+ throw new Error(`Type Validator ${facetKey(facet.type)} differs from its Manifest`);
}
}
}
- return [...components.values()];
+ return components;
}
export function installNodePackageComponents(
diff --git a/packages/package-loader-node/src/index.ts b/packages/package-loader-node/src/index.ts
index 36d34ed2..b043ad5e 100644
--- a/packages/package-loader-node/src/index.ts
+++ b/packages/package-loader-node/src/index.ts
@@ -5,11 +5,13 @@ export {
} from "./contribution.js";
export {
createNodePackageLock,
+ createNodePackageInventory,
loadNodePackageSet,
loadNodePackageSelection,
loadNodePackageContributions,
NodePackageLockStaleError,
readNodePackageLock,
+ selectNodePackageSpecifiers,
writeNodePackageLock,
} from "./lock.js";
export type { NodePackageArtifactDifference } from "./lock.js";
diff --git a/packages/package-loader-node/src/lock.ts b/packages/package-loader-node/src/lock.ts
index dd2ee832..a4627b17 100644
--- a/packages/package-loader-node/src/lock.ts
+++ b/packages/package-loader-node/src/lock.ts
@@ -20,10 +20,12 @@ import {
} from "node:path";
import { pathToFileURL } from "node:url";
-import { digestOf, isDigest } from "@narratage/protocol";
+import { digestOf, isDigest, modulePackageAbi } from "@narratage/protocol";
import { collectNodePackageComponents } from "./contribution.js";
import type {
+ LogicalPackageAddress,
+ NodePackageBinding,
LockedNodePackage,
LockedPackageArtifact,
LoadedNodePackageSet,
@@ -251,30 +253,23 @@ function activationPath(item: ResolvedPhysicalPackage): string {
function contributionMetadata(value: NodePackageContribution): unknown {
assert(value.format === "svml.node-package@1", "Node package contribution has an unsupported format");
- assert(value.name.trim().length > 0, "Node package contribution name is empty");
return {
format: value.format,
- name: value.name,
modules: (value.modules ?? []).map((item) => ({
manifestDigest: digestOf(item.manifest),
specifiers: [...(item.specifiers ?? [])].sort(),
})).sort((left, right) => left.manifestDigest.localeCompare(right.manifestDigest)),
- authorFrontends: [...(value.authorFrontends ?? [])].map((item) => ({
- id: item.id,
- implementationDigest: item.implementationDigest,
- })).sort((left, right) => left.id.localeCompare(right.id)),
- runFrontends: [...(value.runFrontends ?? [])].map((item) => ({
- id: item.id,
- implementationDigest: item.implementationDigest,
- })).sort((left, right) => left.id.localeCompare(right.id)),
hostFacets: [...(value.hostFacets ?? [])].map((item) => ({
abi: item.abi,
- identity: item.identity,
- })).sort((left, right) =>
- `${left.abi}:${digestOf(left.identity)}`.localeCompare(`${right.abi}:${digestOf(right.identity)}`),
- ),
+ 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) => ({
- name: component.name,
producers: [...(component.producers ?? [])].map((item) => ({
producer: item.producer,
implementationDigest: item.implementationDigest,
@@ -289,16 +284,25 @@ function contributionMetadata(value: NodePackageContribution): unknown {
`${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) => left.name.localeCompare(right.name)),
+ })).sort((left, right) => digestOf(left).localeCompare(digestOf(right))),
};
}
-function contributionProvides(value: NodePackageContribution): readonly string[] {
- return [...new Set([
- ...(value.authorFrontends ?? []).map((item) => item.id),
- ...(value.runFrontends ?? []).map((item) => item.id),
- ...(value.modules ?? []).flatMap((item) => item.specifiers ?? []),
- ])].sort();
+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> {
@@ -306,13 +310,10 @@ async function importContribution(item: ResolvedPhysicalPackage): Promise<NodePa
assert((await stat(target)).isFile(), `${item.json.name} activation is not a file`);
const imported = await import(pathToFileURL(target).href) as {
readonly default?: unknown;
- readonly svmlPackage?: unknown;
};
- const value = imported.default ?? imported.svmlPackage;
- assert(value !== null && typeof value === "object", `${item.json.name} activation exports no package`);
+ const value = imported.default;
+ assert(value !== null && typeof value === "object", `${item.json.name} activation has no default package export`);
const contribution = value as NodePackageContribution;
- assert(contribution.name === item.json.name,
- `${item.json.name} activation claims physical package ${contribution.name}`);
collectNodePackageComponents([contribution]);
return contribution;
}
@@ -324,7 +325,7 @@ function lockContent(lock: Omit<NodePackageLock, "digest">): Omit<NodePackageLoc
artifacts: [...lock.artifacts].sort((left, right) =>
`${left.name}@${left.version}`.localeCompare(`${right.name}@${right.version}`),
),
- packages: [...lock.packages].sort((left, right) => left.specifier.localeCompare(right.specifier)),
+ packages: [...lock.packages].sort((left, right) => left.package.name.localeCompare(right.package.name)),
};
}
@@ -358,18 +359,22 @@ function parseLock(value: unknown): NodePackageLock {
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(item.provides === undefined || Array.isArray(item.provides),
- `$lock.packages[${index}].provides must be an array`);
- const provides = (item.provides ?? []).map((raw, provideIndex) =>
- string(raw, `$lock.packages[${index}].provides[${provideIndex}]`));
- assert(new Set(provides).size === provides.length, `$lock.packages[${index}].provides repeats a request`);
+ 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 {
- specifier: string(item.specifier, `$lock.packages[${index}].specifier`),
package: {
name: string(physical.name, `$lock.packages[${index}].package.name`),
version: string(physical.version, `$lock.packages[${index}].package.version`),
},
- provides: [...provides].sort(),
+ offers: [...offers].sort((left, right) => addressKey(left).localeCompare(addressKey(right))),
facetsDigest,
closureDigest,
};
@@ -377,19 +382,8 @@ function parseLock(value: unknown): NodePackageLock {
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 });
- if (lock.digest === digest) return lock;
- const legacyPackages = packages.map(({ provides: _provides, ...item }) => item);
- const legacy = sealLock({
- format: "svml.node-package-lock@1",
- selected,
- artifacts,
- packages: legacyPackages as LockedNodePackage[],
- });
- assert(legacy.digest === digest, "Node package lock digest is invalid");
- // Preserve the authenticated legacy identity so `packages sync` can read its
- // selected roots and rewrite it. Exact activation still rejects it because
- // it carries no logical `provides` inventory.
- return { ...lock, digest };
+ assert(lock.digest === digest, "Node package lock digest is invalid");
+ return lock;
}
/** Parse and authenticate a lock without resolving or executing its packages. */
@@ -496,6 +490,15 @@ export async function createNodePackageLock(
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,
@@ -635,9 +638,8 @@ async function createNodePackageSet(
artifactsByPackage,
);
packages.push({
- specifier: physical.json.name,
package: { name: physical.json.name, version: physical.json.version },
- provides: contributionProvides(contribution),
+ offers: contributionOffers(contribution),
facetsDigest: digestOf(contributionMetadata(contribution)),
closureDigest: digestOf({ format: "svml.package-closure@1", artifacts: ownArtifacts }),
});
@@ -649,18 +651,21 @@ async function createNodePackageSet(
packages,
});
if (inventory !== undefined) {
- const trusted = new Map(inventory.lock.packages.map((item) => [item.specifier, item]));
+ const trusted = new Map(inventory.lock.packages.map((item) => [item.package.name, item]));
for (const item of lock.packages) {
- const expected = trusted.get(item.specifier);
- assert(expected !== undefined, `${item.specifier} is absent from package inventory ${inventory.path}`);
+ 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.specifier} activation differs from package inventory ${inventory.path}`);
+ `${item.package.name} activation differs from package inventory ${inventory.path}`);
}
}
return {
lock,
inventoryDigest: inventory?.lock.digest ?? lock.digest,
- contributions: [...activated.values()].map((item) => item.contribution),
+ packages: [...activated.values()].map((item) => ({
+ specifier: item.physical.json.name,
+ contribution: item.contribution,
+ })),
};
}
@@ -701,24 +706,66 @@ export async function loadNodePackageSet(
}
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: NodePackageContribution[] = [];
+ 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`);
- assert(physical.json.name === expected.specifier, `${expected.specifier} identifies another package`);
const contribution = await importContribution(physical);
assert(digestOf(contributionMetadata(contribution)) === expected.facetsDigest,
- `${expected.specifier} facets do not match the lock`);
+ `${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.specifier} dependency closure does not match the lock`);
- values.push(contribution);
+ `${expected.package.name} dependency closure does not match the lock`);
+ values.push({ specifier: expected.package.name, contribution });
}
- collectNodePackageComponents(values);
- return { lock, inventoryDigest: lock.digest, contributions: values };
+ 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)));
+ assert(providers.length > 0, [
+ `${subject} does not provide this Source language selection:`,
+ ` ${address.abi} ${address.name}`,
+ ].join("\n"));
+ 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}`);
}
/**
@@ -732,41 +779,13 @@ export async function loadNodePackageSelection(
): Promise<LoadedNodePackageSet> {
const lockPath = resolve(path);
const inventory = await readNodePackageLock(lockPath);
- const requested: NodePackageSelectionRequest = Array.isArray(request)
- ? { selected: request }
- : request as NodePackageSelectionRequest;
- const selected = new Set(requested.selected);
- const logical = new Set(requested.logical ?? []);
- if (logical.size > 0) {
- for (const item of inventory.packages) {
- if (item.provides.some((provided) => logical.has(provided))) selected.add(item.specifier);
- }
- const supplied = new Set(inventory.packages.flatMap((item) => item.provides));
- const missingLogical = [...logical].filter((item) => !supplied.has(item)).sort();
- assert(missingLogical.length === 0, [
- `package inventory ${lockPath} does not provide this Source language selection:`,
- ...missingLogical.map((item) => ` ${item}`),
- "Synchronize the current Run Source with `narratage packages sync`.",
- ].join("\n"));
- }
- const available = new Set(inventory.selected);
- // A Source names logical language identity. Its npm-looking spelling is only a convenient
- // physical hint; a trusted package may explicitly provide that identity under another name.
- const missing = logical.size === 0
- ? [...selected].filter((item) => !available.has(item)).sort()
- : [];
- for (const item of [...selected]) if (!available.has(item)) selected.delete(item);
- assert(missing.length === 0, [
- `package inventory ${lockPath} does not authorize this Source selection:`,
- ...missing.map((item) => ` ${item}`),
- "Synchronize the current Run Source with `narratage packages sync`.",
- ].join("\n"));
- return await createNodePackageSet([...selected], resolve(root), {}, { path: lockPath, lock: inventory });
+ const selected = selectedNodePackageSpecifiers(inventory, request, `package inventory ${lockPath}`);
+ return await createNodePackageSet(selected, resolve(root), {}, { path: lockPath, lock: inventory });
}
export async function loadNodePackageContributions(
path: string,
root = dirname(resolve(path)),
): Promise<readonly NodePackageContribution[]> {
- return (await loadNodePackageSet(path, root)).contributions;
+ return (await loadNodePackageSet(path, root)).packages.map((item) => item.contribution);
}
diff --git a/packages/package-loader-node/src/types.ts b/packages/package-loader-node/src/types.ts
index e410222b..78275ce9 100644
--- a/packages/package-loader-node/src/types.ts
+++ b/packages/package-loader-node/src/types.ts
@@ -1,9 +1,19 @@
-import type { RegisteredModulePackage } from "@narratage/compiler-node";
import type { ComponentPackage } from "@narratage/component-kit";
-import type { AuthorFrontend } from "@narratage/elaborator";
import type { HostFacet } from "@narratage/host";
-import type { Digest } from "@narratage/protocol";
-import type { RunFrontend } from "@narratage/run";
+import type { Digest, ModuleManifest } from "@narratage/protocol";
+
+/** Semantic Module declaration carried by one physical Node package. */
+export type NodeModuleContribution = {
+ readonly manifest: ModuleManifest;
+ /** Additional author import spellings resolved to this exact Manifest. */
+ readonly specifiers?: readonly string[];
+};
+
+/** Opaque logical address resolved by package inventory without interpreting the owning ABI. */
+export type LogicalPackageAddress = {
+ readonly abi: string;
+ readonly name: string;
+};
/**
* Trusted executable facets exported by one installed physical package. The Host independently
@@ -12,15 +22,18 @@ import type { RunFrontend } from "@narratage/run";
*/
export type NodePackageContribution = {
readonly format: "svml.node-package@1";
- readonly name: string;
- readonly modules?: readonly RegisteredModulePackage[];
- readonly authorFrontends?: readonly AuthorFrontend[];
- readonly runFrontends?: readonly RunFrontend[];
+ readonly modules?: readonly NodeModuleContribution[];
/** Syntax- or Host-specific executable facets, inert until their exact Host ABI selects them. */
readonly hostFacets?: readonly HostFacet[];
readonly components?: readonly ComponentPackage[];
};
+/** Physical owner established by the Host; executable code never self-asserts this identity. */
+export type NodePackageBinding = {
+ readonly specifier: string;
+ readonly contribution: NodePackageContribution;
+};
+
export type LockedPackageArtifact = {
readonly name: string;
readonly version: string;
@@ -28,14 +41,12 @@ export type LockedPackageArtifact = {
};
export type LockedNodePackage = {
- /** Node package name used only for installed-package resolution. */
- readonly specifier: string;
readonly package: {
readonly name: string;
readonly version: string;
};
- /** Logical Frontend and Module requests this physical package can satisfy. */
- readonly provides: readonly 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. */
@@ -61,10 +72,10 @@ export type NodePackageLockCreateOptions = {
};
export type NodePackageSelectionRequest = {
- /** Physical roots that the Source syntax could name directly. */
+ /** Physical enrollment hints; logical addresses become the sole exact-selection authority. */
readonly selected: readonly string[];
- /** Logical Frontend and Module requests that may be supplied by any trusted inventory package. */
- readonly logical?: readonly string[];
+ /** Logical requests that may be supplied by any trusted inventory package. */
+ readonly logical?: readonly LogicalPackageAddress[];
};
export type LoadedNodePackageSet = {
@@ -72,5 +83,5 @@ export type LoadedNodePackageSet = {
readonly lock: NodePackageLock;
/** Trusted inventory from which the exact closure was selected. */
readonly inventoryDigest: Digest;
- readonly contributions: readonly NodePackageContribution[];
+ 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 0a4d72c1..deaef37e 100644
--- a/packages/package-loader-node/test/loader.test.ts
+++ b/packages/package-loader-node/test/loader.test.ts
@@ -17,7 +17,8 @@ import {
loadNodePackageContributions,
writeNodePackageLock,
} from "@narratage/package-loader-node";
-import { RuntimeAdapterRegistry } from "@narratage/runtime-adapter";
+import { modulePackageAbi } from "@narratage/protocol";
+import { runtimeEndpointAdapterHostAbi, RuntimeAdapterRegistry } from "@narratage/runtime-adapter";
import { TypeValidatorRegistry } from "@narratage/validation";
import { digestOf } from "@narratage/protocol";
import type { ProducerRef } from "@narratage/protocol";
@@ -53,7 +54,6 @@ async function fixture(): Promise<{
dependencies: [],
types: [],
capabilities: [],
- surfaces: [],
producers: [],
};
await writeFile(join(dependencyRoot, "package.json"), JSON.stringify({
@@ -65,7 +65,6 @@ async function fixture(): Promise<{
}, null, 2), "utf8");
await writeFile(dependency, `export default {
format: "svml.node-package@1",
- name: "example-helper",
modules: [{ manifest: ${JSON.stringify(helperManifest)} }],
};\n`, "utf8");
await writeFile(join(typesRoot, "package.json"), JSON.stringify({
@@ -85,7 +84,6 @@ async function fixture(): Promise<{
}, null, 2), "utf8");
await writeFile(join(extraRoot, "activation.mjs"), `export default {
format: "svml.node-package@1",
- name: "example-extra",
};\n`, "utf8");
await writeFile(join(packageRoot, "package.json"), JSON.stringify({
name: "example-card",
@@ -105,7 +103,6 @@ async function fixture(): Promise<{
const producer = { module, name: "make-card" };
export default {
format: "svml.node-package@1",
- name: "example-card",
modules: [{
manifest: {
format: "svml.module@1",
@@ -119,34 +116,18 @@ async function fixture(): Promise<{
name: resultType.name,
schema: { kind: "string", minLength: 1 },
validator: {
- abi: "svml.type-validator@1",
implementation: {
- kind: "registered",
- locator: "example-card/validate-card-result",
digest,
},
},
}],
capabilities: [],
- surfaces: [{
- name: "card",
- tag: "Card",
- mode: "structured",
- outputs: [resultType],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example-card/card",
- digest,
- },
- }],
producers: [{
name: producer.name,
inputs: [],
outputs: [{ name: "result", type: resultType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example-card/make-card",
digest: producerDigest,
},
}],
@@ -156,9 +137,10 @@ async function fixture(): Promise<{
hostFacets: [{
abi: "svml.markup-surface-host@1",
identity: {
- contract: "svml.markup-surface-host-facet@1",
module,
surface: "card",
+ tag: "Card",
+ outputs: [resultType],
mode: "structured",
implementationDigest: digest,
},
@@ -222,12 +204,12 @@ test("an installed locked package carries inert Host facets and activatable comp
const lock = await createNodePackageLock(["example-card"], item.root);
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.specifier), ["example-card", "example-helper"]);
+ assert.deepEqual(lock.packages.map((value) => value.package.name), ["example-card", "example-helper"]);
await writeNodePackageLock(item.lock, lock);
const packages = await loadNodePackageContributions(item.lock, item.root);
- assert.equal(packages[0]?.name, "example-card");
- assert.equal(packages[1]?.name, "example-helper");
+ 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");
const registered: Array<{ readonly producer: ProducerRef; readonly digest: string }> = [];
@@ -292,7 +274,7 @@ test("two physical packages cannot ambiguously provide one required Module", asy
}, null, 2), "utf8");
await writeFile(
join(copyRoot, "index.mjs"),
- (await readFile(item.dependency, "utf8")).replace('name: "example-helper"', 'name: "example-helper-copy"'),
+ await readFile(item.dependency, "utf8"),
"utf8",
);
const cardPackagePath = join(item.root, "node_modules", "example-card", "package.json");
@@ -312,8 +294,8 @@ test("an unrelated selected package does not contaminate another package's imple
const item = await fixture();
const alone = await createNodePackageLock(["example-card"], item.root);
const together = await createNodePackageLock(["example-card", "example-extra"], item.root);
- const left = alone.packages.find((value) => value.specifier === "example-card")!;
- const right = together.packages.find((value) => value.specifier === "example-card")!;
+ 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);
});
@@ -326,7 +308,7 @@ test("selection mutation keeps a shared dependency only through its retained roo
});
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.specifier), ["example-extra"]);
+ assert.deepEqual(next.packages.map((value) => value.package.name), ["example-extra"]);
});
test("a compute facet cannot claim another implementation than its static Manifest", async () => {
@@ -369,12 +351,8 @@ async function runtimeAdapterFixture(marker: string): Promise<{
const capability = { module, name: "Generate" };
const returns = { module, name: "Result" };
const runtimeFacet = {
- abi: "svml.runtime-adapter-host@1",
- identity: {
- contract: "svml.runtime-adapter-facet@1",
- use: "example-runtime-adapter",
- kind: "endpoint",
- },
+ abi: "svml.runtime-endpoint-adapter-host@1",
+ offers: ["example.logical-endpoint"],
implementation: {
activate(context) {
const facet = { module, name: "endpoint" };
@@ -387,7 +365,7 @@ async function runtimeAdapterFixture(marker: string): Promise<{
facets: [{
name: facet.name,
role: "capability-endpoint",
- implementation: { locator: "example-runtime-adapter/endpoint", digest: declared },
+ implementation: { digest: declared },
fulfills: [{ capability, returns }],
lifecycle: "immediate",
defaultConcurrency: 1,
@@ -404,8 +382,6 @@ async function runtimeAdapterFixture(marker: string): Promise<{
returns,
() => ({
value: { kind: "inline", value: "external" },
- delivery: { kind: "inline" },
- metadata: null,
}),
{ runtimeImplementation: { facet, digest: declared, configurationDigest: configuration } },
);
@@ -417,7 +393,6 @@ async function runtimeAdapterFixture(marker: string): Promise<{
};
export default {
format: "svml.node-package@1",
- name: "example-runtime-adapter",
hostFacets: [runtimeFacet],
};
`, "utf8");
@@ -430,18 +405,18 @@ async function loadedExternalEndpointDigest(marker: string): Promise<string> {
item.lock,
await createNodePackageLock(["example-runtime-adapter"], item.root),
);
- const loaded = await loadNodePackageSet(item.lock, item.root);
- const contribution = loaded.contributions[0]!;
+ const loaded = await loadNodePackageSelection(item.lock, {
+ selected: [],
+ logical: [{ abi: runtimeEndpointAdapterHostAbi, name: "example.logical-endpoint" }],
+ }, item.root);
+ const loadedPackage = loaded.packages[0]!;
+ const contribution = loadedPackage.contribution;
const locked = loaded.lock.packages[0]!;
- const artifact = loaded.lock.artifacts.find((value) =>
- value.name === locked.package.name && value.version === locked.package.version)!;
const registry = new RuntimeAdapterRegistry();
registry.registerFacet(contribution.hostFacets![0]!, {
- packageName: contribution.name,
- packageArtifactDigest: artifact.digest,
- packageClosureDigest: locked.closureDigest,
+ closureDigest: locked.closureDigest,
});
- const endpoint = await registry.createEndpoint("example-runtime-adapter", {
+ const endpoint = await registry.createEndpoint("example.logical-endpoint", {
root: item.root,
instance: "external.fixture",
config: {},
@@ -469,7 +444,6 @@ test("a package digest ignores Finder metadata but still binds authored hidden f
}, null, 2), "utf8");
await writeFile(join(packageRoot, "index.mjs"), `export default {
format: "svml.node-package@1",
- name: "example-dotfile",
};\n`, "utf8");
const before = await createNodePackageLock(["example-dotfile"], root);
@@ -507,16 +481,50 @@ test("one inventory activates only the exact package subset selected by a Source
}), "utf8");
await writeFile(join(packageRoot, "index.mjs"), `export default {
format: "svml.node-package@1",
- name: ${JSON.stringify(name)},
modules: [{ manifest: { format: "svml.module@1", name: ${JSON.stringify(specifier!.slice(0, -2))},
- version: "1", dependencies: [], types: [], capabilities: [], producers: [], surfaces: [] },
+ version: "1", dependencies: [], types: [], capabilities: [], producers: [] },
specifiers: [${JSON.stringify(specifier)}] }],
};\n`, "utf8");
}
const path = join(root, "svml.packages.lock");
await writeNodePackageLock(path, await createNodePackageLock(["example-first", "example-second"], root));
- const loaded = await loadNodePackageSelection(path, { selected: [], logical: ["example.first@1"] }, 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.contributions.map((item) => item.name), ["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");
+ }
+ 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/src/activation.ts b/packages/program-space/src/activation.ts
index 32939d36..9ebe8eb7 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, name: "@narratage/program-space", modules: [{ manifest: programSpaceManifest }] };
+export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: programSpaceManifest }] };
export default svmlPackage;
diff --git a/packages/program-space/src/index.ts b/packages/program-space/src/index.ts
index e9f52ac5..8faa0ea3 100644
--- a/packages/program-space/src/index.ts
+++ b/packages/program-space/src/index.ts
@@ -29,7 +29,7 @@ export const programSpaceManifest: ModuleManifest = {
name: programSpaceTypes.programSpace.name,
schema: programSpaceSchema,
}],
- capabilities: [], surfaces: [], producers: [],
+ capabilities: [], producers: [],
};
export const programSpaceManifestDigest = digestOf(programSpaceManifest);
export const programSpaceDependency = { module: programSpaceModuleRef, digest: programSpaceManifestDigest } as const;
diff --git a/packages/protocol/README.md b/packages/protocol/README.md
index 050ddbc8..08e8afba 100644
--- a/packages/protocol/README.md
+++ b/packages/protocol/README.md
@@ -1,19 +1,19 @@
# `@narratage/protocol`
Execution-free wire contracts shared by Core, Drivers and future modules. The package defines
-canonical values, module/type references, static raw/structured Surface declarations, records and
-origins, explicit plans, Needs, Receipts, Derivations, events and commands. It also parses the static
+canonical values, module/type references, records and origins, explicit plans, Needs, Receipts,
+Derivations, events and commands. It also parses the static
JSON representation of a Module Manifest without reading files or executing package code. It
-contains no author-source parser, runtime or video vocabulary. A Surface declaration identifies and
-locks a parser capability; the protocol never executes it. Every Surface also declares the exact set of record types it may
-author, so a parser cannot use its early execution position to impersonate another module.
+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 `svml.type-validator@1` implementation. 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.
+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.
-A Need fulfillment may carry a Host-attested implementation binding: locked Endpoint implementation
-digest, non-secret configuration digest and applied Runtime closure digest. The Endpoint does not
-supply this value. Receipt content addressing covers the binding and any renderer-specific evidence
-stored in fulfillment metadata without teaching Protocol what a renderer is.
+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.
diff --git a/packages/protocol/src/build.ts b/packages/protocol/src/build.ts
index a170561a..35a73e49 100644
--- a/packages/protocol/src/build.ts
+++ b/packages/protocol/src/build.ts
@@ -42,30 +42,18 @@ export type ProvidedOrigin = {
export type RecordOrigin = AuthoredOrigin | DerivedOrigin | ObservedOrigin | ProvidedOrigin;
-/** Content-bound Host assertion that the Type owner's locked validator accepted this exact value. */
-export type TypeValidationReceipt = {
- readonly format: "svml.type-validation@1";
- readonly id: Digest;
- readonly type: TypeRef;
- readonly recordDigest: Digest;
- readonly validatorDigest: Digest;
-};
-
+/** One typed value in the graph; semantic validation happens at the Host admission boundary. */
export type TypedRecord = {
readonly id: RecordId;
readonly type: TypeRef;
readonly value: StoredValue;
readonly digest: Digest;
readonly origin: RecordOrigin;
- readonly validation?: TypeValidationReceipt;
};
export type TypedModule = {
readonly format: "svml.typed-module@1";
- readonly id: string;
- readonly closureDigest: Digest;
readonly records: readonly TypedRecord[];
- readonly semanticDigest: Digest;
};
export type Need = {
@@ -82,12 +70,12 @@ export type Need = {
* 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 and, when present, the applied Runtime Closure.
+ * 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;
- readonly runtimeClosure?: Digest;
};
export type Receipt = {
@@ -179,7 +167,6 @@ export type OperationNode = {
export type ProvidedValue = {
readonly id: RecordId;
readonly value: StoredValue;
- readonly validation?: TypeValidationReceipt;
};
export type CandidateRoot =
@@ -244,7 +231,6 @@ export type BuildPlan = {
readonly id: Digest;
readonly graph: Digest;
readonly request: Digest;
- readonly initialValues: readonly TypedRecord[];
readonly steps: readonly ProducerStep[];
readonly goals: readonly BuildGoal[];
readonly selections: readonly BuildSelection[];
@@ -252,7 +238,6 @@ export type BuildPlan = {
export type LinkedProgram = {
readonly closure: ResolvedModuleClosure;
- readonly modules: readonly TypedModule[];
readonly records: readonly TypedRecord[];
readonly semanticDigest: Digest;
};
@@ -277,13 +262,7 @@ export type FulfillNeedCommand = {
readonly need: Need;
};
-export type CompleteCommand = {
- readonly kind: "complete";
- readonly id: CommandId;
- readonly goals: readonly RecordId[];
-};
-
-export type CoreCommand = InvokeProducerCommand | FulfillNeedCommand | CompleteCommand;
+export type CoreCommand = InvokeProducerCommand | FulfillNeedCommand;
export type ProducerCompletedEvent = {
readonly kind: "producer-completed";
@@ -291,7 +270,6 @@ export type ProducerCompletedEvent = {
readonly command: CommandId;
readonly outputs: Readonly<Record<string, StoredValue>>;
readonly needs: Readonly<Record<string, CanonicalValue>>;
- readonly validations?: Readonly<Record<string, TypeValidationReceipt>>;
};
export type NeedFulfilledEvent = {
@@ -302,7 +280,6 @@ export type NeedFulfilledEvent = {
readonly requestDigest: Digest;
readonly fulfiller: string;
readonly implementation?: FulfillerImplementation;
- readonly validation?: TypeValidationReceipt;
};
export type CommandFailedEvent = {
@@ -343,8 +320,3 @@ export type BuildState = {
readonly acceptedEvents: readonly AcceptedEvent[];
readonly diagnostics: readonly BuildDiagnostic[];
};
-
-export type CoreTransition = {
- readonly state: BuildState;
- readonly commands: readonly CoreCommand[];
-};
diff --git a/packages/protocol/src/canonical.ts b/packages/protocol/src/canonical.ts
index 01054208..44f36282 100644
--- a/packages/protocol/src/canonical.ts
+++ b/packages/protocol/src/canonical.ts
@@ -1,5 +1,3 @@
-import { createHash } from "node:crypto";
-
import type { TypedRecord } from "./build.js";
import { SvmlError } from "./error.js";
import type { Digest, TypeRef } from "./identity.js";
@@ -56,9 +54,85 @@ export function canonicalStringify(value: unknown): string {
return JSON.stringify(canonicalize(value));
}
+const sha256RoundConstants = new Uint32Array([
+ 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+ 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+ 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+ 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+ 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+ 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+ 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
+]);
+
+function rotateRight(value: number, bits: number): number {
+ return (value >>> bits) | (value << (32 - bits));
+}
+
+/** Synchronous, Host-independent SHA-256 for deterministic Core identities. */
+function sha256(value: string): string {
+ const source = new TextEncoder().encode(value);
+ const byteLength = Math.ceil((source.length + 9) / 64) * 64;
+ const bytes = new Uint8Array(byteLength);
+ bytes.set(source);
+ bytes[source.length] = 0x80;
+ const bitLength = BigInt(source.length) * 8n;
+ const view = new DataView(bytes.buffer);
+ view.setUint32(byteLength - 8, Number((bitLength >> 32n) & 0xffffffffn), false);
+ view.setUint32(byteLength - 4, Number(bitLength & 0xffffffffn), false);
+
+ const state = new Uint32Array([
+ 0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
+ 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
+ ]);
+ const words = new Uint32Array(64);
+ for (let offset = 0; offset < byteLength; offset += 64) {
+ for (let index = 0; index < 16; index += 1) words[index] = view.getUint32(offset + index * 4, false);
+ for (let index = 16; index < 64; index += 1) {
+ const left = words[index - 15]!;
+ const right = words[index - 2]!;
+ const s0 = rotateRight(left, 7) ^ rotateRight(left, 18) ^ (left >>> 3);
+ const s1 = rotateRight(right, 17) ^ rotateRight(right, 19) ^ (right >>> 10);
+ words[index] = (words[index - 16]! + s0 + words[index - 7]! + s1) >>> 0;
+ }
+ let a = state[0]!;
+ let b = state[1]!;
+ let c = state[2]!;
+ let d = state[3]!;
+ let e = state[4]!;
+ let f = state[5]!;
+ let g = state[6]!;
+ let h = state[7]!;
+ for (let index = 0; index < 64; index += 1) {
+ const sum1 = rotateRight(e, 6) ^ rotateRight(e, 11) ^ rotateRight(e, 25);
+ const choose = (e & f) ^ (~e & g);
+ const first = (h + sum1 + choose + sha256RoundConstants[index]! + words[index]!) >>> 0;
+ const sum0 = rotateRight(a, 2) ^ rotateRight(a, 13) ^ rotateRight(a, 22);
+ const majority = (a & b) ^ (a & c) ^ (b & c);
+ const second = (sum0 + majority) >>> 0;
+ h = g;
+ g = f;
+ f = e;
+ e = (d + first) >>> 0;
+ d = c;
+ c = b;
+ b = a;
+ a = (first + second) >>> 0;
+ }
+ state[0] = (state[0]! + a) >>> 0;
+ state[1] = (state[1]! + b) >>> 0;
+ state[2] = (state[2]! + c) >>> 0;
+ state[3] = (state[3]! + d) >>> 0;
+ state[4] = (state[4]! + e) >>> 0;
+ state[5] = (state[5]! + f) >>> 0;
+ state[6] = (state[6]! + g) >>> 0;
+ state[7] = (state[7]! + h) >>> 0;
+ }
+ return [...state].map((item) => item.toString(16).padStart(8, "0")).join("");
+}
+
export function digestOf(value: unknown): Digest {
- const hex = createHash("sha256").update(canonicalStringify(value), "utf8").digest("hex");
- return `sha256:${hex}`;
+ return `sha256:${sha256(canonicalStringify(value))}`;
}
export function isDigest(value: string): value is Digest {
diff --git a/packages/protocol/src/identity.ts b/packages/protocol/src/identity.ts
index 1aab6208..5a101f04 100644
--- a/packages/protocol/src/identity.ts
+++ b/packages/protocol/src/identity.ts
@@ -1,7 +1,6 @@
export type Digest = `sha256:${string}`;
export type RecordId = string;
-export type NodeId = string;
export type LogicalOutputId = string;
export type CandidateId = string;
export type OperationId = string;
diff --git a/packages/protocol/src/index.ts b/packages/protocol/src/index.ts
index fdb0fcfc..37f31205 100644
--- a/packages/protocol/src/index.ts
+++ b/packages/protocol/src/index.ts
@@ -1,6 +1,8 @@
export * from "./canonical.js";
export * from "./error.js";
export { parseModuleManifest, parseModuleManifestText } from "./manifest.js";
+export { modulePackageAbi } from "./module.js";
+export { blobRefObjectSchema } from "./value.js";
export type * from "./build.js";
export type * from "./identity.js";
export type * from "./module.js";
diff --git a/packages/protocol/src/manifest.ts b/packages/protocol/src/manifest.ts
index b7a27116..9229529f 100644
--- a/packages/protocol/src/manifest.ts
+++ b/packages/protocol/src/manifest.ts
@@ -7,7 +7,6 @@ import type {
NeedPortDeclaration,
PortDeclaration,
ProducerDeclaration,
- SurfaceDeclaration,
TypeDeclaration,
} from "./module.js";
import type { CapabilityRef, Digest, ModuleRef, TypeRef } from "./identity.js";
@@ -177,9 +176,6 @@ function typeDeclaration(value: unknown, path: string): TypeDeclaration {
return {
name: string(parsed.name, `${path}.name`),
schema: valueSchema(parsed.schema, `${path}.schema`),
- ...(parsed.description === undefined
- ? {}
- : { description: string(parsed.description, `${path}.description`) }),
...(parsed.validator === undefined
? {}
: { validator: typeValidator(parsed.validator, `${path}.validator`) }),
@@ -188,11 +184,7 @@ function typeDeclaration(value: unknown, path: string): TypeDeclaration {
function typeValidator(value: unknown, path: string): NonNullable<TypeDeclaration["validator"]> {
const parsed = object(value, path);
- if (parsed.abi !== "svml.type-validator@1") {
- throw new Error(`${path}.abi must be svml.type-validator@1`);
- }
return {
- abi: "svml.type-validator@1",
implementation: implementation(parsed.implementation, `${path}.implementation`),
};
}
@@ -202,9 +194,6 @@ function capabilityDeclaration(value: unknown, path: string): CapabilityDeclarat
return {
name: string(parsed.name, `${path}.name`),
returns: typeRef(parsed.returns, `${path}.returns`),
- ...(parsed.description === undefined
- ? {}
- : { description: string(parsed.description, `${path}.description`) }),
};
}
@@ -228,8 +217,6 @@ function needPort(value: unknown, path: string): NeedPortDeclaration {
function implementation(value: unknown, path: string): ImplementationRef {
const parsed = object(value, path);
return {
- kind: string(parsed.kind, `${path}.kind`),
- locator: string(parsed.locator, `${path}.locator`),
digest: digest(parsed.digest, `${path}.digest`),
};
}
@@ -251,23 +238,6 @@ function producer(value: unknown, path: string): ProducerDeclaration {
};
}
-function surface(value: unknown, path: string): SurfaceDeclaration {
- const parsed = object(value, path);
- const mode = string(parsed.mode, `${path}.mode`);
- if (mode !== "raw" && mode !== "structured") {
- throw new Error(`${path}.mode must be raw or structured`);
- }
- return {
- name: string(parsed.name, `${path}.name`),
- tag: string(parsed.tag, `${path}.tag`),
- mode,
- outputs: array(parsed.outputs, `${path}.outputs`).map((item, index) =>
- typeRef(item, `${path}.outputs[${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");
@@ -284,9 +254,6 @@ export function parseModuleManifest(value: unknown): ModuleManifest {
capabilities: array(parsed.capabilities, "$manifest.capabilities").map((item, index) =>
capabilityDeclaration(item, `$manifest.capabilities[${index}]`),
),
- surfaces: array(parsed.surfaces, "$manifest.surfaces").map((item, index) =>
- surface(item, `$manifest.surfaces[${index}]`),
- ),
producers: array(parsed.producers, "$manifest.producers").map((item, index) =>
producer(item, `$manifest.producers[${index}]`),
),
diff --git a/packages/protocol/src/module.ts b/packages/protocol/src/module.ts
index 515ba3ce..9e4bd6e1 100644
--- a/packages/protocol/src/module.ts
+++ b/packages/protocol/src/module.ts
@@ -1,6 +1,9 @@
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 type ModuleDependency = {
readonly module: ModuleRef;
readonly digest: Digest;
@@ -9,13 +12,11 @@ export type ModuleDependency = {
export type TypeDeclaration = {
readonly name: string;
readonly schema: ValueSchema;
- readonly description?: string;
/** Optional package-owned semantic refinement beyond the structural Schema. */
readonly validator?: TypeValidatorDeclaration;
};
export type TypeValidatorDeclaration = {
- readonly abi: "svml.type-validator@1";
readonly implementation: ImplementationRef;
};
@@ -33,30 +34,12 @@ export type NeedPortDeclaration = {
export type CapabilityDeclaration = {
readonly name: string;
readonly returns: TypeRef;
- readonly description?: string;
};
export type ImplementationRef = {
- readonly kind: string;
- readonly locator: string;
readonly digest: Digest;
};
-/**
- * A source Surface is an author-facing declaration exported by a module.
- * `raw` delegates the complete region after its opening tag to the registered
- * Surface implementation. `structured` first uses the selected Frontend's
- * generic element parser and delegates only the resulting tree. `outputs`
- * bounds which authored record types that parser is allowed to introduce.
- */
-export type SurfaceDeclaration = {
- readonly name: string;
- readonly tag: string;
- readonly mode: "raw" | "structured";
- readonly outputs: readonly TypeRef[];
- readonly implementation: ImplementationRef;
-};
-
export type ProducerDeclaration = {
readonly name: string;
readonly inputs: readonly PortDeclaration[];
@@ -72,7 +55,6 @@ export type ModuleManifest = {
readonly dependencies: readonly ModuleDependency[];
readonly types: readonly TypeDeclaration[];
readonly capabilities: readonly CapabilityDeclaration[];
- readonly surfaces: readonly SurfaceDeclaration[];
readonly producers: readonly ProducerDeclaration[];
};
diff --git a/packages/protocol/src/value.ts b/packages/protocol/src/value.ts
index 54303d7f..3e3e8d1a 100644
--- a/packages/protocol/src/value.ts
+++ b/packages/protocol/src/value.ts
@@ -66,3 +66,20 @@ export type ObjectFieldSchema = {
readonly schema: ValueSchema;
readonly optional?: boolean;
};
+
+/** Structural schema for a BlobRef nested inside an inline value. */
+export function blobRefObjectSchema(mediaTypes?: readonly string[]): ValueSchema {
+ return {
+ kind: "object",
+ fields: {
+ kind: { schema: { kind: "literal", value: "blob" } },
+ digest: { schema: { kind: "string", minLength: 71, maxLength: 71 } },
+ size: { schema: { kind: "number", integer: true, minimum: 0 } },
+ mediaType: {
+ schema: mediaTypes === undefined
+ ? { kind: "string", minLength: 1 }
+ : { kind: "string", enum: mediaTypes },
+ },
+ },
+ };
+}
diff --git a/packages/provider-google-vertex/src/activation.ts b/packages/provider-google-vertex/src/activation.ts
index ffc1b587..8230b7cc 100644
--- a/packages/provider-google-vertex/src/activation.ts
+++ b/packages/provider-google-vertex/src/activation.ts
@@ -50,7 +50,6 @@ const googleVertexRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-google-vertex",
hostFacets: [googleVertexRuntimeAdapter],
};
diff --git a/packages/provider-google-vertex/src/provider.ts b/packages/provider-google-vertex/src/provider.ts
index 9dff3355..12842598 100644
--- a/packages/provider-google-vertex/src/provider.ts
+++ b/packages/provider-google-vertex/src/provider.ts
@@ -36,7 +36,7 @@ type GenerateCaptionContentInput = {
export type GenerateCaptionContent = (
input: GenerateCaptionContentInput,
-) => Promise<{ readonly text: string; readonly totalTokenCount?: number; readonly modelVersion?: string }>;
+) => Promise<{ readonly text: string }>;
export type CreateGoogleVertexCaptionProviderOptions = {
/** Literal deployment project, mutually exclusive with projectEnv. */
@@ -153,12 +153,7 @@ function sdkGenerateContent(): GenerateCaptionContent {
abortSignal: input.abortSignal,
},
});
- return {
- text: response.text ?? "",
- ...(response.usageMetadata?.totalTokenCount === undefined
- ? {} : { totalTokenCount: response.usageMetadata.totalTokenCount }),
- ...(response.modelVersion === undefined ? {} : { modelVersion: response.modelVersion }),
- };
+ return { text: response.text ?? "" };
};
}
@@ -180,11 +175,8 @@ async function withTimeout<T>(timeoutMs: number, task: (signal: AbortSignal) =>
}
}
-function fulfillment(value: CanonicalValue, metadata: CanonicalValue): EndpointFulfillment {
- return {
- value: { kind: "inline", value },
- metadata,
- };
+function fulfillment(value: CanonicalValue): EndpointFulfillment {
+ return { value: { kind: "inline", value } };
}
export function createGoogleVertexCaptionProvider(options: CreateGoogleVertexCaptionProviderOptions) {
@@ -221,7 +213,6 @@ export function createGoogleVertexCaptionProvider(options: CreateGoogleVertexCap
instance: options.instance ?? "google-vertex.caption",
authority: options.authority ?? options.instance ?? "google-vertex.caption",
implementation: {
- locator: "@narratage/provider-google-vertex/caption-gemini",
digest: googleVertexProviderImplementationDigest,
},
configuration: canonicalize({
@@ -276,15 +267,7 @@ export function createGoogleVertexCaptionProvider(options: CreateGoogleVertexCap
throw new Error("Google Vertex returned invalid Caption JSON");
}
const plan = sealCaptionGeminiPlan(request, raw);
- return fulfillment(canonicalize(plan), canonicalize({
- provider: "google-vertex",
- project,
- location,
- requestedModel: request.model,
- ...(response.modelVersion === undefined ? {} : { modelVersion: response.modelVersion }),
- ...(response.totalTokenCount === undefined ? {} : { totalTokenCount: response.totalTokenCount }),
- responseDigest: digestOf(response.text),
- }));
+ return fulfillment(canonicalize(plan));
},
}],
});
diff --git a/packages/provider-google-vertex/test/provider.test.ts b/packages/provider-google-vertex/test/provider.test.ts
index e4ab7e75..8be3d29b 100644
--- a/packages/provider-google-vertex/test/provider.test.ts
+++ b/packages/provider-google-vertex/test/provider.test.ts
@@ -81,8 +81,6 @@ test("Vertex transports the exact model request while the model package validate
captured = input;
return {
text: JSON.stringify(response(requestValue)),
- totalTokenCount: 123,
- modelVersion: "gemini-2.5-flash-001",
};
},
});
@@ -106,12 +104,11 @@ test("Vertex transports the exact model request while the model package validate
assert.equal(result.value.kind, "inline");
const plan = result.value.kind === "inline" ? result.value.value as Record<string, unknown> : {};
assert.equal(plan.contract, "svml.caption-plan@1");
- assert.equal((result.metadata as Record<string, unknown>).provider, "google-vertex");
});
test("Vertex configuration exposes credential/queue policy without changing the model request", () => {
const provider = createGoogleVertexCaptionProvider({ project: "svml-test-project", defaultConcurrency: 3 });
- assert.equal(provider.name, "google-vertex.caption");
+ 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");
diff --git a/packages/provider-hyperframes-aws-lambda/README.md b/packages/provider-hyperframes-aws-lambda/README.md
index 1c1facaf..165ea30d 100644
--- a/packages/provider-hyperframes-aws-lambda/README.md
+++ b/packages/provider-hyperframes-aws-lambda/README.md
@@ -5,7 +5,7 @@ Recoverable AWS Step Functions/Lambda implementation of the exact
The Endpoint stages the immutable `HyperframesDocument` with the shared
`stageHyperframesProject()` layout, uploads that content-addressed site, starts one distributed
-render and journals its execution ARN. Its Step Functions execution name is derived from the
+render and persists its execution ARN in the Operation checkpoint. Its Step Functions execution name is derived from the
Runtime Operation id, so recovery cannot accidentally submit the same attempt twice.
Cancellation uses that same identity to stop the remote Step Functions execution, including the
crash window before the first checkpoint was saved.
@@ -20,12 +20,11 @@ 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. That digest and the document digest are repeated in
-receipt-covered renderer-attestation metadata, while the Driver independently binds the locked
-Endpoint/configuration/Runtime closure in the generic Need Receipt.
-This is a renderer execution receipt, not an ffprobe claim about the MP4 byte stream. Container and
-stream conformance stays in the explicit media inspection/mux capabilities, so the orchestrating
-machine does not acquire a hidden FFmpeg dependency.
+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
+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.
diff --git a/packages/provider-hyperframes-aws-lambda/src/activation.ts b/packages/provider-hyperframes-aws-lambda/src/activation.ts
index 390e7602..857fbe90 100644
--- a/packages/provider-hyperframes-aws-lambda/src/activation.ts
+++ b/packages/provider-hyperframes-aws-lambda/src/activation.ts
@@ -108,7 +108,6 @@ const awsLambdaHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-hyperframes-aws-lambda",
hostFacets: [awsLambdaHyperframesRuntimeAdapter],
};
diff --git a/packages/provider-hyperframes-aws-lambda/src/provider.ts b/packages/provider-hyperframes-aws-lambda/src/provider.ts
index d7a799fc..0ef121a9 100644
--- a/packages/provider-hyperframes-aws-lambda/src/provider.ts
+++ b/packages/provider-hyperframes-aws-lambda/src/provider.ts
@@ -332,9 +332,6 @@ async function storeOutput(
function fulfillment(
document: HyperframesDocument,
artifact: BlobRef,
- checkpoint: HyperframesCheckpoint,
- progress: HyperframesLambdaProgress,
- rendererImplementationDigest: Digest,
): EndpointFulfillment {
const value: RenderedVisual = sealRenderedVisual({
contract: "svml.rendered-visual@1",
@@ -342,26 +339,8 @@ function fulfillment(
frameCount: document.frameCount,
canvas: document.canvas,
artifact,
- muted: true,
});
- return {
- value: { kind: "inline", value: canonicalize(value) },
- metadata: canonicalize({
- contract: "svml.hyperframes-renderer-attestation@1",
- provider: "hyperframes.aws-lambda",
- providerImplementationDigest: awsLambdaHyperframesProviderImplementationDigest,
- rendererImplementationDigest,
- documentDigest: digestOf(document),
- hyperframesVersion: HYPERFRAMES_VERSION,
- renderId: checkpoint.renderId,
- executionArn: checkpoint.executionArn,
- siteId: checkpoint.site.siteId,
- framesRendered: progress.framesRendered,
- lambdasInvoked: progress.lambdasInvoked,
- costs: progress.costs as unknown as CanonicalValue,
- validation: "hyperframes-progress@1",
- }),
- };
+ return { value: { kind: "inline", value: canonicalize(value) } };
}
function renderConfiguration(document: HyperframesDocument, options: {
@@ -650,7 +629,7 @@ export function createAwsLambdaHyperframesProvider(config: CreateAwsLambdaHyperf
const artifact = await storeOutput(context, client, progress, next, region, maxRenderedBytes);
return {
status: "completed",
- result: fulfillment(document, artifact, next, progress, config.rendererImplementationDigest),
+ result: fulfillment(document, artifact),
};
} catch (error) {
return implementationFailure("HYPERFRAMES_OUTPUT_INVALID", error, true);
@@ -685,7 +664,6 @@ export function createAwsLambdaHyperframesProvider(config: CreateAwsLambdaHyperf
instance: config.instance ?? "hyperframes.aws-lambda",
authority: config.authority ?? config.instance ?? "hyperframes.aws-lambda",
implementation: {
- locator: "@narratage/provider-hyperframes-aws-lambda/render",
digest: awsLambdaHyperframesProviderImplementationDigest,
},
configuration: canonicalize({
diff --git a/packages/provider-hyperframes-aws-lambda/test/live-canary.ts b/packages/provider-hyperframes-aws-lambda/test/live-canary.ts
index 3940b5df..12e14f21 100644
--- a/packages/provider-hyperframes-aws-lambda/test/live-canary.ts
+++ b/packages/provider-hyperframes-aws-lambda/test/live-canary.ts
@@ -179,9 +179,7 @@ async function main(): Promise<void> {
endpoint: "hyperframes.aws-lambda.canary",
authority: "hyperframes.aws-lambda.canary",
route: "fixture.render",
- implementationDigest: digestOf("hyperframes-aws-canary:implementation"),
runtimeClosure: digestOf("hyperframes-aws-canary:runtime"),
- requestDigest: need.requestDigest,
attempt: 1,
});
const context = {
@@ -237,7 +235,6 @@ async function main(): Promise<void> {
frameRate: visual.frameRate,
frameCount: visual.frameCount,
canvas: visual.canvas,
- metadata: outcome.result.metadata,
probe: probe.streams[0],
}, null, 2)}\n`);
} finally {
diff --git a/packages/provider-hyperframes-aws-lambda/test/provider.test.ts b/packages/provider-hyperframes-aws-lambda/test/provider.test.ts
index 1bf0e6a2..90540fb0 100644
--- a/packages/provider-hyperframes-aws-lambda/test/provider.test.ts
+++ b/packages/provider-hyperframes-aws-lambda/test/provider.test.ts
@@ -76,9 +76,7 @@ function operation(request: Need) {
endpoint: "hyperframes.aws-lambda.test",
authority: "hyperframes.aws-lambda.test",
route: "fixture.render",
- implementationDigest: digestOf("hyperframes-lambda:test-implementation"),
runtimeClosure: digestOf("hyperframes-lambda:test-runtime"),
- requestDigest: request.requestDigest,
attempt: 1,
});
}
@@ -338,13 +336,8 @@ test("one deterministic submission resumes and streams the exact output into the
verifyRenderedVisual(completed.result.value.value);
const visual = completed.result.value.value as unknown as RenderedVisual;
assert.equal(visual.frameCount, 60);
- assert.equal(visual.muted, true);
assert.equal(await artifacts.has(visual.artifact.digest), true);
assert.deepEqual(await artifacts.get(visual.artifact.digest), new Uint8Array([1, 2, 3, 4, 5]));
- const metadata = completed.result.metadata as Record<string, CanonicalValue>;
- assert.equal(metadata.contract, "svml.hyperframes-renderer-attestation@1");
- assert.equal(metadata.rendererImplementationDigest, RENDERER_IMPLEMENTATION);
- assert.equal(metadata.documentDigest, digestOf(documentFixture()));
});
test("an ambiguous StartExecution is recovered by the same name without redeploying the site", async () => {
diff --git a/packages/provider-hyperframes-local/README.md b/packages/provider-hyperframes-local/README.md
index 93f23cc7..bc2facae 100644
--- a/packages/provider-hyperframes-local/README.md
+++ b/packages/provider-hyperframes-local/README.md
@@ -4,12 +4,9 @@ Trusted local Provider for the `@narratage/render-hyperframes#render-visual` cap
content-addressed dependencies declared by a `HyperframesDocument`, renders a silent MP4 with the
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.
-
-The receipt-covered renderer attestation includes the HyperFrames version, exact browser executable
-digest/version, document digest and all Surface verification evidence. The Driver separately binds
-the locked Endpoint implementation and configuration; neither identity is self-asserted by the
-handler.
+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.
There are deliberately two concurrency controls:
@@ -22,7 +19,7 @@ the final media.
The Runtime Adapter also owns one non-daemon browser service. `services up` invokes the pinned
HyperFrames CLI's `browser ensure`; the service probe resolves and starts that browser and checks
-ffprobe before a Build. The Endpoint still records the actual browser digest/version in its Receipt.
+ffprobe before a Build.
```ts
const provider = createLocalHyperframesProvider({
diff --git a/packages/provider-hyperframes-local/src/activation.ts b/packages/provider-hyperframes-local/src/activation.ts
index c094b39e..35d8d1a6 100644
--- a/packages/provider-hyperframes-local/src/activation.ts
+++ b/packages/provider-hyperframes-local/src/activation.ts
@@ -85,7 +85,6 @@ const localHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-hyperframes-local",
hostFacets: [localHyperframesRuntimeAdapter],
};
diff --git a/packages/provider-hyperframes-local/src/provider.ts b/packages/provider-hyperframes-local/src/provider.ts
index 19f5c00c..6252da58 100644
--- a/packages/provider-hyperframes-local/src/provider.ts
+++ b/packages/provider-hyperframes-local/src/provider.ts
@@ -1,5 +1,4 @@
import { spawn } from "node:child_process";
-import { createHash } from "node:crypto";
import { createReadStream } from "node:fs";
import { createRequire } from "node:module";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
@@ -15,7 +14,7 @@ import { stageHyperframesProject } from "@narratage/hyperframes/project";
import { renderHyperframesCapabilities } from "@narratage/render-hyperframes";
import { canonicalize, digestOf } from "@narratage/protocol";
import { isStreamingArtifactStore } from "@narratage/runtime";
-import type { BlobRef, CanonicalValue, Digest } from "@narratage/protocol";
+import type { BlobRef, CanonicalValue } from "@narratage/protocol";
import { defineEndpointPackage } from "@narratage/endpoint-kit";
const HYPERFRAMES_VERSION = "0.7.101";
@@ -54,12 +53,6 @@ type ProcessResult = {
readonly stderr: string;
};
-type BrowserIdentity = {
- readonly path: string;
- readonly version: string;
- readonly digest: Digest;
-};
-
type ProbeStream = {
readonly codec_type?: unknown;
readonly codec_name?: unknown;
@@ -159,16 +152,6 @@ async function artifactBytes(
return bytes;
}
-async function fileDigest(path: string): Promise<Digest> {
- return await new Promise((resolve, reject) => {
- const hash = createHash("sha256");
- const stream = createReadStream(path);
- stream.on("data", (chunk) => hash.update(chunk));
- stream.on("error", reject);
- stream.on("end", () => resolve(`sha256:${hash.digest("hex")}`));
- });
-}
-
function parseRational(value: unknown, subject: string): { readonly numerator: bigint; readonly denominator: bigint } {
assert(typeof value === "string" && /^\d+\/\d+$/u.test(value), `${subject} is not a rational`);
const [numerator, denominator] = value.split("/");
@@ -237,11 +220,8 @@ function visualRequest(value: CanonicalValue): HyperframesDocument {
return item.document as HyperframesDocument;
}
-function result(value: CanonicalValue, metadata: CanonicalValue): EndpointFulfillment {
- return {
- value: { kind: "inline", value },
- metadata,
- };
+function result(value: CanonicalValue): EndpointFulfillment {
+ return { value: { kind: "inline", value } };
}
export function createLocalHyperframesProvider(config: CreateLocalHyperframesProviderOptions) {
@@ -272,41 +252,12 @@ export function createLocalHyperframesProvider(config: CreateLocalHyperframesPro
maxProcessOutputBytes,
maxRenderedBytes,
});
- let browserIdentity: Promise<BrowserIdentity> | undefined;
- const identifyBrowser = (): Promise<BrowserIdentity> => {
- browserIdentity ??= (async () => {
- const located = await runProcess({
- executable: nodePath,
- argv: [hyperframesCliPath, "browser", "path"],
- timeoutMs: processTimeoutMs,
- maxOutputBytes: maxProcessOutputBytes,
- });
- const path = Buffer.from(located.stdout).toString("utf8").trim();
- assert(path.length > 0 && !path.includes("\n") && !path.includes("\r"),
- "HyperFrames returned an invalid browser path");
- const [versionResult, digest] = await Promise.all([
- runProcess({
- executable: path,
- argv: ["--version"],
- timeoutMs: processTimeoutMs,
- maxOutputBytes: maxProcessOutputBytes,
- }),
- fileDigest(path),
- ]);
- const version = Buffer.from(versionResult.stdout).toString("utf8").trim();
- assert(version.length > 0, "HyperFrames browser returned no version");
- return { path, version, digest };
- })();
- return browserIdentity;
- };
-
return defineEndpointPackage({
module: localHyperframesProviderModuleRef,
facet: "render",
instance: config.instance ?? "hyperframes.local",
authority: config.authority ?? config.instance ?? "hyperframes.local",
implementation: {
- locator: "@narratage/provider-hyperframes-local/render",
digest: localHyperframesProviderImplementationDigest,
},
configuration,
@@ -321,22 +272,21 @@ export function createLocalHyperframesProvider(config: CreateLocalHyperframesPro
=== "svml.hyperframes-visual-render-request@1",
handler: async (context) => {
const document = visualRequest(context.need.constraints);
- const browser = await identifyBrowser();
const work = await mkdtemp(join(tmpdir(), "svml-hyperframes-local-"));
try {
- const staged = await stageHyperframesProject({
+ await stageHyperframesProject({
document,
directory: work,
read: (artifact) => artifactBytes(context, artifact),
- validateSurface: async (surface, bytes) => canonicalize(
+ validateSurface: async (surface, bytes) => {
await verifyCompositableSurfaceBytes({
surface,
bytes,
ffprobePath,
processTimeoutMs,
maxProbeOutputBytes: maxProcessOutputBytes,
- }),
- ),
+ });
+ },
});
const output = join(work, "visual.mp4");
const fps = document.frameRate.denominator === 1
@@ -383,23 +333,8 @@ export function createLocalHyperframesProvider(config: CreateLocalHyperframesPro
frameCount: document.frameCount,
canvas: document.canvas,
artifact,
- muted: true,
});
- return result(canonicalize(value), canonicalize({
- contract: "svml.hyperframes-renderer-attestation@1",
- provider: "hyperframes.local",
- providerImplementationDigest: localHyperframesProviderImplementationDigest,
- documentDigest: digestOf(document),
- hyperframesVersion: HYPERFRAMES_VERSION,
- browser: {
- version: browser.version,
- digest: browser.digest,
- },
- surfaceValidations: staged.surfaceValidations,
- workers,
- quality,
- browserGpu,
- }));
+ return result(canonicalize(value));
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
diff --git a/packages/provider-hyperframes-local/test/provider.test.ts b/packages/provider-hyperframes-local/test/provider.test.ts
index 80e31356..ef001774 100644
--- a/packages/provider-hyperframes-local/test/provider.test.ts
+++ b/packages/provider-hyperframes-local/test/provider.test.ts
@@ -104,7 +104,7 @@ async function handlerFor(request: Need): Promise<{
test("local HyperFrames Provider exposes one exact visual capability and two separate concurrency levels", async () => {
const provider = createLocalHyperframesProvider({ workers: 4, defaultConcurrency: 2 });
- assert.equal(provider.name, "hyperframes.local");
+ assert.equal(provider.instance.id, "hyperframes.local");
const facet = provider.manifest.facets[0];
assert.equal(facet?.role, "capability-endpoint");
assert(facet?.role === "capability-endpoint");
@@ -159,15 +159,5 @@ test("local HyperFrames Provider really renders a silent frame-exact MP4 with pa
const visual = value as unknown as RenderedVisual;
assert.equal(visual.frameCount, 12);
assert.deepEqual(visual.canvas, { width: 160, height: 96 });
- assert.equal(visual.muted, true);
assert.equal(await artifacts.has(visual.artifact.digest), true);
- assert.equal((output.metadata as Record<string, CanonicalValue>).contract,
- "svml.hyperframes-renderer-attestation@1");
- const metadata = output.metadata as {
- readonly browser: { readonly digest: string; readonly version: string };
- readonly surfaceValidations: readonly { readonly artifactDigest: string }[];
- };
- assert.match(metadata.browser.digest, /^sha256:[0-9a-f]{64}$/u);
- assert.match(metadata.browser.version, /(?:Chrome|Chromium)/u);
- assert.deepEqual(metadata.surfaceValidations.map((item) => item.artifactDigest), [surfaceArtifact.digest]);
});
diff --git a/packages/provider-image-opencv-local/src/activation.ts b/packages/provider-image-opencv-local/src/activation.ts
index 89fc1932..c567aa59 100644
--- a/packages/provider-image-opencv-local/src/activation.ts
+++ b/packages/provider-image-opencv-local/src/activation.ts
@@ -50,7 +50,6 @@ const localOpenCvRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-image-opencv-local",
hostFacets: [localOpenCvRuntimeAdapter],
};
diff --git a/packages/provider-image-opencv-local/src/provider.ts b/packages/provider-image-opencv-local/src/provider.ts
index dc0219a5..aa928e2a 100644
--- a/packages/provider-image-opencv-local/src/provider.ts
+++ b/packages/provider-image-opencv-local/src/provider.ts
@@ -102,7 +102,6 @@ export function createLocalOpenCvImageProvider(config: CreateLocalOpenCvImagePro
instance: config.instance ?? "image.opencv.local",
authority: config.authority ?? config.instance ?? "image.opencv.local",
implementation: {
- locator: "@narratage/provider-image-opencv-local/raster-opencv",
digest: localOpenCvImageProviderImplementationDigest,
},
configuration: canonicalize({ pythonExecutable, processTimeoutMs, maxInputBytes, maxOutputBytes }),
@@ -160,7 +159,6 @@ export function createLocalOpenCvImageProvider(config: CreateLocalOpenCvImagePro
const artifact = await context.artifacts.put(await readFile(output), mediaType);
return {
value: artifact,
- metadata: canonicalize({ provider: "opencv.local", operation: need.kind }),
};
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
diff --git a/packages/provider-image-opencv-local/test/provider.test.ts b/packages/provider-image-opencv-local/test/provider.test.ts
index e018a6f2..73bfde0e 100644
--- a/packages/provider-image-opencv-local/test/provider.test.ts
+++ b/packages/provider-image-opencv-local/test/provider.test.ts
@@ -66,7 +66,7 @@ function composeNeed(source: BlobRef): Need {
test("the OpenCV package is one replaceable Endpoint with no second queue", async () => {
const provider = createLocalOpenCvImageProvider({ defaultConcurrency: 3 });
- assert.equal(provider.name, "image.opencv.local");
+ assert.equal(provider.instance.id, "image.opencv.local");
const facet = provider.manifest.facets[0];
assert(facet?.role === "capability-endpoint");
assert.equal(facet.defaultConcurrency, 3);
diff --git a/packages/provider-kie/README.md b/packages/provider-kie/README.md
index 0e4fe0c1..1a2d344b 100644
--- a/packages/provider-kie/README.md
+++ b/packages/provider-kie/README.md
@@ -73,7 +73,7 @@ Manifests actually imported by the author document; installing KIE does not add
1. Reference `BlobRef`s are read from the configured ArtifactStore and uploaded through KIE's file
stream API. KIE temporary URLs never enter author source or generated Product identity.
-2. `createTask` is journaled as one recoverable Operation. Because KIE does not document an
+2. `createTask` is persisted as one recoverable Operation. Because KIE does not document an
idempotency key, an ambiguous network/5xx submission is not automatically retried.
3. Once a `taskId` exists, restart resumes only that task. Poll/download errors cannot create a new
paid generation.
diff --git a/packages/provider-kie/src/activation.ts b/packages/provider-kie/src/activation.ts
index e224a1b4..3296356a 100644
--- a/packages/provider-kie/src/activation.ts
+++ b/packages/provider-kie/src/activation.ts
@@ -55,7 +55,6 @@ const kieRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-kie",
hostFacets: [kieRuntimeAdapter],
};
diff --git a/packages/provider-kie/src/provider.ts b/packages/provider-kie/src/provider.ts
index 04bcd3dd..cbde832a 100644
--- a/packages/provider-kie/src/provider.ts
+++ b/packages/provider-kie/src/provider.ts
@@ -574,23 +574,9 @@ function endpoint(options: {
}
}
const result = route.packageResult(artifacts);
- const vendorMetrics: Record<string, CanonicalValue> = {};
- for (const name of ["creditsConsumed", "costTime", "completeTime"] as const) {
- const metric = data[name];
- if (typeof metric === "number" && Number.isFinite(metric) && metric >= 0) vendorMetrics[name] = metric;
- }
return {
status: "completed",
- result: {
- value: result,
- metadata: canonicalize({
- provider: "kie",
- taskId: checkpoint.taskId,
- model: checkpoint.model,
- artifacts: artifacts.map((artifact) => artifact.digest),
- ...(Object.keys(vendorMetrics).length === 0 ? {} : { metrics: vendorMetrics }),
- }),
- },
+ result: { value: result },
};
} catch (error) {
if (error instanceof KieError && [
@@ -648,7 +634,6 @@ export function createKieProvider(config: CreateKieProviderOptions) {
instance: config.instance ?? "kie.default",
authority: config.authority ?? config.instance ?? "kie.default",
implementation: {
- locator: "@narratage/provider-kie/market",
digest: kieProviderImplementationDigest,
},
configuration: canonicalize({
diff --git a/packages/provider-kie/test/live-smoke.ts b/packages/provider-kie/test/live-smoke.ts
index 063845a1..357106f6 100644
--- a/packages/provider-kie/test/live-smoke.ts
+++ b/packages/provider-kie/test/live-smoke.ts
@@ -332,8 +332,6 @@ async function createBuild(item: SmokeCase): Promise<ReturnType<typeof start>> {
});
const authored = await admitRecord(closure, draft, validators);
const program = link(closure, [sealTypedModule({
- id: "author:kie-live-smoke",
- closureDigest: closure.digest,
records: [authored],
})]);
const graph = sealCompiledGraph({
@@ -416,11 +414,9 @@ async function main(): Promise<void> {
const execution = createLocalExecutionPackage("execution.local");
const state = createSqliteRuntimeServicePackage({
path: join(root, ".svml", "runtime.sqlite"),
- name: "state.sqlite",
buildInstance: "state.builds",
operationInstance: "state.operations",
dispatchInstance: "state.dispatch",
- journalInstance: "state.journal",
});
const artifacts = createFileArtifactStorePackage({ root: join(root, ".svml", "artifacts"), instance: "artifacts.fs" });
const credentials = createEnvironmentCredentialStorePackage({ instance: "credentials.env" });
@@ -434,14 +430,13 @@ async function main(): Promise<void> {
build: "state.builds",
operations: "state.operations",
dispatch: "state.dispatch",
- journal: "state.journal",
artifacts: "artifacts.fs",
credentials: ["credentials.env"],
},
},
components: [
generationComponent,
- ...[...new Map(selected.map((item) => [item.component.name, item.component])).values()],
+ ...[...new Map(selected.map((item) => [item.manifest.name, item.component])).values()],
],
endpoints: [provider],
scheduling: { maxConcurrency: 1 },
diff --git a/packages/provider-kie/test/models.test.ts b/packages/provider-kie/test/models.test.ts
index dbc05bcc..7e55daea 100644
--- a/packages/provider-kie/test/models.test.ts
+++ b/packages/provider-kie/test/models.test.ts
@@ -133,7 +133,6 @@ test("all model manifests close over the shared generation contract and every Fr
]);
const program: LinkedProgram = {
closure,
- modules: [],
records: [],
semanticDigest: digestOf("kie-model-fragment-test"),
};
diff --git a/packages/provider-kie/test/provider.test.ts b/packages/provider-kie/test/provider.test.ts
index 866bde55..3d9d5da1 100644
--- a/packages/provider-kie/test/provider.test.ts
+++ b/packages/provider-kie/test/provider.test.ts
@@ -67,9 +67,7 @@ function operation(request: Need) {
endpoint: "kie.default",
authority: "kie.default",
route: "fixture.video",
- implementationDigest: kieProviderImplementationDigest,
runtimeClosure: digestOf("runtime:kie-test"),
- requestDigest: request.requestDigest,
attempt: 1,
});
}
diff --git a/packages/provider-media-aws-lambda/src/activation.ts b/packages/provider-media-aws-lambda/src/activation.ts
index 477c77c5..f558024b 100644
--- a/packages/provider-media-aws-lambda/src/activation.ts
+++ b/packages/provider-media-aws-lambda/src/activation.ts
@@ -62,7 +62,6 @@ const awsLambdaMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-media-aws-lambda",
hostFacets: [awsLambdaMediaRuntimeAdapter],
};
diff --git a/packages/provider-media-aws-lambda/src/contract.ts b/packages/provider-media-aws-lambda/src/contract.ts
index daf35386..1c980826 100644
--- a/packages/provider-media-aws-lambda/src/contract.ts
+++ b/packages/provider-media-aws-lambda/src/contract.ts
@@ -52,7 +52,6 @@ export type MediaLambdaResponse =
readonly operation: MediaLambdaOperation;
readonly ok: true;
readonly value: StoredValue;
- readonly metadata: CanonicalValue;
}
| {
readonly contract: typeof MEDIA_LAMBDA_RESPONSE;
@@ -145,13 +144,10 @@ export function parseMediaLambdaResponse(value: unknown): MediaLambdaResponse {
};
}
assert(item.ok === true, "MediaLambdaResponse.ok must be a boolean");
- assert(item.metadata !== null && typeof item.metadata === "object",
- "MediaLambdaResponse.metadata must be an object");
return {
contract: MEDIA_LAMBDA_RESPONSE,
operation: named,
ok: true,
value: storedValue(item.value, "MediaLambdaResponse.value"),
- metadata: item.metadata as CanonicalValue,
};
}
diff --git a/packages/provider-media-aws-lambda/src/provider.ts b/packages/provider-media-aws-lambda/src/provider.ts
index ac54934c..f05f9548 100644
--- a/packages/provider-media-aws-lambda/src/provider.ts
+++ b/packages/provider-media-aws-lambda/src/provider.ts
@@ -108,10 +108,7 @@ export function createAwsLambdaMediaProvider(config: CreateAwsLambdaMediaProvide
`AWS media ${name} reported Artifact ${artifact.digest}, which this Build's ArtifactStore cannot read`
+ ` — the Provider's bucket and the ArtifactStore's bucket are probably not the same`);
}
- return {
- value: reply.value,
- metadata: reply.metadata,
- };
+ return { value: reply.value };
};
return defineEndpointPackage({
@@ -120,7 +117,6 @@ export function createAwsLambdaMediaProvider(config: CreateAwsLambdaMediaProvide
instance: config.instance ?? "media.aws-lambda",
authority: config.authority ?? config.instance ?? "media.aws-lambda",
implementation: {
- locator: "@narratage/provider-media-aws-lambda/media",
digest: awsLambdaMediaProviderImplementationDigest,
},
configuration: canonicalize(configuration as unknown as CanonicalValue),
diff --git a/packages/provider-media-aws-lambda/test/provider.test.ts b/packages/provider-media-aws-lambda/test/provider.test.ts
index 6757e2b8..ab5beaa2 100644
--- a/packages/provider-media-aws-lambda/test/provider.test.ts
+++ b/packages/provider-media-aws-lambda/test/provider.test.ts
@@ -81,7 +81,6 @@ test("the Provider sends the Need verbatim with the bucket the function should u
operation: "inspect",
ok: true,
value: { kind: "inline", value: { contract: "svml.media-inspection@1", artifact } },
- metadata: { provider: "media.aws-lambda" },
} as unknown as CanonicalValue));
const capability = await endpointFor(invoker);
@@ -133,10 +132,8 @@ test("the remote Provider receives the exact AudioProgramPlan compiled for local
operation: "render-audio",
ok: true,
value: { kind: "inline", value: {
- contract: "svml.timeline-audio@1", artifact: output, codec: "pcm_s16le",
- sampleRate: 48_000, channels: 2, sampleFrames: 48_048, loudness: "planned",
+ contract: "svml.timeline-audio@1", artifact: output, sampleFrames: 48_048,
} },
- metadata: { provider: "media.aws-lambda" },
} as unknown as CanonicalValue));
const capability = await endpointFor(invoker, { capability: "render-timeline-audio" });
await capability.handler({ need: { constraints }, artifacts: store, credentials: {} } as never);
@@ -156,7 +153,6 @@ test("a Provider aimed at another bucket fails naming the Artifact, not later wi
contract: "svml.media-inspection@1",
artifact: { kind: "blob", digest: stranger, size: 1, mediaType: "video/mp4" },
} },
- metadata: {},
} as unknown as CanonicalValue));
await assert.rejects(
diff --git a/packages/provider-media-local/package.json b/packages/provider-media-local/package.json
index 07ff37d5..fe446751 100644
--- a/packages/provider-media-local/package.json
+++ b/packages/provider-media-local/package.json
@@ -16,7 +16,6 @@
"@narratage/media": "workspace:*",
"@narratage/media-execution": "workspace:*",
"@narratage/media-pipeline": "workspace:*",
- "@narratage/program-space": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/runtime": "workspace:*",
"@narratage/runtime-adapter": "workspace:*",
diff --git a/packages/provider-media-local/src/activation.ts b/packages/provider-media-local/src/activation.ts
index 8249132e..8d684a69 100644
--- a/packages/provider-media-local/src/activation.ts
+++ b/packages/provider-media-local/src/activation.ts
@@ -59,7 +59,6 @@ const localMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-media-local",
hostFacets: [localMediaRuntimeAdapter],
};
diff --git a/packages/provider-media-local/src/provider.ts b/packages/provider-media-local/src/provider.ts
index 05a8309a..b2ef065f 100644
--- a/packages/provider-media-local/src/provider.ts
+++ b/packages/provider-media-local/src/provider.ts
@@ -43,10 +43,7 @@ function positiveInteger(value: number, subject: string): number {
}
function fulfillment(result: MediaOperationResult): EndpointFulfillment {
- return {
- value: result.value,
- metadata: result.metadata,
- };
+ return { value: result.value };
}
/**
@@ -63,7 +60,6 @@ export function createLocalMediaProvider(config: CreateLocalMediaProviderOptions
const common = { ffmpegPath, ffprobePath, processTimeoutMs, maxProbeOutputBytes };
const environment = (context: EndpointInvocationContext): MediaExecutionEnvironment => ({
...common,
- label: "media.local",
artifacts: {
get: async (source) => await context.artifacts.get(source.digest),
open: async (source) => isStreamingArtifactStore(context.artifacts)
@@ -88,7 +84,6 @@ export function createLocalMediaProvider(config: CreateLocalMediaProviderOptions
instance: config.instance ?? "media.local",
authority: config.authority ?? config.instance ?? "media.local",
implementation: {
- locator: "@narratage/provider-media-local/ffmpeg",
digest: localMediaProviderImplementationDigest,
},
configuration: canonicalize(common),
diff --git a/packages/provider-media-local/test/provider.test.ts b/packages/provider-media-local/test/provider.test.ts
index 20a8baae..baf639b0 100644
--- a/packages/provider-media-local/test/provider.test.ts
+++ b/packages/provider-media-local/test/provider.test.ts
@@ -425,20 +425,8 @@ test("local media Provider derives one exact 16 kHz mono WhisperX evidence artif
const constraints = canonicalize({
contract: "svml.project-speech-evidence-audio-request@1",
source,
- sourceSampleRate: 48_000,
- sourceChannels: 2,
- sourceCodec: "pcm_s16le",
sourceSampleFrames: 48_001,
- evidenceSampleRate: 16_000,
- evidenceChannels: 1,
- evidenceCodec: "pcm_s16le",
evidenceSampleFrames: 16_000,
- durationSec: 48_001 / 48_000,
- segments: [{
- segmentId: "line",
- startSec: 0,
- endSec: 48_001 / 48_000,
- }],
});
const request = need(
"need:speech-evidence-audio",
@@ -449,10 +437,6 @@ test("local media Provider derives one exact 16 kHz mono WhisperX evidence artif
const value = await fulfillInline(artifacts, request);
assertSpeechEvidenceAudioIdentity(value as unknown as SpeechEvidenceAudio);
const evidence = value as unknown as SpeechEvidenceAudio;
- assert.equal(evidence.sampleMap.sourceSampleFrames, 48_001);
- assert.equal(evidence.sampleMap.evidenceSampleFrames, 16_000);
- assert.equal(evidence.sampleMap.sourceOriginSample, 0);
- assert.equal(evidence.sampleMap.evidenceOriginSample, 0);
assert.equal(evidence.sampleFrames, 16_000);
const inspected = await inspectArtifact(artifacts, evidence.artifact);
const audio = inspected.streams.find((stream) => stream.kind === "audio");
@@ -736,7 +720,6 @@ test("local media Provider renders one frame-domain audio plan and muxes exactly
frameCount: 30,
canvas: { width: 160, height: 96 },
artifact: visualArtifact,
- muted: true,
});
const muxRequest = need(
"need:mux-program-media",
diff --git a/packages/provider-whisperx-local/README.md b/packages/provider-whisperx-local/README.md
index 916d4d1e..938a3a42 100644
--- a/packages/provider-whisperx-local/README.md
+++ b/packages/provider-whisperx-local/README.md
@@ -21,7 +21,7 @@ createLocalWhisperXProvider({
The service must be on loopback because this protocol deliberately passes a local staged path. A
future persistent remote Provider should use an Artifact URL or request payload owned by that
Provider; it is a different deployment package but must return the same
-`WhisperXAlignmentEvidence` type. Lambda is deliberately not the target for this warm model.
+`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.
diff --git a/packages/provider-whisperx-local/src/activation.ts b/packages/provider-whisperx-local/src/activation.ts
index 6cc218bb..fbe5cf8e 100644
--- a/packages/provider-whisperx-local/src/activation.ts
+++ b/packages/provider-whisperx-local/src/activation.ts
@@ -72,7 +72,6 @@ const localWhisperXRuntimeAdapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-whisperx-local",
hostFacets: [localWhisperXRuntimeAdapter],
};
diff --git a/packages/provider-whisperx-local/src/provider.ts b/packages/provider-whisperx-local/src/provider.ts
index 206d9f12..d12e3ba2 100644
--- a/packages/provider-whisperx-local/src/provider.ts
+++ b/packages/provider-whisperx-local/src/provider.ts
@@ -2,20 +2,16 @@ import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import type { SpeechBasisSegment } from "@narratage/speech";
-import type { AlignedTranscriptSegment } from "@narratage/speech-evidence";
+import { sealAlignedTranscriptEvidence, speechEvidenceTypes } from "@narratage/speech-evidence";
+import type { AlignedTranscriptEvidence, AlignedTranscriptSegment } from "@narratage/speech-evidence";
import type { EndpointInvocationContext, EndpointFulfillment } from "@narratage/endpoint-kit";
import { canonicalize, digestOf } from "@narratage/protocol";
import type { CanonicalValue } from "@narratage/protocol";
import { defineEndpointPackage } from "@narratage/endpoint-kit";
import {
- sealWhisperXAlignmentEvidence,
whisperXCapabilities,
- whisperXTypes,
-} from "@narratage/whisperx";
-import type {
- WhisperXAlignmentEvidence,
- WhisperXAlignmentRequest,
} from "@narratage/whisperx";
+import type { WhisperXAlignmentRequest } from "@narratage/whisperx";
export const localWhisperXProviderModuleRef = {
name: "@narratage/provider-whisperx-local",
@@ -85,8 +81,7 @@ function alignmentRequest(value: CanonicalValue): WhisperXAlignmentRequest {
&& item.audio.mediaType === "audio/wav"
&& Number.isSafeInteger(item.sampleFrames)
&& item.sampleFrames > 0
- && item.segments.length > 0
- && item.wordAlignment === true,
+ && item.segments.length > 0,
"WhisperX alignment request is invalid");
return item;
}
@@ -203,8 +198,6 @@ export function interpretWhisperXResponse(
return sourceSegments.map((segment) => ({
sourceSegmentId: segment.segmentId,
- startSec: segment.startSec,
- endSec: segment.endSec,
words: buckets.get(segment.segmentId)!,
chars: [],
}));
@@ -212,7 +205,6 @@ export function interpretWhisperXResponse(
async function limitedJson(response: Response, maxBytes: number, subject: string): Promise<{
readonly value: unknown;
- readonly bytes: Uint8Array;
}> {
const reader = response.body?.getReader();
let bytes: Uint8Array;
@@ -245,17 +237,14 @@ async function limitedJson(response: Response, maxBytes: number, subject: string
}
assert(response.ok, `${subject} failed with HTTP ${response.status}: ${Buffer.from(bytes).toString("utf8").slice(0, 500)}`);
try {
- return { value: JSON.parse(Buffer.from(bytes).toString("utf8")), bytes };
+ return { value: JSON.parse(Buffer.from(bytes).toString("utf8")) };
} catch {
throw new Error(`${subject} returned invalid JSON`);
}
}
-function result(value: CanonicalValue, metadata: CanonicalValue): EndpointFulfillment {
- return {
- value: { kind: "inline", value },
- metadata,
- };
+function result(value: CanonicalValue): EndpointFulfillment {
+ return { value: { kind: "inline", value } };
}
export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderOptions) {
@@ -285,7 +274,6 @@ export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderO
instance: config.instance ?? "whisperx.local",
authority: config.authority ?? config.instance ?? "whisperx.local",
implementation: {
- locator: "@narratage/provider-whisperx-local/svml-service",
digest: localWhisperXProviderImplementationDigest,
},
configuration: canonicalize({
@@ -304,7 +292,7 @@ export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderO
capabilities: [{
lifecycle: "immediate" as const,
capability: whisperXCapabilities.alignment,
- returns: whisperXTypes.alignmentEvidence,
+ returns: speechEvidenceTypes.alignedTranscript,
supports: (need) => need.constraints !== null && typeof need.constraints === "object"
&& !Array.isArray(need.constraints)
&& (need.constraints as { readonly contract?: unknown }).contract === "svml.whisperx-alignment-request@1",
@@ -357,26 +345,12 @@ export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderO
assert(raw.value !== null && typeof raw.value === "object" && !Array.isArray(raw.value),
"WhisperX transcription response is invalid");
const response = raw.value as WhisperXServiceResponse;
- const segments = interpretWhisperXResponse(response, request.segments, request.durationSec);
- const rawArtifact = await context.artifacts.put(raw.bytes, "application/json");
- const evidence: WhisperXAlignmentEvidence = sealWhisperXAlignmentEvidence({
- contract: "svml.whisperx-alignment-evidence@1",
- durationSec: request.durationSec,
+ const segments = interpretWhisperXResponse(response, request.segments, request.sampleFrames / 16_000);
+ const evidence: AlignedTranscriptEvidence = sealAlignedTranscriptEvidence({
+ contract: "svml.aligned-transcript-evidence@1",
segments,
});
- return result(canonicalize(evidence), canonicalize({
- provider: "whisperx.local",
- model: expectedModel,
- device: expectedDevice,
- compute: expectedCompute,
- batchSize: expectedBatchSize,
- serviceVersion: expectedServiceVersion,
- whisperxVersion: expectedWhisperXVersion,
- punktTabDigest: expectedPunktTabDigest,
- rawEvidenceArtifact: rawArtifact,
- language: typeof response.language === "string" ? response.language : request.language ?? "unknown",
- inputTranscoded: false,
- }));
+ return result(canonicalize(evidence));
} finally {
await rm(work, { recursive: true, force: true }).catch(() => {});
}
diff --git a/packages/provider-whisperx-local/test/provider.test.ts b/packages/provider-whisperx-local/test/provider.test.ts
index 27e5996f..3457d412 100644
--- a/packages/provider-whisperx-local/test/provider.test.ts
+++ b/packages/provider-whisperx-local/test/provider.test.ts
@@ -2,15 +2,15 @@ import { createServer } from "node:http";
import { readFile } from "node:fs/promises";
import test from "node:test";
import { sealSpeechEvidenceAudio, speechTypes } from "@narratage/speech";
-import type { SpeechEvidenceAudio } from "@narratage/speech";
+import type { SpeechAudioBasis, SpeechEvidenceAudio } from "@narratage/speech";
import assert from "node:assert/strict";
import { MemoryArtifactStore, EndpointRegistry } from "@narratage/driver-node";
import { digestOf } from "@narratage/protocol";
import type { Need } from "@narratage/protocol";
+import { speechEvidenceTypes } from "@narratage/speech-evidence";
import {
whisperXCapabilities,
whisperXRequestForEvidenceAudio,
- whisperXTypes,
} from "@narratage/whisperx";
import {
@@ -46,7 +46,7 @@ function wav(sampleFrames: number): Uint8Array {
test("local WhisperX Provider pins the complete service runtime and is independently queued", () => {
const provider = createLocalWhisperXProvider({ expectedModel: "small", defaultConcurrency: 2 });
- assert.equal(provider.name, "whisperx.local");
+ assert.equal(provider.instance.id, "whisperx.local");
const facet = provider.manifest.facets[0];
assert.equal(facet?.role, "capability-endpoint");
assert(facet?.role === "capability-endpoint");
@@ -70,10 +70,7 @@ test("service pauses are projected onto authored Segments without clipping a cro
],
}],
}, sourceSegments, 2);
- assert.deepEqual(evidence.map((segment) => [segment.sourceSegmentId, segment.startSec, segment.endSec]), [
- ["opening", 0, 1],
- ["answer", 1, 2],
- ]);
+ assert.deepEqual(evidence.map((segment) => segment.sourceSegmentId), ["opening", "answer"]);
assert.deepEqual(evidence[0]!.words[0], { text: "hello", startSec: 0.1, endSec: 0.4, score: 0.99 });
assert.deepEqual(evidence[1]!.words[0], { text: "crossing", score: 0.8 });
assert.deepEqual(evidence[1]!.words[1], { text: "world", startSec: 1.2, endSec: 1.6 });
@@ -129,33 +126,29 @@ test("local Provider stages canonical evidence bytes unchanged and returns seale
const evidenceAudio = sealSpeechEvidenceAudio({
contract: "svml.speech-evidence-audio@1",
artifact,
- codec: "pcm_s16le",
- sampleRate: 16_000,
- channels: 1,
sampleFrames: 32_000,
- durationSec: 2,
- segments: sourceSegments,
- sampleMap: {
- algorithm: "rational-boundary-round@1",
- sourceSampleRate: 48_000,
- evidenceSampleRate: 16_000,
- sourceSampleFrames: 96_000,
- evidenceSampleFrames: 32_000,
- sourceOriginSample: 0,
- evidenceOriginSample: 0,
- },
});
- const constraints = whisperXRequestForEvidenceAudio(evidenceAudio, { language: "en" });
+ const audioBasis: SpeechAudioBasis = {
+ contract: "svml.speech-audio-basis@1",
+ programSpace: {
+ contract: "svml.program-space@1",
+ durationSec: 2,
+ frameRate: { numerator: 30, denominator: 1 },
+ },
+ audio: artifact,
+ segments: sourceSegments,
+ };
+ const constraints = whisperXRequestForEvidenceAudio(evidenceAudio, audioBasis, { language: "en" });
const need: Need = {
id: "need:whisperx-loopback",
capability: whisperXCapabilities.alignment,
- returns: whisperXTypes.alignmentEvidence,
+ returns: speechEvidenceTypes.alignedTranscript,
constraints,
requestedBy: "derivation:whisperx-loopback",
result: "record:whisperx-loopback",
requestDigest: digestOf({
capability: whisperXCapabilities.alignment,
- returns: whisperXTypes.alignmentEvidence,
+ returns: speechEvidenceTypes.alignedTranscript,
constraints,
}),
};
@@ -178,7 +171,7 @@ test("local Provider stages canonical evidence bytes unchanged and returns seale
assert.equal(output.value.kind, "inline");
const value = output.value.kind === "inline" ? output.value.value : null;
assert.equal((value as { readonly segments?: readonly unknown[] }).segments?.length, 2);
- assert.equal((value as { readonly contract?: unknown }).contract, "svml.whisperx-alignment-evidence@1");
+ assert.equal((value as { readonly contract?: unknown }).contract, "svml.aligned-transcript-evidence@1");
assert.equal(speechTypes.evidenceAudio.name, "SpeechEvidenceAudio");
} finally {
await new Promise<void>((resolve) => server.close(() => resolve()));
diff --git a/packages/provider-xiaomi-mimo/src/activation.ts b/packages/provider-xiaomi-mimo/src/activation.ts
index 2bb005e2..15f0e31c 100644
--- a/packages/provider-xiaomi-mimo/src/activation.ts
+++ b/packages/provider-xiaomi-mimo/src/activation.ts
@@ -51,7 +51,6 @@ const adapter = createRuntimeEndpointAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/provider-xiaomi-mimo",
hostFacets: [adapter],
};
diff --git a/packages/provider-xiaomi-mimo/src/provider.ts b/packages/provider-xiaomi-mimo/src/provider.ts
index 15337f2e..9935e15d 100644
--- a/packages/provider-xiaomi-mimo/src/provider.ts
+++ b/packages/provider-xiaomi-mimo/src/provider.ts
@@ -1,5 +1,5 @@
import { defineEndpointPackage } from "@narratage/endpoint-kit";
-import type { EndpointFulfillment, EndpointInvocationContext } from "@narratage/endpoint-kit";
+import type { EndpointInvocationContext } from "@narratage/endpoint-kit";
import {
generationTypes,
sealGeneratedAudioSet,
@@ -59,21 +59,20 @@ function normalizeBaseUrl(value: string): string {
return url.href.replace(/\/$/u, "");
}
-function request(value: CanonicalValue, model: Model): GenerationRequest {
+function request(value: CanonicalValue): GenerationRequest {
const result = value as unknown as GenerationRequest;
assert(result.contract === "svml.generation-request@1", "Xiaomi MiMo received a non-generation request");
- assert(result.model === model, `Xiaomi MiMo ${model} received ${result.model}`);
assert(result.ports !== null && typeof result.ports === "object", "Xiaomi MiMo request has no ports");
return result;
}
-function scalar(req: GenerationRequest, name: string, required = true): string | undefined {
+function scalar(req: GenerationRequest, model: Model, name: string, required = true): string | undefined {
const values = req.ports[name];
if (values === undefined) {
- if (required) throw new Error(`${req.model} requires ${name}`);
+ if (required) throw new Error(`${model} requires ${name}`);
return undefined;
}
- assert(values.length === 1 && typeof values[0] === "string", `${req.model} ${name} must contain one string`);
+ assert(values.length === 1 && typeof values[0] === "string", `${model} ${name} must contain one string`);
return values[0];
}
@@ -111,7 +110,7 @@ async function readVoiceSample(
function supports(model: Model, value: CanonicalValue): boolean {
const req = value as unknown as GenerationRequest;
- if (req?.contract !== "svml.generation-request@1" || req.model !== model
+ if (req?.contract !== "svml.generation-request@1"
|| req.ports === null || typeof req.ports !== "object") return false;
const allowed = model === "mimo-v2.5-tts"
? new Set(["text", "instruction", "voice"])
@@ -170,10 +169,6 @@ async function limitedResponseText(response: Response, maxBytes: number): Promis
return Buffer.from(bytes).toString("utf8");
}
-function fulfillment(value: CanonicalValue, metadata: CanonicalValue): EndpointFulfillment {
- return { value: { kind: "inline", value }, metadata };
-}
-
export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOptions) {
const apiBaseUrl = normalizeBaseUrl(options.apiBaseUrl ?? "https://api.xiaomimimo.com/v1");
const requestTimeoutMs = positiveInteger(options.requestTimeoutMs ?? 180_000, "requestTimeoutMs");
@@ -196,18 +191,18 @@ export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOption
lifecycle: "immediate" as const,
supports: (need: { readonly constraints: CanonicalValue }) => supports(model, need.constraints),
handler: async (context: EndpointInvocationContext) => {
- const req = request(context.need.constraints, model);
- const text = scalar(req, "text")!;
+ const req = request(context.need.constraints);
+ const text = scalar(req, model, "text")!;
const messages: Array<{ role: "user" | "assistant"; content: string }> = [];
const audio: Record<string, CanonicalValue> = { format: "wav" };
if (model === "mimo-v2.5-tts") {
- const instruction = scalar(req, "instruction", false);
+ const instruction = scalar(req, model, "instruction", false);
if (instruction !== undefined) messages.push({ role: "user", content: instruction });
- audio.voice = scalar(req, "voice")!;
+ audio.voice = scalar(req, model, "voice")!;
} else if (model === "mimo-v2.5-tts-voicedesign") {
- messages.push({ role: "user", content: scalar(req, "voiceDescription")! });
+ messages.push({ role: "user", content: scalar(req, model, "voiceDescription")! });
} else {
- const instruction = scalar(req, "instruction", false);
+ const instruction = scalar(req, model, "instruction", false);
if (instruction !== undefined) messages.push({ role: "user", content: instruction });
audio.voice = await readVoiceSample(context, req, maxVoiceSampleBase64Bytes);
}
@@ -231,11 +226,7 @@ export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOption
const bytes = parseAudio(responseText, maxResponseBytes);
const artifact = await context.artifacts.put(bytes, "audio/wav");
const result = sealGeneratedAudioSet({ contract: "svml.generated-audio-set@1", audios: [artifact] });
- return fulfillment(result as unknown as CanonicalValue, canonicalize({
- provider: "xiaomi-mimo",
- requestedModel: model,
- outputBytes: bytes.byteLength,
- }));
+ return { value: { kind: "inline" as const, value: result as unknown as CanonicalValue } };
},
}));
@@ -245,7 +236,6 @@ export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOption
instance: options.instance ?? "xiaomi-mimo.default",
authority: options.authority ?? options.instance ?? "xiaomi-mimo.default",
implementation: {
- locator: "@narratage/provider-xiaomi-mimo/tts",
digest: xiaomiMimoProviderImplementationDigest,
},
configuration: canonicalize({
diff --git a/packages/provider-xiaomi-mimo/test/provider.test.ts b/packages/provider-xiaomi-mimo/test/provider.test.ts
index d2604f5f..d4ff4496 100644
--- a/packages/provider-xiaomi-mimo/test/provider.test.ts
+++ b/packages/provider-xiaomi-mimo/test/provider.test.ts
@@ -94,7 +94,7 @@ test("the official Provider maps all three model contracts without owning them",
assert.equal(String(input), "https://api.xiaomimimo.com/v1/chat/completions");
assert.equal(new Headers(init?.headers).get("api-key"), "test-key");
const body = JSON.parse(String(init?.body)) as Record<string, unknown>;
- assert.equal(body.model, item.request.model);
+ assert.equal(body.model, item.endpoint.capability.name);
assert.equal((body.messages as Array<Record<string, unknown>>).at(-1)?.role, "assistant");
assert.equal((body.messages as Array<Record<string, unknown>>).at(-1)?.content, "Keep every authored word.");
assert.equal("optimize_text_preview" in (body.audio as Record<string, unknown>), false);
diff --git a/packages/ranking/src/activation.ts b/packages/ranking/src/activation.ts
index 774a26d6..6a8c3cf6 100644
--- a/packages/ranking/src/activation.ts
+++ b/packages/ranking/src/activation.ts
@@ -11,34 +11,30 @@ import {
decodeTypewriterListSurface,
rankingComponent,
rankingManifest,
+ rankingMarkupSurfaces,
rankingModuleRef,
- rankingSurfaceImplementationDigests,
} from "./index.js";
const facets = [
- ["tier-style", rankingSurfaceImplementationDigests.tierStyle, decodeTierBoardStyleSurface],
- ["column-style", rankingSurfaceImplementationDigests.columnStyle, decodeColumnStyleSurface],
- ["top-three-style", rankingSurfaceImplementationDigests.topThreeStyle, decodeTopThreeStyleSurface],
- ["typewriter-style", rankingSurfaceImplementationDigests.typewriterStyle, decodeTypewriterListStyleSurface],
- ["tier", rankingSurfaceImplementationDigests.tier, decodeTierBoardSurface],
- ["column", rankingSurfaceImplementationDigests.column, decodeColumnSurface],
- ["top-three", rankingSurfaceImplementationDigests.topThree, decodeTopThreeSurface],
- ["typewriter", rankingSurfaceImplementationDigests.typewriter, decodeTypewriterListSurface],
+ ["tier-style", decodeTierBoardStyleSurface],
+ ["column-style", decodeColumnStyleSurface],
+ ["top-three-style", decodeTopThreeStyleSurface],
+ ["typewriter-style", decodeTypewriterListStyleSurface],
+ ["tier", decodeTierBoardSurface],
+ ["column", decodeColumnSurface],
+ ["top-three", decodeTopThreeSurface],
+ ["typewriter", decodeTypewriterListSurface],
] as const;
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/ranking",
modules: [{
manifest: rankingManifest,
- specifiers: [rankingModuleRef.name, `${rankingModuleRef.name}@1`],
}],
components: [rankingComponent],
- hostFacets: facets.map(([surface, implementationDigest, handler]) => createMarkupSurfaceHostFacet({
+ hostFacets: facets.map(([surface, handler]) => createMarkupSurfaceHostFacet({
module: rankingModuleRef,
- surface,
- mode: "structured",
- implementationDigest,
+ declaration: rankingMarkupSurfaces.find((item) => item.name === surface)!,
handler,
})),
};
diff --git a/packages/ranking/src/component.ts b/packages/ranking/src/component.ts
index 794bb734..0700a92e 100644
--- a/packages/ranking/src/component.ts
+++ b/packages/ranking/src/component.ts
@@ -91,7 +91,6 @@ function programInputs(inputs: ProducerHandlerContext["inputs"]) {
}
export const rankingComponent = {
- name: "@narratage/ranking",
producers: [
{
producer: rankingProducers.materializeTextItem,
diff --git a/packages/ranking/src/fragment.ts b/packages/ranking/src/fragment.ts
index 9af3ca05..24e2afc3 100644
--- a/packages/ranking/src/fragment.ts
+++ b/packages/ranking/src/fragment.ts
@@ -57,7 +57,6 @@ export function createRankingFragment(
variant: RankingVariant,
items: readonly RankingFragmentItem[],
sound: RankingFragmentSound,
- name = `@narratage/ranking/dynamic-${variant}@1`,
) {
if (items.length === 0) throw new Error("Ranking Fragment requires at least one Item.");
const selected = definition(variant);
@@ -167,7 +166,6 @@ export function createRankingFragment(
});
}
return sealGraphFragment({
- name,
inputs,
operations,
exports: [
diff --git a/packages/ranking/src/index.ts b/packages/ranking/src/index.ts
index 5c97b0c9..a880ed96 100644
--- a/packages/ranking/src/index.ts
+++ b/packages/ranking/src/index.ts
@@ -64,7 +64,7 @@ export {
rankingItemSpecSchema,
rankingTextItemShellSchema,
rankingItemSpecSetSchema,
- rankingManifest,
+ rankingManifest, rankingMarkupSurfaces,
rankingManifestDigest,
rankingModuleRef,
rankingProducers,
diff --git a/packages/ranking/src/manifest.ts b/packages/ranking/src/manifest.ts
index 305010e6..d615a8bd 100644
--- a/packages/ranking/src/manifest.ts
+++ b/packages/ranking/src/manifest.ts
@@ -109,7 +109,7 @@ export const rankingScheduleSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.ranking-schedule@1" } }, id: { schema: string },
variant: { schema: variants }, outer: { schema: frameSpan }, terminalFrame: { schema: unsigned },
entries: { schema: { kind: "array", minItems: 1, items: object({
- itemId: { schema: string }, triggerOccurrenceId: { schema: string }, triggerFrame: { schema: unsigned },
+ itemId: { schema: string }, triggerFrame: { schema: unsigned },
stage: { schema: frameSpan }, cumulative: { schema: frameSpan }, settled: { schema: frameSpan },
}) } },
});
@@ -140,8 +140,8 @@ export const rankingSurfaceImplementationDigests = {
topThree: digestOf("@narratage/ranking/top-three-surface@1"),
typewriter: digestOf("@narratage/ranking/typewriter-list-surface@1"),
} as const;
-const registered = (locator: string, digest: ReturnType<typeof digestOf>) => ({ kind: "registered" as const, locator, digest });
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({ abi: "svml.type-validator@1" as const, implementation: registered(locator, digest) });
+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],
@@ -150,6 +150,18 @@ const programDefinitions = [
["typewriter", rankingTypes.typewriterProgram, rankingTypes.typewriterStyle, rankingTypes.typewriterItems, rankingProducers.typewriterProgram, rankingProducers.typewriterEvents, rankingProducers.renderTypewriter, rankingImplementationDigests.typewriterProgram, rankingImplementationDigests.typewriterEvents, rankingImplementationDigests.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.schedule, rankingTypes.tierProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.tier } },
+ { name: "column", tag: "Column", mode: "structured", outputs: [rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.columnProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.column } },
+ { name: "top-three", tag: "TopThree", mode: "structured", outputs: [rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.topThreeProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.topThree } },
+ { name: "typewriter", tag: "TypewriterList", mode: "structured", outputs: [rankingTypes.textItemShell, textTypes.text, rankingTypes.schedule, rankingTypes.typewriterProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { digest: rankingSurfaceImplementationDigests.typewriter } },
+ ] as const;
+
+
export const rankingManifest: ModuleManifest = {
format: "svml.module@1", name: rankingModuleRef.name, version: rankingModuleRef.version,
dependencies: [artifactDependency, mediaDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, compositionDependency, textDependency],
@@ -158,9 +170,9 @@ export const rankingManifest: ModuleManifest = {
{ 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("@narratage/ranking/validate-schedule", rankingValidatorDigests.schedule) },
+ { name: rankingTypes.schedule.name, schema: rankingScheduleSchema, validator: validator(rankingValidatorDigests.schedule) },
{ name: rankingTypes.soundStyle.name, schema: rankingSoundStyleSchema },
- { name: rankingTypes.soundEvents.name, schema: rankingSoundEventsSchema, validator: validator("@narratage/ranking/validate-sound-events", rankingValidatorDigests.events) },
+ { name: rankingTypes.soundEvents.name, schema: rankingSoundEventsSchema, validator: validator(rankingValidatorDigests.events) },
{ name: rankingTypes.sounds.name, schema: rankingSoundSetSchema },
{ name: rankingTypes.tierStyle.name, schema: styleSchema("svml.tier-board-style@1") },
{ name: rankingTypes.columnStyle.name, schema: styleSchema("svml.column-style@1") },
@@ -170,76 +182,66 @@ export const rankingManifest: ModuleManifest = {
{ name: rankingTypes.columnItems.name, schema: setSchema("svml.column-item-set@1") },
{ name: rankingTypes.topThreeItems.name, schema: setSchema("svml.top-three-item-set@1") },
{ name: rankingTypes.typewriterItems.name, schema: setSchema("svml.typewriter-item-set@1") },
- { name: rankingTypes.tierProgram.name, schema: programSchema("svml.tier-board-program@1"), validator: validator("@narratage/ranking/validate-tier-board-program", rankingValidatorDigests.tierProgram) },
- { name: rankingTypes.columnProgram.name, schema: programSchema("svml.column-program@1"), validator: validator("@narratage/ranking/validate-column-program", rankingValidatorDigests.columnProgram) },
- { name: rankingTypes.topThreeProgram.name, schema: programSchema("svml.top-three-program@1"), validator: validator("@narratage/ranking/validate-top-three-program", rankingValidatorDigests.topThreeProgram) },
- { name: rankingTypes.typewriterProgram.name, schema: programSchema("svml.typewriter-list-program@1"), validator: validator("@narratage/ranking/validate-typewriter-list-program", rankingValidatorDigests.typewriterProgram) },
+ { name: rankingTypes.tierProgram.name, schema: programSchema("svml.tier-board-program@1"), validator: validator(rankingValidatorDigests.tierProgram) },
+ { name: rankingTypes.columnProgram.name, schema: programSchema("svml.column-program@1"), validator: validator(rankingValidatorDigests.columnProgram) },
+ { name: rankingTypes.topThreeProgram.name, schema: programSchema("svml.top-three-program@1"), validator: validator(rankingValidatorDigests.topThreeProgram) },
+ { name: rankingTypes.typewriterProgram.name, schema: programSchema("svml.typewriter-list-program@1"), validator: validator(rankingValidatorDigests.typewriterProgram) },
],
capabilities: [],
- surfaces: [
- { name: "tier-style", tag: "TierBoardStyle", mode: "structured", outputs: [rankingTypes.tierStyle, rankingTypes.soundStyle], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/tier-board-style-surface", digest: rankingSurfaceImplementationDigests.tierStyle } },
- { name: "column-style", tag: "ColumnStyle", mode: "structured", outputs: [rankingTypes.columnStyle, rankingTypes.soundStyle], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/column-style-surface", digest: rankingSurfaceImplementationDigests.columnStyle } },
- { name: "top-three-style", tag: "TopThreeStyle", mode: "structured", outputs: [rankingTypes.topThreeStyle, rankingTypes.soundStyle], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/top-three-style-surface", digest: rankingSurfaceImplementationDigests.topThreeStyle } },
- { name: "typewriter-style", tag: "TypewriterListStyle", mode: "structured", outputs: [rankingTypes.typewriterStyle, rankingTypes.soundStyle], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/typewriter-list-style-surface", digest: rankingSurfaceImplementationDigests.typewriterStyle } },
- { name: "tier", tag: "TierBoard", mode: "structured", outputs: [rankingTypes.schedule, rankingTypes.tierProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/tier-board-surface", digest: rankingSurfaceImplementationDigests.tier } },
- { name: "column", tag: "Column", mode: "structured", outputs: [rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.columnProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/column-surface", digest: rankingSurfaceImplementationDigests.column } },
- { name: "top-three", tag: "TopThree", mode: "structured", outputs: [rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.topThreeProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/top-three-surface", digest: rankingSurfaceImplementationDigests.topThree } },
- { name: "typewriter", tag: "TypewriterList", mode: "structured", outputs: [rankingTypes.textItemShell, textTypes.text, rankingTypes.schedule, rankingTypes.typewriterProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/typewriter-list-surface", digest: rankingSurfaceImplementationDigests.typewriter } },
- ],
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("@narratage/ranking/materialize-text-item", rankingImplementationDigests.materializeTextItem) },
- { name: rankingProducers.createSpecs.name, inputs: [{ name: "header", type: rankingTypes.header }], outputs: [{ name: "set", type: rankingTypes.itemSpecs }], needs: [], implementation: registered("@narratage/ranking/create-item-specs", 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("@narratage/ranking/append-item-spec", rankingImplementationDigests.appendSpec) },
+ { 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.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("@narratage/ranking/build-schedule", rankingImplementationDigests.schedule) },
+ ], outputs: [{ name: "schedule", type: rankingTypes.schedule }], needs: [], implementation: registered(rankingImplementationDigests.schedule) },
...([
- [rankingProducers.createTierItems, rankingTypes.tierItems, rankingImplementationDigests.createTierItems, "@narratage/ranking/create-tier-items"],
- [rankingProducers.createColumnItems, rankingTypes.columnItems, rankingImplementationDigests.createColumnItems, "@narratage/ranking/create-column-items"],
- [rankingProducers.createTopThreeItems, rankingTypes.topThreeItems, rankingImplementationDigests.createTopThreeItems, "@narratage/ranking/create-top-three-items"],
- [rankingProducers.createTypewriterItems, rankingTypes.typewriterItems, rankingImplementationDigests.createTypewriterItems, "@narratage/ranking/create-typewriter-items"],
- ] as const).map(([producer, type, implementationDigest, locator]) => ({
- name: producer.name, inputs: [], outputs: [{ name: "set", type }], needs: [], implementation: registered(locator, implementationDigest),
+ [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),
})),
- { 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("@narratage/ranking/append-tier-item", 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: [], implementation: registered(rankingImplementationDigests.appendTierItem) },
...([
- [rankingProducers.appendColumnItem, rankingTypes.columnItems, rankingImplementationDigests.appendColumnItem, "@narratage/ranking/append-column-item"],
- [rankingProducers.appendTopThreeItem, rankingTypes.topThreeItems, rankingImplementationDigests.appendTopThreeItem, "@narratage/ranking/append-top-three-item"],
- ] as const).map(([producer, type, implementationDigest, locator]) => ({
- name: producer.name, inputs: [{ name: "set", type }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type }], needs: [], implementation: registered(locator, implementationDigest),
+ [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.appendColumnIconItem, rankingTypes.columnItems, rankingImplementationDigests.appendColumnIconItem, "@narratage/ranking/append-column-icon-item"],
- [rankingProducers.appendTopThreeIconItem, rankingTypes.topThreeItems, rankingImplementationDigests.appendTopThreeIconItem, "@narratage/ranking/append-top-three-icon-item"],
- ] as const).map(([producer, type, implementationDigest, locator]) => ({
- name: producer.name, inputs: [{ name: "set", type }, { name: "spec", type: rankingTypes.itemSpec }, { name: "icon", type: mediaTypes.blobArtifact }], outputs: [{ name: "set", type }], needs: [], implementation: registered(locator, implementationDigest),
+ [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),
})),
- { name: rankingProducers.appendTypewriterItem.name, inputs: [{ name: "set", type: rankingTypes.typewriterItems }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type: rankingTypes.typewriterItems }], needs: [], implementation: registered("@narratage/ranking/append-typewriter-item", rankingImplementationDigests.appendTypewriterItem) },
+ { 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: 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(`@narratage/ranking/build-${name}-program`, programDigest) },
+ ], outputs: [{ name: "program", type: programType }], needs: [], implementation: registered(programDigest) },
{ 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(`@narratage/ranking/build-${name}-events`, eventDigest) },
- { name: renderProducer.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: programType }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered(`@narratage/ranking/render-${name}`, renderDigest) },
+ ], 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) },
]),
- { name: rankingProducers.createSounds.name, inputs: [], outputs: [{ name: "sounds", type: rankingTypes.sounds }], needs: [], implementation: registered("@narratage/ranking/create-sounds", rankingImplementationDigests.createSounds) },
+ { name: rankingProducers.createSounds.name, inputs: [], outputs: [{ name: "sounds", type: rankingTypes.sounds }], needs: [], implementation: registered(rankingImplementationDigests.createSounds) },
...([
- [rankingProducers.appendAppearSound, rankingImplementationDigests.appendAppearSound, "@narratage/ranking/append-appear-sound"],
- [rankingProducers.appendMoveSound, rankingImplementationDigests.appendMoveSound, "@narratage/ranking/append-move-sound"],
- ] as const).map(([producer, implementationDigest, locator]) => ({
- name: producer.name, inputs: [{ name: "sounds", type: rankingTypes.sounds }, { name: "media", type: mediaTypes.synchronized }], outputs: [{ name: "sounds", type: rankingTypes.sounds }], needs: [], implementation: registered(locator, implementationDigest),
+ [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),
})),
{ 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("@narratage/ranking/render-audio", rankingImplementationDigests.renderAudio) },
+ ], outputs: [{ name: "track", type: compositionTypes.audioTrack }], needs: [], implementation: registered(rankingImplementationDigests.renderAudio) },
],
};
diff --git a/packages/ranking/src/schedule.ts b/packages/ranking/src/schedule.ts
index c74f7642..64902aa7 100644
--- a/packages/ranking/src/schedule.ts
+++ b/packages/ranking/src/schedule.ts
@@ -413,11 +413,10 @@ export function buildRankingSchedule(input: {
const cumulative = resolved.cumulative[index]!;
return {
itemId: item.id,
- triggerOccurrenceId: exclusive.triggerId,
- triggerFrame: exclusive.span.startFrame,
- stage: { ...exclusive.span },
- cumulative: { ...cumulative.span },
- settled: { startFrame: exclusive.span.endFrameExclusive, endFrameExclusive: resolved.outer.endFrameExclusive },
+ triggerFrame: exclusive.startFrame,
+ stage: { ...exclusive },
+ cumulative: { ...cumulative },
+ settled: { startFrame: exclusive.endFrameExclusive, endFrameExclusive: resolved.outer.endFrameExclusive },
};
});
const result: RankingSchedule = {
@@ -449,7 +448,6 @@ export function assertRankingSchedule(value: RankingSchedule, space?: ProgramSpa
identity(entry.itemId, `RankingSchedule.entries.${index}.itemId`);
assert(!ids.has(entry.itemId), `RankingSchedule repeats ${entry.itemId}.`);
ids.add(entry.itemId);
- assert(entry.triggerOccurrenceId.length > 0, `RankingSchedule.entries.${index} has no occurrence identity.`);
frame(entry.triggerFrame, `RankingSchedule.entries.${index}.triggerFrame`);
assert(entry.triggerFrame > previous, "RankingSchedule trigger frames are not strictly increasing.");
previous = entry.triggerFrame;
diff --git a/packages/ranking/src/surface.ts b/packages/ranking/src/surface.ts
index 14b509d5..78186d98 100644
--- a/packages/ranking/src/surface.ts
+++ b/packages/ranking/src/surface.ts
@@ -337,7 +337,7 @@ function rankingSurface(variant: RankingVariant): StructuredSurfaceHandler {
}
inputs["sound-style"] = soundStyle.ref;
}
- const fragment = createRankingFragment(variant, items, sound, `@narratage/ranking/surface/${id}@1`);
+ const fragment = createRankingFragment(variant, items, sound);
return {
records,
components: [{
diff --git a/packages/ranking/src/types.ts b/packages/ranking/src/types.ts
index ba6eff58..988e3667 100644
--- a/packages/ranking/src/types.ts
+++ b/packages/ranking/src/types.ts
@@ -1,8 +1,4 @@
-import type {
- AudioTrack,
- FrameSpan,
- VisualTrack,
-} from "@narratage/composition";
+import type { FrameSpan } from "@narratage/composition";
import type {
FontArtifactRef,
SynchronizedMedia,
@@ -20,7 +16,6 @@ export type RankingHeader = {
export type RankingScheduleEntry = {
readonly itemId: string;
- readonly triggerOccurrenceId: string;
readonly triggerFrame: number;
readonly stage: FrameSpan;
readonly cumulative: FrameSpan;
@@ -277,11 +272,3 @@ export type RankingSoundSet = {
readonly appear?: SynchronizedMedia;
readonly move?: SynchronizedMedia;
};
-
-export type RankingVisualProduct = {
- readonly track: VisualTrack;
-};
-
-export type RankingAudioProduct = {
- readonly track: AudioTrack;
-};
diff --git a/packages/ranking/test/ranking.test.ts b/packages/ranking/test/ranking.test.ts
index 464a710e..78b29be5 100644
--- a/packages/ranking/test/ranking.test.ts
+++ b/packages/ranking/test/ranking.test.ts
@@ -91,13 +91,13 @@ const map: CompleteSemanticMap = {
contract: "svml.complete-semantic-map@1",
tokens: [],
anchors: [
- { identity: "outer-start", timeSec: 10 / 30, frame: 10 },
- { identity: "one", timeSec: 1, frame: 30 },
- { identity: "two", timeSec: 70 / 30, frame: 70 },
- { identity: "three", timeSec: 110 / 30, frame: 110 },
- { identity: "four", timeSec: 150 / 30, frame: 150 },
- { identity: "terminal", timeSec: 190 / 30, frame: 190 },
- { identity: "outer-end", timeSec: 230 / 30, frame: 230 },
+ { identity: "outer-start", frame: 10 },
+ { identity: "one", frame: 30 },
+ { identity: "two", frame: 70 },
+ { identity: "three", frame: 110 },
+ { identity: "four", frame: 150 },
+ { identity: "terminal", frame: 190 },
+ { identity: "outer-end", frame: 230 },
],
};
const outer: NarrativeSelectionRef = {
@@ -156,10 +156,10 @@ const typeSpec = (id: string, text: string, winner = false): TypewriterItemSpec
test("RankingSchedule zips authored item and Moment order and preserves a settled suffix", () => {
const owner = header("column", "tools");
const value = schedule(owner, [columnSpec("fourth"), columnSpec("third"), columnSpec("second")]);
- assert.deepEqual(value.entries.map((entry) => [entry.itemId, entry.triggerOccurrenceId, entry.stage, entry.cumulative]), [
- ["fourth", "next-rank#0", { startFrame: 30, endFrameExclusive: 70 }, { startFrame: 30, endFrameExclusive: 230 }],
- ["third", "next-rank#1", { startFrame: 70, endFrameExclusive: 110 }, { startFrame: 70, endFrameExclusive: 230 }],
- ["second", "next-rank#2", { startFrame: 110, endFrameExclusive: 190 }, { startFrame: 110, endFrameExclusive: 230 }],
+ assert.deepEqual(value.entries.map((entry) => [entry.itemId, entry.stage, entry.cumulative]), [
+ ["fourth", { startFrame: 30, endFrameExclusive: 70 }, { startFrame: 30, endFrameExclusive: 230 }],
+ ["third", { startFrame: 70, endFrameExclusive: 110 }, { startFrame: 70, endFrameExclusive: 230 }],
+ ["second", { startFrame: 110, endFrameExclusive: 190 }, { startFrame: 110, endFrameExclusive: 230 }],
]);
assert.deepEqual(value.entries.at(-1)?.settled, { startFrame: 190, endFrameExclusive: 230 });
});
diff --git a/packages/raster/src/activation.ts b/packages/raster/src/activation.ts
index d6b7174b..c02009e4 100644
--- a/packages/raster/src/activation.ts
+++ b/packages/raster/src/activation.ts
@@ -2,7 +2,6 @@ import { rasterManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/raster",
- modules: [{ manifest: rasterManifest, specifiers: ["@narratage/raster", "@narratage/raster@1"] }],
+ modules: [{ manifest: rasterManifest }],
};
export default svmlPackage;
diff --git a/packages/raster/src/manifest.ts b/packages/raster/src/manifest.ts
index 5814e9a8..e7b02284 100644
--- a/packages/raster/src/manifest.ts
+++ b/packages/raster/src/manifest.ts
@@ -10,7 +10,7 @@ export const rasterManifest: ModuleManifest = {
format: "svml.module@1", name: rasterModuleRef.name, version: rasterModuleRef.version,
dependencies: [artifactDependency], types: [],
capabilities: [{ name: rasterCapabilities.execute.name, returns: artifactTypes.blob }],
- producers: [], surfaces: [],
+ producers: [],
};
export const rasterManifestDigest = digestOf(rasterManifest);
export const rasterDependency = { module: rasterModuleRef, digest: rasterManifestDigest } as const;
diff --git a/packages/render-hyperframes/src/activation.ts b/packages/render-hyperframes/src/activation.ts
index 77696c92..f0073b82 100644
--- a/packages/render-hyperframes/src/activation.ts
+++ b/packages/render-hyperframes/src/activation.ts
@@ -1,17 +1,17 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeHyperframesRenderSurface, renderHyperframesComponent, renderHyperframesManifest,
- renderHyperframesModuleRef, renderHyperframesSurfaceImplementationDigest,
+ renderHyperframesModuleRef,
+ renderHyperframesMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/render-hyperframes",
- modules: [{ manifest: renderHyperframesManifest, specifiers: ["@narratage/render-hyperframes", "@narratage/render-hyperframes@1"] }],
+ modules: [{ manifest: renderHyperframesManifest }],
components: [renderHyperframesComponent],
hostFacets: [createMarkupSurfaceHostFacet({
- module: renderHyperframesModuleRef, surface: "video", mode: "structured",
- implementationDigest: renderHyperframesSurfaceImplementationDigest,
+ module: renderHyperframesModuleRef,
+ declaration: renderHyperframesMarkupSurfaces.find((item) => item.name === "video")!,
handler: decodeHyperframesRenderSurface,
})],
};
diff --git a/packages/render-hyperframes/src/component.ts b/packages/render-hyperframes/src/component.ts
index d85b767f..75774a17 100644
--- a/packages/render-hyperframes/src/component.ts
+++ b/packages/render-hyperframes/src/component.ts
@@ -9,7 +9,6 @@ import { renderHyperframesProducers } from "./manifest.js";
/** Declares the visual Need. It contains no renderer, queue, credentials or deployment choice. */
export const renderHyperframesComponent = {
- name: "@narratage/render-hyperframes",
producers: [{
producer: renderHyperframesProducers.requestVisual,
implementationDigest: requestHyperframesVisualImplementationDigest,
diff --git a/packages/render-hyperframes/src/fragment.ts b/packages/render-hyperframes/src/fragment.ts
index f14ab961..c4bf06e5 100644
--- a/packages/render-hyperframes/src/fragment.ts
+++ b/packages/render-hyperframes/src/fragment.ts
@@ -13,7 +13,6 @@ const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
export const renderHyperframesFragment = sealGraphFragment({
- name: "@narratage/render-hyperframes/video@1",
inputs: [
{ name: "composition", type: compositionTypes.composition },
{ name: "space", type: programSpaceTypes.programSpace },
diff --git a/packages/render-hyperframes/src/index.ts b/packages/render-hyperframes/src/index.ts
index c237758e..d64698c2 100644
--- a/packages/render-hyperframes/src/index.ts
+++ b/packages/render-hyperframes/src/index.ts
@@ -2,7 +2,7 @@ export { renderHyperframesFragment } from "./fragment.js";
export { renderHyperframesComponent } from "./component.js";
export {
renderHyperframesCapabilities,
- renderHyperframesManifest,
+ renderHyperframesManifest, renderHyperframesMarkupSurfaces,
renderHyperframesManifestDigest,
renderHyperframesModuleRef,
renderHyperframesProducers,
diff --git a/packages/render-hyperframes/src/manifest.ts b/packages/render-hyperframes/src/manifest.ts
index a8717b6e..85513d6e 100644
--- a/packages/render-hyperframes/src/manifest.ts
+++ b/packages/render-hyperframes/src/manifest.ts
@@ -31,6 +31,17 @@ export const renderHyperframesProducers = {
requestVisual: { module: renderHyperframesModuleRef, name: "request-visual-render" },
} satisfies Record<string, ProducerRef>;
+export const renderHyperframesMarkupSurfaces = [{
+ name: "video",
+ tag: "Video",
+ mode: "structured",
+ outputs: [],
+ implementation: {
+ digest: renderHyperframesSurfaceImplementationDigest,
+ },
+ }] as const;
+
+
export const renderHyperframesManifest: ModuleManifest = {
format: "svml.module@1",
name: renderHyperframesModuleRef.name,
@@ -47,17 +58,6 @@ export const renderHyperframesManifest: ModuleManifest = {
name: renderHyperframesCapabilities.renderVisual.name,
returns: mediaTypes.renderedVisual,
}],
- surfaces: [{
- name: "video",
- tag: "Video",
- mode: "structured",
- outputs: [],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/render-hyperframes/surface",
- digest: renderHyperframesSurfaceImplementationDigest,
- },
- }],
producers: [
{
name: renderHyperframesProducers.requestVisual.name,
@@ -69,8 +69,6 @@ export const renderHyperframesManifest: ModuleManifest = {
returns: mediaTypes.renderedVisual,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/render-hyperframes/request-visual",
digest: requestHyperframesVisualImplementationDigest,
},
},
diff --git a/packages/render-hyperframes/test/render.test.ts b/packages/render-hyperframes/test/render.test.ts
index 83a5a96b..735808e7 100644
--- a/packages/render-hyperframes/test/render.test.ts
+++ b/packages/render-hyperframes/test/render.test.ts
@@ -46,10 +46,10 @@ import {
renderHyperframesComponent,
renderHyperframesFragment,
renderHyperframesManifest,
+ renderHyperframesMarkupSurfaces,
renderHyperframesModuleRef,
renderHyperframesProducers,
hyperframesVisualRequest,
- renderHyperframesSurfaceImplementationDigest,
} from "@narratage/render-hyperframes";
import {
compileAudioProgramPlan,
@@ -58,8 +58,8 @@ import {
mediaPipelineComponents,
mediaPipelineCapabilities,
mediaPipelineManifest,
+ mediaPipelineMarkupSurfaces,
mediaPipelineModuleRef,
- mediaOperationSurfaceImplementationDigests,
mediaPipelineProducers,
} from "@narratage/media-pipeline";
import {
@@ -119,8 +119,6 @@ const spaceRecord = await admitRecord(closure, sealRecord({
origin,
}), validatorRegistry());
const linked = link(closure, [sealTypedModule({
- id: "author:render-hyperframes-test",
- closureDigest: closure.digest,
records: [compositionRecord, spaceRecord],
})]);
const instance = elaborateGraphFragment(linked, renderHyperframesFragment, {
@@ -216,9 +214,7 @@ test("separate visual, audio and mux Endpoints complete one author-visible rende
frameCount: request.document.frameCount,
canvas: request.document.canvas,
artifact: visualArtifact,
- muted: true,
})),
- metadata: { runtime: "fixture-local" },
};
},
);
@@ -232,11 +228,7 @@ test("separate visual, audio and mux Endpoints complete one author-visible rende
value: stored(sealTimelineAudio({
contract: "svml.timeline-audio@1",
artifact: audioArtifact,
- codec: "pcm_s16le",
- sampleRate: 48_000,
- channels: 2,
sampleFrames: request.plan.sampleFrames,
- loudness: "planned",
})),
};
},
@@ -296,8 +288,7 @@ test("a render Product with another frame domain is rejected by the explicit dow
digest: digestOf("render-hyperframes:wrong-domain"),
size: 1,
mediaType: "video/mp4",
- },
- muted: true,
+ },
})),
}),
);
@@ -316,11 +307,7 @@ test("a render Product with another frame domain is rejected by the explicit dow
size: 1,
mediaType: "audio/wav",
},
- codec: "pcm_s16le",
- sampleRate: request.plan.sampleRate,
- channels: 2,
sampleFrames: request.plan.sampleFrames,
- loudness: "planned",
})),
};
},
@@ -334,12 +321,17 @@ test("a render Product with another frame domain is rejected by the explicit dow
validators: validatorRegistry(),
}).run(build());
assert.equal(result.status, "paused");
- assert.match(result.journal.at(-1)?.message ?? "", /different presentation durations/u);
+ assert.match(result.outcomes.at(-1)?.message ?? "", /different presentation durations/u);
assert.equal(result.state.receipts.length, 2);
});
const fixtureModule = { name: "example.composition-fixture", version: "1" } as const;
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",
name: fixtureModule.name,
@@ -347,17 +339,6 @@ const fixtureManifest: ModuleManifest = {
dependencies: [compositionDependency, programSpaceDependency],
types: [],
capabilities: [],
- surfaces: [{
- name: "composition",
- tag: "Composition",
- mode: "structured",
- outputs: [compositionTypes.composition, programSpaceTypes.programSpace],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.composition-fixture/surface",
- digest: fixtureSurfaceDigest,
- },
- }],
producers: [],
};
@@ -378,26 +359,24 @@ test("the final rendered video is an ordinary BlobArtifact that can feed another
fixtureManifest,
]);
const surfaces = new MarkupSurfaceRegistry();
- surfaces.registerStructured(fixtureModule, "composition", fixtureSurfaceDigest, ({ element }) => ({
+ surfaces.registerStructured({ module: fixtureModule, declaration: fixtureSurface, handler: ({ element }) => ({
records: [
{ id: "composition", type: compositionTypes.composition, value: stored(composition), range: element.range },
{ id: "space", type: programSpaceTypes.programSpace, value: stored(space), range: element.range },
],
components: [],
fragments: [],
- }));
- surfaces.registerStructured(
- renderHyperframesModuleRef,
- "video",
- renderHyperframesSurfaceImplementationDigest,
- decodeHyperframesRenderSurface,
- );
- surfaces.registerStructured(
- mediaPipelineModuleRef,
- "extract-frame",
- mediaOperationSurfaceImplementationDigests.extractFrame,
- decodeExtractFrameSurface,
- );
+ }) });
+ surfaces.registerStructured({
+ module: renderHyperframesModuleRef,
+ declaration: renderHyperframesMarkupSurfaces.find((item) => item.name === "video")!,
+ handler: decodeHyperframesRenderSurface,
+ });
+ surfaces.registerStructured({
+ module: mediaPipelineModuleRef,
+ declaration: mediaPipelineMarkupSurfaces.find((item) => item.name === "extract-frame")!,
+ handler: decodeExtractFrameSurface,
+ });
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
@@ -425,8 +404,8 @@ test("the final rendered video is an ordinary BlobArtifact that can feed another
});
const target = resolveCompiledSourceExport(compiled, "poster.image", artifactTypes.blob);
assert.equal(target.ref.kind, "logical-output");
- const state = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const state = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [{ output: target.ref.kind === "logical-output" ? target.ref.id : "" }],
}));
assert.deepEqual(state.plan.steps.map((step) => step.producer.name).sort(), [
diff --git a/packages/run-markup/README.md b/packages/run-markup/README.md
index c7b55d37..cb90d940 100644
--- a/packages/run-markup/README.md
+++ b/packages/run-markup/README.md
@@ -11,7 +11,7 @@ One Run Source is self-described and names one Author Source explicitly:
<target output="final.video"/>
<build-record id="opening" build="prior-build-id" output="opening-take"/>
- <file id="approved" from="./approved.mp4" media-type="video/mp4"/>
+ <file id="approved" type="@narratage/artifact@1#BlobArtifact" from="./approved.mp4" media-type="video/mp4"/>
<satisfy output="opening-take" candidate="opening"/>
</svrun>
```
@@ -19,8 +19,9 @@ One Run Source is self-described and names one Author Source explicitly:
The Author Source's own Header—not this file and not its suffix—selects its Author Frontend.
`<value>` declares a typed zero-input `StoredValue`. `<file>` content-addresses ordinary source
-bytes as a zero-input BlobArtifact Candidate. `<build-record>` exposes a verified prior
-Build Record as a zero-input Candidate. `<fragment>` instantiates a trusted package Fragment and may
+bytes as the explicitly named blob Type; Run itself does not assume an Artifact module.
+`<build-record>` exposes a verified prior Build Record as a zero-input Candidate. `<fragment>`
+instantiates a trusted package Fragment and may
export several Candidates backed by shared Operations. Two declarations are two instances; one
declaration with several exports is one instance.
diff --git a/packages/run-markup/src/activation.ts b/packages/run-markup/src/activation.ts
index 41b01ef0..89539abd 100644
--- a/packages/run-markup/src/activation.ts
+++ b/packages/run-markup/src/activation.ts
@@ -1,9 +1,10 @@
+import { createRunFrontendHostFacet } from "@narratage/run";
+
import { runMarkupFrontend } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/run-markup",
- runFrontends: [runMarkupFrontend],
+ hostFacets: [createRunFrontendHostFacet(runMarkupFrontend)],
};
export default svmlPackage;
diff --git a/packages/run-markup/src/syntax.ts b/packages/run-markup/src/syntax.ts
index ca73770b..f7137ca0 100644
--- a/packages/run-markup/src/syntax.ts
+++ b/packages/run-markup/src/syntax.ts
@@ -15,7 +15,7 @@ import {
skipTextTrivia,
} from "@narratage/markup";
import type {
- SourceUnit,
+ MarkupSource,
StructuredElement,
} from "@narratage/markup";
@@ -125,8 +125,14 @@ function provided(element: StructuredElement): RunProvidedValue {
}
function file(element: StructuredElement): RunProvidedFile {
- exactAttributes(element, ["id", "from", "media-type"]);
+ exactAttributes(element, ["id", "type", "from", "media-type"]);
empty(element);
+ let type: TypeRef;
+ try {
+ type = parseTypeRef(stringAttribute(element, "type")!);
+ } catch (error) {
+ fail(element, "RUN_TYPE", error instanceof Error ? error.message : String(error));
+ }
const mediaType = stringAttribute(element, "media-type")!;
if (!/^[a-z0-9][a-z0-9!#$&^_.+-]*\/[a-z0-9][a-z0-9!#$&^_.+-]*$/iu.test(mediaType)) {
fail(element, "RUN_MEDIA_TYPE", "<file> media-type must be a concrete MIME media type");
@@ -134,6 +140,7 @@ function file(element: StructuredElement): RunProvidedFile {
return {
kind: "file",
id: stringAttribute(element, "id")!,
+ type,
from: stringAttribute(element, "from")!,
mediaType,
};
@@ -204,7 +211,7 @@ function unique(values: readonly string[], subject: string, element: StructuredE
/** Parse only the public Run language. No package code, Runtime or Provider executes here. */
function parseRunDocumentBody(name: string, text: string): RunDocument {
- const source: SourceUnit = { name, text };
+ const source: MarkupSource = { name, text };
const start = skipTextTrivia(source, 0);
const parsed = parseStructuredElement(source, start);
const end = skipTextTrivia(source, parsed.nextOffset);
diff --git a/packages/run/src/candidate.ts b/packages/run/src/candidate.ts
index 8809ffd4..4a65fd7c 100644
--- a/packages/run/src/candidate.ts
+++ b/packages/run/src/candidate.ts
@@ -8,14 +8,12 @@ import type {
Candidate,
StoredValue,
TypeRef,
- TypeValidationReceipt,
} from "@narratage/protocol";
export type ProvidedCandidateInput = {
readonly type: TypeRef;
readonly value: StoredValue;
readonly record?: string;
- readonly validation?: TypeValidationReceipt;
};
export type BuildRecordCandidateInput = {
@@ -47,7 +45,6 @@ export function createProvidedCandidate(input: ProvidedCandidateInput): Candidat
kind: "provided-candidate@1",
type: input.type,
value,
- ...(input.validation === undefined ? {} : { validation: input.validation }),
};
const suffix = digestOf(identity).slice("sha256:".length);
return {
@@ -58,7 +55,6 @@ export function createProvidedCandidate(input: ProvidedCandidateInput): Candidat
value: {
id: input.record ?? `provided:${suffix}`,
value,
- ...(input.validation === undefined ? {} : { validation: input.validation }),
},
},
};
@@ -82,6 +78,5 @@ export function createBuildRecordCandidate(input: BuildRecordCandidateInput): Ca
return createProvidedCandidate({
type: record.type,
value: record.value,
- ...(record.validation === undefined ? {} : { validation: record.validation }),
});
}
diff --git a/packages/run/src/facet.ts b/packages/run/src/facet.ts
index 8319f546..7682402d 100644
--- a/packages/run/src/facet.ts
+++ b/packages/run/src/facet.ts
@@ -9,8 +9,6 @@ import type {
export const runFragmentHostAbi = "svml.run-fragment-host@1";
export type RunFragmentHostFacetIdentity = {
- readonly contract: "svml.run-fragment-host-facet@1";
- readonly package: string;
readonly exports: readonly {
readonly name: string;
readonly fragment: string;
@@ -19,6 +17,7 @@ export type RunFragmentHostFacetIdentity = {
export type RunFragmentHostFacet = HostFacet & {
readonly abi: typeof runFragmentHostAbi;
+ readonly offers: readonly string[];
readonly identity: RunFragmentHostFacetIdentity;
readonly implementation: RunFragmentPackage;
};
@@ -39,9 +38,8 @@ export function createRunFragmentHostFacet(item: RunFragmentPackage): RunFragmen
if (item.name.trim().length === 0) throw new Error("Run Fragment Host facet package name is empty");
return {
abi: runFragmentHostAbi,
+ offers: [item.name],
identity: {
- contract: "svml.run-fragment-host-facet@1",
- package: item.name,
exports: normalizedExports(item.fragments),
},
implementation: item,
@@ -50,11 +48,10 @@ export function createRunFragmentHostFacet(item: RunFragmentPackage): RunFragmen
function sameIdentity(facet: RunFragmentHostFacet): boolean {
const expected: RunFragmentHostFacetIdentity = {
- contract: "svml.run-fragment-host-facet@1",
- package: facet.implementation.name,
exports: normalizedExports(facet.implementation.fragments),
};
- return canonicalStringify(facet.identity) === canonicalStringify(expected);
+ return canonicalStringify(facet.identity) === canonicalStringify(expected)
+ && canonicalStringify(facet.offers) === canonicalStringify([facet.implementation.name]);
}
/**
@@ -73,11 +70,7 @@ export function installRunFragmentHostFacets(
throw new Error("Run Fragment Host facet has an invalid identity or implementation");
}
const facet = opaque as RunFragmentHostFacet;
- if (facet.identity.contract !== "svml.run-fragment-host-facet@1") {
- throw new Error("Run Fragment Host facet has an unsupported identity");
- }
- if (typeof facet.identity.package !== "string"
- || !Array.isArray(facet.identity.exports)
+ if (!Array.isArray(facet.identity.exports)
|| typeof facet.implementation.name !== "string"
|| facet.implementation.fragments === null
|| typeof facet.implementation.fragments !== "object"
@@ -85,7 +78,7 @@ export function installRunFragmentHostFacets(
throw new Error("Run Fragment Host facet has an invalid package implementation");
}
if (!sameIdentity(facet)) {
- throw new Error(`Run Fragment Host facet ${facet.identity.package} differs from its locked identity`);
+ throw new Error(`Run Fragment Host facet ${facet.implementation.name} differs from its locked identity`);
}
registry.register(facet.implementation);
}
diff --git a/packages/run/src/frontend-facet.ts b/packages/run/src/frontend-facet.ts
new file mode 100644
index 00000000..76100196
--- /dev/null
+++ b/packages/run/src/frontend-facet.ts
@@ -0,0 +1,55 @@
+import type { HostFacet } from "@narratage/host";
+import { canonicalStringify, isDigest } from "@narratage/protocol";
+import { sourceFrontendPackageAbi } from "@narratage/source";
+
+import type { RunFrontend } from "./types.js";
+
+export type RunFrontendHostFacet = HostFacet & {
+ readonly abi: typeof sourceFrontendPackageAbi;
+ readonly offers: readonly [string];
+ readonly identity: {
+ readonly kind: "run";
+ readonly implementationDigest: string;
+ };
+ readonly implementation: RunFrontend;
+};
+
+export function createRunFrontendHostFacet(frontend: RunFrontend): RunFrontendHostFacet {
+ if (frontend.id.trim().length === 0 || !isDigest(frontend.implementationDigest)) {
+ throw new Error("Run Frontend Host facet has an invalid implementation identity");
+ }
+ return {
+ abi: sourceFrontendPackageAbi,
+ offers: [frontend.id],
+ identity: {
+ kind: "run",
+ implementationDigest: frontend.implementationDigest,
+ },
+ implementation: frontend,
+ };
+}
+
+export function runFrontendsFromHostFacets(facets: readonly HostFacet[]): readonly RunFrontend[] {
+ const values: RunFrontend[] = [];
+ for (const opaque of facets) {
+ if (opaque.abi !== sourceFrontendPackageAbi
+ || opaque.identity === null || typeof opaque.identity !== "object" || Array.isArray(opaque.identity)
+ || (opaque.identity as { readonly kind?: unknown }).kind !== "run") continue;
+ const facet = opaque as RunFrontendHostFacet;
+ const frontend = facet.implementation;
+ const expected = createRunFrontendHostFacet(frontend);
+ if (canonicalStringify(facet.offers) !== canonicalStringify(expected.offers)
+ || canonicalStringify(facet.identity) !== canonicalStringify(expected.identity)) {
+ throw new Error(`Run Frontend Host facet ${frontend.id} differs from its locked identity`);
+ }
+ values.push(frontend);
+ }
+ return values;
+}
+
+export function installRunFrontendHostFacets(
+ facets: readonly HostFacet[],
+ registry: { register(frontend: RunFrontend): void },
+): void {
+ for (const frontend of runFrontendsFromHostFacets(facets)) registry.register(frontend);
+}
diff --git a/packages/run/src/frontend.ts b/packages/run/src/frontend.ts
index 0508843d..2247f734 100644
--- a/packages/run/src/frontend.ts
+++ b/packages/run/src/frontend.ts
@@ -15,7 +15,6 @@ import type {
RunFrontendSourceUnit,
RunSourceClosure,
RunSourceUnit,
- RunSourceUnitIdentity,
} from "./types.js";
export class RunSourceError extends Error {
@@ -55,28 +54,16 @@ export function prepareRunSource(source: RunSourceUnit): RunFrontendSourceUnit {
...source,
text: maskSourceHeader(source.text, header),
header,
- sourceDigest: digestOf(source.text),
- };
-}
-
-function unitContent(unit: RunSourceUnitIdentity): Omit<RunSourceUnitIdentity, "id"> {
- return {
- format: "svml.run-source-unit@1",
- frontendRequest: unit.frontendRequest,
- frontend: unit.frontend,
- frontendDigest: unit.frontendDigest,
- sourceDigest: unit.sourceDigest,
- semanticDigest: unit.semanticDigest,
- authorSource: unit.authorSource,
- imports: [...unit.imports].sort((left, right) => left.as.localeCompare(right.as)),
};
}
function closureContent(closure: RunSourceClosure): Omit<RunSourceClosure, "id"> {
return {
format: "svml.run-source-closure@1",
- entry: closure.entry,
- units: [...closure.units].sort((left, right) => left.id.localeCompare(right.id)),
+ frontend: closure.frontend,
+ frontendDigest: closure.frontendDigest,
+ sourceDigest: closure.sourceDigest,
+ semanticDigest: closure.semanticDigest,
};
}
@@ -100,21 +87,12 @@ export async function compileRunSource(
"RUN_FRONTEND_DISCOVERY_DRIFT",
`${frontend.id} changed imports between discover and decode`,
);
- const unitWithoutId = {
- format: "svml.run-source-unit@1" as const,
- frontendRequest: prepared.header.using,
+ const closureWithoutId = {
+ format: "svml.run-source-closure@1" as const,
frontend: frontend.id,
frontendDigest: frontend.implementationDigest,
- sourceDigest: prepared.sourceDigest,
+ sourceDigest: digestOf(source.text),
semanticDigest: digestOf(decoded.document),
- authorSource: discovery.author.source,
- imports: [...discovery.imports].sort((left, right) => left.as.localeCompare(right.as)),
- };
- const unit: RunSourceUnitIdentity = { ...unitWithoutId, id: digestOf(unitWithoutId) };
- const closureWithoutId = {
- format: "svml.run-source-closure@1" as const,
- entry: unit.id,
- units: [unit],
};
const closure: RunSourceClosure = { ...closureWithoutId, id: digestOf(closureWithoutId) };
verifyRunSourceClosure(closure);
@@ -123,17 +101,9 @@ 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(isDigest(closure.id), "INVALID_RUN_SOURCE_CLOSURE_DIGEST", "Run Source Closure digest is invalid");
- const ids = new Set<string>();
- for (const unit of closure.units) {
- assert(unit.format === "svml.run-source-unit@1", "UNSUPPORTED_RUN_SOURCE_UNIT", "unsupported Run SourceUnit");
- assert(isDigest(unit.id) && unit.id === digestOf(unitContent(unit)), "RUN_SOURCE_UNIT_DIGEST_MISMATCH", `${unit.id} digest differs`);
- assert(!ids.has(unit.id), "DUPLICATE_RUN_SOURCE_UNIT", `Run Source Closure repeats ${unit.id}`);
- assert(isDigest(unit.frontendDigest), "INVALID_RUN_FRONTEND_DIGEST", `${unit.id} Frontend digest is invalid`);
- assert(isDigest(unit.sourceDigest), "INVALID_RUN_SOURCE_DIGEST", `${unit.id} source digest is invalid`);
- assert(isDigest(unit.semanticDigest), "INVALID_RUN_SEMANTIC_DIGEST", `${unit.id} semantic digest is invalid`);
- ids.add(unit.id);
- }
- assert(ids.has(closure.entry), "UNKNOWN_RUN_SOURCE_ENTRY", `Run Source entry ${closure.entry} is absent`);
+ assert(closure.frontend.trim().length > 0, "EMPTY_RUN_FRONTEND", "Run Source Frontend is empty");
+ assert(isDigest(closure.frontendDigest), "INVALID_RUN_FRONTEND_DIGEST", "Run Source Frontend digest is invalid");
+ assert(isDigest(closure.sourceDigest), "INVALID_RUN_SOURCE_DIGEST", "Run Source digest is invalid");
+ assert(isDigest(closure.semanticDigest), "INVALID_RUN_SEMANTIC_DIGEST", "Run Source semantic digest is invalid");
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 f72876be..b479c610 100644
--- a/packages/run/src/graph.ts
+++ b/packages/run/src/graph.ts
@@ -19,11 +19,9 @@ function assert(condition: unknown, code: string, message: string): asserts cond
if (!condition) throw new RunGraphError(code, message);
}
-function content(graph: RunGraph): Omit<RunGraph, "id"> {
+function content(graph: Omit<RunGraph, "id">): Omit<RunGraph, "id"> {
return {
format: "svml.run-graph@1",
- authorGraph: graph.authorGraph,
- sourceClosure: graph.sourceClosure,
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)),
@@ -32,7 +30,7 @@ function content(graph: RunGraph): Omit<RunGraph, "id"> {
}
export function sealRunGraph(input: Omit<RunGraph, "format" | "id">): RunGraph {
- const normalized = content({ format: "svml.run-graph@1", id: digestOf(null), ...input });
+ const normalized = content({ format: "svml.run-graph@1", ...input });
const graph: RunGraph = { ...normalized, id: digestOf(normalized) };
verifyRunGraph(graph);
return graph;
@@ -41,8 +39,6 @@ export function sealRunGraph(input: Omit<RunGraph, "format" | "id">): RunGraph {
export function verifyRunGraph(graph: RunGraph): void {
assert(graph.format === "svml.run-graph@1", "UNSUPPORTED_RUN_GRAPH", "unsupported Run Graph");
assert(isDigest(graph.id), "INVALID_RUN_GRAPH_DIGEST", "Run Graph digest is invalid");
- assert(isDigest(graph.authorGraph), "INVALID_RUN_AUTHOR_GRAPH", "Run Graph Author Graph digest is invalid");
- assert(isDigest(graph.sourceClosure), "INVALID_RUN_SOURCE_CLOSURE", "Run Graph Source Closure digest is invalid");
const candidateIds = new Set<string>();
for (const candidate of graph.candidates) {
assert(!candidateIds.has(candidate.id), "DUPLICATE_RUN_CANDIDATE", `Run Graph repeats Candidate ${candidate.id}`);
diff --git a/packages/run/src/index.ts b/packages/run/src/index.ts
index 38e31b8d..899b843c 100644
--- a/packages/run/src/index.ts
+++ b/packages/run/src/index.ts
@@ -25,6 +25,12 @@ export {
RunSourceError,
verifyRunSourceClosure,
} from "./frontend.js";
+export {
+ createRunFrontendHostFacet,
+ installRunFrontendHostFacets,
+ runFrontendsFromHostFacets,
+} from "./frontend-facet.js";
+export type { RunFrontendHostFacet } from "./frontend-facet.js";
export {
RunGraphError,
sealRunGraph,
diff --git a/packages/run/src/resolve.ts b/packages/run/src/resolve.ts
index 08b65648..89fc7c6f 100644
--- a/packages/run/src/resolve.ts
+++ b/packages/run/src/resolve.ts
@@ -41,7 +41,7 @@ export function collectRunModuleRequests(
continue;
}
if (declaration.kind === "file") {
- requests.add("@narratage/artifact@1");
+ requests.add(moduleRequest(declaration.type.module));
continue;
}
if (declaration.kind !== "fragment") continue;
@@ -123,7 +123,7 @@ export async function resolveRunDocument(
const value = await context.readFile(declaration.from, declaration.mediaType);
assertStoredValue(value, declaration.from);
const candidate = createProvidedCandidate({
- type: { module: { name: "@narratage/artifact", version: "1" }, name: "BlobArtifact" },
+ type: declaration.type,
value,
});
addCandidate(candidate);
@@ -176,8 +176,6 @@ export async function resolveRunDocument(
const resolvedCandidates = [...candidates.values()];
const resolvedOperations = [...operations.values()];
const graph = sealRunGraph({
- authorGraph: context.compilation.elaboration.graph.id,
- sourceClosure: context.sourceClosure.id,
candidates: resolvedCandidates,
operations: resolvedOperations,
satisfactions,
diff --git a/packages/run/src/types.ts b/packages/run/src/types.ts
index cf87371b..cec6765e 100644
--- a/packages/run/src/types.ts
+++ b/packages/run/src/types.ts
@@ -11,17 +11,12 @@ import type {
StoredValue,
TypeRef,
} from "@narratage/protocol";
-import type { SourceHeader } from "@narratage/source";
+import type { SourceHeader, SourceUnit } from "@narratage/source";
-export type RunSourceUnit = {
- readonly id: string;
- readonly name: string;
- readonly text: string;
-};
+export type RunSourceUnit = SourceUnit;
export type RunFrontendSourceUnit = RunSourceUnit & {
readonly header: SourceHeader;
- readonly sourceDigest: Digest;
};
export type RunAuthorSourceRequest = {
@@ -45,10 +40,11 @@ export type RunProvidedValue = {
readonly from: string;
};
-/** Ordinary source file admitted as one content-addressed BlobArtifact Candidate. */
+/** Ordinary source file admitted as one content-addressed Candidate of an explicitly named blob Type. */
export type RunProvidedFile = {
readonly kind: "file";
readonly id: string;
+ readonly type: TypeRef;
readonly from: string;
readonly mediaType: string;
};
@@ -116,23 +112,14 @@ export interface RunFrontendRegistryLike {
resolve(id: string): RunFrontend | undefined;
}
-export type RunSourceUnitIdentity = {
- readonly format: "svml.run-source-unit@1";
+/** One self-contained Run Source identity. Run Sources do not recursively import other Run Sources. */
+export type RunSourceClosure = {
+ readonly format: "svml.run-source-closure@1";
readonly id: Digest;
- readonly frontendRequest: string;
readonly frontend: string;
readonly frontendDigest: Digest;
readonly sourceDigest: Digest;
readonly semanticDigest: Digest;
- readonly authorSource: string;
- readonly imports: readonly RunImport[];
-};
-
-export type RunSourceClosure = {
- readonly format: "svml.run-source-closure@1";
- readonly id: Digest;
- readonly entry: Digest;
- readonly units: readonly RunSourceUnitIdentity[];
};
export type RunFragmentPackage = {
@@ -148,8 +135,6 @@ export interface RunFragmentRegistryLike {
export type RunGraph = {
readonly format: "svml.run-graph@1";
readonly id: Digest;
- readonly authorGraph: Digest;
- readonly sourceClosure: Digest;
readonly candidates: readonly Candidate[];
readonly operations: readonly OperationNode[];
readonly satisfactions: readonly Satisfaction[];
diff --git a/packages/run/test/run.test.ts b/packages/run/test/run.test.ts
index 60dc3e64..be238270 100644
--- a/packages/run/test/run.test.ts
+++ b/packages/run/test/run.test.ts
@@ -43,15 +43,12 @@ const manifest: ModuleManifest = {
{ name: mediaType.name, schema: { kind: "string" } },
],
capabilities: [],
- surfaces: [],
producers: [defaultProducer, previewProducer].map((producer) => ({
name: producer.name,
inputs: [{ name: "prompt", type: promptType }],
outputs: [{ name: "media", type: mediaType }],
needs: [],
implementation: {
- kind: "registered" as const,
- locator: `example.run/${producer.name}`,
digest: digestOf(`example.run/${producer.name}@1`),
},
})),
@@ -65,7 +62,7 @@ function fixture(): CompiledSourceClosure {
value: { kind: "inline", value: "A deliberate preview." },
origin: { kind: "authored" },
});
- const program = link(closure, [sealTypedModule({ id: "author:run", closureDigest: closure.digest, records: [prompt] })]);
+ const program = link(closure, [sealTypedModule({ records: [prompt] })]);
const graph = sealCompiledGraph({
program: program.semanticDigest,
outputs: ["left", "right"].map((id) => ({ id, type: mediaType, primary: "default:candidate" })),
@@ -83,7 +80,7 @@ function fixture(): CompiledSourceClosure {
});
return {
program,
- elaboration: { graph },
+ graph,
exports: [
{ name: "prompt", type: promptType, ref: { kind: "record", id: prompt.id } },
{ name: "left", type: mediaType, ref: { kind: "logical-output", id: "left" } },
@@ -94,7 +91,6 @@ function fixture(): CompiledSourceClosure {
function previewFragment() {
return sealGraphFragment({
- name: "shared-preview",
inputs: [{ name: "prompt", type: promptType }],
operations: [{
id: "preview",
@@ -114,12 +110,12 @@ function realize(compilation: CompiledSourceClosure, run: Awaited<ReturnType<typ
const selected = new Map(run.graph.satisfactions.map((item) => [item.output, item.candidate]));
return sealCompiledGraph({
program: compilation.program.semanticDigest,
- outputs: compilation.elaboration.graph.outputs.map((item) => ({
+ outputs: compilation.graph.outputs.map((item) => ({
...item,
primary: selected.get(item.id) ?? item.primary,
})),
- candidates: [...compilation.elaboration.graph.candidates, ...run.graph.candidates],
- operations: [...compilation.elaboration.graph.operations, ...run.graph.operations],
+ candidates: [...compilation.graph.candidates, ...run.graph.candidates],
+ operations: [...compilation.graph.operations, ...run.graph.operations],
});
}
@@ -185,14 +181,14 @@ test("a Provided Value is an ordinary zero-input Candidate", async () => {
const graph = realize(compilation, run);
const state = start(compilation.program, graph, sealBuildRequest({ graph: graph.id, targets: run.graph.targets }));
assert.equal(state.plan.steps.length, 0);
- assert.equal(state.plan.initialValues.length, 1);
+ assert.equal(state.records.filter((record) => record.origin.kind === "provided").length, 1);
});
test("a source file is an ordinary BlobArtifact Candidate", async () => {
const compiled = await compileDocument(`<svrun version="1">
<author source="./main.svml"/>
<target output="left"/>
- <file id="approved" from="./approved.mp4" media-type="video/mp4"/>
+ <file id="approved" type="@narratage/artifact@1#BlobArtifact" from="./approved.mp4" media-type="video/mp4"/>
<satisfy output="left" candidate="approved"/>
</svrun>`);
const compilation = fixture();
@@ -215,11 +211,11 @@ test("a source file is an ordinary BlobArtifact Candidate", async () => {
test("a Build Record resolves a Host Catalog alias without entering Core", async () => {
const compilation = fixture();
- let historical = start(compilation.program, compilation.elaboration.graph, sealBuildRequest({
- graph: compilation.elaboration.graph.id,
+ let historical = start(compilation.program, compilation.graph, sealBuildRequest({
+ graph: compilation.graph.id,
targets: [{ output: "left" }],
}));
- historical = reduce(historical).state;
+ historical = reduce(historical);
const command = historical.outstanding.find((item) => item.kind === "invoke-producer");
assert.ok(command);
const event = {
@@ -227,9 +223,8 @@ test("a Build Record resolves a Host Catalog alias without entering Core", async
command: command.id,
outputs: { media: { kind: "inline" as const, value: "archived media" } },
needs: {},
- validations: {},
};
- historical = reduce(historical, { ...event, id: `event:${digestOf(event)}` }).state;
+ historical = reduce(historical, { ...event, id: `event:${digestOf(event)}` });
const compiled = await compileDocument(`<svrun version="1">
<author source="./main.svml"/><target output="right"/>
@@ -270,7 +265,6 @@ test("a Target-only source still compiles one mandatory Run Graph", async () =>
readFile() { throw new Error("not used"); },
readBuild() { throw new Error("not used"); },
});
- assert.equal(run.graph.authorGraph, compilation.elaboration.graph.id);
assert.equal(run.graph.operations.length, 0);
assert.equal(run.graph.targets[0]?.output, "left");
});
@@ -279,10 +273,9 @@ test("Run Source Closure separates source bytes from semantic meaning", async ()
const first = await compileDocument(`<svrun version="1"><author source="./main.svml"/><target output="left"/></svrun>`);
const second = await compileDocument(`<svrun version="1"><author source="./main.svml"/>\n\n<target output="left"/></svrun>`);
assert.notEqual(first.closure.id, second.closure.id);
- assert.equal(first.closure.units[0]?.semanticDigest, second.closure.units[0]?.semanticDigest);
- const unit = first.closure.units[0]!;
+ assert.equal(first.closure.semanticDigest, second.closure.semanticDigest);
assert.throws(() => verifyRunSourceClosure({
...first.closure,
- units: [{ ...unit, sourceDigest: digestOf("tampered") }],
- }), (error: unknown) => error instanceof RunSourceError && error.code === "RUN_SOURCE_UNIT_DIGEST_MISMATCH");
+ sourceDigest: digestOf("tampered"),
+ }), (error: unknown) => error instanceof RunSourceError && error.code === "RUN_SOURCE_CLOSURE_DIGEST_MISMATCH");
});
diff --git a/packages/runtime-adapter/README.md b/packages/runtime-adapter/README.md
index 2064038c..4560c59d 100644
--- a/packages/runtime-adapter/README.md
+++ b/packages/runtime-adapter/README.md
@@ -3,11 +3,15 @@
Host ABI for turning locked Runtime Profile data into explicitly selected Endpoint and Runtime
service packages.
-One adapter has a unique `use` name and exactly one kind:
+One adapter is addressed by `(kind, use)`:
- `endpoint` constructs an external capability Endpoint;
- `runtime-service` constructs a Scheduler, Store or credential service package.
+The two kinds have separate Host ABIs, so an Endpoint and Runtime service 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.
+
An Endpoint adapter has one pure `activate()` declaration. It parses the selected configuration once
and returns the Endpoint package, optional diagnostics and an optional warm external service. The
Endpoint package is the only source of credentials, capabilities and scheduling facts.
diff --git a/packages/runtime-adapter/src/index.ts b/packages/runtime-adapter/src/index.ts
index 72c293bf..e76f19d2 100644
--- a/packages/runtime-adapter/src/index.ts
+++ b/packages/runtime-adapter/src/index.ts
@@ -10,12 +10,18 @@ import type { RuntimeServicePackage } from "@narratage/runtime";
import { credentialRef } from "@narratage/runtime";
import type { CredentialRef } from "@narratage/runtime";
-export const runtimeAdapterHostAbi = "svml.runtime-adapter-host@1";
+export const runtimeEndpointAdapterHostAbi = "svml.runtime-endpoint-adapter-host@1";
+export const runtimeServiceAdapterHostAbi = "svml.runtime-service-adapter-host@1";
export type RuntimeAdapterKind = "endpoint" | "runtime-service";
-export type RuntimeAdapterIdentity = {
- readonly contract: "svml.runtime-adapter-facet@1";
+export function runtimeAdapterHostAbi(kind: RuntimeAdapterKind):
+ | typeof runtimeEndpointAdapterHostAbi
+ | typeof runtimeServiceAdapterHostAbi {
+ return kind === "endpoint" ? runtimeEndpointAdapterHostAbi : runtimeServiceAdapterHostAbi;
+}
+
+type RuntimeAdapterAddress = {
readonly use: string;
readonly kind: RuntimeAdapterKind;
};
@@ -92,17 +98,14 @@ export type RuntimeServiceAdapterImplementation = {
};
export type RuntimeAdapterHostFacet = HostFacet & {
- readonly abi: typeof runtimeAdapterHostAbi;
- readonly identity: RuntimeAdapterIdentity;
+ readonly abi: ReturnType<typeof runtimeAdapterHostAbi>;
+ readonly identity?: never;
readonly implementation: RuntimeEndpointAdapterImplementation | RuntimeServiceAdapterImplementation;
};
export type RuntimeAdapterPackageBinding = {
- readonly packageName: string;
- /** Actual digest of the selected physical package bytes. */
- readonly packageArtifactDigest: Digest;
- /** Actual digest of this physical package's transitive dependency closure. */
- readonly packageClosureDigest: Digest;
+ /** Verified digest of the physical package and its complete dependency closure. */
+ readonly closureDigest: Digest;
};
type RuntimeAdapterRegistration = {
@@ -114,14 +117,14 @@ function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
-function identity(value: CanonicalValue): RuntimeAdapterIdentity {
- assert(value !== null && typeof value === "object" && !Array.isArray(value),
- "Runtime Adapter identity must be an object");
- const item = value as unknown as RuntimeAdapterIdentity;
- assert(item.contract === "svml.runtime-adapter-facet@1", "Runtime Adapter identity contract is unsupported");
- assert(item.use.trim().length > 0, "Runtime Adapter use name is empty");
- assert(item.kind === "endpoint" || item.kind === "runtime-service", "Runtime Adapter kind is invalid");
- return canonicalize(item) as unknown as RuntimeAdapterIdentity;
+function address(facet: RuntimeAdapterHostFacet): RuntimeAdapterAddress {
+ const kind = facet.abi === runtimeEndpointAdapterHostAbi
+ ? "endpoint"
+ : facet.abi === runtimeServiceAdapterHostAbi ? "runtime-service" : 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");
+ return { use: facet.offers[0]!, kind };
}
function implementation(
@@ -146,13 +149,10 @@ export function createRuntimeEndpointAdapterFacet(options: {
readonly use: string;
readonly activate: RuntimeEndpointAdapterImplementation["activate"];
}): RuntimeAdapterHostFacet {
+ assert(options.use.trim().length > 0, "Runtime Adapter use name is empty");
const facet: RuntimeAdapterHostFacet = {
- abi: runtimeAdapterHostAbi,
- identity: identity(canonicalize({
- contract: "svml.runtime-adapter-facet@1",
- use: options.use,
- kind: "endpoint",
- })),
+ abi: runtimeEndpointAdapterHostAbi,
+ offers: [options.use],
implementation: implementation({ activate: options.activate }, `Runtime Adapter ${options.use}`, "endpoint"),
};
return facet;
@@ -164,13 +164,10 @@ export function createRuntimeServiceAdapterFacet(options: {
readonly create: RuntimeServiceAdapterImplementation["create"];
readonly doctor?: RuntimeServiceAdapterImplementation["doctor"];
}): RuntimeAdapterHostFacet {
+ assert(options.use.trim().length > 0, "Runtime Adapter use name is empty");
return {
- abi: runtimeAdapterHostAbi,
- identity: identity(canonicalize({
- contract: "svml.runtime-adapter-facet@1",
- use: options.use,
- kind: "runtime-service",
- })),
+ abi: runtimeServiceAdapterHostAbi,
+ offers: [options.use],
implementation: implementation({
validate: options.validate,
create: options.create,
@@ -180,10 +177,10 @@ export function createRuntimeServiceAdapterFacet(options: {
}
export function isRuntimeAdapterHostFacet(value: HostFacet): value is RuntimeAdapterHostFacet {
- if (value.abi !== runtimeAdapterHostAbi) return false;
try {
- identity(value.identity);
- implementation(value.implementation, "Runtime Adapter", identity(value.identity).kind);
+ assert(value.identity === undefined, "Runtime Adapter facet must not carry a second identity");
+ const resolved = address(value as RuntimeAdapterHostFacet);
+ implementation(value.implementation, "Runtime Adapter", resolved.kind);
return true;
} catch {
return false;
@@ -192,17 +189,14 @@ export function isRuntimeAdapterHostFacet(value: HostFacet): value is RuntimeAda
function boundImplementationDigest(
binding: RuntimeAdapterPackageBinding,
- adapter: RuntimeAdapterIdentity,
+ adapter: RuntimeAdapterAddress,
facet: string,
declared: Digest,
): Digest {
- assert(isDigest(binding.packageArtifactDigest), `${binding.packageName} package Artifact digest is invalid`);
- assert(isDigest(binding.packageClosureDigest), `${binding.packageName} package Closure digest is invalid`);
+ assert(isDigest(binding.closureDigest), "Runtime Adapter package Closure digest is invalid");
return digestOf({
contract: "svml.loaded-runtime-implementation@1",
- package: binding.packageName,
- packageArtifact: binding.packageArtifactDigest,
- packageClosure: binding.packageClosureDigest,
+ closure: binding.closureDigest,
adapter,
facet,
declared,
@@ -232,7 +226,7 @@ function proxyRegistrar(
function bindEndpointPackage(
value: EndpointPackage,
- adapter: RuntimeAdapterIdentity,
+ adapter: RuntimeAdapterAddress,
binding: RuntimeAdapterPackageBinding | undefined,
): EndpointPackage {
if (binding === undefined) return value;
@@ -257,7 +251,7 @@ function bindEndpointPackage(
function bindServicePackage(
value: RuntimeServicePackage,
- adapter: RuntimeAdapterIdentity,
+ adapter: RuntimeAdapterAddress,
binding: RuntimeAdapterPackageBinding | undefined,
): RuntimeServicePackage {
if (binding === undefined) return value;
@@ -279,18 +273,20 @@ function bindServicePackage(
export class RuntimeAdapterRegistry {
readonly #registrations = new Map<string, RuntimeAdapterRegistration>();
+ #key(use: string, kind: RuntimeAdapterKind): string {
+ return `${kind}\u0000${use}`;
+ }
+
#register(facet: RuntimeAdapterHostFacet, binding?: RuntimeAdapterPackageBinding): void {
- assert(facet.abi === runtimeAdapterHostAbi, `Runtime Adapter ${facet.abi} ABI is unsupported`);
- const normalized = identity(facet.identity);
- implementation(facet.implementation, `Runtime Adapter ${normalized.use}`, normalized.kind);
- assert(!this.#registrations.has(normalized.use), `Runtime Adapter ${normalized.use} is already registered`);
+ 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(binding.packageName.trim().length > 0, "Runtime Adapter physical package name is empty");
- assert(isDigest(binding.packageArtifactDigest), `${binding.packageName} package Artifact digest is invalid`);
- assert(isDigest(binding.packageClosureDigest), `${binding.packageName} package Closure digest is invalid`);
+ assert(isDigest(binding.closureDigest), "Runtime Adapter package Closure digest is invalid");
}
- this.#registrations.set(normalized.use, {
- facet: { ...facet, identity: normalized },
+ this.#registrations.set(key, {
+ facet,
...(binding === undefined ? {} : { binding }),
});
}
@@ -301,8 +297,9 @@ export class RuntimeAdapterRegistry {
}
has(use: string, kind?: RuntimeAdapterKind): boolean {
- const value = this.#registrations.get(use);
- return value !== undefined && (kind === undefined || value.facet.identity.kind === kind);
+ return kind === undefined
+ ? this.#registrations.has(this.#key(use, "endpoint")) || this.#registrations.has(this.#key(use, "runtime-service"))
+ : this.#registrations.has(this.#key(use, kind));
}
/**
@@ -315,19 +312,13 @@ export class RuntimeAdapterRegistry {
kind: RuntimeAdapterKind,
context: RuntimeAdapterFactoryContext,
): readonly RuntimeDoctorDiagnostic[] {
- const value = this.#registrations.get(use);
+ 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,
}];
- if (value.facet.identity.kind !== kind) return [{
- severity: "error",
- code: "RUNTIME_ADAPTER_KIND",
- message: `Runtime Adapter ${use} is ${value.facet.identity.kind}, not ${kind}`,
- subject: use,
- }];
assert(kind === "runtime-service", "Endpoint configuration is validated by its activation");
(value.facet.implementation as RuntimeServiceAdapterImplementation).validate(context);
return [];
@@ -337,9 +328,8 @@ export class RuntimeAdapterRegistry {
use: string,
context: RuntimeAdapterFactoryContext,
): Promise<RuntimeEndpointActivation> {
- const value = this.#registrations.get(use);
+ const value = this.#registrations.get(this.#key(use, "endpoint"));
assert(value !== undefined, `Runtime Endpoint adapter ${use} is not registered`);
- assert(value.facet.identity.kind === "endpoint", `Runtime Adapter ${use} is not an Endpoint adapter`);
const implementation = value.facet.implementation as RuntimeEndpointAdapterImplementation;
const activation = await implementation.activate(context);
assert(activation !== null && typeof activation === "object", `Runtime Endpoint adapter ${use} returned no activation`);
@@ -353,7 +343,7 @@ export class RuntimeAdapterRegistry {
`Runtime Endpoint adapter ${use} activation diagnose must be a function`);
return {
...activation,
- endpoint: bindEndpointPackage(activation.endpoint, value.facet.identity, value.binding),
+ endpoint: bindEndpointPackage(activation.endpoint, { use, kind: "endpoint" }, value.binding),
};
}
@@ -362,9 +352,8 @@ export class RuntimeAdapterRegistry {
}
async createService(use: string, context: RuntimeAdapterFactoryContext): Promise<RuntimeServicePackage> {
- const value = this.#registrations.get(use);
+ const value = this.#registrations.get(this.#key(use, "runtime-service"));
assert(value !== undefined, `Runtime service adapter ${use} is not registered`);
- assert(value.facet.identity.kind === "runtime-service", `Runtime Adapter ${use} is not a Runtime service adapter`);
const implementation = value.facet.implementation as RuntimeServiceAdapterImplementation;
implementation.validate(context);
const created = await implementation.create(context);
@@ -372,13 +361,12 @@ export class RuntimeAdapterRegistry {
assert(service.instance.id === context.instance || service.instance.id.startsWith(`${context.instance}.`),
`Runtime Adapter ${use} created service ${service.instance.id} outside configured namespace ${context.instance}`);
}
- return bindServicePackage(created, value.facet.identity, value.binding);
+ return bindServicePackage(created, { use, kind: "runtime-service" }, value.binding);
}
async doctor(use: string, kind: RuntimeAdapterKind, context: RuntimeAdapterFactoryContext): Promise<readonly RuntimeDoctorDiagnostic[]> {
- const value = this.#registrations.get(use);
+ 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 }];
- if (value.facet.identity.kind !== kind) return [{ severity: "error", code: "RUNTIME_ADAPTER_KIND", message: `Runtime Adapter ${use} is ${value.facet.identity.kind}, not ${kind}`, subject: use }];
assert(kind === "runtime-service", "Endpoint diagnostics belong to its activation");
const diagnose = (value.facet.implementation as RuntimeServiceAdapterImplementation).doctor;
return diagnose === undefined ? [] : await diagnose(context);
diff --git a/packages/runtime-adapter/test/registry.test.ts b/packages/runtime-adapter/test/registry.test.ts
index bbdcab5f..305c422e 100644
--- a/packages/runtime-adapter/test/registry.test.ts
+++ b/packages/runtime-adapter/test/registry.test.ts
@@ -1,8 +1,6 @@
import assert from "node:assert/strict";
import test from "node:test";
-import { digestOf } from "@narratage/protocol";
-
import {
createRuntimeEndpointAdapterFacet,
createRuntimeServiceAdapterFacet,
@@ -47,6 +45,18 @@ test("a facet declares which kind it is, and the registry keeps the two apart",
assert.equal(registry.has("example.absent"), false);
});
+test("Endpoint and Runtime Service may intentionally share one logical spelling", () => {
+ const registry = new RuntimeAdapterRegistry();
+ registry.registerFacet(endpoint("example.shared"));
+ registry.registerFacet(createRuntimeServiceAdapterFacet({
+ use: "example.shared",
+ validate() {},
+ create: () => ({ services: [] }) as never,
+ }));
+ assert.ok(registry.has("example.shared", "endpoint"));
+ assert.ok(registry.has("example.shared", "runtime-service"));
+});
+
test("asking an Endpoint adapter for a Runtime Service is refused, not coerced", async () => {
const registry = new RuntimeAdapterRegistry();
registry.registerFacet(endpoint("example.endpoint"));
@@ -67,7 +77,7 @@ test("a Runtime Service adapter cannot escape its configured instance namespace"
);
});
-test("one name is one adapter, so a second registration is an error rather than a winner", () => {
+test("one kind and logical name has one adapter, so a second registration is an error", () => {
const registry = new RuntimeAdapterRegistry();
registry.registerFacet(endpoint("example.endpoint"));
assert.throws(() => registry.registerFacet(endpoint("example.endpoint")), /already registered/u);
@@ -172,18 +182,11 @@ test("Runtime config readers accept a value or refuse it; they never guess one",
/**
* Pin.
*
- * A package lock records a `facetsDigest` derived from these identities. If the
- * identity of an unchanged adapter shifted, every recorded lock would fail
- * verification for a reason nobody changed on purpose — which has happened once
- * already, when `kind` was renamed. The constant makes that a visible edit.
+ * ABI and offers carry the address. Identity must not repeat it.
*/
-test("an unchanged adapter keeps its identity, because locks are addressed by it", () => {
+test("an adapter stores its address once", () => {
const facet = endpoint("@narratage/example-provider");
- assert.deepEqual(facet.identity, {
- contract: "svml.runtime-adapter-facet@1",
- use: "@narratage/example-provider",
- kind: "endpoint",
- });
- assert.equal(digestOf(facet.identity),
- "sha256:c9ce6e18b3d02f65148cfc06b016ae0a7dee00430558bb393472726fb91a756f");
+ assert.equal("identity" in facet, false);
+ assert.deepEqual(facet.offers, ["@narratage/example-provider"]);
+ assert.equal(facet.abi, "svml.runtime-endpoint-adapter-host@1");
});
diff --git a/packages/runtime/README.md b/packages/runtime/README.md
index bada6bbc..80ed5c73 100644
--- a/packages/runtime/README.md
+++ b/packages/runtime/README.md
@@ -10,7 +10,7 @@ The first implementation contains:
- static Runtime Module facets, sealed Profile resolution and a content-addressed Runtime Closure;
- exact Endpoint capability/return bindings and implementation digests;
- `BuildStore` and `OperationStore` ports with compare-and-swap in-memory references;
-- a recoverable Endpoint lifecycle that journals before `start`, checkpoints `pending`,
+- 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 `RuntimeServicePackage` ABI that binds configured Scheduler, BuildStore,
@@ -31,8 +31,8 @@ An Endpoint's vendor-side job system remains internal and cannot advance another
content-addressed 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.
-Nothing in the Operation journal becomes an accepted domain fact until an Endpoint completion is
-validated and reduced by Core. If a process stops after completion is journaled but before Core
+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
call the Endpoint again.
diff --git a/packages/runtime/src/catalog.ts b/packages/runtime/src/catalog.ts
index d25b8481..8f3acb75 100644
--- a/packages/runtime/src/catalog.ts
+++ b/packages/runtime/src/catalog.ts
@@ -3,12 +3,10 @@ import type {
Digest,
LogicalOutputRef,
RecordRef,
- TypeRef,
} from "@narratage/protocol";
export type BuildCatalogAlias = {
readonly name: string;
- readonly type: TypeRef;
readonly ref: RecordRef | LogicalOutputRef;
};
@@ -42,12 +40,6 @@ function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
-function verifyType(type: TypeRef, subject: string): void {
- assert(type.module.name.trim().length > 0, `${subject} module name is empty`);
- assert(type.module.version.trim().length > 0, `${subject} module version is empty`);
- assert(type.name.trim().length > 0, `${subject} type name is empty`);
-}
-
export function verifyBuildCatalogDescriptor(descriptor: BuildCatalogDescriptor): void {
assert(descriptor.format === "svml.build-catalog-descriptor@1", "Build Catalog descriptor format is invalid");
assert(isDigest(descriptor.core), "Build Catalog Core identity is invalid");
@@ -61,7 +53,6 @@ export function verifyBuildCatalogDescriptor(descriptor: BuildCatalogDescriptor)
assert(alias.name.trim().length > 0, "Build Catalog alias name is empty");
assert(!names.has(alias.name), `Build Catalog repeats alias ${alias.name}`);
names.add(alias.name);
- verifyType(alias.type, `Build Catalog alias ${alias.name}`);
assert(alias.ref.kind === "record" || alias.ref.kind === "logical-output",
`Build Catalog alias ${alias.name} has an unsupported reference`);
assert(alias.ref.id.trim().length > 0, `Build Catalog alias ${alias.name} reference is empty`);
diff --git a/packages/runtime/src/dispatch.ts b/packages/runtime/src/dispatch.ts
index 3f103b11..e98eb3c8 100644
--- a/packages/runtime/src/dispatch.ts
+++ b/packages/runtime/src/dispatch.ts
@@ -1,5 +1,5 @@
-import { canonicalize, digestOf, isDigest } from "@narratage/protocol";
-import type { CanonicalValue, Digest } from "@narratage/protocol";
+import { digestOf, isDigest } from "@narratage/protocol";
+import type { Digest } from "@narratage/protocol";
export type DispatchAdmission = "open" | "closing" | "closed";
export type DispatchPhase = "queued" | "leased" | "waiting" | "blocked" | "settling" | "terminal";
@@ -18,8 +18,8 @@ export type BuildDispatchIdentity = {
readonly id: Digest;
readonly build: string;
readonly core: Digest;
- /** Exact execution revision for Runtime services and Endpoint deployment. */
- readonly runtimeRevision: Digest;
+ /** Exact Runtime Closure selected for this execution domain. */
+ readonly runtimeClosure: Digest;
};
export type BuildDispatchSnapshot = BuildDispatchIdentity & {
@@ -44,8 +44,8 @@ export type BuildDispatchCreate =
| { readonly status: "existing"; readonly snapshot: BuildDispatchSnapshot };
export type BuildDispatchClaim = {
- /** Exact Runtime Revision this Worker can execute. Claims are filtered before leasing. */
- readonly runtimeRevision: Digest;
+ /** Exact Runtime Closure this Worker can execute. Claims are filtered before leasing. */
+ readonly runtimeClosure: Digest;
readonly owner: string;
readonly token: string;
readonly now: number;
@@ -150,42 +150,6 @@ export type BuildDispatchStore = {
listCapacity(): Promise<readonly CapacityReservation[]>;
};
-export type RuntimeJournalKind =
- | "dispatch-created"
- | "dispatch-claimed"
- | "dispatch-released"
- | "dispatch-terminal"
- | "cancellation-requested"
- | "worker-started"
- | "worker-stopped"
- | "capacity-acquired"
- | "capacity-released"
- | "operation-control";
-
-export type RuntimeJournalEntry = {
- readonly format: "svml.runtime-journal-entry@1";
- readonly sequence: number;
- readonly at: number;
- readonly kind: RuntimeJournalKind;
- readonly build?: string;
- readonly operation?: Digest;
- readonly worker?: string;
- readonly detail: CanonicalValue;
-};
-
-export type RuntimeJournalQuery = {
- readonly after?: number;
- readonly build?: string;
- readonly operation?: Digest;
- readonly worker?: string;
- readonly limit?: number;
-};
-
-export type RuntimeJournal = {
- append(entry: Omit<RuntimeJournalEntry, "format" | "sequence">): Promise<RuntimeJournalEntry>;
- list(query?: RuntimeJournalQuery): Promise<readonly RuntimeJournalEntry[]>;
-};
-
function assert(condition: unknown, message: string): asserts condition {
if (!condition) throw new Error(message);
}
@@ -203,34 +167,20 @@ function positive(value: number, subject: string): number {
export function createBuildDispatchIdentity(input: {
readonly build: string;
readonly core: Digest;
- readonly runtimeRevision: Digest;
+ readonly runtimeClosure: Digest;
}): 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.runtimeRevision), "Build Dispatch Runtime Revision digest is invalid");
+ assert(isDigest(input.runtimeClosure), "Build Dispatch Runtime Closure digest is invalid");
const content = {
format: "svml.build-dispatch-identity@1" as const,
build: input.build,
core: input.core,
- runtimeRevision: input.runtimeRevision,
+ runtimeClosure: input.runtimeClosure,
};
return { ...content, id: digestOf(content) };
}
-export function createRuntimeRevision(input: {
- readonly runtimeClosure: Digest;
- readonly runtimePackageClosure?: Digest;
-}): Digest {
- assert(isDigest(input.runtimeClosure), "Runtime Revision Runtime Closure digest is invalid");
- assert(input.runtimePackageClosure === undefined || isDigest(input.runtimePackageClosure),
- "Runtime Revision Runtime package closure digest is invalid");
- return digestOf({
- format: "svml.runtime-revision@1",
- runtimeClosure: input.runtimeClosure,
- runtimePackageClosure: input.runtimePackageClosure ?? null,
- });
-}
-
export function verifyBuildDispatchIdentity(value: BuildDispatchIdentity): void {
const expected = createBuildDispatchIdentity(value);
assert(value.format === expected.format && value.id === expected.id, "Build Dispatch identity differs");
@@ -260,23 +210,23 @@ export function verifyBuildDispatchSnapshot(value: BuildDispatchSnapshot): void
}
/**
- * One DispatchStore is one execution domain. It may admit only one Runtime Revision while work is
+ * 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 assertRuntimeRevisionAdmission(
- runtimeRevision: Digest,
+export function assertRuntimeClosureAdmission(
+ runtimeClosure: Digest,
dispatches: readonly BuildDispatchSnapshot[],
): void {
- assert(isDigest(runtimeRevision), "Runtime Revision digest is invalid");
+ assert(isDigest(runtimeClosure), "Runtime Closure digest is invalid");
const conflicts = dispatches
- .filter((item) => item.phase !== "terminal" && item.runtimeRevision !== runtimeRevision)
+ .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 Revision ${runtimeRevision} cannot enter this execution domain while unfinished Builds belong to another revision:`,
- ...conflicts.map((item) => ` ${item.build} · ${item.phase} · ${item.runtimeRevision}`),
+ `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"));
}
@@ -310,16 +260,3 @@ export function verifyCapacityReservation(value: CapacityReservation): void {
safeNonNegative(value.createdAt, "Capacity reservation createdAt");
safeNonNegative(value.updatedAt, "Capacity reservation updatedAt");
}
-
-export function verifyRuntimeJournalEntry(value: RuntimeJournalEntry): void {
- assert(value.format === "svml.runtime-journal-entry@1", "Runtime Journal entry format is unsupported");
- positive(value.sequence, "Runtime Journal sequence");
- safeNonNegative(value.at, "Runtime Journal timestamp");
- assert([
- "dispatch-created", "dispatch-claimed", "dispatch-released", "dispatch-terminal",
- "cancellation-requested", "worker-started", "worker-stopped", "capacity-acquired",
- "capacity-released", "operation-control",
- ].includes(value.kind), "Runtime Journal kind is invalid");
- if (value.operation !== undefined) assert(isDigest(value.operation), "Runtime Journal Operation digest is invalid");
- canonicalize(value.detail);
-}
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index a55ce155..1826a4f2 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -1,3 +1,4 @@
+export { plannedNeeds } from "@narratage/core";
export { MemoryBuildStore } from "./memory.js";
export {
MemoryBuildCatalog,
@@ -14,23 +15,20 @@ export {
} from "./credentials.js";
export type * from "./credentials.js";
export {
- assertRuntimeRevisionAdmission,
+ assertRuntimeClosureAdmission,
capacityReservationId,
createBuildDispatchIdentity,
- createRuntimeRevision,
nonTerminalDispatchPhases,
verifyBuildDispatchIdentity,
verifyBuildDispatchSnapshot,
verifyCapacityLimits,
verifyCapacityReservation,
verifyDispatchLease,
- verifyRuntimeJournalEntry,
} from "./dispatch.js";
export type * from "./dispatch.js";
export {
MemoryOperationStore,
operationCancellationRequestId,
- sealOperationCompletion,
sealOperationIdentity,
verifyOperationIdentity,
verifyOperationCancellationControl,
diff --git a/packages/runtime/src/memory.ts b/packages/runtime/src/memory.ts
index ea2d1d02..135493e9 100644
--- a/packages/runtime/src/memory.ts
+++ b/packages/runtime/src/memory.ts
@@ -18,7 +18,7 @@ function durableState(state: BuildState): BuildState {
return normalized;
}
-/** Reference CAS store for tests and one-process local Builds. It is not an Operation journal. */
+/** Reference CAS Store for tests and one-process local Builds. It does not persist Operations. */
export class MemoryBuildStore implements BuildStore {
readonly #builds = new Map<string, BuildSnapshot>();
diff --git a/packages/runtime/src/operations.ts b/packages/runtime/src/operations.ts
index 286d0a07..30109ce1 100644
--- a/packages/runtime/src/operations.ts
+++ b/packages/runtime/src/operations.ts
@@ -13,16 +13,12 @@ export type OperationIdentity = {
readonly endpoint: string;
readonly authority: string;
readonly route: string;
- readonly implementationDigest: Digest;
readonly runtimeClosure: Digest;
- readonly requestDigest: Digest;
readonly attempt: number;
};
export type OperationCompletion = {
readonly value: StoredValue;
- readonly metadata?: CanonicalValue;
- readonly digest: Digest;
};
export type OperationFailure = {
@@ -76,7 +72,7 @@ export type OperationUpdate =
}
| {
readonly status: "completed";
- readonly completion: Omit<OperationCompletion, "digest">;
+ readonly completion: OperationCompletion;
}
| { readonly status: "failed"; readonly failure: OperationFailure }
| { readonly status: "cancelled"; readonly cancellation: OperationCancellationControl }
@@ -97,7 +93,6 @@ export type OperationQuery = {
readonly authority?: string;
readonly route?: string;
readonly runtimeClosure?: Digest;
- readonly requestDigest?: Digest;
};
export type OperationStore = {
@@ -129,9 +124,7 @@ function identityContent(value: Omit<OperationIdentity, "id">): Omit<OperationId
endpoint: value.endpoint,
authority: value.authority,
route: value.route,
- implementationDigest: value.implementationDigest,
runtimeClosure: value.runtimeClosure,
- requestDigest: value.requestDigest,
attempt: value.attempt,
};
}
@@ -144,9 +137,7 @@ export function sealOperationIdentity(
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.implementationDigest), "Operation implementation digest is invalid");
assert(isDigest(value.runtimeClosure), "Operation Runtime Closure digest is invalid");
- assert(isDigest(value.requestDigest), "Operation request digest is invalid");
positiveInteger(value.attempt, "Operation attempt");
const content = identityContent({
format: "svml.operation-identity@1",
@@ -161,20 +152,6 @@ export function verifyOperationIdentity(identity: OperationIdentity): void {
&& identity.id === expected.id, "Operation identity differs");
}
-function completionContent(value: Omit<OperationCompletion, "digest">) {
- return {
- value: structuredClone(value.value),
- ...(value.metadata === undefined ? {} : { metadata: structuredClone(value.metadata) }),
- };
-}
-
-export function sealOperationCompletion(
- value: Omit<OperationCompletion, "digest">,
-): OperationCompletion {
- const content = completionContent(value);
- return { ...content, digest: digestOf(content) };
-}
-
export function verifyOperationSnapshot(snapshot: OperationSnapshot): void {
verifyOperationIdentity(snapshot);
assert(Number.isSafeInteger(snapshot.revision) && snapshot.revision >= 0, "Operation revision is invalid");
@@ -208,8 +185,6 @@ export function verifyOperationSnapshot(snapshot: OperationSnapshot): void {
}
if (snapshot.status === "completed") {
assert(snapshot.completion !== undefined && presence === 1, "completed Operation requires only completion");
- const expected = sealOperationCompletion(snapshot.completion);
- assert(snapshot.completion.digest === expected.digest, "Operation completion digest differs");
}
if (snapshot.status === "failed") {
assert(snapshot.failure !== undefined && presence === 1, "failed Operation requires only failure");
@@ -253,7 +228,7 @@ function copy(snapshot: OperationSnapshot): OperationSnapshot {
return structuredClone(snapshot);
}
-/** In-process reference journal. Durable/distributed adapters must add leases around the same CAS law. */
+/** In-process reference Store. Durable/distributed adapters must preserve the same CAS law. */
export class MemoryOperationStore implements OperationStore {
readonly #operations = new Map<Digest, OperationSnapshot>();
@@ -284,7 +259,6 @@ export class MemoryOperationStore implements OperationStore {
.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.requestDigest === undefined || snapshot.requestDigest === query.requestDigest)
.sort((left, right) => left.attempt - right.attempt || left.id.localeCompare(right.id))
.map(copy);
}
@@ -320,7 +294,7 @@ export class MemoryOperationStore implements OperationStore {
...(update.progress === undefined ? {} : { progress: structuredClone(update.progress) }),
}
: update.status === "completed"
- ? { status: "completed" as const, completion: sealOperationCompletion(update.completion) }
+ ? { status: "completed" as const, completion: structuredClone(update.completion) }
: update.status === "failed"
? { status: "failed" as const, failure: structuredClone(update.failure) }
: { status: "cancelled" as const, cancellation: structuredClone(update.cancellation) };
@@ -332,9 +306,7 @@ export class MemoryOperationStore implements OperationStore {
endpoint: current.endpoint,
authority: current.authority,
route: current.route,
- implementationDigest: current.implementationDigest,
runtimeClosure: current.runtimeClosure,
- requestDigest: current.requestDigest,
attempt: current.attempt,
revision: current.revision + 1,
...mutable,
diff --git a/packages/runtime/src/profile.ts b/packages/runtime/src/profile.ts
index 6f54af81..6fba1bb4 100644
--- a/packages/runtime/src/profile.ts
+++ b/packages/runtime/src/profile.ts
@@ -1,4 +1,4 @@
-import { resolveProducer } from "@narratage/core";
+import { plannedNeeds } from "@narratage/core";
import { digestOf, isDigest } from "@narratage/protocol";
import type {
BuildState,
@@ -14,7 +14,6 @@ export type RuntimeFacetRole =
| "build-store"
| "operation-store"
| "dispatch-store"
- | "runtime-journal"
| "artifact-store"
| "credential-store"
| "capability-endpoint";
@@ -27,7 +26,6 @@ export type RuntimeFacetRef = {
};
export type RuntimeImplementation = {
- readonly locator: string;
readonly digest: Digest;
};
@@ -69,7 +67,7 @@ export type RuntimeProfileInstance = {
/** 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 configurationDigest: Digest;
};
export type RuntimeEndpointBinding = RuntimeCapability & {
@@ -78,8 +76,6 @@ export type RuntimeEndpointBinding = RuntimeCapability & {
export type RuntimeProfile = {
readonly format: "svml.runtime-profile@1";
- readonly digest: Digest;
- readonly name: string;
readonly instances: readonly RuntimeProfileInstance[];
readonly scheduler: string;
readonly worker: string;
@@ -87,7 +83,6 @@ export type RuntimeProfile = {
readonly build: string;
readonly operations: string;
readonly dispatch: string;
- readonly journal: string;
readonly artifacts: string;
readonly credentials: readonly string[];
};
@@ -124,7 +119,6 @@ export type ResolvedRuntimeInstance = ResolvedRuntimeService | ResolvedRuntimeEn
export type RuntimeClosure = {
readonly format: "svml.runtime-closure@1";
readonly digest: Digest;
- readonly profile: Digest;
readonly modules: readonly { readonly module: ModuleRef; readonly digest: Digest }[];
readonly instances: readonly ResolvedRuntimeInstance[];
readonly scheduler: string;
@@ -187,9 +181,8 @@ function sortedUniqueStrings(values: readonly string[], subject: string): readon
}
function normalizeImplementation(value: RuntimeImplementation, subject: string): RuntimeImplementation {
- assert(value.locator.trim().length > 0, `${subject} implementation locator is empty`);
assert(isDigest(value.digest), `${subject} implementation digest is invalid`);
- return { locator: value.locator, digest: value.digest };
+ return { digest: value.digest };
}
function normalizeCapability(value: RuntimeCapability): RuntimeCapability {
@@ -271,8 +264,7 @@ export class RuntimeModuleRegistry {
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.locator === resolved.facet.implementation.locator
- && instance.implementation.digest === resolved.facet.implementation.digest,
+ 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`);
@@ -287,18 +279,15 @@ export class RuntimeModuleRegistry {
}
}
-function profileContent(profile: RuntimeProfile): Omit<RuntimeProfile, "digest"> {
+function profileContent(profile: RuntimeProfile): RuntimeProfile {
return {
format: "svml.runtime-profile@1",
- name: profile.name,
instances: [...profile.instances]
.map((instance) => ({
id: instance.id,
facet: { module: { ...instance.facet.module }, name: instance.facet.name },
...(instance.authority === undefined ? {} : { authority: instance.authority }),
- ...(instance.configurationDigest === undefined
- ? {}
- : { configurationDigest: instance.configurationDigest }),
+ configurationDigest: instance.configurationDigest,
}))
.sort((left, right) => left.id.localeCompare(right.id)),
scheduler: profile.scheduler,
@@ -307,7 +296,6 @@ function profileContent(profile: RuntimeProfile): Omit<RuntimeProfile, "digest">
build: profile.stores.build,
operations: profile.stores.operations,
dispatch: profile.stores.dispatch,
- journal: profile.stores.journal,
artifacts: profile.stores.artifacts,
credentials: [...profile.stores.credentials].sort(),
},
@@ -325,14 +313,12 @@ function profileContent(profile: RuntimeProfile): Omit<RuntimeProfile, "digest">
function verifyProfileShape(profile: RuntimeProfile): void {
assert(profile.format === "svml.runtime-profile@1", "unsupported Runtime Profile format");
- assert(profile.name.trim().length > 0, "Runtime Profile name is empty");
assert(profile.scheduler.trim().length > 0, "Runtime Profile scheduler is empty");
assert(profile.worker.trim().length > 0, "Runtime Profile worker is empty");
for (const [name, id] of Object.entries({
build: profile.stores.build,
operations: profile.stores.operations,
dispatch: profile.stores.dispatch,
- journal: profile.stores.journal,
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");
@@ -344,9 +330,7 @@ function verifyProfileShape(profile: RuntimeProfile): void {
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`);
- if (instance.configurationDigest !== undefined) {
- assert(isDigest(instance.configurationDigest), `${instance.id} configuration digest is invalid`);
- }
+ assert(isDigest(instance.configurationDigest), `${instance.id} configuration digest is invalid`);
return instance.id;
});
assert(new Set(ids).size === ids.length, "Runtime Profile repeats an instance id");
@@ -364,27 +348,23 @@ function verifyProfileShape(profile: RuntimeProfile): void {
}
export function sealRuntimeProfile(
- value: Omit<RuntimeProfile, "format" | "digest">,
+ value: Omit<RuntimeProfile, "format">,
): RuntimeProfile {
const draft: RuntimeProfile = {
format: "svml.runtime-profile@1",
- digest: digestOf("unsealed-runtime-profile"),
...value,
};
verifyProfileShape(draft);
- const content = profileContent(draft);
- return { ...content, digest: digestOf(content) };
+ return profileContent(draft);
}
export function verifyRuntimeProfile(profile: RuntimeProfile): void {
verifyProfileShape(profile);
- assert(isDigest(profile.digest) && profile.digest === digestOf(profileContent(profile)), "Runtime Profile digest differs");
}
-function closureContent(closure: RuntimeClosure): Omit<RuntimeClosure, "digest"> {
+function closureContent(closure: Omit<RuntimeClosure, "digest">): Omit<RuntimeClosure, "digest"> {
return {
format: "svml.runtime-closure@1",
- profile: closure.profile,
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))
@@ -404,7 +384,6 @@ function closureContent(closure: RuntimeClosure): Omit<RuntimeClosure, "digest">
export function verifyRuntimeClosure(closure: RuntimeClosure): void {
assert(closure.format === "svml.runtime-closure@1", "unsupported Runtime Closure format");
- assert(isDigest(closure.profile), "Runtime Closure profile digest is invalid");
assert(isDigest(closure.digest) && closure.digest === digestOf(closureContent(closure)), "Runtime Closure digest differs");
positiveInteger(closure.scheduling.maxConcurrency, "Runtime Closure maxConcurrency");
const moduleKeys = closure.modules.map((item) => {
@@ -443,7 +422,6 @@ export function verifyRuntimeClosure(closure: RuntimeClosure): void {
build: "build-store",
operations: "operation-store",
dispatch: "dispatch-store",
- journal: "runtime-journal",
artifacts: "artifact-store",
} as const;
for (const [name, role] of Object.entries(roles) as [keyof typeof roles, typeof roles[keyof typeof roles]][]) {
@@ -482,7 +460,7 @@ export function resolveRuntimeProfile(
id: instance.id,
facet: { module: { ...instance.facet.module }, name: instance.facet.name },
implementation: { ...resolved.facet.implementation },
- configurationDigest: instance.configurationDigest ?? digestOf({}),
+ 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`);
@@ -507,7 +485,6 @@ export function resolveRuntimeProfile(
build: "build-store",
operations: "operation-store",
dispatch: "dispatch-store",
- journal: "runtime-journal",
artifacts: "artifact-store",
} as const;
for (const [name, role] of Object.entries(storeRoles) as [keyof typeof storeRoles, typeof storeRoles[keyof typeof storeRoles]][]) {
@@ -528,10 +505,8 @@ export function resolveRuntimeProfile(
if (instances.some((instance) => instance.role === "capability-endpoint" && instance.credentialSlots.length > 0)) {
assert(profile.stores.credentials.length > 0, "credentialed Endpoints require a CredentialStore");
}
- const draft: RuntimeClosure = {
+ const draft: Omit<RuntimeClosure, "digest"> = {
format: "svml.runtime-closure@1",
- digest: digestOf("unsealed-runtime-closure"),
- profile: profile.digest,
modules: [...modules.values()],
instances,
scheduler: profile.scheduler,
@@ -558,15 +533,7 @@ export function runtimeEndpoint(
/** Fail before execution if the selected finite BuildPlan has an unbound external requirement. */
export function verifyRuntimeCoverage(closure: RuntimeClosure, state: BuildState): void {
verifyRuntimeClosure(closure);
- const required = new Map<string, RuntimeCapability>();
- for (const step of state.plan.steps) {
- const producer = resolveProducer(state.program.closure, step.producer);
- for (const need of producer.needs) {
- const requirement = { capability: need.capability, returns: need.returns };
- required.set(bindingKey(requirement), requirement);
- }
- }
- for (const requirement of required.values()) {
+ for (const requirement of plannedNeeds(state)) {
assert(
closure.endpoints.some((binding) => sameCapability(binding, requirement)),
`Runtime Closure does not bind demanded capability ${bindingKey(requirement)}`,
diff --git a/packages/runtime/src/scheduler.ts b/packages/runtime/src/scheduler.ts
index 90e7be49..e0192e59 100644
--- a/packages/runtime/src/scheduler.ts
+++ b/packages/runtime/src/scheduler.ts
@@ -11,17 +11,16 @@ import type {
RuntimeRunnableCommand,
ScheduledBuild,
ScheduledBuildResult,
- SchedulerJournalEntry,
+ SchedulerExecutionOutcome,
} from "./types.js";
type MutableBuild = {
readonly id: string;
state: BuildState;
revision: number | undefined;
- readonly journal: SchedulerJournalEntry[];
+ readonly outcomes: SchedulerExecutionOutcome[];
blocked: ScheduledBuildResult["blocked"];
stopped: boolean;
- completedEvents: number;
};
type ActiveResult = {
@@ -56,14 +55,12 @@ export class LocalBuildScheduler implements BuildScheduler {
readonly #executor: RuntimeCommandExecutor;
readonly #maxConcurrency: number;
readonly #resourceLimits: Readonly<Record<string, number>>;
- readonly #maxEventsPerBuild: number;
readonly #runtimeClosure: RuntimeClosure | undefined;
readonly #buildStore: BuildSchedulerOptions["buildStore"];
constructor(executor: RuntimeCommandExecutor, options: BuildSchedulerOptions = {}) {
this.#executor = executor;
this.#maxConcurrency = positiveInteger(options.maxConcurrency ?? 4, "maxConcurrency");
- this.#maxEventsPerBuild = positiveInteger(options.maxEventsPerBuild ?? 1_000, "maxEventsPerBuild");
this.#runtimeClosure = options.runtimeClosure === undefined
? undefined
: structuredClone(options.runtimeClosure);
@@ -106,10 +103,9 @@ export class LocalBuildScheduler implements BuildScheduler {
id: request.id,
state,
revision,
- journal: [],
+ outcomes: [],
blocked: [],
stopped: false,
- completedEvents: 0,
});
}
const active = new Map<string, ActiveCommand>();
@@ -220,7 +216,7 @@ export class LocalBuildScheduler implements BuildScheduler {
const build = settled.build;
if (settled.execution === undefined) {
build.stopped = true;
- build.journal.push({
+ build.outcomes.push({
command: settled.command.command.id,
kind: settled.command.command.kind,
resources: settled.command.resources.map((resource) => resource.id),
@@ -231,7 +227,7 @@ export class LocalBuildScheduler implements BuildScheduler {
}
if (settled.execution.status === "pending") {
build.stopped = true;
- build.journal.push({
+ build.outcomes.push({
command: settled.command.command.id,
kind: settled.command.command.kind,
resources: settled.command.resources.map((resource) => resource.id),
@@ -243,7 +239,7 @@ export class LocalBuildScheduler implements BuildScheduler {
}
if (settled.execution.status === "deferred") {
build.stopped = true;
- build.journal.push({
+ build.outcomes.push({
command: settled.command.command.id,
kind: settled.command.command.kind,
resources: settled.command.resources.map((resource) => resource.id),
@@ -255,31 +251,18 @@ export class LocalBuildScheduler implements BuildScheduler {
}
const event = settled.execution.event;
try {
- const next = reduce(build.state, event).state;
+ const next = reduce(build.state, event);
await persist(build, next);
- build.completedEvents += 1;
- build.journal.push({
+ build.outcomes.push({
command: settled.command.command.id,
kind: settled.command.command.kind,
resources: settled.command.resources.map((resource) => resource.id),
status: "completed",
event: event.id,
});
- if (build.completedEvents >= this.#maxEventsPerBuild
- && build.state.status !== "complete"
- && build.state.status !== "failed") {
- build.stopped = true;
- build.journal.push({
- command: settled.command.command.id,
- kind: settled.command.command.kind,
- resources: settled.command.resources.map((resource) => resource.id),
- status: "error",
- message: `Build exceeded ${this.#maxEventsPerBuild} accepted events`,
- });
- }
} catch (error) {
build.stopped = true;
- build.journal.push({
+ build.outcomes.push({
command: settled.command.command.id,
kind: settled.command.command.kind,
resources: settled.command.resources.map((resource) => resource.id),
@@ -295,7 +278,7 @@ export class LocalBuildScheduler implements BuildScheduler {
? "complete"
: build.state.status === "failed" ? "failed" : "paused",
state: build.state,
- journal: [...build.journal],
+ outcomes: [...build.outcomes],
blocked: [...build.blocked],
}));
}
diff --git a/packages/runtime/src/services.ts b/packages/runtime/src/services.ts
index 82cfd581..0c4178b3 100644
--- a/packages/runtime/src/services.ts
+++ b/packages/runtime/src/services.ts
@@ -3,7 +3,8 @@ import type { CanonicalValue, Digest, ModuleRef } from "@narratage/protocol";
import { CompositeCredentialStore } from "./credentials.js";
import type { CredentialStore } from "./credentials.js";
-import type { BuildDispatchStore, RuntimeJournal } from "./dispatch.js";
+import type { BuildCatalog } from "./catalog.js";
+import type { BuildDispatchStore } from "./dispatch.js";
import type { OperationStore } from "./operations.js";
import {
RuntimeModuleRegistry,
@@ -31,7 +32,6 @@ export type RuntimeWorkerService = RuntimeServiceBase<"worker", RuntimeWorkerFac
export type RuntimeBuildStoreService = RuntimeServiceBase<"build-store", BuildStore>;
export type RuntimeOperationStoreService = RuntimeServiceBase<"operation-store", OperationStore>;
export type RuntimeDispatchStoreService = RuntimeServiceBase<"dispatch-store", BuildDispatchStore>;
-export type RuntimeJournalService = RuntimeServiceBase<"runtime-journal", RuntimeJournal>;
export type RuntimeArtifactStoreService = RuntimeServiceBase<"artifact-store", ArtifactStore>;
export type RuntimeCredentialStoreService = RuntimeServiceBase<"credential-store", CredentialStore>;
@@ -41,15 +41,15 @@ export type RuntimeService =
| RuntimeBuildStoreService
| RuntimeOperationStoreService
| RuntimeDispatchStoreService
- | RuntimeJournalService
| RuntimeArtifactStoreService
| RuntimeCredentialStoreService;
/** One configured deployment package may expose several exact Runtime services. */
export type RuntimeServicePackage = {
- readonly name: string;
readonly manifest: RuntimeModuleManifest;
readonly services: readonly RuntimeService[];
+ /** Optional Host-facing index owned by the same durable Build store; never part of Runtime selection. */
+ readonly buildCatalog?: BuildCatalog;
close?(): void | Promise<void>;
};
@@ -58,7 +58,6 @@ type RuntimeServiceDefinitionBase<Role extends RuntimeServiceFacetRole, Service>
readonly facet: string;
readonly instance: string;
readonly implementation: {
- readonly locator: string;
readonly digest: Digest;
};
readonly configuration?: CanonicalValue;
@@ -71,14 +70,14 @@ export type RuntimeServiceDefinition =
| RuntimeServiceDefinitionBase<"build-store", BuildStore>
| RuntimeServiceDefinitionBase<"operation-store", OperationStore>
| RuntimeServiceDefinitionBase<"dispatch-store", BuildDispatchStore>
- | RuntimeServiceDefinitionBase<"runtime-journal", RuntimeJournal>
| RuntimeServiceDefinitionBase<"artifact-store", ArtifactStore>
| RuntimeServiceDefinitionBase<"credential-store", CredentialStore>;
export type DefineRuntimeServicePackageOptions = {
- readonly name?: string;
readonly module: ModuleRef;
readonly services: readonly RuntimeServiceDefinition[];
+ /** Host presentation index co-owned with this package's BuildStore, if any. */
+ readonly buildCatalog?: BuildCatalog;
readonly close?: () => void | Promise<void>;
};
@@ -89,7 +88,6 @@ export type RuntimeServiceSelection = {
readonly build: string;
readonly operations: string;
readonly dispatch: string;
- readonly journal: string;
readonly artifacts: string;
readonly credentials: readonly string[];
};
@@ -103,7 +101,6 @@ export type RuntimeServiceAssembly = {
readonly buildStore: BuildStore;
readonly operationStore: OperationStore;
readonly dispatchStore: BuildDispatchStore;
- readonly journal: RuntimeJournal;
readonly artifactStore: ArtifactStore;
readonly credentialStore: CredentialStore;
close(): Promise<void>;
@@ -150,10 +147,6 @@ function verifyServicePort(service: RuntimeService): void {
"acquireCapacity", "heartbeatCapacity", "parkCapacity", "releaseCapacity", "clearCapacity", "listCapacity",
]) callable(service.service, method, service.instance.id);
break;
- case "runtime-journal":
- callable(service.service, "append", service.instance.id);
- callable(service.service, "list", service.instance.id);
- break;
case "artifact-store":
callable(service.service, "put", service.instance.id);
callable(service.service, "get", service.instance.id);
@@ -178,7 +171,6 @@ export function defineRuntimeServicePackage(
assert(definition.instance.trim().length > 0, "Runtime service instance is empty");
assert(!instances.has(definition.instance), `Runtime service instance ${definition.instance} is duplicated`);
assert(!facets.has(definition.facet), `Runtime service facet ${definition.facet} is duplicated`);
- assert(definition.implementation.locator.trim().length > 0, `${definition.instance} implementation locator is empty`);
assert(isDigest(definition.implementation.digest), `${definition.instance} implementation digest is invalid`);
instances.add(definition.instance);
facets.add(definition.facet);
@@ -203,9 +195,9 @@ export function defineRuntimeServicePackage(
})),
};
const result: RuntimeServicePackage = {
- name: options.name ?? options.module.name,
manifest,
services,
+ ...(options.buildCatalog === undefined ? {} : { buildCatalog: options.buildCatalog }),
...(options.close === undefined ? {} : { close: options.close }),
};
verifyRuntimeServicePackage(result);
@@ -213,31 +205,29 @@ export function defineRuntimeServicePackage(
}
export function verifyRuntimeServicePackage(value: RuntimeServicePackage): void {
- assert(value.name.trim().length > 0, "Runtime service package name is empty");
- assert(value.services.length > 0, `${value.name} contains no Runtime service`);
+ const packageName = `${value.manifest.name}@${value.manifest.version}`;
+ assert(value.services.length > 0, `${packageName} contains no Runtime service`);
const modules = new RuntimeModuleRegistry();
modules.register(value.manifest);
const ids = new Set<string>();
const claimedFacets = new Set<string>();
for (const service of value.services) {
- assert(service.instance.id.trim().length > 0, `${value.name} Runtime service instance is empty`);
- assert(!ids.has(service.instance.id), `${value.name} repeats Runtime service ${service.instance.id}`);
+ assert(service.instance.id.trim().length > 0, `${packageName} Runtime service instance is empty`);
+ assert(!ids.has(service.instance.id), `${packageName} repeats Runtime service ${service.instance.id}`);
ids.add(service.instance.id);
- if (service.instance.configurationDigest !== undefined) {
- assert(isDigest(service.instance.configurationDigest),
- `${value.name} service ${service.instance.id} configuration digest is invalid`);
- }
+ assert(isDigest(service.instance.configurationDigest),
+ `${packageName} service ${service.instance.id} configuration digest is invalid`);
verifyServicePort(service);
const resolved = modules.resolve(service.instance.facet);
- assert(resolved !== undefined, `${value.name} service ${service.instance.id} has no Manifest facet`);
+ assert(resolved !== undefined, `${packageName} service ${service.instance.id} has no Manifest facet`);
assert(resolved.facet.role === service.role,
- `${value.name} service ${service.instance.id} role differs from its Manifest facet`);
+ `${packageName} service ${service.instance.id} role differs from its Manifest facet`);
claimedFacets.add(serviceFacetKey(service));
}
for (const facet of value.manifest.facets) {
- assert(facet.role !== "capability-endpoint", `${value.name} Runtime service Manifest contains an Endpoint facet`);
+ assert(facet.role !== "capability-endpoint", `${packageName} Runtime service Manifest contains an Endpoint facet`);
const key = `${value.manifest.name}@${value.manifest.version}#${facet.name}`;
- assert(claimedFacets.has(key), `${value.name} Manifest facet ${facet.name} has no configured service`);
+ assert(claimedFacets.has(key), `${packageName} Manifest facet ${facet.name} has no configured service`);
}
}
@@ -264,11 +254,8 @@ export function assembleRuntimeServices(
selection: RuntimeServiceSelection,
): RuntimeServiceAssembly {
const services = new Map<string, { readonly package: RuntimeServicePackage; readonly service: RuntimeService }>();
- const packageNames = new Set<string>();
for (const item of packages) {
verifyRuntimeServicePackage(item);
- assert(!packageNames.has(item.name), `Runtime service package ${item.name} is configured twice`);
- packageNames.add(item.name);
for (const service of item.services) {
assert(!services.has(service.instance.id), `Runtime service instance ${service.instance.id} is configured twice`);
services.set(service.instance.id, { package: item, service });
@@ -279,10 +266,9 @@ export function assembleRuntimeServices(
const build = selectedService(services, selection.stores.build, "build-store");
const operations = selectedService(services, selection.stores.operations, "operation-store");
const dispatch = selectedService(services, selection.stores.dispatch, "dispatch-store");
- const journal = selectedService(services, selection.stores.journal, "runtime-journal");
const artifacts = selectedService(services, selection.stores.artifacts, "artifact-store");
const credentialServices = selection.stores.credentials.map((id) => selectedService(services, id, "credential-store")!);
- const selected = [scheduler, worker, build, operations, dispatch, journal, artifacts, ...credentialServices]
+ const selected = [scheduler, worker, build, operations, dispatch, artifacts, ...credentialServices]
.filter((item): item is NonNullable<typeof item> => item !== undefined);
const selectedPackages = [...new Set(selected.map((item) => item.package))];
let closed = false;
@@ -294,7 +280,6 @@ export function assembleRuntimeServices(
buildStore: build!.service.service,
operationStore: operations!.service.service,
dispatchStore: dispatch!.service.service,
- journal: journal!.service.service,
artifactStore: artifacts!.service.service,
credentialStore: new CompositeCredentialStore(credentialServices.map((item) => item.service.service)),
async close() {
diff --git a/packages/runtime/src/types.ts b/packages/runtime/src/types.ts
index ddd0fbe1..5f8b26e3 100644
--- a/packages/runtime/src/types.ts
+++ b/packages/runtime/src/types.ts
@@ -6,7 +6,7 @@ import type {
Digest,
} from "@narratage/protocol";
import type { RuntimeClosure } from "./profile.js";
-import type { BuildDispatchSnapshot, BuildDispatchStore, RuntimeJournal } from "./dispatch.js";
+import type { BuildDispatchSnapshot, BuildDispatchStore } from "./dispatch.js";
import type { OperationSnapshot } from "./operations.js";
export type RuntimeBlockedCommand = {
@@ -39,7 +39,6 @@ export type RuntimeExecutionStores = {
readonly builds: BuildStore;
readonly operations: import("./operations.js").OperationStore;
readonly dispatch: BuildDispatchStore;
- readonly journal: RuntimeJournal;
readonly artifacts: ArtifactStore;
};
@@ -61,8 +60,7 @@ export type RuntimeWorkerFactoryOptions = {
readonly scheduler: BuildSchedulerFactory;
readonly stores: RuntimeExecutionStores;
readonly scheduling: BuildSchedulerOptions;
- readonly runtimeRevision: Digest;
- readonly runtimeClosure?: RuntimeClosure;
+ readonly runtimeClosure: RuntimeClosure;
};
/** Selected execution strategy. Process supervision remains a generic Host concern. */
@@ -70,10 +68,6 @@ export type RuntimeWorkerFactory = {
create(executor: RuntimeCommandExecutor, options: RuntimeWorkerFactoryOptions): RuntimeWorker;
};
-export type RuntimeQueueStatus = {
- readonly dispatches: readonly BuildDispatchSnapshot[];
-};
-
export type RuntimePreparation = {
readonly state: BuildState;
readonly runnable: readonly RuntimeRunnableCommand[];
@@ -172,7 +166,7 @@ export type ScheduledBuild = {
readonly state: BuildState;
};
-export type SchedulerJournalEntry = {
+export type SchedulerExecutionOutcome = {
readonly command: string;
readonly kind: CoreCommand["kind"];
readonly resources: readonly string[];
@@ -187,14 +181,13 @@ export type ScheduledBuildResult = {
readonly id: string;
readonly status: "complete" | "paused" | "failed";
readonly state: BuildState;
- readonly journal: readonly SchedulerJournalEntry[];
+ readonly outcomes: readonly SchedulerExecutionOutcome[];
readonly blocked: readonly RuntimeBlockedCommand[];
};
export type BuildSchedulerOptions = {
readonly maxConcurrency?: number;
readonly resourceLimits?: Readonly<Record<string, number>>;
- readonly maxEventsPerBuild?: number;
readonly runtimeClosure?: RuntimeClosure;
/** Optional durable authority. When present, every accepted Core Event is persisted by CAS. */
readonly buildStore?: BuildStore;
diff --git a/packages/runtime/test/catalog.test.ts b/packages/runtime/test/catalog.test.ts
index 01705143..ac9f9eee 100644
--- a/packages/runtime/test/catalog.test.ts
+++ b/packages/runtime/test/catalog.test.ts
@@ -12,7 +12,6 @@ function descriptor(core = digestOf("core:one")) {
run: { path: "/project/delivery.svrun" },
aliases: [{
name: "final.video",
- type: { module: { name: "example.media", version: "1" }, name: "Video" },
ref: { kind: "logical-output" as const, id: "logical:final" },
}],
};
@@ -30,7 +29,6 @@ test("Build Catalog indexes Host aliases without becoming Build truth", async ()
...descriptor(),
aliases: [...descriptor().aliases, {
name: "timing.map",
- type: { module: { name: "example.timing", version: "1" }, name: "Map" },
ref: { kind: "logical-output" as const, id: "logical:timing" },
}],
});
diff --git a/packages/runtime/test/operations.test.ts b/packages/runtime/test/operations.test.ts
index 7e941338..8d41253d 100644
--- a/packages/runtime/test/operations.test.ts
+++ b/packages/runtime/test/operations.test.ts
@@ -15,14 +15,12 @@ function identity(overrides: { readonly endpoint?: string; readonly runtimeClosu
endpoint: overrides.endpoint ?? "hyperframes.local",
authority: "hyperframes.local",
route: "fixture.render",
- implementationDigest: digestOf("hyperframes.local/implementation@1"),
runtimeClosure: (overrides.runtimeClosure ?? digestOf("runtime-closure:local")) as never,
- requestDigest: digestOf("render-request"),
attempt: 1,
});
}
-test("Operation identity locks Build, Command, Endpoint, implementation and Runtime Closure", () => {
+test("Operation identity locks Build, Command, Endpoint and Runtime Closure", () => {
const first = identity();
assert.equal(first.id, identity().id);
assert.notEqual(first.id, identity({ endpoint: "hyperframes.hosted" }).id);
@@ -70,7 +68,6 @@ test("pending checkpoints and completion advance by CAS without entering BuildSt
status: "completed",
completion: {
value: { kind: "inline", value: { artifact: "video.mp4" } },
- metadata: { remoteJob: "job-123" },
},
});
assert.equal(completed.status, "stored");
diff --git a/packages/runtime/test/profile.test.ts b/packages/runtime/test/profile.test.ts
index 75c59542..783f8523 100644
--- a/packages/runtime/test/profile.test.ts
+++ b/packages/runtime/test/profile.test.ts
@@ -33,7 +33,6 @@ function manifest(): RuntimeModuleManifest {
name: "local-scheduler",
role: "scheduler",
implementation: {
- locator: "example.runtime-fixture/local-scheduler",
digest: digestOf("example.runtime-fixture/local-scheduler@1"),
},
},
@@ -42,14 +41,12 @@ function manifest(): RuntimeModuleManifest {
["memory-build-store", "build-store"],
["memory-operation-store", "operation-store"],
["memory-dispatch-store", "dispatch-store"],
- ["memory-runtime-journal", "runtime-journal"],
["memory-artifact-store", "artifact-store"],
["memory-credential-store", "credential-store"],
] as const).map(([name, role]) => ({
name,
role,
implementation: {
- locator: `example.runtime-fixture/${name}`,
digest: digestOf(`example.runtime-fixture/${name}@1`),
},
})),
@@ -57,7 +54,6 @@ function manifest(): RuntimeModuleManifest {
name: endpointFacet.name,
role: "capability-endpoint",
implementation: {
- locator: "example.runtime-fixture/greeting-endpoint",
digest: endpointImplementationDigest,
},
fulfills: [{ capability: capabilities.generation, returns: types.generated }],
@@ -70,7 +66,6 @@ function manifest(): RuntimeModuleManifest {
function profile(options: { readonly operations?: boolean; readonly resource?: number } = {}) {
return sealRuntimeProfile({
- name: "fixture.local",
instances: [
{ id: "scheduler.local", facet: { module: runtimeModule, name: "local-scheduler" } },
{ id: "worker.local", facet: { module: runtimeModule, name: "local-worker" } },
@@ -80,7 +75,6 @@ function profile(options: { readonly operations?: boolean; readonly resource?: n
facet: { module: runtimeModule, name: "memory-operation-store" },
}]),
{ id: "dispatch.memory", facet: { module: runtimeModule, name: "memory-dispatch-store" } },
- { id: "journal.memory", facet: { module: runtimeModule, name: "memory-runtime-journal" } },
{ id: "artifacts.memory", facet: { module: runtimeModule, name: "memory-artifact-store" } },
{ id: "credentials.memory", facet: { module: runtimeModule, name: "memory-credential-store" } },
{
@@ -88,14 +82,13 @@ function profile(options: { readonly operations?: boolean; readonly resource?: n
facet: endpointFacet,
authority: "greeting.local",
},
- ],
+ ].map((instance) => ({ ...instance, configurationDigest: digestOf({}) })),
scheduler: "scheduler.local",
worker: "worker.local",
stores: {
build: "build.memory",
operations: "operations.memory",
dispatch: "dispatch.memory",
- journal: "journal.memory",
artifacts: "artifacts.memory",
credentials: ["credentials.memory"],
},
@@ -142,7 +135,10 @@ test("Profile order is not identity but an execution-policy change is", () => {
endpoints: [...normal.endpoints].reverse(),
scheduling: { ...normal.scheduling, resources: [...normal.scheduling.resources].reverse() },
});
- assert.equal(normal.digest, reordered.digest);
+ assert.equal(
+ resolveRuntimeProfile(registry, normal).digest,
+ resolveRuntimeProfile(registry, reordered).digest,
+ );
assert.notEqual(
resolveRuntimeProfile(registry, normal).digest,
resolveRuntimeProfile(registry, profile({ resource: 1 })).digest,
@@ -159,7 +155,6 @@ test("non-secret instance configuration is locked independently from implementat
? { ...instance, configurationDigest: digestOf({ baseUrl: "https://provider.example" }) }
: instance),
});
- assert.notEqual(original.digest, configured.digest);
assert.notEqual(
resolveRuntimeProfile(registry, original).digest,
resolveRuntimeProfile(registry, configured).digest,
diff --git a/packages/runtime/test/services.test.ts b/packages/runtime/test/services.test.ts
index 2d74dbb2..620d2686 100644
--- a/packages/runtime/test/services.test.ts
+++ b/packages/runtime/test/services.test.ts
@@ -14,7 +14,6 @@ const moduleRef = { name: "example.runtime-services", version: "1" } as const;
function servicePackage(close?: () => void) {
return defineRuntimeServicePackage({
- name: "example.runtime-services.local",
module: moduleRef,
services: [
{
@@ -22,7 +21,6 @@ function servicePackage(close?: () => void) {
facet: "scheduler",
instance: "scheduler.example",
implementation: {
- locator: "example.runtime-services/scheduler",
digest: digestOf("example.runtime-services/scheduler@1"),
},
configuration: { algorithm: "fixture" },
@@ -36,7 +34,7 @@ function servicePackage(close?: () => void) {
role: "worker",
facet: "worker",
instance: "worker.example",
- implementation: { locator: "example.runtime-services/worker", digest: digestOf("worker") },
+ implementation: { digest: digestOf("worker") },
service: { create() { return { async runOnce() { return undefined; }, async run() {} }; } },
},
{
@@ -44,7 +42,6 @@ function servicePackage(close?: () => void) {
facet: "build-store",
instance: "builds.example",
implementation: {
- locator: "example.runtime-services/build-store",
digest: digestOf("example.runtime-services/build-store@1"),
},
configuration: { database: "fixture" },
@@ -55,7 +52,6 @@ function servicePackage(close?: () => void) {
facet: "operation-store",
instance: "operations.example",
implementation: {
- locator: "example.runtime-services/operation-store",
digest: digestOf("example.runtime-services/operation-store@1"),
},
configuration: { database: "fixture" },
@@ -65,24 +61,17 @@ function servicePackage(close?: () => void) {
role: "dispatch-store",
facet: "dispatch-store",
instance: "dispatch.example",
- implementation: { locator: "example.runtime-services/dispatch", digest: digestOf("dispatch") },
+ implementation: { digest: digestOf("dispatch") },
service: 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: "runtime-journal",
- facet: "runtime-journal",
- instance: "journal.example",
- implementation: { locator: "example.runtime-services/journal", digest: digestOf("journal") },
- service: { async append() { throw new Error("unused"); }, async list() { return []; } },
- },
{
role: "artifact-store",
facet: "artifact-store",
instance: "artifacts.example",
- implementation: { locator: "example.runtime-services/artifacts", digest: digestOf("artifacts") },
+ implementation: { digest: digestOf("artifacts") },
service: {
async put() { throw new Error("unused"); },
async get() { return undefined; },
@@ -93,7 +82,7 @@ function servicePackage(close?: () => void) {
role: "credential-store",
facet: "credential-store",
instance: "credentials.example",
- implementation: { locator: "example.runtime-services/credentials", digest: digestOf("credentials") },
+ implementation: { digest: digestOf("credentials") },
service: { async resolve() { return undefined; } },
},
],
@@ -111,7 +100,6 @@ test("one physical Runtime package exposes separately selected Scheduler and Sto
build: "builds.example",
operations: "operations.example",
dispatch: "dispatch.example",
- journal: "journal.example",
artifacts: "artifacts.example",
credentials: ["credentials.example"],
},
@@ -123,7 +111,6 @@ test("one physical Runtime package exposes separately selected Scheduler and Sto
"builds.example",
"operations.example",
"dispatch.example",
- "journal.example",
"artifacts.example",
"credentials.example",
]);
@@ -150,7 +137,6 @@ test("Runtime service configuration is identity-bound and role selection is exac
build: "builds.example",
operations: "operations.example",
dispatch: "dispatch.example",
- journal: "journal.example",
artifacts: "artifacts.example",
credentials: ["credentials.example"],
},
diff --git a/packages/screen-overlay/src/activation.ts b/packages/screen-overlay/src/activation.ts
index 67f64b67..4858d006 100644
--- a/packages/screen-overlay/src/activation.ts
+++ b/packages/screen-overlay/src/activation.ts
@@ -1,15 +1,15 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeScreenOverlaySurface, screenOverlayComponent, screenOverlayManifest, screenOverlayModuleRef,
- screenOverlaySurfaceImplementationDigest,
+ screenOverlayMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
- format: "svml.node-package@1" as const, name: "@narratage/screen-overlay",
- modules: [{ manifest: screenOverlayManifest, specifiers: [screenOverlayModuleRef.name, `${screenOverlayModuleRef.name}@1`] }],
+ format: "svml.node-package@1" as const,
+ modules: [{ manifest: screenOverlayManifest }],
components: [screenOverlayComponent],
hostFacets: [createMarkupSurfaceHostFacet({
- module: screenOverlayModuleRef, surface: "track", mode: "structured",
- implementationDigest: screenOverlaySurfaceImplementationDigest, handler: decodeScreenOverlaySurface,
+ module: screenOverlayModuleRef,
+ declaration: screenOverlayMarkupSurfaces.find((item) => item.name === "track")!, handler: decodeScreenOverlaySurface,
})],
};
export default svmlPackage;
diff --git a/packages/screen-overlay/src/component.ts b/packages/screen-overlay/src/component.ts
index cdfeb8c3..27b106ae 100644
--- a/packages/screen-overlay/src/component.ts
+++ b/packages/screen-overlay/src/component.ts
@@ -15,7 +15,6 @@ import type { ScreenOverlayHeader, ScreenOverlayItemSpec, ScreenOverlayProgram,
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 = {
- name: "@narratage/screen-overlay",
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: {} }) },
diff --git a/packages/screen-overlay/src/fragment.ts b/packages/screen-overlay/src/fragment.ts
index b0af318d..17a2f7b3 100644
--- a/packages/screen-overlay/src/fragment.ts
+++ b/packages/screen-overlay/src/fragment.ts
@@ -13,7 +13,7 @@ export type ScreenOverlayFragmentItem =
| { readonly kind: "moment"; readonly specName: string; readonly mapName: string; readonly sourceName: string };
const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
-export function createScreenOverlayFragment(items: readonly ScreenOverlayFragmentItem[], name: string) {
+export function createScreenOverlayFragment(items: readonly ScreenOverlayFragmentItem[]) {
if (items.length === 0) throw new Error("Screen Overlay Fragment requires at least one Item.");
const types = new Map<string, typeof screenOverlayTypes.itemSpec | typeof semanticMapTypes.complete | typeof narrativeTypes.selection | typeof narrativeTypes.moment>();
const operations: FragmentOperation[] = [{ id: "overlay:set:empty", producer: screenOverlayProducers.createSet, inputs: {}, result: { kind: "output", name: "set" } }];
@@ -34,7 +34,7 @@ export function createScreenOverlayFragment(items: readonly ScreenOverlayFragmen
{ id: "overlay:program", producer: screenOverlayProducers.finalize, inputs: { set: operation(current), header: input("header") }, result: { kind: "output", name: "program" } },
{ id: "overlay:track", producer: screenOverlayProducers.render, inputs: { canvas: input("canvas"), space: input("space"), program: operation("overlay:program") }, result: { kind: "output", name: "track" } },
);
- return sealGraphFragment({ name, inputs: [
+ return sealGraphFragment({ inputs: [
{ name: "canvas", type: spatialTypes.canvas }, { name: "header", type: screenOverlayTypes.header },
{ name: "space", type: programSpaceTypes.programSpace }, ...[...types].map(([inputName, type]) => ({ name: inputName, type })),
], operations, exports: [
@@ -42,4 +42,4 @@ export function createScreenOverlayFragment(items: readonly ScreenOverlayFragmen
{ name: "track", type: compositionTypes.visualTrack, root: operation("overlay:track") },
] });
}
-export const programScreenOverlayFragment = createScreenOverlayFragment([{ kind: "program", specName: "spec" }], "@narratage/screen-overlay/one-program-item@1");
+export const programScreenOverlayFragment = createScreenOverlayFragment([{ kind: "program", specName: "spec" }]);
diff --git a/packages/screen-overlay/src/index.ts b/packages/screen-overlay/src/index.ts
index e7a8a70e..45ab8d1b 100644
--- a/packages/screen-overlay/src/index.ts
+++ b/packages/screen-overlay/src/index.ts
@@ -2,7 +2,7 @@ export { screenOverlayComponent } from "./component.js";
export { createScreenOverlayFragment, programScreenOverlayFragment } from "./fragment.js";
export type { ScreenOverlayFragmentItem } from "./fragment.js";
export {
- screenOverlayDependency, screenOverlayHeaderSchema, screenOverlayItemSpecSchema, screenOverlayManifest,
+ screenOverlayDependency, screenOverlayHeaderSchema, screenOverlayItemSpecSchema, screenOverlayManifest, screenOverlayMarkupSurfaces,
screenOverlayManifestDigest, screenOverlayModuleRef, screenOverlayProducers, screenOverlayProgramSchema,
screenOverlaySetSchema, screenOverlaySurfaceImplementationDigest, screenOverlayTypes,
} from "./manifest.js";
diff --git a/packages/screen-overlay/src/manifest.ts b/packages/screen-overlay/src/manifest.ts
index 254306fe..0626e749 100644
--- a/packages/screen-overlay/src/manifest.ts
+++ b/packages/screen-overlay/src/manifest.ts
@@ -64,7 +64,7 @@ const itemSpec = object({
});
const frameSpan = object({ startFrame: { schema: unsignedInteger }, endFrameExclusive: { schema: unsignedInteger } });
const item = object({
- id: { schema: string }, sourceOccurrenceId: { schema: string }, span: { schema: frameSpan }, content: { schema: component },
+ id: { schema: string }, span: { schema: frameSpan }, content: { schema: component },
stacking: { schema: object({ order: { schema: integer }, tieBreak: { schema: string } }) },
});
export const screenOverlayHeaderSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.screen-overlay-header@1" } }, id: { schema: string } });
@@ -72,9 +72,12 @@ export const screenOverlayItemSpecSchema: ValueSchema = itemSpec;
export const screenOverlaySetSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.screen-overlay-set@1" } }, items: { schema: { kind: "array", items: item } } });
export const screenOverlayProgramSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.screen-overlay-program@1" } }, id: { schema: string }, items: { schema: { kind: "array", minItems: 1, items: item } } });
export const screenOverlaySurfaceImplementationDigest = digestOf("@narratage/screen-overlay/track-surface@1");
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({ abi: "svml.type-validator@1" as const, implementation: { kind: "registered" as const, locator, digest } });
+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 screenOverlayManifest: ModuleManifest = {
format: "svml.module@1", name: screenOverlayModuleRef.name, version: screenOverlayModuleRef.version,
dependencies: [narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, compositionDependency],
@@ -82,16 +85,15 @@ export const screenOverlayManifest: ModuleManifest = {
{ 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("@narratage/screen-overlay/validate-program", screenOverlayValidatorDigests.program) },
+ { name: screenOverlayTypes.program.name, schema: screenOverlayProgramSchema, validator: validator(screenOverlayValidatorDigests.program) },
], capabilities: [],
- surfaces: [{ name: "track", tag: "Track", mode: "structured", outputs: [screenOverlayTypes.header, screenOverlayTypes.itemSpec, screenOverlayTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/screen-overlay/track-surface", digest: screenOverlaySurfaceImplementationDigest } }],
producers: [
- { name: screenOverlayProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [], implementation: { kind: "registered", locator: "@narratage/screen-overlay/create-set", digest: screenOverlayImplementationDigests.createSet } },
- { name: screenOverlayProducers.appendProgram.name, inputs: [...appendInputs], outputs: [{ name: "set", type: screenOverlayTypes.set }], needs: [], implementation: { kind: "registered", locator: "@narratage/screen-overlay/append-program", 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: { kind: "registered", locator: "@narratage/screen-overlay/append-selection", 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: { kind: "registered", locator: "@narratage/screen-overlay/append-moment", 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: { kind: "registered", locator: "@narratage/screen-overlay/finalize", 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: { kind: "registered", locator: "@narratage/screen-overlay/render", digest: screenOverlayImplementationDigests.render } },
+ { 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 } },
],
};
export const screenOverlayManifestDigest = digestOf(screenOverlayManifest);
diff --git a/packages/screen-overlay/src/program.ts b/packages/screen-overlay/src/program.ts
index 1bf4f56d..3d4a47e9 100644
--- a/packages/screen-overlay/src/program.ts
+++ b/packages/screen-overlay/src/program.ts
@@ -127,7 +127,6 @@ function realized(
assertScreenOverlaySet(set); assertScreenOverlayHeader(header); assertScreenOverlayItemSpec(spec);
const additions = occurrences.map((occurrence, index) => ({
id: occurrence.id,
- sourceOccurrenceId: occurrence.sourceOccurrenceId,
span: { ...occurrence.span },
content: structuredClone(spec.content),
stacking: { order: spec.stackingOrder, tieBreak: `${header.id}:${spec.id}:${index + 1}` },
@@ -161,7 +160,7 @@ export function assertScreenOverlayProgram(value: ScreenOverlayProgram): void {
const ids = new Set<string>();
for (const item of value.items) {
identity(item.id, "ScreenOverlayItemProgram.id"); assert(!ids.has(item.id), `Duplicate Screen Overlay Item ${item.id}.`); ids.add(item.id);
- assert(item.sourceOccurrenceId.length > 0 && item.span.startFrame >= 0 && item.span.endFrameExclusive > item.span.startFrame,
+ assert(item.span.startFrame >= 0 && item.span.endFrameExclusive > item.span.startFrame,
`Screen Overlay Item ${item.id} timing is invalid.`);
assertScreenOverlayComponent(item.content); assert(Number.isSafeInteger(item.stacking.order) && item.stacking.tieBreak.length > 0,
`Screen Overlay Item ${item.id} stacking is invalid.`);
diff --git a/packages/screen-overlay/src/surface.ts b/packages/screen-overlay/src/surface.ts
index dc3accaa..66a895d0 100644
--- a/packages/screen-overlay/src/surface.ts
+++ b/packages/screen-overlay/src/surface.ts
@@ -137,6 +137,6 @@ export const decodeScreenOverlaySurface: StructuredSurfaceHandler = ({ element,
}
}
if (fragmentItems.length === 0) throw new Error(`${element.name} requires at least one component.`);
- const fragment = createScreenOverlayFragment(fragmentItems, `@narratage/screen-overlay/surface/${id}@1`);
+ const fragment = createScreenOverlayFragment(fragmentItems);
return { records, components: [{ id, fragment: fragment.id, inputs, outputs: { program: `${id}.program`, track: `${id}.track` }, range: element.range }], fragments: [fragment] };
};
diff --git a/packages/screen-overlay/src/types.ts b/packages/screen-overlay/src/types.ts
index 9d8a17f8..f0465cb4 100644
--- a/packages/screen-overlay/src/types.ts
+++ b/packages/screen-overlay/src/types.ts
@@ -59,7 +59,7 @@ export type ScreenOverlayItemSpec = {
};
export type ScreenOverlayHeader = { readonly contract: "svml.screen-overlay-header@1"; readonly id: string };
export type ScreenOverlayItemProgram = {
- readonly id: string; readonly sourceOccurrenceId: string; readonly span: FrameSpan;
+ readonly id: string; readonly span: FrameSpan;
readonly content: ScreenOverlayComponent;
readonly stacking: { readonly order: number; readonly tieBreak: string };
};
diff --git a/packages/screen-overlay/test/screen-overlay.test.ts b/packages/screen-overlay/test/screen-overlay.test.ts
index b7c9ec74..ef4b7657 100644
--- a/packages/screen-overlay/test/screen-overlay.test.ts
+++ b/packages/screen-overlay/test/screen-overlay.test.ts
@@ -20,9 +20,9 @@ import {
finalizeScreenOverlay,
renderScreenOverlay,
screenOverlayManifest,
+ screenOverlayMarkupSurfaces,
screenOverlayModuleRef,
screenOverlayProducers,
- screenOverlaySurfaceImplementationDigest,
sealScreenOverlayHeader,
sealScreenOverlayItemSpec,
} from "@narratage/screen-overlay";
@@ -116,7 +116,7 @@ test("overlay Tracks interleave with peer Tracks only through absolute stacking"
});
test("the package has no lower-composite, sibling Track, backdrop-filter or hidden audio port", () => {
- const fragment = createScreenOverlayFragment([{ kind: "program", specName: "spec" }], "example.overlay@1");
+ const fragment = createScreenOverlayFragment([{ kind: "program", specName: "spec" }]);
assert.deepEqual(fragment.inputs.map((input) => input.name), ["canvas", "header", "space", "spec"]);
assert.equal(fragment.exports.some((output) => output.type.name === "AudioTrack"), false);
assert.throws(() => sealScreenOverlayItemSpec({
@@ -130,6 +130,11 @@ test("the package has no lower-composite, sibling Track, backdrop-filter or hidd
test("the self-described Screen Surface parses into a finite peer-Track graph", async () => {
const fixtureModule = { name: "example.screen-inputs", version: "1" } as const;
const fixtureSurfaceDigest = digestOf("example.screen-inputs/surface@1");
+ 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",
name: fixtureModule.name,
@@ -137,17 +142,6 @@ test("the self-described Screen Surface parses into a finite peer-Track graph",
dependencies: [spatialDependency, programSpaceDependency],
types: [],
capabilities: [],
- surfaces: [{
- name: "inputs",
- tag: "Inputs",
- mode: "structured",
- outputs: [spatialTypes.canvas, programSpaceTypes.programSpace],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.screen-inputs/surface",
- digest: fixtureSurfaceDigest,
- },
- }],
producers: [],
};
const closure = createResolvedClosure([
@@ -166,20 +160,19 @@ test("the self-described Screen Surface parses into a finite peer-Track graph",
fixtureManifest,
]);
const registry = new MarkupSurfaceRegistry();
- registry.registerStructured(fixtureModule, "inputs", fixtureSurfaceDigest, ({ element }) => ({
+ registry.registerStructured({ module: fixtureModule, declaration: fixtureSurface, handler: ({ element }) => ({
records: [
{ id: "canvas", type: spatialTypes.canvas, value: { kind: "inline", value: canvas }, range: element.range },
{ id: "space", type: programSpaceTypes.programSpace, value: { kind: "inline", value: space }, range: element.range },
],
components: [],
fragments: [],
- }));
- registry.registerStructured(
- screenOverlayModuleRef,
- "track",
- screenOverlaySurfaceImplementationDigest,
- decodeScreenOverlaySurface,
- );
+ }) });
+ registry.registerStructured({
+ module: screenOverlayModuleRef,
+ declaration: screenOverlayMarkupSurfaces.find((item) => item.name === "track")!,
+ handler: decodeScreenOverlaySurface,
+ });
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({
registry,
@@ -208,8 +201,8 @@ test("the self-described Screen Surface parses into a finite peer-Track graph",
});
const trackExport = resolveCompiledSourceExport(compiled, "screen-fx.track", compositionTypes.visualTrack);
assert.equal(trackExport.ref.kind, "logical-output");
- const build = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const build = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [{ output: trackExport.ref.kind === "logical-output" ? trackExport.ref.id : "" }],
}));
assert.deepEqual(build.plan.steps.map((step) => step.producer.name).sort(), [
diff --git a/packages/script/package.json b/packages/script/package.json
index ed105c4e..c3a76891 100644
--- a/packages/script/package.json
+++ b/packages/script/package.json
@@ -11,7 +11,6 @@
"activation": "./src/activation.ts"
},
"dependencies": {
- "@narratage/core": "workspace:*",
"@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/text": "workspace:*",
diff --git a/packages/script/src/activation.ts b/packages/script/src/activation.ts
index 3eef4374..ae1f82e2 100644
--- a/packages/script/src/activation.ts
+++ b/packages/script/src/activation.ts
@@ -4,18 +4,15 @@ import {
decodeScriptSurface,
scriptManifest,
scriptModuleRef,
- scriptSurfaceImplementationDigest,
+ scriptMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/script",
- modules: [{ manifest: scriptManifest, specifiers: ["@narratage/script", "@narratage/script@1"] }],
+ modules: [{ manifest: scriptManifest }],
hostFacets: [createMarkupSurfaceHostFacet({
module: scriptModuleRef,
- surface: "script",
- mode: "raw",
- implementationDigest: scriptSurfaceImplementationDigest,
+ declaration: scriptMarkupSurfaces.find((item) => item.name === "script")!,
handler: decodeScriptSurface,
})],
};
diff --git a/packages/script/src/format.ts b/packages/script/src/format.ts
index fa234b6b..04ab3027 100644
--- a/packages/script/src/format.ts
+++ b/packages/script/src/format.ts
@@ -1,4 +1,4 @@
-import { digestOf } from "@narratage/core";
+import { digestOf } from "@narratage/protocol";
import { ScriptSyntaxError } from "./error.js";
import { narrativeValue } from "./narrative.js";
diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts
index ccc55106..0d3fff80 100644
--- a/packages/script/src/index.ts
+++ b/packages/script/src/index.ts
@@ -9,7 +9,7 @@ export {
narrativeSelectionType,
narrativeSchema,
narrativeType,
- scriptManifest,
+ scriptManifest, scriptMarkupSurfaces,
scriptModuleRef,
scriptSurfaceImplementationDigest,
} from "./manifest.js";
@@ -25,7 +25,6 @@ export {
narrativeMomentValue,
narrativeSelectionValue,
narrativeSpeechTextValue,
- narrativeSourceMap,
narrativeValue,
serializeCaption,
serializeDialogue,
diff --git a/packages/script/src/manifest.ts b/packages/script/src/manifest.ts
index 0797c6b9..b853a054 100644
--- a/packages/script/src/manifest.ts
+++ b/packages/script/src/manifest.ts
@@ -1,6 +1,6 @@
import { narrativeDependency, narrativeSchema, narrativeTypes } from "@narratage/narrative";
import { textDependency, textTypes } from "@narratage/text";
-import { digestOf } from "@narratage/core";
+import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, TypeRef } from "@narratage/protocol";
export const scriptModuleRef = { name: "@narratage/script", version: "1" } as const;
@@ -13,7 +13,28 @@ export const captionCorrespondenceType: TypeRef = narrativeTypes.captionCorrespo
export const captionDisplayWordSubsetType: TypeRef = narrativeTypes.captionDisplayWordSubset;
export { narrativeSchema };
-export const scriptSurfaceImplementationDigest = digestOf("@narratage/script/display-atoms-surface@1");
+export const scriptSurfaceImplementationDigest = digestOf("@narratage/script/display-atoms-with-structural-order-surface@1");
+
+export const scriptMarkupSurfaces = [
+ {
+ name: "script",
+ tag: "script",
+ mode: "raw",
+ outputs: [
+ narrativeType,
+ narrativeExcerptType,
+ textTypes.text,
+ narrativeSelectionType,
+ narrativeMomentType,
+ captionDisplayType,
+ captionCorrespondenceType,
+ captionDisplayWordSubsetType,
+ ],
+ implementation: {
+ digest: scriptSurfaceImplementationDigest,
+ },
+ },
+] as const;
export const scriptManifest: ModuleManifest = {
format: "svml.module@1",
@@ -22,27 +43,5 @@ export const scriptManifest: ModuleManifest = {
dependencies: [narrativeDependency, textDependency],
types: [],
capabilities: [],
- surfaces: [
- {
- name: "script",
- tag: "script",
- mode: "raw",
- outputs: [
- narrativeType,
- narrativeExcerptType,
- textTypes.text,
- narrativeSelectionType,
- narrativeMomentType,
- captionDisplayType,
- captionCorrespondenceType,
- captionDisplayWordSubsetType,
- ],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/script/surface",
- digest: scriptSurfaceImplementationDigest,
- },
- },
- ],
producers: [],
};
diff --git a/packages/script/src/narrative.ts b/packages/script/src/narrative.ts
index 429d6bd3..c9d9c949 100644
--- a/packages/script/src/narrative.ts
+++ b/packages/script/src/narrative.ts
@@ -1,4 +1,4 @@
-import { canonicalize } from "@narratage/core";
+import { canonicalize } from "@narratage/protocol";
import type { CanonicalValue } from "@narratage/protocol";
import type {
CaptionCorrespondence,
@@ -78,7 +78,6 @@ function projectCaption(
const wordId = `${atomId}:word:${groupIndex + 1}`;
words.push({
id: wordId,
- index: words.length,
atomId,
segmentId: region.segmentId,
turnId: turn.id,
@@ -89,7 +88,6 @@ function projectCaption(
});
atoms.push({
id: atomId,
- index: atoms.length,
segmentId: region.segmentId,
turnId: turn.id,
...(turn.role === undefined ? {} : { role: turn.role }),
@@ -283,7 +281,6 @@ export function narrativeValue(parsed: ParsedNarrative): CanonicalValue {
contract: "svml.narrative@1",
segments: parsed.segments.map((segment) => ({
id: segment.id,
- index: segment.index,
startAnchorId: segment.startAnchorId,
endAnchorId: segment.endAnchorId,
tokenStart: segment.tokenStart,
@@ -291,9 +288,7 @@ export function narrativeValue(parsed: ParsedNarrative): CanonicalValue {
})),
tokens: parsed.tokens.map((token) => ({
id: token.id,
- index: token.index,
segmentId: token.segmentId,
- segmentTokenIndex: token.segmentTokenIndex,
startAnchorId: token.startAnchorId,
endAnchorId: token.endAnchorId,
text: token.text,
@@ -321,7 +316,15 @@ export function narrativeValue(parsed: ParsedNarrative): CanonicalValue {
anchorId: occurrence.boundary.anchorId,
})),
})),
- semanticIndex: parsed.semanticIndex,
+ semanticIndex: {
+ contract: "svml.semantic-index@1",
+ anchors: parsed.semanticIndex.anchors.map((anchor) => ({
+ id: anchor.id,
+ kind: anchor.kind,
+ segmentId: anchor.segmentId,
+ ...(anchor.tokenId === undefined ? {} : { tokenId: anchor.tokenId }),
+ })),
+ },
});
}
@@ -336,28 +339,3 @@ export function serializeDialogue(parsed: ParsedNarrative): string {
export function serializeCaption(parsed: ParsedNarrative): string {
return parsed.captionProjection.text;
}
-
-export function narrativeSourceMap(recordId: string, parsed: ParsedNarrative): CanonicalValue {
- return canonicalize({
- format: "svml.script-source-map@1",
- record: recordId,
- segments: parsed.segments.map((segment) => ({ id: segment.id, range: segment.range })),
- tokens: parsed.tokens.map((token) => ({ id: token.id, range: token.range })),
- turns: parsed.turns.map((turn) => ({ id: turn.id, range: turn.range })),
- selections: parsed.selections.map((selection) => ({
- id: selection.id,
- occurrences: selection.occurrences.map((occurrence) => ({
- occurrence: occurrence.occurrence,
- open: occurrence.open.range,
- close: occurrence.close.range,
- })),
- })),
- moments: parsed.moments.map((moment) => ({
- id: moment.id,
- occurrences: moment.occurrences.map((occurrence) => ({
- occurrence: occurrence.occurrence,
- range: occurrence.range,
- })),
- })),
- });
-}
diff --git a/packages/script/src/parser.ts b/packages/script/src/parser.ts
index 832e7778..1b20264c 100644
--- a/packages/script/src/parser.ts
+++ b/packages/script/src/parser.ts
@@ -1,4 +1,4 @@
-import { digestOf } from "@narratage/core";
+import { digestOf } from "@narratage/protocol";
import { ScriptSyntaxError } from "./error.js";
import type {
diff --git a/packages/script/src/surface.ts b/packages/script/src/surface.ts
index 03d302ff..fbf4a149 100644
--- a/packages/script/src/surface.ts
+++ b/packages/script/src/surface.ts
@@ -1,5 +1,3 @@
-import { canonicalize } from "@narratage/core";
-
import { ScriptSyntaxError } from "./error.js";
import {
captionCorrespondence,
@@ -12,7 +10,6 @@ import {
narrativeMomentValue,
narrativeSelectionValue,
narrativeSpeechTextValue,
- narrativeSourceMap,
narrativeValue,
} from "./narrative.js";
import {
@@ -161,6 +158,5 @@ export function decodeScriptSurface(input: ScriptSurfaceInput): ScriptSurfaceOut
],
components: [],
fragments: [],
- sourceMaps: [canonicalize(narrativeSourceMap(rawId, parsed))],
};
}
diff --git a/packages/script/src/types.ts b/packages/script/src/types.ts
index d5136e02..e9fabc13 100644
--- a/packages/script/src/types.ts
+++ b/packages/script/src/types.ts
@@ -31,12 +31,19 @@ export type ParsedRoleAtom = {
export type ParsedAtom = ParsedTextAtom | ParsedRoleAtom;
export type ParsedSegment = NarrativeSegment & {
+ /** Parser-local array position; omitted from the public Narrative value. */
+ readonly index: number;
readonly atoms: readonly ParsedAtom[];
readonly range: SourceRange;
readonly selfClosing: boolean;
};
-export type ParsedToken = NarrativeToken & { readonly range: SourceRange };
+export type ParsedToken = NarrativeToken & {
+ /** Parser-local positions used to create stable source anchor ids; omitted from Narrative. */
+ readonly index: number;
+ readonly segmentTokenIndex: number;
+ readonly range: SourceRange;
+};
export type ParsedTurn = NarrativeTurn & { readonly range: SourceRange };
export type ParsedSelectionOccurrence = NarrativeSelectionOccurrence & {
@@ -111,5 +118,4 @@ export type ScriptSurfaceOutput = {
/** Script is a record-only Surface; it cannot smuggle executable graph declarations. */
readonly components: readonly never[];
readonly fragments: readonly never[];
- readonly sourceMaps: readonly CanonicalValue[];
};
diff --git a/packages/seedance/package.json b/packages/seedance/package.json
index 751d0e9f..6f05b5ce 100644
--- a/packages/seedance/package.json
+++ b/packages/seedance/package.json
@@ -15,7 +15,6 @@
"@narratage/elaborator": "workspace:*",
"@narratage/generation": "workspace:*",
"@narratage/model-kit": "workspace:*",
- "@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/speech": "workspace:*",
"@narratage/text": "workspace:*",
diff --git a/packages/seedance/src/activation.ts b/packages/seedance/src/activation.ts
index 171e1dd3..848482ef 100644
--- a/packages/seedance/src/activation.ts
+++ b/packages/seedance/src/activation.ts
@@ -7,34 +7,27 @@ import {
seedanceComponent,
seedanceManifest,
seedanceModuleRef,
- seedanceSurfaceImplementationDigests,
+ seedanceMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/seedance",
- modules: [{ manifest: seedanceManifest, specifiers: ["@narratage/seedance", "@narratage/seedance@1"] }],
+ modules: [{ manifest: seedanceManifest }],
components: [seedanceComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
module: seedanceModuleRef,
- surface: "text-video",
- mode: "structured",
- implementationDigest: seedanceSurfaceImplementationDigests.textVideo,
+ declaration: seedanceMarkupSurfaces.find((item) => item.name === "text-video")!,
handler: decodeSeedanceTextVideoSurface,
}),
createMarkupSurfaceHostFacet({
module: seedanceModuleRef,
- surface: "frame-video",
- mode: "structured",
- implementationDigest: seedanceSurfaceImplementationDigests.frameVideo,
+ declaration: seedanceMarkupSurfaces.find((item) => item.name === "frame-video")!,
handler: decodeSeedanceFrameVideoSurface,
}),
createMarkupSurfaceHostFacet({
module: seedanceModuleRef,
- surface: "reference-video",
- mode: "structured",
- implementationDigest: seedanceSurfaceImplementationDigests.referenceVideo,
+ declaration: seedanceMarkupSurfaces.find((item) => item.name === "reference-video")!,
handler: decodeSeedanceReferenceVideoSurface,
}),
],
diff --git a/packages/seedance/src/fragment.ts b/packages/seedance/src/fragment.ts
index da81c6d7..18d7c7d1 100644
--- a/packages/seedance/src/fragment.ts
+++ b/packages/seedance/src/fragment.ts
@@ -20,7 +20,6 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
*/
export function createSeedanceGenerationFragment(endpoint: ExactModelEndpoint) {
return sealGraphFragment({
- name: `@narratage/seedance/${endpoint.key}-primary-video@1`,
inputs: [{ name: "request", type: endpoint.requestType }],
operations: [
{
@@ -123,7 +122,6 @@ export function createSeedanceDurationGenerationFragment(
...mediaInputs.map((item) => `${item.name}=${item.port}:media`),
].join(",") || "no-dynamic-inputs";
return sealGraphFragment({
- name: `@narratage/seedance/${endpoint.key}-duration-assembled-primary-video[${shape}]@1`,
inputs,
operations,
exports: [{
diff --git a/packages/seedance/src/index.ts b/packages/seedance/src/index.ts
index 846592ed..de09effc 100644
--- a/packages/seedance/src/index.ts
+++ b/packages/seedance/src/index.ts
@@ -204,6 +204,46 @@ export const seedanceEndpointsByModel = {
"seedance-2.5": seedanceEndpoints.v25!,
} as const;
+export const seedanceMarkupSurfaces = [
+ {
+ name: "text-video",
+ tag: "TextVideo",
+ mode: "structured",
+ outputs: [
+ seedanceTypes.durationProgram,
+ ...Object.values(seedanceEndpoints).flatMap((endpoint) => [
+ endpoint.draftType,
+ ...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
+ ]),
+ ],
+ implementation: {
+ digest: seedanceSurfaceImplementationDigests.textVideo,
+ },
+ },
+ {
+ name: "frame-video",
+ tag: "FrameVideo",
+ mode: "structured",
+ 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",
+ tag: "ReferenceVideo",
+ mode: "structured",
+ outputs: [seedanceTypes.durationProgram, ...Object.values(seedanceEndpoints).flatMap((endpoint) => [
+ endpoint.draftType, ...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
+ ])],
+ implementation: {
+ digest: seedanceSurfaceImplementationDigests.referenceVideo,
+ },
+ },
+] as const;
+
export const seedanceManifest = {
...seedanceBaseDefinition.manifest,
dependencies: [
@@ -217,51 +257,6 @@ export const seedanceManifest = {
schema: { kind: "oneOf", variants: seedanceModels.map(durationProgramSchema) } satisfies ValueSchema,
},
],
- surfaces: [
- {
- name: "text-video",
- tag: "TextVideo",
- mode: "structured",
- outputs: [
- seedanceTypes.durationProgram,
- ...Object.values(seedanceEndpoints).flatMap((endpoint) => [
- endpoint.draftType,
- ...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
- ]),
- ],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/seedance/text-video-surface",
- digest: seedanceSurfaceImplementationDigests.textVideo,
- },
- },
- {
- name: "frame-video",
- tag: "FrameVideo",
- mode: "structured",
- outputs: [seedanceTypes.durationProgram, ...Object.values(seedanceEndpoints).flatMap((endpoint) => [
- endpoint.draftType, ...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
- ])],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/seedance/frame-video-surface",
- digest: seedanceSurfaceImplementationDigests.frameVideo,
- },
- },
- {
- name: "reference-video",
- tag: "ReferenceVideo",
- mode: "structured",
- outputs: [seedanceTypes.durationProgram, ...Object.values(seedanceEndpoints).flatMap((endpoint) => [
- endpoint.draftType, ...Object.values(endpoint.mediaBindings).map((binding) => binding.type),
- ])],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/seedance/reference-video-surface",
- digest: seedanceSurfaceImplementationDigests.referenceVideo,
- },
- },
- ],
producers: [
...seedanceBaseDefinition.manifest.producers,
...seedanceModels.map((model) => ({
@@ -273,8 +268,6 @@ export const seedanceManifest = {
outputs: [{ name: "draft", type: seedanceEndpointsByModel[model].draftType }],
needs: [],
implementation: {
- kind: "registered" as const,
- locator: `@narratage/seedance/compile-${model}-duration-request`,
digest: seedanceDurationCompileImplementationDigests[model],
},
})),
diff --git a/packages/seedream/src/activation.ts b/packages/seedream/src/activation.ts
index ef5788d2..1383813f 100644
--- a/packages/seedream/src/activation.ts
+++ b/packages/seedream/src/activation.ts
@@ -1,8 +1,11 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
-import { seedreamComponent, seedreamManifest, seedreamModuleRef, seedreamSurfaceImplementationDigests } from "./index.js";
+import { seedreamComponent, seedreamManifest, seedreamModuleRef,
+ seedreamMarkupSurfaces } from "./index.js";
import { decodeSeedreamReferenceImageSurface, decodeSeedreamTextImageSurface } from "./surface.js";
-export const svmlPackage = { format: "svml.node-package@1" as const, name: "@narratage/seedream", modules: [{ manifest: seedreamManifest, specifiers: ["@narratage/seedream", "@narratage/seedream@1"] }], components: [seedreamComponent], hostFacets: [
- createMarkupSurfaceHostFacet({ module: seedreamModuleRef, surface: "text-image", mode: "structured", implementationDigest: seedreamSurfaceImplementationDigests.textImage, handler: decodeSeedreamTextImageSurface }),
- createMarkupSurfaceHostFacet({ module: seedreamModuleRef, surface: "reference-image", mode: "structured", implementationDigest: seedreamSurfaceImplementationDigests.referenceImage, handler: decodeSeedreamReferenceImageSurface }),
+export const svmlPackage = { format: "svml.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;
diff --git a/packages/seedream/src/index.ts b/packages/seedream/src/index.ts
index 246da1ab..6db354ec 100644
--- a/packages/seedream/src/index.ts
+++ b/packages/seedream/src/index.ts
@@ -50,17 +50,19 @@ export const seedreamSurfaceImplementationDigests = {
referenceImage: digestOf("@narratage/seedream/reference-image-surface@1"),
} as const;
const endpoint = seedreamEndpoints.image!;
-export const seedreamManifest = {
- ...seedreamBaseDefinition.manifest,
- surfaces: [{
+
+export const seedreamMarkupSurfaces = [{
name: "text-image", tag: "TextImage", mode: "structured" as const,
outputs: [endpoint.draftType],
- implementation: { kind: "trusted-frontend-surface" as const, locator: "@narratage/seedream/text-image-surface", digest: seedreamSurfaceImplementationDigests.textImage },
+ implementation: { digest: seedreamSurfaceImplementationDigests.textImage },
}, {
name: "reference-image", tag: "ReferenceImage", mode: "structured" as const,
outputs: [endpoint.draftType, endpoint.mediaBindings.images!.type],
- implementation: { kind: "trusted-frontend-surface" as const, locator: "@narratage/seedream/reference-image-surface", digest: seedreamSurfaceImplementationDigests.referenceImage },
- }],
+ implementation: { digest: seedreamSurfaceImplementationDigests.referenceImage },
+ }] as const;
+
+export const seedreamManifest = {
+ ...seedreamBaseDefinition.manifest,
};
export const seedreamManifestDigest = digestOf(seedreamManifest);
export const seedreamDefinition = {
diff --git a/packages/semantic-map/package.json b/packages/semantic-map/package.json
index 52322842..fb56ddf0 100644
--- a/packages/semantic-map/package.json
+++ b/packages/semantic-map/package.json
@@ -12,7 +12,6 @@
},
"dependencies": {
"@narratage/narrative": "workspace:*",
- "@narratage/program-space": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/speech-evidence": "workspace:*"
}
diff --git a/packages/semantic-map/src/activation.ts b/packages/semantic-map/src/activation.ts
index a6eb2a79..1f83adfc 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, name: "@narratage/semantic-map", modules: [{ manifest: semanticMapManifest }] };
+export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: semanticMapManifest }] };
export default svmlPackage;
diff --git a/packages/semantic-map/src/index.ts b/packages/semantic-map/src/index.ts
index bb2dadd1..f9b72f58 100644
--- a/packages/semantic-map/src/index.ts
+++ b/packages/semantic-map/src/index.ts
@@ -5,7 +5,7 @@ export {
momentFrames,
segmentFrameSpan,
selectionFrameSpans,
- tokenSpanSeconds,
+ tokenFrameSpan,
} from "./location.js";
export { completeSemanticMapSchema, semanticMapDependency, semanticMapManifest, semanticMapManifestDigest, semanticMapModuleRef, semanticMapTypes } from "./manifest.js";
export type * from "./types.js";
diff --git a/packages/semantic-map/src/location.ts b/packages/semantic-map/src/location.ts
index b78a6aa3..48b40d9f 100644
--- a/packages/semantic-map/src/location.ts
+++ b/packages/semantic-map/src/location.ts
@@ -1,6 +1,4 @@
import type { NarrativeExcerpt, NarrativeMomentRef, NarrativeSelectionRef } from "@narratage/narrative";
-import { assertProgramSpaceIdentity } from "@narratage/program-space";
-import type { ProgramSpace } from "@narratage/program-space";
import type { CompleteSemanticMap } from "./types.js";
export type LocatedFrameSpan = { readonly startFrame: number; readonly endFrameExclusive: number };
@@ -64,11 +62,9 @@ function frameFor(frames: ReadonlyMap<string, number>, anchorId: string, owner:
export function selectionFrameSpans(
map: CompleteSemanticMap,
selection: NarrativeSelectionRef,
- programSpace: ProgramSpace,
): readonly LocatedFrameSpan[] {
assertCompleteSemanticMapIdentity(map);
assertNarrativeSelectionIdentity(selection);
- assertProgramSpaceIdentity(programSpace);
const frames = anchorFrames(map);
return selection.occurrences.map((occurrence) => {
const startFrame = frameFor(frames, occurrence.startAnchorId, `NarrativeSelection ${selection.id}`);
@@ -81,10 +77,8 @@ export function selectionFrameSpans(
export function segmentFrameSpan(
map: CompleteSemanticMap,
segment: NarrativeExcerpt,
- programSpace: ProgramSpace,
): LocatedFrameSpan {
assertCompleteSemanticMapIdentity(map);
- assertProgramSpaceIdentity(programSpace);
if (segment.contract !== "svml.narrative-excerpt@1" || segment.kind !== "segment" || segment.id.length === 0) {
throw new Error("Narrative Segment excerpt is invalid");
}
@@ -104,27 +98,28 @@ export function segmentFrameSpan(
* anchor; a component that renders the Script text itself addresses them by
* token, because its runs are computed rather than authored.
*/
-export function tokenSpanSeconds(
+export function tokenFrameSpan(
map: CompleteSemanticMap,
tokenIds: readonly string[],
-): { readonly startSec: number; readonly endSec: number } | undefined {
+): LocatedFrameSpan | undefined {
assertCompleteSemanticMapIdentity(map);
if (tokenIds.length === 0) return undefined;
const timing = new Map(map.tokens.map((token) => [token.tokenId, token]));
const located = tokenIds.map((id) => timing.get(id));
if (located.some((token) => token === undefined)) return undefined;
- return { startSec: located[0]!.startSec, endSec: located.at(-1)!.endSec };
+ return {
+ startFrame: located[0]!.startFrame,
+ endFrameExclusive: located.at(-1)!.endFrameExclusive,
+ };
}
/** Project every occurrence of one Script Moment onto one measured SemanticMap. */
export function momentFrames(
map: CompleteSemanticMap,
moment: NarrativeMomentRef,
- programSpace: ProgramSpace,
): readonly number[] {
assertCompleteSemanticMapIdentity(map);
assertNarrativeMomentIdentity(moment);
- assertProgramSpaceIdentity(programSpace);
const frames = anchorFrames(map);
return moment.occurrences.map((occurrence) =>
frameFor(frames, occurrence.anchorId, `NarrativeMoment ${moment.id}`));
diff --git a/packages/semantic-map/src/manifest.ts b/packages/semantic-map/src/manifest.ts
index afe1bca6..df2b1bdf 100644
--- a/packages/semantic-map/src/manifest.ts
+++ b/packages/semantic-map/src/manifest.ts
@@ -1,18 +1,17 @@
import { narrativeDependency } from "@narratage/narrative";
-import { programSpaceDependency } from "@narratage/program-space";
import { speechEvidenceDependency } from "@narratage/speech-evidence";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, TypeRef, ValueSchema } from "@narratage/protocol";
-const string = { kind: "string", minLength: 1 } as const; const number = { kind: "number", minimum: 0 } as const; const integer = { kind: "number", integer: true, minimum: 0 } as const;
+const string = { kind: "string", minLength: 1 } as const;
+const integer = { kind: "number", integer: true, minimum: 0 } as const;
const object = (fields: Readonly<Record<string, { readonly schema: ValueSchema; readonly optional?: boolean }>>): ValueSchema => ({ kind: "object", fields });
-const timedSegment = object({ segmentId: { schema: string }, startSec: { schema: number }, endSec: { schema: number }, startFrame: { schema: integer }, endFrame: { schema: integer } });
-const timedToken = object({ tokenId: { schema: string }, segmentId: { schema: string }, startSec: { schema: number }, endSec: { schema: number }, startFrame: { schema: integer }, endFrame: { schema: integer } });
-const point = object({ identity: { schema: string }, timeSec: { schema: number }, frame: { schema: integer } });
+const timedToken = object({ tokenId: { schema: string }, segmentId: { schema: string }, startFrame: { schema: integer }, endFrameExclusive: { schema: integer } });
+const point = object({ identity: { schema: string }, frame: { schema: integer } });
export const completeSemanticMapSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.complete-semantic-map@1" } },
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, programSpaceDependency], types: [{ name: semanticMapTypes.complete.name, schema: completeSemanticMapSchema }], capabilities: [], surfaces: [], producers: [] };
+ 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;
diff --git a/packages/semantic-map/src/types.ts b/packages/semantic-map/src/types.ts
index 605c1d36..7af029e9 100644
--- a/packages/semantic-map/src/types.ts
+++ b/packages/semantic-map/src/types.ts
@@ -1,9 +1,10 @@
-export type AlignmentRelation = "exact" | "split" | "merge" | "replacement" | "source-omission" | "evidence-insertion";
-/** How the aligner paired one Script run with one evidence run. Working data, not a map field. */
-export type AlignmentGroup = { readonly sourceSegmentId: string; readonly sourceTokenIds: readonly string[]; readonly evidenceWordStart: number; readonly evidenceWordEndExclusive: number; readonly relation: AlignmentRelation; readonly cost: number };
-export type TimedSpeechToken = { readonly tokenId: string; readonly segmentId: string; readonly startSec: number; readonly endSec: number; readonly startFrame: number; readonly endFrame: number };
-export type TimedSpeechSegment = { readonly segmentId: string; readonly startSec: number; readonly endSec: number; readonly startFrame: number; readonly endFrame: number };
-export type SemanticTimePoint = { readonly identity: string; readonly timeSec: number; readonly frame: number };
+export type TimedSpeechToken = {
+ readonly tokenId: string;
+ readonly segmentId: string;
+ readonly startFrame: number;
+ readonly endFrameExclusive: number;
+};
+export type SemanticTimePoint = { readonly identity: string; readonly frame: number };
/**
* The 2M+2N point map every marker addresses, plus the Segment and Token ranges
* consumers read windows from. Anchors are the addressing truth.
diff --git a/packages/semantic-map/test/location.test.ts b/packages/semantic-map/test/location.test.ts
index 10427b03..d72783c4 100644
--- a/packages/semantic-map/test/location.test.ts
+++ b/packages/semantic-map/test/location.test.ts
@@ -4,7 +4,6 @@ import test from "node:test";
import { momentFrames, segmentFrameSpan, selectionFrameSpans } from "@narratage/semantic-map";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import type { NarrativeMomentRef, NarrativeSelectionRef } from "@narratage/narrative";
-import type { ProgramSpace } from "@narratage/program-space";
/**
* Two Segments at 10 fps. Words are one frame wide with a one-frame gap, so a
@@ -14,20 +13,10 @@ import type { ProgramSpace } from "@narratage/program-space";
* opening: hello[0..1) end[2..3) segment 0..4
* second: start[5..6) here[7..8) segment 5..9
*/
-const space: ProgramSpace = {
- contract: "svml.program-space@1",
- frameRate: { numerator: 10, denominator: 1 },
- durationSec: 1,
-};
-
-const anchor = (identity: string, frame: number) => ({ identity, timeSec: frame / 10, frame });
+const anchor = (identity: string, frame: number) => ({ identity, frame });
const map = {
contract: "svml.complete-semantic-map@1",
- segments: [
- { segmentId: "opening", startSec: 0, endSec: 0.4, startFrame: 0, endFrame: 4 },
- { segmentId: "second", startSec: 0.5, endSec: 0.9, startFrame: 5, endFrame: 9 },
- ],
tokens: [],
anchors: [
anchor("segment:opening:start", 0),
@@ -60,7 +49,7 @@ function selection(openAnchor: string, closeAnchor: string): NarrativeSelectionR
test("the default inward markers select exactly the marked word", () => {
// `@x end @/x` resolved at parse time to token 2's own cuts.
assert.deepEqual(
- selectionFrameSpans(map, selection("segment:opening:token:2:start", "segment:opening:token:2:end"), space),
+ selectionFrameSpans(map, selection("segment:opening:token:2:start", "segment:opening:token:2:end")),
[{ startFrame: 2, endFrameExclusive: 3 }],
);
});
@@ -68,7 +57,7 @@ test("the default inward markers select exactly the marked word", () => {
test("outward markers absorb the surrounding silence, not the neighbouring word", () => {
// `hello ~@x end @/x~ …` resolves to hello's END and the next word's START.
assert.deepEqual(
- selectionFrameSpans(map, selection("segment:opening:token:1:end", "segment:opening:token:2:start"), space),
+ selectionFrameSpans(map, selection("segment:opening:token:1:end", "segment:opening:token:2:start")),
[{ startFrame: 1, endFrameExclusive: 2 }],
);
});
@@ -77,11 +66,11 @@ test("a Segment cut is an ordinary anchor, so a Selection may start at one", ()
// `</opening><second> ~@x start …` — the left boundary is `second`'s own start
// cut, five frames after `opening` ended, never `opening`'s last word.
assert.deepEqual(
- selectionFrameSpans(map, selection("segment:second:start", "segment:second:token:1:end"), space),
+ selectionFrameSpans(map, selection("segment:second:start", "segment:second:token:1:end")),
[{ startFrame: 5, endFrameExclusive: 6 }],
);
assert.deepEqual(
- selectionFrameSpans(map, selection("segment:second:token:2:start", "segment:second:end"), space),
+ selectionFrameSpans(map, selection("segment:second:token:2:start", "segment:second:end")),
[{ startFrame: 7, endFrameExclusive: 9 }],
);
});
@@ -89,7 +78,7 @@ test("a Segment cut is an ordinary anchor, so a Selection may start at one", ()
test("a whole Segment is exactly its two structural anchors", () => {
assert.deepEqual(segmentFrameSpan(map, {
contract: "svml.narrative-excerpt@1", kind: "segment", id: "second", tokenStart: 2, tokenEndExclusive: 4,
- }, space), { startFrame: 5, endFrameExclusive: 9 });
+ }), { startFrame: 5, endFrameExclusive: 9 });
});
test("a Moment locates one instant per occurrence", () => {
@@ -101,12 +90,12 @@ test("a Moment locates one instant per occurrence", () => {
{ occurrence: 1, anchorId: "segment:second:token:2:start" },
],
} as NarrativeMomentRef;
- assert.deepEqual(momentFrames(map, moment, space), [5, 7]);
+ assert.deepEqual(momentFrames(map, moment), [5, 7]);
});
test("an anchor the map does not contain names the Selection that asked for it", () => {
assert.throws(
- () => selectionFrameSpans(map, selection("segment:missing:start", "segment:second:end"), space),
+ () => selectionFrameSpans(map, selection("segment:missing:start", "segment:second:end")),
/NarrativeSelection x names anchor segment:missing:start/u,
);
});
@@ -132,7 +121,7 @@ test("overlapping occurrences pass through untouched, in Script order", () => {
],
} as NarrativeSelectionRef;
// opening:token1:start = 0, opening:end = 4, second:token1:end = 6, second:end = 9
- assert.deepEqual(selectionFrameSpans(map, overlapping, space), [
+ assert.deepEqual(selectionFrameSpans(map, overlapping), [
{ startFrame: 0, endFrameExclusive: 4 },
{ startFrame: 6, endFrameExclusive: 9 },
]);
@@ -157,7 +146,7 @@ test("Script order is preserved even when it runs backwards in time", () => {
},
],
} as NarrativeSelectionRef;
- assert.deepEqual(selectionFrameSpans(map, crossing, space), [
+ assert.deepEqual(selectionFrameSpans(map, crossing), [
{ startFrame: 5, endFrameExclusive: 9 },
{ startFrame: 0, endFrameExclusive: 4 },
]);
diff --git a/packages/source/package.json b/packages/source/package.json
index 845210b3..b10bf0c8 100644
--- a/packages/source/package.json
+++ b/packages/source/package.json
@@ -6,5 +6,8 @@
"type": "module",
"exports": {
".": "./src/index.ts"
+ },
+ "dependencies": {
+ "@narratage/protocol": "workspace:*"
}
}
diff --git a/packages/source/src/index.ts b/packages/source/src/index.ts
index e712685f..afa185b3 100644
--- a/packages/source/src/index.ts
+++ b/packages/source/src/index.ts
@@ -4,3 +4,14 @@ export {
SourceHeaderError,
} from "./header.js";
export type { SourceHeader } from "./header.js";
+export type {
+ Awaitable,
+ ResolvedSourceAsset,
+ SourceAssetRequest,
+ SourceAssetResolver,
+ SourceImportRequest,
+ SourceResolver,
+ SourceUnit,
+} from "./unit.js";
+/** Logical package address for Source Frontends selected by a Source Header. */
+export const sourceFrontendPackageAbi = "svml.source-frontend@1";
diff --git a/packages/source/src/unit.ts b/packages/source/src/unit.ts
new file mode 100644
index 00000000..ff7c0e1b
--- /dev/null
+++ b/packages/source/src/unit.ts
@@ -0,0 +1,38 @@
+import type { BlobRef, SourceRange } from "@narratage/protocol";
+
+export type SourceUnit = {
+ /** Host-canonical identity used only for recursion and diagnostics. */
+ readonly id: string;
+ readonly name: string;
+ readonly text: string;
+};
+
+export type SourceImportRequest = {
+ readonly from: string;
+ readonly alias: string;
+ readonly range?: SourceRange;
+};
+
+export type SourceAssetRequest = {
+ readonly from: string;
+ readonly mediaType: string;
+ /** Package-owned bytes admitted by the compiler before a Workspace is consulted. */
+ readonly bytes?: Uint8Array;
+ readonly range?: SourceRange;
+};
+
+export type ResolvedSourceAsset = {
+ readonly artifact: BlobRef;
+};
+
+export type Awaitable<T> = T | Promise<T>;
+
+export type SourceResolver = (
+ importer: SourceUnit,
+ request: SourceImportRequest,
+) => Awaitable<SourceUnit>;
+
+export type SourceAssetResolver = (
+ importer: SourceUnit,
+ request: SourceAssetRequest,
+) => Awaitable<ResolvedSourceAsset>;
diff --git a/packages/spatial/package.json b/packages/spatial/package.json
index e6b29133..49b0458d 100644
--- a/packages/spatial/package.json
+++ b/packages/spatial/package.json
@@ -14,8 +14,7 @@
"@narratage/component-kit": "workspace:*",
"@narratage/elaborator": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/markup": "workspace:*",
- "@narratage/validation": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/core": "workspace:*"
diff --git a/packages/spatial/src/activation.ts b/packages/spatial/src/activation.ts
index 25aeb08b..eec037dc 100644
--- a/packages/spatial/src/activation.ts
+++ b/packages/spatial/src/activation.ts
@@ -12,23 +12,29 @@ import {
import {
spatialManifest,
spatialModuleRef,
- spatialSurfaceDigests,
+ spatialMarkupSurfaces,
} from "./manifest.js";
import { spatialComponent } from "./component.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/spatial",
- modules: [{ manifest: spatialManifest, specifiers: ["@narratage/spatial", "@narratage/spatial@1"] }],
+ modules: [{ manifest: spatialManifest }],
components: [spatialComponent],
hostFacets: [
- createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "canvas", mode: "structured", implementationDigest: spatialSurfaceDigests.canvas, handler: decodeCanvasSurface }),
- createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "point", mode: "structured", implementationDigest: spatialSurfaceDigests.point, handler: decodePointSurface }),
- createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "path", mode: "structured", implementationDigest: spatialSurfaceDigests.path, handler: decodePathSurface }),
- createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "extent", mode: "structured", implementationDigest: spatialSurfaceDigests.extent, handler: decodeExtentSurface }),
- createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "frame", mode: "structured", implementationDigest: spatialSurfaceDigests.frame, handler: decodeFrameSurface }),
- createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "anchored-frame", mode: "structured", implementationDigest: spatialSurfaceDigests.anchoredFrame, handler: decodeAnchoredFrameSurface }),
- createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "aspect-frame", mode: "structured", implementationDigest: spatialSurfaceDigests.aspectFrame, handler: decodeAspectFrameSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "canvas")!, handler: decodeCanvasSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "point")!, handler: decodePointSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "path")!, handler: decodePathSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "extent")!, handler: decodeExtentSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "frame")!, handler: decodeFrameSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "anchored-frame")!, handler: decodeAnchoredFrameSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef,
+ declaration: spatialMarkupSurfaces.find((item) => item.name === "aspect-frame")!, handler: decodeAspectFrameSurface }),
],
};
export default svmlPackage;
diff --git a/packages/spatial/src/component.ts b/packages/spatial/src/component.ts
index a9b5114d..6ea4b2ab 100644
--- a/packages/spatial/src/component.ts
+++ b/packages/spatial/src/component.ts
@@ -39,7 +39,6 @@ function inline<T>(value: StoredValue | undefined, label: string): T {
const output = (value: unknown) => ({ kind: "inline" as const, value: canonicalize(value) });
export const spatialComponent = {
- name: "@narratage/spatial",
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: {} }) },
diff --git a/packages/spatial/src/fragment.ts b/packages/spatial/src/fragment.ts
index c4aeaf91..d660c5ea 100644
--- a/packages/spatial/src/fragment.ts
+++ b/packages/spatial/src/fragment.ts
@@ -6,35 +6,30 @@ const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (name: string) => ({ kind: "fragment-operation" as const, operation: name });
export const canvasFrameFragment = sealGraphFragment({
- name: "@narratage/spatial/canvas-frame@1",
inputs: [{ name: "canvas", type: spatialTypes.canvas }],
operations: [{ id: "resolve", producer: spatialProducers.canvasFrame, inputs: { canvas: input("canvas") }, result: { kind: "output", name: "frame" } }],
exports: [{ name: "frame", type: spatialTypes.frame, root: operation("resolve") }],
});
export const frameEdgesFragment = sealGraphFragment({
- name: "@narratage/spatial/frame-edges@1",
inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "program", type: spatialTypes.frameEdgesProgram }],
operations: [{ id: "resolve", producer: spatialProducers.frameEdges, inputs: { parent: input("parent"), program: input("program") }, result: { kind: "output", name: "frame" } }],
exports: [{ name: "frame", type: spatialTypes.frame, root: operation("resolve") }],
});
export const anchoredFrameFragment = sealGraphFragment({
- name: "@narratage/spatial/anchored-frame@1",
inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "program", type: spatialTypes.anchoredFrameProgram }],
operations: [{ id: "resolve", producer: spatialProducers.anchoredFrame, inputs: { parent: input("parent"), program: input("program") }, result: { kind: "output", name: "frame" } }],
exports: [{ name: "frame", type: spatialTypes.frame, root: operation("resolve") }],
});
export const aspectFrameFragment = sealGraphFragment({
- name: "@narratage/spatial/aspect-frame@1",
inputs: [{ name: "parent", type: spatialTypes.frame }, { name: "extent", type: spatialTypes.extent }, { name: "program", type: spatialTypes.aspectFrameProgram }],
operations: [{ id: "resolve", producer: spatialProducers.aspectFrame, inputs: { parent: input("parent"), extent: input("extent"), program: input("program") }, result: { kind: "output", name: "frame" } }],
exports: [{ name: "frame", type: spatialTypes.frame, root: operation("resolve") }],
});
export const fitContentFragment = sealGraphFragment({
- name: "@narratage/spatial/fit-content@1",
inputs: [{ name: "frame", type: spatialTypes.frame }, { name: "extent", type: spatialTypes.extent }, { name: "fit", type: spatialTypes.fit }],
operations: [{ id: "resolve", producer: spatialProducers.fitContent, inputs: { frame: input("frame"), extent: input("extent"), fit: input("fit") }, result: { kind: "output", name: "fitted" } }],
exports: [{ name: "fitted", type: spatialTypes.fitted, root: operation("resolve") }],
diff --git a/packages/spatial/src/index.ts b/packages/spatial/src/index.ts
index 5fdf6dc3..07d2c9f8 100644
--- a/packages/spatial/src/index.ts
+++ b/packages/spatial/src/index.ts
@@ -10,7 +10,7 @@ export {
export * from "./geometry.js";
export {
spatialDependency,
- spatialManifest,
+ spatialManifest, spatialMarkupSurfaces,
spatialManifestDigest,
spatialModuleRef,
spatialProducers,
diff --git a/packages/spatial/src/manifest.ts b/packages/spatial/src/manifest.ts
index 9736e522..914c16ad 100644
--- a/packages/spatial/src/manifest.ts
+++ b/packages/spatial/src/manifest.ts
@@ -45,44 +45,45 @@ export const spatialProducers = {
fitContent: { module: spatialModuleRef, name: "fit-content" },
} satisfies Record<string, ProducerRef>;
-const validator = (locator: string, digest: ReturnType<typeof digestOf>) => ({
- abi: "svml.type-validator@1" as const,
- implementation: { kind: "registered" as const, locator, digest },
+const validator = (digest: ReturnType<typeof digestOf>) => ({
+ implementation: { digest },
});
+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 } },
+ ] as const;
+
+
export const spatialManifest: ModuleManifest = {
format: "svml.module@1",
name: spatialModuleRef.name,
version: spatialModuleRef.version,
dependencies: [],
types: [
- { name: spatialTypes.canvas.name, schema: canvasSpaceSchema, validator: validator("@narratage/spatial/validate-canvas", spatialValidatorDigests.canvas) },
- { name: spatialTypes.point.name, schema: spatialPointSchema, validator: validator("@narratage/spatial/validate-point", spatialValidatorDigests.point) },
- { name: spatialTypes.frame.name, schema: spatialFrameSchema, validator: validator("@narratage/spatial/validate-frame", spatialValidatorDigests.frame) },
- { name: spatialTypes.path.name, schema: spatialPathSchema, validator: validator("@narratage/spatial/validate-path", spatialValidatorDigests.path) },
- { name: spatialTypes.extent.name, schema: intrinsicExtentSchema, validator: validator("@narratage/spatial/validate-extent", spatialValidatorDigests.extent) },
- { name: spatialTypes.fit.name, schema: contentFitSchema, validator: validator("@narratage/spatial/validate-fit", spatialValidatorDigests.fit) },
- { name: spatialTypes.fitted.name, schema: fittedContentSchema, validator: validator("@narratage/spatial/validate-fitted", spatialValidatorDigests.fitted) },
+ { 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 },
],
capabilities: [],
- surfaces: [
- { name: "canvas", tag: "Canvas", mode: "structured", outputs: [spatialTypes.canvas], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/spatial/canvas-surface", digest: spatialSurfaceDigests.canvas } },
- { name: "point", tag: "Point", mode: "structured", outputs: [spatialTypes.point], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/spatial/point-surface", digest: spatialSurfaceDigests.point } },
- { name: "path", tag: "Path", mode: "structured", outputs: [spatialTypes.path], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/spatial/path-surface", digest: spatialSurfaceDigests.path } },
- { name: "extent", tag: "Extent", mode: "structured", outputs: [spatialTypes.extent], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/spatial/extent-surface", digest: spatialSurfaceDigests.extent } },
- { name: "frame", tag: "Frame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.frameEdgesProgram], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/spatial/frame-surface", digest: spatialSurfaceDigests.frame } },
- { name: "anchored-frame", tag: "AnchoredFrame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.anchoredFrameProgram], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/spatial/anchored-frame-surface", digest: spatialSurfaceDigests.anchoredFrame } },
- { name: "aspect-frame", tag: "AspectFrame", mode: "structured", outputs: [spatialTypes.frame, spatialTypes.extent, spatialTypes.aspectFrameProgram], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/spatial/aspect-frame-surface", digest: spatialSurfaceDigests.aspectFrame } },
- ],
producers: [
- { name: spatialProducers.canvasFrame.name, inputs: [{ name: "canvas", type: spatialTypes.canvas }], outputs: [{ name: "frame", type: spatialTypes.frame }], needs: [], implementation: { kind: "registered", locator: "@narratage/spatial/canvas-frame", 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: { kind: "registered", locator: "@narratage/spatial/frame-edges", 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: { kind: "registered", locator: "@narratage/spatial/anchored-frame", 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: { kind: "registered", locator: "@narratage/spatial/aspect-frame", 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: { kind: "registered", locator: "@narratage/spatial/fit-content", digest: spatialImplementationDigests.fitContent } },
+ { 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 } },
],
};
export const spatialManifestDigest = digestOf(spatialManifest);
diff --git a/packages/spatial/test/spatial.test.ts b/packages/spatial/test/spatial.test.ts
index 9657311e..124bd2a8 100644
--- a/packages/spatial/test/spatial.test.ts
+++ b/packages/spatial/test/spatial.test.ts
@@ -25,9 +25,9 @@ import {
sealSpatialPath,
spatialComponent,
spatialManifest,
+ spatialMarkupSurfaces,
spatialModuleRef,
spatialProducers,
- spatialSurfaceDigests,
spatialTypes,
} from "../src/index.js";
import type { ContentFit, IntrinsicExtent, SpatialAnchor, SpatialFrame } from "../src/index.js";
@@ -202,12 +202,17 @@ function source(text: string): AuthorSourceUnit {
test("self-described Spatial Surfaces produce an explicit Canvas edge and finite Frame graph", async () => {
const closure = createResolvedClosure([spatialManifest]);
const surfaces = new MarkupSurfaceRegistry();
- surfaces.registerStructured(spatialModuleRef, "canvas", spatialSurfaceDigests.canvas, decodeCanvasSurface);
- surfaces.registerStructured(spatialModuleRef, "point", spatialSurfaceDigests.point, decodePointSurface);
- surfaces.registerStructured(spatialModuleRef, "path", spatialSurfaceDigests.path, decodePathSurface);
- surfaces.registerStructured(spatialModuleRef, "frame", spatialSurfaceDigests.frame, decodeFrameSurface);
- surfaces.registerStructured(spatialModuleRef, "anchored-frame", spatialSurfaceDigests.anchoredFrame, decodeAnchoredFrameSurface);
- surfaces.registerStructured(spatialModuleRef, "aspect-frame", spatialSurfaceDigests.aspectFrame, decodeAspectFrameSurface);
+ const register = (name: string, handler: Parameters<MarkupSurfaceRegistry["registerStructured"]>[0]["handler"]) => {
+ const declaration = spatialMarkupSurfaces.find((item) => item.name === name);
+ if (declaration === undefined) throw new Error(`missing Spatial Surface ${name}`);
+ surfaces.registerStructured({ module: spatialModuleRef, declaration, handler });
+ };
+ register("canvas", decodeCanvasSurface);
+ register("point", decodePointSurface);
+ register("path", decodePathSurface);
+ register("frame", decodeFrameSurface);
+ register("anchored-frame", decodeAnchoredFrameSurface);
+ register("aspect-frame", decodeAspectFrameSurface);
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({ registry: surfaces, resolveModule: () => spatialModuleRef }));
const validators = new TypeValidatorRegistry();
@@ -235,8 +240,8 @@ test("self-described Spatial Surfaces produce an explicit Canvas edge and finite
assert.equal(resolveCompiledSourceExport(compiled, "headline-path", spatialTypes.path).ref.kind, "record");
const sticker = resolveCompiledSourceExport(compiled, "sticker", spatialTypes.frame);
assert.equal(sticker.ref.kind, "logical-output");
- const build = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const build = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [{ output: sticker.ref.kind === "logical-output" ? sticker.ref.id : "" }],
}));
assert.deepEqual(build.plan.steps.map((step) => step.producer.name).sort(), [
diff --git a/packages/speech-alignment/README.md b/packages/speech-alignment/README.md
index 1ecc2082..58f0088f 100644
--- a/packages/speech-alignment/README.md
+++ b/packages/speech-alignment/README.md
@@ -14,7 +14,7 @@ into the selected ProgramSpace and contains one timing for every Script token an
semantic anchors.
The locator accepts Narrative, SpeechAudioBasis and AlignedTranscriptEvidence through three explicit
-graph edges. It checks duration, Segment identity, order and windows against the supplied Basis.
+graph edges. It checks Segment identity, order and measured windows against the supplied Basis.
Artifact/Basis lineage stays in the upstream request edges and Derivations instead of being copied
through every evidence value.
diff --git a/packages/speech-alignment/src/activation.ts b/packages/speech-alignment/src/activation.ts
index eb016bb2..43f0f70b 100644
--- a/packages/speech-alignment/src/activation.ts
+++ b/packages/speech-alignment/src/activation.ts
@@ -2,7 +2,6 @@ import { speechAlignmentComponent, speechAlignmentManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/speech-alignment",
modules: [{ manifest: speechAlignmentManifest }],
components: [speechAlignmentComponent],
};
diff --git a/packages/speech-alignment/src/align.ts b/packages/speech-alignment/src/align.ts
index 790b0c7e..9e7d462c 100644
--- a/packages/speech-alignment/src/align.ts
+++ b/packages/speech-alignment/src/align.ts
@@ -1,8 +1,8 @@
import type { NarrativeToken } from "@narratage/narrative";
import type { SpeechWordEvidence } from "@narratage/speech-evidence";
-import type { AlignmentGroup, AlignmentRelation } from "@narratage/semantic-map";
import { editDistance, normalizeForAlignment } from "./normalize.js";
+import type { AlignmentGroup, AlignmentRelation } from "./types.js";
const EPSILON = 1e-9;
const DEFAULT_MAX_GROUP = 4;
diff --git a/packages/speech-alignment/src/component.ts b/packages/speech-alignment/src/component.ts
index 4b9e055c..1bb6cde7 100644
--- a/packages/speech-alignment/src/component.ts
+++ b/packages/speech-alignment/src/component.ts
@@ -18,7 +18,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
/** Provider-neutral deterministic alignment; acoustic measurement remains an explicit upstream Need. */
export const speechAlignmentComponent = {
- name: "@narratage/speech-alignment",
producers: [{
producer: speechAlignmentProducers.locate,
implementationDigest: speechLocatorDigest,
diff --git a/packages/speech-alignment/src/locate.ts b/packages/speech-alignment/src/locate.ts
index a64cd926..7daabdb8 100644
--- a/packages/speech-alignment/src/locate.ts
+++ b/packages/speech-alignment/src/locate.ts
@@ -3,13 +3,13 @@ import type { Narrative, NarrativeToken } from "@narratage/narrative";
import type { ProgramSpace } from "@narratage/program-space";
import type { SpeechAudioBasis, SpeechBasis } from "@narratage/speech";
import type { AlignedTranscriptEvidence, AlignedTranscriptSegment, SpeechCharacterEvidence, SpeechWordEvidence } from "@narratage/speech-evidence";
-import type { AlignmentGroup, CompleteSemanticMap, SemanticTimePoint, TimedSpeechSegment, TimedSpeechToken } from "@narratage/semantic-map";
+import type { CompleteSemanticMap, SemanticTimePoint, TimedSpeechToken } from "@narratage/semantic-map";
import { alignWordGroups } from "./align.js";
import { SpeechAlignmentError } from "./error.js";
import { alignCharacters, alignmentCharacters } from "./normalize.js";
+import type { AlignmentGroup, TimedSpeechSegment } from "./types.js";
-const EPSILON = 1e-6;
export const speechLocatorDigest = digestOf("@narratage/speech-alignment/locate@1");
type MutableTiming = {
@@ -81,12 +81,7 @@ function validateEvidence(
if (evidence.contract !== "svml.aligned-transcript-evidence@1") {
fail("SPEECH_CONTRACT", `Unsupported aligned-transcript contract ${evidence.contract}.`);
}
- if (!Number.isFinite(evidence.durationSec) || evidence.durationSec <= 0) {
- fail("SPEECH_DURATION", "Aligned-transcript duration must be positive and finite.");
- }
- if (Math.abs(evidence.durationSec - basis.programSpace.durationSec) > EPSILON) {
- fail("SPEECH_EVIDENCE_DURATION", "Aligned transcript duration differs from SpeechBasis.");
- }
+ const durationSec = basis.programSpace.durationSec;
const expected = new Set(narrative.segments.map((segment) => segment.id));
const seen = new Set<string>();
for (const segment of evidence.segments) {
@@ -97,11 +92,10 @@ function validateEvidence(
fail("SPEECH_SEGMENT_DUPLICATE", `Aligned transcript repeats Segment ${segment.sourceSegmentId}.`);
}
seen.add(segment.sourceSegmentId);
- validateWindow(segment.startSec, segment.endSec, evidence.durationSec, `Segment ${segment.sourceSegmentId}`);
for (const [index, word] of segment.words.entries()) {
if (typeof word.text !== "string") fail("SPEECH_WORD_TEXT", `Word ${index + 1} has no text.`);
if (finite(word.startSec) && finite(word.endSec)) {
- validateWindow(word.startSec, word.endSec, evidence.durationSec, `Word ${index + 1}`);
+ validateWindow(word.startSec, word.endSec, durationSec, `Word ${index + 1}`);
}
}
for (const [index, char] of segment.chars.entries()) {
@@ -109,28 +103,16 @@ function validateEvidence(
fail("SPEECH_CHAR_WORD", `Character ${index + 1} has an invalid wordIndex.`);
}
if (finite(char.startSec) && finite(char.endSec)) {
- validateWindow(char.startSec, char.endSec, evidence.durationSec, `Character ${index + 1}`);
+ validateWindow(char.startSec, char.endSec, durationSec, `Character ${index + 1}`);
}
}
for (const [index, span] of (segment.speechActivity ?? []).entries()) {
- validateWindow(span.startSec, span.endSec, evidence.durationSec, `VAD span ${index + 1}`);
+ validateWindow(span.startSec, span.endSec, durationSec, `VAD span ${index + 1}`);
}
}
for (const id of expected) {
if (!seen.has(id)) fail("SPEECH_SEGMENT_MISSING", `Aligned transcript is missing Segment ${id}.`);
}
- const segmentsById = new Map(evidence.segments.map((segment) => [segment.sourceSegmentId, segment]));
- for (const sourceSegment of narrative.segments) {
- const segment = segmentsById.get(sourceSegment.id)!;
- const basisSegment = basis.segments.find((item) => item.segmentId === sourceSegment.id)!;
- // The transcript must answer the segmentation it was asked about.
- if (
- Math.abs(segment.startSec - basisSegment.startSec) > EPSILON
- || Math.abs(segment.endSec - basisSegment.endSec) > EPSILON
- ) {
- fail("SPEECH_EVIDENCE_SEGMENT_AFFINITY", `Segment ${segment.sourceSegmentId} differs from SpeechBasis.`);
- }
- }
}
function syntheticCharTimes(
@@ -264,14 +246,17 @@ function locatePairedGroup(
}
}
-function speechBounds(segment: AlignedTranscriptSegment): { readonly start: number; readonly end: number } {
+function speechBounds(
+ segment: AlignedTranscriptSegment,
+ basisSegment: { readonly startSec: number; readonly endSec: number },
+): { readonly start: number; readonly end: number } {
const spans = segment.speechActivity ?? [];
return spans.length
? { start: spans[0]!.startSec, end: spans.at(-1)!.endSec }
- : { start: segment.startSec, end: segment.endSec };
+ : { start: basisSegment.startSec, end: basisSegment.endSec };
}
-function fillEstimated(
+function fillMissingTiming(
values: Array<MutableTiming | undefined>,
source: readonly NarrativeToken[],
startBound: number,
@@ -315,11 +300,6 @@ function frameFor(basis: SpeechAudioBasis, timeSec: number): number {
return Math.round(timeSec * numerator / denominator);
}
-function secondsFor(basis: SpeechAudioBasis, frame: number): number {
- const { numerator, denominator } = basis.programSpace.frameRate;
- return frame * denominator / numerator;
-}
-
/**
* Locate every Script token against one recording.
*
@@ -332,8 +312,8 @@ function secondsFor(basis: SpeechAudioBasis, frame: number): number {
*
* Locating fails only when the Script, the audio and the transcript are not the
* same three things: a missing or repeated Segment, a Segment the Script never
- * declared, a transcript answering a different segmentation, or a duration that
- * belongs to other audio. It never fails because of a timestamp.
+ * declared, or a transcript answering a different segmentation. It never fails
+ * merely because a provider timestamp is awkward.
*/
export function locateSpeechTiming(
narrative: Narrative,
@@ -353,8 +333,9 @@ export function locateSpeechTiming(
const chars = timedChars(aligned);
const located: Array<MutableTiming | undefined> = Array(source.length).fill(undefined);
for (const group of segmentGroups) locatePairedGroup(group, source, aligned.words, chars, located);
- const bounds = speechBounds(aligned);
- const complete = fillEstimated(located, source, bounds.start, bounds.end);
+ const basisSegment = basis.segments.find((item) => item.segmentId === segment.id)!;
+ const bounds = speechBounds(aligned, basisSegment);
+ const complete = fillMissingTiming(located, source, bounds.start, bounds.end);
const segmentTokens = source.map((token, index): TimedSpeechToken => {
const timing = complete[index]!;
const startFrame = frameFor(basis, timing.startSec);
@@ -362,21 +343,17 @@ export function locateSpeechTiming(
return {
tokenId: token.id,
segmentId: segment.id,
- startSec: secondsFor(basis, startFrame),
- endSec: secondsFor(basis, endFrame),
startFrame,
- endFrame,
+ endFrameExclusive: endFrame,
};
});
timedTokens.push(...segmentTokens);
- const startFrame = frameFor(basis, aligned.startSec);
- const endFrame = frameFor(basis, aligned.endSec);
+ const startFrame = frameFor(basis, basisSegment.startSec);
+ const endFrame = frameFor(basis, basisSegment.endSec);
timedSegments.push({
segmentId: segment.id,
- startSec: secondsFor(basis, startFrame),
- endSec: secondsFor(basis, endFrame),
startFrame,
- endFrame,
+ endFrameExclusive: endFrame,
});
}
@@ -386,13 +363,13 @@ export function locateSpeechTiming(
if (anchor.kind === "segment-start" || anchor.kind === "segment-end") {
const segment = segmentsById.get(anchor.segmentId)!;
return anchor.kind === "segment-start"
- ? { identity: anchor.id, timeSec: segment.startSec, frame: segment.startFrame }
- : { identity: anchor.id, timeSec: segment.endSec, frame: segment.endFrame };
+ ? { identity: anchor.id, frame: segment.startFrame }
+ : { identity: anchor.id, frame: segment.endFrameExclusive };
}
const token = tokensById.get(anchor.tokenId!)!;
return anchor.kind === "token-start"
- ? { identity: anchor.id, timeSec: token.startSec, frame: token.startFrame }
- : { identity: anchor.id, timeSec: token.endSec, frame: token.endFrame };
+ ? { identity: anchor.id, frame: token.startFrame }
+ : { identity: anchor.id, frame: token.endFrameExclusive };
});
return {
contract: "svml.complete-semantic-map@1" as const,
diff --git a/packages/speech-alignment/src/manifest.ts b/packages/speech-alignment/src/manifest.ts
index 9b553da2..25bddf25 100644
--- a/packages/speech-alignment/src/manifest.ts
+++ b/packages/speech-alignment/src/manifest.ts
@@ -23,7 +23,6 @@ export const speechAlignmentManifest: ModuleManifest = {
],
types: [],
capabilities: [],
- surfaces: [],
producers: [{
name: speechAlignmentProducers.locate.name,
inputs: [
@@ -34,8 +33,6 @@ export const speechAlignmentManifest: ModuleManifest = {
outputs: [{ name: "map", type: semanticMapTypes.complete }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/speech-alignment/locate",
digest: speechLocatorDigest,
},
}],
diff --git a/packages/speech-alignment/src/types.ts b/packages/speech-alignment/src/types.ts
index 5dec813b..714375a2 100644
--- a/packages/speech-alignment/src/types.ts
+++ b/packages/speech-alignment/src/types.ts
@@ -6,11 +6,32 @@ export type {
SpeechWordEvidence,
} from "@narratage/speech-evidence";
export type {
- AlignmentGroup,
- AlignmentRelation,
CompleteSemanticMap,
SemanticTimePoint,
- TimedSpeechSegment,
TimedSpeechToken,
} from "@narratage/semantic-map";
export type { SpeechAudioBasis } from "@narratage/speech";
+
+/** Private vocabulary of the alignment implementation, not part of SemanticMap. */
+export type AlignmentRelation =
+ | "exact"
+ | "split"
+ | "merge"
+ | "replacement"
+ | "source-omission"
+ | "evidence-insertion";
+
+export type AlignmentGroup = {
+ readonly sourceSegmentId: string;
+ readonly sourceTokenIds: readonly string[];
+ readonly evidenceWordStart: number;
+ readonly evidenceWordEndExclusive: number;
+ readonly relation: AlignmentRelation;
+ readonly cost: number;
+};
+
+export type TimedSpeechSegment = {
+ readonly segmentId: string;
+ readonly startFrame: number;
+ readonly endFrameExclusive: number;
+};
diff --git a/packages/speech-alignment/test/speech-align.test.ts b/packages/speech-alignment/test/speech-align.test.ts
index 292136fa..ce4a8f7a 100644
--- a/packages/speech-alignment/test/speech-align.test.ts
+++ b/packages/speech-alignment/test/speech-align.test.ts
@@ -42,12 +42,9 @@ function evidence(args: {
}): AlignedTranscriptEvidence {
return sealAlignedTranscriptEvidence({
contract: "svml.aligned-transcript-evidence@1",
- durationSec: args.basis.programSpace.durationSec,
segments: [
{
sourceSegmentId: args.segmentId ?? "line",
- startSec: args.startSec ?? 0,
- endSec: args.endSec ?? args.basis.programSpace.durationSec,
words: args.words,
chars: args.chars ?? [],
...(args.vad === undefined ? {} : { speechActivity: args.vad }),
@@ -130,10 +127,10 @@ test("exact transcript words cover every Script and Segment anchor", () => {
assert.equal(map.tokens.length, 2);
assert.equal(map.anchors.length, 2 * narrative.tokens.length + 2 * narrative.segments.length);
assert.deepEqual(
- map.tokens.map((token) => [token.startSec, token.endSec]),
+ map.tokens.map((token) => [token.startFrame, token.endFrameExclusive]),
[
- [0.1, 0.4],
- [0.5, 0.9],
+ [100, 400],
+ [500, 900],
],
);
assert.equal(new Set(map.anchors.map((anchor) => anchor.identity)).size, map.anchors.length);
@@ -156,10 +153,10 @@ test("M:1 uses evidence character times instead of dividing a merged word by len
assert.deepEqual(relations(narrative, merged), ["merge"]);
assert.deepEqual(
- map.tokens.map((token) => [token.startSec, token.endSec]),
+ map.tokens.map((token) => [token.startFrame, token.endFrameExclusive]),
[
- [0.1, 0.36],
- [0.42, 0.78],
+ [100, 360],
+ [420, 780],
],
);
});
@@ -174,8 +171,8 @@ test("1:N wraps all evidence words in one Script token", () => {
assert.deepEqual(relations(narrative, split), ["split"]);
assert.deepEqual(
- [map.tokens[0]?.startSec, map.tokens[0]?.endSec],
- [0.2, 0.82],
+ [map.tokens[0]?.startFrame, map.tokens[0]?.endFrameExclusive],
+ [200, 820],
);
});
@@ -198,12 +195,12 @@ test("a recognized filler stays an insertion and does not absorb neighboring Scr
"exact",
]);
assert.deepEqual(
- map.tokens.map((token) => [token.startSec, token.endSec]),
+ map.tokens.map((token) => [token.startFrame, token.endFrameExclusive]),
[
- [0.1, 0.2],
- [0.4, 0.62],
- [0.67, 0.82],
- [0.86, 0.96],
+ [100, 200],
+ [400, 620],
+ [670, 820],
+ [860, 960],
],
);
});
@@ -224,12 +221,12 @@ test("an omitted Script word receives the complete unmeasured interval between n
"exact",
]);
assert.deepEqual(
- [map.tokens[2]?.startSec, map.tokens[2]?.endSec],
- [0.4, 0.6],
+ [map.tokens[2]?.startFrame, map.tokens[2]?.endFrameExclusive],
+ [400, 600],
);
});
-test("VAD bounds contain estimates when an entire Script Segment has no recognized words", () => {
+test("VAD bounds contain missing tokens when a Script Segment has no recognized words", () => {
const narrative = parseScript("vad.svml", "<line>One two.</line>");
const map = locate(narrative, {
words: [],
@@ -237,10 +234,10 @@ test("VAD bounds contain estimates when an entire Script Segment has no recogniz
});
assert.deepEqual(
- map.tokens.map((token) => [token.startSec, token.endSec]),
+ map.tokens.map((token) => [token.startFrame, token.endFrameExclusive]),
[
- [0.4, 0.8],
- [0.8, 1.2],
+ [400, 800],
+ [800, 1_200],
],
);
});
@@ -253,28 +250,23 @@ test("multiple Script Segments stay independent even when evidence records arriv
]);
const map = locateSpeechTiming(narrative, basis, sealAlignedTranscriptEvidence({
contract: "svml.aligned-transcript-evidence@1",
- durationSec: 2,
segments: [
{
sourceSegmentId: "two",
- startSec: 1,
- endSec: 2,
words: [{ text: "Goodbye", startSec: 1.2, endSec: 1.6 }],
chars: [],
},
{
sourceSegmentId: "one",
- startSec: 0,
- endSec: 1,
words: [{ text: "Hello", startSec: 0.2, endSec: 0.55 }],
chars: [],
},
],
}));
- assert.deepEqual(map.tokens.map((token) => [token.segmentId, token.startSec, token.endSec]), [
- ["one", 0.2, 0.55],
- ["two", 1.2, 1.6],
+ assert.deepEqual(map.tokens.map((token) => [token.segmentId, token.startFrame, token.endFrameExclusive]), [
+ ["one", 200, 550],
+ ["two", 1_200, 1_600],
]);
});
@@ -289,8 +281,8 @@ test("overlapping evidence word windows reach the map overlapping", () => {
{ text: "two", startSec: 0.4, endSec: 0.8 },
],
});
- assert.deepEqual(map.tokens.map((token) => [token.startSec, token.endSec]), [[0.1, 0.5], [0.4, 0.8]]);
- assert.equal(map.tokens[1]!.startSec < map.tokens[0]!.endSec, true, "the overlap survived");
+ assert.deepEqual(map.tokens.map((token) => [token.startFrame, token.endFrameExclusive]), [[100, 500], [400, 800]]);
+ assert.equal(map.tokens[1]!.startFrame < map.tokens[0]!.endFrameExclusive, true, "the overlap survived");
});
test("locating is total: every Script token carries a window", () => {
@@ -300,12 +292,13 @@ test("locating is total: every Script token carries a window", () => {
words: [{ text: "alpha" }, { text: "beta" }, { text: "gamma" }, { text: "delta" }],
});
assert.equal(blind.tokens.length, narrative.tokens.length);
- assert.equal(blind.tokens.every((token) => Number.isFinite(token.startSec) && Number.isFinite(token.endSec)), true);
+ assert.equal(blind.tokens.every((token) => Number.isSafeInteger(token.startFrame)
+ && Number.isSafeInteger(token.endFrameExclusive)), true);
// The speaker said something else entirely; the Script is still fully located.
const diverged = locate(narrative, { words: [{ text: "zzz", startSec: 0.2, endSec: 0.8 }] });
assert.equal(diverged.tokens.length, narrative.tokens.length);
- assert.equal(diverged.tokens.every((token) => Number.isFinite(token.startSec)), true);
+ assert.equal(diverged.tokens.every((token) => Number.isSafeInteger(token.startFrame)), true);
});
test("Evidence is interpreted only through the explicitly connected SpeechAudioBasis", () => {
@@ -344,10 +337,10 @@ test("the final map is quantized once into the selected ProgramSpace", () => {
words: [{ text: "Hello", startSec: 0.111, endSec: 0.289 }],
}));
assert.deepEqual(
- [map.tokens[0]?.startFrame, map.tokens[0]?.endFrame, map.tokens[0]?.startSec, map.tokens[0]?.endSec],
- [3, 9, 0.1, 0.3],
+ [map.tokens[0]?.startFrame, map.tokens[0]?.endFrameExclusive],
+ [3, 9],
);
- assert.equal(map.anchors.every((anchor) => anchor.timeSec === anchor.frame / 30), true);
+ assert.equal(map.anchors.every((anchor) => Number.isSafeInteger(anchor.frame)), true);
});
test("a backwards character measurement reaches the map backwards, uncorrected", () => {
@@ -369,8 +362,8 @@ test("a backwards character measurement reaches the map backwards, uncorrected",
});
const middle = map.tokens[1]!;
assert.equal(
- middle.startSec > middle.endSec,
+ middle.startFrame > middle.endFrameExclusive,
true,
- `the inverted measurement survived, got ${middle.startSec}..${middle.endSec}`,
+ `the inverted measurement survived, got ${middle.startFrame}..${middle.endFrameExclusive}`,
);
});
diff --git a/packages/speech-basis/src/activation.ts b/packages/speech-basis/src/activation.ts
index 43a6810d..b2fb753a 100644
--- a/packages/speech-basis/src/activation.ts
+++ b/packages/speech-basis/src/activation.ts
@@ -2,7 +2,6 @@ import { speechBasisComponent, speechBasisManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/speech-basis",
modules: [{ manifest: speechBasisManifest }],
components: [speechBasisComponent],
};
diff --git a/packages/speech-basis/src/component.ts b/packages/speech-basis/src/component.ts
index 17464667..ccd37066 100644
--- a/packages/speech-basis/src/component.ts
+++ b/packages/speech-basis/src/component.ts
@@ -24,7 +24,6 @@ function speechBasis(value: StoredValue | undefined): SpeechBasis {
/** Pure projections of one atomic SpeechBasis; no Artifact read or external capability is hidden here. */
export const speechBasisComponent = {
- name: "@narratage/speech-basis",
producers: [
{
producer: speechBasisProducers.projectProgramSpace,
diff --git a/packages/speech-basis/src/fragment.ts b/packages/speech-basis/src/fragment.ts
index f619771d..1d78c21b 100644
--- a/packages/speech-basis/src/fragment.ts
+++ b/packages/speech-basis/src/fragment.ts
@@ -11,7 +11,6 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
/** Project the independently demandable facts carried by one SpeechBasis. */
export const speechBasisProjectionFragment = sealGraphFragment({
- name: "@narratage/speech-basis/projections@1",
inputs: [{ name: "basis", type: speechTypes.basis }],
operations: [
{
diff --git a/packages/speech-basis/src/manifest.ts b/packages/speech-basis/src/manifest.ts
index 511710b2..8d8e3ffd 100644
--- a/packages/speech-basis/src/manifest.ts
+++ b/packages/speech-basis/src/manifest.ts
@@ -31,7 +31,6 @@ export const speechBasisManifest: ModuleManifest = {
],
types: [],
capabilities: [],
- surfaces: [],
producers: [
{
name: speechBasisProducers.projectProgramSpace.name,
@@ -39,8 +38,6 @@ export const speechBasisManifest: ModuleManifest = {
outputs: [{ name: "programSpace", type: programSpaceTypes.programSpace }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/speech-basis/project-program-space",
digest: projectSpeechProgramSpaceImplementationDigest,
},
},
@@ -50,8 +47,6 @@ export const speechBasisManifest: ModuleManifest = {
outputs: [{ name: "audio", type: speechTypes.audioBasis }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/speech-basis/project-audio",
digest: projectSpeechAudioImplementationDigest,
},
},
@@ -61,8 +56,6 @@ export const speechBasisManifest: ModuleManifest = {
outputs: [{ name: "visual", type: compositionTypes.visualTrack }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/speech-basis/project-visual",
digest: projectSpeechVisualImplementationDigest,
},
},
@@ -72,8 +65,6 @@ export const speechBasisManifest: ModuleManifest = {
outputs: [{ name: "track", type: compositionTypes.audioTrack }],
needs: [],
implementation: {
- kind: "registered",
- locator: "@narratage/speech-basis/project-audio-track",
digest: projectSpeechAudioTrackImplementationDigest,
},
},
diff --git a/packages/speech-basis/src/projection.ts b/packages/speech-basis/src/projection.ts
index 3369350b..15b447f4 100644
--- a/packages/speech-basis/src/projection.ts
+++ b/packages/speech-basis/src/projection.ts
@@ -41,6 +41,13 @@ export function projectSpeechAudio(basis: SpeechBasis): SpeechAudioBasis {
export function projectSpeechVisual(basis: SpeechBasis): VisualTrack {
assertSpeechBasisIdentity(basis);
const trackId = `speech-visual:${basis.segments.map((segment) => segment.segmentId).join("+")}`;
+ const frameAt = (seconds: number): number => Math.round(
+ seconds * basis.programSpace.frameRate.numerator / basis.programSpace.frameRate.denominator,
+ );
+ const spans = new Map(basis.segments.map((segment) => [segment.segmentId, {
+ startFrame: frameAt(segment.startSec),
+ endFrameExclusive: frameAt(segment.endSec),
+ }]));
return sealVisualTrack({
contract: "svml.visual-track@1",
visualIr: "svml.visual-ir@1",
@@ -48,17 +55,20 @@ export function projectSpeechVisual(basis: SpeechBasis): VisualTrack {
presents: lowerRestrictedSpeechVisualPresents(
trackId,
basis.programSpace,
- basis.visualTrack.clips.map((clip) => ({
- id: clip.segmentId,
- span: structuredClone(clip.span),
- artifact: clip.artifact,
- extent: clip.extent,
- frameRate: clip.frameRate,
- frameCount: clip.frameCount,
- frame: clip.frame,
- fit: clip.fit,
- stackingOrder: clip.stackingOrder,
- })),
+ basis.visualTrack.clips.map((clip) => {
+ const span = spans.get(clip.segmentId)!;
+ return {
+ id: clip.segmentId,
+ span,
+ artifact: clip.artifact,
+ extent: clip.extent,
+ frameRate: basis.programSpace.frameRate,
+ frameCount: span.endFrameExclusive - span.startFrame,
+ frame: clip.frame,
+ fit: clip.fit,
+ stackingOrder: clip.stackingOrder,
+ };
+ }),
),
});
}
diff --git a/packages/speech-basis/test/product.test.ts b/packages/speech-basis/test/product.test.ts
index cb82e985..0f7c95c3 100644
--- a/packages/speech-basis/test/product.test.ts
+++ b/packages/speech-basis/test/product.test.ts
@@ -6,7 +6,7 @@ import {
import { sealProgramSpace } from "@narratage/program-space";
import { sealSpeechBasis, speechDependency, speechTypes } from "@narratage/speech";
import type { SpeechBasis } from "@narratage/speech";
-import { compositionTypes, compositionValidatorDigests } from "@narratage/composition";
+import { compositionTypes } from "@narratage/composition";
import { mediaPipelineManifest } from "@narratage/media-pipeline";
import assert from "node:assert/strict";
import test from "node:test";
@@ -15,11 +15,9 @@ import {
createResolvedClosure,
digestOf,
link,
- recordDigest,
sealBuildRequest,
sealCompiledGraph,
sealRecord,
- sealTypeValidationReceipt,
sealTypedModule,
start,
} from "@narratage/core";
@@ -56,15 +54,12 @@ const testManifest: ModuleManifest = {
dependencies: [speechDependency],
types: [{ name: requestType.name, schema: { kind: "string", minLength: 1 } }],
capabilities: [],
- surfaces: [],
producers: [{
name: generateProducer.name,
inputs: [{ name: "request", type: requestType }],
outputs: [{ name: "take", type: speechTypes.basis }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.speech-basis-product/generate",
digest: generateImplementationDigest,
},
}],
@@ -111,11 +106,8 @@ function sampleTake(label = "generated"): SpeechBasis {
visualTrack: {
clips: [{
segmentId: "opening",
- span: { startFrame: 0, endFrameExclusive: 60 },
artifact: visual,
extent: { contract: "svml.intrinsic-extent@1", widthPx: 720, heightPx: 1280 },
- frameRate: { ...programSpace.frameRate },
- frameCount: 60,
frame: { contract: "svml.spatial-frame@1", xPx: 0, yPx: 0, widthPx: 720, heightPx: 1280 },
fit: {
contract: "svml.content-fit@1", sizing: "cover",
@@ -143,8 +135,6 @@ function createProgram(): LinkedProgram {
},
});
return link(closure, [sealTypedModule({
- id: "author:speech-basis-product",
- closureDigest: closure.digest,
records: [request],
})]);
}
@@ -156,11 +146,6 @@ function createGraph(program: LinkedProgram): CompiledGraph {
const existingTake = sampleTake("approved");
const existingVisual = projectSpeechVisual(existingTake);
const existingVisualValue = { kind: "inline" as const, value: existingVisual };
- const existingVisualValidation = sealTypeValidationReceipt({
- type: compositionTypes.visualTrack,
- recordDigest: recordDigest(compositionTypes.visualTrack, existingVisualValue),
- validatorDigest: compositionValidatorDigests.visualTrack,
- });
return sealCompiledGraph({
program: program.semanticDigest,
outputs: [
@@ -215,7 +200,6 @@ function createGraph(program: LinkedProgram): CompiledGraph {
value: {
id: "provided:opening-visual",
value: existingVisualValue,
- validation: existingVisualValidation,
},
},
},
@@ -324,7 +308,7 @@ test("selecting an Existing SpeechBasis stops generation but keeps both projecti
{ "opening.take": "opening.take.existing" },
);
assert.deepEqual(stepIds(state), ["project-opening-audio", "project-opening-visual"]);
- assert.deepEqual(state.plan.initialValues.map((record) => record.id), ["provided:opening-take"]);
+ assert.deepEqual(state.records.filter((record) => record.origin.kind === "provided").map((record) => record.id), ["provided:opening-take"]);
assert.equal(
state.plan.steps.find((step) => step.id === "project-opening-audio")?.inputs.basis,
"provided:opening-take",
diff --git a/packages/speech-evidence/package.json b/packages/speech-evidence/package.json
index d82990aa..0686f915 100644
--- a/packages/speech-evidence/package.json
+++ b/packages/speech-evidence/package.json
@@ -11,7 +11,6 @@
"activation": "./src/activation.ts"
},
"dependencies": {
- "@narratage/protocol": "workspace:*",
- "@narratage/speech": "workspace:*"
+ "@narratage/protocol": "workspace:*"
}
}
diff --git a/packages/speech-evidence/src/activation.ts b/packages/speech-evidence/src/activation.ts
index 2da20129..2e223f27 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, name: "@narratage/speech-evidence", modules: [{ manifest: speechEvidenceManifest }] };
+export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: speechEvidenceManifest }] };
export default svmlPackage;
diff --git a/packages/speech-evidence/src/index.ts b/packages/speech-evidence/src/index.ts
index 1dc26677..f4b4164d 100644
--- a/packages/speech-evidence/src/index.ts
+++ b/packages/speech-evidence/src/index.ts
@@ -1,19 +1,18 @@
-import { speechDependency } from "@narratage/speech";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, TypeRef, ValueSchema } from "@narratage/protocol";
export type SpeechWordEvidence = { readonly text: string; readonly startSec?: number; readonly endSec?: number; readonly score?: number };
export type SpeechCharacterEvidence = { readonly char: string; readonly wordIndex: number; readonly startSec?: number; readonly endSec?: number; readonly score?: number };
export type SpeechActivitySpan = { readonly startSec: number; readonly endSec: number };
-export type AlignedTranscriptSegment = { readonly sourceSegmentId: string; readonly startSec: number; readonly endSec: number;
+export type AlignedTranscriptSegment = { readonly sourceSegmentId: string;
readonly words: readonly SpeechWordEvidence[]; readonly chars: readonly SpeechCharacterEvidence[]; readonly speechActivity?: readonly SpeechActivitySpan[] };
-export type AlignedTranscriptEvidence = { readonly contract: "svml.aligned-transcript-evidence@1"; readonly durationSec: number; readonly segments: readonly AlignedTranscriptSegment[] };
+export type AlignedTranscriptEvidence = { readonly contract: "svml.aligned-transcript-evidence@1"; readonly segments: readonly AlignedTranscriptSegment[] };
const string = { kind: "string", minLength: 1 } as const; const number = { kind: "number", minimum: 0 } as const; const integer = { kind: "number", integer: true, minimum: 0 } as const;
const object = (fields: Readonly<Record<string, { readonly schema: ValueSchema; readonly optional?: boolean }>>): ValueSchema => ({ kind: "object", fields });
const word = object({ text: { schema: { kind: "string" } }, startSec: { schema: number, optional: true }, endSec: { schema: number, optional: true }, score: { schema: { kind: "number", minimum: 0, maximum: 1 }, optional: true } });
const char = object({ char: { schema: { kind: "string" } }, wordIndex: { schema: integer }, startSec: { schema: number, optional: true }, endSec: { schema: number, optional: true }, score: { schema: { kind: "number", minimum: 0, maximum: 1 }, optional: true } });
export const alignedTranscriptEvidenceFields = {
- contract: { schema: { kind: "literal", value: "svml.aligned-transcript-evidence@1" } }, durationSec: { schema: number },
- segments: { schema: { kind: "array", minItems: 1, items: object({ sourceSegmentId: { schema: string }, startSec: { schema: number }, endSec: { schema: number },
+ contract: { schema: { kind: "literal", value: "svml.aligned-transcript-evidence@1" } },
+ segments: { schema: { kind: "array", minItems: 1, items: object({ sourceSegmentId: { schema: string },
words: { schema: { kind: "array", items: word } }, chars: { schema: { kind: "array", items: char } },
speechActivity: { schema: { kind: "array", items: object({ startSec: { schema: number }, endSec: { schema: number } }) }, optional: true } }) } },
} as const satisfies Readonly<Record<string, { readonly schema: ValueSchema; readonly optional?: boolean }>>;
@@ -21,7 +20,7 @@ export const alignedTranscriptEvidenceSchema: ValueSchema = object(alignedTransc
export const speechEvidenceModuleRef = { name: "@narratage/speech-evidence", version: "1" } as const;
export const speechEvidenceTypes = { alignedTranscript: { module: speechEvidenceModuleRef, name: "AlignedTranscriptEvidence" } } satisfies Record<string, TypeRef>;
export const speechEvidenceManifest: ModuleManifest = { format: "svml.module@1", name: speechEvidenceModuleRef.name, version: speechEvidenceModuleRef.version,
- dependencies: [speechDependency], types: [{ name: speechEvidenceTypes.alignedTranscript.name, schema: alignedTranscriptEvidenceSchema }], capabilities: [], surfaces: [], producers: [] };
+ dependencies: [], types: [{ name: speechEvidenceTypes.alignedTranscript.name, schema: alignedTranscriptEvidenceSchema }], capabilities: [], producers: [] };
export const speechEvidenceManifestDigest = digestOf(speechEvidenceManifest);
export const speechEvidenceDependency = { module: speechEvidenceModuleRef, digest: speechEvidenceManifestDigest } as const;
export function sealAlignedTranscriptEvidence(value: AlignedTranscriptEvidence): AlignedTranscriptEvidence { return structuredClone(value); }
diff --git a/packages/speech-spine/src/activation.ts b/packages/speech-spine/src/activation.ts
index c62e012c..96f512ec 100644
--- a/packages/speech-spine/src/activation.ts
+++ b/packages/speech-spine/src/activation.ts
@@ -1,20 +1,19 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeSpeechSpineSurface, speechSpineComponent, speechSpineManifest,
- speechSpineModuleRef, speechSpineSurfaceImplementationDigest,
+ speechSpineModuleRef,
+ speechSpineMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/speech-spine",
modules: [{
manifest: speechSpineManifest,
- specifiers: ["@narratage/speech-spine", "@narratage/speech-spine@1"],
}],
components: [speechSpineComponent],
hostFacets: [createMarkupSurfaceHostFacet({
- module: speechSpineModuleRef, surface: "spine", mode: "structured",
- implementationDigest: speechSpineSurfaceImplementationDigest, handler: decodeSpeechSpineSurface,
+ module: speechSpineModuleRef,
+ declaration: speechSpineMarkupSurfaces.find((item) => item.name === "spine")!, handler: decodeSpeechSpineSurface,
})],
};
export default svmlPackage;
diff --git a/packages/speech-spine/src/component.ts b/packages/speech-spine/src/component.ts
index db739958..1d5132c8 100644
--- a/packages/speech-spine/src/component.ts
+++ b/packages/speech-spine/src/component.ts
@@ -26,7 +26,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
}
export const speechSpineComponent = {
- name: "@narratage/speech-spine",
producers: [
{
producer: speechSpineProducers.createSet,
diff --git a/packages/speech-spine/src/fragment.ts b/packages/speech-spine/src/fragment.ts
index 9c4f246c..769a3831 100644
--- a/packages/speech-spine/src/fragment.ts
+++ b/packages/speech-spine/src/fragment.ts
@@ -110,7 +110,6 @@ export function createSpeechSpineFragment(options: SpeechSpineFragmentOptions) {
},
);
return sealGraphFragment({
- name: options.name?.trim() || "@narratage/speech-spine/spine@1",
inputs: [...declaredInputs.entries()].map(([name, type]) => ({ name, type })),
operations,
exports: [
diff --git a/packages/speech-spine/src/index.ts b/packages/speech-spine/src/index.ts
index ae3fac4a..3d33bca1 100644
--- a/packages/speech-spine/src/index.ts
+++ b/packages/speech-spine/src/index.ts
@@ -2,7 +2,7 @@
export { speechSpineComponent } from "./component.js";
export { createSpeechSpineFragment } from "./fragment.js";
export {
- speechSpineManifest,
+ speechSpineManifest, speechSpineMarkupSurfaces,
speechSpineManifestDigest,
speechSpineModuleRef,
speechSpineProducers,
diff --git a/packages/speech-spine/src/manifest.ts b/packages/speech-spine/src/manifest.ts
index 72b4a37e..abf91fdc 100644
--- a/packages/speech-spine/src/manifest.ts
+++ b/packages/speech-spine/src/manifest.ts
@@ -75,6 +75,20 @@ export const speechSpineVisualSpecSchema: ValueSchema = object({
stackingOrder: { schema: { kind: "number", integer: true } },
});
+export const speechSpineMarkupSurfaces = [{
+ name: "spine",
+ tag: "Spine",
+ mode: "structured",
+ outputs: [speechSpineTypes.spineProgram, speechSpineTypes.visualSpec, spatialTypes.fit,
+ 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",
name: speechSpineModuleRef.name,
@@ -97,27 +111,13 @@ export const speechSpineManifest: ModuleManifest = {
{ name: speechSpineTypes.visualSpec.name, schema: speechSpineVisualSpecSchema },
],
capabilities: [],
- surfaces: [{
- name: "spine",
- tag: "Spine",
- mode: "structured",
- outputs: [speechSpineTypes.spineProgram, speechSpineTypes.visualSpec, spatialTypes.fit,
- mediaPipelineTypes.selectionRequest,
- speechTypes.basis, programSpaceTypes.programSpace, speechTypes.audioBasis,
- compositionTypes.visualTrack, compositionTypes.audioTrack],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/speech-spine/spine-surface",
- digest: speechSpineSurfaceImplementationDigest,
- },
- }],
producers: [
{
name: speechSpineProducers.createSet.name,
inputs: [],
outputs: [{ name: "set", type: speechSpineTypes.spineSet }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/speech-spine/create-spine-set", digest: createSpeechSpineSetImplementationDigest },
+ implementation: { digest: createSpeechSpineSetImplementationDigest },
},
{
name: speechSpineProducers.appendAudioTake.name,
@@ -129,7 +129,7 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "set", type: speechSpineTypes.spineSet }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/speech-spine/append-spine-audio-take", digest: appendSpeechSpineAudioTakeImplementationDigest },
+ implementation: { digest: appendSpeechSpineAudioTakeImplementationDigest },
},
{
name: speechSpineProducers.appendVisualTake.name,
@@ -144,7 +144,7 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "set", type: speechSpineTypes.spineSet }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/speech-spine/append-spine-visual-take", digest: appendSpeechSpineVisualTakeImplementationDigest },
+ implementation: { digest: appendSpeechSpineVisualTakeImplementationDigest },
},
{
name: speechSpineProducers.compileAudio.name,
@@ -154,7 +154,7 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "plan", type: mediaPipelineTypes.audioProgramPlan }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/speech-spine/compile-spine-audio", digest: compileSpeechSpineAudioImplementationDigest },
+ implementation: { digest: compileSpeechSpineAudioImplementationDigest },
},
{
name: speechSpineProducers.assembleBasis.name,
@@ -165,7 +165,7 @@ export const speechSpineManifest: ModuleManifest = {
],
outputs: [{ name: "basis", type: speechTypes.basis }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/speech-spine/assemble-speech-basis", digest: assembleSpeechBasisImplementationDigest },
+ implementation: { digest: assembleSpeechBasisImplementationDigest },
},
],
};
diff --git a/packages/speech-spine/src/program.ts b/packages/speech-spine/src/program.ts
index 0c60994a..35326d29 100644
--- a/packages/speech-spine/src/program.ts
+++ b/packages/speech-spine/src/program.ts
@@ -253,20 +253,16 @@ export function assembleSpeechBasis(
});
frame = 0;
const visualClips = set.takes.flatMap((take) => {
- const startFrame = frame;
frame += take.media.timeline.frameCount;
if (take.media.visual === undefined || take.visual === undefined) return [];
return [{
segmentId: take.segment.id,
- span: { startFrame, endFrameExclusive: frame },
artifact: structuredClone(take.media.visual.artifact),
extent: {
contract: "svml.intrinsic-extent@1" as const,
widthPx: take.media.visual.width,
heightPx: take.media.visual.height,
},
- frameRate: { ...take.media.timeline.frameRate },
- frameCount: take.media.timeline.frameCount,
frame: structuredClone(take.visual.frame),
fit: structuredClone(take.visual.fit),
stackingOrder: take.visual.stackingOrder,
diff --git a/packages/speech-spine/test/program.test.ts b/packages/speech-spine/test/program.test.ts
index 2aff12b7..2d96aafd 100644
--- a/packages/speech-spine/test/program.test.ts
+++ b/packages/speech-spine/test/program.test.ts
@@ -65,11 +65,7 @@ test("audio Takes lengthen the speech program without inventing a visual clip",
const audio: TimelineAudio = {
contract: "svml.timeline-audio@1",
artifact: { kind: "blob", digest: digestOf("speech:mix"), size: 1, mediaType: "audio/wav" },
- codec: "pcm_s16le",
- sampleRate: 48_000,
- channels: 2,
sampleFrames: 96_000,
- loudness: "planned",
};
const basis = assembleSpeechBasis(program, set, audio);
assert.deepEqual(basis.segments.map((item) => item.segmentId), ["voiceover", "answer"]);
@@ -77,11 +73,8 @@ test("audio Takes lengthen the speech program without inventing a visual clip",
assert.equal(basis.visualTrack.clips.length, 1);
assert.deepEqual(basis.visualTrack.clips[0], {
segmentId: "answer",
- span: { startFrame: 30, endFrameExclusive: 60 },
artifact: synchronized("presenter", true).visual!.artifact,
extent: { contract: "svml.intrinsic-extent@1", widthPx: 720, heightPx: 1280 },
- frameRate: { numerator: 30, denominator: 1 },
- frameCount: 30,
frame,
fit,
stackingOrder: 30,
diff --git a/packages/speech-spine/test/surface.test.ts b/packages/speech-spine/test/surface.test.ts
index 9541de18..af21c0f7 100644
--- a/packages/speech-spine/test/surface.test.ts
+++ b/packages/speech-spine/test/surface.test.ts
@@ -23,8 +23,8 @@ import type { ModuleManifest } from "@narratage/protocol";
import {
decodeScriptSurface,
scriptManifest,
+ scriptMarkupSurfaces,
scriptModuleRef,
- scriptSurfaceImplementationDigest,
} from "@narratage/script";
import { speechBasisManifest, speechBasisProducers } from "@narratage/speech-basis";
import { textComponent, textManifest } from "@narratage/text";
@@ -33,16 +33,16 @@ import { svsManifest, svsModuleRef, svsRecipeType } from "@narratage/svs";
import {
decodeSpeechSpineSurface,
speechSpineManifest,
+ speechSpineMarkupSurfaces,
speechSpineModuleRef,
speechSpineProducers,
- speechSpineSurfaceImplementationDigest,
} from "@narratage/speech-spine";
import {
decodeCanvasSurface,
decodeFrameSurface,
spatialComponent,
+ spatialMarkupSurfaces,
spatialModuleRef,
- spatialSurfaceDigests,
} from "@narratage/spatial";
import {
MarkupSurfaceRegistry,
@@ -52,16 +52,16 @@ import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validati
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",
name: fixtureModule.name,
version: fixtureModule.version,
dependencies: [artifactDependency, mediaDependency, { module: svsModuleRef, digest: digestOf(svsManifest) }],
types: [], capabilities: [], producers: [],
- surfaces: [{
- name: "media", tag: "Media", mode: "structured", outputs: [artifactTypes.blob, svsRecipeType],
- implementation: { kind: "trusted-frontend-surface", locator: "example.speech-media/surface", digest: fixtureSurfaceDigest },
- }],
};
function source(text: string): AuthorSourceUnit {
@@ -85,11 +85,11 @@ test("Speech Spine lowers ordered Takes into media normalization, one audio plan
fixtureManifest,
]);
const surfaces = new MarkupSurfaceRegistry();
- surfaces.registerRaw(scriptModuleRef, "script", scriptSurfaceImplementationDigest, decodeScriptSurface);
- surfaces.registerStructured(speechSpineModuleRef, "spine", speechSpineSurfaceImplementationDigest, decodeSpeechSpineSurface);
- surfaces.registerStructured(spatialModuleRef, "canvas", spatialSurfaceDigests.canvas, decodeCanvasSurface);
- surfaces.registerStructured(spatialModuleRef, "frame", spatialSurfaceDigests.frame, decodeFrameSurface);
- surfaces.registerStructured(fixtureModule, "media", fixtureSurfaceDigest, ({ element }) => ({
+ surfaces.registerRaw({ module: scriptModuleRef, declaration: scriptMarkupSurfaces[0]!, handler: decodeScriptSurface });
+ surfaces.registerStructured({ module: speechSpineModuleRef, declaration: speechSpineMarkupSurfaces.find((item) => item.name === "spine")!, handler: decodeSpeechSpineSurface });
+ surfaces.registerStructured({ module: spatialModuleRef, declaration: spatialMarkupSurfaces.find((item) => item.name === "canvas")!, handler: decodeCanvasSurface });
+ surfaces.registerStructured({ module: spatialModuleRef, declaration: spatialMarkupSurfaces.find((item) => item.name === "frame")!, handler: decodeFrameSurface });
+ surfaces.registerStructured({ module: fixtureModule, declaration: fixtureSurface, handler: ({ element }) => ({
records: [
...["take-one", "take-two", "voice-one"].map((id) => ({
id, type: artifactTypes.blob,
@@ -106,7 +106,7 @@ test("Speech Spine lowers ordered Takes into media normalization, one audio plan
},
],
components: [], fragments: [],
- }));
+ }) });
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
@@ -146,8 +146,8 @@ test("Speech Spine lowers ordered Takes into media normalization, one audio plan
resolveSource() { throw new Error("fixture has no source imports"); },
});
const target = resolveCompiledSourceExport(compiled, "speech.visual", compositionTypes.visualTrack);
- const build = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const build = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [{ output: target.ref.kind === "logical-output" ? target.ref.id : "" }],
}));
const names = build.plan.steps.map((step) => step.producer.name);
diff --git a/packages/speech/src/activation.ts b/packages/speech/src/activation.ts
index 02a06d73..651669a9 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, name: "@narratage/speech", modules: [{ manifest: speechManifest }] };
+export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: speechManifest }] };
export default svmlPackage;
diff --git a/packages/speech/src/identity.ts b/packages/speech/src/identity.ts
index 826c7b0c..7bce31a9 100644
--- a/packages/speech/src/identity.ts
+++ b/packages/speech/src/identity.ts
@@ -21,14 +21,9 @@ export function sealSpeechEvidenceAudio(value: SpeechEvidenceAudio): SpeechEvide
export function assertSpeechEvidenceAudioIdentity(value: SpeechEvidenceAudio): void {
if (value.contract !== "svml.speech-evidence-audio@1" || value.artifact.kind !== "blob" || !isDigest(value.artifact.digest)
|| !Number.isSafeInteger(value.artifact.size) || value.artifact.size < 0 || value.artifact.mediaType !== "audio/wav"
- || value.codec !== "pcm_s16le" || value.sampleRate !== 16_000 || value.channels !== 1 || !Number.isSafeInteger(value.sampleFrames)
- || value.sampleFrames < 1 || !Number.isFinite(value.durationSec) || value.durationSec <= 0) throw new Error("SpeechEvidenceAudio media identity is invalid.");
- if (value.sampleMap.algorithm !== "rational-boundary-round@1" || value.sampleMap.sourceSampleRate !== 48_000
- || value.sampleMap.evidenceSampleRate !== 16_000 || !Number.isSafeInteger(value.sampleMap.sourceSampleFrames)
- || value.sampleMap.sourceSampleFrames < 1 || value.sampleMap.evidenceSampleFrames !== value.sampleFrames
- || value.sampleMap.sourceOriginSample !== 0 || value.sampleMap.evidenceOriginSample !== 0
- || speechEvidenceSampleBoundary(value.sampleMap.sourceSampleFrames) !== value.sampleFrames) throw new Error("SpeechEvidenceAudio sample map is invalid.");
- if (value.segments.length === 0) throw new Error("SpeechEvidenceAudio has no Segment identity.");
+ || !Number.isSafeInteger(value.sampleFrames) || value.sampleFrames < 1) {
+ throw new Error("SpeechEvidenceAudio media identity is invalid.");
+ }
}
export function assertSpeechBasisIdentity(basis: SpeechBasis): void {
if (basis.contract !== "svml.speech-basis@1") throw new Error("Unsupported SpeechBasis contract.");
@@ -39,17 +34,14 @@ export function assertSpeechBasisIdentity(basis: SpeechBasis): void {
const frameAt = (seconds: number): number => Math.round(
seconds * basis.programSpace.frameRate.numerator / basis.programSpace.frameRate.denominator,
);
- const segmentSpans = new Map<string, { readonly startFrame: number; readonly endFrameExclusive: number }>();
+ const segmentIds = new Set<string>();
for (const segment of basis.segments) {
if (!segment.segmentId || segment.startSec !== previousEnd || !Number.isFinite(segment.endSec)
|| segment.endSec <= segment.startSec || segment.endSec > basis.programSpace.durationSec) {
throw new Error("SpeechBasis Segment is invalid or non-contiguous.");
}
- if (segmentSpans.has(segment.segmentId)) throw new Error(`SpeechBasis repeats Segment ${segment.segmentId}.`);
- segmentSpans.set(segment.segmentId, {
- startFrame: frameAt(segment.startSec),
- endFrameExclusive: frameAt(segment.endSec),
- });
+ if (segmentIds.has(segment.segmentId)) throw new Error(`SpeechBasis repeats Segment ${segment.segmentId}.`);
+ segmentIds.add(segment.segmentId);
previousEnd = segment.endSec;
}
if (frameAt(previousEnd) !== programSpaceFrameCount(basis.programSpace)) {
@@ -57,18 +49,10 @@ export function assertSpeechBasisIdentity(basis: SpeechBasis): void {
}
const seenVisuals = new Set<string>();
for (const clip of basis.visualTrack.clips) {
- const segmentSpan = segmentSpans.get(clip.segmentId);
- if (segmentSpan === undefined || seenVisuals.has(clip.segmentId)
+ if (!segmentIds.has(clip.segmentId) || seenVisuals.has(clip.segmentId)
|| clip.artifact.kind !== "blob" || !isDigest(clip.artifact.digest)
|| !Number.isSafeInteger(clip.artifact.size) || clip.artifact.size < 0
|| !clip.artifact.mediaType.startsWith("video/")
- || clip.frameRate.numerator !== basis.programSpace.frameRate.numerator
- || clip.frameRate.denominator !== basis.programSpace.frameRate.denominator
- || !Number.isSafeInteger(clip.frameCount) || clip.frameCount <= 0
- || !Number.isSafeInteger(clip.span.startFrame) || !Number.isSafeInteger(clip.span.endFrameExclusive)
- || clip.span.startFrame !== segmentSpan?.startFrame
- || clip.span.endFrameExclusive !== segmentSpan?.endFrameExclusive
- || clip.frameCount !== clip.span.endFrameExclusive - clip.span.startFrame
|| !Number.isSafeInteger(clip.stackingOrder)) {
throw new Error(`SpeechBasis visual clip ${clip.segmentId} is invalid.`);
}
diff --git a/packages/speech/src/manifest.ts b/packages/speech/src/manifest.ts
index b449eb5c..9b8352a7 100644
--- a/packages/speech/src/manifest.ts
+++ b/packages/speech/src/manifest.ts
@@ -14,6 +14,6 @@ export const speechManifest: ModuleManifest = { format: "svml.module@1", name: s
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 }],
- capabilities: [], surfaces: [], producers: [] };
+ capabilities: [], producers: [] };
export const speechManifestDigest = digestOf(speechManifest);
export const speechDependency = { module: speechModuleRef, digest: speechManifestDigest } as const;
diff --git a/packages/speech/src/schema.ts b/packages/speech/src/schema.ts
index 94b2d012..f08a0799 100644
--- a/packages/speech/src/schema.ts
+++ b/packages/speech/src/schema.ts
@@ -18,12 +18,7 @@ export const speechBasisSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.speech-basis@1" } }, programSpace: { schema: programSpaceSchema }, audio: { schema: audioBlobRef },
visualTrack: { schema: object({ clips: { schema: { kind: "array", items: object({ segmentId: { schema: string }, artifact: { schema: object({
kind: { schema: { kind: "literal", value: "blob" } }, digest: { schema: digest }, size: { schema: integer }, mediaType: { schema: string },
- }) }, span: { schema: object({
- startFrame: { schema: integer }, endFrameExclusive: { schema: integer },
- }) }, extent: { schema: intrinsicExtentSchema }, frameRate: { schema: object({
- numerator: { schema: { kind: "number", integer: true, minimum: 1 } },
- denominator: { schema: { kind: "number", integer: true, minimum: 1 } },
- }) }, frameCount: { schema: { kind: "number", integer: true, minimum: 1 } },
+ }) }, extent: { schema: intrinsicExtentSchema },
frame: { schema: spatialFrameSchema }, fit: { schema: contentFitSchema },
stackingOrder: { schema: { kind: "number", integer: true } },
}) } } }) },
@@ -33,12 +28,5 @@ export const speechAudioBasisSchema: ValueSchema = object({ contract: { schema:
programSpace: { schema: programSpaceSchema }, audio: { schema: audioBlobRef }, segments: { schema: { kind: "array", minItems: 1, items: segment } } });
export const speechEvidenceAudioSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.speech-evidence-audio@1" } },
artifact: { schema: audioBlobRef },
- codec: { schema: { kind: "literal", value: "pcm_s16le" } }, sampleRate: { schema: { kind: "literal", value: 16_000 } }, channels: { schema: { kind: "literal", value: 1 } },
- sampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } }, durationSec: { schema: number },
- segments: { schema: { kind: "array", minItems: 1, items: segment } }, sampleMap: { schema: object({
- algorithm: { schema: { kind: "literal", value: "rational-boundary-round@1" } }, sourceSampleRate: { schema: { kind: "literal", value: 48_000 } },
- evidenceSampleRate: { schema: { kind: "literal", value: 16_000 } }, sourceSampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } },
- evidenceSampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } }, sourceOriginSample: { schema: { kind: "literal", value: 0 } },
- evidenceOriginSample: { schema: { kind: "literal", value: 0 } },
- }) },
+ sampleFrames: { schema: { kind: "number", integer: true, minimum: 1 } },
});
diff --git a/packages/speech/src/types.ts b/packages/speech/src/types.ts
index 6e784e48..d982a707 100644
--- a/packages/speech/src/types.ts
+++ b/packages/speech/src/types.ts
@@ -8,11 +8,8 @@ export type SpeechBasis = {
readonly contract: "svml.speech-basis@1"; readonly programSpace: ProgramSpace; readonly audio: BlobRef;
readonly visualTrack: { readonly clips: readonly {
readonly segmentId: string;
- readonly span: { readonly startFrame: number; readonly endFrameExclusive: number };
readonly artifact: BlobRef;
readonly extent: IntrinsicExtent;
- readonly frameRate: { readonly numerator: number; readonly denominator: number };
- readonly frameCount: number;
readonly frame: SpatialFrame;
readonly fit: ContentFit;
readonly stackingOrder: number;
@@ -24,9 +21,8 @@ export type SpeechAudioBasis = {
readonly segments: readonly SpeechBasisSegment[];
};
export type SpeechEvidenceAudio = {
- readonly contract: "svml.speech-evidence-audio@1"; readonly artifact: BlobRef; readonly codec: "pcm_s16le";
- readonly sampleRate: 16_000; readonly channels: 1; readonly sampleFrames: number; readonly durationSec: number;
- readonly segments: readonly SpeechBasisSegment[];
- readonly sampleMap: { readonly algorithm: "rational-boundary-round@1"; readonly sourceSampleRate: 48_000; readonly evidenceSampleRate: 16_000;
- readonly sourceSampleFrames: number; readonly evidenceSampleFrames: number; readonly sourceOriginSample: 0; readonly evidenceOriginSample: 0 };
+ readonly contract: "svml.speech-evidence-audio@1";
+ readonly artifact: BlobRef;
+ /** Exact 16 kHz mono PCM sample count. Format constants belong to this Type, not every value. */
+ readonly sampleFrames: number;
};
diff --git a/packages/speech/test/evidence.test.ts b/packages/speech/test/evidence.test.ts
index 4ed1cfea..1e8e177a 100644
--- a/packages/speech/test/evidence.test.ts
+++ b/packages/speech/test/evidence.test.ts
@@ -19,7 +19,7 @@ test("speech evidence uses integer rational boundary projection rather than floa
assert.equal(programSpaceSampleFrames(ntsc, 48_000), 48_048);
});
-test("SpeechEvidenceAudio records evidence bytes and the complete source-to-evidence sample map", () => {
+test("SpeechEvidenceAudio carries only normalized evidence bytes and their exact sample count", () => {
const value = sealSpeechEvidenceAudio({
contract: "svml.speech-evidence-audio@1",
artifact: {
@@ -28,25 +28,11 @@ test("SpeechEvidenceAudio records evidence bytes and the complete source-to-evid
size: 32_044,
mediaType: "audio/wav",
},
- codec: "pcm_s16le",
- sampleRate: 16_000,
- channels: 1,
sampleFrames: 16_000,
- durationSec: 1,
- segments: [{ segmentId: "line", startSec: 0, endSec: 1 }],
- sampleMap: {
- algorithm: "rational-boundary-round@1",
- sourceSampleRate: 48_000,
- evidenceSampleRate: 16_000,
- sourceSampleFrames: 48_000,
- evidenceSampleFrames: 16_000,
- sourceOriginSample: 0,
- evidenceOriginSample: 0,
- },
});
assert.doesNotThrow(() => assertSpeechEvidenceAudioIdentity(value));
assert.throws(
- () => assertSpeechEvidenceAudioIdentity({ ...value, sampleFrames: 16_001 }),
- /sample map|digest/u,
+ () => assertSpeechEvidenceAudioIdentity({ ...value, sampleFrames: 0 }),
+ /media identity/u,
);
});
diff --git a/packages/store-sqlite/README.md b/packages/store-sqlite/README.md
index 8e27345f..bc48edd8 100644
--- a/packages/store-sqlite/README.md
+++ b/packages/store-sqlite/README.md
@@ -1,6 +1,6 @@
# `@narratage/store-sqlite`
-Durable local adapters for the environment-neutral Build, Operation, Dispatch and Journal ports.
+Durable local adapters for the environment-neutral Build, Operation and Dispatch ports.
One SQLite file may physically contain the execution tables and an optional Host index, but their
interfaces remain separate:
@@ -8,7 +8,6 @@ interfaces remain separate:
- BuildStore persists verified Core facts with compare-and-swap revisions;
- OperationStore persists external attempt identities, checkpoints and completions;
- BuildDispatchStore persists current Build admission, leases and generic capacity reservations;
-- RuntimeJournal persists operational observations for queue and cancellation inspection;
- BuildCatalog indexes source/run paths and output aliases for Host presentation only;
- no ready-command queue is stored. Core regenerates readiness from BuildState after every restart.
@@ -16,7 +15,7 @@ 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.
-`createSqliteRuntimeServicePackage()` returns one physical package with four separately selectable
+`createSqliteRuntimeServicePackage()` returns one physical package with three separately selectable
execution services plus a Host-only `catalog` handle. They share one connection and one close
lifecycle. The catalog is deliberately absent from the Runtime service Manifest and Runtime
Closure; changing the Host-only catalog table therefore cannot change the identity under which an
diff --git a/packages/store-sqlite/src/activation.ts b/packages/store-sqlite/src/activation.ts
index 5f37a3c8..1b56c5d4 100644
--- a/packages/store-sqlite/src/activation.ts
+++ b/packages/store-sqlite/src/activation.ts
@@ -21,12 +21,10 @@ const sqliteStateAdapter = createRuntimeServiceAdapterFacet({
if (path === undefined) throw new Error("SQLite path is required");
const { createSqliteRuntimeServicePackage } = await import("./store.js");
return createSqliteRuntimeServicePackage({
- name: context.instance,
path: resolve(context.root, path),
buildInstance: `${context.instance}.builds`,
operationInstance: `${context.instance}.operations`,
dispatchInstance: `${context.instance}.dispatch`,
- journalInstance: `${context.instance}.journal`,
...(runtimeConfigPositiveInteger(config.busyTimeoutMs, "SQLite busyTimeoutMs") === undefined
? {} : { busyTimeoutMs: config.busyTimeoutMs as number }),
...(context.access === "read-only" ? { readOnly: true } : {}),
@@ -36,7 +34,6 @@ const sqliteStateAdapter = createRuntimeServiceAdapterFacet({
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/store-sqlite",
hostFacets: [sqliteStateAdapter],
};
diff --git a/packages/store-sqlite/src/index.ts b/packages/store-sqlite/src/index.ts
index 5737b8de..a09490c8 100644
--- a/packages/store-sqlite/src/index.ts
+++ b/packages/store-sqlite/src/index.ts
@@ -4,7 +4,6 @@ export {
sqliteBuildStoreImplementationDigest,
sqliteDispatchStoreImplementationDigest,
sqliteOperationStoreImplementationDigest,
- sqliteRuntimeJournalImplementationDigest,
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 2ef267e2..786592cc 100644
--- a/packages/store-sqlite/src/store.ts
+++ b/packages/store-sqlite/src/store.ts
@@ -6,18 +6,17 @@ import {
canonicalStringify,
verifyBuildState,
} from "@narratage/core";
-import { canonicalize, digestOf } from "@narratage/protocol";
+import { digestOf } from "@narratage/protocol";
import type {
BuildState,
Digest,
} from "@narratage/protocol";
import {
- assertRuntimeRevisionAdmission,
+ assertRuntimeClosureAdmission,
verifyBuildCatalogDescriptor,
verifyBuildCatalogEntry,
defineRuntimeServicePackage,
capacityReservationId,
- sealOperationCompletion,
verifyBuildDispatchIdentity,
verifyBuildDispatchSnapshot,
verifyCapacityLimits,
@@ -25,7 +24,6 @@ import {
verifyDispatchLease,
verifyOperationIdentity,
verifyOperationSnapshot,
- verifyRuntimeJournalEntry,
} from "@narratage/runtime";
import type {
BuildDispatchClaim,
@@ -52,9 +50,6 @@ import type {
OperationStore,
OperationStoreWrite,
OperationUpdate,
- RuntimeJournal,
- RuntimeJournalEntry,
- RuntimeJournalQuery,
RuntimeServicePackage,
} from "@narratage/runtime";
@@ -77,10 +72,6 @@ export const sqliteDispatchStoreImplementationDigest = digestOf(
"@narratage/store-sqlite/dispatch-store@1",
);
-export const sqliteRuntimeJournalImplementationDigest = digestOf(
- "@narratage/store-sqlite/runtime-journal@1",
-);
-
export type SqliteRuntimeStateOptions = {
readonly busyTimeoutMs?: number;
/** Open an existing archive without creating files or schema. */
@@ -89,11 +80,9 @@ export type SqliteRuntimeStateOptions = {
export type CreateSqliteRuntimeServicePackageOptions = SqliteRuntimeStateOptions & {
readonly path: string;
- readonly name?: string;
readonly buildInstance?: string;
readonly operationInstance?: string;
readonly dispatchInstance?: string;
- readonly journalInstance?: string;
};
type Row = Record<string, unknown>;
@@ -150,9 +139,7 @@ function operationIdentity(snapshot: OperationSnapshot): OperationIdentity {
endpoint: snapshot.endpoint,
authority: snapshot.authority,
route: snapshot.route,
- implementationDigest: snapshot.implementationDigest,
runtimeClosure: snapshot.runtimeClosure,
- requestDigest: snapshot.requestDigest,
attempt: snapshot.attempt,
};
}
@@ -374,7 +361,6 @@ class SqliteOperationStore implements OperationStore {
["authority", query.authority],
["route", query.route],
["runtimeClosure", query.runtimeClosure],
- ["requestDigest", query.requestDigest],
] as const) {
if (value === undefined) continue;
predicates.push(`json_extract(identity_json, '$.${field}') = ?`);
@@ -425,7 +411,7 @@ class SqliteOperationStore implements OperationStore {
...(update.progress === undefined ? {} : { progress: update.progress }),
}) : null;
const completion = update.status === "completed"
- ? canonicalStringify(sealOperationCompletion(update.completion))
+ ? canonicalStringify(update.completion)
: null;
const failure = update.status === "failed" ? canonicalStringify(update.failure) : null;
const cancellation = update.status === "cancelled"
@@ -525,7 +511,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
id: existing.id,
build: existing.build,
core: existing.core,
- runtimeRevision: existing.runtimeRevision,
+ runtimeClosure: existing.runtimeClosure,
}) === canonicalStringify(identity),
`Dispatch ${identity.build} already names another Build or Runtime Closure`);
return { status: "existing", snapshot: existing };
@@ -534,10 +520,10 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {
const conflictingRows = this.#database.prepare(`
SELECT * FROM svml_dispatches
WHERE phase != 'terminal'
- AND json_extract(identity_json, '$.runtimeRevision') != ?
+ AND json_extract(identity_json, '$.runtimeClosure') != ?
ORDER BY created_at ASC, build_id ASC
- `).all(identity.runtimeRevision) as Row[];
- assertRuntimeRevisionAdmission(identity.runtimeRevision, conflictingRows.map(parseDispatchSnapshot));
+ `).all(identity.runtimeClosure) as Row[];
+ assertRuntimeClosureAdmission(identity.runtimeClosure, conflictingRows.map(parseDispatchSnapshot));
const result = this.#database.prepare(`
INSERT INTO svml_dispatches (
@@ -582,19 +568,19 @@ 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.runtimeRevision), "Dispatch claim Runtime Revision is invalid");
+ 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
WHERE phase != 'terminal'
- AND json_extract(identity_json, '$.runtimeRevision') = ?
+ 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.runtimeRevision, now, now) as Row | undefined;
+ `).get(request.runtimeClosure, 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");
@@ -884,71 +870,12 @@ function parseCapacityReservation(row: Row): CapacityReservation {
return value;
}
-class SqliteRuntimeJournal implements RuntimeJournal {
- readonly #database: DatabaseSync;
-
- constructor(database: DatabaseSync) {
- this.#database = database;
- }
-
- async append(entry: Omit<RuntimeJournalEntry, "format" | "sequence">): Promise<RuntimeJournalEntry> {
- nonNegativeInteger(entry.at, "Runtime Journal timestamp");
- const detail = canonicalize(entry.detail);
- const result = this.#database.prepare(`
- INSERT INTO svml_runtime_journal (at, kind, build_id, operation_id, worker_id, detail_json)
- VALUES (?, ?, ?, ?, ?, ?)
- `).run(entry.at, entry.kind, entry.build ?? null, entry.operation ?? null, entry.worker ?? null,
- canonicalStringify(detail));
- assert(typeof result.lastInsertRowid === "number" || typeof result.lastInsertRowid === "bigint",
- "SQLite Runtime Journal returned no sequence");
- const sequence = Number(result.lastInsertRowid);
- const value: RuntimeJournalEntry = {
- format: "svml.runtime-journal-entry@1",
- sequence,
- ...entry,
- detail,
- };
- verifyRuntimeJournalEntry(value);
- return value;
- }
-
- async list(query: RuntimeJournalQuery = {}): Promise<readonly RuntimeJournalEntry[]> {
- const after = query.after ?? 0;
- const limit = query.limit ?? 1_000;
- nonNegativeInteger(after, "Runtime Journal after");
- positiveInteger(limit, "Runtime Journal limit");
- const rows = this.#database.prepare(`
- SELECT sequence, at, kind, build_id, operation_id, worker_id, detail_json
- FROM svml_runtime_journal WHERE sequence > ? ORDER BY sequence ASC LIMIT ?
- `).all(after, limit) as Row[];
- return rows.map((row) => {
- assert(typeof row.sequence === "number" && typeof row.at === "number" && typeof row.kind === "string"
- && typeof row.detail_json === "string", "SQLite Runtime Journal row is invalid");
- const entry = {
- format: "svml.runtime-journal-entry@1" as const,
- sequence: row.sequence,
- at: row.at,
- kind: row.kind,
- ...(typeof row.build_id === "string" ? { build: row.build_id } : {}),
- ...(typeof row.operation_id === "string" ? { operation: row.operation_id as Digest } : {}),
- ...(typeof row.worker_id === "string" ? { worker: row.worker_id } : {}),
- detail: JSON.parse(row.detail_json),
- } as RuntimeJournalEntry;
- verifyRuntimeJournalEntry(entry);
- return entry;
- }).filter((entry) => query.build === undefined || entry.build === query.build)
- .filter((entry) => query.operation === undefined || entry.operation === query.operation)
- .filter((entry) => query.worker === undefined || entry.worker === query.worker);
- }
-}
-
/** One local database with domain-neutral execution facts and Host presentation catalog. */
export class SqliteRuntimeState {
readonly path: string;
readonly builds: BuildStore;
readonly operations: OperationStore;
readonly dispatch: BuildDispatchStore;
- readonly journal: RuntimeJournal;
readonly catalog: BuildCatalog;
readonly #database: DatabaseSync;
@@ -1053,17 +980,6 @@ export class SqliteRuntimeState {
UNIQUE (build_id, command_id)
) STRICT;
CREATE INDEX IF NOT EXISTS svml_capacity_state ON svml_capacity (in_flight, active_expires_at);
- CREATE TABLE IF NOT EXISTS svml_runtime_journal (
- sequence INTEGER PRIMARY KEY AUTOINCREMENT,
- at INTEGER NOT NULL,
- kind TEXT NOT NULL,
- build_id TEXT,
- operation_id TEXT,
- worker_id TEXT,
- detail_json TEXT NOT NULL
- ) STRICT;
- CREATE INDEX IF NOT EXISTS svml_runtime_journal_build ON svml_runtime_journal (build_id, sequence);
- CREATE INDEX IF NOT EXISTS svml_runtime_journal_operation ON svml_runtime_journal (operation_id, sequence);
`);
if (alreadyInitialized === undefined) {
this.#database.prepare("INSERT INTO svml_store_meta (singleton, schema_version) VALUES (1, ?)").run(databaseSchemaVersion);
@@ -1071,7 +987,6 @@ export class SqliteRuntimeState {
this.builds = new SqliteBuildStore(database);
this.operations = new SqliteOperationStore(database);
this.dispatch = new SqliteBuildDispatchStore(database);
- this.journal = new SqliteRuntimeJournal(database);
this.catalog = new SqliteBuildCatalog(database);
}
@@ -1082,7 +997,7 @@ export class SqliteRuntimeState {
export function createSqliteRuntimeServicePackage(
options: CreateSqliteRuntimeServicePackageOptions,
-): RuntimeServicePackage & { readonly catalog: BuildCatalog } {
+): RuntimeServicePackage {
const state = new SqliteRuntimeState(options.path, {
...(options.busyTimeoutMs === undefined ? {} : { busyTimeoutMs: options.busyTimeoutMs }),
...(options.readOnly === undefined ? {} : { readOnly: options.readOnly }),
@@ -1090,10 +1005,8 @@ export function createSqliteRuntimeServicePackage(
const buildInstance = options.buildInstance ?? "builds.sqlite";
const operationInstance = options.operationInstance ?? "operations.sqlite";
const dispatchInstance = options.dispatchInstance ?? "dispatch.sqlite";
- const journalInstance = options.journalInstance ?? "journal.sqlite";
try {
- return Object.assign(defineRuntimeServicePackage({
- name: options.name ?? "state.sqlite",
+ return defineRuntimeServicePackage({
module: sqliteStoreModuleRef,
services: [
{
@@ -1101,7 +1014,6 @@ export function createSqliteRuntimeServicePackage(
facet: "build-store",
instance: buildInstance,
implementation: {
- locator: "@narratage/store-sqlite/build-store",
digest: sqliteBuildStoreImplementationDigest,
},
configuration: {
@@ -1116,7 +1028,6 @@ export function createSqliteRuntimeServicePackage(
facet: "operation-store",
instance: operationInstance,
implementation: {
- locator: "@narratage/store-sqlite/operation-store",
digest: sqliteOperationStoreImplementationDigest,
},
configuration: {
@@ -1131,7 +1042,6 @@ export function createSqliteRuntimeServicePackage(
facet: "dispatch-store",
instance: dispatchInstance,
implementation: {
- locator: "@narratage/store-sqlite/dispatch-store",
digest: sqliteDispatchStoreImplementationDigest,
},
configuration: {
@@ -1141,24 +1051,10 @@ export function createSqliteRuntimeServicePackage(
},
service: state.dispatch,
},
- {
- role: "runtime-journal",
- facet: "runtime-journal",
- instance: journalInstance,
- implementation: {
- locator: "@narratage/store-sqlite/runtime-journal",
- digest: sqliteRuntimeJournalImplementationDigest,
- },
- configuration: {
- path: state.path,
- schemaVersion: databaseSchemaVersion,
- busyTimeoutMs: options.busyTimeoutMs ?? 5_000,
- },
- service: state.journal,
- },
],
+ buildCatalog: state.catalog,
close: () => state.close(),
- }), { catalog: state.catalog });
+ });
} catch (error) {
state.close();
throw error;
diff --git a/packages/store-sqlite/test/store.test.ts b/packages/store-sqlite/test/store.test.ts
index 44609d8e..fa100ba6 100644
--- a/packages/store-sqlite/test/store.test.ts
+++ b/packages/store-sqlite/test/store.test.ts
@@ -46,7 +46,6 @@ test("SQLite stores verified Build facts and Operation checkpoints across reopen
source: { path: "/project/main.svml", closure: digestOf("source-closure") },
aliases: [{
name: "final.video",
- type: initial.plan.goals[0]!.type,
ref: { kind: "logical-output", id: initial.request.targets[0]!.output },
}],
});
@@ -56,9 +55,7 @@ test("SQLite stores verified Build facts and Operation checkpoints across reopen
endpoint: "kie.personal",
authority: "kie.personal",
route: "fixture.generation",
- implementationDigest: digestOf("kie-implementation"),
runtimeClosure: digestOf("runtime-closure"),
- requestDigest: digestOf("generation-request"),
attempt: 1,
});
const operationCreated = await first.operations.create(operation);
@@ -104,9 +101,7 @@ test("SQLite Operation CAS preserves a terminal completion", async () => {
endpoint: "hyperframes.lambda",
authority: "hyperframes.lambda",
route: "fixture.render",
- implementationDigest: digestOf("hyperframes-lambda"),
runtimeClosure: digestOf("runtime"),
- requestDigest: digestOf("render-request"),
attempt: 1,
});
await state.operations.create(identity);
@@ -114,7 +109,6 @@ test("SQLite Operation CAS preserves a terminal completion", async () => {
status: "completed",
completion: {
value: { kind: "inline", value: { artifact: "video.mp4" } },
- metadata: { task: "lambda-1" },
},
});
assert.equal(completed.status, "stored");
@@ -142,9 +136,7 @@ test("SQLite keeps cancellation control independent from execution state", async
endpoint: "endpoint.cancel",
authority: "endpoint.cancel",
route: "fixture.cancel",
- implementationDigest: digestOf("implementation.cancel"),
runtimeClosure: digestOf("runtime.cancel"),
- requestDigest: digestOf("request.cancel"),
attempt: 1,
});
await state.operations.create(identity);
@@ -177,7 +169,7 @@ test("Host Catalog schema changes do not change the execution Runtime Closure",
assert.deepEqual(
services.services.map((item) => item.instance.configurationDigest),
[
- ...Array(4).fill(digestOf({ path: join(directory, "runtime.sqlite"), schemaVersion: 6, busyTimeoutMs: 5_000 })),
+ ...Array(3).fill(digestOf({ path: join(directory, "runtime.sqlite"), schemaVersion: 6, busyTimeoutMs: 5_000 })),
],
);
await services.close?.();
@@ -192,14 +184,14 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"
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"), runtimeRevision: closure,
+ build: "build-a", core: digestOf("core:a"), runtimeClosure: closure,
}), { now: 100 });
- const first = await state.dispatch.claim({ runtimeRevision: closure, owner: "worker-a", token: "lease-a", now: 100, leaseMs: 10 });
+ const first = await state.dispatch.claim({ runtimeClosure: closure, 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({ runtimeRevision: closure, owner: "worker-b", token: "early", now: 105, leaseMs: 10 }), undefined);
- const second = await state.dispatch.claim({ runtimeRevision: closure, owner: "worker-b", token: "lease-b", now: 111, leaseMs: 10 });
+ 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.ok(second?.lease);
assert.equal(second.lease.fence, 2);
const paidResources = [{ id: "authority:paid", maxActive: 1, maxInFlight: 1 }];
@@ -235,9 +227,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"), runtimeRevision: closure,
+ build: "build-b", core: digestOf("core:b"), runtimeClosure: closure,
}), { now: 112 });
- const third = await state.dispatch.claim({ runtimeRevision: closure, owner: "worker-c", token: "lease-c", now: 112, leaseMs: 10 });
+ const third = await state.dispatch.claim({ runtimeClosure: closure, 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",
@@ -247,9 +239,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"), runtimeRevision: closure,
+ build: "build-c", core: digestOf("core:c"), runtimeClosure: closure,
}), { now: 200, priority: 100 });
- const fourth = await state.dispatch.claim({ runtimeRevision: closure, owner: "worker-d", token: "lease-d", now: 200, leaseMs: 10 });
+ const fourth = await state.dispatch.claim({ runtimeClosure: closure, 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,16 +259,16 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"
}
});
-test("one SQLite execution domain rejects a second Runtime Revision until prior work is terminal", async () => {
+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 firstRevision = digestOf("runtime:first");
- const secondRevision = digestOf("runtime:second");
+ const firstClosure = digestOf("runtime:first");
+ const secondClosure = digestOf("runtime:second");
const firstIdentity = createBuildDispatchIdentity({
build: "first-build",
core: digestOf("core:first"),
- runtimeRevision: firstRevision,
+ runtimeClosure: firstClosure,
});
assert.equal((await state.dispatch.create(firstIdentity, { now: 100 })).status, "created");
assert.equal((await state.dispatch.create(firstIdentity, { now: 101 })).status, "existing");
@@ -284,13 +276,13 @@ test("one SQLite execution domain rejects a second Runtime Revision until prior
state.dispatch.create(createBuildDispatchIdentity({
build: "second-build",
core: digestOf("core:second"),
- runtimeRevision: secondRevision,
+ 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({
- runtimeRevision: firstRevision,
+ runtimeClosure: firstClosure,
owner: "worker:first",
token: "lease:first",
now: 103,
@@ -301,7 +293,7 @@ test("one SQLite execution domain rejects a second Runtime Revision until prior
assert.equal((await state.dispatch.create(createBuildDispatchIdentity({
build: "second-build",
core: digestOf("core:second"),
- runtimeRevision: secondRevision,
+ runtimeClosure: secondClosure,
}), { now: 105 })).status, "created");
state.close();
} finally {
@@ -322,10 +314,10 @@ test("Authority and Route resources are acquired atomically across models", asyn
await state.dispatch.create(createBuildDispatchIdentity({
build,
core: digestOf(`core:${build}`),
- runtimeRevision: closure,
+ runtimeClosure: closure,
}), { now });
const claimed = await state.dispatch.claim({
- runtimeRevision: closure,
+ runtimeClosure: closure,
owner: `worker:${build}`,
token: `lease:${build}`,
now,
diff --git a/packages/svs/src/activation.ts b/packages/svs/src/activation.ts
index 87788b29..0c87c4b5 100644
--- a/packages/svs/src/activation.ts
+++ b/packages/svs/src/activation.ts
@@ -1,10 +1,11 @@
+import { createAuthorFrontendHostFacet } from "@narratage/elaborator";
+
import { svsFrontend, svsManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/svs",
modules: [{ manifest: svsManifest }],
- authorFrontends: [svsFrontend],
+ hostFacets: [createAuthorFrontendHostFacet(svsFrontend)],
};
export default svmlPackage;
diff --git a/packages/svs/src/frontend.ts b/packages/svs/src/frontend.ts
index 0e1f5f3b..27104dd2 100644
--- a/packages/svs/src/frontend.ts
+++ b/packages/svs/src/frontend.ts
@@ -24,7 +24,6 @@ export const svsFrontend: AuthorFrontend = {
decode(source, context) {
verifyClosure(context.closure);
const parsed = parseSvs(source.name, source.text);
- const sourceDigest = source.sourceDigest;
const records = parsed.recipes.map((recipe) => sealRecord({
id: recipe.value.path,
type: svsRecipeType,
@@ -39,11 +38,9 @@ export const svsFrontend: AuthorFrontend = {
}));
return {
module: sealTypedModule({
- id: `source:${source.name}`,
- closureDigest: context.closure.digest,
records,
}),
- author: sealAuthorModule({ name: `source:${source.name}`, components: [] }),
+ author: sealAuthorModule({ components: [] }),
fragments: [],
exports,
};
diff --git a/packages/svs/src/manifest.ts b/packages/svs/src/manifest.ts
index 06a608b9..d6d5136a 100644
--- a/packages/svs/src/manifest.ts
+++ b/packages/svs/src/manifest.ts
@@ -1,4 +1,4 @@
-import { digestOf } from "@narratage/core";
+import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, TypeRef } from "@narratage/protocol";
export const svsModuleRef = { name: "@narratage/svs", version: "1" } as const;
@@ -29,6 +29,5 @@ export const svsManifest: ModuleManifest = {
},
}],
capabilities: [],
- surfaces: [],
producers: [],
};
diff --git a/packages/svs/test/source-closure.test.ts b/packages/svs/test/source-closure.test.ts
index c449c5ab..1d6aa0ea 100644
--- a/packages/svs/test/source-closure.test.ts
+++ b/packages/svs/test/source-closure.test.ts
@@ -42,6 +42,10 @@ const cardType = { module: laboratory, name: "Card" } satisfies TypeRef;
const cardAppearanceType = { module: laboratory, name: "CardAppearance" } satisfies TypeRef;
const renderProducer = { module: laboratory, name: "render-card" } satisfies ProducerRef;
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",
@@ -64,32 +68,18 @@ const manifest: ModuleManifest = {
},
],
capabilities: [],
- surfaces: [{
- name: "card",
- tag: "Card",
- mode: "structured",
- outputs: [cardAppearanceType],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.recipe-card/card-surface",
- digest: cardSurfaceDigest,
- },
- }],
producers: [{
name: renderProducer.name,
inputs: [{ name: "appearance", type: cardAppearanceType }],
outputs: [{ name: "card", type: cardType }],
needs: [],
implementation: {
- kind: "registered",
- locator: "example.recipe-card/render-card",
digest: digestOf("example.recipe-card/render-card@1"),
},
}],
};
const cardFragment = sealGraphFragment({
- name: "example.recipe-card/card@1",
inputs: [{ name: "appearance", type: cardAppearanceType }],
operations: [{
id: "render",
@@ -131,7 +121,7 @@ function recipeValue(record: TypedRecord | undefined): SvsRecipe {
function sourceRegistry(): MarkupSurfaceRegistry {
const registry = new MarkupSurfaceRegistry();
- registry.registerStructured(laboratory, "card", cardSurfaceDigest, ({ element, resolveReference }) => {
+ registry.registerStructured({ module: laboratory, declaration: cardSurface, handler: ({ element, resolveReference }) => {
const id = stringAttribute(element, "id");
const appearancePath = referenceAttribute(element, "appearance");
const resolved = resolveReference(appearancePath);
@@ -174,7 +164,7 @@ function sourceRegistry(): MarkupSurfaceRegistry {
}],
fragments: [cardFragment],
};
- });
+ } });
return registry;
}
@@ -222,9 +212,9 @@ async function compileMain(alias: string, root = "/project", styles = styleText)
test("Text and SVS recursively compile one aliased Recipe into a Core BuildPlan", async () => {
const compiled = await compileMain("studio");
assert.equal(compiled.closure.units.length, 2);
- assert.equal(compiled.module.records.length, 2);
- const recipe = compiled.module.records.find((record) => record.type.name === svsRecipeType.name);
- const appearance = compiled.module.records.find((record) => record.type.name === cardAppearanceType.name);
+ assert.equal(compiled.program.records.length, 2);
+ const recipe = compiled.program.records.find((record) => record.type.name === svsRecipeType.name);
+ const appearance = compiled.program.records.find((record) => record.type.name === cardAppearanceType.name);
assert.deepEqual(recipe?.value, {
kind: "inline",
value: {
@@ -244,8 +234,8 @@ test("Text and SVS recursively compile one aliased Recipe into a Core BuildPlan"
});
const target = resolveCompiledSourceExport(compiled, "answer.result", cardType);
assert.equal(target.ref.kind, "logical-output");
- const state = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const state = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [{ output: target.ref.kind === "logical-output" ? target.ref.id : "" }],
}));
assert.equal(state.plan.steps.length, 1);
@@ -269,19 +259,19 @@ test("source import alias changes source identity but not Recipe or Graph semant
const studio = await compileMain("studio");
const brand = await compileMain("brand");
assert.notEqual(studio.closure.id, brand.closure.id);
- const studioAppearance = studio.module.records.find((record) => record.type.name === cardAppearanceType.name);
- const brandAppearance = brand.module.records.find((record) => record.type.name === cardAppearanceType.name);
+ const studioAppearance = studio.program.records.find((record) => record.type.name === cardAppearanceType.name);
+ const brandAppearance = brand.program.records.find((record) => record.type.name === cardAppearanceType.name);
assert.equal(studioAppearance?.id, brandAppearance?.id);
assert.equal(studioAppearance?.digest, brandAppearance?.digest);
- assert.equal(studio.elaboration.graph.id, brand.elaboration.graph.id);
+ assert.equal(studio.graph.id, brand.graph.id);
});
test("relocating the same source tree preserves Source Closure and Graph identity", async () => {
const original = await compileMain("studio", "/project");
const relocated = await compileMain("studio", "/copy/project");
assert.equal(original.closure.id, relocated.closure.id);
- assert.equal(original.module.semanticDigest, relocated.module.semanticDigest);
- assert.equal(original.elaboration.graph.id, relocated.elaboration.graph.id);
+ assert.equal(original.program.semanticDigest, relocated.program.semanticDigest);
+ assert.equal(original.graph.id, relocated.graph.id);
});
test("Frontend identity changes Source Closure identity but not equal decoded author meaning", async () => {
@@ -305,8 +295,8 @@ test("Frontend identity changes Source Closure identity but not equal decoded au
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.module.semanticDigest, compatible.module.semanticDigest);
- assert.equal(official.elaboration.graph.id, compatible.elaboration.graph.id);
+ assert.equal(official.program.semanticDigest, compatible.program.semanticDigest);
+ assert.equal(official.graph.id, compatible.graph.id);
});
test("Source Closure binds every recursive SourceUnit digest", async () => {
diff --git a/packages/temporal/src/activation.ts b/packages/temporal/src/activation.ts
index 81c708a7..3fd4177e 100644
--- a/packages/temporal/src/activation.ts
+++ b/packages/temporal/src/activation.ts
@@ -2,7 +2,6 @@ import { temporalManifest } from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/temporal",
modules: [{ manifest: temporalManifest }],
};
export default svmlPackage;
diff --git a/packages/temporal/src/index.ts b/packages/temporal/src/index.ts
index d3ae6299..39017688 100644
--- a/packages/temporal/src/index.ts
+++ b/packages/temporal/src/index.ts
@@ -15,7 +15,6 @@ export const temporalManifest: ModuleManifest = {
dependencies: [],
types: [],
capabilities: [],
- surfaces: [],
producers: [],
};
export const temporalManifestDigest = digestOf(temporalManifest);
diff --git a/packages/temporal/src/location.ts b/packages/temporal/src/location.ts
index 5c1ae690..2cad397b 100644
--- a/packages/temporal/src/location.ts
+++ b/packages/temporal/src/location.ts
@@ -33,7 +33,7 @@ export function locateSelectionOccurrences(
): readonly LocatedSelectionOccurrence[] {
assertProgramSpaceIdentity(space);
const totalFrames = programSpaceFrameCount(space);
- const spans = selectionFrameSpans(map, selection, space);
+ const spans = selectionFrameSpans(map, selection);
if (spans.length !== selection.occurrences.length) {
throw new Error(`NarrativeSelection ${selection.id} location cardinality changed.`);
}
@@ -59,7 +59,7 @@ export function locateMomentOccurrences(
): readonly LocatedMomentOccurrence[] {
assertProgramSpaceIdentity(space);
const totalFrames = programSpaceFrameCount(space);
- const frames = momentFrames(map, moment, space);
+ const frames = momentFrames(map, moment);
if (frames.length !== moment.occurrences.length) {
throw new Error(`NarrativeMoment ${moment.id} location cardinality changed.`);
}
@@ -88,7 +88,7 @@ export function locateSegmentOccurrence(
): LocatedSegmentOccurrence {
assertProgramSpaceIdentity(space);
const totalFrames = programSpaceFrameCount(space);
- const span = segmentFrameSpan(map, segment, space);
+ const span = segmentFrameSpan(map, segment);
assertLocatedFrame(span.startFrame, totalFrames, `Narrative Segment ${segment.id} start`);
assertLocatedFrame(span.endFrameExclusive, totalFrames, `Narrative Segment ${segment.id} end`);
if (span.endFrameExclusive <= span.startFrame) throw new Error(`Narrative Segment ${segment.id} has no positive frame span.`);
diff --git a/packages/temporal/src/projection.ts b/packages/temporal/src/projection.ts
index bae800e9..c8fc8cdf 100644
--- a/packages/temporal/src/projection.ts
+++ b/packages/temporal/src/projection.ts
@@ -131,9 +131,9 @@ export function projectTemporalWindow(
return { startFrame, endFrameExclusive };
}
-function projectedId(itemId: string, sourceOccurrenceId: string): string {
+function projectedId(itemId: string, occurrenceId: string): string {
if (itemId.length === 0) throw new Error("Projected item id must not be empty.");
- return `${itemId}::${sourceOccurrenceId}`;
+ return `${itemId}::${occurrenceId}`;
}
export function projectSelectionWindows(input: {
@@ -154,7 +154,6 @@ export function projectSelectionWindows(input: {
);
return occurrences.map((occurrence) => ({
id: projectedId(input.itemId, occurrence.id),
- sourceOccurrenceId: occurrence.id,
span: projectTemporalWindow(input.projection, { program, selection: occurrence }, input.space),
}));
}
@@ -177,7 +176,6 @@ export function projectMomentWindows(input: {
);
return occurrences.map((occurrence) => ({
id: projectedId(input.itemId, occurrence.id),
- sourceOccurrenceId: occurrence.id,
span: projectTemporalWindow(input.projection, { program, moment: occurrence }, input.space),
}));
}
@@ -190,7 +188,6 @@ export function projectProgramWindow(input: {
const program = locateProgramOccurrence(input.space);
return {
id: projectedId(input.itemId, program.id),
- sourceOccurrenceId: program.id,
span: projectTemporalWindow(input.projection, { program }, input.space),
};
}
@@ -206,7 +203,6 @@ export function projectSegmentWindow(input: {
const segment = locateSegmentOccurrence(input.map, input.segment, input.space);
return {
id: projectedId(input.itemId, segment.id),
- sourceOccurrenceId: segment.id,
span: projectTemporalWindow(input.projection, { program, segment }, input.space),
};
}
diff --git a/packages/temporal/src/schedule.ts b/packages/temporal/src/schedule.ts
index 146b99ac..c207a2c6 100644
--- a/packages/temporal/src/schedule.ts
+++ b/packages/temporal/src/schedule.ts
@@ -36,25 +36,17 @@ export function resolveTriggeredSchedule(input: {
previousFrame = trigger.frame;
}
const cumulative = input.triggers.map((trigger) => ({
- id: `cumulative::${trigger.id}`,
- triggerId: trigger.id,
- span: { startFrame: trigger.frame, endFrameExclusive: input.outer.endFrameExclusive },
+ startFrame: trigger.frame,
+ endFrameExclusive: input.outer.endFrameExclusive,
}));
const exclusive = input.triggers.map((trigger, index) => ({
- id: `exclusive::${trigger.id}`,
- triggerId: trigger.id,
- span: {
- startFrame: trigger.frame,
- endFrameExclusive: input.triggers[index + 1]?.frame ?? input.terminalFrame,
- },
+ startFrame: trigger.frame,
+ endFrameExclusive: input.triggers[index + 1]?.frame ?? input.terminalFrame,
}));
return {
outer: { ...input.outer },
terminalFrame: input.terminalFrame,
cumulative,
exclusive,
- ...(input.terminalFrame < input.outer.endFrameExclusive
- ? { settledSuffix: { startFrame: input.terminalFrame, endFrameExclusive: input.outer.endFrameExclusive } }
- : {}),
};
}
diff --git a/packages/temporal/src/types.ts b/packages/temporal/src/types.ts
index f848ba09..af17a169 100644
--- a/packages/temporal/src/types.ts
+++ b/packages/temporal/src/types.ts
@@ -59,7 +59,6 @@ export type FrameSpan = {
export type ProjectedOccurrence = {
readonly id: string;
- readonly sourceOccurrenceId: string;
readonly span: FrameSpan;
};
@@ -70,16 +69,9 @@ export type TriggerPoint = {
readonly frame: number;
};
-export type TriggeredStage = {
- readonly id: string;
- readonly triggerId: string;
- readonly span: FrameSpan;
-};
-
export type TriggeredSchedule = {
readonly outer: FrameSpan;
readonly terminalFrame: number;
- readonly cumulative: readonly TriggeredStage[];
- readonly exclusive: readonly TriggeredStage[];
- readonly settledSuffix?: FrameSpan;
+ readonly cumulative: readonly FrameSpan[];
+ readonly exclusive: readonly FrameSpan[];
};
diff --git a/packages/temporal/test/temporal.test.ts b/packages/temporal/test/temporal.test.ts
index b0b9b7e1..0411b0e6 100644
--- a/packages/temporal/test/temporal.test.ts
+++ b/packages/temporal/test/temporal.test.ts
@@ -27,13 +27,13 @@ const map: CompleteSemanticMap = {
contract: "svml.complete-semantic-map@1",
tokens: [],
anchors: [
- { identity: "a", timeSec: 1, frame: 30 },
- { identity: "b", timeSec: 2, frame: 60 },
- { identity: "c", timeSec: 3, frame: 90 },
- { identity: "d", timeSec: 4, frame: 120 },
- { identity: "late", timeSec: 8, frame: 240 },
- { identity: "segment:answer:start", timeSec: 2, frame: 60 },
- { identity: "segment:answer:end", timeSec: 4, frame: 120 },
+ { identity: "a", frame: 30 },
+ { identity: "b", frame: 60 },
+ { identity: "c", frame: 90 },
+ { identity: "d", frame: 120 },
+ { identity: "late", frame: 240 },
+ { identity: "segment:answer:start", frame: 60 },
+ { identity: "segment:answer:end", frame: 120 },
],
};
@@ -57,7 +57,6 @@ test("one Selection projects exact local points and stable occurrence identity",
});
assert.deepEqual(result, [{
id: "card::proof#7",
- sourceOccurrenceId: "proof#7",
span: { startFrame: 30, endFrameExclusive: 60 },
}]);
});
@@ -72,7 +71,6 @@ test("one Segment projects from its own structural start and end anchors", () =>
});
assert.deepEqual(result, {
id: "answer-card::answer",
- sourceOccurrenceId: "answer",
span: { startFrame: 60, endFrameExclusive: 120 },
});
});
@@ -89,7 +87,7 @@ test("each preserves source order, even when physical time is reversed between o
expansion: { kind: "each" },
projection: { start: { ref: "selection.start" }, end: { ref: "selection.end" } },
});
- assert.deepEqual(result.map((item) => item.sourceOccurrenceId), ["mentions#4", "mentions#9"]);
+ assert.deepEqual(result.map((item) => item.id), ["repeat::mentions#4", "repeat::mentions#9"]);
assert.deepEqual(result.map((item) => item.span.startFrame), [90, 30]);
});
@@ -210,17 +208,16 @@ test("triggered schedule derives cumulative, exclusive and settled windows from
terminalFrame: 240,
triggers: [{ id: "one", frame: 30 }, { id: "two", frame: 90 }, { id: "three", frame: 150 }],
});
- assert.deepEqual(result.cumulative.map((item) => item.span), [
+ assert.deepEqual(result.cumulative, [
{ startFrame: 30, endFrameExclusive: 300 },
{ startFrame: 90, endFrameExclusive: 300 },
{ startFrame: 150, endFrameExclusive: 300 },
]);
- assert.deepEqual(result.exclusive.map((item) => item.span), [
+ assert.deepEqual(result.exclusive, [
{ startFrame: 30, endFrameExclusive: 90 },
{ startFrame: 90, endFrameExclusive: 150 },
{ startFrame: 150, endFrameExclusive: 240 },
]);
- assert.deepEqual(result.settledSuffix, { startFrame: 240, endFrameExclusive: 300 });
});
test("triggered schedule rejects equal, reversed and out-of-bound points", () => {
diff --git a/packages/text/src/activation.ts b/packages/text/src/activation.ts
index 770042db..50dd5f7b 100644
--- a/packages/text/src/activation.ts
+++ b/packages/text/src/activation.ts
@@ -1,34 +1,30 @@
+import { createAuthorFrontendHostFacet } from "@narratage/elaborator";
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeTextRenderSurface,
decodeTextValueSurface,
textComponent,
- textImplementationDigests,
textManifest,
textModuleRef,
textSvsFrontend,
+ textMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/text",
- modules: [{ manifest: textManifest, specifiers: ["@narratage/text", "@narratage/text@1"] }],
- authorFrontends: [textSvsFrontend],
+ modules: [{ manifest: textManifest }],
components: [textComponent],
hostFacets: [
+ createAuthorFrontendHostFacet(textSvsFrontend),
createMarkupSurfaceHostFacet({
module: textModuleRef,
- surface: "value",
- mode: "structured",
- implementationDigest: textImplementationDigests.valueSurface,
+ declaration: textMarkupSurfaces.find((item) => item.name === "value")!,
handler: decodeTextValueSurface,
}),
createMarkupSurfaceHostFacet({
module: textModuleRef,
- surface: "render",
- mode: "structured",
- implementationDigest: textImplementationDigests.renderSurface,
+ declaration: textMarkupSurfaces.find((item) => item.name === "render")!,
handler: decodeTextRenderSurface,
}),
],
diff --git a/packages/text/src/component.ts b/packages/text/src/component.ts
index a2ab4b42..7a089a5a 100644
--- a/packages/text/src/component.ts
+++ b/packages/text/src/component.ts
@@ -23,7 +23,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
}
export const textComponent = {
- name: "@narratage/text",
validators: [
{ type: textTypes.text, implementationDigest: textImplementationDigests.validateText,
handler: ({ value }) => verifyText(inline(value, "Text")) },
diff --git a/packages/text/src/fragment.ts b/packages/text/src/fragment.ts
index 47fdd184..8807e67f 100644
--- a/packages/text/src/fragment.ts
+++ b/packages/text/src/fragment.ts
@@ -46,7 +46,6 @@ export function createTextRenderFragment(entries: readonly TextFragmentBinding[]
result: { kind: "output", name: "text" },
});
return sealGraphFragment({
- name: `@narratage/text/render[${names.join(",") || "no-dynamic-bindings"}]@1`,
inputs,
operations,
exports: [{
diff --git a/packages/text/src/frontend.ts b/packages/text/src/frontend.ts
index 92e52729..2024446a 100644
--- a/packages/text/src/frontend.ts
+++ b/packages/text/src/frontend.ts
@@ -26,7 +26,7 @@ export const textSvsFrontend: AuthorFrontend = {
const candidates = recipes
.map((recipe) => /^text-template\.([a-z][a-z0-9-]{0,95})$/u.exec(recipe.path)?.[1])
.filter((id): id is string => id !== undefined);
- if (candidates.length !== 1) throw new Error(`${source.name} must declare exactly one text-template.<id> metadata Recipe`);
+ if (candidates.length !== 1) throw new Error(`${source.name} must declare exactly one root Recipe text-template.<id>`);
const id = candidates[0]!;
const template = textTemplateFromSvsRecipes(recipes, id);
const record = sealRecord({
@@ -38,8 +38,8 @@ export const textSvsFrontend: AuthorFrontend = {
verifyRecordStructure(context.closure, record);
const exports: AuthorSourceExport[] = [{ name: id, ref: { kind: "record", id }, type: textTypes.template }];
return {
- module: sealTypedModule({ id: `source:${source.name}`, closureDigest: context.closure.digest, records: [record] }),
- author: sealAuthorModule({ name: `source:${source.name}`, components: [] }),
+ module: sealTypedModule({ records: [record] }),
+ author: sealAuthorModule({ components: [] }),
fragments: [],
exports,
};
diff --git a/packages/text/src/index.ts b/packages/text/src/index.ts
index eb38ec45..7b57aa0f 100644
--- a/packages/text/src/index.ts
+++ b/packages/text/src/index.ts
@@ -5,7 +5,7 @@ export type { TextFragmentBinding } from "./fragment.js";
export {
textDependency,
textImplementationDigests,
- textManifest,
+ textManifest, textMarkupSurfaces,
textManifestDigest,
textModuleRef,
textProducers,
diff --git a/packages/text/src/manifest.ts b/packages/text/src/manifest.ts
index 868de47f..2341a0bf 100644
--- a/packages/text/src/manifest.ts
+++ b/packages/text/src/manifest.ts
@@ -30,15 +30,37 @@ export const textImplementationDigests = {
} as const;
const openObject: ValueSchema = { kind: "object", fields: {}, allowUnknown: true };
-const type = (name: string, schema: ValueSchema, locator: string, digest: (typeof textImplementationDigests)[keyof typeof textImplementationDigests]) => ({
+const type = (
+ name: string,
+ schema: ValueSchema,
+ digest: (typeof textImplementationDigests)[keyof typeof textImplementationDigests],
+) => ({
name,
schema,
validator: {
- abi: "svml.type-validator@1" as const,
- implementation: { kind: "registered" as const, locator, digest },
+ 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",
name: textModuleRef.name,
@@ -51,9 +73,9 @@ export const textManifest: ModuleManifest = {
contract: { schema: { kind: "literal", value: "svml.text@1" } },
value: { schema: { kind: "string" } },
},
- }, "@narratage/text/validate-text", textImplementationDigests.validateText),
- type(textTypes.template.name, openObject, "@narratage/text/validate-template", textImplementationDigests.validateTemplate),
- type(textTypes.bindings.name, openObject, "@narratage/text/validate-bindings", textImplementationDigests.validateBindings),
+ }, textImplementationDigests.validateText),
+ type(textTypes.template.name, openObject, textImplementationDigests.validateTemplate),
+ type(textTypes.bindings.name, openObject, textImplementationDigests.validateBindings),
type(textTypes.binding.name, {
kind: "object",
fields: {
@@ -61,37 +83,16 @@ export const textManifest: ModuleManifest = {
name: { schema: { kind: "string", minLength: 1 } },
mode: { schema: { kind: "string", enum: ["set", "append"] } },
},
- }, "@narratage/text/validate-binding", textImplementationDigests.validateBinding),
+ }, textImplementationDigests.validateBinding),
],
capabilities: [],
- surfaces: [{
- name: "value",
- tag: "Value",
- mode: "structured",
- outputs: [textTypes.text],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/text/value-surface",
- digest: textImplementationDigests.valueSurface,
- },
- }, {
- name: "render",
- tag: "Render",
- mode: "structured",
- outputs: [textTypes.text, textTypes.bindings, textTypes.binding],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/text/render-surface",
- digest: textImplementationDigests.renderSurface,
- },
- }],
producers: [
{
name: textProducers.emptyBindings.name,
inputs: [],
outputs: [{ name: "bindings", type: textTypes.bindings }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/text/empty-bindings", digest: textImplementationDigests.emptyBindings },
+ implementation: { digest: textImplementationDigests.emptyBindings },
},
{
name: textProducers.bindText.name,
@@ -102,7 +103,7 @@ export const textManifest: ModuleManifest = {
],
outputs: [{ name: "bindings", type: textTypes.bindings }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/text/bind-text", digest: textImplementationDigests.bindText },
+ implementation: { digest: textImplementationDigests.bindText },
},
{
name: textProducers.render.name,
@@ -112,7 +113,7 @@ export const textManifest: ModuleManifest = {
],
outputs: [{ name: "text", type: textTypes.text }],
needs: [],
- implementation: { kind: "registered", locator: "@narratage/text/render", digest: textImplementationDigests.render },
+ implementation: { digest: textImplementationDigests.render },
},
],
};
diff --git a/packages/text/src/svs.ts b/packages/text/src/svs.ts
index 7c036946..0710bb8d 100644
--- a/packages/text/src/svs.ts
+++ b/packages/text/src/svs.ts
@@ -118,7 +118,7 @@ export function textTemplateFromSvsRecipes(
): TextTemplate {
const prefix = `text-template.${templateId}`;
const meta = recipes.find((recipe) => recipe.path === prefix);
- if (meta === undefined) throw new Error(`Missing ${prefix} metadata Recipe`);
+ if (meta === undefined) throw new Error(`Missing root Recipe ${prefix}`);
exactProperties(meta, new Set(["separator"]), ["default-"]);
if (text(meta, "separator", "paragraph") !== "paragraph") throw new Error(`${prefix}.separator must be paragraph`);
const defaults: Record<string, TextScalar> = {};
diff --git a/packages/typography-track/src/activation.ts b/packages/typography-track/src/activation.ts
index 7f4be3a1..b7efdc35 100644
--- a/packages/typography-track/src/activation.ts
+++ b/packages/typography-track/src/activation.ts
@@ -7,30 +7,29 @@ import {
typographyTrackComponent,
typographyTrackManifest,
typographyTrackModuleRef,
- typographyTrackSurfaceImplementationDigests,
+ typographyTrackMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/typography-track",
- modules: [{ manifest: typographyTrackManifest, specifiers: ["@narratage/typography-track", "@narratage/typography-track@1"] }],
+ modules: [{ manifest: typographyTrackManifest }],
components: [typographyTrackComponent],
hostFacets: [
createMarkupSurfaceHostFacet({
- module: typographyTrackModuleRef, surface: "style", mode: "structured",
- implementationDigest: typographyTrackSurfaceImplementationDigests.style, handler: decodeTypographyStyleSurface,
+ module: typographyTrackModuleRef,
+ declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "style")!, handler: decodeTypographyStyleSurface,
}),
createMarkupSurfaceHostFacet({
- module: typographyTrackModuleRef, surface: "motion", mode: "structured",
- implementationDigest: typographyTrackSurfaceImplementationDigests.motion, handler: decodeTypographyMotionSurface,
+ module: typographyTrackModuleRef,
+ declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "motion")!, handler: decodeTypographyMotionSurface,
}),
createMarkupSurfaceHostFacet({
- module: typographyTrackModuleRef, surface: "track", mode: "structured",
- implementationDigest: typographyTrackSurfaceImplementationDigests.track, handler: decodeTypographyTrackSurface,
+ module: typographyTrackModuleRef,
+ declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "track")!, handler: decodeTypographyTrackSurface,
}),
createMarkupSurfaceHostFacet({
- module: typographyTrackModuleRef, surface: "mask", mode: "structured",
- implementationDigest: typographyTrackSurfaceImplementationDigests.mask, handler: decodeTypographyMaskSurface,
+ module: typographyTrackModuleRef,
+ declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "mask")!, handler: decodeTypographyMaskSurface,
}),
],
};
diff --git a/packages/typography-track/src/component.ts b/packages/typography-track/src/component.ts
index 6151a6e9..f24d1570 100644
--- a/packages/typography-track/src/component.ts
+++ b/packages/typography-track/src/component.ts
@@ -53,7 +53,6 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
const output = (value: unknown) => ({ kind: "inline" as const, value: canonicalize(value) });
export const typographyTrackComponent = {
- name: "@narratage/typography-track",
producers: [
{
producer: typographyTrackProducers.materializePlainItem,
diff --git a/packages/typography-track/src/fragment.ts b/packages/typography-track/src/fragment.ts
index 9450d0df..bba428ff 100644
--- a/packages/typography-track/src/fragment.ts
+++ b/packages/typography-track/src/fragment.ts
@@ -10,7 +10,6 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
/** Provider-free official lowering from TypographyTrackProgram to one peer VisualTrack. */
export const typographyTrackFragment = sealGraphFragment({
- name: "@narratage/typography-track/render@1",
inputs: [
{ name: "space", type: programSpaceTypes.programSpace },
{ name: "program", type: typographyTrackTypes.program },
diff --git a/packages/typography-track/src/index.ts b/packages/typography-track/src/index.ts
index 6e065316..d4562571 100644
--- a/packages/typography-track/src/index.ts
+++ b/packages/typography-track/src/index.ts
@@ -1,7 +1,7 @@
export { typographyTrackFragment } from "./fragment.js";
export { typographyTrackComponent } from "./component.js";
export {
- typographyTrackManifest,
+ typographyTrackManifest, typographyTrackMarkupSurfaces,
typographyTrackManifestDigest,
typographyTrackModuleRef,
typographyTrackProducers,
diff --git a/packages/typography-track/src/manifest.ts b/packages/typography-track/src/manifest.ts
index 6c632c21..ea6707bb 100644
--- a/packages/typography-track/src/manifest.ts
+++ b/packages/typography-track/src/manifest.ts
@@ -152,7 +152,7 @@ export const plainTextItemSpecSchema: ValueSchema = object({
});
const span = object({ startFrame: { schema: integer }, endFrameExclusive: { schema: positiveInteger } });
const item = object({
- id: { schema: string }, sourceOccurrenceId: { schema: string }, span: { schema: span }, geometry: { schema: geometry },
+ id: { schema: string }, span: { schema: span }, geometry: { schema: geometry },
document: { schema: visualTextDocumentSchema }, style: { schema: textStyleSchema }, motion: { schema: textMotionSchema },
tieBreak: { schema: string },
});
@@ -175,7 +175,15 @@ export const typographyTrackSurfaceImplementationDigests = {
mask: digestOf("@narratage/typography-track/owned-mask-surface@1"),
} as const;
-const registered = (locator: string, digest: ReturnType<typeof digestOf>) => ({ kind: "registered" as const, locator, digest });
+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 } },
+ ] as const;
+
export const typographyTrackManifest: ModuleManifest = {
format: "svml.module@1",
@@ -194,24 +202,18 @@ export const typographyTrackManifest: ModuleManifest = {
{ name: typographyTrackTypes.maskSpec.name, schema: textMaskSpecSchema },
],
capabilities: [],
- surfaces: [
- { name: "style", tag: "Style", mode: "structured", outputs: [typographyTrackTypes.style], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/style-surface", digest: typographyTrackSurfaceImplementationDigests.style } },
- { name: "motion", tag: "Motion", mode: "structured", outputs: [typographyTrackTypes.motion], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/motion-surface", 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: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/complete-track-surface", digest: typographyTrackSurfaceImplementationDigests.track } },
- { name: "mask", tag: "Mask", mode: "structured", outputs: [typographyTrackTypes.maskSpec, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/owned-mask-surface", digest: typographyTrackSurfaceImplementationDigests.mask } },
- ],
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("@narratage/typography-track/materialize-plain-text-item", materializePlainTextItemImplementationDigest) },
- { name: typographyTrackProducers.bindPoint.name, inputs: [{ name: "point", type: spatialTypes.point }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered("@narratage/typography-track/bind-point-placement", bindPointTextPlacementImplementationDigest) },
- { name: typographyTrackProducers.bindArea.name, inputs: [{ name: "frame", type: spatialTypes.frame }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered("@narratage/typography-track/bind-area-placement", bindAreaTextPlacementImplementationDigest) },
- { name: typographyTrackProducers.bindPath.name, inputs: [{ name: "path", type: spatialTypes.path }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered("@narratage/typography-track/bind-path-placement", bindPathTextPlacementImplementationDigest) },
- { name: typographyTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered("@narratage/typography-track/create-set", 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("@narratage/typography-track/append-program", 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("@narratage/typography-track/append-selection", 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("@narratage/typography-track/append-moment", 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("@narratage/typography-track/finalize", 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("@narratage/typography-track/render", 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("@narratage/typography-track/render-mask", renderTextMaskTrackImplementationDigest) },
+ { 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) },
],
};
diff --git a/packages/typography-track/src/program.ts b/packages/typography-track/src/program.ts
index 24215293..23122181 100644
--- a/packages/typography-track/src/program.ts
+++ b/packages/typography-track/src/program.ts
@@ -304,7 +304,6 @@ function occurrenceItem(
): TextItem {
return {
id: count === 1 ? spec.id : occurrence.id,
- sourceOccurrenceId: occurrence.sourceOccurrenceId,
span: { ...occurrence.span },
geometry: structuredClone(geometry),
document: structuredClone(spec.document),
diff --git a/packages/typography-track/src/surface.ts b/packages/typography-track/src/surface.ts
index 2fc698e1..cc8e5023 100644
--- a/packages/typography-track/src/surface.ts
+++ b/packages/typography-track/src/surface.ts
@@ -733,7 +733,8 @@ function createTrackFragment(id: string, items: readonly FragmentItem[]): GraphF
];
const inputs = [...new Map(inputEntries.map((value) => [value.name, value])).values()];
return sealGraphFragment({
- name: `@narratage/typography-track/surface/${id}@1`, inputs, operations,
+ inputs,
+ operations,
exports: [
{
name: "program", type: typographyTrackTypes.program, root: operation("text:finalize"),
@@ -860,7 +861,6 @@ function createMaskFragment(id: string): GraphFragment {
{ name: "spec", type: typographyTrackTypes.maskSpec },
];
return sealGraphFragment({
- name: `@narratage/typography-track/mask-surface/${id}@1`,
inputs,
operations: [{
id: "text-mask:render", producer: typographyTrackProducers.renderMask,
diff --git a/packages/typography-track/src/types.ts b/packages/typography-track/src/types.ts
index 1df873c9..17a5e404 100644
--- a/packages/typography-track/src/types.ts
+++ b/packages/typography-track/src/types.ts
@@ -86,7 +86,6 @@ export type PlainTextItemSpec = {
export type TextItem = {
readonly id: string;
- readonly sourceOccurrenceId: string;
readonly span: FrameSpan;
readonly geometry: TextGeometry;
readonly document: TextDocument;
diff --git a/packages/typography-track/test/typography-track.test.ts b/packages/typography-track/test/typography-track.test.ts
index 9911b305..b842e771 100644
--- a/packages/typography-track/test/typography-track.test.ts
+++ b/packages/typography-track/test/typography-track.test.ts
@@ -35,9 +35,9 @@ import {
decodeTypographyStyleSurface,
decodeTypographyTrackSurface,
typographyTrackManifest,
+ typographyTrackMarkupSurfaces,
typographyTrackModuleRef,
typographyTrackProducers,
- typographyTrackSurfaceImplementationDigests,
typographyTrackTypes,
} from "@narratage/typography-track";
import type { TextStyle } from "@narratage/typography-track";
@@ -162,7 +162,6 @@ test("persistent and timed Text Items lower to ordinary VisualTrack Presents", (
items: [
{
id: "watermark",
- sourceOccurrenceId: "program",
span: { startFrame: 0, endFrameExclusive: 150 },
tieBreak: "watermark",
geometry: { kind: "point", point: { contract: "svml.spatial-point@1", xPx: 900, yPx: 80 } },
@@ -172,7 +171,6 @@ test("persistent and timed Text Items lower to ordinary VisualTrack Presents", (
},
{
id: "callout",
- sourceOccurrenceId: "program",
span: { startFrame: 30, endFrameExclusive: 90 },
tieBreak: "callout",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 108, yPx: 1248, widthPx: 864, heightPx: 230.4 } },
@@ -214,7 +212,7 @@ test("Text Mask explicitly consumes one authored Text Program and one owned stil
const program = sealTypographyTrackProgram({
contract: "svml.typography-track-program@1", id: "mask-shape",
items: [{
- id: "mask-title", sourceOccurrenceId: "program",
+ id: "mask-title",
span: { startFrame: 0, endFrameExclusive: 150 }, tieBreak: "mask-title",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 100, yPx: 200, widthPx: 800, heightPx: 240 } },
document: document("OWNED MASK"),
@@ -267,7 +265,6 @@ test("TypographyTrackProgram rejects a frame span outside ProgramSpace", () => {
id: "invalid-text",
items: [{
id: "late",
- sourceOccurrenceId: "program",
span: { startFrame: 149, endFrameExclusive: 151 },
tieBreak: "late",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 0, yPx: 0, widthPx: 1080, heightPx: 192 } },
@@ -284,8 +281,8 @@ test("Selection Text consumes explicit Selection, SemanticMap, Style, Motion and
contract: "svml.complete-semantic-map@1",
tokens: [],
anchors: [
- { identity: "selection:start", timeSec: 1, frame: 30 },
- { identity: "selection:end", timeSec: 2, frame: 60 },
+ { identity: "selection:start", frame: 30 },
+ { identity: "selection:end", frame: 60 },
],
};
const selection: NarrativeSelectionRef = {
@@ -318,6 +315,20 @@ test("Selection Text consumes explicit Selection, SemanticMap, Style, Motion and
test("the self-described Markup Surfaces compile Style, Motion and all three spatial forms", async () => {
const fixtureModule = { name: "example.text-inputs", version: "1" } as const;
const fixtureDigest = digestOf("example.text-inputs/surface@1");
+ const fixtureSurface = {
+ name: "inputs", tag: "Inputs", mode: "structured",
+ outputs: [
+ svsRecipeType,
+ programSpaceTypes.programSpace,
+ spatialTypes.point,
+ spatialTypes.frame,
+ spatialTypes.path,
+ mediaTypes.fontArtifact,
+ mediaTypes.compositableSurface,
+ textTypes.text,
+ ],
+ implementation: { digest: fixtureDigest },
+ } as const;
const fixtureManifest: ModuleManifest = {
format: "svml.module@1",
name: fixtureModule.name,
@@ -334,22 +345,6 @@ test("the self-described Markup Surfaces compile Style, Motion and all three spa
],
types: [],
capabilities: [],
- surfaces: [{
- name: "inputs",
- tag: "Inputs",
- mode: "structured",
- outputs: [
- svsRecipeType,
- programSpaceTypes.programSpace,
- spatialTypes.point,
- spatialTypes.frame,
- spatialTypes.path,
- mediaTypes.fontArtifact,
- mediaTypes.compositableSurface,
- textTypes.text,
- ],
- implementation: { kind: "trusted-frontend-surface", locator: "example.text-inputs/surface", digest: fixtureDigest },
- }],
producers: [],
};
const closure = createResolvedClosure([
@@ -360,7 +355,7 @@ test("the self-described Markup Surfaces compile Style, Motion and all three spa
fixtureManifest,
]);
const surfaces = new MarkupSurfaceRegistry();
- surfaces.registerStructured(fixtureModule, "inputs", fixtureDigest, ({ element }) => ({
+ surfaces.registerStructured({ module: fixtureModule, declaration: fixtureSurface, handler: ({ element }) => ({
records: [
{
id: "editorial",
@@ -412,11 +407,11 @@ test("the self-described Markup Surfaces compile Style, Motion and all three spa
],
components: [],
fragments: [],
- }));
- surfaces.registerStructured(typographyTrackModuleRef, "style", typographyTrackSurfaceImplementationDigests.style, decodeTypographyStyleSurface);
- surfaces.registerStructured(typographyTrackModuleRef, "motion", typographyTrackSurfaceImplementationDigests.motion, decodeTypographyMotionSurface);
- surfaces.registerStructured(typographyTrackModuleRef, "track", typographyTrackSurfaceImplementationDigests.track, decodeTypographyTrackSurface);
- surfaces.registerStructured(typographyTrackModuleRef, "mask", typographyTrackSurfaceImplementationDigests.mask, decodeTypographyMaskSurface);
+ }) });
+ surfaces.registerStructured({ module: typographyTrackModuleRef, declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "style")!, handler: decodeTypographyStyleSurface });
+ surfaces.registerStructured({ module: typographyTrackModuleRef, declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "motion")!, handler: decodeTypographyMotionSurface });
+ surfaces.registerStructured({ module: typographyTrackModuleRef, declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "track")!, handler: decodeTypographyTrackSurface });
+ surfaces.registerStructured({ module: typographyTrackModuleRef, declaration: typographyTrackMarkupSurfaces.find((item) => item.name === "mask")!, handler: decodeTypographyMaskSurface });
const frontends = new AuthorFrontendRegistry();
frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
@@ -474,8 +469,8 @@ test("the self-described Markup Surfaces compile Style, Motion and all three spa
assert.equal(program.ref.kind, "logical-output");
assert.equal(ordinaryTrack.ref.kind, "logical-output");
assert.equal(track.ref.kind, "logical-output");
- const build = start(compiled.program, compiled.elaboration.graph, sealBuildRequest({
- graph: compiled.elaboration.graph.id,
+ const build = start(compiled.program, compiled.graph, sealBuildRequest({
+ graph: compiled.graph.id,
targets: [
{ output: ordinaryTrack.ref.kind === "logical-output" ? ordinaryTrack.ref.id : "" },
{ output: track.ref.kind === "logical-output" ? track.ref.id : "" },
@@ -578,7 +573,7 @@ test("rich Text lowers ordered glyph layers, boxes, bounded flow, sequences and
id: "rich-text",
items: [
{
- id: "area", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: 150 }, tieBreak: "area",
+ id: "area", span: { startFrame: 0, endFrameExclusive: 150 }, tieBreak: "area",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 80, yPx: 200, widthPx: 720, heightPx: 320 } },
document: { paragraphs: [{
id: "p1",
@@ -593,7 +588,7 @@ test("rich Text lowers ordered glyph layers, boxes, bounded flow, sequences and
motion,
},
{
- id: "path", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: 150 }, tieBreak: "path",
+ id: "path", span: { startFrame: 0, endFrameExclusive: 150 }, tieBreak: "path",
geometry: { kind: "path", path: { contract: "svml.spatial-path@1", commands: [
{ kind: "move", xPx: 100, yPx: 700 },
{ kind: "quadratic", controlX: 540, controlY: 520, xPx: 980, yPx: 700 },
diff --git a/packages/validation/README.md b/packages/validation/README.md
index 7416e89d..5948a4bc 100644
--- a/packages/validation/README.md
+++ b/packages/validation/README.md
@@ -3,15 +3,14 @@
Host-side admission for package-owned semantic Types.
A module owns the meaning of every `TypeRef` it declares. Core always checks the Type's structural
-Schema. When structure is insufficient, the owner may also lock a pure validator implementation in
-its static Manifest using `svml.type-validator@1`. The reference Host registers that exact Type and
-implementation digest here.
+Schema. When structure is insufficient, the owner may also lock a pure validator implementation
+digest in its static Manifest. The reference Host registers that exact Type and implementation
+digest here.
-`validateValue()` runs the owner validator and returns a content-bound validation receipt.
-`admitRecord()` applies the same gate to authored or externally provided Records. `NodeDriver`
-applies it to Producer and Provider results before creating an Event. Core neither executes the
-validator nor learns the domain meaning: it verifies that a required receipt names the exact
-nominal Type, Record digest and validator digest locked by the resolved Module Closure.
+`validateValue()` runs the owner validator as a Host admission gate. `admitRecord()` applies the
+same gate to authored or externally provided Records. `NodeDriver` applies it to Producer and
+Provider results before creating an Event. Core neither executes the validator nor learns the
+domain meaning; admitted Records carry no validation metadata through the graph.
Validators are refinements, not converters. They may accept or reject a value; they may not rewrite
it, create graph edges, select a Provider, read credentials or add author intent. Cross-package
@@ -22,10 +21,9 @@ Type owner Manifest -> nominal Type + Schema + optional validator digest
Producer package -> emits that exact TypeRef
Consumer package -> accepts that exact TypeRef
Host admission -> executes the locked validator
-Core -> verifies graph typing, Schema and receipt bindings
+Core -> verifies graph typing and structural Schema
```
-The current reference registry executes trusted in-process handlers. A validation receipt is a
-content-bound Host assertion, not a cryptographic attestation from arbitrary third-party code.
-Community validator execution still requires the planned code-byte verification, resource limits
-and sandbox/worker boundary. Until then only trusted installed implementations may be registered.
+The current reference registry executes trusted in-process handlers. Community validator execution
+still requires the planned code-byte verification, resource limits and sandbox/worker boundary.
+Until then only trusted installed implementations may be registered.
diff --git a/packages/validation/package.json b/packages/validation/package.json
index a92963a9..ca6ac0c1 100644
--- a/packages/validation/package.json
+++ b/packages/validation/package.json
@@ -8,6 +8,7 @@
".": "./src/index.ts"
},
"dependencies": {
+ "@narratage/component-kit": "workspace:*",
"@narratage/core": "workspace:*",
"@narratage/protocol": "workspace:*"
}
diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.ts
index ce14a148..e31d44e0 100644
--- a/packages/validation/src/index.ts
+++ b/packages/validation/src/index.ts
@@ -1,19 +1,21 @@
import {
isDigest,
- recordDigest,
resolveType,
sealRecord,
- sealTypeValidationReceipt,
validateStoredValue,
verifyRecord,
verifyRecordStructure,
} from "@narratage/core";
+import type {
+ TypeValidatorContext,
+ TypeValidatorHandler,
+ TypeValidatorRegistrar,
+} from "@narratage/component-kit";
import type {
Digest,
ResolvedModuleClosure,
StoredValue,
TypeRef,
- TypeValidationReceipt,
TypedRecord,
} from "@narratage/protocol";
@@ -27,14 +29,7 @@ function sameType(left: TypeRef, right: TypeRef): boolean {
&& left.name === right.name;
}
-export type TypeValidatorContext = {
- readonly type: TypeRef;
- readonly value: StoredValue;
-};
-
-export type TypeValidatorHandler = (
- context: TypeValidatorContext,
-) => void | Promise<void>;
+export type { TypeValidatorContext, TypeValidatorHandler, TypeValidatorRegistrar } from "@narratage/component-kit";
export type TypeValidatorRegistration = {
readonly type: TypeRef;
@@ -46,15 +41,6 @@ export interface TypeValidatorRegistryLike {
resolve(type: TypeRef): TypeValidatorRegistration | undefined;
}
-/** Mutable package-install seam. Type owners register refinements; Core stays type-agnostic. */
-export interface TypeValidatorRegistrar {
- register(
- type: TypeRef,
- implementationDigest: Digest,
- handler: TypeValidatorHandler,
- ): void;
-}
-
export class TypeValidationError extends Error {
readonly code: string;
readonly subject: string | undefined;
@@ -95,10 +81,10 @@ export async function validateValue(
type: TypeRef,
value: StoredValue,
registry: TypeValidatorRegistryLike,
-): Promise<TypeValidationReceipt | undefined> {
+): Promise<void> {
const declaration = resolveType(closure, type);
validateStoredValue(value, declaration.schema, `$validation.${typeKey(type)}`);
- if (declaration.validator === undefined) return undefined;
+ 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));
@@ -126,11 +112,6 @@ export async function validateValue(
typeKey(type),
);
}
- return sealTypeValidationReceipt({
- type,
- recordDigest: recordDigest(type, value),
- validatorDigest: registration.implementationDigest,
- });
}
export async function admitRecord(
@@ -140,16 +121,12 @@ export async function admitRecord(
): Promise<TypedRecord> {
const {
digest: _digest,
- validation: _validation,
...draft
} = record;
const unvalidated = sealRecord(draft);
verifyRecordStructure(closure, unvalidated);
- const validation = await validateValue(closure, record.type, record.value, registry);
- const admitted = sealRecord({
- ...draft,
- ...(validation === undefined ? {} : { validation }),
- });
+ await validateValue(closure, record.type, record.value, registry);
+ const admitted = sealRecord(draft);
verifyRecord(closure, admitted);
return admitted;
}
diff --git a/packages/video-cli/README.md b/packages/video-cli/README.md
index 6b15988e..62215f04 100644
--- a/packages/video-cli/README.md
+++ b/packages/video-cli/README.md
@@ -38,9 +38,9 @@ to contain Narratage's `package.json`.
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. A JSON Runtime Profile
+this checkout without weakening canonical-path source and asset containment. The official JSON Runtime Profile
has the same optional `packageRoot` override while retaining state and Artifacts under its own
-`root`.
+`root`; the generic CLI does not infer that syntax from its suffix.
`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
@@ -89,7 +89,8 @@ 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, Author/Run Frontend, Host-facet, Producer and Validator identities. The Loader does not
+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
diff --git a/packages/video-cli/package.json b/packages/video-cli/package.json
index e61078c1..65f1a904 100644
--- a/packages/video-cli/package.json
+++ b/packages/video-cli/package.json
@@ -13,7 +13,6 @@
"@narratage/local": "workspace:*",
"@narratage/markup": "workspace:*",
"@narratage/package-loader-node": "workspace:*",
- "@narratage/run-markup": "workspace:*",
- "@narratage/source": "workspace:*"
+ "@narratage/workspace-fs-node": "workspace:*"
}
}
diff --git a/packages/video-cli/src/compiler.ts b/packages/video-cli/src/compiler.ts
index b52d7251..eefc191f 100644
--- a/packages/video-cli/src/compiler.ts
+++ b/packages/video-cli/src/compiler.ts
@@ -1,13 +1,13 @@
import type { CliCompilerOptions } from "@narratage/cli";
import { createMarkupNodeCompiler } from "@narratage/compiler-markup-node";
-
-/** Video authoring packages are selected by an explicit package lock; none are implicit here. */
-export const videoBuiltInPackageContributions = [] as const;
+import { NodeFilesystemWorkspace } from "@narratage/workspace-fs-node";
/** Assemble the Markup compiler Host from only the packages selected for this invocation. */
export function createVideoCompiler(options: CliCompilerOptions) {
return createMarkupNodeCompiler(options.packageContributions, {
- ...(options.workspaceRoot === undefined ? {} : { root: options.workspaceRoot }),
- ...(options.assetRoots === undefined ? {} : { assetRoots: options.assetRoots }),
+ workspace: new NodeFilesystemWorkspace({
+ ...(options.workspaceRoot === undefined ? {} : { root: options.workspaceRoot }),
+ ...(options.assetRoots === undefined ? {} : { assetRoots: options.assetRoots }),
+ }),
});
}
diff --git a/packages/video-cli/src/distribution.ts b/packages/video-cli/src/distribution.ts
index a4b35a35..ce0a0485 100644
--- a/packages/video-cli/src/distribution.ts
+++ b/packages/video-cli/src/distribution.ts
@@ -1,26 +1,21 @@
import type { CliDistribution } from "@narratage/cli";
import { fileURLToPath } from "node:url";
-import { extname } from "node:path";
import {
createVideoCompiler,
- videoBuiltInPackageContributions,
} from "./compiler.js";
const packageRoot = import.meta.dirname;
/** Official video authoring and local Runtime-adapter assembly for the generic CLI engine. */
export const videoCliDistribution: CliDistribution = {
- name: "@narratage/video-cli",
packageRoot,
- builtInPackageContributions: videoBuiltInPackageContributions,
- runFrontends: [],
+ bootstrapPackages: [],
createCompiler: createVideoCompiler,
discoverSourcePackages: async (path, options) => {
const { discoverVideoSourcePackages } = await import("./package-selection.js");
return await discoverVideoSourcePackages(path, options);
},
resolveCompilationPackages: async (path) => {
- if (extname(path) !== ".json") return {};
const { runtimeConfigPackageSelection } = await import("@narratage/local/config");
const selection = await runtimeConfigPackageSelection(path, { packageRoot });
return {
@@ -28,9 +23,13 @@ export const videoCliDistribution: CliDistribution = {
...(selection.packageLock === undefined ? {} : { packageLock: selection.packageLock }),
...(selection.runtimePackageLock === undefined ? {} : { runtimePackageLock: selection.runtimePackageLock }),
packageRoot: selection.packageRoot,
- runtimePackages: selection.runtimePackages,
+ runtimeSelection: selection.runtimeSelection,
};
},
+ runtimeProfileRevision: async (path) => {
+ const { runtimeConfigRevision } = await import("@narratage/local/config");
+ return await runtimeConfigRevision(path);
+ },
runtimeWorkerLaunch: () => ({
command: process.execPath,
args: [...process.execArgv, fileURLToPath(new URL("./cli.ts", import.meta.url))],
diff --git a/packages/video-cli/src/index.ts b/packages/video-cli/src/index.ts
index 816ffe88..297df42f 100644
--- a/packages/video-cli/src/index.ts
+++ b/packages/video-cli/src/index.ts
@@ -4,14 +4,13 @@ import {
runCli,
} from "@narratage/cli";
import type { CliIo } from "@narratage/cli";
-import type { NodePackageContribution } from "@narratage/package-loader-node";
+import type { NodePackageBinding } from "@narratage/package-loader-node";
import { videoCliDistribution } from "./distribution.js";
export { materializeArtifact, materializeRecord };
export {
createVideoCompiler,
- videoBuiltInPackageContributions,
} from "./compiler.js";
export { videoCliDistribution } from "./distribution.js";
@@ -23,10 +22,10 @@ export async function createVideoRuntimeFromConfig(path: string) {
export function runVideoCli(
argv: readonly string[],
io: CliIo,
- packageContributions: readonly NodePackageContribution[] = [],
+ packages: readonly NodePackageBinding[] = [],
): Promise<void> {
return runCli(argv, io, {
...videoCliDistribution,
- builtInPackageContributions: packageContributions,
+ bootstrapPackages: packages,
});
}
diff --git a/packages/video-cli/src/package-selection.ts b/packages/video-cli/src/package-selection.ts
index b293f095..efcb64b8 100644
--- a/packages/video-cli/src/package-selection.ts
+++ b/packages/video-cli/src/package-selection.ts
@@ -1,92 +1,28 @@
-import { readFile, realpath } from "node:fs/promises";
-import { dirname, isAbsolute, relative, resolve } from "node:path";
+import { discoverSourcePackages } from "@narratage/cli";
+import {
+ createMarkupAuthorFrontend,
+ MarkupSurfaceRegistry,
+} from "@narratage/markup";
+import type { NodePackageBinding } from "@narratage/package-loader-node";
-import { discoverMarkup, markupAuthorFrontendId } from "@narratage/markup";
-import { parseRunDocument, runMarkupFrontendId } from "@narratage/run-markup";
-import { maskSourceHeader, parseSourceHeader } from "@narratage/source";
+const markupFrontend = createMarkupAuthorFrontend({
+ registry: new MarkupSurfaceRegistry(),
+ resolveModule(request) {
+ throw new Error(`Markup discovery unexpectedly resolved Module ${request.from}`);
+ },
+});
-function isWithin(root: string, path: string): boolean {
- const relation = relative(root, path);
- return relation === "" || (!relation.startsWith("..") && !isAbsolute(relation));
-}
-
-/** Convert a logical `package[/subpath]@version` request to its physical npm package root. */
-function physicalPackage(request: string): string {
- const version = request.lastIndexOf("@");
- if (version <= 0) throw new Error(`Package request ${request} must end in @version`);
- const logical = request.slice(0, version);
- if (logical.startsWith("@")) {
- const slash = logical.indexOf("/", 1);
- if (slash < 0) throw new Error(`Scoped package request ${request} is invalid`);
- const subpath = logical.indexOf("/", slash + 1);
- return subpath < 0 ? logical : logical.slice(0, subpath);
- }
- const subpath = logical.indexOf("/");
- return subpath < 0 ? logical : logical.slice(0, subpath);
-}
-
-function relativeSource(importer: string, request: string): string {
- if (!request.startsWith("./") && !request.startsWith("../")) {
- throw new Error(`Source import ${request} in ${importer} must be relative`);
- }
- return resolve(dirname(importer), request);
-}
-
-/**
- * Official video Distribution package discovery.
- *
- * It reads only Source Headers and import prologues. No component, Provider,
- * Runtime adapter or package activation executes while the new lock is chosen.
- */
+/** Video Distribution bootstrap: generic Source discovery plus the bare Markup Frontend. */
export async function discoverVideoSourcePackages(
sourcePath: string,
- options: { readonly workspaceRoot?: string } = {},
-): Promise<{ readonly selected: readonly string[]; readonly logical: readonly string[] }> {
- const canonicalSource = await realpath(resolve(sourcePath));
- const root = await realpath(resolve(options.workspaceRoot ?? dirname(canonicalSource)));
- if (!isWithin(root, canonicalSource)) throw new Error(`Source ${canonicalSource} is outside workspace root ${root}`);
-
- const selected = new Set<string>();
- const logical = new Set<string>();
- const visited = new Set<string>();
- const discoverAuthor = async (path: string): Promise<void> => {
- const canonical = await realpath(path);
- if (!isWithin(root, canonical)) throw new Error(`Author Source ${canonical} is outside workspace root ${root}`);
- if (visited.has(canonical)) return;
- visited.add(canonical);
- const text = await readFile(canonical, "utf8");
- const name = relative(root, canonical);
- const header = parseSourceHeader(name, text);
- if (header.using !== markupAuthorFrontendId) {
- // Markup is the Distribution's bootstrap Frontend. Every other Frontend
- // is ordinary selected package code and therefore belongs in the lock.
- selected.add(physicalPackage(header.using));
- logical.add(header.using);
- return;
- }
- const discovery = discoverMarkup({ name, text: maskSourceHeader(text, header) });
- for (const item of discovery.imports) {
- if (item.kind === "module") {
- selected.add(physicalPackage(item.from));
- logical.add(item.from);
- }
- else await discoverAuthor(relativeSource(canonical, item.from));
- }
- };
-
- const text = await readFile(canonicalSource, "utf8");
- const header = parseSourceHeader(relative(root, canonicalSource), text);
- if (header.using === runMarkupFrontendId) {
- selected.add(physicalPackage(header.using));
- logical.add(header.using);
- const run = parseRunDocument(relative(root, canonicalSource), maskSourceHeader(text, header));
- for (const item of run.imports) {
- selected.add(physicalPackage(item.from));
- logical.add(item.from);
- }
- await discoverAuthor(relativeSource(canonicalSource, run.author.source));
- } else {
- await discoverAuthor(canonicalSource);
- }
- return { selected: [...selected].sort(), logical: [...logical].sort() };
+ options: {
+ readonly workspaceRoot?: string;
+ readonly packages?: readonly NodePackageBinding[];
+ } = {},
+) {
+ return await discoverSourcePackages(sourcePath, {
+ ...(options.workspaceRoot === undefined ? {} : { workspaceRoot: options.workspaceRoot }),
+ ...(options.packages === undefined ? {} : { packages: options.packages }),
+ bootstrapAuthorFrontends: [markupFrontend],
+ });
}
diff --git a/packages/video-cli/test/cli.test.ts b/packages/video-cli/test/cli.test.ts
index 56394214..a3d73bf1 100644
--- a/packages/video-cli/test/cli.test.ts
+++ b/packages/video-cli/test/cli.test.ts
@@ -29,7 +29,10 @@ test("source package selection is derived from Run and Author imports", async ()
<script id="story"><line><HOST>Hello.</line></script>
</svml>`, "utf8");
const run = await writeRun(root, "build.svrun", [{ output: "story" }]);
- const discovered = await videoCliDistribution.discoverSourcePackages!(run, { workspaceRoot: root });
+ const discovered = await videoCliDistribution.discoverSourcePackages!(run, {
+ workspaceRoot: root,
+ packages: videoTestPackages,
+ });
assert.deepEqual(discovered.selected, ["@narratage/run-markup", "@narratage/script", "@narratage/svs"]);
} finally {
await rm(root, { recursive: true, force: true });
@@ -280,10 +283,10 @@ test("Text Template and exact Seedance keep speaker prompt assembly visible in t
].sort());
});
-test("CLI accepts a declarative Runtime Profile without an executable config module", async () => {
+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, "svml.runtime.json");
- const runtimePackageLock = join(root, "runtime.packages.lock.json");
+ const profile = join(root, "deployment.profile");
+ const runtimePackageLock = join(root, "runtime.packages.lock");
await writeNodePackageLock(
runtimePackageLock,
await createNodePackageLock([
@@ -311,7 +314,6 @@ test("CLI accepts a declarative Runtime Profile without an executable config mod
build: "state.builds",
operations: "state.operations",
dispatch: "state.dispatch",
- journal: "state.journal",
artifacts: "artifacts",
credentials: ["credentials"],
},
@@ -414,17 +416,14 @@ test("CLI package lock activates an installed package without changing the offic
const digest = ${JSON.stringify(implementationDigest)};
export default {
format: "svml.node-package@1",
- name: "example-empty",
modules: [{ manifest: {
format: "svml.module@1", name: module.name, version: module.version,
dependencies: [], types: [], capabilities: [], producers: [],
- surfaces: [{ name: "empty", tag: "Empty", mode: "structured", outputs: [],
- implementation: { kind: "trusted-frontend-surface", locator: "example/empty", digest } }],
}, specifiers: ["example.empty@1"] }],
hostFacets: [{
abi: "svml.markup-surface-host@1",
- identity: { contract: "svml.markup-surface-host-facet@1", module, surface: "empty",
- mode: "structured", implementationDigest: digest },
+ identity: { module, surface: "empty",
+ tag: "Empty", outputs: [], mode: "structured", implementationDigest: digest },
implementation() { return { records: [], components: [], fragments: [] }; },
}],
};
@@ -437,7 +436,7 @@ test("CLI package lock activates an installed package without changing the offic
svml: { activation: "./activation.mjs" },
}), "utf8");
await writeFile(join(installedExtra, "activation.mjs"), `
- export default { format: "svml.node-package@1", name: "example-extra" };
+ export default { format: "svml.node-package@1" };
`, "utf8");
const file = join(projectRoot, "main.svml");
const lockPath = join(projectRoot, "svml.packages.lock");
@@ -539,7 +538,7 @@ test("CLI package lock activates an installed package without changing the offic
mutationOutput = "";
await writeFile(join(installedExtra, "activation.mjs"), `
- export default { format: "svml.node-package@1", name: "example-extra" };
+ 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], {
@@ -674,7 +673,13 @@ test("CLI inspect and get read the durable Build archive independently of build
const state = {
id: buildDigest,
status: "active",
- graph: { id: `sha256:${"4".repeat(64)}` },
+ 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" }],
@@ -698,7 +703,7 @@ test("CLI inspect and get read the durable Build archive independently of build
type: { module: { name: "example", version: "1" }, name: "Evidence" },
value: { kind: "inline", value: {
words: [],
- rawEvidenceArtifact: { kind: "blob", digest: rawDigest, size: rawBytes.byteLength, mediaType: "application/json" },
+ explicitReferenceArtifact: { kind: "blob", digest: rawDigest, size: rawBytes.byteLength, mediaType: "application/json" },
} },
digest: `sha256:${"5".repeat(64)}`,
origin: { kind: "authored", module: "example" },
@@ -715,15 +720,12 @@ test("CLI inspect and get read the durable Build archive independently of build
run: { path: join(root, "delivery.svrun") },
aliases: [{
name: "final.video",
- type: state.records[0]!.type,
ref: { kind: "logical-output", id: "logical:final" },
}, {
name: "timing.rawEvidence",
- type: state.records[1]!.type,
ref: { kind: "record", id: "record:whisperx" },
}, {
name: "unused.image",
- type: state.records[0]!.type,
ref: { kind: "logical-output", id: "logical:unused" },
}],
createdAt: 100,
@@ -770,6 +772,7 @@ test("CLI inspect and get read the durable Build archive independently of build
async close() {},
};
const selected = {
+ runtimeProfileRevision: async () => "test-revision",
createRuntimeControlFromConfig: async () => control,
} as unknown as CliDistribution;
const runArchiveCli = (
diff --git a/packages/video-cli/test/packages.ts b/packages/video-cli/test/packages.ts
index 43fbedd8..6b6d27be 100644
--- a/packages/video-cli/test/packages.ts
+++ b/packages/video-cli/test/packages.ts
@@ -30,39 +30,42 @@ import visualIr from "../../visual-ir/src/activation.js";
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";
+
+const bind = (specifier: string, contribution: NodePackageContribution) => ({ specifier, contribution });
/** Test-only explicit environment; production video CLI starts with no author packages. */
export const videoTestPackages = [
- artifact,
- narrative,
- media,
- programSpace,
- speech,
- speechEvidence,
- semanticMap,
- visualIr,
- composition,
- svs,
- script,
- estimate,
- fontsOpen,
- text,
- generation,
- seedance,
- caption,
- captionFine,
- captionGemini,
- speechAlignment,
- speechBasis,
- speechSpine,
- whisperX,
- spatial,
- temporal,
- mediaTrack,
- typographyTrack,
- film,
- hyperframes,
- mediaPipeline,
- renderHyperframes,
- runMarkup,
+ bind("@narratage/artifact", artifact),
+ bind("@narratage/narrative", narrative),
+ bind("@narratage/media", media),
+ bind("@narratage/program-space", programSpace),
+ bind("@narratage/speech", speech),
+ bind("@narratage/speech-evidence", speechEvidence),
+ bind("@narratage/semantic-map", semanticMap),
+ bind("@narratage/visual-ir", visualIr),
+ bind("@narratage/composition", composition),
+ bind("@narratage/svs", svs),
+ bind("@narratage/script", script),
+ bind("@narratage/estimate", estimate),
+ bind("@narratage/fonts-open", fontsOpen),
+ bind("@narratage/text", text),
+ bind("@narratage/generation", generation),
+ bind("@narratage/seedance", seedance),
+ bind("@narratage/caption", caption),
+ bind("@narratage/caption-fine", captionFine),
+ bind("@narratage/caption-gemini", captionGemini),
+ bind("@narratage/speech-alignment", speechAlignment),
+ bind("@narratage/speech-basis", speechBasis),
+ bind("@narratage/speech-spine", speechSpine),
+ bind("@narratage/whisperx", whisperX),
+ bind("@narratage/spatial", spatial),
+ bind("@narratage/temporal", temporal),
+ bind("@narratage/media-track", mediaTrack),
+ bind("@narratage/typography-track", typographyTrack),
+ bind("@narratage/film", film),
+ bind("@narratage/hyperframes", hyperframes),
+ bind("@narratage/media-pipeline", mediaPipeline),
+ bind("@narratage/render-hyperframes", renderHyperframes),
+ bind("@narratage/run-markup", runMarkup),
] as const;
diff --git a/packages/visual-ir/src/activation.ts b/packages/visual-ir/src/activation.ts
index e08762ea..06aa118a 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, name: "@narratage/visual-ir", modules: [{ manifest: visualIrManifest }] };
+export const svmlPackage = { format: "svml.node-package@1" as const, modules: [{ manifest: visualIrManifest }] };
export default svmlPackage;
diff --git a/packages/visual-ir/src/index.ts b/packages/visual-ir/src/index.ts
index 356c1a4d..1e10b64a 100644
--- a/packages/visual-ir/src/index.ts
+++ b/packages/visual-ir/src/index.ts
@@ -4,6 +4,6 @@ export { assertVisualStyleV1, VISUAL_IR_V1, VISUAL_STYLE_ENUM_VALUES_V1, VISUAL_
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,
- dependencies: [], types: [], capabilities: [], surfaces: [], producers: [] };
+ dependencies: [], types: [], capabilities: [], producers: [] };
export const visualIrManifestDigest = digestOf(visualIrManifest);
export const visualIrDependency = { module: visualIrModuleRef, digest: visualIrManifestDigest } as const;
diff --git a/packages/whisperx/README.md b/packages/whisperx/README.md
index 9af5b809..0dd7f7f8 100644
--- a/packages/whisperx/README.md
+++ b/packages/whisperx/README.md
@@ -1,18 +1,18 @@
# @narratage/whisperx
Explicit WhisperX model-family capability for the official speech program. Importing this package
-selects WhisperX; Runtime registration only binds the resulting `WhisperXAlignmentEvidence` Need to
+selects WhisperX; Runtime registration only binds the resulting alignment Need to
a concrete WhisperX execution endpoint such as a trusted local worker or hosted service.
The package contains no credentials, Python environment or queue. Providers translate the typed
-request constraints and return the canonical WhisperX result contract. A deterministic Producer
-then lowers that result to provider-neutral `AlignedTranscriptEvidence`.
+request constraints directly into provider-neutral `AlignedTranscriptEvidence`. There is no
+vendor-shaped Evidence wrapper or pass-through normalization node in the graph.
-The request Producer consumes only canonical `SpeechEvidenceAudio`, never the visual SpeechBasis
-projection and never an arbitrary container audio stream. `@narratage/media-pipeline` first requests the
-explicit 48 kHz stereo speech-master → 16 kHz mono evidence projection. That Record binds the
-zero-origin rational sample map and exact evidence bytes. The Producer Derivation binds the source
-SpeechAudioBasis; the Need and Receipt bind the exact evidence-audio request to the accepted result.
+The request Producer consumes canonical `SpeechEvidenceAudio` bytes plus a separate
+`SpeechAudioBasis` edge. `@narratage/media-pipeline` first requests the explicit 48 kHz stereo
+speech-master → 16 kHz mono evidence projection. The evidence Record carries only the normalized
+Artifact and exact sample count; Segment truth comes from the Basis edge instead of being copied
+through an intermediate media value. The Derivation and Need bind all three steps.
`@narratage/provider-whisperx-local` is the first concrete adapter; it validates and stages those bytes
unchanged for a warm loopback service.
diff --git a/packages/whisperx/src/activation.ts b/packages/whisperx/src/activation.ts
index ccf8ecb3..e22d65ed 100644
--- a/packages/whisperx/src/activation.ts
+++ b/packages/whisperx/src/activation.ts
@@ -1,17 +1,17 @@
import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
- decodeWhisperXAlignmentSurface, whisperXComponent, whisperXImplementationDigests,
+ decodeWhisperXAlignmentSurface, whisperXComponent,
whisperXManifest, whisperXModuleRef,
+ whisperXMarkupSurfaces,
} from "./index.js";
export const svmlPackage = {
format: "svml.node-package@1" as const,
- name: "@narratage/whisperx",
- modules: [{ manifest: whisperXManifest, specifiers: ["@narratage/whisperx", "@narratage/whisperx@1"] }],
+ modules: [{ manifest: whisperXManifest }],
components: [whisperXComponent],
hostFacets: [createMarkupSurfaceHostFacet({
- module: whisperXModuleRef, surface: "alignment", mode: "structured",
- implementationDigest: whisperXImplementationDigests.surface,
+ module: whisperXModuleRef,
+ declaration: whisperXMarkupSurfaces.find((item) => item.name === "alignment")!,
handler: decodeWhisperXAlignmentSurface,
})],
};
diff --git a/packages/whisperx/src/component.ts b/packages/whisperx/src/component.ts
index 510cc290..376b395c 100644
--- a/packages/whisperx/src/component.ts
+++ b/packages/whisperx/src/component.ts
@@ -1,17 +1,13 @@
import type { ComponentPackage } from "@narratage/component-kit";
-import type { SpeechEvidenceAudio } from "@narratage/speech";
+import type { SpeechAudioBasis, SpeechEvidenceAudio } from "@narratage/speech";
import type { CanonicalValue, StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
-import {
- normalizeWhisperXAlignment,
- whisperXRequestForEvidenceAudio,
-} from "./evidence.js";
+import { whisperXRequestForEvidenceAudio } from "./evidence.js";
import {
whisperXImplementationDigests,
whisperXProducers,
} from "./manifest.js";
-import type { WhisperXAlignmentEvidence } from "./types.js";
function inline(value: StoredValue, subject: string): CanonicalValue {
if (value.kind !== "inline") throw new Error(`${subject} must be inline`);
@@ -19,29 +15,16 @@ function inline(value: StoredValue, subject: string): CanonicalValue {
}
export const whisperXComponent = {
- name: "@narratage/whisperx",
producers: [
{
producer: whisperXProducers.request,
implementationDigest: whisperXImplementationDigests.request,
handler: ({ inputs }) => {
- const audio = inline(inputs.audio!.value, "SpeechEvidenceAudio") as unknown as SpeechEvidenceAudio;
+ const evidence = inline(inputs.evidence!.value, "SpeechEvidenceAudio") as unknown as SpeechEvidenceAudio;
+ const audio = inline(inputs.audio!.value, "SpeechAudioBasis") as unknown as SpeechAudioBasis;
return {
outputs: {},
- needs: { alignment: canonicalize(whisperXRequestForEvidenceAudio(audio)) },
- };
- },
- },
- {
- producer: whisperXProducers.normalize,
- implementationDigest: whisperXImplementationDigests.normalize,
- handler: ({ inputs }) => {
- const evidence = inline(inputs.whisperx!.value, "WhisperXAlignmentEvidence") as unknown as WhisperXAlignmentEvidence;
- return {
- outputs: {
- evidence: { kind: "inline", value: canonicalize(normalizeWhisperXAlignment(evidence)) },
- },
- needs: {},
+ needs: { alignment: canonicalize(whisperXRequestForEvidenceAudio(evidence, audio)) },
};
},
},
diff --git a/packages/whisperx/src/evidence.ts b/packages/whisperx/src/evidence.ts
index 41715e6e..0efe568f 100644
--- a/packages/whisperx/src/evidence.ts
+++ b/packages/whisperx/src/evidence.ts
@@ -1,46 +1,20 @@
import { assertSpeechEvidenceAudioIdentity } from "@narratage/speech";
-import type { SpeechEvidenceAudio } from "@narratage/speech";
-import { sealAlignedTranscriptEvidence } from "@narratage/speech-evidence";
-import type { AlignedTranscriptEvidence } from "@narratage/speech-evidence";
-
-import type {
- WhisperXAlignmentEvidence,
- WhisperXAlignmentRequest,
- WhisperXEvidenceContent,
-} from "./types.js";
+import { assertSpeechAudioBasisIdentity } from "@narratage/speech";
+import type { SpeechAudioBasis, SpeechEvidenceAudio } from "@narratage/speech";
+import type { WhisperXAlignmentRequest } from "./types.js";
export function whisperXRequestForEvidenceAudio(
- basis: SpeechEvidenceAudio,
+ evidence: SpeechEvidenceAudio,
+ basis: SpeechAudioBasis,
options: { readonly language?: string } = {},
): WhisperXAlignmentRequest {
- assertSpeechEvidenceAudioIdentity(basis);
+ assertSpeechEvidenceAudioIdentity(evidence);
+ assertSpeechAudioBasisIdentity(basis);
return {
contract: "svml.whisperx-alignment-request@1",
- audio: basis.artifact,
- sampleFrames: basis.sampleFrames,
- durationSec: basis.durationSec,
+ audio: evidence.artifact,
+ sampleFrames: evidence.sampleFrames,
segments: basis.segments,
...(options.language === undefined ? {} : { language: options.language }),
- wordAlignment: true,
- characterAlignment: "when-available",
};
}
-
-export function sealWhisperXAlignmentEvidence(
- content: WhisperXEvidenceContent,
-): WhisperXAlignmentEvidence {
- return structuredClone(content);
-}
-
-export function normalizeWhisperXAlignment(
- evidence: WhisperXAlignmentEvidence,
-): AlignedTranscriptEvidence {
- const {
- contract: _contract,
- ...shared
- } = evidence;
- return sealAlignedTranscriptEvidence({
- contract: "svml.aligned-transcript-evidence@1",
- ...shared,
- });
-}
diff --git a/packages/whisperx/src/fragment.ts b/packages/whisperx/src/fragment.ts
index 25062923..fab0bd9a 100644
--- a/packages/whisperx/src/fragment.ts
+++ b/packages/whisperx/src/fragment.ts
@@ -6,14 +6,13 @@ import { sealGraphFragment } from "@narratage/elaborator";
import { mediaPipelineProducers } from "@narratage/media-pipeline";
import { speechAlignmentProducers } from "@narratage/speech-alignment";
-import { whisperXProducers, whisperXTypes } from "./manifest.js";
+import { whisperXProducers } from "./manifest.js";
const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
/** One measured acoustic pass followed by provider-neutral deterministic Script alignment. */
export const whisperXSpeechAlignmentFragment = sealGraphFragment({
- name: "@narratage/whisperx/speech-alignment@1",
inputs: [
{ name: "narrative", type: narrativeTypes.narrative },
{ name: "audio", type: speechTypes.audioBasis },
@@ -28,32 +27,21 @@ export const whisperXSpeechAlignmentFragment = sealGraphFragment({
{
id: "request-whisperx",
producer: whisperXProducers.request,
- inputs: { audio: operation("prepare-evidence-audio") },
+ inputs: { evidence: operation("prepare-evidence-audio"), audio: input("audio") },
result: { kind: "need", name: "alignment" },
},
- {
- id: "normalize-evidence",
- producer: whisperXProducers.normalize,
- inputs: { whisperx: operation("request-whisperx") },
- result: { kind: "output", name: "evidence" },
- },
{
id: "locate-speech",
producer: speechAlignmentProducers.locate,
- inputs: { narrative: input("narrative"), audio: input("audio"), evidence: operation("normalize-evidence") },
+ inputs: { narrative: input("narrative"), audio: input("audio"), evidence: operation("request-whisperx") },
result: { kind: "output", name: "map" },
},
],
exports: [
- {
- name: "rawEvidence",
- type: whisperXTypes.alignmentEvidence,
- root: operation("request-whisperx"),
- },
{
name: "evidence",
type: speechEvidenceTypes.alignedTranscript,
- root: operation("normalize-evidence"),
+ root: operation("request-whisperx"),
},
{
name: "map",
diff --git a/packages/whisperx/src/index.ts b/packages/whisperx/src/index.ts
index 8c0fa497..4357351e 100644
--- a/packages/whisperx/src/index.ts
+++ b/packages/whisperx/src/index.ts
@@ -2,19 +2,13 @@ export {
whisperXComponent,
} from "./component.js";
export { whisperXSpeechAlignmentFragment } from "./fragment.js";
+export { whisperXRequestForEvidenceAudio } from "./evidence.js";
export {
- normalizeWhisperXAlignment,
- sealWhisperXAlignmentEvidence,
- whisperXRequestForEvidenceAudio,
-} from "./evidence.js";
-export {
- whisperXAlignmentEvidenceSchema,
whisperXCapabilities,
whisperXImplementationDigests,
- whisperXManifest,
+ whisperXManifest, whisperXMarkupSurfaces,
whisperXModuleRef,
whisperXProducers,
- whisperXTypes,
} 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 316ce8ea..2aafb9fc 100644
--- a/packages/whisperx/src/manifest.ts
+++ b/packages/whisperx/src/manifest.ts
@@ -1,37 +1,33 @@
import { speechDependency, speechTypes } from "@narratage/speech";
-import { alignedTranscriptEvidenceFields, speechEvidenceDependency, speechEvidenceTypes } from "@narratage/speech-evidence";
+import { speechEvidenceDependency, speechEvidenceTypes } from "@narratage/speech-evidence";
import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
import { digestOf } from "@narratage/protocol";
-import type { CapabilityRef, ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
+import type { CapabilityRef, ModuleManifest, ProducerRef } from "@narratage/protocol";
import { mediaPipelineManifest, mediaPipelineModuleRef } from "@narratage/media-pipeline";
import { speechAlignmentManifest, speechAlignmentModuleRef } from "@narratage/speech-alignment";
export const whisperXModuleRef = { name: "@narratage/whisperx", version: "1" } as const;
-export const whisperXTypes = {
- alignmentEvidence: { module: whisperXModuleRef, name: "WhisperXAlignmentEvidence" },
-} satisfies Record<string, TypeRef>;
export const whisperXCapabilities = {
alignment: { module: whisperXModuleRef, name: "whisperx-alignment" },
} satisfies Record<string, CapabilityRef>;
export const whisperXProducers = {
request: { module: whisperXModuleRef, name: "request-whisperx-alignment" },
- normalize: { module: whisperXModuleRef, name: "normalize-whisperx-alignment" },
} satisfies Record<string, ProducerRef>;
export const whisperXImplementationDigests = {
request: digestOf("@narratage/whisperx/request@1"),
- normalize: digestOf("@narratage/whisperx/normalize@1"),
surface: digestOf("@narratage/whisperx/alignment-surface@1"),
};
-const { contract: _commonContract, ...sharedEvidenceFields } =
- alignedTranscriptEvidenceFields;
-export const whisperXAlignmentEvidenceSchema: ValueSchema = {
- kind: "object",
- fields: {
- contract: { schema: { kind: "literal", value: "svml.whisperx-alignment-evidence@1" } },
- ...sharedEvidenceFields,
- },
-};
+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",
@@ -44,48 +40,27 @@ export const whisperXManifest: ModuleManifest = {
{ module: mediaPipelineModuleRef, digest: digestOf(mediaPipelineManifest) },
{ module: speechAlignmentModuleRef, digest: digestOf(speechAlignmentManifest) },
],
- types: [{ name: whisperXTypes.alignmentEvidence.name, schema: whisperXAlignmentEvidenceSchema }],
+ types: [],
capabilities: [{
name: whisperXCapabilities.alignment.name,
- returns: whisperXTypes.alignmentEvidence,
- }],
- surfaces: [{
- name: "alignment",
- tag: "Alignment",
- mode: "structured",
- outputs: [whisperXTypes.alignmentEvidence, speechEvidenceTypes.alignedTranscript, semanticMapTypes.complete],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/whisperx/alignment-surface",
- digest: whisperXImplementationDigests.surface,
- },
+ returns: speechEvidenceTypes.alignedTranscript,
}],
producers: [
{
name: whisperXProducers.request.name,
- inputs: [{ name: "audio", type: speechTypes.evidenceAudio }],
+ inputs: [
+ { name: "evidence", type: speechTypes.evidenceAudio },
+ { name: "audio", type: speechTypes.audioBasis },
+ ],
outputs: [],
needs: [{
name: "alignment",
capability: whisperXCapabilities.alignment,
- returns: whisperXTypes.alignmentEvidence,
+ returns: speechEvidenceTypes.alignedTranscript,
}],
implementation: {
- kind: "registered",
- locator: "@narratage/whisperx/request",
digest: whisperXImplementationDigests.request,
},
},
- {
- name: whisperXProducers.normalize.name,
- inputs: [{ name: "whisperx", type: whisperXTypes.alignmentEvidence }],
- outputs: [{ name: "evidence", type: speechEvidenceTypes.alignedTranscript }],
- needs: [],
- implementation: {
- kind: "registered",
- locator: "@narratage/whisperx/normalize",
- digest: whisperXImplementationDigests.normalize,
- },
- },
],
};
diff --git a/packages/whisperx/src/surface.ts b/packages/whisperx/src/surface.ts
index 343abbbd..9aa998e7 100644
--- a/packages/whisperx/src/surface.ts
+++ b/packages/whisperx/src/surface.ts
@@ -54,7 +54,6 @@ export const decodeWhisperXAlignmentSurface: StructuredSurfaceHandler = ({ eleme
fragment: whisperXSpeechAlignmentFragment.id,
inputs: { narrative: narrative.ref, audio: audio.ref },
outputs: {
- rawEvidence: `${id}.rawEvidence`,
evidence: `${id}.evidence`,
map: `${id}.map`,
},
diff --git a/packages/whisperx/src/types.ts b/packages/whisperx/src/types.ts
index 1630007e..7de45100 100644
--- a/packages/whisperx/src/types.ts
+++ b/packages/whisperx/src/types.ts
@@ -1,22 +1,10 @@
import type { SpeechBasisSegment, SpeechEvidenceAudio } from "@narratage/speech";
-import type { AlignedTranscriptEvidence, AlignedTranscriptSegment } from "@narratage/speech-evidence";
+import type { AlignedTranscriptSegment } from "@narratage/speech-evidence";
export type WhisperXAlignmentRequest = {
readonly contract: "svml.whisperx-alignment-request@1";
readonly audio: SpeechEvidenceAudio["artifact"];
readonly sampleFrames: number;
- readonly durationSec: number;
readonly segments: readonly SpeechBasisSegment[];
readonly language?: string;
- readonly wordAlignment: true;
- readonly characterAlignment: "when-available";
};
-
-export type WhisperXAlignmentEvidence = {
- readonly contract: "svml.whisperx-alignment-evidence@1";
- readonly durationSec: number;
- readonly segments: readonly AlignedTranscriptSegment[];
-};
-
-export type WhisperXEvidenceContent = WhisperXAlignmentEvidence;
-export type ProviderNeutralEvidenceContent = AlignedTranscriptEvidence;
diff --git a/packages/whisperx/test/whisperx.test.ts b/packages/whisperx/test/whisperx.test.ts
index 18573973..738df04f 100644
--- a/packages/whisperx/test/whisperx.test.ts
+++ b/packages/whisperx/test/whisperx.test.ts
@@ -4,15 +4,13 @@ import {
import type { ProducerRegistrar } from "@narratage/component-kit";
import { sealProgramSpace } from "@narratage/program-space";
import { sealSpeechBasis, sealSpeechEvidenceAudio } from "@narratage/speech";
-import type { SpeechBasis, SpeechEvidenceAudio } from "@narratage/speech";
+import type { SpeechAudioBasis, SpeechBasis, SpeechEvidenceAudio } from "@narratage/speech";
import assert from "node:assert/strict";
import test from "node:test";
import { digestOf } from "@narratage/protocol";
import type { Digest, ProducerRef } from "@narratage/protocol";
import {
- normalizeWhisperXAlignment,
- sealWhisperXAlignmentEvidence,
whisperXComponent,
whisperXProducers,
whisperXRequestForEvidenceAudio,
@@ -42,47 +40,26 @@ function evidenceAudio(basis: SpeechBasis): SpeechEvidenceAudio {
size: 32_044,
mediaType: "audio/wav",
},
- codec: "pcm_s16le",
- sampleRate: 16_000,
- channels: 1,
sampleFrames: 16_000,
- durationSec: 1,
- segments: basis.segments,
- sampleMap: {
- algorithm: "rational-boundary-round@1",
- sourceSampleRate: 48_000,
- evidenceSampleRate: 16_000,
- sourceSampleFrames: 48_000,
- evidenceSampleFrames: 16_000,
- sourceOriginSample: 0,
- evidenceOriginSample: 0,
- },
});
}
-test("WhisperX consumes only the canonical 16 kHz evidence projection", () => {
- const valid = evidenceAudio(basis());
- assert.equal(whisperXRequestForEvidenceAudio(valid).audio.digest, valid.artifact.digest);
- const tampered = { ...valid, sampleFrames: 16_001 };
- assert.throws(() => whisperXRequestForEvidenceAudio(tampered), /sample map|digest/u);
-});
+function audioBasis(value: SpeechBasis): SpeechAudioBasis {
+ return {
+ contract: "svml.speech-audio-basis@1",
+ programSpace: value.programSpace,
+ audio: value.audio,
+ segments: value.segments,
+ };
+}
-test("WhisperX normalization lowers model-specific evidence without leaking provider metadata", () => {
- const measured = sealWhisperXAlignmentEvidence({
- contract: "svml.whisperx-alignment-evidence@1",
- durationSec: 1,
- segments: [{
- sourceSegmentId: "line",
- startSec: 0,
- endSec: 1,
- words: [{ text: "hello", startSec: 0.1, endSec: 0.4 }],
- chars: [],
- }],
- });
- const normalized = normalizeWhisperXAlignment(measured);
- assert.equal(normalized.contract, "svml.aligned-transcript-evidence@1");
- assert.equal("engine" in normalized, false);
- assert.deepEqual(normalized.segments, measured.segments);
+test("WhisperX receives normalized bytes and Segment truth through separate graph inputs", () => {
+ const source = basis();
+ const valid = evidenceAudio(source);
+ const request = whisperXRequestForEvidenceAudio(valid, audioBasis(source));
+ assert.equal(request.audio.digest, valid.artifact.digest);
+ assert.deepEqual(request.segments, source.segments);
+ assert.equal(request.sampleFrames, 16_000);
});
test("WhisperX installs into the host-neutral compute port without a Node Driver", () => {
@@ -95,8 +72,5 @@ test("WhisperX installs into the host-neutral compute port without a Node Driver
registerProducerFacets(registrar, whisperXComponent.producers);
- assert.deepEqual(registrations.map((item) => item.producer), [
- whisperXProducers.request,
- whisperXProducers.normalize,
- ]);
+ assert.deepEqual(registrations.map((item) => item.producer), [whisperXProducers.request]);
});
diff --git a/packages/workspace-fs-node/README.md b/packages/workspace-fs-node/README.md
index ee2023b5..c82af280 100644
--- a/packages/workspace-fs-node/README.md
+++ b/packages/workspace-fs-node/README.md
@@ -1,6 +1,6 @@
# `@narratage/workspace-fs-node`
-Default Node filesystem implementation of the host-neutral `Workspace` contract.
+Reference Node filesystem implementation of the host-neutral `Workspace` contract.
Every `open()` call creates one isolated compilation session. It canonicalizes real paths, confines
SourceUnit and Source Asset reads to the configured root, rejects symlink escapes, locks each edge
diff --git a/packages/workspace-fs-node/package.json b/packages/workspace-fs-node/package.json
index 0cb6666c..80e78fd0 100644
--- a/packages/workspace-fs-node/package.json
+++ b/packages/workspace-fs-node/package.json
@@ -8,8 +8,8 @@
".": "./src/index.ts"
},
"dependencies": {
- "@narratage/elaborator": "workspace:*",
- "@narratage/host": "workspace:*",
- "@narratage/protocol": "workspace:*"
+ "@narratage/workspace": "workspace:*",
+ "@narratage/protocol": "workspace:*",
+ "@narratage/source": "workspace:*"
}
}
diff --git a/packages/workspace-fs-node/src/workspace.ts b/packages/workspace-fs-node/src/workspace.ts
index 88453568..527046b9 100644
--- a/packages/workspace-fs-node/src/workspace.ts
+++ b/packages/workspace-fs-node/src/workspace.ts
@@ -4,16 +4,16 @@ import { readFile, realpath } from "node:fs/promises";
import { dirname, isAbsolute, relative, resolve } from "node:path";
import type {
- AuthorSourceAssetRequest,
- AuthorSourceImport,
- AuthorSourceUnit,
-} from "@narratage/elaborator";
+ SourceAssetRequest,
+ SourceImportRequest,
+ SourceUnit,
+} from "@narratage/source";
import type {
ArtifactAttachment,
Workspace,
WorkspaceSession,
-} from "@narratage/host";
-import { WorkspaceError } from "@narratage/host";
+} from "@narratage/workspace";
+import { WorkspaceError } from "@narratage/workspace";
import type { BlobRef } from "@narratage/protocol";
function isWithin(root: string, path: string): boolean {
@@ -23,15 +23,15 @@ function isWithin(root: string, path: string): boolean {
class NodeFilesystemWorkspaceSession implements WorkspaceSession {
readonly root: string;
- readonly entry: AuthorSourceUnit;
+ readonly entry: SourceUnit;
readonly #assetRoots: readonly string[];
- readonly #sourceCache = new Map<string, AuthorSourceUnit>();
- readonly #sourceEdges = new Map<string, AuthorSourceUnit>();
+ readonly #sourceCache = new Map<string, SourceUnit>();
+ readonly #sourceEdges = new Map<string, SourceUnit>();
readonly #assetIdentity = new Map<string, { readonly digest: BlobRef["digest"]; readonly size: number }>();
readonly #assetEdges = new Map<string, string>();
readonly #attachments = new Map<string, ArtifactAttachment>();
- private constructor(root: string, entry: AuthorSourceUnit, assetRoots: readonly string[]) {
+ private constructor(root: string, entry: SourceUnit, assetRoots: readonly string[]) {
this.root = root;
this.entry = entry;
this.#assetRoots = assetRoots;
@@ -53,7 +53,7 @@ class NodeFilesystemWorkspaceSession implements WorkspaceSession {
canonicalEntry,
);
}
- const entry: AuthorSourceUnit = {
+ const entry: SourceUnit = {
id: canonicalEntry,
name: relative(root, canonicalEntry) || canonicalEntry.split("/").at(-1) || canonicalEntry,
text: await readFile(canonicalEntry, "utf8"),
@@ -61,7 +61,7 @@ class NodeFilesystemWorkspaceSession implements WorkspaceSession {
return new NodeFilesystemWorkspaceSession(root, entry, [root, ...assetRoots]);
}
- async #loadSource(path: string): Promise<AuthorSourceUnit> {
+ async #loadSource(path: string): Promise<SourceUnit> {
const canonical = await realpath(resolve(path));
if (!isWithin(this.root, canonical)) {
throw new WorkspaceError(
@@ -72,7 +72,7 @@ class NodeFilesystemWorkspaceSession implements WorkspaceSession {
}
const cached = this.#sourceCache.get(canonical);
if (cached !== undefined) return cached;
- const unit: AuthorSourceUnit = {
+ const unit: SourceUnit = {
id: canonical,
name: relative(this.root, canonical) || canonical.split("/").at(-1) || canonical,
text: await readFile(canonical, "utf8"),
@@ -82,9 +82,9 @@ class NodeFilesystemWorkspaceSession implements WorkspaceSession {
}
readonly resolveSource = async (
- importer: AuthorSourceUnit,
- request: AuthorSourceImport,
- ): Promise<AuthorSourceUnit> => {
+ importer: SourceUnit,
+ request: SourceImportRequest,
+ ): Promise<SourceUnit> => {
if (!request.from.startsWith("./") && !request.from.startsWith("../")) {
throw new WorkspaceError(
"UNSUPPORTED_SOURCE_IMPORT",
@@ -104,8 +104,8 @@ class NodeFilesystemWorkspaceSession implements WorkspaceSession {
};
readonly resolveAsset = async (
- importer: AuthorSourceUnit,
- request: AuthorSourceAssetRequest,
+ importer: SourceUnit,
+ request: SourceAssetRequest,
) => {
if (!request.from.startsWith("./") && !request.from.startsWith("../")) {
throw new WorkspaceError(
diff --git a/packages/workspace/README.md b/packages/workspace/README.md
new file mode 100644
index 00000000..1f5872f9
--- /dev/null
+++ b/packages/workspace/README.md
@@ -0,0 +1,4 @@
+# `@narratage/workspace`
+
+Replaceable Author/Run source and asset sessions. Filesystem, browser, Git, memory and remote
+implementations can provide the same port without entering Core or the generic Host-facet package.
diff --git a/packages/workspace/package.json b/packages/workspace/package.json
new file mode 100644
index 00000000..63356fe8
--- /dev/null
+++ b/packages/workspace/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "@narratage/workspace",
+ "version": "0.0.0-dev",
+ "license": "SEE LICENSE IN LICENSE",
+ "private": true,
+ "type": "module",
+ "exports": {
+ ".": "./src/index.ts"
+ },
+ "dependencies": {
+ "@narratage/protocol": "workspace:*",
+ "@narratage/source": "workspace:*"
+ }
+}
diff --git a/packages/workspace/src/index.ts b/packages/workspace/src/index.ts
new file mode 100644
index 00000000..523ebb6f
--- /dev/null
+++ b/packages/workspace/src/index.ts
@@ -0,0 +1,38 @@
+import type {
+ Awaitable,
+ SourceAssetResolver,
+ SourceResolver,
+ SourceUnit,
+} from "@narratage/source";
+import type { BlobRef } from "@narratage/protocol";
+
+/** Repeatably openable transfer bytes admitted by the selected Workspace. */
+export type ArtifactAttachment = {
+ readonly artifact: BlobRef;
+ open(): Awaitable<AsyncIterable<Uint8Array>>;
+};
+
+/** One isolated, read-once definition session for exactly one compilation. */
+export interface WorkspaceSession {
+ readonly entry: SourceUnit;
+ readonly resolveSource: SourceResolver;
+ readonly resolveAsset: SourceAssetResolver;
+ attachments(): Awaitable<readonly ArtifactAttachment[]>;
+}
+
+/** Replaceable definition environment: filesystem, browser, Git, memory or remote workspace. */
+export interface Workspace {
+ open(entryLocator: string): Awaitable<WorkspaceSession>;
+}
+
+export class WorkspaceError extends Error {
+ readonly code: string;
+ readonly subject: string | undefined;
+
+ constructor(code: string, message: string, subject?: string) {
+ super(message);
+ this.name = "WorkspaceError";
+ this.code = code;
+ this.subject = subject;
+ }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c0d06b8e..1b132cb4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -441,12 +441,9 @@ importers:
'@narratage/compiler-node':
specifier: workspace:*
version: link:../compiler-node
- '@narratage/host':
- specifier: workspace:*
- version: link:../host
- '@narratage/local':
+ '@narratage/elaborator':
specifier: workspace:*
- version: link:../local
+ version: link:../elaborator
'@narratage/package-loader-node':
specifier: workspace:*
version: link:../package-loader-node
@@ -462,6 +459,13 @@ importers:
'@narratage/source':
specifier: workspace:*
version: link:../source
+ '@narratage/workspace':
+ specifier: workspace:*
+ version: link:../workspace
+ devDependencies:
+ '@narratage/local':
+ specifier: workspace:*
+ version: link:../local
packages/comment-sticker:
dependencies:
@@ -523,9 +527,6 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
- '@narratage/host':
- specifier: workspace:*
- version: link:../host
'@narratage/markup':
specifier: workspace:*
version: link:../markup
@@ -535,10 +536,16 @@ importers:
'@narratage/validation':
specifier: workspace:*
version: link:../validation
+ '@narratage/workspace':
+ specifier: workspace:*
+ version: link:../workspace
devDependencies:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
+ '@narratage/workspace-fs-node':
+ specifier: workspace:*
+ version: link:../workspace-fs-node
packages/compiler-node:
dependencies:
@@ -548,9 +555,6 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
- '@narratage/host':
- specifier: workspace:*
- version: link:../host
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
@@ -563,9 +567,9 @@ importers:
'@narratage/validation':
specifier: workspace:*
version: link:../validation
- '@narratage/workspace-fs-node':
+ '@narratage/workspace':
specifier: workspace:*
- version: link:../workspace-fs-node
+ version: link:../workspace
devDependencies:
'@narratage/markup':
specifier: workspace:*
@@ -573,15 +577,15 @@ importers:
'@narratage/run-markup':
specifier: workspace:*
version: link:../run-markup
+ '@narratage/workspace-fs-node':
+ specifier: workspace:*
+ version: link:../workspace-fs-node
packages/component-kit:
dependencies:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/validation':
- specifier: workspace:*
- version: link:../validation
packages/composition:
dependencies:
@@ -1316,9 +1320,6 @@ importers:
packages/host:
dependencies:
- '@narratage/elaborator':
- specifier: workspace:*
- version: link:../elaborator
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
@@ -1437,9 +1438,6 @@ importers:
'@narratage/endpoint-kit':
specifier: workspace:*
version: link:../endpoint-kit
- '@narratage/host':
- specifier: workspace:*
- version: link:../host
'@narratage/package-loader-node':
specifier: workspace:*
version: link:../package-loader-node
@@ -1455,6 +1453,9 @@ importers:
'@narratage/validation':
specifier: workspace:*
version: link:../validation
+ '@narratage/workspace':
+ specifier: workspace:*
+ version: link:../workspace
devDependencies:
'@narratage/artifact-store-fs':
specifier: workspace:*
@@ -1733,31 +1734,22 @@ importers:
packages/package-loader-node:
dependencies:
- '@narratage/compiler-node':
- specifier: workspace:*
- version: link:../compiler-node
'@narratage/component-kit':
specifier: workspace:*
version: link:../component-kit
- '@narratage/elaborator':
- specifier: workspace:*
- version: link:../elaborator
'@narratage/host':
specifier: workspace:*
version: link:../host
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/run':
- specifier: workspace:*
- version: link:../run
- '@narratage/validation':
- specifier: workspace:*
- version: link:../validation
devDependencies:
'@narratage/runtime-adapter':
specifier: workspace:*
version: link:../runtime-adapter
+ '@narratage/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/program-space:
dependencies:
@@ -2467,7 +2459,11 @@ importers:
specifier: workspace:*
version: link:../speech-evidence
- packages/source: {}
+ packages/source:
+ dependencies:
+ '@narratage/protocol':
+ specifier: workspace:*
+ version: link:../protocol
packages/spatial:
dependencies:
@@ -2807,6 +2803,9 @@ importers:
packages/validation:
dependencies:
+ '@narratage/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@narratage/core':
specifier: workspace:*
version: link:../core
@@ -2831,12 +2830,9 @@ importers:
'@narratage/package-loader-node':
specifier: workspace:*
version: link:../package-loader-node
- '@narratage/run-markup':
- specifier: workspace:*
- version: link:../run-markup
- '@narratage/source':
+ '@narratage/workspace-fs-node':
specifier: workspace:*
- version: link:../source
+ version: link:../workspace-fs-node
packages/visual-ir:
dependencies:
@@ -2881,17 +2877,26 @@ importers:
specifier: workspace:*
version: link:../program-space
- packages/workspace-fs-node:
+ packages/workspace:
dependencies:
- '@narratage/elaborator':
+ '@narratage/protocol':
specifier: workspace:*
- version: link:../elaborator
- '@narratage/host':
+ version: link:../protocol
+ '@narratage/source':
specifier: workspace:*
- version: link:../host
+ version: link:../source
+
+ packages/workspace-fs-node:
+ dependencies:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
+ '@narratage/source':
+ specifier: workspace:*
+ version: link:../source
+ '@narratage/workspace':
+ specifier: workspace:*
+ version: link:../workspace
services/media-lambda:
dependencies:
@@ -2938,9 +2943,6 @@ importers:
'@narratage/fonts-open':
specifier: workspace:*
version: link:../../packages/fonts-open
- '@narratage/host':
- specifier: workspace:*
- version: link:../../packages/host
'@narratage/hyperframes':
specifier: workspace:*
version: link:../../packages/hyperframes
@@ -2962,6 +2964,9 @@ importers:
'@narratage/video-cli':
specifier: workspace:*
version: link:../../packages/video-cli
+ '@narratage/workspace':
+ specifier: workspace:*
+ version: link:../../packages/workspace
vite:
specifier: 5.4.21
version: 5.4.21(@types/[email protected])
diff --git a/services/media-lambda/src/handler.ts b/services/media-lambda/src/handler.ts
index 607c5332..5f78b2f5 100644
--- a/services/media-lambda/src/handler.ts
+++ b/services/media-lambda/src/handler.ts
@@ -183,7 +183,6 @@ export function createMediaLambdaHandler(options: MediaLambdaHandlerOptions = {}
...(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),
- label: "media.aws-lambda",
};
const result = await OPERATIONS[operation](env, request.constraints);
return {
@@ -191,7 +190,6 @@ export function createMediaLambdaHandler(options: MediaLambdaHandlerOptions = {}
operation,
ok: true as const,
value: result.value,
- metadata: result.metadata,
};
} catch (error) {
// Never thrown: the transport will not copy a failed function's payload
diff --git a/services/media-lambda/test/handler.test.ts b/services/media-lambda/test/handler.test.ts
index 69984c21..e811f8e8 100644
--- a/services/media-lambda/test/handler.test.ts
+++ b/services/media-lambda/test/handler.test.ts
@@ -76,7 +76,7 @@ test("the function answers a real Need with real media, over a bucket it address
assert.equal(value.streams.length, 1);
assert.equal(value.streams[0]!.kind, "audio");
assert.equal(value.streams[0]!.sampleRate, 48_000);
- assert.deepEqual(reply.metadata, { operation: "inspect", provider: "media.aws-lambda" });
+ assert.equal("metadata" in reply, false);
} finally {
await rm(work, { recursive: true, force: true });
}
diff --git a/tools/caption-playground/package.json b/tools/caption-playground/package.json
index 11bec2b4..5eedf3d5 100644
--- a/tools/caption-playground/package.json
+++ b/tools/caption-playground/package.json
@@ -8,7 +8,7 @@
"@narratage/caption-fine": "workspace:*",
"@narratage/composition": "workspace:*",
"@narratage/fonts-open": "workspace:*",
- "@narratage/host": "workspace:*",
+ "@narratage/workspace": "workspace:*",
"@narratage/hyperframes": "workspace:*",
"@narratage/narrative": "workspace:*",
"@narratage/package-loader-node": "workspace:*",
diff --git a/tools/caption-playground/src/main.ts b/tools/caption-playground/src/main.ts
index 4bbfef71..ff5271b8 100644
--- a/tools/caption-playground/src/main.ts
+++ b/tools/caption-playground/src/main.ts
@@ -32,7 +32,7 @@ let snapshot: CaptionPlaygroundSnapshot | undefined;
let requestInFlight = false;
const loadedFontCss = new Set<string>();
-function cueProjection(display: CaptionDisplaySequence, program: CaptionProgram): TimedCaptionProjection {
+function cueProjection(display: CaptionDisplaySequence, program: CaptionProgram, fps: number): TimedCaptionProjection {
const atomByWord = new Map(display.atoms.flatMap((atom) => atom.wordIds.map((wordId) => [wordId, atom] as const)));
const cues: TimedCaptionProjection["cues"][number][] = [];
let cursor = 0;
@@ -55,25 +55,25 @@ function cueProjection(display: CaptionDisplaySequence, program: CaptionProgram)
}
for (const group of groups) {
const words = group.reduce((sum, atom) => sum + atom.wordIds.length, 0);
- const duration = Math.max(1, words * 0.42);
+ const duration = Math.max(1, Math.round(words * 0.42 * fps));
const start = cursor;
const end = cursor + duration;
let atomCursor = start;
+ let consumedWords = 0;
const timedAtoms = group.map((atom, index) => {
+ consumedWords += atom.wordIds.length;
const atomEnd = index === group.length - 1
? end
- : atomCursor + duration * atom.wordIds.length / words;
- const value = { atomId: atom.id, startSec: atomCursor, endSec: atomEnd };
+ : start + Math.round(duration * consumedWords / words);
+ const value = { atomId: atom.id, startFrame: atomCursor, endFrameExclusive: atomEnd };
atomCursor = atomEnd;
return value;
});
cues.push({
id: `caption-playground:cue:${cues.length + 1}`,
- runId: run.id,
styleId: run.styleId,
- segmentId: group[0]!.segmentId,
- startSec: start,
- endSec: end,
+ startFrame: start,
+ endFrameExclusive: end,
atoms: timedAtoms,
fields: [],
});
@@ -85,9 +85,8 @@ function cueProjection(display: CaptionDisplaySequence, program: CaptionProgram)
function showPreview(value: CaptionPlaygroundSnapshot): void {
const program = resolveCaptionProgram(value.display, "caption-playground", value.style, []);
- const projection = cueProjection(value.display, program);
- const rawDuration = projection.cues.at(-1)?.endSec ?? 1;
- const frameCount = Math.max(1, Math.ceil(rawDuration * value.preview.fps));
+ const projection = cueProjection(value.display, program, value.preview.fps);
+ const frameCount = projection.cues.at(-1)?.endFrameExclusive ?? 1;
const space = sealProgramSpace({
contract: "svml.program-space@1",
durationSec: frameCount / value.preview.fps,
diff --git a/tools/caption-playground/src/server.ts b/tools/caption-playground/src/server.ts
index c7467738..fb6bd7e1 100644
--- a/tools/caption-playground/src/server.ts
+++ b/tools/caption-playground/src/server.ts
@@ -8,7 +8,7 @@ import { fineCaptionRecipeSchema, FINE_CAPTION_FAMILY } from "@narratage/caption
import { openFontFamilies } from "@narratage/fonts-open";
import type { OpenFontFamily, OpenFontStyle } from "@narratage/fonts-open";
import { loadNodePackageSet } from "@narratage/package-loader-node";
-import type { ArtifactAttachment } from "@narratage/host";
+import type { ArtifactAttachment } from "@narratage/workspace";
import type { CanonicalValue, TypedRecord } from "@narratage/protocol";
import { parseSvs } from "@narratage/svs";
import { createVideoCompiler } from "@narratage/video-cli";
@@ -202,7 +202,7 @@ export function captionPlaygroundPlugin(options: CaptionPlaygroundOptions): Plug
const compile = async (): Promise<CurrentState> => {
const packageSet = await loaded;
const compiler = createVideoCompiler({
- packageContributions: packageSet.contributions,
+ packageContributions: packageSet.packages.map((item) => item.contribution),
workspaceRoot: dirname(options.source),
});
const [result, fontText, recipeText] = await Promise.all([