@qlever-llc/trellis 0.8.3 → 0.9.0-rc.10

package/script/npm/src/contract_support/mod.js

@@ -3,7 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unwrapSchema = exports.schema = exports.isJsonValue = exports.digestJson = exports.canonicalizeJson = exports.CONTRACT_STATE_METADATA = exports.CONTRACT_KV_METADATA = exports.CONTRACT_JOBS_METADATA = exports.CATALOG_FORMAT_V1 = exports.CONTRACT_FORMAT_V1 = exports.StoreResourceBindingSchema = exports.PaginatedSchema = exports.KvResourceBindingSchema = exports.JobsResourceBindingSchema = exports.JobsQueueBindingSchema = exports.IsoDateSchema = exports.InstalledServiceContractSchema = exports.EventHeaderSchema = exports.ContractStoreResourceSchema = exports.ContractStateStoreSchema = exports.ContractStateSchema = exports.ContractSchemaRefSchema = exports.ContractResourcesSchema = exports.ContractResourceBindingsSchema = exports.ContractKvResourceSchema = exports.ContractJobsSchema = exports.ContractJobQueueSchema = void 0;
+exports.unwrapSchema = exports.schema = exports.isJsonValue = exports.digestJson = exports.canonicalizeJson = exports.CONTRACT_STATE_METADATA = exports.CONTRACT_KV_METADATA = exports.CONTRACT_JOBS_METADATA = exports.TrellisCatalogV1Schema = exports.TrellisContractV1Schema = exports.ContractUsesSchema = exports.ContractExportsSchema = exports.ContractCapabilitiesSchema = exports.ContractCapabilityMetadataSchema = exports.CATALOG_FORMAT_V1 = exports.CONTRACT_FORMAT_V1 = exports.StoreResourceBindingSchema = exports.PageResponseSchema = exports.PageRequestSchema = exports.KvResourceBindingSchema = exports.JobsResourceBindingSchema = exports.JobsQueueBindingSchema = exports.IsoDateSchema = exports.InstalledServiceContractSchema = exports.EventHeaderSchema = exports.ContractStoreResourceSchema = exports.ContractStateStoreSchema = exports.ContractStateSchema = exports.ContractSchemaRefSchema = exports.ContractResourcesSchema = exports.ContractResourceBindingsSchema = exports.ContractKvResourceSchema = exports.ContractJobsSchema = exports.ContractJobQueueSchema = void 0;
+exports.contractCapabilityNamespace = contractCapabilityNamespace;
+exports.globalCapabilityName = globalCapabilityName;
+exports.normalizeContractManifest = normalizeContractManifest;
+exports.parseContractManifest = parseContractManifest;
 exports.projectContractDigestManifest = projectContractDigestManifest;
 exports.digestContractManifest = digestContractManifest;
 exports.defineError = defineError;
@@ -12,6 +16,7 @@ exports.defineAppContract = defineAppContract;
 exports.defineAgentContract = defineAgentContract;
 exports.defineDeviceContract = defineDeviceContract;
 const typebox_1 = __importDefault(require("typebox"));
+const value_1 = require("typebox/value");
 const TrellisError_js_1 = require("../errors/TrellisError.js");
 const canonical_js_1 = require("./canonical.js");
 Object.defineProperty(exports, "canonicalizeJson", { enumerable: true, get: function () { return canonical_js_1.canonicalizeJson; } });
@@ -21,26 +26,172 @@ const runtime_js_1 = require("./runtime.js");
 Object.defineProperty(exports, "schema", { enumerable: true, get: function () { return runtime_js_1.schema; } });
 Object.defineProperty(exports, "unwrapSchema", { enumerable: true, get: function () { return runtime_js_1.unwrapSchema; } });
 const schema_pointers_js_1 = require("./schema_pointers.js");
-var protocol_js_1 = require("./protocol.js");
-Object.defineProperty(exports, "ContractJobQueueSchema", { enumerable: true, get: function () { return protocol_js_1.ContractJobQueueSchema; } });
-Object.defineProperty(exports, "ContractJobsSchema", { enumerable: true, get: function () { return protocol_js_1.ContractJobsSchema; } });
-Object.defineProperty(exports, "ContractKvResourceSchema", { enumerable: true, get: function () { return protocol_js_1.ContractKvResourceSchema; } });
-Object.defineProperty(exports, "ContractResourceBindingsSchema", { enumerable: true, get: function () { return protocol_js_1.ContractResourceBindingsSchema; } });
-Object.defineProperty(exports, "ContractResourcesSchema", { enumerable: true, get: function () { return protocol_js_1.ContractResourcesSchema; } });
-Object.defineProperty(exports, "ContractSchemaRefSchema", { enumerable: true, get: function () { return protocol_js_1.ContractSchemaRefSchema; } });
-Object.defineProperty(exports, "ContractStateSchema", { enumerable: true, get: function () { return protocol_js_1.ContractStateSchema; } });
-Object.defineProperty(exports, "ContractStateStoreSchema", { enumerable: true, get: function () { return protocol_js_1.ContractStateStoreSchema; } });
-Object.defineProperty(exports, "ContractStoreResourceSchema", { enumerable: true, get: function () { return protocol_js_1.ContractStoreResourceSchema; } });
-Object.defineProperty(exports, "EventHeaderSchema", { enumerable: true, get: function () { return protocol_js_1.EventHeaderSchema; } });
-Object.defineProperty(exports, "InstalledServiceContractSchema", { enumerable: true, get: function () { return protocol_js_1.InstalledServiceContractSchema; } });
-Object.defineProperty(exports, "IsoDateSchema", { enumerable: true, get: function () { return protocol_js_1.IsoDateSchema; } });
-Object.defineProperty(exports, "JobsQueueBindingSchema", { enumerable: true, get: function () { return protocol_js_1.JobsQueueBindingSchema; } });
-Object.defineProperty(exports, "JobsResourceBindingSchema", { enumerable: true, get: function () { return protocol_js_1.JobsResourceBindingSchema; } });
-Object.defineProperty(exports, "KvResourceBindingSchema", { enumerable: true, get: function () { return protocol_js_1.KvResourceBindingSchema; } });
-Object.defineProperty(exports, "PaginatedSchema", { enumerable: true, get: function () { return protocol_js_1.PaginatedSchema; } });
-Object.defineProperty(exports, "StoreResourceBindingSchema", { enumerable: true, get: function () { return protocol_js_1.StoreResourceBindingSchema; } });
+const protocol_js_1 = require("./protocol.js");
+var protocol_js_2 = require("./protocol.js");
+Object.defineProperty(exports, "ContractJobQueueSchema", { enumerable: true, get: function () { return protocol_js_2.ContractJobQueueSchema; } });
+Object.defineProperty(exports, "ContractJobsSchema", { enumerable: true, get: function () { return protocol_js_2.ContractJobsSchema; } });
+Object.defineProperty(exports, "ContractKvResourceSchema", { enumerable: true, get: function () { return protocol_js_2.ContractKvResourceSchema; } });
+Object.defineProperty(exports, "ContractResourceBindingsSchema", { enumerable: true, get: function () { return protocol_js_2.ContractResourceBindingsSchema; } });
+Object.defineProperty(exports, "ContractResourcesSchema", { enumerable: true, get: function () { return protocol_js_2.ContractResourcesSchema; } });
+Object.defineProperty(exports, "ContractSchemaRefSchema", { enumerable: true, get: function () { return protocol_js_2.ContractSchemaRefSchema; } });
+Object.defineProperty(exports, "ContractStateSchema", { enumerable: true, get: function () { return protocol_js_2.ContractStateSchema; } });
+Object.defineProperty(exports, "ContractStateStoreSchema", { enumerable: true, get: function () { return protocol_js_2.ContractStateStoreSchema; } });
+Object.defineProperty(exports, "ContractStoreResourceSchema", { enumerable: true, get: function () { return protocol_js_2.ContractStoreResourceSchema; } });
+Object.defineProperty(exports, "EventHeaderSchema", { enumerable: true, get: function () { return protocol_js_2.EventHeaderSchema; } });
+Object.defineProperty(exports, "InstalledServiceContractSchema", { enumerable: true, get: function () { return protocol_js_2.InstalledServiceContractSchema; } });
+Object.defineProperty(exports, "IsoDateSchema", { enumerable: true, get: function () { return protocol_js_2.IsoDateSchema; } });
+Object.defineProperty(exports, "JobsQueueBindingSchema", { enumerable: true, get: function () { return protocol_js_2.JobsQueueBindingSchema; } });
+Object.defineProperty(exports, "JobsResourceBindingSchema", { enumerable: true, get: function () { return protocol_js_2.JobsResourceBindingSchema; } });
+Object.defineProperty(exports, "KvResourceBindingSchema", { enumerable: true, get: function () { return protocol_js_2.KvResourceBindingSchema; } });
+Object.defineProperty(exports, "PageRequestSchema", { enumerable: true, get: function () { return protocol_js_2.PageRequestSchema; } });
+Object.defineProperty(exports, "PageResponseSchema", { enumerable: true, get: function () { return protocol_js_2.PageResponseSchema; } });
+Object.defineProperty(exports, "StoreResourceBindingSchema", { enumerable: true, get: function () { return protocol_js_2.StoreResourceBindingSchema; } });
 exports.CONTRACT_FORMAT_V1 = "trellis.contract.v1";
 exports.CATALOG_FORMAT_V1 = "trellis.catalog.v1";
+const NonEmptyStringSchema = typebox_1.default.String({ minLength: 1 });
+const VersionSchema = typebox_1.default.String({ pattern: "^v[0-9]+$" });
+const PointerStringSchema = typebox_1.default.String({ pattern: "^/.*" });
+const CapabilityListSchema = typebox_1.default.Array(NonEmptyStringSchema);
+const JsonSchemaValueSchema = typebox_1.default.Union([
+    typebox_1.default.Object({}, { additionalProperties: true }),
+    typebox_1.default.Boolean(),
+]);
+exports.ContractCapabilityMetadataSchema = typebox_1.default.Object({
+    displayName: NonEmptyStringSchema,
+    description: NonEmptyStringSchema,
+    consequence: typebox_1.default.Optional(NonEmptyStringSchema),
+});
+exports.ContractCapabilitiesSchema = typebox_1.default.Record(NonEmptyStringSchema, exports.ContractCapabilityMetadataSchema);
+exports.ContractExportsSchema = typebox_1.default.Object({
+    schemas: typebox_1.default.Optional(typebox_1.default.Array(NonEmptyStringSchema, { uniqueItems: true })),
+});
+const ContractUseRpcSchema = typebox_1.default.Object({
+    call: typebox_1.default.Optional(CapabilityListSchema),
+});
+const ContractUsePubSubSchema = typebox_1.default.Object({
+    publish: typebox_1.default.Optional(CapabilityListSchema),
+    subscribe: typebox_1.default.Optional(CapabilityListSchema),
+});
+const ContractUseFeedSchema = typebox_1.default.Object({
+    subscribe: typebox_1.default.Optional(CapabilityListSchema),
+});
+const ContractUseSchema = typebox_1.default.Object({
+    contract: NonEmptyStringSchema,
+    rpc: typebox_1.default.Optional(ContractUseRpcSchema),
+    operations: typebox_1.default.Optional(ContractUseRpcSchema),
+    events: typebox_1.default.Optional(ContractUsePubSubSchema),
+    feeds: typebox_1.default.Optional(ContractUseFeedSchema),
+});
+const ContractUsesFlatSchema = typebox_1.default.Record(NonEmptyStringSchema, ContractUseSchema);
+exports.ContractUsesSchema = typebox_1.default.Object({
+    required: typebox_1.default.Optional(ContractUsesFlatSchema),
+    optional: typebox_1.default.Optional(ContractUsesFlatSchema),
+});
+const ContractErrorDeclSchema = typebox_1.default.Object({
+    type: NonEmptyStringSchema,
+    schema: typebox_1.default.Optional(protocol_js_1.ContractSchemaRefSchema),
+});
+const ContractErrorRefSchema = typebox_1.default.Object({
+    type: NonEmptyStringSchema,
+});
+const RpcCapabilitiesSchema = typebox_1.default.Object({
+    call: typebox_1.default.Optional(CapabilityListSchema),
+});
+const OperationCapabilitiesSchema = typebox_1.default.Object({
+    call: typebox_1.default.Optional(CapabilityListSchema),
+    read: typebox_1.default.Optional(CapabilityListSchema),
+    cancel: typebox_1.default.Optional(CapabilityListSchema),
+    control: typebox_1.default.Optional(CapabilityListSchema),
+});
+const PubSubCapabilitiesSchema = typebox_1.default.Object({
+    publish: typebox_1.default.Optional(CapabilityListSchema),
+    subscribe: typebox_1.default.Optional(CapabilityListSchema),
+});
+const FeedCapabilitiesSchema = typebox_1.default.Object({
+    subscribe: typebox_1.default.Optional(CapabilityListSchema),
+});
+const RpcTransferSchema = typebox_1.default.Object({
+    direction: typebox_1.default.Literal("receive"),
+});
+const OperationTransferSchema = typebox_1.default.Object({
+    direction: typebox_1.default.Literal("send"),
+    store: NonEmptyStringSchema,
+    key: PointerStringSchema,
+    contentType: typebox_1.default.Optional(PointerStringSchema),
+    metadata: typebox_1.default.Optional(PointerStringSchema),
+    expiresInMs: typebox_1.default.Optional(typebox_1.default.Integer({ minimum: 1 })),
+    maxBytes: typebox_1.default.Optional(typebox_1.default.Integer({ minimum: 1 })),
+});
+const ContractRpcMethodSchema = typebox_1.default.Object({
+    version: VersionSchema,
+    subject: NonEmptyStringSchema,
+    input: protocol_js_1.ContractSchemaRefSchema,
+    output: protocol_js_1.ContractSchemaRefSchema,
+    capabilities: typebox_1.default.Optional(RpcCapabilitiesSchema),
+    errors: typebox_1.default.Optional(typebox_1.default.Array(ContractErrorRefSchema)),
+    transfer: typebox_1.default.Optional(RpcTransferSchema),
+});
+const ContractOperationSignalSchema = typebox_1.default.Object({
+    input: protocol_js_1.ContractSchemaRefSchema,
+});
+const ContractOperationSchema = typebox_1.default.Object({
+    version: VersionSchema,
+    subject: NonEmptyStringSchema,
+    input: protocol_js_1.ContractSchemaRefSchema,
+    progress: typebox_1.default.Optional(protocol_js_1.ContractSchemaRefSchema),
+    output: protocol_js_1.ContractSchemaRefSchema,
+    transfer: typebox_1.default.Optional(OperationTransferSchema),
+    capabilities: typebox_1.default.Optional(OperationCapabilitiesSchema),
+    signals: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, ContractOperationSignalSchema)),
+    cancel: typebox_1.default.Optional(typebox_1.default.Boolean()),
+});
+const ContractEventSchema = typebox_1.default.Object({
+    version: VersionSchema,
+    subject: NonEmptyStringSchema,
+    params: typebox_1.default.Optional(typebox_1.default.Array(PointerStringSchema)),
+    event: protocol_js_1.ContractSchemaRefSchema,
+    capabilities: typebox_1.default.Optional(PubSubCapabilitiesSchema),
+});
+const ContractFeedSchema = typebox_1.default.Object({
+    version: VersionSchema,
+    subject: NonEmptyStringSchema,
+    input: protocol_js_1.ContractSchemaRefSchema,
+    event: protocol_js_1.ContractSchemaRefSchema,
+    capabilities: typebox_1.default.Optional(FeedCapabilitiesSchema),
+});
+exports.TrellisContractV1Schema = typebox_1.default.Object({
+    format: typebox_1.default.Literal(exports.CONTRACT_FORMAT_V1),
+    id: NonEmptyStringSchema,
+    displayName: NonEmptyStringSchema,
+    description: NonEmptyStringSchema,
+    kind: typebox_1.default.Union([
+        typebox_1.default.Literal("service"),
+        typebox_1.default.Literal("app"),
+        typebox_1.default.Literal("device"),
+        typebox_1.default.Literal("agent"),
+    ]),
+    capabilities: typebox_1.default.Optional(exports.ContractCapabilitiesSchema),
+    schemas: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, JsonSchemaValueSchema)),
+    exports: typebox_1.default.Optional(exports.ContractExportsSchema),
+    uses: typebox_1.default.Optional(exports.ContractUsesSchema),
+    state: typebox_1.default.Optional(protocol_js_1.ContractStateSchema),
+    rpc: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, ContractRpcMethodSchema)),
+    operations: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, ContractOperationSchema)),
+    events: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, ContractEventSchema)),
+    feeds: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, ContractFeedSchema)),
+    errors: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, ContractErrorDeclSchema)),
+    jobs: typebox_1.default.Optional(typebox_1.default.Record(NonEmptyStringSchema, protocol_js_1.ContractJobQueueSchema)),
+    resources: typebox_1.default.Optional(protocol_js_1.ContractResourcesSchema),
+});
+exports.TrellisCatalogV1Schema = typebox_1.default.Object({
+    format: typebox_1.default.Literal(exports.CATALOG_FORMAT_V1),
+    contracts: typebox_1.default.Array(typebox_1.default.Object({
+        id: NonEmptyStringSchema,
+        digest: typebox_1.default.String({ pattern: "^[A-Za-z0-9_-]+$" }),
+        displayName: NonEmptyStringSchema,
+        description: NonEmptyStringSchema,
+    })),
+});
 const CONTRACT_MODULE_METADATA = Symbol.for("@qlever-llc/trellis/contracts/contract-module");
 exports.CONTRACT_JOBS_METADATA = Symbol.for("@qlever-llc/trellis/contracts/jobs");
 exports.CONTRACT_KV_METADATA = Symbol.for("@qlever-llc/trellis/contracts/kv");
@@ -120,13 +271,18 @@ function attachDefinedErrorPayload(error, payload) {
 }
 const TRELLIS_AUTH_CONTRACT_ID = "trellis.auth@v1";
 const TRELLIS_STATE_CONTRACT_ID = "trellis.state@v1";
-const BASELINE_AUTH_RPC_CALL = ["Auth.Me", "Auth.Logout"];
+const TRELLIS_HEALTH_CONTRACT_ID = "trellis.health@v1";
+const BASELINE_AUTH_RPC_CALL = [
+    "Auth.Sessions.Me",
+    "Auth.Sessions.Logout",
+];
 const BASELINE_STATE_RPC_CALL = [
     "State.Get",
     "State.Put",
     "State.Delete",
     "State.List",
 ];
+const BASELINE_HEALTH_EVENTS_PUBLISH = ["Health.Heartbeat"];
 const UnknownRuntimeSchema = (0, runtime_js_1.schema)(typebox_1.default.Unknown());
 function typedUnknownRuntimeSchema() {
     return UnknownRuntimeSchema;
@@ -139,13 +295,22 @@ function trellisRpcDesc(name) {
         callerCapabilities: [],
     };
 }
+function trellisEventDesc(name) {
+    return {
+        subject: eventSubject(name, "v1", undefined),
+        event: typedUnknownRuntimeSchema(),
+        publishCapabilities: [],
+        subscribeCapabilities: [],
+    };
+}
 const BASELINE_AUTH_API = {
     rpc: {
-        "Auth.Me": trellisRpcDesc("Auth.Me"),
-        "Auth.Logout": trellisRpcDesc("Auth.Logout"),
+        "Auth.Sessions.Me": trellisRpcDesc("Auth.Sessions.Me"),
+        "Auth.Sessions.Logout": trellisRpcDesc("Auth.Sessions.Logout"),
     },
     operations: {},
     events: {},
+    feeds: {},
     subjects: {},
 };
 const BASELINE_STATE_API = {
@@ -157,6 +322,16 @@ const BASELINE_STATE_API = {
     },
     operations: {},
     events: {},
+    feeds: {},
+    subjects: {},
+};
+const BASELINE_HEALTH_API = {
+    rpc: {},
+    operations: {},
+    events: {
+        "Health.Heartbeat": trellisEventDesc("Health.Heartbeat"),
+    },
+    feeds: {},
     subjects: {},
 };
 function createContractRefBuilder(registry) {
@@ -173,6 +348,9 @@ function createContractRefBuilder(registry) {
         error(errorName) {
             return errorName;
         },
+        capability(capabilityName) {
+            return capabilityName;
+        },
     };
 }
 function cloneSchema(schemaValue) {
@@ -304,9 +482,18 @@ function assertRegistryDoesNotDeclareExports(registry) {
         throw new Error("contract exports must be declared in the callback body, not the registry argument");
     }
 }
+function assertRegistryDoesNotDeclareCapabilities(registry) {
+    if (Object.hasOwn(registry, "capabilities")) {
+        throw new Error("contract capabilities must be declared in the callback body, not the registry argument");
+    }
+}
 function resolveSchemaRef(schemas, ref, context) {
     assertSchemaRefExists(schemas, ref, context);
-    return cloneSchema(schemas[ref.schema]);
+    const schema = schemas?.[ref.schema];
+    if (!schema) {
+        throw new Error(`${context} references missing schema '${ref.schema}'`);
+    }
+    return cloneSchema(schema);
 }
 function digestCanonicalJson(value) {
     return (0, canonical_js_1.sha256Base64urlSync)((0, canonical_js_1.canonicalizeJson)(value));
@@ -314,6 +501,41 @@ function digestCanonicalJson(value) {
 function sortedUnique(values) {
     return [...new Set(values)].sort();
 }
+/** Return the global capability namespace for a contract id. */
+function contractCapabilityNamespace(contractId) {
+    return contractId.replace(/@v\d+$/, "");
+}
+/** Return the globally qualified name for a contract-local capability. */
+function globalCapabilityName(contractId, localCapability) {
+    return `${contractCapabilityNamespace(contractId)}::${localCapability}`;
+}
+function projectCapabilities(capabilities, contractId, declaredCapabilities, context) {
+    if (!capabilities) {
+        return undefined;
+    }
+    return sortedUnique(capabilities.map((capability) => {
+        if (declaredCapabilities && Object.hasOwn(declaredCapabilities, capability)) {
+            return globalCapabilityName(contractId, capability);
+        }
+        if (capability === "admin" || capability === "service" ||
+            capability.includes("::")) {
+            return capability;
+        }
+        throw new Error(`${context} references undeclared local capability '${capability}'`);
+    }));
+}
+function emitCapabilities(contractId, capabilities) {
+    if (!capabilities) {
+        return undefined;
+    }
+    const entries = Object.entries(capabilities)
+        .map(([localCapability, metadata]) => [
+        globalCapabilityName(contractId, localCapability),
+        { ...metadata },
+    ]);
+    entries.sort(([left], [right]) => left.localeCompare(right));
+    return Object.fromEntries(entries);
+}
 function collectSchemaRef(reachableSchemas, ref) {
     if (ref) {
         reachableSchemas.add(ref.schema);
@@ -339,10 +561,17 @@ function collectReachableSchemaNames(contract) {
         collectSchemaRef(reachableSchemas, operation.input);
         collectSchemaRef(reachableSchemas, operation.progress);
         collectSchemaRef(reachableSchemas, operation.output);
+        for (const signal of Object.values(operation.signals ?? {})) {
+            collectSchemaRef(reachableSchemas, signal.input);
+        }
     }
     for (const event of Object.values(contract.events ?? {})) {
         collectSchemaRef(reachableSchemas, event.event);
     }
+    for (const feed of Object.values(contract.feeds ?? {})) {
+        collectSchemaRef(reachableSchemas, feed.input);
+        collectSchemaRef(reachableSchemas, feed.event);
+    }
     for (const job of Object.values(contract.jobs ?? {})) {
         collectSchemaRef(reachableSchemas, job.payload);
         collectSchemaRef(reachableSchemas, job.result);
@@ -382,7 +611,7 @@ function projectDigestResources(resources) {
         ...(resources.store ? { store: resources.store } : {}),
     };
 }
-function projectDigestUses(uses) {
+function projectDigestUsesFlat(uses) {
     if (!uses) {
         return undefined;
     }
@@ -406,9 +635,37 @@ function projectDigestUses(uses) {
                     },
                 }
                 : {}),
+            ...(use.feeds?.subscribe
+                ? { feeds: { subscribe: sortedUnique(use.feeds.subscribe) } }
+                : {}),
         },
     ]));
 }
+function omitRequiredUseAliases(optional, required) {
+    if (!optional) {
+        return undefined;
+    }
+    if (!required) {
+        return optional;
+    }
+    const requiredAliases = new Set(Object.keys(required));
+    const entries = Object.entries(optional).filter(([alias]) => !requiredAliases.has(alias));
+    return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+}
+function projectDigestUses(uses) {
+    if (!uses) {
+        return undefined;
+    }
+    const required = projectDigestUsesFlat(uses.required);
+    const optional = omitRequiredUseAliases(projectDigestUsesFlat(uses.optional), required);
+    if (!required && !optional) {
+        return undefined;
+    }
+    return {
+        ...(required ? { required } : {}),
+        ...(optional ? { optional } : {}),
+    };
+}
 function projectDigestRpc(rpc) {
     if (!rpc) {
         return undefined;
@@ -437,7 +694,7 @@ function projectDigestOperations(operations) {
         {
             ...operation,
             ...((operation.capabilities?.call || operation.capabilities?.read ||
-                operation.capabilities?.cancel)
+                operation.capabilities?.cancel || operation.capabilities?.control)
                 ? {
                     capabilities: {
                         ...(operation.capabilities.call
@@ -449,6 +706,9 @@ function projectDigestOperations(operations) {
                         ...(operation.capabilities.cancel
                             ? { cancel: sortedUnique(operation.capabilities.cancel) }
                             : {}),
+                        ...(operation.capabilities.control
+                            ? { control: sortedUnique(operation.capabilities.control) }
+                            : {}),
                     },
                 }
                 : {}),
@@ -478,6 +738,314 @@ function projectDigestEvents(events) {
         },
     ]));
 }
+function projectDigestFeeds(feeds) {
+    if (!feeds) {
+        return undefined;
+    }
+    return Object.fromEntries(Object.entries(feeds).map(([name, feed]) => [
+        name,
+        {
+            ...feed,
+            ...(feed.capabilities?.subscribe
+                ? {
+                    capabilities: {
+                        subscribe: sortedUnique(feed.capabilities.subscribe),
+                    },
+                }
+                : {}),
+        },
+    ]));
+}
+function mapValues(values, map) {
+    if (!values)
+        return undefined;
+    return Object.fromEntries(Object.entries(values).map(([key, value]) => [key, map(value)]));
+}
+function schemaRef(ref) {
+    return { schema: ref.schema };
+}
+function capabilityMetadata(metadata) {
+    return {
+        displayName: metadata.displayName,
+        description: metadata.description,
+        ...(metadata.consequence ? { consequence: metadata.consequence } : {}),
+    };
+}
+function useRpc(use) {
+    if (!use)
+        return undefined;
+    return {
+        ...(use.call ? { call: [...use.call] } : {}),
+    };
+}
+function usePubSub(use) {
+    if (!use)
+        return undefined;
+    return {
+        ...(use.publish ? { publish: [...use.publish] } : {}),
+        ...(use.subscribe ? { subscribe: [...use.subscribe] } : {}),
+    };
+}
+function contractUse(use) {
+    return {
+        contract: use.contract,
+        ...(use.rpc ? { rpc: useRpc(use.rpc) } : {}),
+        ...(use.operations ? { operations: useRpc(use.operations) } : {}),
+        ...(use.events ? { events: usePubSub(use.events) } : {}),
+        ...(use.feeds
+            ? {
+                feeds: {
+                    ...(use.feeds.subscribe
+                        ? { subscribe: [...use.feeds.subscribe] }
+                        : {}),
+                },
+            }
+            : {}),
+    };
+}
+function contractUses(uses) {
+    if (!uses)
+        return undefined;
+    return {
+        ...(uses.required
+            ? { required: mapValues(uses.required, contractUse) }
+            : {}),
+        ...(uses.optional
+            ? { optional: mapValues(uses.optional, contractUse) }
+            : {}),
+    };
+}
+function stateStore(store) {
+    return {
+        kind: store.kind,
+        schema: schemaRef(store.schema),
+        ...(store.stateVersion ? { stateVersion: store.stateVersion } : {}),
+        ...(store.acceptedVersions
+            ? { acceptedVersions: mapValues(store.acceptedVersions, schemaRef) }
+            : {}),
+    };
+}
+function rpcMethod(method) {
+    return {
+        version: method.version,
+        subject: method.subject,
+        input: schemaRef(method.input),
+        output: schemaRef(method.output),
+        ...(method.transfer
+            ? { transfer: { direction: method.transfer.direction } }
+            : {}),
+        ...(method.capabilities?.call
+            ? { capabilities: { call: [...method.capabilities.call] } }
+            : {}),
+        ...(method.errors
+            ? { errors: method.errors.map((error) => ({ type: error.type })) }
+            : {}),
+    };
+}
+function operation(operation) {
+    return {
+        version: operation.version,
+        subject: operation.subject,
+        input: schemaRef(operation.input),
+        ...(operation.progress ? { progress: schemaRef(operation.progress) } : {}),
+        output: schemaRef(operation.output),
+        ...(operation.transfer
+            ? {
+                transfer: {
+                    direction: operation.transfer.direction,
+                    store: operation.transfer.store,
+                    key: operation.transfer.key,
+                    ...(operation.transfer.contentType
+                        ? { contentType: operation.transfer.contentType }
+                        : {}),
+                    ...(operation.transfer.metadata
+                        ? { metadata: operation.transfer.metadata }
+                        : {}),
+                    ...(operation.transfer.expiresInMs !== undefined
+                        ? { expiresInMs: operation.transfer.expiresInMs }
+                        : {}),
+                    ...(operation.transfer.maxBytes !== undefined
+                        ? { maxBytes: operation.transfer.maxBytes }
+                        : {}),
+                },
+            }
+            : {}),
+        ...(operation.capabilities
+            ? {
+                capabilities: {
+                    ...(operation.capabilities.call
+                        ? { call: [...operation.capabilities.call] }
+                        : {}),
+                    ...(operation.capabilities.read
+                        ? { read: [...operation.capabilities.read] }
+                        : {}),
+                    ...(operation.capabilities.cancel
+                        ? { cancel: [...operation.capabilities.cancel] }
+                        : {}),
+                    ...(operation.capabilities.control
+                        ? { control: [...operation.capabilities.control] }
+                        : {}),
+                },
+            }
+            : {}),
+        ...(operation.signals
+            ? {
+                signals: mapValues(operation.signals, (signal) => ({ input: schemaRef(signal.input) })),
+            }
+            : {}),
+        ...(operation.cancel !== undefined ? { cancel: operation.cancel } : {}),
+    };
+}
+function event(event) {
+    return {
+        version: event.version,
+        subject: event.subject,
+        ...(event.params ? { params: [...event.params] } : {}),
+        event: schemaRef(event.event),
+        ...(event.capabilities
+            ? {
+                capabilities: {
+                    ...(event.capabilities.publish
+                        ? { publish: [...event.capabilities.publish] }
+                        : {}),
+                    ...(event.capabilities.subscribe
+                        ? { subscribe: [...event.capabilities.subscribe] }
+                        : {}),
+                },
+            }
+            : {}),
+    };
+}
+function feed(feed) {
+    return {
+        version: feed.version,
+        subject: feed.subject,
+        input: schemaRef(feed.input),
+        event: schemaRef(feed.event),
+        ...(feed.capabilities?.subscribe
+            ? { capabilities: { subscribe: [...feed.capabilities.subscribe] } }
+            : {}),
+    };
+}
+function errorDecl(error) {
+    return {
+        type: error.type,
+        ...(error.schema ? { schema: schemaRef(error.schema) } : {}),
+    };
+}
+function jobQueue(queue) {
+    return {
+        payload: schemaRef(queue.payload),
+        ...(queue.result ? { result: schemaRef(queue.result) } : {}),
+        ...(queue.maxDeliver !== undefined ? { maxDeliver: queue.maxDeliver } : {}),
+        ...(queue.backoffMs ? { backoffMs: [...queue.backoffMs] } : {}),
+        ...(queue.ackWaitMs !== undefined ? { ackWaitMs: queue.ackWaitMs } : {}),
+        ...(queue.defaultDeadlineMs !== undefined
+            ? { defaultDeadlineMs: queue.defaultDeadlineMs }
+            : {}),
+        ...(queue.progress !== undefined ? { progress: queue.progress } : {}),
+        ...(queue.logs !== undefined ? { logs: queue.logs } : {}),
+        ...(queue.dlq !== undefined ? { dlq: queue.dlq } : {}),
+        ...(queue.concurrency !== undefined
+            ? { concurrency: queue.concurrency }
+            : {}),
+    };
+}
+function kvResource(resource) {
+    return {
+        purpose: resource.purpose,
+        schema: schemaRef(resource.schema),
+        ...(resource.required !== undefined ? { required: resource.required } : {}),
+        ...(resource.history !== undefined ? { history: resource.history } : {}),
+        ...(resource.ttlMs !== undefined ? { ttlMs: resource.ttlMs } : {}),
+        ...(resource.maxValueBytes !== undefined
+            ? { maxValueBytes: resource.maxValueBytes }
+            : {}),
+    };
+}
+function storeResource(resource) {
+    return {
+        purpose: resource.purpose,
+        ...(resource.required !== undefined ? { required: resource.required } : {}),
+        ...(resource.ttlMs !== undefined ? { ttlMs: resource.ttlMs } : {}),
+        ...(resource.maxObjectBytes !== undefined
+            ? { maxObjectBytes: resource.maxObjectBytes }
+            : {}),
+        ...(resource.maxTotalBytes !== undefined
+            ? { maxTotalBytes: resource.maxTotalBytes }
+            : {}),
+    };
+}
+/**
+ * Return the canonical manifest shape used by Trellis runtimes before
+ * validation, persistence, and digesting.
+ *
+ * This is not the digest projection: human-facing fields such as
+ * `displayName` and `description` are preserved here even though they are not
+ * part of contract identity. Unknown extension fields are intentionally omitted
+ * until the runtime explicitly supports them.
+ */
+function normalizeContractManifest(contract) {
+    return {
+        format: contract.format,
+        id: contract.id,
+        displayName: contract.displayName,
+        description: contract.description,
+        kind: contract.kind,
+        ...(contract.capabilities
+            ? { capabilities: mapValues(contract.capabilities, capabilityMetadata) }
+            : {}),
+        ...(contract.schemas ? { schemas: contract.schemas } : {}),
+        ...(contract.exports
+            ? {
+                exports: {
+                    ...(contract.exports.schemas
+                        ? { schemas: [...contract.exports.schemas] }
+                        : {}),
+                },
+            }
+            : {}),
+        ...(contract.uses ? { uses: contractUses(contract.uses) } : {}),
+        ...(contract.state ? { state: mapValues(contract.state, stateStore) } : {}),
+        ...(contract.rpc ? { rpc: mapValues(contract.rpc, rpcMethod) } : {}),
+        ...(contract.operations
+            ? { operations: mapValues(contract.operations, operation) }
+            : {}),
+        ...(contract.events ? { events: mapValues(contract.events, event) } : {}),
+        ...(contract.feeds ? { feeds: mapValues(contract.feeds, feed) } : {}),
+        ...(contract.jobs ? { jobs: mapValues(contract.jobs, jobQueue) } : {}),
+        ...(contract.resources
+            ? {
+                resources: {
+                    ...(contract.resources.kv
+                        ? { kv: mapValues(contract.resources.kv, kvResource) }
+                        : {}),
+                    ...(contract.resources.store
+                        ? { store: mapValues(contract.resources.store, storeResource) }
+                        : {}),
+                },
+            }
+            : {}),
+        ...(contract.errors
+            ? { errors: mapValues(contract.errors, errorDecl) }
+            : {}),
+    };
+}
+/**
+ * Parse untrusted contract JSON into the current Trellis v1 manifest shape.
+ *
+ * Unknown extension fields are accepted for forward compatibility but are not
+ * returned. Callers must use the returned value for persistence and digesting.
+ */
+function parseContractManifest(value) {
+    try {
+        return normalizeContractManifest(value_1.Value.Parse(exports.TrellisContractV1Schema, value));
+    }
+    catch (error) {
+        const details = [...value_1.Value.Errors(exports.TrellisContractV1Schema, value)].map((entry) => `${entry.instancePath || "#"}: ${entry.message}`);
+        throw new TypeError(`Invalid contract${details.length > 0 ? `:\n${details.join("\n")}` : ""}`, { cause: error });
+    }
+}
 /**
  * Build the normalized runtime/interface projection used for contract identity.
  */
@@ -489,16 +1057,19 @@ function projectContractDigestManifest(contract) {
     const rpc = projectDigestRpc(contract.rpc);
     const operations = projectDigestOperations(contract.operations);
     const events = projectDigestEvents(contract.events);
+    const feeds = projectDigestFeeds(contract.feeds);
     return {
         format: contract.format,
         id: contract.id,
         kind: contract.kind,
+        ...(contract.capabilities ? { capabilities: contract.capabilities } : {}),
         ...(schemas ? { schemas } : {}),
         ...(contract.state ? { state: contract.state } : {}),
         ...(uses ? { uses } : {}),
         ...(rpc ? { rpc } : {}),
         ...(operations ? { operations } : {}),
         ...(events ? { events } : {}),
+        ...(feeds ? { feeds } : {}),
         ...(errors ? { errors } : {}),
         ...(contract.jobs ? { jobs: contract.jobs } : {}),
         ...(resources ? { resources } : {}),
@@ -506,7 +1077,7 @@ function projectContractDigestManifest(contract) {
 }
 /** Compute the v1 contract digest from the normalized digest projection. */
 function digestContractManifest(contract) {
-    return digestCanonicalJson(projectContractDigestManifest(contract));
+    return digestCanonicalJson(projectContractDigestManifest(normalizeContractManifest(contract)));
 }
 function rpcSubject(name, version) {
     return `rpc.${version}.${name}`;
@@ -514,6 +1085,9 @@ function rpcSubject(name, version) {
 function operationSubject(name, version) {
     return `operations.${version}.${name}`;
 }
+function feedSubject(name, version) {
+    return `feeds.${version}.${name}`;
+}
 function eventSubject(name, version, params) {
     const suffix = params && params.length > 0
         ? `.${params.map((pointer) => `{${pointer}}`).join(".")}`
@@ -607,10 +1181,14 @@ function buildContractKvMetadata(resources, schemas) {
     const metadata = {};
     for (const [alias, resource] of Object.entries(kv)) {
         assertSchemaRefExists(schemas, resource.schema, `kv resource '${alias}'`);
+        const schema = schemas?.[resource.schema.schema];
+        if (!schema) {
+            throw new Error(`kv resource '${alias}' references missing schema '${resource.schema.schema}'`);
+        }
         metadata[alias] = {
             required: resource.required ?? true,
             value: undefined,
-            schema: schemas[resource.schema.schema],
+            schema,
         };
     }
     return metadata;
@@ -648,7 +1226,7 @@ function emitState(state) {
         },
     ]));
 }
-function emitUses(uses) {
+function emitUsesFlat(uses) {
     if (!uses) {
         return undefined;
     }
@@ -672,10 +1250,28 @@ function emitUses(uses) {
                     },
                 }
                 : {}),
+            ...(use.feeds?.subscribe
+                ? { feeds: { subscribe: sortedUnique(use.feeds.subscribe) } }
+                : {}),
         },
     ]));
 }
+function emitUses(uses) {
+    if (!uses) {
+        return undefined;
+    }
+    const required = emitUsesFlat(uses.required);
+    const optional = omitRequiredUseAliases(emitUsesFlat(uses.optional), required);
+    if (!required && !optional) {
+        return undefined;
+    }
+    return {
+        ...(required ? { required } : {}),
+        ...(optional ? { optional } : {}),
+    };
+}
 function emitContract(source) {
+    const capabilities = emitCapabilities(source.id, source.capabilities);
     const rpc = source.rpc
         ? Object.fromEntries(Object.entries(source.rpc).map(([name, method]) => {
             const emitted = {
@@ -686,7 +1282,7 @@ function emitContract(source) {
             };
             if (method.capabilities?.call) {
                 emitted.capabilities = {
-                    call: sortedUnique(method.capabilities.call),
+                    call: projectCapabilities(method.capabilities.call, source.id, source.capabilities, `rpc '${name}' call capabilities`) ?? [],
                 };
             }
             if (method.transfer) {
@@ -733,19 +1329,36 @@ function emitContract(source) {
                 emitted.transfer = { ...operation.transfer, direction: "send" };
             }
             if (operation.capabilities?.call || operation.capabilities?.read ||
-                operation.capabilities?.cancel) {
+                operation.capabilities?.cancel || operation.capabilities?.control) {
                 emitted.capabilities = {
                     ...(operation.capabilities.call
-                        ? { call: sortedUnique(operation.capabilities.call) }
+                        ? {
+                            call: projectCapabilities(operation.capabilities.call, source.id, source.capabilities, `operation '${name}' call capabilities`) ?? [],
+                        }
                         : {}),
                     ...(operation.capabilities.read
-                        ? { read: sortedUnique(operation.capabilities.read) }
+                        ? {
+                            read: projectCapabilities(operation.capabilities.read, source.id, source.capabilities, `operation '${name}' read capabilities`) ?? [],
+                        }
                         : {}),
                     ...(operation.capabilities.cancel
-                        ? { cancel: sortedUnique(operation.capabilities.cancel) }
+                        ? {
+                            cancel: projectCapabilities(operation.capabilities.cancel, source.id, source.capabilities, `operation '${name}' cancel capabilities`) ?? [],
+                        }
+                        : {}),
+                    ...(operation.capabilities.control
+                        ? {
+                            control: projectCapabilities(operation.capabilities.control, source.id, source.capabilities, `operation '${name}' control capabilities`) ?? [],
+                        }
                         : {}),
                 };
             }
+            if (operation.signals) {
+                emitted.signals = Object.fromEntries(Object.entries(operation.signals).map(([signalName, signal]) => [
+                    signalName,
+                    { input: { ...signal.input } },
+                ]));
+            }
             if (operation.cancel !== undefined) {
                 emitted.cancel = operation.cancel;
             }
@@ -769,16 +1382,36 @@ function emitContract(source) {
             if (event.capabilities?.publish || event.capabilities?.subscribe) {
                 emitted.capabilities = {
                     ...(event.capabilities.publish
-                        ? { publish: sortedUnique(event.capabilities.publish) }
+                        ? {
+                            publish: projectCapabilities(event.capabilities.publish, source.id, source.capabilities, `event '${name}' publish capabilities`) ?? [],
+                        }
                         : {}),
                     ...(event.capabilities.subscribe
-                        ? { subscribe: sortedUnique(event.capabilities.subscribe) }
+                        ? {
+                            subscribe: projectCapabilities(event.capabilities.subscribe, source.id, source.capabilities, `event '${name}' subscribe capabilities`) ?? [],
+                        }
                         : {}),
                 };
             }
             return [name, emitted];
         }))
         : undefined;
+    const feeds = source.feeds
+        ? Object.fromEntries(Object.entries(source.feeds).map(([name, feed]) => {
+            const emitted = {
+                version: feed.version,
+                subject: feed.subject ?? feedSubject(name, feed.version),
+                input: { ...feed.input },
+                event: { ...feed.event },
+            };
+            if (feed.capabilities?.subscribe) {
+                emitted.capabilities = {
+                    subscribe: projectCapabilities(feed.capabilities.subscribe, source.id, source.capabilities, `feed '${name}' subscribe capabilities`) ?? [],
+                };
+            }
+            return [name, emitted];
+        }))
+        : undefined;
     const errors = source.errors
         ? Object.fromEntries(Object.entries(source.errors).map(([name, error]) => {
             const emitted = { type: error.type };
@@ -799,6 +1432,7 @@ function emitContract(source) {
         displayName: source.displayName,
         description: source.description,
         kind: source.kind,
+        ...(capabilities ? { capabilities } : {}),
         ...(source.schemas ? { schemas: cloneSchemas(source.schemas) } : {}),
         ...(source.exports
             ? { exports: cloneContractExports(source.exports) }
@@ -808,6 +1442,7 @@ function emitContract(source) {
         ...(rpc ? { rpc } : {}),
         ...(operations ? { operations } : {}),
         ...(events ? { events } : {}),
+        ...(feeds ? { feeds } : {}),
         ...(errors ? { errors } : {}),
         ...(jobs ? { jobs } : {}),
         ...(resources ? { resources } : {}),
@@ -842,7 +1477,7 @@ function buildOwnedApi(source) {
             subject: method.subject ?? rpcSubject(name, method.version),
             input: (0, runtime_js_1.schema)(resolveSchemaRef(source.schemas, method.input, `rpc '${name}' input`)),
             output: (0, runtime_js_1.schema)(resolveSchemaRef(source.schemas, method.output, `rpc '${name}' output`)),
-            callerCapabilities: method.capabilities?.call ?? [],
+            callerCapabilities: projectCapabilities(method.capabilities?.call, source.id, source.capabilities, `rpc '${name}' call capabilities`) ?? [],
             transfer: method.transfer ? { ...method.transfer } : undefined,
             authRequired: method.authRequired ?? true,
             errors: method.errors,
@@ -867,9 +1502,18 @@ function buildOwnedApi(source) {
             transfer: operation.transfer
                 ? { ...operation.transfer, direction: "send" }
                 : undefined,
-            callerCapabilities: operation.capabilities?.call ?? [],
-            readCapabilities: operation.capabilities?.read ?? [],
-            cancelCapabilities: operation.capabilities?.cancel ?? [],
+            signals: operation.signals
+                ? Object.fromEntries(Object.entries(operation.signals).map(([signalName, signal]) => [
+                    signalName,
+                    {
+                        input: (0, runtime_js_1.schema)(resolveSchemaRef(source.schemas, signal.input, `operation '${name}' signal '${signalName}' input`)),
+                    },
+                ]))
+                : undefined,
+            callerCapabilities: projectCapabilities(operation.capabilities?.call, source.id, source.capabilities, `operation '${name}' call capabilities`) ?? [],
+            readCapabilities: projectCapabilities(operation.capabilities?.read, source.id, source.capabilities, `operation '${name}' read capabilities`) ?? [],
+            cancelCapabilities: projectCapabilities(operation.capabilities?.cancel, source.id, source.capabilities, `operation '${name}' cancel capabilities`) ?? [],
+            controlCapabilities: projectCapabilities(operation.capabilities?.control, source.id, source.capabilities, `operation '${name}' control capabilities`) ?? [],
             cancel: operation.cancel,
         },
     ]));
@@ -884,12 +1528,21 @@ function buildOwnedApi(source) {
                     eventSubject(name, event.version, event.params),
                 params: event.params,
                 event: (0, runtime_js_1.schema)(resolveSchemaRef(source.schemas, event.event, `event '${name}'`)),
-                publishCapabilities: event.capabilities?.publish ?? [],
-                subscribeCapabilities: event.capabilities?.subscribe ?? [],
+                publishCapabilities: projectCapabilities(event.capabilities?.publish, source.id, source.capabilities, `event '${name}' publish capabilities`) ?? [],
+                subscribeCapabilities: projectCapabilities(event.capabilities?.subscribe, source.id, source.capabilities, `event '${name}' subscribe capabilities`) ?? [],
             },
         ];
     }));
-    return { rpc, operations, events, subjects: {} };
+    const feeds = Object.fromEntries(Object.entries(source.feeds ?? {}).map(([name, feed]) => [
+        name,
+        {
+            subject: feed.subject ?? feedSubject(name, feed.version),
+            input: (0, runtime_js_1.schema)(resolveSchemaRef(source.schemas, feed.input, `feed '${name}' input`)),
+            event: (0, runtime_js_1.schema)(resolveSchemaRef(source.schemas, feed.event, `feed '${name}' event`)),
+            subscribeCapabilities: projectCapabilities(feed.capabilities?.subscribe, source.id, source.capabilities, `feed '${name}' subscribe capabilities`) ?? [],
+        },
+    ]));
+    return { rpc, operations, events, feeds, subjects: {} };
 }
 function mergeRecord(kind, out, next) {
     for (const [key, value] of Object.entries(next)) {
@@ -914,6 +1567,7 @@ function assertValidUseSpec(contractId, spec, api) {
     assertSelectedKeysExist(contractId, "operations", spec.operations?.call, api.operations);
     assertSelectedKeysExist(contractId, "events", spec.events?.publish, api.events);
     assertSelectedKeysExist(contractId, "events", spec.events?.subscribe, api.events);
+    assertSelectedKeysExist(contractId, "feeds", spec.feeds?.subscribe, api.feeds ?? {});
 }
 function attachContractModuleMetadata(value, contractModule) {
     Object.defineProperty(value, CONTRACT_MODULE_METADATA, {
@@ -1042,6 +1696,9 @@ function createUseHelper(getContractModule) {
                     },
                 }
                 : {}),
+            ...(spec.feeds?.subscribe
+                ? { feeds: { subscribe: [...spec.feeds.subscribe] } }
+                : {}),
         };
         return attachContractModuleMetadata(dependencyUse, contractModule);
     });
@@ -1053,11 +1710,11 @@ function getContractModuleFromUse(alias, useValue) {
     }
     return contractModule;
 }
-function normalizeUses(uses) {
+function normalizeUseEntries(uses) {
     if (!uses) {
         return {
             manifestUses: undefined,
-            usedApi: { rpc: {}, operations: {}, events: {}, subjects: {} },
+            usedApi: { rpc: {}, operations: {}, events: {}, feeds: {}, subjects: {} },
         };
     }
     const manifestUses = {};
@@ -1065,6 +1722,7 @@ function normalizeUses(uses) {
         rpc: {},
         operations: {},
         events: {},
+        feeds: {},
         subjects: {},
     };
     for (const [alias, useValue] of Object.entries(uses)) {
@@ -1073,6 +1731,7 @@ function normalizeUses(uses) {
         const operationsCall = useValue.operations?.call;
         const eventsPublish = useValue.events?.publish;
         const eventsSubscribe = useValue.events?.subscribe;
+        const feedsSubscribe = useValue.feeds?.subscribe;
         if (useValue.contract !== contractModule.CONTRACT_ID) {
             throw new Error(`Contract use '${alias}' references '${useValue.contract}' but module id is '${contractModule.CONTRACT_ID}'`);
         }
@@ -1087,6 +1746,7 @@ function normalizeUses(uses) {
                     },
                 }
                 : {}),
+            ...(feedsSubscribe ? { feeds: { subscribe: feedsSubscribe } } : {}),
         }, contractModule.API.owned);
         manifestUses[alias] = {
             contract: contractModule.CONTRACT_ID,
@@ -1100,6 +1760,7 @@ function normalizeUses(uses) {
                     },
                 }
                 : {}),
+            ...(feedsSubscribe ? { feeds: { subscribe: [...feedsSubscribe] } } : {}),
         };
         const rpcKeys = selectedKeys(rpcCall);
         if (rpcKeys.length > 0) {
@@ -1116,11 +1777,35 @@ function normalizeUses(uses) {
         if (eventKeys.size > 0) {
             mergeRecord("events", usedApi.events, Object.fromEntries([...eventKeys].map((key) => [key, contractModule.API.owned.events[key]])));
         }
+        const feedKeys = selectedKeys(feedsSubscribe);
+        if (feedKeys.length > 0) {
+            mergeRecord("feeds", usedApi.feeds ?? {}, Object.fromEntries(feedKeys.map((key) => [key, contractModule.API.owned.feeds?.[key]])));
+        }
     }
     return { manifestUses, usedApi };
 }
+function normalizeUses(uses) {
+    if (!uses) {
+        return {
+            manifestUses: undefined,
+            usedApi: emptyApi(),
+        };
+    }
+    const required = normalizeUseEntries(uses.required);
+    const optional = normalizeUseEntries(omitRequiredUseAliases(uses.optional, uses.required));
+    const usedApi = emptyApi();
+    mergeUseIntoApi(usedApi, required.usedApi);
+    mergeUseIntoApi(usedApi, optional.usedApi);
+    return {
+        manifestUses: {
+            ...(required.manifestUses ? { required: required.manifestUses } : {}),
+            ...(optional.manifestUses ? { optional: optional.manifestUses } : {}),
+        },
+        usedApi,
+    };
+}
 function emptyApi() {
-    return { rpc: {}, operations: {}, events: {}, subjects: {} };
+    return { rpc: {}, operations: {}, events: {}, feeds: {}, subjects: {} };
 }
 function addUniqueStrings(target, values) {
     for (const value of values) {
@@ -1146,6 +1831,8 @@ function mergeUseIntoManifest(manifestUses, alias, use) {
     addUniqueStrings(eventsPublish, use.events?.publish ?? []);
     const eventsSubscribe = [...(existing.events?.subscribe ?? [])];
     addUniqueStrings(eventsSubscribe, use.events?.subscribe ?? []);
+    const feedsSubscribe = [...(existing.feeds?.subscribe ?? [])];
+    addUniqueStrings(feedsSubscribe, use.feeds?.subscribe ?? []);
     manifestUses[alias] = {
         contract: existing.contract,
         ...(rpcCall.length > 0 ? { rpc: { call: rpcCall } } : {}),
@@ -1160,6 +1847,9 @@ function mergeUseIntoManifest(manifestUses, alias, use) {
                 },
             }
             : {}),
+        ...(feedsSubscribe.length > 0
+            ? { feeds: { subscribe: feedsSubscribe } }
+            : {}),
     };
 }
 function mergeApiAllowDuplicateSubject(kind, out, next) {
@@ -1184,6 +1874,7 @@ function mergeUseIntoApi(target, api) {
     mergeApiAllowDuplicateSubject("rpc", target.rpc, api.rpc);
     mergeApiAllowDuplicateSubject("operations", target.operations, api.operations);
     mergeApiAllowDuplicateSubject("events", target.events, api.events);
+    mergeApiAllowDuplicateSubject("feeds", target.feeds ?? {}, api.feeds ?? {});
     mergeApiAllowDuplicateSubject("subjects", target.subjects, api.subjects);
 }
 function baselineUse(contract, use, api) {
@@ -1197,22 +1888,33 @@ function deriveImplicitTrellisUses(source) {
     if (source.state) {
         uses.state = baselineUse(TRELLIS_STATE_CONTRACT_ID, { rpc: { call: [...BASELINE_STATE_RPC_CALL] } }, BASELINE_STATE_API);
     }
+    if ((source.kind === "service" || source.kind === "device") &&
+        source.id !== TRELLIS_HEALTH_CONTRACT_ID) {
+        uses.health = baselineUse(TRELLIS_HEALTH_CONTRACT_ID, { events: { publish: [...BASELINE_HEALTH_EVENTS_PUBLISH] } }, BASELINE_HEALTH_API);
+    }
     return uses;
 }
 function normalizeContractUses(source) {
     const explicit = normalizeUses(source.uses);
-    const manifestUses = {
-        ...(explicit.manifestUses ?? {}),
-    };
     const usedApi = emptyApi();
     mergeUseIntoApi(usedApi, explicit.usedApi);
+    const required = {
+        ...(explicit.manifestUses?.required ?? {}),
+    };
+    const optional = explicit.manifestUses?.optional
+        ? { ...explicit.manifestUses.optional }
+        : undefined;
     for (const [alias, use] of Object.entries(deriveImplicitTrellisUses(source))) {
-        mergeUseIntoManifest(manifestUses, alias, use.manifestUse);
+        mergeUseIntoManifest(required, alias, use.manifestUse);
         mergeUseIntoApi(usedApi, use.api);
     }
     return {
-        manifestUses: Object.keys(manifestUses).length > 0
-            ? manifestUses
+        manifestUses: Object.keys(required).length > 0 ||
+            (optional && Object.keys(optional).length > 0)
+            ? {
+                ...(Object.keys(required).length > 0 ? { required } : {}),
+                ...(optional && Object.keys(optional).length > 0 ? { optional } : {}),
+            }
             : undefined,
         usedApi,
     };
@@ -1231,11 +1933,13 @@ function mergeDerivedApis(ownedApi, usedApi) {
         rpc: mergeApiSection("rpc", usedApi.rpc, ownedApi.rpc),
         operations: mergeApiSection("operations", usedApi.operations, ownedApi.operations),
         events: mergeApiSection("events", usedApi.events, ownedApi.events),
+        feeds: mergeApiSection("feeds", usedApi.feeds ?? {}, ownedApi.feeds ?? {}),
         subjects: mergeApiSection("subjects", usedApi.subjects, ownedApi.subjects),
     };
 }
 function defineContract(registry, build) {
     assertRegistryDoesNotDeclareExports(registry);
+    assertRegistryDoesNotDeclareCapabilities(registry);
     const errorClasses = getErrorClassRegistry(registry.errors);
     const normalizedErrors = normalizeErrorRegistry(registry.errors);
     const body = build(createContractRefBuilder({
@@ -1255,6 +1959,7 @@ function defineContract(registry, build) {
         displayName: source.displayName,
         description: source.description,
         kind: source.kind,
+        ...(source.capabilities ? { capabilities: source.capabilities } : {}),
         ...(source.schemas ? { schemas: source.schemas } : {}),
         ...(source.exports ? { exports: source.exports } : {}),
         ...(source.state ? { state: source.state } : {}),
@@ -1262,6 +1967,7 @@ function defineContract(registry, build) {
         ...(source.rpc ? { rpc: source.rpc } : {}),
         ...(source.operations ? { operations: source.operations } : {}),
         ...(source.events ? { events: source.events } : {}),
+        ...(source.feeds ? { feeds: source.feeds } : {}),
         ...(source.errors ? { errors: source.errors } : {}),
         ...(source.jobs ? { jobs: source.jobs } : {}),
         ...(source.resources ? { resources: source.resources } : {}),