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.
TypeScript agentic-aiaiai-agentsai-videocompilerdslffmpeggenerative-aillmmarkup-languagemonorepoplugin-systemprogramming-languagetext-to-videotypescriptvideovideo-automationvideo-clonevideo-editingvideo-generation
refactor(runtime): schedule provider authorities and routes
kashorin98e0e35a0bfa
diff --git a/docs/README.md b/docs/README.mdindex bf50038f..2eb92686 100644--- a/docs/README.md+++ b/docs/README.md@@ -28,6 +28,8 @@ the working tree contains only documents that should inform current implementatiRuntime, recovery and environment replacement.- [`runtime-execution-control.md`](./runtime-execution-control.md) — target durable Build dispatch,Worker lifecycle, transparent queue inspection and unambiguous Build/Operation cancellation.+- [`runtime-provider-scheduling.md`](./runtime-provider-scheduling.md) — explicit Provider+ Authorities, exact capability Routes, immutable Runtime Revisions and atomic resource tickets.- [`cli-experience.md`](./cli-experience.md) — complete human/CI/machine terminal design,command hierarchy, visual language and decentralized Endpoint authentication.- [`runtime-adapter-loading.md`](./runtime-adapter-loading.md) — separately locked Providerdiff --git a/docs/guide/conventions.md b/docs/guide/conventions.mdindex 783ef971..549343ca 100644--- a/docs/guide/conventions.md+++ b/docs/guide/conventions.md@@ -58,5 +58,5 @@ When adding a new package, add its path mapping to `tsconfig.json`:- Compilation failures throw with descriptive messages including source location.- Runtime failures are recorded as Operation failures in the Build state machine.-- Recoverable failures trigger retry according to the Scheduler's lane policy.+- Recoverable failures trigger retry according to Endpoint policy after Scheduler resource admission.- Fatal failures transition the Build to a terminal state.diff --git a/docs/guide/providers.md b/docs/guide/providers.mdindex 27b63785..563916c0 100644--- a/docs/guide/providers.md+++ b/docs/guide/providers.md@@ -54,7 +54,7 @@ import type { EndpointManifest } from "@narratage/endpoint-kit";export function createMyServiceProvider(options: {instance: string;- lane?: string;+ authority?: string;apiKey: CredentialRef;defaultConcurrency?: number;}) {@@ -99,7 +99,7 @@ const adapter = createRuntimeEndpointAdapterFacet({return {endpoint: createMyServiceProvider({instance: context.instance,- lane: context.lane,+ authority: context.authority,apiKey,...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),}),@@ -192,7 +192,7 @@ instantiates its `use` id.{"use": "@narratage/provider-my-service","instance": "my-service.project",- "lane": "generation",+ "authority": "my-service.project","config": {"apiKey": { "store": "keychain", "key": "my-service.api-key" },"defaultConcurrency": 2diff --git a/docs/guide/runtime-profile.md b/docs/guide/runtime-profile.mdindex 30d38a5a..1c9fb552 100644--- a/docs/guide/runtime-profile.md+++ b/docs/guide/runtime-profile.md@@ -45,7 +45,7 @@ Two forms are supported:{"use": "@narratage/provider-kie","instance": "kie.production",- "lane": "generation",+ "authority": "kie.production","config": {"apiKey": { "store": "keychain", "key": "kie.api-key" },"defaultConcurrency": 2@@ -54,19 +54,19 @@ Two forms are supported:{"use": "@narratage/provider-media-local","instance": "media.local",- "lane": "media",+ "authority": "media.local","config": { "defaultConcurrency": 2 }},{"use": "@narratage/provider-whisperx-local","instance": "whisperx.local",- "lane": "alignment",+ "authority": "whisperx.local","config": { "defaultConcurrency": 1 }},{"use": "@narratage/provider-google-vertex","instance": "vertex.local",- "lane": "planning",+ "authority": "vertex.local","config": {"projectEnv": "GOOGLE_CLOUD_PROJECT","credentials": { "store": "keychain", "key": "google.vertex-json" },@@ -76,7 +76,7 @@ Two forms are supported:{"use": "@narratage/provider-hyperframes-local","instance": "hyperframes.local",- "lane": "render",+ "authority": "hyperframes.local","config": { "workers": 2, "quality": "standard", "defaultConcurrency": 1 }}],@@ -91,16 +91,7 @@ Two forms are supported:"process:hyperframes","process:media"],- "scheduling": {- "maxConcurrency": 4,- "lanes": {- "generation": 2,- "media": 2,- "alignment": 1,- "planning": 1,- "render": 1- }- }+ "scheduling": { "maxConcurrency": 4 }}```@@ -110,7 +101,7 @@ Two forms are supported:|---|---|| `use` | Adapter name, resolved from `runtimePackageLock` || `instance` | Unique identifier for this Endpoint instance |-| `lane` | Scheduling lane governing concurrency |+| `authority` | Stable non-secret identity of the account, deployment or compute pool whose limits are shared || `config` | Adapter-specific non-secret configuration, CredentialRefs, concurrency and timeouts |Credentials are addressed as `{ "store": "…", "key": "…" }`; secret bytes never enter the@@ -139,9 +130,10 @@ Neither value enters Author or Run graph identity.### Scheduling-`maxConcurrency` caps admitted Operations across all Workers sharing the DispatchStore. Each named-`lane` has its own sub-cap. Capacity reservations are durable and fenced by the Build lease rather-than process-local counters.+`maxConcurrency` caps admitted Operations across all Workers sharing the DispatchStore. Provider+packages contribute an Authority resource and an exact capability Route resource; the Store+acquires both atomically. Optional `resources` overrides address those opaque ids. Capacity tickets+are durable and fenced by the Build lease rather than process-local counters.### Permissions@@ -181,13 +173,13 @@ export default async function createRuntime() {const endpoints = [createKieProvider({instance: "kie.prod",- lane: "generation",+ authority: "kie.prod",apiKey: credentialRef("env", "KIE_API_KEY"),defaultConcurrency: 2,}),createLocalMediaProvider({instance: "media.prod",- lane: "media",+ authority: "media.prod",defaultConcurrency: 2,}),];@@ -215,7 +207,6 @@ export default async function createRuntime() {],scheduling: {maxConcurrency: 4,- lanes: { generation: 2, media: 2 },},});}diff --git a/docs/guide/services.md b/docs/guide/services.mdindex 6681a9fa..053839db 100644--- a/docs/guide/services.md+++ b/docs/guide/services.md@@ -104,7 +104,7 @@ job remains in the same state.`@narratage/provider-whisperx-local` declares the warm service. Its health probe locks protocol,package, model, device, compute type and batch size. It accepts only canonical evidence WAVs beneath-the configured input roots. WhisperX remains one-at-a-time internally; the Runtime lane prevents+the configured input roots. WhisperX remains one-at-a-time internally; the Runtime Route resource preventsavoidable `BUSY` responses.For service development it may be run directly:diff --git a/docs/quickstart/run.md b/docs/quickstart/run.mdindex 6ee2a27f..c4dfa13e 100644--- a/docs/quickstart/run.md+++ b/docs/quickstart/run.md@@ -213,7 +213,7 @@ The Runtime Profile (`svml.runtime.json`) tells the system **where** to run each{"use": "@narratage/provider-kie","instance": "kie.main",- "lane": "generation",+ "authority": "kie.main","config": {"apiKey": { "store": "env", "key": "KIE_API_KEY" },"defaultConcurrency": 2@@ -222,19 +222,19 @@ The Runtime Profile (`svml.runtime.json`) tells the system **where** to run each{"use": "@narratage/provider-media-local","instance": "media.main",- "lane": "media",+ "authority": "media.main","config": { "defaultConcurrency": 2 }},{"use": "@narratage/provider-whisperx-local","instance": "whisperx.main",- "lane": "alignment",+ "authority": "whisperx.main","config": { "defaultConcurrency": 1 }},{"use": "@narratage/provider-google-vertex","instance": "vertex.main",- "lane": "planning",+ "authority": "vertex.main","config": {"projectEnv": "GOOGLE_CLOUD_PROJECT","credentials": { "store": "env", "key": "GOOGLE_APPLICATION_CREDENTIALS_JSON" },@@ -245,7 +245,7 @@ The Runtime Profile (`svml.runtime.json`) tells the system **where** to run each{"use": "@narratage/provider-hyperframes-local","instance": "hyperframes.main",- "lane": "render",+ "authority": "hyperframes.main","config": {"workers": 2,"quality": "standard",@@ -265,28 +265,19 @@ The Runtime Profile (`svml.runtime.json`) tells the system **where** to run each"process:hyperframes","process:media"],- "scheduling": {- "maxConcurrency": 4,- "lanes": {- "generation": 2,- "media": 2,- "alignment": 1,- "planning": 1,- "render": 1- }- }+ "scheduling": { "maxConcurrency": 4 }}```### Endpoints-Each endpoint binds a Provider package to a named instance with a concurrency lane:+Each endpoint binds a Provider package to a named instance and an explicit Provider Authority:| Field | Description ||---|---|| `use` | Provider package name (e.g. `@narratage/provider-kie`) || `instance` | Unique instance identifier |-| `lane` | Scheduling lane for concurrency control |+| `authority` | Stable non-secret identity of the account, deployment or compute pool whose limits are shared || `config` | Provider-specific non-secret configuration and ordinary CredentialRefs |### Permissions@@ -296,8 +287,9 @@ require permissions not listed here.### Scheduling-`maxConcurrency` limits total parallel Operations. `lanes` sets per-lane concurrency limits to-prevent one type of work from starving others.+`maxConcurrency` limits total parallel Operations. Every Provider contributes an Authority resource+and one exact capability Route resource. Optional `resources` overrides use those opaque resource+ids; they never select a model or Provider.## Build workflowdiff --git a/docs/zh/guide/conventions.md b/docs/zh/guide/conventions.mdindex b88b9bd7..866d21c5 100644--- a/docs/zh/guide/conventions.md+++ b/docs/zh/guide/conventions.md@@ -56,5 +56,5 @@ description: 命名、模块边界、TypeScript 配置与 wire 数据。- 编译失败时抛出带有描述性信息的错误,其中包含源码位置。- 运行时失败在 Build 状态机中记录为 Operation 失败。-- 可恢复的失败会按照 Scheduler 的 lane 策略触发重试。+- 可恢复的失败会在 Scheduler 资源准入后按照 Endpoint 策略触发重试。- 致命失败会让 Build 转入终止状态。diff --git a/docs/zh/guide/providers.md b/docs/zh/guide/providers.mdindex 72a50018..0a2741fd 100644--- a/docs/zh/guide/providers.md+++ b/docs/zh/guide/providers.md@@ -50,7 +50,7 @@ import type { EndpointManifest } from "@narratage/endpoint-kit";export function createMyServiceProvider(options: {instance: string;- lane?: string;+ authority?: string;apiKey: CredentialRef;defaultConcurrency?: number;}) {@@ -95,7 +95,7 @@ const adapter = createRuntimeEndpointAdapterFacet({return {endpoint: createMyServiceProvider({instance: context.instance,- lane: context.lane,+ authority: context.authority,apiKey,...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),}),@@ -182,7 +182,7 @@ node --run narratage -- lock-packages <runtime-lock> \{"use": "@narratage/provider-my-service","instance": "my-service.project",- "lane": "generation",+ "authority": "my-service.project","config": {"apiKey": { "store": "keychain", "key": "my-service.api-key" },"defaultConcurrency": 2diff --git a/docs/zh/guide/runtime-profile.md b/docs/zh/guide/runtime-profile.mdindex a33cfd38..95adfd78 100644--- a/docs/zh/guide/runtime-profile.md+++ b/docs/zh/guide/runtime-profile.md@@ -37,7 +37,7 @@ Runtime Profile 声明冻结后的 Build *在哪里*执行:Scheduler、Worker{"use": "@narratage/provider-kie","instance": "kie.production",- "lane": "generation",+ "authority": "kie.production","config": {"apiKey": { "store": "keychain", "key": "kie.api-key" },"defaultConcurrency": 2@@ -51,10 +51,7 @@ Runtime Profile 声明冻结后的 Build *在哪里*执行:Scheduler、Worker"network:api.kie.ai","network:kieai.redpandaai.co"],- "scheduling": {- "maxConcurrency": 4,- "lanes": { "generation": 2 }- }+ "scheduling": { "maxConcurrency": 4 }}```@@ -80,8 +77,9 @@ Narratage 安装目录加载校验后的包。## 并发与权限-`maxConcurrency` 和每个 lane 的上限由 DispatchStore 在所有共享 Worker 之间执行,不是某个-CLI 进程里的计数器。容量租约跟随 Build 的 fenced lease;过期 Worker 不能继续准入结果。+`maxConcurrency`、Provider Authority 与精确 Capability Route 的上限由 DispatchStore 在所有+共享 Worker 之间执行,不是某个 CLI 进程里的计数器。容量租约跟随 Build 的 fenced lease;+过期 Worker 不能继续准入结果。权限仍是显式 allowlist,例如 `network:<host>`、`filesystem:<scope>`、`process:<name>`。diff --git a/docs/zh/guide/services.md b/docs/zh/guide/services.mdindex 2fe2d7da..d67ffba9 100644--- a/docs/zh/guide/services.md+++ b/docs/zh/guide/services.md@@ -80,7 +80,7 @@ node --run narratage -- operation <operation-id> --runtime svml.runtime.json## WhisperX`@narratage/provider-whisperx-local` 声明热服务及健康探测,锁定协议、包版本、模型、设备、-计算类型和 batch size。服务只读取允许目录下的规范证据 WAV。Runtime lane 避免无意义的+计算类型和 batch size。服务只读取允许目录下的规范证据 WAV。Runtime Route 资源避免无意义的并发 `BUSY`。开发服务本身时仍可前台运行:diff --git a/docs/zh/quickstart/run.md b/docs/zh/quickstart/run.mdindex 8cb23683..adff3956 100644--- a/docs/zh/quickstart/run.md+++ b/docs/zh/quickstart/run.md@@ -201,7 +201,7 @@ Runtime Profile(`svml.runtime.json`)告诉系统**在哪里**执行每种类{"use": "@narratage/provider-kie","instance": "kie.main",- "lane": "generation",+ "authority": "kie.main","config": {"apiKey": { "store": "env", "key": "KIE_API_KEY" },"defaultConcurrency": 2@@ -210,19 +210,19 @@ Runtime Profile(`svml.runtime.json`)告诉系统**在哪里**执行每种类{"use": "@narratage/provider-media-local","instance": "media.main",- "lane": "media",+ "authority": "media.main","config": { "defaultConcurrency": 2 }},{"use": "@narratage/provider-whisperx-local","instance": "whisperx.main",- "lane": "alignment",+ "authority": "whisperx.main","config": { "defaultConcurrency": 1 }},{"use": "@narratage/provider-google-vertex","instance": "vertex.main",- "lane": "planning",+ "authority": "vertex.main","config": {"projectEnv": "GOOGLE_CLOUD_PROJECT","credentials": { "store": "env", "key": "GOOGLE_APPLICATION_CREDENTIALS_JSON" },@@ -233,7 +233,7 @@ Runtime Profile(`svml.runtime.json`)告诉系统**在哪里**执行每种类{"use": "@narratage/provider-hyperframes-local","instance": "hyperframes.main",- "lane": "render",+ "authority": "hyperframes.main","config": {"workers": 2,"quality": "standard",@@ -253,28 +253,19 @@ Runtime Profile(`svml.runtime.json`)告诉系统**在哪里**执行每种类"process:hyperframes","process:media"],- "scheduling": {- "maxConcurrency": 4,- "lanes": {- "generation": 2,- "media": 2,- "alignment": 1,- "planning": 1,- "render": 1- }- }+ "scheduling": { "maxConcurrency": 4 }}```### Endpoint-每个 endpoint 将一个 Provider 包绑定到具有并发通道的命名实例:+每个 endpoint 将一个 Provider 包绑定到命名实例与显式的 Provider Authority:| 字段 | 说明 ||---|---|| `use` | Provider 包名(例如 `@narratage/provider-kie`) || `instance` | 唯一的实例标识符 |-| `lane` | 用于并发控制的调度通道 |+| `authority` | 共享外部容量的账号、部署或计算池的稳定非秘密标识 || `config` | Provider 专属非秘密配置、CredentialRef 与并发数 |### 权限@@ -283,7 +274,8 @@ Runtime Profile(`svml.runtime.json`)告诉系统**在哪里**执行每种类### 调度-`maxConcurrency` 限制总的并行 Operation 数。`lanes` 设置每个通道的并发上限,以防止某一类工作饿死其他工作。+`maxConcurrency` 限制总的并行 Operation 数。Provider 会贡献一个 Authority 资源和一个精确+Capability Route 资源,二者由 Store 原子获取;可选的 `resources` 只按不透明资源 id 覆盖容量。## Build 工作流diff --git a/examples/talking-film-live/svml.runtime-packages.lock b/examples/talking-film-live/svml.runtime-packages.lockindex a27d165c..a1ff9af9 100644--- a/examples/talking-film-live/svml.runtime-packages.lock+++ b/examples/talking-film-live/svml.runtime-packages.lock@@ -90,7 +90,7 @@{"name": "@narratage/driver-node","version": "0.0.0-dev",- "digest": "sha256:0e1209c7f242956f55f90e712a7921ba63fe0e9a20a6164461afa5215d8bcba2"+ "digest": "sha256:17e07b13a98efb4a638d483910090ee03ff8249325429ad467c4234bbd03eb11"},{"name": "@narratage/elaborator",@@ -100,7 +100,7 @@{"name": "@narratage/endpoint-kit","version": "0.0.0-dev",- "digest": "sha256:833d4c2b40cbf889c4790476a92a7e3eb9ddf42b748fd17bc7f9ca9bc8596c14"+ "digest": "sha256:b5f1bc184c29c11a3cd781967eccbb750d4125e7ecc1109c9dc53c23b9111034"},{"name": "@narratage/generation",@@ -120,7 +120,7 @@{"name": "@narratage/local","version": "0.0.0-dev",- "digest": "sha256:d2bece5a791dc3b7a88f890a54142b5e0cc5a534485ff4e20d5740787a8b90a1"+ "digest": "sha256:27ec6ee9f102bda5515d6c25fa3a1e380e3418e5631ac1c6742b019c0f266afc"},{"name": "@narratage/markup",@@ -165,27 +165,27 @@{"name": "@narratage/provider-google-vertex","version": "0.0.0-dev",- "digest": "sha256:87cc370c56a3730dd94f9d2e74481d91db25a3a9ca0483b3077e66f69d5f3c10"+ "digest": "sha256:195e40d974ebd8db61bd04d2f1a937d1faa19db9e8ac414f7465ef7d85155d82"},{"name": "@narratage/provider-hyperframes-local","version": "0.0.0-dev",- "digest": "sha256:5e466e9bc267266768904c4bd873c2f98a5a9dffbc2dc67c545710e391a60242"+ "digest": "sha256:66716245c1ff78a7ce00aa79236d33595f78625e89514fe805989942cdf1d165"},{"name": "@narratage/provider-kie","version": "0.0.0-dev",- "digest": "sha256:47fd2c4c57dc381b21f9622002d77f7db7003c52de8c70e1ca295ae13cebdb18"+ "digest": "sha256:a226af6435ff05baa90b7103696674a43842603520c2d80a96fe6e2e1e276f8d"},{"name": "@narratage/provider-media-local","version": "0.0.0-dev",- "digest": "sha256:4dcefebb3b6baf6436ba607ce434328a2d50eb88542a96f6220671715cddd9f1"+ "digest": "sha256:50bfeb7fcbeee00ac4da6ff0c4144fb08f433c75566a65a5742e8e29beef7b2c"},{"name": "@narratage/provider-whisperx-local","version": "0.0.0-dev",- "digest": "sha256:3fea223b5b0d1569b2c04e7949c82b6eeaa770caa41b19b461ed035e30d8c29e"+ "digest": "sha256:106cf7298cd919cd98b3c5257612edf2c2503d095dc936d48d43e2ece99e4bdf"},{"name": "@narratage/render-hyperframes",@@ -205,12 +205,12 @@{"name": "@narratage/runtime-adapter","version": "0.0.0-dev",- "digest": "sha256:b67dfc214ab9ae8cec350cee2e479aa70e7c62bf19a01d7c1d091d6e7df7c913"+ "digest": "sha256:b5263d9acb716c2a6112a979cc8faf4ff961fe73ff82836a5418feec67eecb06"},{"name": "@narratage/runtime","version": "0.0.0-dev",- "digest": "sha256:b7954bf727125baedc31377d3a1d9066b5bd9c019c72fe6468fcc4864243aa31"+ "digest": "sha256:f12df62ed8f04d97afdfcca2af9f965962f5ba33f2cd018d0d853332547ff695"},{"name": "@narratage/semantic-map",@@ -245,7 +245,7 @@{"name": "@narratage/store-sqlite","version": "0.0.0-dev",- "digest": "sha256:a6063abc900ba2e608db91ab9b587306af3bb843627f5f95c242668ca9abdd7d"+ "digest": "sha256:9379c1bdfa3c5acea58a6e3ad14535454cbc1c86582b7be121de0dd5f89ceaba"},{"name": "@narratage/svs",@@ -926,7 +926,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:914018276b9218afc13940ca5c362dc95fa19d574fc07b06b6fe005c5eb30315",- "closureDigest": "sha256:466bbc1b42c06f020dfe64ebd701f037771f0c61a37ce5614cdff03d4bcf0943"+ "closureDigest": "sha256:80fc129e5f3bf68e6fdb77b9b5e356eb9dfed154ad2da98e1dde9c45e7bfba82"},{"specifier": "@narratage/credential-store-env",@@ -935,7 +935,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:ee33ba638bbf2f88eee8f34a2f3179f435a0af9ccbae3fbb7d2a81bd6aeac612",- "closureDigest": "sha256:7521e30257c61ecaae22198b985900b135e6348172bf1a699eae06c57782458c"+ "closureDigest": "sha256:c4241c245a5fb626e588613132a74c4da10e77d0ca4bc0eb83efae3f40ef1b97"},{"specifier": "@narratage/local",@@ -944,7 +944,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:6689aed79b0947c7315aef65e46806ce73da01de3d73b454e1497b8d847ffa61",- "closureDigest": "sha256:e0730ba07fbef51517fb77ea985b83d12a42eedde998852e29db5cdb199a55c2"+ "closureDigest": "sha256:c7dbb390644c0c782826ad25455aace6b63e35458cef6354312fd02aa8211b0c"},{"specifier": "@narratage/provider-google-vertex",@@ -953,7 +953,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",- "closureDigest": "sha256:4bcb114a29f4bd429dbcea883b7a8ee0f178a30c3488d261f2485214f953acd8"+ "closureDigest": "sha256:e7259c57d39c74563de3402fffaa1699489b6e9abbe1f8c6977e03e09c88e3cb"},{"specifier": "@narratage/provider-hyperframes-local",@@ -962,7 +962,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",- "closureDigest": "sha256:0eb5def07621f9a75934160af6372d8c97087dd6e8434e40cb8ad4497de38218"+ "closureDigest": "sha256:ae693238af06b4feb06c0d8e2d6c10a443d4d866bf39ce13334c6cc05125f5b1"},{"specifier": "@narratage/provider-kie",@@ -971,7 +971,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:e61ebb911a33d4c5d0e4e4ee4fb69cdb790f4ced050ef35f7472bfbd72013d9b",- "closureDigest": "sha256:94ed9baec91ef62d316be9296803aa26d523164cddbdcb48b92b8a743ab04a09"+ "closureDigest": "sha256:7636ff66aadd0eb88300974fd37d7990ec38c0f3ac415f52edcf9126b11d3efe"},{"specifier": "@narratage/provider-media-local",@@ -980,7 +980,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",- "closureDigest": "sha256:d59a831fdeea751342aba28e48465d2f62b13d436dafe84bd47529aa2a7542f0"+ "closureDigest": "sha256:e4996fbbc622d79d69c2e1a217726b203828fc1db6bbb6aafaee4a30d485cb78"},{"specifier": "@narratage/provider-whisperx-local",@@ -989,7 +989,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",- "closureDigest": "sha256:2125f3b538132060328c2435e6bda42f86e5356edef9705c954f32d162ab268f"+ "closureDigest": "sha256:604a1510ad0452f38a7a0a0a1beafefbd4cc9cd8325686b114320794a9fbda8c"},{"specifier": "@narratage/store-sqlite",@@ -998,8 +998,8 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:5bccf73cd953710fc31ef44672fef1bfc396fd4aa2eff4b53108e8ff87e749c3",- "closureDigest": "sha256:84f9770cc535fb1e01a038e6f626bb5d32beb83d8b2169dc0c02b914334ec4c4"+ "closureDigest": "sha256:2c2587eb467888135741d77de271099d190d88d7544c0ce4adbb49412bcf7edd"}],- "digest": "sha256:f1d098a85cfd67ba365732a7635f15e45c72ea45e2eb7807f7afcac914cc2faf"+ "digest": "sha256:2169c16075f921f6dd0236678d78c93051a406dd55a6249407afc43348ade212"}diff --git a/examples/talking-film-live/svml.runtime.json b/examples/talking-film-live/svml.runtime.jsonindex dcca556a..f068031a 100644--- a/examples/talking-film-live/svml.runtime.json+++ b/examples/talking-film-live/svml.runtime.json@@ -24,7 +24,7 @@{"use": "@narratage/provider-kie","instance": "kie.talking-film",- "lane": "generation",+ "authority": "kie.talking-film","config": {"apiKey": { "store": "env", "key": "KIE_API_KEY" },"defaultConcurrency": 2@@ -33,7 +33,7 @@{"use": "@narratage/provider-media-local","instance": "media.talking-film",- "lane": "media",+ "authority": "media.talking-film","config": {"defaultConcurrency": 2}@@ -41,7 +41,7 @@{"use": "@narratage/provider-whisperx-local","instance": "whisperx.talking-film",- "lane": "alignment",+ "authority": "whisperx.talking-film","config": {"defaultConcurrency": 1}@@ -49,7 +49,7 @@{"use": "@narratage/provider-google-vertex","instance": "vertex.talking-film",- "lane": "planning",+ "authority": "vertex.talking-film","config": {"projectEnv": "GOOGLE_CLOUD_PROJECT","credentials": { "store": "env", "key": "GOOGLE_APPLICATION_CREDENTIALS_JSON" },@@ -59,7 +59,7 @@{"use": "@narratage/provider-hyperframes-local","instance": "hyperframes.talking-film",- "lane": "render",+ "authority": "hyperframes.talking-film","config": {"workers": 2,"quality": "standard",@@ -80,13 +80,6 @@"process:media"],"scheduling": {- "maxConcurrency": 4,- "lanes": {- "generation": 2,- "media": 2,- "alignment": 1,- "planning": 1,- "render": 1- }+ "maxConcurrency": 4}}diff --git a/examples/talking-film-live/svml.runtime.ts b/examples/talking-film-live/svml.runtime.tsindex db60cc01..68f5c170 100644--- a/examples/talking-film-live/svml.runtime.ts+++ b/examples/talking-film-live/svml.runtime.ts@@ -20,30 +20,30 @@ export default async function createTalkingFilmRuntime() {const endpoints = [createKieProvider({instance: "kie.talking-film",- lane: "generation",+ authority: "kie.talking-film",apiKey: credentialRef("env", "KIE_API_KEY"),defaultConcurrency: 2,}),createLocalMediaProvider({instance: "media.talking-film",- lane: "media",+ authority: "media.talking-film",defaultConcurrency: 2,}),createLocalWhisperXProvider({instance: "whisperx.talking-film",- lane: "alignment",+ authority: "whisperx.talking-film",defaultConcurrency: 1,}),createGoogleVertexCaptionProvider({project,instance: "vertex.talking-film",- lane: "planning",+ authority: "vertex.talking-film",credentialsJson: credentialRef("env", "GOOGLE_APPLICATION_CREDENTIALS_JSON"),defaultConcurrency: 1,}),createLocalHyperframesProvider({instance: "hyperframes.talking-film",- lane: "render",+ authority: "hyperframes.talking-film",workers: 2,quality: "standard",defaultConcurrency: 1,@@ -90,13 +90,6 @@ export default async function createTalkingFilmRuntime() {])],scheduling: {maxConcurrency: 4,- lanes: {- generation: 2,- media: 2,- alignment: 1,- planning: 1,- render: 1,- },},});}diff --git a/examples/talking-head-aroll/svml.runtime-packages.lock b/examples/talking-head-aroll/svml.runtime-packages.lockindex a27d165c..a1ff9af9 100644--- a/examples/talking-head-aroll/svml.runtime-packages.lock+++ b/examples/talking-head-aroll/svml.runtime-packages.lock@@ -90,7 +90,7 @@{"name": "@narratage/driver-node","version": "0.0.0-dev",- "digest": "sha256:0e1209c7f242956f55f90e712a7921ba63fe0e9a20a6164461afa5215d8bcba2"+ "digest": "sha256:17e07b13a98efb4a638d483910090ee03ff8249325429ad467c4234bbd03eb11"},{"name": "@narratage/elaborator",@@ -100,7 +100,7 @@{"name": "@narratage/endpoint-kit","version": "0.0.0-dev",- "digest": "sha256:833d4c2b40cbf889c4790476a92a7e3eb9ddf42b748fd17bc7f9ca9bc8596c14"+ "digest": "sha256:b5f1bc184c29c11a3cd781967eccbb750d4125e7ecc1109c9dc53c23b9111034"},{"name": "@narratage/generation",@@ -120,7 +120,7 @@{"name": "@narratage/local","version": "0.0.0-dev",- "digest": "sha256:d2bece5a791dc3b7a88f890a54142b5e0cc5a534485ff4e20d5740787a8b90a1"+ "digest": "sha256:27ec6ee9f102bda5515d6c25fa3a1e380e3418e5631ac1c6742b019c0f266afc"},{"name": "@narratage/markup",@@ -165,27 +165,27 @@{"name": "@narratage/provider-google-vertex","version": "0.0.0-dev",- "digest": "sha256:87cc370c56a3730dd94f9d2e74481d91db25a3a9ca0483b3077e66f69d5f3c10"+ "digest": "sha256:195e40d974ebd8db61bd04d2f1a937d1faa19db9e8ac414f7465ef7d85155d82"},{"name": "@narratage/provider-hyperframes-local","version": "0.0.0-dev",- "digest": "sha256:5e466e9bc267266768904c4bd873c2f98a5a9dffbc2dc67c545710e391a60242"+ "digest": "sha256:66716245c1ff78a7ce00aa79236d33595f78625e89514fe805989942cdf1d165"},{"name": "@narratage/provider-kie","version": "0.0.0-dev",- "digest": "sha256:47fd2c4c57dc381b21f9622002d77f7db7003c52de8c70e1ca295ae13cebdb18"+ "digest": "sha256:a226af6435ff05baa90b7103696674a43842603520c2d80a96fe6e2e1e276f8d"},{"name": "@narratage/provider-media-local","version": "0.0.0-dev",- "digest": "sha256:4dcefebb3b6baf6436ba607ce434328a2d50eb88542a96f6220671715cddd9f1"+ "digest": "sha256:50bfeb7fcbeee00ac4da6ff0c4144fb08f433c75566a65a5742e8e29beef7b2c"},{"name": "@narratage/provider-whisperx-local","version": "0.0.0-dev",- "digest": "sha256:3fea223b5b0d1569b2c04e7949c82b6eeaa770caa41b19b461ed035e30d8c29e"+ "digest": "sha256:106cf7298cd919cd98b3c5257612edf2c2503d095dc936d48d43e2ece99e4bdf"},{"name": "@narratage/render-hyperframes",@@ -205,12 +205,12 @@{"name": "@narratage/runtime-adapter","version": "0.0.0-dev",- "digest": "sha256:b67dfc214ab9ae8cec350cee2e479aa70e7c62bf19a01d7c1d091d6e7df7c913"+ "digest": "sha256:b5263d9acb716c2a6112a979cc8faf4ff961fe73ff82836a5418feec67eecb06"},{"name": "@narratage/runtime","version": "0.0.0-dev",- "digest": "sha256:b7954bf727125baedc31377d3a1d9066b5bd9c019c72fe6468fcc4864243aa31"+ "digest": "sha256:f12df62ed8f04d97afdfcca2af9f965962f5ba33f2cd018d0d853332547ff695"},{"name": "@narratage/semantic-map",@@ -245,7 +245,7 @@{"name": "@narratage/store-sqlite","version": "0.0.0-dev",- "digest": "sha256:a6063abc900ba2e608db91ab9b587306af3bb843627f5f95c242668ca9abdd7d"+ "digest": "sha256:9379c1bdfa3c5acea58a6e3ad14535454cbc1c86582b7be121de0dd5f89ceaba"},{"name": "@narratage/svs",@@ -926,7 +926,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:914018276b9218afc13940ca5c362dc95fa19d574fc07b06b6fe005c5eb30315",- "closureDigest": "sha256:466bbc1b42c06f020dfe64ebd701f037771f0c61a37ce5614cdff03d4bcf0943"+ "closureDigest": "sha256:80fc129e5f3bf68e6fdb77b9b5e356eb9dfed154ad2da98e1dde9c45e7bfba82"},{"specifier": "@narratage/credential-store-env",@@ -935,7 +935,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:ee33ba638bbf2f88eee8f34a2f3179f435a0af9ccbae3fbb7d2a81bd6aeac612",- "closureDigest": "sha256:7521e30257c61ecaae22198b985900b135e6348172bf1a699eae06c57782458c"+ "closureDigest": "sha256:c4241c245a5fb626e588613132a74c4da10e77d0ca4bc0eb83efae3f40ef1b97"},{"specifier": "@narratage/local",@@ -944,7 +944,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:6689aed79b0947c7315aef65e46806ce73da01de3d73b454e1497b8d847ffa61",- "closureDigest": "sha256:e0730ba07fbef51517fb77ea985b83d12a42eedde998852e29db5cdb199a55c2"+ "closureDigest": "sha256:c7dbb390644c0c782826ad25455aace6b63e35458cef6354312fd02aa8211b0c"},{"specifier": "@narratage/provider-google-vertex",@@ -953,7 +953,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",- "closureDigest": "sha256:4bcb114a29f4bd429dbcea883b7a8ee0f178a30c3488d261f2485214f953acd8"+ "closureDigest": "sha256:e7259c57d39c74563de3402fffaa1699489b6e9abbe1f8c6977e03e09c88e3cb"},{"specifier": "@narratage/provider-hyperframes-local",@@ -962,7 +962,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",- "closureDigest": "sha256:0eb5def07621f9a75934160af6372d8c97087dd6e8434e40cb8ad4497de38218"+ "closureDigest": "sha256:ae693238af06b4feb06c0d8e2d6c10a443d4d866bf39ce13334c6cc05125f5b1"},{"specifier": "@narratage/provider-kie",@@ -971,7 +971,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:e61ebb911a33d4c5d0e4e4ee4fb69cdb790f4ced050ef35f7472bfbd72013d9b",- "closureDigest": "sha256:94ed9baec91ef62d316be9296803aa26d523164cddbdcb48b92b8a743ab04a09"+ "closureDigest": "sha256:7636ff66aadd0eb88300974fd37d7990ec38c0f3ac415f52edcf9126b11d3efe"},{"specifier": "@narratage/provider-media-local",@@ -980,7 +980,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",- "closureDigest": "sha256:d59a831fdeea751342aba28e48465d2f62b13d436dafe84bd47529aa2a7542f0"+ "closureDigest": "sha256:e4996fbbc622d79d69c2e1a217726b203828fc1db6bbb6aafaee4a30d485cb78"},{"specifier": "@narratage/provider-whisperx-local",@@ -989,7 +989,7 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",- "closureDigest": "sha256:2125f3b538132060328c2435e6bda42f86e5356edef9705c954f32d162ab268f"+ "closureDigest": "sha256:604a1510ad0452f38a7a0a0a1beafefbd4cc9cd8325686b114320794a9fbda8c"},{"specifier": "@narratage/store-sqlite",@@ -998,8 +998,8 @@"version": "0.0.0-dev"},"facetsDigest": "sha256:5bccf73cd953710fc31ef44672fef1bfc396fd4aa2eff4b53108e8ff87e749c3",- "closureDigest": "sha256:84f9770cc535fb1e01a038e6f626bb5d32beb83d8b2169dc0c02b914334ec4c4"+ "closureDigest": "sha256:2c2587eb467888135741d77de271099d190d88d7544c0ce4adbb49412bcf7edd"}],- "digest": "sha256:f1d098a85cfd67ba365732a7635f15e45c72ea45e2eb7807f7afcac914cc2faf"+ "digest": "sha256:2169c16075f921f6dd0236678d78c93051a406dd55a6249407afc43348ade212"}diff --git a/examples/talking-head-aroll/svml.runtime.json b/examples/talking-head-aroll/svml.runtime.jsonindex 958034d0..d3a769b6 100644--- a/examples/talking-head-aroll/svml.runtime.json+++ b/examples/talking-head-aroll/svml.runtime.json@@ -24,7 +24,7 @@{"use": "@narratage/provider-kie","instance": "kie.talking-head-aroll",- "lane": "generation",+ "authority": "kie.talking-head-aroll","config": {"apiKey": { "store": "env", "key": "KIE_API_KEY" },"defaultConcurrency": 2@@ -33,7 +33,7 @@{"use": "@narratage/provider-media-local","instance": "media.talking-head-aroll",- "lane": "media",+ "authority": "media.talking-head-aroll","config": {"defaultConcurrency": 2}@@ -41,7 +41,7 @@{"use": "@narratage/provider-whisperx-local","instance": "whisperx.talking-head-aroll",- "lane": "alignment",+ "authority": "whisperx.talking-head-aroll","config": {"defaultConcurrency": 1}@@ -49,7 +49,7 @@{"use": "@narratage/provider-google-vertex","instance": "vertex.talking-head-aroll",- "lane": "planning",+ "authority": "vertex.talking-head-aroll","config": {"projectEnv": "GOOGLE_CLOUD_PROJECT","credentials": { "store": "env", "key": "GOOGLE_APPLICATION_CREDENTIALS_JSON" },@@ -60,7 +60,7 @@{"use": "@narratage/provider-hyperframes-local","instance": "hyperframes.talking-head-aroll",- "lane": "render",+ "authority": "hyperframes.talking-head-aroll","config": {"workers": 2,"quality": "standard",@@ -81,13 +81,6 @@"process:media"],"scheduling": {- "maxConcurrency": 4,- "lanes": {- "generation": 2,- "media": 2,- "alignment": 1,- "planning": 1,- "render": 1- }+ "maxConcurrency": 4}}diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.tsindex 6c2d049d..1e6172cd 100644--- a/packages/cli/src/main.ts+++ b/packages/cli/src/main.ts@@ -10,7 +10,7 @@ import type {LocalRuntimeControl,} from "@narratage/local";import type { NodeCompiledSourceClosure } from "@narratage/compiler-node";-import type { BuildCatalogDescriptor, OperationProgress } from "@narratage/runtime";+import type { BuildCatalogDescriptor, CapacityReservation, OperationProgress } from "@narratage/runtime";import { isDigest } from "@narratage/protocol";import type { BuildState, CapabilityRef } from "@narratage/protocol";import { parseSourceHeader } from "@narratage/source";@@ -643,6 +643,49 @@ function formatOperationProgress(progress: OperationProgress): string {return `${progress.phase} · ${amount}${progress.unit === undefined ? "" : ` ${progress.unit}`}`;}+type QueueRouteSummary = {+ readonly authority: string;+ readonly route: string;+ readonly queued: number;+ readonly active: number;+ readonly inFlight: number;+};++/** Derive the Provider → capability view from generic tickets; no model registry participates. */+function summarizeQueueRoutes(capacity: readonly CapacityReservation[]): readonly QueueRouteSummary[] {+ const groups = new Map<string, { authority: string; route: string; queued: number; active: number; inFlight: number }>();+ for (const ticket of capacity) {+ if (ticket.queue === undefined) continue;+ const key = `${ticket.queue.authority}\u0000${ticket.queue.route}`;+ const group = groups.get(key) ?? {+ authority: ticket.queue.authority,+ route: ticket.queue.route,+ queued: 0,+ active: 0,+ inFlight: 0,+ };+ if (ticket.active === undefined && !ticket.inFlight) group.queued += 1;+ if (ticket.active !== undefined) group.active += 1;+ if (ticket.inFlight) group.inFlight += 1;+ groups.set(key, group);+ }+ return [...groups.values()].sort((left, right) =>+ left.authority.localeCompare(right.authority) || left.route.localeCompare(right.route));+}++function queueRouteLines(groups: readonly QueueRouteSummary[]): readonly string[] {+ const lines: string[] = [];+ let authority: string | undefined;+ for (const group of groups) {+ if (group.authority !== authority) {+ authority = group.authority;+ lines.push(authority);+ }+ lines.push(` ${group.route}: queued ${group.queued} · active ${group.active} · remote ${group.inFlight}`);+ }+ return lines;+}+function inlineValuePreview(value: unknown, limit = 240): string {const encoded = JSON.stringify(value);if (encoded.length <= limit) return encoded;@@ -1092,10 +1135,11 @@ export async function runCli(const queue = await runtime.queue();const counts = Object.fromEntries(["queued", "leased", "waiting", "blocked", "settling", "terminal"].map((phase) => [phase, queue.dispatches.filter((item) => item.phase === phase).length]));+ const routes = summarizeQueueRoutes(queue.capacity);const machine = {ok: worker.state === "running" && external.services.every((item) => item.state.state === "ready"),worker,- queue: { counts, capacity: queue.capacity },+ queue: { counts, routes, capacity: queue.capacity },services: external.services,};writeOperational(machine, "Runtime status", machine.ok ? "success" : "warning", [@@ -1104,7 +1148,7 @@ export async function runCli(["Running", String(counts.leased ?? 0)],["Waiting", String(counts.waiting ?? 0)],["Capacity reservations", String(queue.capacity.length)],- ]);+ ], queueRouteLines(routes));if (!machine.ok) io.setExitCode?.(1);} finally {await runtime.close();@@ -1236,11 +1280,14 @@ export async function runCli(at: Date.now(),worker,dispatches: queue.dispatches,+ routes: summarizeQueueRoutes(queue.capacity),capacity: queue.capacity,operations: queue.operations.map((item) => ({id: item.id,build: item.build,endpoint: item.endpoint,+ authority: item.authority,+ route: item.route,attempt: item.attempt,revision: item.revision,status: item.status,@@ -1253,10 +1300,14 @@ export async function runCli(item.status === "created" || item.status === "pending");const buildLines = active.slice(0, args.verbose ? undefined : 12).map((item) =>`${item.build}: ${item.phase}${item.admission === "open" ? "" : ` · ${item.admission}`}`);- const capacityLines = queue.capacity.slice(0, args.verbose ? undefined : 12).map((item) =>- `${item.lane}: ${item.inFlight ? "in flight" : "parked"} · ${item.build}`);+ const routeLines = queueRouteLines(summarizeQueueRoutes(queue.capacity));+ const genericCapacityLines = queue.capacity.filter((item) => item.queue === undefined)+ .slice(0, args.verbose ? undefined : 12)+ .map((item) => `${item.resources.map((resource) => resource.id).join(" + ")}: ${item.active === undefined+ ? "queued"+ : "active"} · ${item.build}`);const operationLines = activeOperations.slice(0, args.verbose ? undefined : 12).map((item) =>- `${item.build} · ${item.endpoint}: ${item.progress === undefined+ `${item.build} · ${item.authority} → ${item.route}: ${item.progress === undefined? item.status: formatOperationProgress(item.progress)}`);writeOperational(value, "Runtime queue", active.length === 0 ? "success" : "info", [@@ -1264,11 +1315,12 @@ export async function runCli(["Active Operations", String(activeOperations.length)],["Worker", worker.pid === undefined ? worker.state : `${worker.state} · ${worker.pid}`],["Queued Builds", String(queue.dispatches.length)],- ["Reserved capacity", String(queue.capacity.length)],+ ["Operation tickets", String(queue.capacity.length)],], [...buildLines,...(operationLines.length === 0 ? [] : ["Operations:", ...operationLines]),- ...(capacityLines.length === 0 ? [] : ["Capacity:", ...capacityLines]),+ ...(routeLines.length === 0 ? [] : ["Provider queues:", ...routeLines]),+ ...(genericCapacityLines.length === 0 ? [] : ["Other resources:", ...genericCapacityLines]),]);};if (!args.watch) await writeQueue();@@ -1281,7 +1333,7 @@ export async function runCli(const machine = { build: args.file, operations: status.operations };writeOperational(machine, "Build operations", "info", [["Build", args.file!], ["Operations", String(status.operations.length)],- ], status.operations.map((item) => `${item.id}: ${item.status} · ${item.endpoint}`+ ], status.operations.map((item) => `${item.id}: ${item.status} · ${item.authority} → ${item.route}`+ `${item.progress === undefined ? "" : ` · ${formatOperationProgress(item.progress)}`}`+ `${item.failure === undefined ? "" : ` · ${item.failure.code}: ${item.failure.message}`}`+ `${item.cancellation === undefined ? "" : ` · cancellation ${item.cancellation.status}`}`));@@ -1291,6 +1343,7 @@ export async function runCli(writeOperational({ operation }, operation === undefined ? "Operation not found" : "Operation detail",operation === undefined ? "warning" : "info", operation === undefined ? [] : [["Operation", operation.id], ["Status", operation.status], ["Endpoint", operation.endpoint],+ ["Authority", operation.authority], ["Route", operation.route],["Attempt", String(operation.attempt)],...(operation.progress === undefined ? [] : [["Progress", formatOperationProgress(operation.progress)] as const]),], operation?.failure === undefined ? [] : [diff --git a/packages/driver-node/README.md b/packages/driver-node/README.mdindex 75519235..12670bcd 100644--- a/packages/driver-node/README.md+++ b/packages/driver-node/README.md@@ -10,8 +10,9 @@ the prototype API.component packages depend on that tiny structural port, not on this Node Driver.- `EndpointRegistry` binds an already explicit external capability to implementations that may useAPIs, credentials, queues, local runtimes, devices or human services.-- Registrations may declare a scheduling lane and default concurrency. The environment-neutral- `@narratage/runtime` Scheduler shares that lane across Builds; a Runtime Profile may override its limit.+- Registrations may declare generic scheduling resources. Provider registrations claim one shared+ Authority plus one exact capability Route. The environment-neutral `@narratage/runtime`+ Scheduler acquires all claims atomically across Builds; a Runtime Profile may override limits.- A Producer receives only its command identity and immutable typed inputs. It has no ArtifactStore,credentials, network, queue or store handle; external work must be emitted as a typed `Need`.- Endpoints match the locked `CapabilityRef` and return `TypeRef`. Multiple exact endpoints requirediff --git a/packages/driver-node/src/driver.ts b/packages/driver-node/src/driver.tsindex 62e7520c..5c1fff24 100644--- a/packages/driver-node/src/driver.ts+++ b/packages/driver-node/src/driver.ts@@ -62,15 +62,14 @@ export type NodeDriverOptions = {type Executable =| {readonly command: InvokeProducerCommand;- readonly lane: string;- readonly maxConcurrency: number;+ readonly resources: readonly import("@narratage/runtime").RuntimeResourceClaim[];readonly run: () => Promise<ProducerHandlerResult>;}| {readonly command: FulfillNeedCommand;readonly endpointId: string;- readonly lane: string;- readonly maxConcurrency: number;+ readonly resources: readonly import("@narratage/runtime").RuntimeResourceClaim[];+ readonly queue?: import("@narratage/runtime").RuntimeQueueRoute;readonly registration: EndpointRegistration;};@@ -171,8 +170,11 @@ export class NodeDriver {return {executable: {command,- lane: registration.scheduling?.lane ?? `producer:${producerRegistryKey(command.producer)}`,- maxConcurrency: registration.scheduling?.maxConcurrency ?? Number.MAX_SAFE_INTEGER,+ resources: registration.scheduling?.resources ?? [{+ id: `producer:${producerRegistryKey(command.producer)}`,+ maxActive: Number.MAX_SAFE_INTEGER,+ maxInFlight: Number.MAX_SAFE_INTEGER,+ }],run: async () =>registration.handler({command: structuredClone(command),@@ -227,8 +229,12 @@ export class NodeDriver {executable: {command,endpointId: registration.id,- lane: registration.scheduling?.lane ?? `endpoint:${registration.id}`,- maxConcurrency: registration.scheduling?.maxConcurrency ?? 1,+ resources: registration.scheduling?.resources ?? [{+ id: `endpoint:${registration.id}`,+ maxActive: 1,+ maxInFlight: 1,+ }],+ ...(registration.scheduling?.queue === undefined ? {} : { queue: registration.scheduling.queue }),registration,},};@@ -336,6 +342,8 @@ export class NodeDriver {|| snapshot.build !== expected.build|| snapshot.command !== expected.command|| snapshot.endpoint !== expected.endpoint+ || snapshot.authority !== expected.authority+ || snapshot.route !== expected.route|| snapshot.implementationDigest !== expected.implementationDigest|| snapshot.runtimeClosure !== expected.runtimeClosure|| snapshot.requestDigest !== expected.requestDigest) {@@ -356,10 +364,13 @@ export class NodeDriver {if (runtimeClosure === undefined) throw new Error("recoverable Endpoint requires Runtime Closure");const implementation = executable.registration.runtimeImplementation;if (implementation === undefined) throw new Error("recoverable Endpoint has no implementation identity");+ if (executable.queue === undefined) throw new Error("recoverable Endpoint has no Provider Authority route");const base = {build: context.build,command: executable.command.id,endpoint: executable.endpointId,+ authority: executable.queue.authority,+ route: executable.queue.route,implementationDigest: implementation.digest,runtimeClosure,requestDigest: executable.command.need.requestDigest,@@ -523,12 +534,11 @@ export class NodeDriver {state,runnable: classifications.flatMap(({ executable }) => executable === undefined ? [] : [{command: executable.command,- lane: executable.lane,- maxConcurrency: executable.maxConcurrency,+ resources: executable.resources,+ ...(("queue" in executable && executable.queue !== undefined) ? { queue: executable.queue } : {}),capacityMode: "endpointId" in executable && executable.registration.kind === "recoverable"? "recoverable": "active",- maxInFlight: executable.maxConcurrency,}]),blocked: classifications.map((item) => item.blocked)@@ -593,6 +603,8 @@ export class NodeDriver {build: operation.build,command: operation.command,endpoint: operation.endpoint,+ authority: operation.authority,+ route: operation.route,implementationDigest: operation.implementationDigest,runtimeClosure: operation.runtimeClosure,requestDigest: operation.requestDigest,@@ -728,6 +740,9 @@ export class NodeDriver {});return { status: "paused", state, journal, 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;diff --git a/packages/driver-node/src/registry.ts b/packages/driver-node/src/registry.tsindex cf497feb..8689a45e 100644--- a/packages/driver-node/src/registry.ts+++ b/packages/driver-node/src/registry.ts@@ -46,12 +46,20 @@ function sameRef(function verifyScheduling(scheduling: SchedulingHint | undefined): void {if (scheduling === undefined) return;- if (scheduling.lane !== undefined && scheduling.lane.trim().length === 0) {- throw new Error("scheduling lane must not be empty");- }- if (scheduling.maxConcurrency !== undefined- && (!Number.isSafeInteger(scheduling.maxConcurrency) || scheduling.maxConcurrency < 1)) {- throw new Error("scheduling maxConcurrency must be a positive safe integer");+ if (scheduling.resources.length === 0) throw new Error("scheduling resources must not be empty");+ const ids = scheduling.resources.map((resource) => {+ if (resource.id.trim().length === 0) throw new Error("scheduling resource id must not be empty");+ for (const [name, value] of [["maxActive", resource.maxActive], ["maxInFlight", resource.maxInFlight]] as const) {+ if (!Number.isSafeInteger(value) || value < 1) {+ throw new Error(`scheduling resource ${resource.id} ${name} must be a positive safe integer`);+ }+ }+ return resource.id;+ });+ if (new Set(ids).size !== ids.length) throw new Error("scheduling resources contain duplicate ids");+ if (scheduling.queue !== undefined+ && (scheduling.queue.authority.trim().length === 0 || scheduling.queue.route.trim().length === 0)) {+ throw new Error("scheduling queue authority and route must not be empty");}}@@ -209,15 +217,35 @@ export class EndpointRegistry implements EndpointRegistrar {if (JSON.stringify(credentialSlots) !== JSON.stringify(endpoint.credentialSlots)) {throw new Error(`Endpoint ${endpoint.id} credential slots do not match the Runtime Closure`);}+ const route = endpointCapabilityKey(binding.capability);+ const declaredRoute = registration.scheduling?.queue;+ if (declaredRoute !== undefined+ && (declaredRoute.authority !== endpoint.authority || declaredRoute.route !== route)) {+ throw new Error(`Endpoint ${endpoint.id} scheduling route differs from the Runtime Closure`);+ }pending.push({key: endpointCapabilityKey(binding.capability),endpoint: endpoint.id,- scheduling: { lane: endpoint.lane, maxConcurrency: endpoint.maxConcurrency },+ scheduling: {+ queue: { authority: endpoint.authority, route },+ resources: [+ {+ id: `authority:${endpoint.authority}`,+ maxActive: endpoint.maxConcurrency,+ maxInFlight: endpoint.maxConcurrency,+ },+ {+ id: `route:${endpoint.authority}/${route}`,+ maxActive: endpoint.maxConcurrency,+ maxInFlight: endpoint.maxConcurrency,+ },+ ],+ },});}for (const item of pending) {this.#bindings.set(item.key, item.endpoint);- this.#runtimeScheduling.set(item.endpoint, item.scheduling);+ this.#runtimeScheduling.set(`${item.endpoint}\n${item.key}`, item.scheduling);}this.#runtimeClosure = closure.digest;}@@ -233,7 +261,7 @@ export class EndpointRegistry implements EndpointRegistrar {const registration = registrations.find((candidate) => candidate.id === bound);const scheduling = registration === undefined? undefined- : this.#runtimeScheduling.get(registration.id) ?? registration.scheduling;+ : this.#runtimeScheduling.get(`${registration.id}\n${key}`) ?? registration.scheduling;return registration === undefined? { status: "missing", endpointId: bound }: {@@ -249,7 +277,7 @@ export class EndpointRegistry implements EndpointRegistrar {};}const registration = registrations[0]!;- const scheduling = this.#runtimeScheduling.get(registration.id) ?? registration.scheduling;+ const scheduling = this.#runtimeScheduling.get(`${registration.id}\n${key}`) ?? registration.scheduling;return {status: "resolved",registration: scheduling === undefined ? registration : { ...registration, scheduling },diff --git a/packages/driver-node/test/scheduler.test.ts b/packages/driver-node/test/scheduler.test.tsindex 601453b3..76bf5621 100644--- a/packages/driver-node/test/scheduler.test.ts+++ b/packages/driver-node/test/scheduler.test.ts@@ -6,6 +6,7 @@ import {NodeDriver,parseBuildState,EndpointRegistry,+ endpointCapabilityKey,serializeBuildState,} from "@narratage/driver-node";import type {@@ -125,7 +126,7 @@ function createParallelGreetingBuild(generationCount = 2) {}function configuredExecutor(options: {- readonly lane: string;+ readonly resource: string;readonly defaultConcurrency: number;readonly observe: (active: number) => void;readonly runtimeImplementation?: RuntimeEndpointImplementation;@@ -155,8 +156,11 @@ function configuredExecutor(options: {},{scheduling: {- lane: options.lane,- maxConcurrency: options.defaultConcurrency,+ resources: [{+ id: options.resource,+ maxActive: options.defaultConcurrency,+ maxInFlight: options.defaultConcurrency,+ }],},...(options.runtimeImplementation === undefined? {}@@ -259,7 +263,7 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl{ 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, lane: "endpoint:generation.local" },+ { id: "generation.local", facet: providerFacet, authority: "fixture.account" },],scheduler: "scheduler.local",worker: "worker.local",@@ -278,7 +282,13 @@ function resolvedRuntime(laneLimit: number, lifecycle: "immediate" | "recoverabl}],scheduling: {maxConcurrency: 8,- lanes: [{ name: "endpoint:generation.local", maxConcurrency: laneLimit }],+ resources: [+ { id: "authority:fixture.account", maxConcurrency: laneLimit },+ {+ id: `route:fixture.account/${endpointCapabilityKey(capabilities.generation)}`,+ maxConcurrency: laneLimit,+ },+ ],},}));return { closure, modules };@@ -314,10 +324,10 @@ function recoverableExecutor(};}-test("one local Scheduler shares an Endpoint lane across multiple Builds", async () => {+test("one local Scheduler shares an Endpoint resource across multiple Builds", async () => {let maximumActive = 0;const { executor, getCalls } = configuredExecutor({- lane: "seedance:fixture.account",+ resource: "authority:fixture.account",defaultConcurrency: 1,observe(active) {maximumActive = Math.max(maximumActive, active);@@ -333,14 +343,14 @@ test("one local Scheduler shares an Endpoint lane across multiple Builds", asyncassert.equal(getCalls(), 2);assert.equal(maximumActive, 1);assert.equal(results.every((result) =>- result.journal.some((entry) => entry.lane === "seedance:fixture.account")), true);+ result.journal.some((entry) => entry.resources.includes("authority:fixture.account"))), true);});-test("a Runtime Profile lane override changes parallelism without changing either Build", async () => {+test("a Runtime Profile resource override changes parallelism without changing either Build", async () => {let maximumActive = 0;- const lane = "seedance:fixture.account";+ const resource = "authority:fixture.account";const { executor } = configuredExecutor({- lane,+ resource,defaultConcurrency: 1,observe(active) {maximumActive = Math.max(maximumActive, active);@@ -349,7 +359,7 @@ test("a Runtime Profile lane override changes parallelism without changing eitheconst initial = createGreetingBuild();const scheduler = new LocalBuildScheduler(executor, {maxConcurrency: 8,- laneLimits: { [lane]: 2 },+ resourceLimits: { [resource]: 2 },});const results = await scheduler.run([{ id: "video-a", state: initial },@@ -361,10 +371,10 @@ test("a Runtime Profile lane override changes parallelism without changing eitheassert.equal(results[0]?.state.request.digest, results[1]?.state.request.digest);});-test("independent paid commands inside one Build may fill the same lane without duplicating their shared upstream", async () => {+test("independent paid commands inside one Build may fill the same resource without duplicating their shared upstream", async () => {let maximumActive = 0;const { executor, getCalls } = configuredExecutor({- lane: "seedance:fixture.account",+ resource: "authority:fixture.account",defaultConcurrency: 2,observe(active) {maximumActive = Math.max(maximumActive, active);@@ -385,7 +395,7 @@ test("independent paid commands inside one Build may fill the same lane withouttest("durable scheduling keeps the rest of an in-flight command batch after one event is stored", async () => {let maximumActive = 0;const { executor, getCalls } = configuredExecutor({- lane: "seedance:fixture.account",+ resource: "authority:fixture.account",defaultConcurrency: 2,observe(active) {maximumActive = Math.max(maximumActive, active);@@ -446,7 +456,7 @@ test("a locked Runtime Closure assembles exact Endpoint code and Scheduler policlet maximumActive = 0;const { closure, modules } = resolvedRuntime(2);const { executor, endpoints } = configuredExecutor({- lane: "ignored-registration-lane",+ resource: "authority:ignored-registration",defaultConcurrency: 1,runtimeImplementation: {facet: providerFacet,@@ -468,14 +478,14 @@ test("a locked Runtime Closure assembles exact Endpoint code and Scheduler polic]);assert.deepEqual(results.map((result) => result.status), ["complete", "complete"]);- assert.equal(maximumActive, 2, "the locked Profile override, not registration order, owns the lane");+ assert.equal(maximumActive, 2, "the locked Profile override, not registration order, owns the resource");assert.equal(results.every((result) => result.state.receipts[0]?.fulfiller === "generation.local"), true);});test("a same-name Endpoint with different implementation bytes is rejected before execution", () => {const { closure, modules } = resolvedRuntime(1);const { endpoints, getCalls } = configuredExecutor({- lane: "endpoint:generation.local",+ resource: "authority:fixture.account",defaultConcurrency: 1,runtimeImplementation: {facet: providerFacet,@@ -492,7 +502,7 @@ test("a same-name Endpoint with different implementation bytes is rejected befortest("a same-name Endpoint with different configured-instance identity is rejected", () => {const { closure, modules } = resolvedRuntime(1);const { endpoints, getCalls } = configuredExecutor({- lane: "endpoint:generation.local",+ resource: "authority:fixture.account",defaultConcurrency: 1,runtimeImplementation: {facet: providerFacet,@@ -509,7 +519,7 @@ test("a same-name Endpoint with different configured-instance identity is rejecttest("a recoverable Runtime facet cannot be activated by a one-shot Handler", () => {const { closure, modules } = resolvedRuntime(1, "recoverable");const { endpoints, getCalls } = configuredExecutor({- lane: "endpoint:generation.local",+ resource: "authority:fixture.account",defaultConcurrency: 1,runtimeImplementation: {facet: providerFacet,diff --git a/packages/endpoint-kit/src/index.ts b/packages/endpoint-kit/src/index.tsindex 8e4d9ebc..d7d78a4d 100644--- a/packages/endpoint-kit/src/index.ts+++ b/packages/endpoint-kit/src/index.ts@@ -88,8 +88,15 @@ export type RecoverableEndpoint = {/** Endpoint/implementation scheduling metadata; it never changes Core demand or command identity. */export type EndpointScheduling = {- readonly lane?: string;- readonly maxConcurrency?: number;+ readonly resources: readonly {+ readonly id: string;+ readonly maxActive: number;+ readonly maxInFlight: number;+ }[];+ readonly queue?: {+ readonly authority: string;+ readonly route: string;+ };};export type EndpointRetryPolicy = {@@ -171,7 +178,8 @@ export type DefineEndpointPackageOptions = {readonly module: ModuleRef;readonly facet: string;readonly instance: string;- readonly lane?: string;+ /** Explicit non-secret account, deployment or compute-pool identity. */+ readonly authority: string;readonly implementation: {readonly locator: string;readonly digest: Digest;@@ -207,7 +215,7 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En"Endpoint module identity is invalid");assert(options.facet.trim().length > 0, "Endpoint facet is empty");assert(options.instance.trim().length > 0, "Endpoint instance is empty");- if (options.lane !== undefined) assert(options.lane.trim().length > 0, "Endpoint lane 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");@@ -276,8 +284,8 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): Enconst instance: RuntimeProfileInstance = {id: options.instance,facet,+ authority: options.authority,configurationDigest,- ...(options.lane === undefined ? {} : { lane: options.lane }),};const bindings: readonly RuntimeEndpointBinding[] = fulfills.map((item) => ({...item,@@ -291,6 +299,8 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): Encredentials: credentialDescriptions,install(registry) {for (const capability of options.capabilities) {+ const route = refKey(capability.capability);+ const concurrency = positiveInteger(options.defaultConcurrency ?? 1, "defaultConcurrency");const common: EndpointRegistrationOptions = {...(capability.supports === undefined ? {} : { supports: capability.supports }),runtimeImplementation: {@@ -300,8 +310,19 @@ export function defineEndpointPackage(options: DefineEndpointPackageOptions): En},credentials,scheduling: {- lane: options.lane ?? `endpoint:${options.instance}`,- maxConcurrency: options.defaultConcurrency ?? 1,+ queue: { authority: options.authority, route },+ resources: [+ {+ id: `authority:${options.authority}`,+ maxActive: concurrency,+ maxInFlight: concurrency,+ },+ {+ id: `route:${options.authority}/${route}`,+ maxActive: concurrency,+ maxInFlight: concurrency,+ },+ ],},...(capability.lifecycle === "recoverable" && capability.retry !== undefined? { retry: capability.retry }diff --git a/packages/endpoint-kit/test/endpoint.test.ts b/packages/endpoint-kit/test/endpoint.test.tsindex bc5e9581..0624511e 100644--- a/packages/endpoint-kit/test/endpoint.test.ts+++ b/packages/endpoint-kit/test/endpoint.test.ts@@ -46,6 +46,7 @@ test("one Endpoint definition generates Manifest, instance, bindings and host-nemodule: { name: "example.provider", version: "1" },facet: "http-json",instance: "example.personal",+ authority: "example.personal",implementation,permissions: ["network:example.test"],configuration: { baseUrl: "https://example.test" },@@ -91,6 +92,7 @@ test("non-secret Endpoint configuration and credential references change instancmodule: { name: "example.provider", version: "1" },facet: "http-json",instance: "example.personal",+ authority: "example.personal",implementation,configuration: { baseUrl },credentials: { apiKey: credentialRef("env", variable) },diff --git a/packages/local/README.md b/packages/local/README.mdindex 570dfded..851052af 100644--- a/packages/local/README.md+++ b/packages/local/README.md@@ -51,7 +51,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 andasks the selected Scheduler to regenerate the current commands. Recoverable Provider checkpoints-remain in `OperationStore`; dispatch lease, heartbeat, admission and shared lane capacity remain in+remain in `OperationStore`; dispatch lease, heartbeat, admission and shared resource capacity remain in`BuildDispatchStore`; operational history remains in `RuntimeJournal`.Cancellation first closes admission. Existing Operations keep their own execution fact and adiff --git a/packages/local/src/config.ts b/packages/local/src/config.tsindex d32cc18e..2e2ef6de 100644--- a/packages/local/src/config.ts+++ b/packages/local/src/config.ts@@ -33,7 +33,7 @@ import type { LocalRuntimeControl } from "./types.js";export type RuntimeConfigEntry = {readonly use: string;readonly instance: string;- readonly lane?: string;+ readonly authority?: string;readonly config?: CanonicalValue;};@@ -53,7 +53,7 @@ export type RuntimeConfigDocument = {readonly permissions: readonly string[];readonly scheduling: {readonly maxConcurrency: number;- readonly lanes?: Readonly<Record<string, number>>;+ readonly resources?: Readonly<Record<string, number>>;readonly maxEventsPerBuild?: number;};};@@ -94,14 +94,16 @@ function stringList(value: unknown, subject: string): readonly string[] {return items;}-function entry(value: unknown, subject: string, laneAllowed: boolean): RuntimeConfigEntry {+function entry(value: unknown, subject: string, authorityRequired: boolean): RuntimeConfigEntry {const item = object(value, subject);- exactKeys(item, laneAllowed ? ["use", "instance", "lane", "config"] : ["use", "instance", "config"], subject);- const lane = laneAllowed ? optionalString(item.lane, `${subject}.lane`) : undefined;+ exactKeys(item, authorityRequired ? ["use", "instance", "authority", "config"] : ["use", "instance", "config"], subject);+ const authority = authorityRequired+ ? requiredString(item.authority, `${subject}.authority`)+ : undefined;return {use: requiredString(item.use, `${subject}.use`),instance: requiredString(item.instance, `${subject}.instance`),- ...(lane === undefined ? {} : { lane }),+ ...(authority === undefined ? {} : { authority }),...(item.config === undefined ? {} : { config: canonicalize(item.config) }),};}@@ -110,17 +112,17 @@ function entry(value: unknown, subject: string, laneAllowed: boolean): RuntimeCofunction scheduling(value: unknown): RuntimeConfigDocument["scheduling"] {if (value === undefined) throw new Error("$runtime.scheduling is required");const item = object(value, "$runtime.scheduling");- exactKeys(item, ["maxConcurrency", "lanes", "maxEventsPerBuild"], "$runtime.scheduling");- const lanes = item.lanes === undefined ? undefined : object(item.lanes, "$runtime.scheduling.lanes");- const normalizedLanes = lanes === undefined ? undefined : Object.fromEntries(Object.entries(lanes).map(([name, limit]) => {- if (name.trim().length === 0) throw new Error("Runtime lane name must not be empty");- return [name, positiveInteger(limit, `$runtime.scheduling.lanes.${name}`)!];+ exactKeys(item, ["maxConcurrency", "resources", "maxEventsPerBuild"], "$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");+ return [name, positiveInteger(limit, `$runtime.scheduling.resources.${name}`)!];}));const maxConcurrency = positiveInteger(item.maxConcurrency, "$runtime.scheduling.maxConcurrency");if (maxConcurrency === undefined) throw new Error("$runtime.scheduling.maxConcurrency is required");return {maxConcurrency,- ...(normalizedLanes === undefined ? {} : { lanes: normalizedLanes }),+ ...(normalizedResources === undefined ? {} : { resources: normalizedResources }),...(positiveInteger(item.maxEventsPerBuild, "$runtime.scheduling.maxEventsPerBuild") === undefined? {}: { maxEventsPerBuild: item.maxEventsPerBuild as number }),@@ -298,7 +300,7 @@ export async function declaredExternalServices(const activation = await registry.activateEndpoint(item.use, {root,instance: item.instance,- ...(item.lane === undefined ? {} : { lane: item.lane }),+ authority: item.authority!,config: item.config ?? {},});if (options.capabilities !== undefined && !activation.endpoint.bindings.some((binding) =>@@ -373,7 +375,7 @@ export async function doctorRuntimeConfig(const context = {root,instance: item.instance,- ...(item.lane === undefined ? {} : { lane: item.lane }),+ authority: item.authority!,config: item.config ?? {},};let activation: RuntimeEndpointActivation;@@ -522,7 +524,7 @@ export async function createRuntimeFromConfig(return await registry.createEndpoint(item.use, {root,instance: item.instance,- ...(item.lane === undefined ? {} : { lane: item.lane }),+ authority: item.authority!,config: item.config ?? {},});}));@@ -642,7 +644,7 @@ export async function createRuntimeCredentialsFromConfig(const endpoint = await registry.createEndpoint(endpointEntry.use, {root,instance: endpointEntry.instance,- ...(endpointEntry.lane === undefined ? {} : { lane: endpointEntry.lane }),+ authority: endpointEntry.authority!,config: endpointEntry.config ?? {},});return createLocalCredentialControl({diff --git a/packages/local/src/runtime.ts b/packages/local/src/runtime.tsindex 43be9fd5..8610c705 100644--- a/packages/local/src/runtime.ts+++ b/packages/local/src/runtime.ts@@ -121,8 +121,8 @@ export async function createLocalRuntime(options: CreateLocalRuntimeOptions,): Promise<LocalRuntime> {const buildCatalog = options.buildCatalog;- if (options.scheduling?.maxConcurrency !== undefined || options.scheduling?.laneLimits !== undefined) {- throw new Error("a locked Runtime Closure owns maxConcurrency and lane limits");+ if (options.scheduling?.maxConcurrency !== undefined || options.scheduling?.resourceLimits !== undefined) {+ throw new Error("a locked Runtime Closure owns maxConcurrency and resource limits");}const producers = new ProducerRegistry();const endpoints = new EndpointRegistry();@@ -154,7 +154,7 @@ export async function createLocalRuntime(});const scheduling = {maxConcurrency: options.closure.value.scheduling.maxConcurrency,- laneLimits: Object.fromEntries(options.closure.value.scheduling.lanes.map((lane) => [lane.name, lane.maxConcurrency])),+ resourceLimits: Object.fromEntries(options.closure.value.scheduling.resources.map((resource) => [resource.id, resource.maxConcurrency])),...(options.scheduling?.maxEventsPerBuild === undefined? {} : { maxEventsPerBuild: options.scheduling.maxEventsPerBuild }),};@@ -343,8 +343,8 @@ export async function createProjectLocalRuntime(endpoints: endpointPackages.flatMap((item) => item.bindings),scheduling: {maxConcurrency: options.scheduling.maxConcurrency,- lanes: Object.entries(options.scheduling.lanes ?? {}).map(([name, maxConcurrency]) => ({- name,+ resources: Object.entries(options.scheduling.resources ?? {}).map(([id, maxConcurrency]) => ({+ id,maxConcurrency,})),},diff --git a/packages/local/src/scheduler-package.ts b/packages/local/src/scheduler-package.tsindex 89108eb7..9ebe64f9 100644--- a/packages/local/src/scheduler-package.ts+++ b/packages/local/src/scheduler-package.ts@@ -29,7 +29,7 @@ export function createLocalSchedulerPackage(locator: "@narratage/local/scheduler",digest: localSchedulerImplementationDigest,},- configuration: { algorithm: "queue-free-fair-lanes", version: 1 },+ configuration: { algorithm: "queue-free-atomic-resources", version: 1 },service: {create(executor, options) {return new LocalBuildScheduler(executor, options);@@ -54,7 +54,7 @@ export function createLocalExecutionPackage(locator: "@narratage/local/scheduler",digest: localSchedulerImplementationDigest,},- configuration: { algorithm: "fair-lanes", version: 1 },+ configuration: { algorithm: "atomic-resources", version: 1 },service: {create(executor, options) {return new LocalBuildScheduler(executor, options);diff --git a/packages/local/src/types.ts b/packages/local/src/types.tsindex cd15ce62..5c7b35e3 100644--- a/packages/local/src/types.ts+++ b/packages/local/src/types.ts@@ -98,7 +98,7 @@ export type ProjectLocalRuntimeOptions = {readonly allowedPermissions: readonly string[];readonly scheduling: {readonly maxConcurrency: number;- readonly lanes?: Readonly<Record<string, number>>;+ readonly resources?: Readonly<Record<string, number>>;readonly maxEventsPerBuild?: number;};readonly validators?: LocalTypeValidatorRegistry;diff --git a/packages/local/src/worker.ts b/packages/local/src/worker.tsindex 5eef7a8f..0fa7c71d 100644--- a/packages/local/src/worker.ts+++ b/packages/local/src/worker.ts@@ -4,7 +4,6 @@ import type { BuildState, Digest } from "@narratage/protocol";import { capacityReservationId } from "@narratage/runtime";import type {BuildDispatchSnapshot,- CapacityReservation,DispatchLease,RuntimeCommandExecutor,RuntimeExecutionResult,@@ -88,33 +87,30 @@ class CapacityExecutor implements RuntimeCommandExecutor {`Build ${this.#build} Worker lease is stale`);}- async #acquire(descriptor: RuntimeRunnableCommand): Promise<CapacityReservation> {- while (true) {- await this.#assertAuthority();- const now = Date.now();- const acquired = await this.#options.stores.dispatch.acquireCapacity({- build: this.#build,- command: descriptor.command.id,- lane: descriptor.lane,- mode: descriptor.capacityMode ?? "active",- buildLease: this.#dispatchLease,- owner: this.#dispatchLease.owner,- token: randomUUID(),- now,- leaseMs: this.#leaseMs,- limits: {- globalActive: positive(this.#options.scheduling.maxConcurrency ?? 1, "global active capacity"),- laneActive: positive(- this.#options.scheduling.laneLimits?.[descriptor.lane] ?? descriptor.maxConcurrency,- `lane ${descriptor.lane} active capacity`,- ),- laneInFlight: positive(descriptor.maxInFlight ?? descriptor.maxConcurrency,- `lane ${descriptor.lane} in-flight capacity`),- },- });- if (acquired.status === "acquired") return acquired.reservation;- await pause(Math.max(1, acquired.retryAt - now));- }+ async #acquire(descriptor: RuntimeRunnableCommand) {+ await this.#assertAuthority();+ const now = Date.now();+ const resources = descriptor.resources.map((resource) => {+ const override = this.#options.scheduling.resourceLimits?.[resource.id];+ return override === undefined+ ? resource+ : { ...resource, maxActive: override, maxInFlight: override };+ });+ return await this.#options.stores.dispatch.acquireCapacity({+ build: this.#build,+ command: descriptor.command.id,+ resources,+ ...(descriptor.queue === undefined ? {} : { queue: descriptor.queue }),+ mode: descriptor.capacityMode ?? "active",+ buildLease: this.#dispatchLease,+ owner: this.#dispatchLease.owner,+ token: randomUUID(),+ now,+ leaseMs: this.#leaseMs,+ limits: {+ globalActive: positive(this.#options.scheduling.maxConcurrency ?? 1, "global active capacity"),+ },+ });}async executeCommand(@@ -125,7 +121,17 @@ class CapacityExecutor implements RuntimeCommandExecutor {assert(context.build === this.#build, "Capacity executor received another Build identity");const descriptor = this.#delegate.prepare(state).runnable.find((item) => item.command.id === commandId);assert(descriptor !== undefined, `command ${commandId} is not currently executable`);- const reservation = await this.#acquire(descriptor);+ const acquired = await this.#acquire(descriptor);+ if (acquired.status === "blocked") {+ return {+ status: "deferred",+ wakeAt: acquired.retryAt,+ reason: acquired.resource === undefined+ ? acquired.reason+ : `${acquired.reason}:${acquired.resource}`,+ };+ }+ const reservation = acquired.reservation;const lease = reservation.active;assert(lease !== undefined, `Capacity reservation ${reservation.id} has no active lease`);let heartbeatError: unknown;@@ -294,8 +300,11 @@ class DurableLocalWorker implements RuntimeWorker {async runOnce(options: { readonly owner: string; readonly leaseMs: number }): Promise<BuildDispatchSnapshot | undefined> {assert(options.owner.trim().length > 0, "Worker owner is empty");const leaseMs = positive(options.leaseMs, "Worker leaseMs");+ const runtimeClosure = this.#options.runtimeClosure;+ assert(runtimeClosure !== undefined, "durable Worker requires one exact Runtime Revision");const token = randomUUID();const dispatch = await this.#options.stores.dispatch.claim({+ runtimeClosure: runtimeClosure.digest,owner: options.owner,token,now: Date.now(),@@ -309,10 +318,8 @@ class DurableLocalWorker implements RuntimeWorker {const stored = await this.#options.stores.builds.read(dispatch.build);assert(stored !== undefined, `Dispatch ${dispatch.build} has no BuildState`);assert(stored.state.id === dispatch.core, `Dispatch ${dispatch.build} Core identity differs`);- if (this.#options.runtimeClosure !== undefined) {- assert(this.#options.runtimeClosure.digest === dispatch.runtimeClosure,- `Dispatch ${dispatch.build} Runtime Closure differs`);- }+ assert(runtimeClosure.digest === dispatch.runtimeClosure,+ `Dispatch ${dispatch.build} Runtime Closure differs`);const suppressedCommands = new Set<string>();const controlled = new CapacityExecutor(this.#executor,@@ -357,12 +364,14 @@ class DurableLocalWorker implements RuntimeWorker {return terminal;}const pending = result.journal.filter((item) => item.status === "pending");+ const deferred = result.journal.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");const now = Date.now();const wakeTimes = [...pending.map((item) => item.wakeAt ?? now + 1_000),+ ...deferred.map((item) => item.wakeAt ?? now + 1_000),...controlledOperations.map((item) => item.cancellation?.status === "requested"&& item.cancellation.retryAt === undefined? nowdiff --git a/packages/local/test/config.test.ts b/packages/local/test/config.test.tsindex 0743612f..28b602d3 100644--- a/packages/local/test/config.test.ts+++ b/packages/local/test/config.test.ts@@ -95,7 +95,7 @@ test("declarative adapters are explicit and never guessed", async () => {await writeFile(path, JSON.stringify({format: "svml.runtime-config@1",...required,- endpoints: [{ use: "example.missing", instance: "missing", config: {} }],+ endpoints: [{ use: "example.missing", instance: "missing", authority: "example.missing", config: {} }],permissions: [],}));await assert.rejects(@@ -128,9 +128,9 @@ test("doctor names the external program a Provider needs, and the command that sformat: "svml.runtime-config@1",...required,endpoints: [- { use: "example.absent", instance: "absent", config: {} },- { use: "example.wrong", instance: "wrong", config: {} },- { use: "example.exploding", instance: "exploding", config: {} },+ { use: "example.absent", instance: "absent", authority: "example.account", config: {} },+ { use: "example.wrong", instance: "wrong", authority: "example.account", config: {} },+ { use: "example.exploding", instance: "exploding", authority: "example.account", config: {} },],permissions: [],}));@@ -178,8 +178,8 @@ test("doctor activates one pure Endpoint declaration without constructing Runtim...required,runtimeServices: [{ use: "example.store", instance: "store", config: { mode: "valid" } }],endpoints: [- { use: "example.invalid", instance: "invalid", config: { mode: "bad" } },- { use: "example.missing-credential", instance: "missing-credential", config: {} },+ { use: "example.invalid", instance: "invalid", authority: "example.account", config: { mode: "bad" } },+ { use: "example.missing-credential", instance: "missing-credential", authority: "example.account", config: {} },],permissions: [],}));@@ -245,7 +245,7 @@ test("doctor resolves credentials from the same Endpoint declaration used by exeformat: "svml.runtime-config@1",...required,runtimeServices: [{ use: "example.credentials", instance: "credentials", config: {} }],- endpoints: [{ use: "example.provider", instance: "provider", config: {} }],+ endpoints: [{ use: "example.provider", instance: "provider", authority: "example.account", config: {} }],permissions: [],}));diff --git a/packages/local/test/external-services.test.ts b/packages/local/test/external-services.test.tsindex f62852ab..ecd23651 100644--- a/packages/local/test/external-services.test.ts+++ b/packages/local/test/external-services.test.ts@@ -46,9 +46,9 @@ async function project(service: (root: string) => RuntimeExternalService) {},},endpoints: [- { use: "example.program", instance: "one", config: {} },+ { use: "example.program", instance: "one", authority: "example.local", config: {} },// A second Endpoint driving the same program: it is brought up once.- { use: "example.program", instance: "two", config: {} },+ { use: "example.program", instance: "two", authority: "example.local", config: {} },],permissions: [],scheduling: { maxConcurrency: 1 },diff --git a/packages/local/test/local.test.ts b/packages/local/test/local.test.tsindex a4a7c3ed..71a7e1ce 100644--- a/packages/local/test/local.test.ts+++ b/packages/local/test/local.test.ts@@ -133,6 +133,7 @@ test("Endpoint-declared credentials use the selected writable Store without a Prmodule: providerModule,facet: "generation",instance: "generation.auth-test",+ authority: "generation.auth-test",implementation: { locator: "example.local-endpoint/generation", digest: providerDigest },credentials: { apiKey: credentialRef("memory", "generation.api-key") },credentialInputs: { apiKey: { label: "Generation API key" } },@@ -274,7 +275,7 @@ test("project local runtime resumes durable work while component and endpoint paconst endpointPackage: EndpointPackage = {name: "example.endpoint.personal",manifest: providerManifest,- instance: { id: "generation.personal", facet: providerFacet },+ instance: { id: "generation.personal", facet: providerFacet, authority: "generation.personal" },bindings: [{capability: capabilities.generation,returns: types.generated,@@ -477,6 +478,8 @@ test("two durable Workers share one SQLite capacity limit across Runtime instanc} as const);let first: Awaited<ReturnType<typeof createProjectLocalRuntime>> | undefined;let second: Awaited<ReturnType<typeof createProjectLocalRuntime>> | undefined;+ let firstTurn: Promise<unknown> | undefined;+ let secondTurn: Promise<unknown> | undefined;try {first = await createProjectLocalRuntime({ root: directory, ...options() });second = await createProjectLocalRuntime({ root: directory, ...options() });@@ -488,18 +491,23 @@ test("two durable Workers share one SQLite capacity limit across Runtime instancid: "capacity-b",state: createGreetingBuild({ generationRealization: "placeholder", goalAccepts: "substitute" }),});- const firstTurn = first.workOnce({ owner: "worker-a", leaseMs: 120 });+ firstTurn = first.workOnce({ owner: "worker-a", leaseMs: 120 });await firstEntered;- const secondTurn = second.workOnce({ owner: "worker-b", leaseMs: 120 });+ secondTurn = second.workOnce({ owner: "worker-b", leaseMs: 120 });await new Promise((resolve) => setTimeout(resolve, 200));assert.equal(promptCalls, 1,"the second Worker cannot enter after the original capacity expiry while its peer keeps heartbeating");- assert.equal((await first.queue()).capacity.length, 1);+ const tickets = (await first.queue()).capacity;+ assert.equal(tickets.length, 2, "the active command and its blocked peer are both durable tickets");+ assert.equal(tickets.filter((item) => item.active !== undefined).length, 1);release?.();await Promise.all([firstTurn, secondTurn]);+ assert.equal(promptCalls, 1, "a capacity miss releases its Build instead of waiting inside the Worker");+ await second.workOnce({ owner: "worker-b", leaseMs: 120 });assert.equal(promptCalls, 2);} finally {release?.();+ await Promise.allSettled([firstTurn, secondTurn].filter((item): item is Promise<unknown> => item !== undefined));await second?.close();await first?.close();await rm(directory, { recursive: true, force: true });diff --git a/packages/provider-google-vertex/src/activation.ts b/packages/provider-google-vertex/src/activation.tsindex 0db08a5e..ffc1b587 100644--- a/packages/provider-google-vertex/src/activation.ts+++ b/packages/provider-google-vertex/src/activation.ts@@ -13,6 +13,7 @@ import { createGoogleVertexCaptionProvider } from "./provider.js";const googleVertexRuntimeAdapter = createRuntimeEndpointAdapterFacet({use: "@narratage/provider-google-vertex",activate(context) {+ if (context.authority === undefined) throw new Error("Google Vertex Provider Authority is required");const config = runtimeConfigObject(context.config, "Google Vertex");runtimeConfigExact(config, ["project", "projectEnv", "location", "credentials", "defaultConcurrency",@@ -33,7 +34,7 @@ const googleVertexRuntimeAdapter = createRuntimeEndpointAdapterFacet({endpoint: createGoogleVertexCaptionProvider({...(projectValue === undefined ? { projectEnv: projectEnv! } : { project: projectValue }),instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,...(location === undefined ? {} : { location }),credentialsJson: credentials,...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),diff --git a/packages/provider-google-vertex/src/provider.ts b/packages/provider-google-vertex/src/provider.tsindex 605e71ba..e892d5e1 100644--- a/packages/provider-google-vertex/src/provider.ts+++ b/packages/provider-google-vertex/src/provider.ts@@ -45,7 +45,7 @@ export type CreateGoogleVertexCaptionProviderOptions = {readonly projectEnv?: string;readonly location?: string;readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;/** JSON contents, not a filesystem path. A CredentialStore decides where these bytes live. */readonly credentialsJson?: CredentialRef;readonly defaultConcurrency?: number;@@ -221,7 +221,7 @@ export function createGoogleVertexCaptionProvider(options: CreateGoogleVertexCapmodule: googleVertexProviderModuleRef,facet: "caption-gemini",instance: options.instance ?? "google-vertex.caption",- ...(options.lane === undefined ? {} : { lane: options.lane }),+ authority: options.authority ?? options.instance ?? "google-vertex.caption",implementation: {locator: "@narratage/provider-google-vertex/caption-gemini",digest: googleVertexProviderImplementationDigest,diff --git a/packages/provider-hyperframes-aws-lambda/src/activation.ts b/packages/provider-hyperframes-aws-lambda/src/activation.tsindex f92f540a..390e7602 100644--- a/packages/provider-hyperframes-aws-lambda/src/activation.ts+++ b/packages/provider-hyperframes-aws-lambda/src/activation.ts@@ -33,6 +33,7 @@ function optionalInteger(}function providerOptions(context: RuntimeAdapterFactoryContext): RuntimeProviderOptions {+ if (context.authority === undefined) throw new Error("AWS Lambda HyperFrames Provider Authority is required");const config = runtimeConfigObject(context.config, "AWS Lambda HyperFrames");runtimeConfigExact(config, CONFIG_KEYS, "AWS Lambda HyperFrames");const stateMachineArn = runtimeConfigString(config.stateMachineArn, "HyperFrames stateMachineArn");@@ -79,7 +80,7 @@ function providerOptions(context: RuntimeAdapterFactoryContext): RuntimeProviderconst maxAttempts = optionalInteger(config, "maxAttempts");return {instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,stateMachineArn,bucketName,rendererImplementationDigest: rendererImplementationDigest as Digest,diff --git a/packages/provider-hyperframes-aws-lambda/src/provider.ts b/packages/provider-hyperframes-aws-lambda/src/provider.tsindex 1cdc7d1d..25b2eb3f 100644--- a/packages/provider-hyperframes-aws-lambda/src/provider.ts+++ b/packages/provider-hyperframes-aws-lambda/src/provider.ts@@ -65,7 +65,7 @@ export type HyperframesLambdaQuality = "draft" | "standard" | "high";export type CreateAwsLambdaHyperframesProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;readonly stateMachineArn: string;readonly bucketName: string;/** Content identity of the deployed remote renderer, not merely its mutable ARN. */@@ -685,7 +685,7 @@ export function createAwsLambdaHyperframesProvider(config: CreateAwsLambdaHyperfmodule: awsLambdaHyperframesProviderModuleRef,facet: "render",instance: config.instance ?? "hyperframes.aws-lambda",- ...(config.lane === undefined ? {} : { lane: config.lane }),+ authority: config.authority ?? config.instance ?? "hyperframes.aws-lambda",implementation: {locator: "@narratage/provider-hyperframes-aws-lambda/render",digest: awsLambdaHyperframesProviderImplementationDigest,diff --git a/packages/provider-hyperframes-aws-lambda/test/live-canary.ts b/packages/provider-hyperframes-aws-lambda/test/live-canary.tsindex 7351ebf1..af74f5b1 100644--- a/packages/provider-hyperframes-aws-lambda/test/live-canary.ts+++ b/packages/provider-hyperframes-aws-lambda/test/live-canary.ts@@ -179,6 +179,8 @@ async function main(): Promise<void> {build: `build:hyperframes-aws-canary:${canaryId}`,command: commandId,endpoint: "hyperframes.aws-lambda.canary",+ authority: "hyperframes.aws-lambda.canary",+ route: "fixture.render",implementationDigest: digestOf("hyperframes-aws-canary:implementation"),runtimeClosure: digestOf("hyperframes-aws-canary:runtime"),requestDigest: need.requestDigest,diff --git a/packages/provider-hyperframes-aws-lambda/test/provider.test.ts b/packages/provider-hyperframes-aws-lambda/test/provider.test.tsindex 6453f8ff..35406b37 100644--- a/packages/provider-hyperframes-aws-lambda/test/provider.test.ts+++ b/packages/provider-hyperframes-aws-lambda/test/provider.test.ts@@ -76,6 +76,8 @@ function operation(request: Need) {build: "build:hyperframes-lambda-test",command: "command:hyperframes-lambda-test",endpoint: "hyperframes.aws-lambda.test",+ authority: "hyperframes.aws-lambda.test",+ route: "fixture.render",implementationDigest: digestOf("hyperframes-lambda:test-implementation"),runtimeClosure: digestOf("hyperframes-lambda:test-runtime"),requestDigest: request.requestDigest,@@ -277,6 +279,7 @@ test("the Runtime adapter refuses a hardware-GPU deployment wish instead of ignoassert.throws(() => implementation.activate({root: "/tmp",instance: "hyperframes.lambda.test",+ authority: "hyperframes.lambda.test",config: canonicalize({stateMachineArn: STATE_MACHINE,bucketName: BUCKET,@@ -290,7 +293,8 @@ test("one deterministic submission resumes and streams the exact output into theconst { client, state } = fakeClient();const { endpoint, registration } = await endpointFor(request, client);assert.equal(registration.retry?.maxAttempts, 1);- assert.equal(registration.scheduling?.maxConcurrency, 2);+ assert.equal(registration.scheduling?.resources.find((item) =>+ item.id.startsWith("authority:"))?.maxActive, 2);const memory = new MemoryArtifactStore();let streamed = 0;diff --git a/packages/provider-hyperframes-local/README.md b/packages/provider-hyperframes-local/README.mdindex ef2a3571..93f23cc7 100644--- a/packages/provider-hyperframes-local/README.md+++ b/packages/provider-hyperframes-local/README.md@@ -13,7 +13,7 @@ handler.There are deliberately two concurrency controls:-- `defaultConcurrency` limits whole render requests admitted by the Runtime lane.+- `defaultConcurrency` limits whole render requests admitted by Runtime Authority/Route resources.- `workers` controls HyperFrames' parallel Chrome frame workers inside one admitted render.The Provider owns both controls because they are deployment policy, not author intent. It neverdiff --git a/packages/provider-hyperframes-local/src/activation.ts b/packages/provider-hyperframes-local/src/activation.tsindex ae3b676c..c094b39e 100644--- a/packages/provider-hyperframes-local/src/activation.ts+++ b/packages/provider-hyperframes-local/src/activation.ts@@ -17,6 +17,7 @@ import { localHyperframesBrowserService } from "./service.js";const localHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({use: "@narratage/provider-hyperframes-local",activate(context) {+ if (context.authority === undefined) throw new Error("local HyperFrames Provider Authority is required");const config = runtimeConfigObject(context.config, "local HyperFrames");runtimeConfigExact(config, ["nodePath", "hyperframesCliPath", "ffprobePath", "workers", "quality", "browserGpu",@@ -51,7 +52,7 @@ const localHyperframesRuntimeAdapter = createRuntimeEndpointAdapterFacet({return {endpoint: createLocalHyperframesProvider({instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,...(nodePath === undefined ? {} : { nodePath }),...(hyperframesCliPath === undefined ? {} : { hyperframesCliPath }),...(ffprobePath === undefined ? {} : { ffprobePath }),diff --git a/packages/provider-hyperframes-local/src/provider.ts b/packages/provider-hyperframes-local/src/provider.tsindex c70ecd48..6c9c3994 100644--- a/packages/provider-hyperframes-local/src/provider.ts+++ b/packages/provider-hyperframes-local/src/provider.ts@@ -34,7 +34,7 @@ export type HyperframesBrowserGpu = "auto" | "software" | "hardware";export type CreateLocalHyperframesProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;readonly nodePath?: string;readonly hyperframesCliPath?: string;readonly ffprobePath?: string;@@ -246,7 +246,7 @@ function result(value: CanonicalValue, metadata: CanonicalValue): EndpointFulfil};}-export function createLocalHyperframesProvider(config: CreateLocalHyperframesProviderOptions = {}) {+export function createLocalHyperframesProvider(config: CreateLocalHyperframesProviderOptions) {const nodePath = config.nodePath ?? process.execPath;const hyperframesCliPath = config.hyperframesCliPath ?? defaultHyperframesCliPath();const ffprobePath = config.ffprobePath ?? "ffprobe";@@ -306,7 +306,7 @@ export function createLocalHyperframesProvider(config: CreateLocalHyperframesPromodule: localHyperframesProviderModuleRef,facet: "render",instance: config.instance ?? "hyperframes.local",- ...(config.lane === undefined ? {} : { lane: config.lane }),+ authority: config.authority ?? config.instance ?? "hyperframes.local",implementation: {locator: "@narratage/provider-hyperframes-local/render",digest: localHyperframesProviderImplementationDigest,diff --git a/packages/provider-hyperframes-local/test/provider.test.ts b/packages/provider-hyperframes-local/test/provider.test.tsindex ea6dda26..71dc1d86 100644--- a/packages/provider-hyperframes-local/test/provider.test.ts+++ b/packages/provider-hyperframes-local/test/provider.test.ts@@ -118,7 +118,8 @@ test("local HyperFrames Provider exposes one exact visual capability and two sependpoint: "hyperframes.local",}]);const resolved = await handlerFor(requestNeed());- assert.equal(resolved.registration.scheduling?.maxConcurrency, 1,+ assert.equal(resolved.registration.scheduling?.resources.find((item) =>+ item.id.startsWith("authority:"))?.maxActive, 1,"Runtime request admission must remain separate from HyperFrames frame workers");});diff --git a/packages/provider-image-opencv-local/README.md b/packages/provider-image-opencv-local/README.mdindex a9e459b1..468aa225 100644--- a/packages/provider-image-opencv-local/README.md+++ b/packages/provider-image-opencv-local/README.md@@ -12,4 +12,4 @@ The repository ships the frozen deployment environment in `services/image-opencvAdapter's default configuration, `services up` runs `uv sync --frozen` and the Endpoint, service probeand doctor all resolve the resulting `.venv` interpreter. An explicit `pythonExecutable` selects anoperator-managed compatible environment and suppresses that managed prepare. Runtime admission and-inner image work share the configured Endpoint lane; no separate queue is hidden in this package.+inner image work share the configured Endpoint Authority/Route resources; no separate queue is hidden in this package.diff --git a/packages/provider-image-opencv-local/src/activation.ts b/packages/provider-image-opencv-local/src/activation.tsindex 72e2c739..89fc1932 100644--- a/packages/provider-image-opencv-local/src/activation.ts+++ b/packages/provider-image-opencv-local/src/activation.ts@@ -16,6 +16,7 @@ import { localOpenCvService } from "./service.js";const localOpenCvRuntimeAdapter = createRuntimeEndpointAdapterFacet({use: "@narratage/provider-image-opencv-local",activate(context) {+ if (context.authority === undefined) throw new Error("local OpenCV Provider Authority is required");const config = runtimeConfigObject(context.config, "local OpenCV image");runtimeConfigExact(config, ["pythonExecutable", "defaultConcurrency", "processTimeoutMs", "maxInputBytes", "maxOutputBytes",@@ -29,7 +30,7 @@ const localOpenCvRuntimeAdapter = createRuntimeEndpointAdapterFacet({return {endpoint: createLocalOpenCvImageProvider({instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,pythonExecutable: deployment.pythonExecutable,...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),...(processTimeoutMs === undefined ? {} : { processTimeoutMs }),diff --git a/packages/provider-image-opencv-local/src/provider.ts b/packages/provider-image-opencv-local/src/provider.tsindex 159cd684..15daedbf 100644--- a/packages/provider-image-opencv-local/src/provider.ts+++ b/packages/provider-image-opencv-local/src/provider.ts@@ -27,7 +27,7 @@ export const localOpenCvImageProviderImplementationDigest = digestOf(export type CreateLocalOpenCvImageProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;readonly pythonExecutable?: string;readonly processTimeoutMs?: number;readonly maxInputBytes?: number;@@ -90,7 +90,7 @@ async function runProcess(options: {});}-export function createLocalOpenCvImageProvider(config: CreateLocalOpenCvImageProviderOptions = {}) {+export function createLocalOpenCvImageProvider(config: CreateLocalOpenCvImageProviderOptions) {const pythonExecutable = config.pythonExecutable ?? "python3";const processTimeoutMs = positiveInteger(config.processTimeoutMs ?? 5 * 60_000, "processTimeoutMs");const maxInputBytes = positiveInteger(config.maxInputBytes ?? 128 * 1024 * 1024, "maxInputBytes");@@ -100,7 +100,7 @@ export function createLocalOpenCvImageProvider(config: CreateLocalOpenCvImagePromodule: localOpenCvImageProviderModuleRef,facet: "raster",instance: config.instance ?? "image.opencv.local",- ...(config.lane === undefined ? {} : { lane: config.lane }),+ authority: config.authority ?? config.instance ?? "image.opencv.local",implementation: {locator: "@narratage/provider-image-opencv-local/raster-opencv",digest: localOpenCvImageProviderImplementationDigest,diff --git a/packages/provider-kie/README.md b/packages/provider-kie/README.mdindex adaeccb3..923df981 100644--- a/packages/provider-kie/README.md+++ b/packages/provider-kie/README.md@@ -43,7 +43,7 @@ Declarative activation names an ordinary CredentialRef, not an environment-speci{"use": "@narratage/provider-kie","instance": "kie.personal",- "lane": "generation",+ "authority": "kie.personal","config": {"apiKey": { "store": "keychain", "key": "kie.api-key" },"defaultConcurrency": 2@@ -83,7 +83,7 @@ Manifests actually imported by the author document; installing KIE does not addimmediately written to the configured content-addressed ArtifactStore, and removed from durableresult metadata.5. The selected `BuildDispatchStore` owns shared Build capacity. This Provider contributes one KIE- lane and a conservative create-task interval; it does not introduce Redis or another source of+ Authority plus exact capability Routes and a conservative create-task interval; it does not introduce Redis or another source ofBuild truth.The automated suite uses an adversarial fake KIE service. The credentialed smoke command is a paiddiff --git a/packages/provider-kie/src/activation.ts b/packages/provider-kie/src/activation.tsindex 4e1d5ad2..e224a1b4 100644--- a/packages/provider-kie/src/activation.ts+++ b/packages/provider-kie/src/activation.ts@@ -12,6 +12,7 @@ import { createKieProvider } from "./provider.js";const kieRuntimeAdapter = createRuntimeEndpointAdapterFacet({use: "@narratage/provider-kie",activate(context) {+ if (context.authority === undefined) throw new Error("KIE Provider Authority is required");const config = runtimeConfigObject(context.config, "KIE");runtimeConfigExact(config, ["apiBaseUrl", "uploadBaseUrl", "apiKey", "defaultConcurrency", "pollIntervalMs",@@ -37,7 +38,7 @@ const kieRuntimeAdapter = createRuntimeEndpointAdapterFacet({return {endpoint: createKieProvider({instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,...(apiBaseUrl === undefined ? {} : { apiBaseUrl }),...(uploadBaseUrl === undefined ? {} : { uploadBaseUrl }),apiKey,diff --git a/packages/provider-kie/src/provider.ts b/packages/provider-kie/src/provider.tsindex 75559927..8437b491 100644--- a/packages/provider-kie/src/provider.ts+++ b/packages/provider-kie/src/provider.ts@@ -36,7 +36,7 @@ type Fetch = typeof globalThis.fetch;export type CreateKieProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;readonly apiBaseUrl?: string;readonly uploadBaseUrl?: string;readonly apiKey?: CredentialRef;@@ -612,7 +612,7 @@ function endpoint(options: {};}-export function createKieProvider(config: CreateKieProviderOptions = {}) {+export function createKieProvider(config: CreateKieProviderOptions) {verifyKieRoutes();const apiBaseUrl = baseUrl(config.apiBaseUrl ?? "https://api.kie.ai", "apiBaseUrl");const uploadBaseUrl = baseUrl(config.uploadBaseUrl ?? "https://kieai.redpandaai.co", "uploadBaseUrl");@@ -648,7 +648,7 @@ export function createKieProvider(config: CreateKieProviderOptions = {}) {module: kieProviderModuleRef,facet: "market",instance: config.instance ?? "kie.default",- ...(config.lane === undefined ? {} : { lane: config.lane }),+ authority: config.authority ?? config.instance ?? "kie.default",implementation: {locator: "@narratage/provider-kie/market",digest: kieProviderImplementationDigest,diff --git a/packages/provider-kie/test/provider.test.ts b/packages/provider-kie/test/provider.test.tsindex ed119706..05a46750 100644--- a/packages/provider-kie/test/provider.test.ts+++ b/packages/provider-kie/test/provider.test.ts@@ -68,6 +68,8 @@ function operation(request: Need) {build: "build:kie-test",command: "command:kie-test",endpoint: "kie.default",+ authority: "kie.default",+ route: "fixture.video",implementationDigest: kieProviderImplementationDigest,runtimeClosure: digestOf("runtime:kie-test"),requestDigest: request.requestDigest,diff --git a/packages/provider-media-aws-lambda/src/activation.ts b/packages/provider-media-aws-lambda/src/activation.tsindex 1836d494..477c77c5 100644--- a/packages/provider-media-aws-lambda/src/activation.ts+++ b/packages/provider-media-aws-lambda/src/activation.ts@@ -13,6 +13,7 @@ import type { CreateAwsLambdaMediaProviderOptions } from "./provider.js";const QUALIFIED_ARN = /^arn:aws(?:-[a-z]+)*:lambda:([a-z0-9-]+):\d{12}:function:[A-Za-z0-9-_]+:([A-Za-z0-9-_]+)$/u;function providerOptions(context: RuntimeAdapterFactoryContext): CreateAwsLambdaMediaProviderOptions {+ if (context.authority === undefined) throw new Error("AWS Lambda media Provider Authority is required");const config = runtimeConfigObject(context.config, "AWS Lambda media");runtimeConfigExact(config, ["functionArn", "bucket", "prefix", "region", "defaultConcurrency",@@ -40,7 +41,7 @@ function providerOptions(context: RuntimeAdapterFactoryContext): CreateAwsLambdaconst defaultConcurrency = runtimeConfigPositiveInteger(config.defaultConcurrency, "AWS Lambda defaultConcurrency");return {instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,functionArn,bucket,...(prefix === undefined ? {} : { prefix }),diff --git a/packages/provider-media-aws-lambda/src/provider.ts b/packages/provider-media-aws-lambda/src/provider.tsindex f23fb1a7..f5afeca9 100644--- a/packages/provider-media-aws-lambda/src/provider.ts+++ b/packages/provider-media-aws-lambda/src/provider.ts@@ -30,7 +30,7 @@ const QUALIFIED_ARN =export type CreateAwsLambdaMediaProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;/** Must name a version or alias. See the assertion below for why. */readonly functionArn: string;readonly bucket: string;@@ -120,7 +120,7 @@ export function createAwsLambdaMediaProvider(config: CreateAwsLambdaMediaProvidemodule: awsLambdaMediaProviderModuleRef,facet: "media",instance: config.instance ?? "media.aws-lambda",- ...(config.lane === undefined ? {} : { lane: config.lane }),+ authority: config.authority ?? config.instance ?? "media.aws-lambda",implementation: {locator: "@narratage/provider-media-aws-lambda/media",digest: awsLambdaMediaProviderImplementationDigest,diff --git a/packages/provider-media-local/src/activation.ts b/packages/provider-media-local/src/activation.tsindex 585ea41a..8249132e 100644--- a/packages/provider-media-local/src/activation.ts+++ b/packages/provider-media-local/src/activation.ts@@ -16,6 +16,7 @@ import { localMediaToolchainService } from "./service.js";const localMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({use: "@narratage/provider-media-local",activate(context) {+ if (context.authority === undefined) throw new Error("local media Provider Authority is required");const config = runtimeConfigObject(context.config, "local media");runtimeConfigExact(config, ["ffmpegPath", "ffprobePath", "defaultConcurrency", "processTimeoutMs", "maxProbeOutputBytes",@@ -30,7 +31,7 @@ const localMediaRuntimeAdapter = createRuntimeEndpointAdapterFacet({return {endpoint: createLocalMediaProvider({instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,...(ffmpegPath === undefined ? {} : { ffmpegPath }),...(ffprobePath === undefined ? {} : { ffprobePath }),...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),diff --git a/packages/provider-media-local/src/provider.ts b/packages/provider-media-local/src/provider.tsindex 0df2f1f4..365e13de 100644--- a/packages/provider-media-local/src/provider.ts+++ b/packages/provider-media-local/src/provider.ts@@ -25,7 +25,7 @@ export const localMediaProviderImplementationDigest = digestOf("@narratage/proviexport type CreateLocalMediaProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;readonly ffmpegPath?: string;readonly ffprobePath?: string;readonly defaultConcurrency?: number;@@ -56,7 +56,7 @@ function fulfillment(result: MediaOperationResult): EndpointFulfillment {* operations themselves live in `@narratage/media-execution`, shared with the* AWS Provider so one Need cannot mean two different transforms.*/-export function createLocalMediaProvider(config: CreateLocalMediaProviderOptions = {}) {+export function createLocalMediaProvider(config: CreateLocalMediaProviderOptions) {const ffmpegPath = config.ffmpegPath ?? "ffmpeg";const ffprobePath = config.ffprobePath ?? "ffprobe";const processTimeoutMs = positiveInteger(config.processTimeoutMs ?? 10 * 60_000, "processTimeoutMs");@@ -88,7 +88,7 @@ export function createLocalMediaProvider(config: CreateLocalMediaProviderOptionsmodule: localMediaProviderModuleRef,facet: "media",instance: config.instance ?? "media.local",- ...(config.lane === undefined ? {} : { lane: config.lane }),+ authority: config.authority ?? config.instance ?? "media.local",implementation: {locator: "@narratage/provider-media-local/ffmpeg",digest: localMediaProviderImplementationDigest,diff --git a/packages/provider-whisperx-local/src/activation.ts b/packages/provider-whisperx-local/src/activation.tsindex 20f778e6..6cc218bb 100644--- a/packages/provider-whisperx-local/src/activation.ts+++ b/packages/provider-whisperx-local/src/activation.ts@@ -12,6 +12,7 @@ import { localWhisperXService } from "./service.js";const localWhisperXRuntimeAdapter = createRuntimeEndpointAdapterFacet({use: "@narratage/provider-whisperx-local",activate(context) {+ if (context.authority === undefined) throw new Error("WhisperX Provider Authority is required");const config = runtimeConfigObject(context.config, "local WhisperX");runtimeConfigExact(config, ["baseUrl", "expectedModel", "expectedDevice", "expectedCompute", "expectedBatchSize",@@ -51,7 +52,7 @@ const localWhisperXRuntimeAdapter = createRuntimeEndpointAdapterFacet({return {endpoint: createLocalWhisperXProvider({instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,...(baseUrl === undefined ? {} : { baseUrl }),...(expectedModel === undefined ? {} : { expectedModel }),...(expectedDevice === undefined ? {} : { expectedDevice }),diff --git a/packages/provider-whisperx-local/src/provider.ts b/packages/provider-whisperx-local/src/provider.tsindex 098aa702..f4a51c9c 100644--- a/packages/provider-whisperx-local/src/provider.ts+++ b/packages/provider-whisperx-local/src/provider.ts@@ -29,7 +29,7 @@ export const localWhisperXPunktTabDigest =export type CreateLocalWhisperXProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;/** Must resolve to the same machine because the protocol passes a staged local path. */readonly baseUrl?: string;readonly expectedModel?: string;@@ -260,7 +260,7 @@ function result(value: CanonicalValue, metadata: CanonicalValue): EndpointFulfil};}-export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderOptions = {}) {+export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderOptions) {const baseUrl = new URL(config.baseUrl ?? "http://127.0.0.1:8765");assert(baseUrl.protocol === "http:" && ["127.0.0.1", "localhost", "::1", "[::1]"].includes(baseUrl.hostname),"local WhisperX Provider requires a loopback HTTP service");@@ -285,7 +285,7 @@ export function createLocalWhisperXProvider(config: CreateLocalWhisperXProviderOmodule: localWhisperXProviderModuleRef,facet: "alignment",instance: config.instance ?? "whisperx.local",- ...(config.lane === undefined ? {} : { lane: config.lane }),+ authority: config.authority ?? config.instance ?? "whisperx.local",implementation: {locator: "@narratage/provider-whisperx-local/svml-service",digest: localWhisperXProviderImplementationDigest,diff --git a/packages/provider-xiaomi-mimo/README.md b/packages/provider-xiaomi-mimo/README.mdindex f6774e2a..99c8b12e 100644--- a/packages/provider-xiaomi-mimo/README.md+++ b/packages/provider-xiaomi-mimo/README.md@@ -13,7 +13,7 @@ Runtime Profile example:{"use": "@narratage/provider-xiaomi-mimo","instance": "mimo.official",- "lane": "xiaomi-mimo",+ "authority": "mimo.official","config": {"apiKey": { "store": "keychain", "key": "xiaomi-mimo.api-key" },"defaultConcurrency": 2@@ -32,5 +32,5 @@ node --run narratage -- lock-packages svml.runtime-packages.lock \--package-root .```-The Provider declares a default concurrency limit on its selected Runtime lane. The shared+The Provider declares default concurrency on its Authority and exact capability Routes. The sharedScheduler owns queuing across Builds; this package does not create a private queue.diff --git a/packages/provider-xiaomi-mimo/src/activation.ts b/packages/provider-xiaomi-mimo/src/activation.tsindex 2ce41b39..2bb005e2 100644--- a/packages/provider-xiaomi-mimo/src/activation.ts+++ b/packages/provider-xiaomi-mimo/src/activation.ts@@ -12,6 +12,7 @@ import { createXiaomiMimoProvider } from "./provider.js";const adapter = createRuntimeEndpointAdapterFacet({use: "@narratage/provider-xiaomi-mimo",activate(context) {+ if (context.authority === undefined) throw new Error("Xiaomi MiMo Provider Authority is required");const config = runtimeConfigObject(context.config, "Xiaomi MiMo");runtimeConfigExact(config, ["apiBaseUrl", "apiKey", "defaultConcurrency", "requestTimeoutMs",@@ -36,7 +37,7 @@ const adapter = createRuntimeEndpointAdapterFacet({return {endpoint: createXiaomiMimoProvider({instance: context.instance,- ...(context.lane === undefined ? {} : { lane: context.lane }),+ authority: context.authority,...(apiBaseUrl === undefined ? {} : { apiBaseUrl }),apiKey,...(defaultConcurrency === undefined ? {} : { defaultConcurrency }),diff --git a/packages/provider-xiaomi-mimo/src/provider.ts b/packages/provider-xiaomi-mimo/src/provider.tsindex 77665ab5..d579128a 100644--- a/packages/provider-xiaomi-mimo/src/provider.ts+++ b/packages/provider-xiaomi-mimo/src/provider.ts@@ -32,7 +32,7 @@ type Fetch = typeof globalThis.fetch;export type CreateXiaomiMimoProviderOptions = {readonly instance?: string;- readonly lane?: string;+ readonly authority?: string;readonly apiBaseUrl?: string;readonly apiKey?: CredentialRef;readonly defaultConcurrency?: number;@@ -174,7 +174,7 @@ function fulfillment(value: CanonicalValue, metadata: CanonicalValue): EndpointFreturn { value: { kind: "inline", value }, conformance: "exact", delivery: "executed", metadata };}-export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOptions = {}) {+export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOptions) {const apiBaseUrl = normalizeBaseUrl(options.apiBaseUrl ?? "https://api.xiaomimimo.com/v1");const requestTimeoutMs = positiveInteger(options.requestTimeoutMs ?? 180_000, "requestTimeoutMs");const maxResponseBytes = positiveInteger(options.maxResponseBytes ?? 64 * 1024 * 1024, "maxResponseBytes");@@ -243,7 +243,7 @@ export function createXiaomiMimoProvider(options: CreateXiaomiMimoProviderOptionmodule: xiaomiMimoProviderModuleRef,facet: "tts",instance: options.instance ?? "xiaomi-mimo.default",- ...(options.lane === undefined ? {} : { lane: options.lane }),+ authority: options.authority ?? options.instance ?? "xiaomi-mimo.default",implementation: {locator: "@narratage/provider-xiaomi-mimo/tts",digest: xiaomiMimoProviderImplementationDigest,diff --git a/packages/runtime-adapter/src/index.ts b/packages/runtime-adapter/src/index.tsindex 3567e6a8..014c7a2a 100644--- a/packages/runtime-adapter/src/index.ts+++ b/packages/runtime-adapter/src/index.ts@@ -24,7 +24,8 @@ export type RuntimeAdapterFactoryContext = {/** Absolute project root resolved from the Runtime Profile document. */readonly root: string;readonly instance: string;- readonly lane?: string;+ /** Required for Endpoint adapters; absent for Runtime service adapters. */+ readonly authority?: string;readonly config: CanonicalValue;};diff --git a/packages/runtime/README.md b/packages/runtime/README.mdindex 50c751d6..38e429ad 100644--- a/packages/runtime/README.md+++ b/packages/runtime/README.md@@ -6,7 +6,7 @@ The first implementation contains:- `RuntimeCommandExecutor`: regenerate Core-authorized commands and execute one by identity;- `LocalBuildScheduler`: one authoritative, queue-free scheduler shared by multiple Builds;-- named concurrency lanes with Runtime Profile overrides;+- atomic generic resource claims with Runtime Profile overrides;- static Runtime Module facets, sealed Profile resolution and a content-addressed Runtime Closure;- exact Endpoint capability/return bindings, implementation digests and permission allowlists;- `BuildStore` and `OperationStore` ports with compare-and-swap in-memory references;@@ -23,8 +23,9 @@ credential authority. These remain trusted deployment packages, not author-imporThe Scheduler does not traverse Graphs, choose Candidates, rewrite Needs or accept arbitraryserialized commands. Core remains the sole source of readiness and the sole Event acceptance law.-Lanes only limit how many already-authorized commands execute concurrently. An Endpoint's remote job-queue is still internal to that Endpoint and cannot advance another Build step.+Resources only limit how many already-authorized commands execute concurrently. Provider Endpoints+claim both an explicit Authority and an exact capability Route; the Store acquires them atomically.+An Endpoint's vendor-side job system remains internal and cannot advance another Build step.`MemoryBuildStore` stores verified BuildState only. `MemoryOperationStore` separately records acontent-addressed attempt identity, stable submission key, pending checkpoint and terminal result.diff --git a/packages/runtime/src/dispatch.ts b/packages/runtime/src/dispatch.tsindex eab2af1f..fbd6ee56 100644--- a/packages/runtime/src/dispatch.ts+++ b/packages/runtime/src/dispatch.ts@@ -43,6 +43,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 runtimeClosure: Digest;readonly owner: string;readonly token: string;readonly now: number;@@ -64,8 +66,12 @@ export type CapacityMode = "active" | "recoverable";export type CapacityLimits = {readonly globalActive: number;- readonly laneActive: number;- readonly laneInFlight: number;+};++export type CapacityResourceClaim = {+ readonly id: string;+ readonly maxActive: number;+ readonly maxInFlight: number;};export type CapacityReservation = {@@ -73,7 +79,11 @@ export type CapacityReservation = {readonly id: Digest;readonly build: string;readonly command: string;- readonly lane: string;+ readonly resources: readonly CapacityResourceClaim[];+ readonly queue?: {+ readonly authority: string;+ readonly route: string;+ };readonly mode: CapacityMode;readonly inFlight: boolean;readonly active?: DispatchLease;@@ -84,7 +94,8 @@ export type CapacityReservation = {export type CapacityAcquireRequest = {readonly build: string;readonly command: string;- readonly lane: string;+ readonly resources: readonly CapacityResourceClaim[];+ readonly queue?: CapacityReservation["queue"];readonly mode: CapacityMode;/** Current Build authority; a stale Worker cannot reserve capacity after being fenced. */readonly buildLease: DispatchLease;@@ -97,7 +108,12 @@ export type CapacityAcquireRequest = {export type CapacityAcquire =| { readonly status: "acquired"; readonly reservation: CapacityReservation }- | { readonly status: "blocked"; readonly retryAt: number; readonly reason: "global-active" | "lane-active" | "lane-in-flight" };+ | {+ readonly status: "blocked";+ readonly retryAt: number;+ readonly reason: "global-active" | "resource-active" | "resource-in-flight";+ readonly resource?: string;+ };/*** Durable execution control for Build identities, leases and shared capacity.@@ -227,14 +243,23 @@ export function capacityReservationId(build: string, command: string): Digest {export function verifyCapacityLimits(value: CapacityLimits): void {positive(value.globalActive, "global active capacity");- positive(value.laneActive, "lane active capacity");- positive(value.laneInFlight, "lane in-flight capacity");}export function verifyCapacityReservation(value: CapacityReservation): void {assert(value.format === "svml.capacity-reservation@1", "Capacity reservation format is unsupported");assert(value.id === capacityReservationId(value.build, value.command), "Capacity reservation identity differs");- assert(value.lane.trim().length > 0, "Capacity reservation lane is empty");+ assert(value.resources.length > 0, "Capacity reservation resources are empty");+ const resources = value.resources.map((resource) => {+ assert(resource.id.trim().length > 0, "Capacity resource id is empty");+ positive(resource.maxActive, `Capacity resource ${resource.id} active limit`);+ positive(resource.maxInFlight, `Capacity resource ${resource.id} in-flight limit`);+ return resource.id;+ });+ assert(new Set(resources).size === resources.length, "Capacity reservation repeats a resource");+ if (value.queue !== undefined) {+ assert(value.queue.authority.trim().length > 0, "Capacity queue authority is empty");+ assert(value.queue.route.trim().length > 0, "Capacity queue route is empty");+ }assert(value.mode === "active" || value.mode === "recoverable", "Capacity reservation mode is invalid");if (value.active !== undefined) verifyDispatchLease(value.active, "Capacity lease");safeNonNegative(value.createdAt, "Capacity reservation createdAt");diff --git a/packages/runtime/src/operations.ts b/packages/runtime/src/operations.tsindex 613cd69a..62057862 100644--- a/packages/runtime/src/operations.ts+++ b/packages/runtime/src/operations.ts@@ -13,6 +13,8 @@ export type OperationIdentity = {readonly build: string;readonly command: string;readonly endpoint: string;+ readonly authority: string;+ readonly route: string;readonly implementationDigest: Digest;readonly runtimeClosure: Digest;readonly requestDigest: Digest;@@ -97,6 +99,8 @@ export type OperationQuery = {readonly build?: string;readonly command?: string;readonly endpoint?: string;+ readonly authority?: string;+ readonly route?: string;readonly runtimeClosure?: Digest;readonly requestDigest?: Digest;};@@ -126,6 +130,8 @@ function submissionContent(value: {readonly build: string;readonly command: string;readonly endpoint: string;+ readonly authority: string;+ readonly route: string;readonly implementationDigest: Digest;readonly runtimeClosure: Digest;readonly requestDigest: Digest;@@ -136,6 +142,8 @@ function submissionContent(value: {build: value.build,command: value.command,endpoint: value.endpoint,+ authority: value.authority,+ route: value.route,implementationDigest: value.implementationDigest,runtimeClosure: value.runtimeClosure,requestDigest: value.requestDigest,@@ -149,6 +157,8 @@ function identityContent(value: Omit<OperationIdentity, "id">): Omit<OperationIdbuild: value.build,command: value.command,endpoint: value.endpoint,+ authority: value.authority,+ route: value.route,implementationDigest: value.implementationDigest,runtimeClosure: value.runtimeClosure,requestDigest: value.requestDigest,@@ -163,6 +173,8 @@ export function sealOperationIdentity(assert(value.build.trim().length > 0, "Operation build id is empty");assert(value.command.trim().length > 0, "Operation command id is empty");assert(value.endpoint.trim().length > 0, "Operation Endpoint id is empty");+ assert(value.authority.trim().length > 0, "Operation Provider Authority is empty");+ assert(value.route.trim().length > 0, "Operation Capability Route is empty");assert(isDigest(value.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");@@ -305,6 +317,8 @@ export class MemoryOperationStore implements OperationStore {.filter((snapshot) => query.build === undefined || snapshot.build === query.build).filter((snapshot) => query.command === undefined || snapshot.command === query.command).filter((snapshot) => query.endpoint === undefined || snapshot.endpoint === query.endpoint)+ .filter((snapshot) => query.authority === undefined || snapshot.authority === query.authority)+ .filter((snapshot) => query.route === undefined || snapshot.route === query.route).filter((snapshot) => query.runtimeClosure === undefined || snapshot.runtimeClosure === query.runtimeClosure).filter((snapshot) => query.requestDigest === undefined || snapshot.requestDigest === query.requestDigest).sort((left, right) => left.attempt - right.attempt || left.id.localeCompare(right.id))@@ -352,6 +366,8 @@ export class MemoryOperationStore implements OperationStore {build: current.build,command: current.command,endpoint: current.endpoint,+ authority: current.authority,+ route: current.route,implementationDigest: current.implementationDigest,runtimeClosure: current.runtimeClosure,requestDigest: current.requestDigest,diff --git a/packages/runtime/src/profile.ts b/packages/runtime/src/profile.tsindex 98415c5e..e9cd8ca1 100644--- a/packages/runtime/src/profile.ts+++ b/packages/runtime/src/profile.ts@@ -68,8 +68,8 @@ export type RuntimeModuleManifest = {export type RuntimeProfileInstance = {readonly id: string;readonly facet: RuntimeFacetRef;- /** Optional authority-wide lane name. The default is endpoint:<instance id>. */- readonly lane?: string;+ /** 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;};@@ -96,7 +96,7 @@ export type RuntimeProfile = {readonly endpoints: readonly RuntimeEndpointBinding[];readonly scheduling: {readonly maxConcurrency: number;- readonly lanes: readonly { readonly name: string; readonly maxConcurrency: number }[];+ readonly resources: readonly { readonly id: string; readonly maxConcurrency: number }[];};};@@ -119,7 +119,7 @@ export type ResolvedRuntimeEndpoint = {readonly fulfills: readonly RuntimeCapability[];readonly lifecycle: "immediate" | "recoverable";readonly credentialSlots: readonly string[];- readonly lane: string;+ readonly authority: string;readonly maxConcurrency: number;};@@ -295,8 +295,7 @@ export class RuntimeModuleRegistry {=== JSON.stringify(resolved.facet.credentialSlots ?? []), `${instance.id} Endpoint credential slots differ`);assert(JSON.stringify(instance.fulfills.map(bindingKey))=== JSON.stringify(resolved.facet.fulfills.map(bindingKey)), `${instance.id} Endpoint capabilities differ`);- const override = closure.scheduling.lanes.find((lane) => lane.name === instance.lane)?.maxConcurrency;- assert(instance.maxConcurrency === (override ?? resolved.facet.defaultConcurrency),+ assert(instance.maxConcurrency === resolved.facet.defaultConcurrency,`${instance.id} Endpoint concurrency differs`);}}@@ -311,7 +310,7 @@ function profileContent(profile: RuntimeProfile): Omit<RuntimeProfile, "digest">.map((instance) => ({id: instance.id,facet: { module: { ...instance.facet.module }, name: instance.facet.name },- ...(instance.lane === undefined ? {} : { lane: instance.lane }),+ ...(instance.authority === undefined ? {} : { authority: instance.authority }),...(instance.configurationDigest === undefined? {}: { configurationDigest: instance.configurationDigest }),@@ -332,9 +331,9 @@ function profileContent(profile: RuntimeProfile): Omit<RuntimeProfile, "digest">.sort((left, right) => bindingKey(left).localeCompare(bindingKey(right))),scheduling: {maxConcurrency: profile.scheduling.maxConcurrency,- lanes: [...profile.scheduling.lanes]- .map((lane) => ({ name: lane.name, maxConcurrency: lane.maxConcurrency }))- .sort((left, right) => left.name.localeCompare(right.name)),+ resources: [...profile.scheduling.resources]+ .map((resource) => ({ id: resource.id, maxConcurrency: resource.maxConcurrency }))+ .sort((left, right) => left.id.localeCompare(right.id)),},};}@@ -360,7 +359,7 @@ function verifyProfileShape(profile: RuntimeProfile): void {assert(instance.id.trim().length > 0, "Runtime Profile instance id is empty");assert(instance.facet.name.trim().length > 0, `${instance.id} facet name is empty`);assert(instance.facet.module.name.length > 0 && instance.facet.module.version.length > 0, `${instance.id} facet module is invalid`);- if (instance.lane !== undefined) assert(instance.lane.trim().length > 0, `${instance.id} lane is empty`);+ 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`);}@@ -372,12 +371,12 @@ function verifyProfileShape(profile: RuntimeProfile): void {return bindingKey(normalizeCapability(binding));});assert(new Set(bindings).size === bindings.length, "Runtime Profile repeats an Endpoint binding");- const laneNames = profile.scheduling.lanes.map((lane) => {- assert(lane.name.trim().length > 0, "Runtime Profile lane name is empty");- positiveInteger(lane.maxConcurrency, `Runtime lane ${lane.name}`);- return lane.name;+ const resourceNames = profile.scheduling.resources.map((resource) => {+ assert(resource.id.trim().length > 0, "Runtime Profile resource id is empty");+ positiveInteger(resource.maxConcurrency, `Runtime resource ${resource.id}`);+ return resource.id;});- assert(new Set(laneNames).size === laneNames.length, "Runtime Profile repeats a lane override");+ assert(new Set(resourceNames).size === resourceNames.length, "Runtime Profile repeats a resource override");}export function sealRuntimeProfile(@@ -413,7 +412,8 @@ function closureContent(closure: RuntimeClosure): Omit<RuntimeClosure, "digest">.sort((left, right) => bindingKey(left).localeCompare(bindingKey(right))),scheduling: {maxConcurrency: closure.scheduling.maxConcurrency,- lanes: [...closure.scheduling.lanes].map((lane) => ({ ...lane })).sort((left, right) => left.name.localeCompare(right.name)),+ resources: [...closure.scheduling.resources].map((resource) => ({ ...resource }))+ .sort((left, right) => left.id.localeCompare(right.id)),},};}@@ -429,12 +429,12 @@ export function verifyRuntimeClosure(closure: RuntimeClosure): void {return moduleKey(item.module);});assert(new Set(moduleKeys).size === moduleKeys.length, "Runtime Closure repeats a module");- const laneNames = closure.scheduling.lanes.map((lane) => {- assert(lane.name.trim().length > 0, "Runtime Closure lane is empty");- positiveInteger(lane.maxConcurrency, `Runtime Closure lane ${lane.name}`);- return lane.name;+ const resourceNames = closure.scheduling.resources.map((resource) => {+ assert(resource.id.trim().length > 0, "Runtime Closure resource id is empty");+ positiveInteger(resource.maxConcurrency, `Runtime Closure resource ${resource.id}`);+ return resource.id;});- assert(new Set(laneNames).size === laneNames.length, "Runtime Closure repeats a lane override");+ assert(new Set(resourceNames).size === resourceNames.length, "Runtime Closure repeats a resource override");const instances = new Map<string, ResolvedRuntimeInstance>();for (const instance of closure.instances) {assert(!instances.has(instance.id), `Runtime Closure repeats instance ${instance.id}`);@@ -443,7 +443,7 @@ export function verifyRuntimeClosure(closure: RuntimeClosure): void {assert(moduleKeys.includes(moduleKey(instance.facet.module)), `${instance.id} refers to an unlocked Runtime module`);sortedUniqueStrings(instance.permissions, `${instance.id} permissions`);if (instance.role === "capability-endpoint") {- assert(instance.lane.trim().length > 0, `${instance.id} Endpoint lane is empty`);+ assert(instance.authority.trim().length > 0, `${instance.id} Endpoint authority is empty`);positiveInteger(instance.maxConcurrency, `${instance.id} Endpoint maxConcurrency`);assert(instance.fulfills.length > 0, `${instance.id} Endpoint fulfills nothing`);assert(new Set(instance.fulfills.map(bindingKey)).size === instance.fulfills.length,@@ -508,16 +508,15 @@ export function resolveRuntimeProfile(permissions: [...resolved.facet.permissions],};if (resolved.facet.role !== "capability-endpoint") return { ...common, role: resolved.facet.role };- const lane = instance.lane ?? `endpoint:${instance.id}`;- const override = profile.scheduling.lanes.find((candidate) => candidate.name === lane)?.maxConcurrency;+ assert(instance.authority !== undefined, `${instance.id} Endpoint Provider Authority is required`);return {...common,role: "capability-endpoint",fulfills: resolved.facet.fulfills.map((item) => structuredClone(item)),lifecycle: resolved.facet.lifecycle,credentialSlots: [...(resolved.facet.credentialSlots ?? [])],- lane,- maxConcurrency: override ?? resolved.facet.defaultConcurrency,+ authority: instance.authority,+ maxConcurrency: resolved.facet.defaultConcurrency,};});const byId = new Map(instances.map((instance) => [instance.id, instance]));@@ -600,13 +599,13 @@ export function verifyRuntimeCoverage(closure: RuntimeClosure, state: BuildStateexport function localSchedulerOptionsFromClosure(closure: RuntimeClosure): {readonly maxConcurrency: number;- readonly laneLimits: Readonly<Record<string, number>>;+ readonly resourceLimits: Readonly<Record<string, number>>;readonly runtimeClosure: RuntimeClosure;} {verifyRuntimeClosure(closure);return {maxConcurrency: closure.scheduling.maxConcurrency,- laneLimits: Object.fromEntries(closure.scheduling.lanes.map((lane) => [lane.name, lane.maxConcurrency])),+ resourceLimits: Object.fromEntries(closure.scheduling.resources.map((resource) => [resource.id, resource.maxConcurrency])),runtimeClosure: structuredClone(closure),};}diff --git a/packages/runtime/src/scheduler.ts b/packages/runtime/src/scheduler.tsindex 2a31a756..90e7be49 100644--- a/packages/runtime/src/scheduler.ts+++ b/packages/runtime/src/scheduler.ts@@ -48,13 +48,14 @@ function buildCommandKey(build: string, command: string): string {}/**- * Queue-free, one-process reference Scheduler. It shares lane limits across all submitted Builds,+ * Queue-free, one-process reference Scheduler. It atomically admits every declared resource+ * across all submitted Builds,* but never searches a Graph: every runnable command is regenerated by Core through the Executor.*/export class LocalBuildScheduler implements BuildScheduler {readonly #executor: RuntimeCommandExecutor;readonly #maxConcurrency: number;- readonly #laneLimits: Readonly<Record<string, number>>;+ readonly #resourceLimits: Readonly<Record<string, number>>;readonly #maxEventsPerBuild: number;readonly #runtimeClosure: RuntimeClosure | undefined;readonly #buildStore: BuildSchedulerOptions["buildStore"];@@ -68,11 +69,11 @@ export class LocalBuildScheduler implements BuildScheduler {: structuredClone(options.runtimeClosure);this.#buildStore = options.buildStore;if (this.#runtimeClosure !== undefined) verifyRuntimeClosure(this.#runtimeClosure);- for (const [lane, limit] of Object.entries(options.laneLimits ?? {})) {- if (lane.trim().length === 0) throw new Error("lane override name must not be empty");- positiveInteger(limit, `lane ${lane}`);+ for (const [resource, limit] of Object.entries(options.resourceLimits ?? {})) {+ if (resource.trim().length === 0) throw new Error("resource override name must not be empty");+ positiveInteger(limit, `resource ${resource}`);}- this.#laneLimits = { ...(options.laneLimits ?? {}) };+ this.#resourceLimits = { ...(options.resourceLimits ?? {}) };}async run(requests: readonly ScheduledBuild[]): Promise<readonly ScheduledBuildResult[]> {@@ -112,18 +113,18 @@ export class LocalBuildScheduler implements BuildScheduler {});}const active = new Map<string, ActiveCommand>();- const laneDefaults = new Map<string, number>();+ const resourceDefaults = new Map<string, number>();let cursor = 0;- const laneLimit = (command: RuntimeRunnableCommand): number => {- const override = this.#laneLimits[command.lane];+ const resourceLimit = (resource: RuntimeRunnableCommand["resources"][number]): number => {+ const override = this.#resourceLimits[resource.id];if (override !== undefined) return override;- const proposed = positiveInteger(command.maxConcurrency, `lane ${command.lane} default`);- const previous = laneDefaults.get(command.lane);+ const proposed = positiveInteger(resource.maxActive, `resource ${resource.id} default`);+ const previous = resourceDefaults.get(resource.id);if (previous !== undefined && previous !== proposed) {- throw new Error(`lane ${command.lane} has conflicting default concurrency ${previous} and ${proposed}`);+ throw new Error(`resource ${resource.id} has conflicting default concurrency ${previous} and ${proposed}`);}- laneDefaults.set(command.lane, proposed);+ resourceDefaults.set(resource.id, proposed);return proposed;};@@ -165,9 +166,13 @@ export class LocalBuildScheduler implements BuildScheduler {return ready;};- const laneCounts = (): Map<string, number> => {+ const resourceCounts = (): Map<string, number> => {const counts = new Map<string, number>();- for (const item of active.values()) counts.set(item.command.lane, (counts.get(item.command.lane) ?? 0) + 1);+ for (const item of active.values()) {+ for (const resource of item.command.resources) {+ counts.set(resource.id, (counts.get(resource.id) ?? 0) + 1);+ }+ }return counts;};@@ -183,7 +188,7 @@ export class LocalBuildScheduler implements BuildScheduler {while (true) {const ready = await preparations();- const counts = laneCounts();+ const counts = resourceCounts();let slots = this.#maxConcurrency - active.size;while (slots > 0 && builds.length > 0) {@@ -192,12 +197,15 @@ export class LocalBuildScheduler implements BuildScheduler {const index = (cursor + offset) % builds.length;const build = builds[index]!;const command = (ready.get(build.id) ?? []).find((candidate) =>- (counts.get(candidate.lane) ?? 0) < laneLimit(candidate));+ candidate.resources.every((resource) =>+ (counts.get(resource.id) ?? 0) < resourceLimit(resource)));if (command === undefined) continue;ready.set(build.id, (ready.get(build.id) ?? []).filter((item) =>item.command.id !== command.command.id));launch(build, command);- counts.set(command.lane, (counts.get(command.lane) ?? 0) + 1);+ for (const resource of command.resources) {+ counts.set(resource.id, (counts.get(resource.id) ?? 0) + 1);+ }cursor = (index + 1) % builds.length;slots -= 1;selected = true;@@ -215,7 +223,7 @@ export class LocalBuildScheduler implements BuildScheduler {build.journal.push({command: settled.command.command.id,kind: settled.command.command.kind,- lane: settled.command.lane,+ resources: settled.command.resources.map((resource) => resource.id),status: "error",message: settled.error instanceof Error ? settled.error.message : String(settled.error),});@@ -226,13 +234,25 @@ export class LocalBuildScheduler implements BuildScheduler {build.journal.push({command: settled.command.command.id,kind: settled.command.command.kind,- lane: settled.command.lane,+ resources: settled.command.resources.map((resource) => resource.id),status: "pending",operation: settled.execution.operation,...(settled.execution.wakeAt === undefined ? {} : { wakeAt: settled.execution.wakeAt }),});continue;}+ if (settled.execution.status === "deferred") {+ 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: "deferred",+ wakeAt: settled.execution.wakeAt,+ message: settled.execution.reason,+ });+ continue;+ }const event = settled.execution.event;try {const next = reduce(build.state, event).state;@@ -241,7 +261,7 @@ export class LocalBuildScheduler implements BuildScheduler {build.journal.push({command: settled.command.command.id,kind: settled.command.command.kind,- lane: settled.command.lane,+ resources: settled.command.resources.map((resource) => resource.id),status: "completed",event: event.id,});@@ -252,7 +272,7 @@ export class LocalBuildScheduler implements BuildScheduler {build.journal.push({command: settled.command.command.id,kind: settled.command.command.kind,- lane: settled.command.lane,+ resources: settled.command.resources.map((resource) => resource.id),status: "error",message: `Build exceeded ${this.#maxEventsPerBuild} accepted events`,});@@ -262,7 +282,7 @@ export class LocalBuildScheduler implements BuildScheduler {build.journal.push({command: settled.command.command.id,kind: settled.command.command.kind,- lane: settled.command.lane,+ resources: settled.command.resources.map((resource) => resource.id),status: "error",message: error instanceof Error ? error.message : String(error),});diff --git a/packages/runtime/src/types.ts b/packages/runtime/src/types.tsindex 64d31ba9..597ec04f 100644--- a/packages/runtime/src/types.ts+++ b/packages/runtime/src/types.ts@@ -17,13 +17,22 @@ export type RuntimeBlockedCommand = {export type RuntimeRunnableCommand = {readonly command: CoreCommand;- /** One authority-wide concurrency bucket, normally an Endpoint instance or local implementation. */- readonly lane: string;- /** Registration default; a Runtime Profile may explicitly override it for this Scheduler. */- readonly maxConcurrency: number;+ /** Every resource is acquired atomically before the command can cause a side effect. */+ readonly resources: readonly RuntimeResourceClaim[];+ readonly queue?: RuntimeQueueRoute;/** Recoverable work retains one shared in-flight reservation while polling. */readonly capacityMode?: "active" | "recoverable";- readonly maxInFlight?: number;+};++export type RuntimeResourceClaim = {+ readonly id: string;+ readonly maxActive: number;+ readonly maxInFlight: number;+};++export type RuntimeQueueRoute = {+ readonly authority: string;+ readonly route: string;};export type RuntimeExecutionStores = {@@ -77,7 +86,8 @@ export type RuntimeExecutionContext = {export type RuntimeExecutionResult =| { readonly status: "completed"; readonly event: BuildEvent }- | { readonly status: "pending"; readonly operation: Digest; readonly wakeAt?: number };+ | { readonly status: "pending"; readonly operation: Digest; readonly wakeAt?: number }+ | { readonly status: "deferred"; readonly wakeAt: number; readonly reason: string };/*** Minimal execution port used by a Scheduler. Implementations must regenerate the command from@@ -164,8 +174,8 @@ export type ScheduledBuild = {export type SchedulerJournalEntry = {readonly command: string;readonly kind: CoreCommand["kind"];- readonly lane: string;- readonly status: "completed" | "pending" | "error";+ readonly resources: readonly string[];+ readonly status: "completed" | "pending" | "deferred" | "error";readonly event?: string;readonly operation?: Digest;readonly wakeAt?: number;@@ -182,7 +192,7 @@ export type ScheduledBuildResult = {export type BuildSchedulerOptions = {readonly maxConcurrency?: number;- readonly laneLimits?: Readonly<Record<string, 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. */diff --git a/packages/runtime/test/operations.test.ts b/packages/runtime/test/operations.test.tsindex bba4dc94..305e7009 100644--- a/packages/runtime/test/operations.test.ts+++ b/packages/runtime/test/operations.test.ts@@ -13,6 +13,8 @@ function identity(overrides: { readonly endpoint?: string; readonly runtimeClosubuild: "video-42",command: "command:render",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"),diff --git a/packages/runtime/test/profile.test.ts b/packages/runtime/test/profile.test.tsindex 69991312..b763df6a 100644--- a/packages/runtime/test/profile.test.ts+++ b/packages/runtime/test/profile.test.ts@@ -71,7 +71,7 @@ function manifest(permissions: readonly string[] = []): RuntimeModuleManifest {};}-function profile(options: { readonly operations?: boolean; readonly lane?: number } = {}) {+function profile(options: { readonly operations?: boolean; readonly resource?: number } = {}) {return sealRuntimeProfile({name: "fixture.local",instances: [@@ -89,7 +89,7 @@ function profile(options: { readonly operations?: boolean; readonly lane?: numbe{id: "greeting.local",facet: endpointFacet,- lane: "endpoint:greeting.local",+ authority: "greeting.local",},],scheduler: "scheduler.local",@@ -109,7 +109,7 @@ function profile(options: { readonly operations?: boolean; readonly lane?: numbe}],scheduling: {maxConcurrency: 8,- lanes: [{ name: "endpoint:greeting.local", maxConcurrency: options.lane ?? 2 }],+ resources: [{ id: "authority:greeting.local", maxConcurrency: options.resource ?? 2 }],},});}@@ -126,11 +126,11 @@ test("Runtime Profile resolves installed static facets into one deterministic loassert.equal(endpoint?.role, "capability-endpoint");if (endpoint?.role === "capability-endpoint") {assert.equal(endpoint.implementation.digest, endpointImplementationDigest);- assert.equal(endpoint.lane, "endpoint:greeting.local");- assert.equal(endpoint.maxConcurrency, 2);+ assert.equal(endpoint.authority, "greeting.local");+ assert.equal(endpoint.maxConcurrency, 1);}- assert.deepEqual(localSchedulerOptionsFromClosure(first).laneLimits, {- "endpoint:greeting.local": 2,+ assert.deepEqual(localSchedulerOptionsFromClosure(first).resourceLimits, {+ "authority:greeting.local": 2,});assert.doesNotThrow(() => verifyRuntimeCoverage(first, createGreetingBuild()));});@@ -143,12 +143,12 @@ test("Profile order is not identity but an execution-policy change is", () => {...normal,instances: [...normal.instances].reverse(),endpoints: [...normal.endpoints].reverse(),- scheduling: { ...normal.scheduling, lanes: [...normal.scheduling.lanes].reverse() },+ scheduling: { ...normal.scheduling, resources: [...normal.scheduling.resources].reverse() },});assert.equal(normal.digest, reordered.digest);assert.notEqual(resolveRuntimeProfile(registry, normal).digest,- resolveRuntimeProfile(registry, profile({ lane: 1 })).digest,+ resolveRuntimeProfile(registry, profile({ resource: 1 })).digest,);});diff --git a/packages/store-sqlite/src/store.ts b/packages/store-sqlite/src/store.tsindex a9e847b5..01c77420 100644--- a/packages/store-sqlite/src/store.ts+++ b/packages/store-sqlite/src/store.ts@@ -57,7 +57,7 @@ import type {RuntimeServicePackage,} from "@narratage/runtime";-const databaseSchemaVersion = 4;+const databaseSchemaVersion = 5;export const sqliteStoreModuleRef = {name: "@narratage/store-sqlite",@@ -145,6 +145,8 @@ function operationIdentity(snapshot: OperationSnapshot): OperationIdentity {build: snapshot.build,command: snapshot.command,endpoint: snapshot.endpoint,+ authority: snapshot.authority,+ route: snapshot.route,implementationDigest: snapshot.implementationDigest,runtimeClosure: snapshot.runtimeClosure,requestDigest: snapshot.requestDigest,@@ -365,6 +367,8 @@ class SqliteOperationStore implements OperationStore {["build", query.build],["command", query.command],["endpoint", query.endpoint],+ ["authority", query.authority],+ ["route", query.route],["runtimeClosure", query.runtimeClosure],["requestDigest", query.requestDigest],] as const) {@@ -547,17 +551,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.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_dispatchesWHERE phase != 'terminal'+ AND json_extract(identity_json, '$.runtimeClosure') = ?AND available_at <= ?AND (lease_owner IS NULL OR lease_expires_at <= ?)ORDER BY priority DESC, available_at ASC, created_at ASC, build_id ASCLIMIT 1- `).get(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");@@ -670,11 +676,26 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {async acquireCapacity(request: CapacityAcquireRequest): Promise<CapacityAcquire> {assert(request.owner.trim().length > 0 && request.token.trim().length > 0, "Capacity claimant is empty");- assert(request.lane.trim().length > 0, "Capacity lane is empty");+ assert(request.resources.length > 0, "Capacity resources are empty");nonNegativeInteger(request.now, "Capacity acquisition time");positiveInteger(request.leaseMs, "Capacity leaseMs");verifyCapacityLimits(request.limits);verifyDispatchLease(request.buildLease);+ const resources = [...request.resources].map((resource) => ({ ...resource }))+ .sort((left, right) => left.id.localeCompare(right.id));+ const resourceIds = resources.map((resource) => {+ assert(resource.id.trim().length > 0, "Capacity resource id is empty");+ positiveInteger(resource.maxActive, `Capacity resource ${resource.id} maxActive`);+ positiveInteger(resource.maxInFlight, `Capacity resource ${resource.id} maxInFlight`);+ return resource.id;+ });+ assert(new Set(resourceIds).size === resourceIds.length, "Capacity resources contain duplicates");+ if (request.queue !== undefined) {+ assert(request.queue.authority.trim().length > 0 && request.queue.route.trim().length > 0,+ "Capacity queue authority and route are required");+ }+ const resourcesJson = canonicalStringify(resources);+ const queueJson = request.queue === undefined ? null : canonicalStringify(request.queue);const id = capacityReservationId(request.build, request.command);return transaction(this.#database, () => {const dispatch = this.#database.prepare(`@@ -683,57 +704,67 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {`).get(request.build) as Row | undefined;assert(dispatch !== undefined && leaseMatches(dispatch, request.buildLease),`Dispatch ${request.build} lease is stale`);- const existing = this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row | undefined;+ let existing = this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row | undefined;+ if (existing === undefined) {+ this.#database.prepare(`+ INSERT INTO svml_capacity (+ reservation_id, build_id, command_id, resources_json, queue_json, mode, in_flight,+ active_owner, active_token, active_fence, active_expires_at, created_at, updated_at+ ) VALUES (?, ?, ?, ?, ?, ?, 0, NULL, NULL, 0, NULL, ?, ?)+ `).run(id, request.build, request.command, resourcesJson, queueJson, request.mode,+ request.now, request.now);+ existing = this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row;+ }+ assert(existing.build_id === request.build && existing.command_id === request.command+ && existing.resources_json === resourcesJson && existing.queue_json === queueJson+ && existing.mode === request.mode,+ `Capacity reservation ${id} identity differs`);if (existing !== undefined && typeof existing.active_expires_at === "number" && existing.active_expires_at > request.now) {- return { status: "blocked", retryAt: existing.active_expires_at, reason: "lane-active" };+ return { status: "blocked", retryAt: existing.active_expires_at, reason: "resource-active" };}const activeGlobal = this.#database.prepare(`SELECT COUNT(*) AS count FROM svml_capacityWHERE active_owner IS NOT NULL AND active_expires_at > ? AND reservation_id != ?`).get(request.now, id) as Row;- const activeLane = this.#database.prepare(`- SELECT COUNT(*) AS count FROM svml_capacity- WHERE lane = ? AND active_owner IS NOT NULL AND active_expires_at > ? AND reservation_id != ?- `).get(request.lane, request.now, id) as Row;- const inFlightLane = this.#database.prepare(`- SELECT COUNT(*) AS count FROM svml_capacity- WHERE lane = ? AND in_flight = 1 AND reservation_id != ?- `).get(request.lane, id) as Row;- assert(typeof activeGlobal.count === "number" && typeof activeLane.count === "number" && typeof inFlightLane.count === "number",- "SQLite Capacity counts are invalid");+ assert(typeof activeGlobal.count === "number", "SQLite global Capacity count is invalid");const retryAtRow = this.#database.prepare(`SELECT MIN(active_expires_at) AS retry_at FROM svml_capacityWHERE active_owner IS NOT NULL AND active_expires_at > ?`).get(request.now) as Row;const retryAt = typeof retryAtRow.retry_at === "number" ? retryAtRow.retry_at : request.now + 100;if (activeGlobal.count >= request.limits.globalActive) return { status: "blocked", retryAt, reason: "global-active" };- if (activeLane.count >= request.limits.laneActive) return { status: "blocked", retryAt, reason: "lane-active" };const alreadyInFlight = existing?.in_flight === 1;- if (request.mode === "recoverable" && !alreadyInFlight && inFlightLane.count >= request.limits.laneInFlight) {- return { status: "blocked", retryAt, reason: "lane-in-flight" };+ for (const resource of resources) {+ const active = this.#database.prepare(`+ SELECT COUNT(DISTINCT capacity.reservation_id) AS count+ FROM svml_capacity AS capacity, json_each(capacity.resources_json) AS claim+ WHERE json_extract(claim.value, '$.id') = ?+ AND capacity.active_owner IS NOT NULL AND capacity.active_expires_at > ?+ AND capacity.reservation_id != ?+ `).get(resource.id, request.now, id) as Row;+ const inFlight = this.#database.prepare(`+ SELECT COUNT(DISTINCT capacity.reservation_id) AS count+ FROM svml_capacity AS capacity, json_each(capacity.resources_json) AS claim+ WHERE json_extract(claim.value, '$.id') = ?+ AND capacity.in_flight = 1 AND capacity.reservation_id != ?+ `).get(resource.id, id) as Row;+ assert(typeof active.count === "number" && typeof inFlight.count === "number",+ `SQLite Capacity counts for ${resource.id} are invalid`);+ if (active.count >= resource.maxActive) {+ return { status: "blocked", retryAt, reason: "resource-active", resource: resource.id };+ }+ if (request.mode === "recoverable" && !alreadyInFlight && inFlight.count >= resource.maxInFlight) {+ return { status: "blocked", retryAt, reason: "resource-in-flight", resource: resource.id };+ }}const fence = typeof existing?.active_fence === "number" ? existing.active_fence + 1 : 1;- if (existing === undefined) {- this.#database.prepare(`- INSERT INTO svml_capacity (- reservation_id, build_id, command_id, lane, mode, in_flight,- active_owner, active_token, active_fence, active_expires_at, created_at, updated_at- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)- `).run(id, request.build, request.command, request.lane, request.mode,- request.mode === "recoverable" ? 1 : 0,- request.owner, request.token, fence, request.now + request.leaseMs, request.now, request.now);- } else {- assert(existing.build_id === request.build && existing.command_id === request.command- && existing.lane === request.lane && existing.mode === request.mode,- `Capacity reservation ${id} identity differs`);- this.#database.prepare(`- UPDATE svml_capacity- SET in_flight = MAX(in_flight, ?), active_owner = ?, active_token = ?,- active_fence = ?, active_expires_at = ?, updated_at = ?- WHERE reservation_id = ?- `).run(request.mode === "recoverable" ? 1 : 0, request.owner, request.token,- fence, request.now + request.leaseMs, request.now, id);- }+ this.#database.prepare(`+ UPDATE svml_capacity+ SET in_flight = MAX(in_flight, ?), active_owner = ?, active_token = ?,+ active_fence = ?, active_expires_at = ?, updated_at = ?+ WHERE reservation_id = ?+ `).run(request.mode === "recoverable" ? 1 : 0, request.owner, request.token,+ fence, request.now + request.leaseMs, request.now, id);return { status: "acquired", reservation: parseCapacityReservation(this.#database.prepare("SELECT * FROM svml_capacity WHERE reservation_id = ?").get(id) as Row,) };@@ -793,7 +824,7 @@ class SqliteBuildDispatchStore implements BuildDispatchStore {function parseCapacityReservation(row: Row): CapacityReservation {assert(typeof row.reservation_id === "string" && typeof row.build_id === "string"- && typeof row.command_id === "string" && typeof row.lane === "string" && typeof row.mode === "string",+ && typeof row.command_id === "string" && typeof row.resources_json === "string" && typeof row.mode === "string","SQLite Capacity row identity is invalid");assert(typeof row.in_flight === "number" && typeof row.created_at === "number" && typeof row.updated_at === "number","SQLite Capacity row state is invalid");@@ -808,7 +839,10 @@ function parseCapacityReservation(row: Row): CapacityReservation {id: row.reservation_id as Digest,build: row.build_id,command: row.command_id,- lane: row.lane,+ resources: JSON.parse(row.resources_json) as CapacityReservation["resources"],+ ...(typeof row.queue_json === "string"+ ? { queue: JSON.parse(row.queue_json) as NonNullable<CapacityReservation["queue"]> }+ : {}),mode: row.mode,inFlight: row.in_flight === 1,...(active === undefined ? {} : { active }),@@ -968,7 +1002,8 @@ export class SqliteRuntimeState {reservation_id TEXT PRIMARY KEY,build_id TEXT NOT NULL,command_id TEXT NOT NULL,- lane TEXT NOT NULL,+ resources_json TEXT NOT NULL,+ queue_json TEXT,mode TEXT NOT NULL CHECK (mode IN ('active', 'recoverable')),in_flight INTEGER NOT NULL CHECK (in_flight IN (0, 1)),active_owner TEXT,@@ -979,7 +1014,7 @@ export class SqliteRuntimeState {updated_at INTEGER NOT NULL,UNIQUE (build_id, command_id)) STRICT;- CREATE INDEX IF NOT EXISTS svml_capacity_lane ON svml_capacity (lane, in_flight, active_expires_at);+ 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,diff --git a/packages/store-sqlite/test/store.test.ts b/packages/store-sqlite/test/store.test.tsindex 79e74d7e..83811710 100644--- a/packages/store-sqlite/test/store.test.ts+++ b/packages/store-sqlite/test/store.test.ts@@ -39,6 +39,8 @@ test("SQLite stores verified Build facts and Operation checkpoints across reopenbuild: "video",command: "command:generation",endpoint: "kie.personal",+ authority: "kie.personal",+ route: "fixture.generation",implementationDigest: digestOf("kie-implementation"),runtimeClosure: digestOf("runtime-closure"),requestDigest: digestOf("generation-request"),@@ -85,6 +87,8 @@ test("SQLite Operation CAS preserves a terminal completion", async () => {build: "video",command: "command:render",endpoint: "hyperframes.lambda",+ authority: "hyperframes.lambda",+ route: "fixture.render",implementationDigest: digestOf("hyperframes-lambda"),runtimeClosure: digestOf("runtime"),requestDigest: digestOf("render-request"),@@ -123,6 +127,8 @@ test("SQLite keeps cancellation control independent from execution state", asyncbuild: "cancel-build",command: "command:cancel",endpoint: "endpoint.cancel",+ authority: "endpoint.cancel",+ route: "fixture.cancel",implementationDigest: digestOf("implementation.cancel"),runtimeClosure: digestOf("runtime.cancel"),requestDigest: digestOf("request.cancel"),@@ -161,7 +167,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: 4, busyTimeoutMs: 5_000 })),+ ...Array(4).fill(digestOf({ path: join(directory, "runtime.sqlite"), schemaVersion: 5, busyTimeoutMs: 5_000 })),],);await services.close?.();@@ -178,29 +184,35 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"await state.dispatch.create(createBuildDispatchIdentity({build: "build-a", core: digestOf("core:a"), runtimeClosure: closure,}), { now: 100 });- const first = await state.dispatch.claim({ owner: "worker-a", token: "lease-a", now: 100, leaseMs: 10 });+ const foreignClosure = digestOf("runtime:another-revision");+ await state.dispatch.create(createBuildDispatchIdentity({+ build: "foreign-build", core: digestOf("core:foreign"), runtimeClosure: foreignClosure,+ }), { now: 99, priority: 1_000 });+ 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", "a Worker must not lease a higher-priority foreign Runtime Revision");assert.equal(first.lease.fence, 1);- assert.equal(await state.dispatch.claim({ owner: "worker-b", token: "early", now: 105, leaseMs: 10 }), undefined);- const second = await state.dispatch.claim({ owner: "worker-b", token: "lease-b", now: 111, leaseMs: 10 });+ assert.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 }];await assert.rejects(state.dispatch.release("build-a", first.lease, { phase: "waiting", availableAt: 120 }, 112),/stale/u,);await assert.rejects(state.dispatch.acquireCapacity({- build: "build-a", command: "command:a", lane: "paid", mode: "recoverable",+ build: "build-a", command: "command:a", resources: paidResources, mode: "recoverable",buildLease: first.lease, owner: "worker-a", token: "capacity-a", now: 112, leaseMs: 10,- limits: { globalActive: 1, laneActive: 1, laneInFlight: 1 },+ limits: { globalActive: 1 },}),/stale/u,);const reserved = await state.dispatch.acquireCapacity({- build: "build-a", command: "command:a", lane: "paid", mode: "recoverable",+ build: "build-a", command: "command:a", resources: paidResources, mode: "recoverable",buildLease: second.lease, owner: "worker-b", token: "capacity-b", now: 112, leaseMs: 10,- limits: { globalActive: 1, laneActive: 1, laneInFlight: 1 },+ limits: { globalActive: 1 },});assert.equal(reserved.status, "acquired");@@ -219,19 +231,19 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"await state.dispatch.create(createBuildDispatchIdentity({build: "build-b", core: digestOf("core:b"), runtimeClosure: closure,}), { now: 112 });- const third = await state.dispatch.claim({ 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", lane: "paid", mode: "recoverable",+ build: "build-b", command: "command:b", resources: paidResources, mode: "recoverable",buildLease: third.lease, owner: "worker-c", token: "capacity-c", now: 112, leaseMs: 10,- limits: { globalActive: 1, laneActive: 1, laneInFlight: 1 },+ limits: { globalActive: 1 },});assert.equal(blocked.status, "blocked");await state.dispatch.create(createBuildDispatchIdentity({build: "build-c", core: digestOf("core:c"), runtimeClosure: closure,}), { now: 200, priority: 100 });- const fourth = await state.dispatch.claim({ 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(@@ -243,6 +255,102 @@ test("SQLite fences expired Workers and shares capacity across Build dispatches"assert.equal(cancelledWake.admission, "closing");assert.equal(cancelledWake.availableAt, 201,"a cancellation racing with release cannot be delayed by the Worker's stale schedule");+ const foreign = await state.dispatch.claim({+ runtimeClosure: foreignClosure,+ owner: "foreign-worker",+ token: "foreign-lease",+ now: 203,+ leaseMs: 10,+ });+ assert.equal(foreign?.build, "foreign-build");+ state.close();+ } finally {+ await rm(directory, { recursive: true, force: true });+ }+});++test("Authority and Route resources are acquired atomically across models", async () => {+ const directory = await mkdtemp(join(tmpdir(), "svml-sqlite-hierarchy-"));+ try {+ const state = new SqliteRuntimeState(join(directory, "runtime.sqlite"));+ const closure = digestOf("runtime:hierarchical-capacity");+ const authority = { id: "authority:kie.main", maxActive: 2, maxInFlight: 2 };+ const seedance = { id: "route:kie.main/seedance-2-mini", maxActive: 1, maxInFlight: 1 };+ const minimax = { id: "route:kie.main/minimax-h3", maxActive: 2, maxInFlight: 2 };++ const leaseBuild = async (build: string, now: number) => {+ await state.dispatch.create(createBuildDispatchIdentity({+ build,+ core: digestOf(`core:${build}`),+ runtimeClosure: closure,+ }), { now });+ const claimed = await state.dispatch.claim({+ runtimeClosure: closure,+ owner: `worker:${build}`,+ token: `lease:${build}`,+ now,+ leaseMs: 1_000,+ });+ assert.equal(claimed?.build, build);+ assert.ok(claimed.lease);+ return claimed.lease;+ };++ const firstLease = await leaseBuild("seedance-a", 100);+ const first = await state.dispatch.acquireCapacity({+ build: "seedance-a",+ command: "generate:a",+ resources: [authority, seedance],+ queue: { authority: "kie.main", route: "seedance-2-mini" },+ mode: "recoverable",+ buildLease: firstLease,+ owner: "worker:seedance-a",+ token: "capacity:a",+ now: 100,+ leaseMs: 1_000,+ limits: { globalActive: 10 },+ });+ assert.equal(first.status, "acquired");+ assert.ok(first.reservation.active);+ await state.dispatch.parkCapacity(first.reservation.id, first.reservation.active, true, 101);++ const secondLease = await leaseBuild("seedance-b", 102);+ const sameRoute = await state.dispatch.acquireCapacity({+ build: "seedance-b",+ command: "generate:b",+ resources: [authority, seedance],+ queue: { authority: "kie.main", route: "seedance-2-mini" },+ mode: "recoverable",+ buildLease: secondLease,+ owner: "worker:seedance-b",+ token: "capacity:b",+ now: 102,+ leaseMs: 1_000,+ limits: { globalActive: 10 },+ });+ assert.deepEqual(sameRoute, {+ status: "blocked",+ retryAt: 202,+ reason: "resource-in-flight",+ resource: seedance.id,+ });++ const thirdLease = await leaseBuild("minimax-a", 103);+ const otherRoute = await state.dispatch.acquireCapacity({+ build: "minimax-a",+ command: "generate:c",+ resources: [authority, minimax],+ queue: { authority: "kie.main", route: "minimax-h3" },+ mode: "recoverable",+ buildLease: thirdLease,+ owner: "worker:minimax-a",+ token: "capacity:c",+ now: 103,+ leaseMs: 1_000,+ limits: { globalActive: 10 },+ });+ assert.equal(otherRoute.status, "acquired",+ "another model may use the remaining Provider Authority capacity");state.close();} finally {await rm(directory, { recursive: true, force: true });diff --git a/packages/video-cli/test/cli.test.ts b/packages/video-cli/test/cli.test.tsindex 4326d0fb..56969f19 100644--- a/packages/video-cli/test/cli.test.ts+++ b/packages/video-cli/test/cli.test.ts@@ -300,14 +300,14 @@ test("CLI accepts a declarative Runtime Profile without an executable config modendpoints: [{use: "@narratage/provider-kie",instance: "kie.cli-test",- lane: "generation",+ authority: "kie.cli-test",config: { apiKey: { store: "env", key: "SVML_TEST_MISSING_KIE_KEY" }, defaultConcurrency: 2 },}],permissions: ["filesystem:state", "filesystem:artifacts", "environment:credentials","network:api.kie.ai", "network:kieai.redpandaai.co",],- scheduling: { maxConcurrency: 4, lanes: { generation: 2 } },+ scheduling: { maxConcurrency: 4, resources: { "authority:kie.cli-test": 2 } },}), "utf8");let output = "";await runCli(["status", "missing-build", "--runtime", profile], {