@aikdna/kdna-core 0.18.0 → 0.19.0

package/src/container/index.mjs

@@ -0,0 +1,20 @@
+import containerApi from './index.js';
+
+export const MIMETYPE = containerApi.MIMETYPE;
+export const REQUIRED_DIR_ENTRIES = containerApi.REQUIRED_DIR_ENTRIES;
+export const isKdnaSourceDir = containerApi.isKdnaSourceDir;
+export const detectContainerFormat = containerApi.detectContainerFormat;
+export const readLayout = containerApi.readLayout;
+export const inspect = containerApi.inspect;
+export const validate = containerApi.validate;
+export const planLoad = containerApi.planLoad;
+export const loadAuthorized = containerApi.loadAuthorized;
+export const buildChecksums = containerApi.buildChecksums;
+export const computeRuntimeEntrySetDigest = containerApi.computeRuntimeEntrySetDigest;
+export const pack = containerApi.pack;
+export const unpack = containerApi.unpack;
+export const load = containerApi.load;
+export const loadAsset = containerApi.loadAsset;
+export const FORBIDDEN_OUTPUT_TERMS = containerApi.FORBIDDEN_OUTPUT_TERMS;
+
+export default containerApi;

package/src/container-dispatcher.js

@@ -185,7 +185,7 @@ function readSourceDirectory(absPath, _opts) {
 }
 
 function readKdnaContainer(absPath, _opts) {
-  const v1Layout = require('./v1/index.js').readLayout(absPath);
+  const layout = require('./container/index.js').readLayout(absPath);
   const containerBuf = fs.readFileSync(absPath);
   const assetDigest = crypto.createHash('sha256').update(containerBuf).digest();
 
@@ -194,15 +194,15 @@ function readKdnaContainer(absPath, _opts) {
     sourcePath: absPath,
     format: 'kdna',
     mimetype: MIMETYPE,
-    manifest: v1Layout.manifest,
-    payloadRaw: v1Layout.map['payload.kdnab'] || null,
-    checksums: v1Layout.map['checksums.json']
-      ? (() => { try { return JSON.parse(v1Layout.map['checksums.json'].toString('utf8')); } catch { return null; } })()
+    manifest: layout.manifest,
+    payloadRaw: layout.map['payload.kdnab'] || null,
+    checksums: layout.map['checksums.json']
+      ? (() => { try { return JSON.parse(layout.map['checksums.json'].toString('utf8')); } catch { return null; } })()
       : null,
     assetDigest,
     containerDigest: `sha256:${assetDigest.toString('hex')}`,
     containerBuffer: containerBuf,
-    entries: new Map(Object.entries(v1Layout.map)),
+    entries: new Map(Object.entries(layout.map)),
   };
 }
 

package/src/crypto-profile.js

@@ -17,14 +17,7 @@ try {
  * - AES-256-GCM content encryption
  * - Random CEK per asset; license key only unwraps CEK, never touches content
  */
-const LICENSED_ENTRY_PROFILE = 'kdna-licensed-entry-v1';
-
-/**
- * Pre-RFC legacy profile (now experimental).
- * Uses scrypt-sha256 with concatenated secret (`licenseKey|machineFingerprint`).
- * Retained for backward compatibility only.
- */
-const LICENSED_EXPERIMENTAL_PROFILE = 'kdna-licensed-entry-experimental';
+const LICENSED_ENTRY_PROFILE = 'kdna.encryption.licensed-entry';
 
 /**
  * RFC-0009 compliant profile.
@@ -33,11 +26,11 @@ const LICENSED_EXPERIMENTAL_PROFILE = 'kdna-licensed-entry-experimental';
  * - AES-256-GCM content encryption
  * - Dual key slots: password + recovery
  */
-const PASSWORD_PROTECTED_PROFILE = 'kdna-password-protected-v1';
+const PASSWORD_PROTECTED_PROFILE = 'kdna.encryption.password';
+const ENCRYPTION_PROFILE_VERSION = '0.1.0';
 
 const RFC_KDF = 'HKDF-SHA256';
 const RFC_KEY_WRAPPING = 'AES-256-KW';
-const LEGACY_KDF = 'scrypt-sha256';
 const PASSWORD_KDF = 'Argon2id';
 const ALG = 'AES-256-GCM';
 
@@ -63,14 +56,20 @@ function normalizeEnvelope(value) {
     try { return cbor.decode(Buffer.from(value, 'utf8')); } catch { /* fall through */ }
   }
   if (value && typeof value === 'object') return value;
-  throw new Error('encrypted entry envelope must be CBOR (kdna_version 1.0)');
+  throw new Error('encrypted entry envelope must be CBOR (format 0.1.0)');
 }
 
-function encryptedEntryAad(entryName, manifest = {}, profile = LICENSED_ENTRY_PROFILE) {
+function encryptedEntryAad(
+  entryName,
+  manifest = {},
+  profile = LICENSED_ENTRY_PROFILE,
+  profileVersion = ENCRYPTION_PROFILE_VERSION,
+) {
   return Buffer.from(
     [
       profile,
-      manifest.name || manifest.asset_id || '',
+      profileVersion,
+      manifest.asset_id || '',
       manifest.version || '',
       entryName,
     ].join('\n'),
@@ -173,7 +172,7 @@ function aesUnwrap(key, ciphertext) {
 /**
  * Derive a key-wrapping key (KWK) from a license key via HKDF-SHA256.
  */
-function deriveWrappingKey(licenseKey, info = 'kdna-licensed-entry-v1-kwk') {
+function deriveWrappingKey(licenseKey, info = 'kdna.encryption.licensed-entry-kwk') {
   return hkdfSha256(licenseKey, null, info, 32);
 }
 
@@ -207,7 +206,7 @@ function unwrapCEK(wrappedCek, wrappingKey) {
  * 4. Wrap CEK with KWK (AES-256-KW)
  * 5. Store wrapped_key in envelope
  */
-function encryptLicensedEntryV1(plaintext, options = {}) {
+function encryptLicensedEntry(plaintext, options = {}) {
   const { entryName, manifest = {}, licenseKey } = options;
   if (!entryName) throw new Error('entryName is required');
   if (!licenseKey) throw new Error('licenseKey is required for RFC-0008 encryption');
@@ -223,6 +222,7 @@ function encryptLicensedEntryV1(plaintext, options = {}) {
 
   return {
     profile: LICENSED_ENTRY_PROFILE,
+    profile_version: ENCRYPTION_PROFILE_VERSION,
     alg: ALG,
     kdf: RFC_KDF,
     key_wrapping: RFC_KEY_WRAPPING,
@@ -240,7 +240,7 @@ function encryptLicensedEntryV1(plaintext, options = {}) {
  * 2. Unwrap CEK from wrapped_key (AES-256-KW)
  * 3. Decrypt content with CEK (AES-256-GCM)
  */
-function decryptLicensedEntryV1(envelopeValue, options = {}) {
+function decryptLicensedEntry(envelopeValue, options = {}) {
   const { entryName, manifest = {}, licenseKey } = options;
   if (!entryName) throw new Error('entryName is required');
   if (!licenseKey) throw new Error('licenseKey is required for RFC-0008 decryption');
@@ -249,6 +249,9 @@ function decryptLicensedEntryV1(envelopeValue, options = {}) {
   if (envelope.profile !== LICENSED_ENTRY_PROFILE) {
     throw new Error(`unsupported encrypted entry profile: ${envelope.profile || 'unknown'} (expected ${LICENSED_ENTRY_PROFILE})`);
   }
+  if (envelope.profile_version !== ENCRYPTION_PROFILE_VERSION) {
+    throw new Error(`unsupported encrypted entry profile_version: ${envelope.profile_version || 'unknown'}`);
+  }
   if (envelope.alg !== ALG) throw new Error(`unsupported encrypted entry alg: ${envelope.alg}`);
   if (envelope.kdf !== RFC_KDF) throw new Error(`unsupported encrypted entry kdf: ${envelope.kdf}`);
   if (envelope.key_wrapping !== RFC_KEY_WRAPPING) throw new Error(`unsupported encrypted entry key_wrapping: ${envelope.key_wrapping}`);
@@ -358,6 +361,7 @@ function encryptProtectedEntry(plaintext, options = {}) {
 
   return {
     profile: PASSWORD_PROTECTED_PROFILE,
+    profile_version: ENCRYPTION_PROFILE_VERSION,
     alg: ALG,
     kdf: PASSWORD_KDF,
     key_wrapping: RFC_KEY_WRAPPING,
@@ -382,6 +386,9 @@ function decryptProtectedEntry(envelopeValue, options = {}) {
       `unsupported encrypted entry profile: ${envelope.profile || 'unknown'} (expected ${PASSWORD_PROTECTED_PROFILE})`,
     );
   }
+  if (envelope.profile_version !== ENCRYPTION_PROFILE_VERSION) {
+    throw new Error(`unsupported encrypted entry profile_version: ${envelope.profile_version || 'unknown'}`);
+  }
   if (envelope.alg !== ALG) throw new Error(`unsupported encrypted entry alg: ${envelope.alg}`);
   if (envelope.kdf !== PASSWORD_KDF) throw new Error(`unsupported encrypted entry kdf: ${envelope.kdf}`);
   if (envelope.key_wrapping !== RFC_KEY_WRAPPING) {
@@ -422,12 +429,12 @@ function createRecoveryDecryptEntry(options = {}) {
     decryptProtectedEntry(ciphertext, { entryName, manifest, recoveryCode });
 }
 
-// ── B2: scrypt-based password profile (v0.1 write profile) ─────────
+// ── B2: scrypt-based password profile (0.1 write profile) ─────────
 // Uses Node built-in crypto.scryptSync — zero additional dependencies.
-// v0.2 will promote the Argon2id profile (above) as the default write
+// 0.2 will promote the Argon2id profile (above) as the default write
 // profile; this scrypt profile will remain a read-only legacy profile.
 
-const PASSWORD_PROTECTED_SCRYPT_PROFILE = 'kdna-password-protected-v1-scrypt';
+const PASSWORD_PROTECTED_SCRYPT_PROFILE = 'kdna.encryption.password.scrypt';
 const SCRYPT_KDF = 'scrypt-sha256';
 
 function derivePasswordKeyScrypt(password, params = {}) {
@@ -468,6 +475,7 @@ function encryptProtectedEntryScrypt(plaintext, options = {}) {
 
   return {
     profile: PASSWORD_PROTECTED_SCRYPT_PROFILE,
+    profile_version: ENCRYPTION_PROFILE_VERSION,
     alg: ALG,
     kdf: SCRYPT_KDF,
     key_wrapping: RFC_KEY_WRAPPING,
@@ -508,6 +516,9 @@ function decryptProtectedEntryScrypt(envelopeValue, options = {}) {
       `unsupported encrypted entry profile: ${envelope.profile || 'unknown'} (expected ${PASSWORD_PROTECTED_SCRYPT_PROFILE})`,
     );
   }
+  if (envelope.profile_version !== ENCRYPTION_PROFILE_VERSION) {
+    throw new Error(`unsupported encrypted entry profile_version: ${envelope.profile_version || 'unknown'}`);
+  }
   if (envelope.alg !== ALG) throw new Error(`unsupported encrypted entry alg: ${envelope.alg}`);
   if (envelope.kdf !== SCRYPT_KDF) throw new Error(`unsupported encrypted entry kdf: ${envelope.kdf}`);
   if (envelope.key_wrapping !== RFC_KEY_WRAPPING) {
@@ -537,95 +548,21 @@ function createPasswordDecryptEntryScrypt(options = {}) {
     decryptProtectedEntryScrypt(ciphertext, { entryName, manifest, password });
 }
 
-// ── Legacy / experimental profile (pre-RFC, backward compat) ───────
-
-function deriveLicensedEntryKeyLegacy(options = {}) {
-  const { licenseKey, machineFingerprint, salt, keyLength = 32 } = options;
-  if (!licenseKey) throw new Error('licenseKey is required');
-  if (!machineFingerprint) throw new Error('machineFingerprint is required');
-  const saltBuffer = Buffer.isBuffer(salt) || salt instanceof Uint8Array
-    ? Buffer.from(salt)
-    : decodeBase64(salt, 'salt');
-  const secret = `${licenseKey}|${machineFingerprint}`;
-  return crypto.scryptSync(secret, saltBuffer, keyLength);
-}
-
-function encryptLicensedEntryLegacy(plaintext, options = {}) {
-  const { entryName, manifest = {}, licenseKey, machineFingerprint } = options;
-  if (!entryName) throw new Error('entryName is required');
-  const salt = crypto.randomBytes(16);
-  const iv = crypto.randomBytes(12);
-  const key = deriveLicensedEntryKeyLegacy({ licenseKey, machineFingerprint, salt });
-  const cipher = crypto.createCipheriv('aes-256-gcm', key, iv);
-  cipher.setAAD(encryptedEntryAad(entryName, manifest, LICENSED_EXPERIMENTAL_PROFILE));
-  const ciphertext = Buffer.concat([cipher.update(toBuffer(plaintext, 'plaintext')), cipher.final()]);
-  return {
-    profile: LICENSED_EXPERIMENTAL_PROFILE,
-    alg: ALG,
-    kdf: LEGACY_KDF,
-    salt: salt.toString('base64'),
-    iv: iv.toString('base64'),
-    tag: cipher.getAuthTag().toString('base64'),
-    ciphertext: ciphertext.toString('base64'),
-  };
-}
-
-function decryptLicensedEntryLegacy(envelopeValue, options = {}) {
-  const { entryName, manifest = {}, licenseKey, machineFingerprint } = options;
-  if (!entryName) throw new Error('entryName is required');
-  const envelope = normalizeEnvelope(envelopeValue);
-  if (envelope.profile !== LICENSED_EXPERIMENTAL_PROFILE) {
-    throw new Error(`unsupported encrypted entry profile: ${envelope.profile || 'unknown'}`);
-  }
-  if (envelope.alg !== ALG) throw new Error(`unsupported encrypted entry alg: ${envelope.alg}`);
-  if (envelope.kdf !== LEGACY_KDF) throw new Error(`unsupported encrypted entry kdf: ${envelope.kdf}`);
-  const key = deriveLicensedEntryKeyLegacy({
-    licenseKey,
-    machineFingerprint,
-    salt: envelope.salt,
-  });
-  const decipher = crypto.createDecipheriv('aes-256-gcm', key, decodeBase64(envelope.iv, 'iv'));
-  decipher.setAAD(encryptedEntryAad(entryName, manifest, LICENSED_EXPERIMENTAL_PROFILE));
-  decipher.setAuthTag(decodeBase64(envelope.tag, 'tag'));
-  return Buffer.concat([
-    decipher.update(decodeBase64(envelope.ciphertext, 'ciphertext')),
-    decipher.final(),
-  ]);
-}
-
-// ── Unified entry points (auto-detect profile) ────────────────────
-
-function encryptLicensedEntry(plaintext, options = {}) {
-  return encryptLicensedEntryV1(plaintext, options);
-}
-
-function decryptLicensedEntry(envelopeValue, options = {}) {
-  const envelope = normalizeEnvelope(envelopeValue);
-  if (envelope.profile === LICENSED_ENTRY_PROFILE) {
-    return decryptLicensedEntryV1(envelopeValue, options);
-  }
-  if (envelope.profile === LICENSED_EXPERIMENTAL_PROFILE) {
-    return decryptLicensedEntryLegacy(envelopeValue, options);
-  }
-  throw new Error(`unsupported encrypted entry profile: ${envelope.profile || 'unknown'}`);
-}
-
 function createLicensedDecryptEntry(options = {}) {
-  const { licenseKey, machineFingerprint } = options;
+  const { licenseKey } = options;
   return ({ entryName, ciphertext, manifest }) =>
-    decryptLicensedEntry(ciphertext, { entryName, manifest, licenseKey, machineFingerprint });
+    decryptLicensedEntry(ciphertext, { entryName, manifest, licenseKey });
 }
 
 module.exports = {
   // Profiles
   LICENSED_ENTRY_PROFILE,
-  LICENSED_EXPERIMENTAL_PROFILE,
   PASSWORD_PROTECTED_PROFILE,
   PASSWORD_PROTECTED_SCRYPT_PROFILE,
+  ENCRYPTION_PROFILE_VERSION,
   ALG,
   RFC_KDF,
   RFC_KEY_WRAPPING,
-  LEGACY_KDF,
   PASSWORD_KDF,
   SCRYPT_KDF,
 
@@ -634,8 +571,8 @@ module.exports = {
   generateCEK,
   wrapCEK,
   unwrapCEK,
-  encryptLicensedEntryV1,
-  decryptLicensedEntryV1,
+  encryptLicensedEntry,
+  decryptLicensedEntry,
 
   // RFC-0009 compliant (Argon2id)
   derivePasswordKey,
@@ -646,20 +583,13 @@ module.exports = {
   createPasswordDecryptEntry,
   createRecoveryDecryptEntry,
 
-  // B2 scrypt password profile (v0.1 write profile)
+  // B2 scrypt password profile (0.1 write profile)
   derivePasswordKeyScrypt,
   encryptProtectedEntryScrypt,
   decryptProtectedEntryScrypt,
   createPasswordDecryptEntryScrypt,
 
-  // Legacy
-  deriveLicensedEntryKey: deriveLicensedEntryKeyLegacy,
-  encryptLicensedEntryLegacy,
-  decryptLicensedEntryLegacy,
-
-  // Unified
-  encryptLicensedEntry,
-  decryptLicensedEntry,
+  // Consumer adapter
   createLicensedDecryptEntry,
 
   // Low-level

package/src/external-key-grant.js

@@ -8,26 +8,27 @@
 
 const crypto = require('node:crypto');
 const path = require('node:path');
-const Ajv2020 = require('ajv/dist/2020');
+const JsonSchema2020 = require('ajv/dist/2020');
 const addFormats = require('ajv-formats');
 const cbor = require('cbor-x');
 const { hkdfSha256, aesWrap, aesUnwrap } = require('./crypto-profile');
 
-const EXTERNAL_ENVELOPE_PROFILE = 'kdna-envelope-external-grant-v1';
-const EXTERNAL_GRANT_PROFILE = 'kdna-key-grant-v1';
-const EXTERNAL_AAD_PROFILE = 'kdna-external-asset-cek-v1';
-const DEVICE_KEK_PROFILE = 'kdna-device-grant-kek-v1';
+const EXTERNAL_ENVELOPE_PROFILE = 'kdna.envelope.external-grant';
+const EXTERNAL_GRANT_PROFILE = 'kdna.grant.external-key';
+const EXTERNAL_AAD_PROFILE = 'kdna.key-context.asset-content';
+const DEVICE_KEK_PROFILE = 'kdna.key-context.device-grant';
+const EXTERNAL_GRANT_CONTRACT_VERSION = '0.1.0';
 const ENVELOPE_ALG = 'A256GCM';
 const GRANT_WRAP_ALG = 'X25519-HKDF-SHA256+A256KW';
 
 const schemaRoot = path.join(__dirname, '..', 'schema');
-const ajv = new Ajv2020({ allErrors: true, strict: true });
+const ajv = new JsonSchema2020({ allErrors: true, strict: true });
 addFormats(ajv);
 const validateEnvelopeSchema = ajv.compile(
-  require(path.join(schemaRoot, 'kdna-envelope-external-grant-v1.schema.json')),
+  require(path.join(schemaRoot, 'external-grant-envelope.schema.json')),
 );
 const validateGrantSchema = ajv.compile(
-  require(path.join(schemaRoot, 'kdna-key-grant-v1.schema.json')),
+  require(path.join(schemaRoot, 'external-key-grant.schema.json')),
 );
 
 const verifiedEntitlements = new WeakSet();
@@ -127,8 +128,9 @@ function externalEnvelopeAad({ manifest, entryName, plaintextDigest, keyRef, iss
   const entitlementProfile = manifest?.entitlement?.profile || '';
   const fields = [
     EXTERNAL_ENVELOPE_PROFILE,
+    EXTERNAL_GRANT_CONTRACT_VERSION,
     manifest?.asset_uid || '',
-    manifest?.asset_id || manifest?.name || '',
+    manifest?.asset_id || '',
     manifest?.version || '',
     entryName,
     plaintextDigest,
@@ -210,6 +212,7 @@ function encryptExternalGrantEntry(plaintextValue, options = {}) {
     const ciphertext = Buffer.concat([cipher.update(plaintext), cipher.final()]);
     return {
       profile: EXTERNAL_ENVELOPE_PROFILE,
+      contract_version: EXTERNAL_GRANT_CONTRACT_VERSION,
       alg: ENVELOPE_ALG,
       cek_derivation: 'HKDF-SHA256',
       key_ref: keyRef,
@@ -327,9 +330,18 @@ function createExternalKeyGrant(options = {}) {
     shared = crypto.diffieHellman({ privateKey: ephemeral.privateKey, publicKey: deviceKey });
     const salt = wrapSalt ? Buffer.from(wrapSalt) : crypto.randomBytes(16);
     if (salt.length !== 16) fail('KDNA_GRANT_FORMAT_INVALID', 'grant wrap salt must be 16 bytes');
-    kek = hkdfSha256(shared, salt, Buffer.from(`${DEVICE_KEK_PROFILE}\n${grantId}`, 'utf8'), 32);
+    kek = hkdfSha256(
+      shared,
+      salt,
+      Buffer.from(
+        `${DEVICE_KEK_PROFILE}\n${EXTERNAL_GRANT_CONTRACT_VERSION}\n${grantId}`,
+        'utf8',
+      ),
+      32,
+    );
     const grant = {
       profile: EXTERNAL_GRANT_PROFILE,
+      contract_version: EXTERNAL_GRANT_CONTRACT_VERSION,
       grant_id: grantId,
       issuer,
       signing_key_id: signingKeyId,
@@ -339,7 +351,7 @@ function createExternalKeyGrant(options = {}) {
       device_public_key: devicePublicKey,
       device_signing_public_key: deviceSigningPublicKey,
       asset: {
-        asset_id: manifest.asset_id || manifest.name,
+        asset_id: manifest.asset_id,
         asset_uid: manifest.asset_uid,
         version: manifest.version,
         digest: assetDigest,
@@ -402,7 +414,7 @@ function authorizeExternalKeyGrant(options = {}) {
     grant,
     issuerPublicKeys,
     manifest,
-    checksums,
+    expectedAssetDigest,
     envelope: envelopeValue,
     deviceAgreementKey,
     expectedAccountId,
@@ -433,10 +445,15 @@ function authorizeExternalKeyGrant(options = {}) {
     'KDNA_GRANT_DEVICE_MISMATCH',
     'device signing key',
   );
-  expectEqual(grant.asset.asset_id, manifest.asset_id || manifest.name, 'KDNA_GRANT_ASSET_MISMATCH', 'asset ID');
+  expectEqual(grant.asset.asset_id, manifest.asset_id, 'KDNA_GRANT_ASSET_MISMATCH', 'asset ID');
   expectEqual(grant.asset.asset_uid, manifest.asset_uid, 'KDNA_GRANT_ASSET_MISMATCH', 'asset UID');
   expectEqual(grant.asset.version, manifest.version, 'KDNA_GRANT_ASSET_MISMATCH', 'asset version');
-  expectEqual(grant.asset.digest, checksums?.asset_digest, 'KDNA_GRANT_DIGEST_MISMATCH', 'asset digest');
+  expectEqual(
+    grant.asset.digest,
+    expectedAssetDigest,
+    'KDNA_GRANT_DIGEST_MISMATCH',
+    'asset digest',
+  );
   expectEqual(grant.asset.entry_path, envelope.entry_path, 'KDNA_GRANT_ASSET_MISMATCH', 'entry path');
   expectEqual(grant.asset.key_ref, envelope.key_ref, 'KDNA_GRANT_ASSET_MISMATCH', 'key reference');
   expectEqual(grant.asset.issuer_key_id, envelope.issuer_key_id, 'KDNA_GRANT_ASSET_MISMATCH', 'issuer asset key');
@@ -454,7 +471,15 @@ function authorizeExternalKeyGrant(options = {}) {
   const ephemeralKey = publicKeyFromRaw('X25519', `x25519:${b64url(ephemeralRaw)}`);
   const shared = crypto.diffieHellman({ privateKey, publicKey: ephemeralKey });
   const salt = decodeB64url(grant.wrap.salt, 'grant wrap salt', 16);
-  const kek = hkdfSha256(shared, salt, Buffer.from(`${DEVICE_KEK_PROFILE}\n${grant.grant_id}`, 'utf8'), 32);
+  const kek = hkdfSha256(
+    shared,
+    salt,
+    Buffer.from(
+      `${DEVICE_KEK_PROFILE}\n${EXTERNAL_GRANT_CONTRACT_VERSION}\n${grant.grant_id}`,
+      'utf8',
+    ),
+    32,
+  );
   let cek;
   try {
     cek = aesUnwrap(kek, decodeB64url(grant.wrap.wrapped_cek, 'wrapped CEK', 40));
@@ -543,6 +568,7 @@ module.exports = {
   EXTERNAL_GRANT_PROFILE,
   EXTERNAL_AAD_PROFILE,
   DEVICE_KEK_PROFILE,
+  EXTERNAL_GRANT_CONTRACT_VERSION,
   KDNAExternalGrantError,
   canonicalJson,
   grantSigningPayload,

package/src/index.js

@@ -2,7 +2,6 @@
  * @aikdna/kdna-core — CJS entry point
  */
 const loader = require('./loader');
-const lint = require('./lint-pure');
 const validate = require('./validate-pure');
 const render = require('./render');
 const compose = require('./compose');
@@ -11,15 +10,15 @@ const cryptoProfile = require('./crypto-profile');
 const externalKeyGrant = require('./external-key-grant');
 const publicApi = require('./public-api');
 const workpackPure = require('./workpack-pure');
-const v1 = require('./v1');
+const container = require('./container');
 const runtimeApi = require('./runtime-api');
-const capsuleV2 = require('./capsule-v2');
-const executionContractV1 = require('./execution-contract-v1');
+const runtimeCapsule = require('./runtime-capsule');
+const runtimeContract = require('./runtime-contract');
+const loaderCompatibility = require('./loader-compatibility');
 
 module.exports = {
   ...publicApi,
   ...loader,
-  ...lint,
   ...validate,
   ...render,
   ...compose,
@@ -27,8 +26,12 @@ module.exports = {
   ...cryptoProfile,
   ...externalKeyGrant,
   ...workpackPure,
-  ...v1,
+  ...container,
   ...runtimeApi,
-  ...capsuleV2,
-  ...executionContractV1,
+  ...runtimeCapsule,
+  ...runtimeContract,
+  STRICT_LOADER_VERSION: loaderCompatibility.STRICT_LOADER_VERSION,
+  parseLoaderVersion: loaderCompatibility.parseLoaderVersion,
+  compareLoaderVersions: loaderCompatibility.compareLoaderVersions,
+  assessLoaderCompatibility: loaderCompatibility.assessLoaderCompatibility,
 };

package/src/index.mjs

@@ -10,10 +10,9 @@ export {
   formatContext,
 } from './loader.js';
 
-export { lintDomain, validateManifest } from './lint-pure.js';
-
 export {
   MIMETYPE,
+  KDNA_LOADER_VERSION,
   REQUIRED_DIR_ENTRIES,
   isKdnaSourceDir,
   detectContainerFormat,
@@ -23,12 +22,17 @@ export {
   buildChecksums,
   pack,
   unpack,
-  buildCapsule,
   FORBIDDEN_OUTPUT_TERMS,
   parseSemver,
   compareSemver,
   satisfies,
-} from './v1/index.js';
+} from './container/index.js';
+
+import loaderCompatibility from './loader-compatibility.js';
+export const STRICT_LOADER_VERSION = loaderCompatibility.STRICT_LOADER_VERSION;
+export const parseLoaderVersion = loaderCompatibility.parseLoaderVersion;
+export const compareLoaderVersions = loaderCompatibility.compareLoaderVersions;
+export const assessLoaderCompatibility = loaderCompatibility.assessLoaderCompatibility;
 
 import runtimeApi from './runtime-api.js';
 export const planLoad = runtimeApi.planLoad;
@@ -57,8 +61,8 @@ import cryptoProfile from './crypto-profile.js';
 import externalKeyGrant from './external-key-grant.js';
 import publicApi from './public-api.js';
 import workpackPure from './workpack-pure.js';
-import capsuleV2 from './capsule-v2.js';
-import executionContractV1 from './execution-contract-v1.js';
+import runtimeCapsule from './runtime-capsule.js';
+import runtimeContract from './runtime-contract.js';
 
 export const openKDNA = publicApi.openKDNA;
 export const openKDNASync = publicApi.openKDNASync;
@@ -80,58 +84,62 @@ export const matchDomain = publicApi.matchDomain;
 export const matchDomainSync = publicApi.matchDomainSync;
 export const composeKDNA = publicApi.composeKDNA;
 
-export const DIGEST_PROFILE = capsuleV2.DIGEST_PROFILE;
-export const CAPSULE_DIGEST_PROFILE = capsuleV2.CAPSULE_DIGEST_PROFILE;
-export const BASIS = capsuleV2.BASIS;
-export const computeAssetDigest = capsuleV2.computeAssetDigest;
-export const computeRuntimeEntrySetDigest = capsuleV2.computeRuntimeEntrySetDigest;
-export const computeDigestEvidence = capsuleV2.computeDigestEvidence;
-export const canonicalizeJcs = capsuleV2.canonicalizeJcs;
-export const computeCapsuleDeliveryDigest = capsuleV2.computeCapsuleDeliveryDigest;
-export const buildCapsuleV2 = capsuleV2.buildCapsuleV2;
-export const loadCapsuleV2 = capsuleV2.loadCapsuleV2;
-export const adaptCapsuleV2ToV1 = capsuleV2.adaptCapsuleV2ToV1;
+export const DIGEST_PROFILE = runtimeCapsule.DIGEST_PROFILE;
+export const DIGEST_PROFILE_VERSION = runtimeCapsule.DIGEST_PROFILE_VERSION;
+export const CAPSULE_DIGEST_PROFILE = runtimeCapsule.CAPSULE_DIGEST_PROFILE;
+export const CANONICALIZATION_PROFILE_VERSION = runtimeCapsule.CANONICALIZATION_PROFILE_VERSION;
+export const RUNTIME_CAPSULE_CONTRACT_VERSION = runtimeCapsule.RUNTIME_CAPSULE_CONTRACT_VERSION;
+export const BASIS = runtimeCapsule.BASIS;
+export const computeAssetDigest = runtimeCapsule.computeAssetDigest;
+export const computeRuntimeEntrySetDigest = runtimeCapsule.computeRuntimeEntrySetDigest;
+export const computeDigestEvidence = runtimeCapsule.computeDigestEvidence;
+export const canonicalizeJcs = runtimeCapsule.canonicalizeJcs;
+export const computeCapsuleDeliveryDigest = runtimeCapsule.computeCapsuleDeliveryDigest;
+export const buildRuntimeCapsule = runtimeCapsule.buildRuntimeCapsule;
+export const loadRuntimeCapsule = runtimeCapsule.loadRuntimeCapsule;
 
-export const KDNAExecutionContractError = executionContractV1.KDNAExecutionContractError;
-export const PLAN_DIGEST_PROFILE = executionContractV1.PLAN_DIGEST_PROFILE;
-export const HOST_PROTOCOL = executionContractV1.HOST_PROTOCOL;
-export const DEFAULT_CORE_CAPSULE_VERSIONS = executionContractV1.DEFAULT_CORE_CAPSULE_VERSIONS;
-export const parseExecutionContractJsonV1 = executionContractV1.parseExecutionContractJsonV1;
-export const computeConsumptionPlanDigestV1 = executionContractV1.computeConsumptionPlanDigestV1;
-export const buildConsumptionPlanV1 = executionContractV1.buildConsumptionPlanV1;
-export const validateConsumptionPlanV1 = executionContractV1.validateConsumptionPlanV1;
-export const negotiateExecutionPairV1 = executionContractV1.negotiateExecutionPairV1;
-export const buildAgentHost2RequestV1 = executionContractV1.buildAgentHost2RequestV1;
-export const validateAgentHost2RequestV1 = executionContractV1.validateAgentHost2RequestV1;
-export const validateAgentHost2ReceiptV1 = executionContractV1.validateAgentHost2ReceiptV1;
-export const deriveBudgetEvidenceV1 = executionContractV1.deriveBudgetEvidenceV1;
-export const buildPreHostBudgetBlockedTraceV1 =
-  executionContractV1.buildPreHostBudgetBlockedTraceV1;
-export const validatePreHostBudgetBlockedTraceV1 =
-  executionContractV1.validatePreHostBudgetBlockedTraceV1;
-export const buildJudgmentTraceV1 = executionContractV1.buildJudgmentTraceV1;
-export const validateJudgmentTraceV1 = executionContractV1.validateJudgmentTraceV1;
+export const KDNARuntimeContractError = runtimeContract.KDNARuntimeContractError;
+export const PLAN_DIGEST_PROFILE = runtimeContract.PLAN_DIGEST_PROFILE;
+export const PLAN_DIGEST_PROFILE_VERSION = runtimeContract.PLAN_DIGEST_PROFILE_VERSION;
+export const HOST_PROTOCOL = runtimeContract.HOST_PROTOCOL;
+export const HOST_PROTOCOL_VERSION = runtimeContract.HOST_PROTOCOL_VERSION;
+export const DEFAULT_CORE_CAPSULE_CONTRACT_VERSIONS =
+  runtimeContract.DEFAULT_CORE_CAPSULE_CONTRACT_VERSIONS;
+export const parseRuntimeContractJson = runtimeContract.parseRuntimeContractJson;
+export const computeConsumptionPlanDigest = runtimeContract.computeConsumptionPlanDigest;
+export const buildConsumptionPlan = runtimeContract.buildConsumptionPlan;
+export const validateConsumptionPlan = runtimeContract.validateConsumptionPlan;
+export const negotiateRuntimePair = runtimeContract.negotiateRuntimePair;
+export const buildAgentHostRequest = runtimeContract.buildAgentHostRequest;
+export const validateAgentHostRequest = runtimeContract.validateAgentHostRequest;
+export const validateAgentHostReceipt = runtimeContract.validateAgentHostReceipt;
+export const deriveBudgetEvidence = runtimeContract.deriveBudgetEvidence;
+export const buildPreHostBudgetBlockedTrace =
+  runtimeContract.buildPreHostBudgetBlockedTrace;
+export const validatePreHostBudgetBlockedTrace =
+  runtimeContract.validatePreHostBudgetBlockedTrace;
+export const buildJudgmentTrace = runtimeContract.buildJudgmentTrace;
+export const validateJudgmentTrace = runtimeContract.validateJudgmentTrace;
 
 export const STANDARD_ENTRIES = assetReader.STANDARD_ENTRIES;
 export const createKdnaAssetReader = assetReader.createKdnaAssetReader;
 
 export const {
   LICENSED_ENTRY_PROFILE,
-  LICENSED_EXPERIMENTAL_PROFILE,
   PASSWORD_PROTECTED_PROFILE,
   PASSWORD_PROTECTED_SCRYPT_PROFILE,
+  ENCRYPTION_PROFILE_VERSION,
   ALG,
   RFC_KDF,
   RFC_KEY_WRAPPING,
-  LEGACY_KDF,
   PASSWORD_KDF,
   SCRYPT_KDF,
   deriveWrappingKey,
   generateCEK,
   wrapCEK,
   unwrapCEK,
-  encryptLicensedEntryV1,
-  decryptLicensedEntryV1,
+  encryptLicensedEntry,
+  decryptLicensedEntry,
   derivePasswordKey,
   generateRecoveryCode,
   decodeRecoveryCode,
@@ -143,11 +151,6 @@ export const {
   encryptProtectedEntryScrypt,
   decryptProtectedEntryScrypt,
   createPasswordDecryptEntryScrypt,
-  deriveLicensedEntryKey,
-  encryptLicensedEntryLegacy,
-  decryptLicensedEntryLegacy,
-  encryptLicensedEntry,
-  decryptLicensedEntry,
   createLicensedDecryptEntry,
   hkdfSha256,
   aesWrap,
@@ -159,6 +162,7 @@ export const {
   EXTERNAL_GRANT_PROFILE,
   EXTERNAL_AAD_PROFILE,
   DEVICE_KEK_PROFILE,
+  EXTERNAL_GRANT_CONTRACT_VERSION,
   KDNAExternalGrantError,
   canonicalJson,
   grantSigningPayload,