capdag 1.198.510 → 1.205.540

package/capdag.test.js

@@ -8,6 +8,12 @@ const {
   Cap, CapGroup, CapManifest, MediaDef, MediaDefError, MediaDefErrorCodes,
   resolveMediaUrn, buildExtensionIndex, mediaUrnsForExtension, getExtensionMappings,
   CartridgeInfo, CartridgeCapSummary, CartridgeSuggestion, CartridgeRepoClient, CartridgeRepoServer,
+  hostPlatform, CompatStatus, primaryPackage, CartridgeCompatibilityResolution,
+  registryUrlFromBuildEnv,
+  slugForSync, CartridgeInstallSource, validateRegistryUrlScheme, RegistryUrlSchemeResultKind,
+  CartridgeJson, CartridgeJsonError, CartridgeJsonErrorKind, hashCartridgeDirectory,
+  DiscoveryIdentity, DiscoveredCartridge, discoverCartridges,
+  CartridgeAttachmentErrorKind, CartridgeChannel,
   CapFabEdge, CapFabStats, CapFab,
   StdinSource, StdinSourceKind,
   validateNoMediaDefRedefinitionSync,
@@ -103,7 +109,7 @@ function runTest(name, fn) {
 /**
  * Helper function to build test URNs with required in/out media URNs.
  * Uses MEDIA_VOID for in and MEDIA_OBJECT for out, matching the
- * Rust reference test_urn helper: test_urn(tags) => cap:in="media:void";{tags};out="media:record;textable"
+ * Rust reference test_urn helper: test_urn(tags) => cap:in="media:void";{tags};out="media:enc=utf-8;record"
  */
 // TEST0051: Urn
 function test0051_Urn(tags) {
@@ -158,7 +164,7 @@ function test003_directionMatching() {
   assert(cap.accepts(request), 'Same direction specs should match');
 
   // Different direction should not match
-  const requestDiff = CapUrn.fromString('cap:in="media:textable";generate;out="media:record;textable"');
+  const requestDiff = CapUrn.fromString('cap:in="media:enc=utf-8";generate;out="media:enc=utf-8;record"');
   assert(!cap.accepts(requestDiff), 'Different inSpec should not match');
 
   // Wildcard direction matches any
@@ -170,7 +176,7 @@ function test003_directionMatching() {
 // Key lookup is case-insensitive: uppercase variants of `ext` resolve
 // to the same keyed tag.
 function test004_unquotedValuesLowercased() {
-  const cap = CapUrn.fromString('cap:ext=pdf;generate;in=media:void;out="media:record;textable"');
+  const cap = CapUrn.fromString('cap:ext=pdf;generate;in=media:void;out="media:enc=utf-8;record"');
   assert(cap.hasMarkerTag('generate'), 'Unquoted value should be lowercased');
   assertEqual(cap.getTag('ext'), 'pdf', 'Unquoted value should be lowercased');
   assertEqual(cap.getTag('EXT'), 'pdf', 'Key lookup should be case-insensitive');
@@ -458,7 +464,7 @@ function test024_compatibility() {
   assert(general.accepts(cap1), 'General request should accept more specific instance');
   assert(!cap1.accepts(general), 'Specific pattern should reject general instance');
 
-  const broadIn = CapUrn.fromString('cap:in="media:";generate;out="media:record;textable"');
+  const broadIn = CapUrn.fromString('cap:in="media:";generate;out="media:enc=utf-8;record"');
   assert(!cap1.accepts(broadIn), 'Specific input should not accept broad wildcard input');
   assert(broadIn.accepts(cap1), 'Wildcard input should accept specific input');
 }
@@ -479,11 +485,11 @@ function test025_bestMatch() {
 // TEST026: Test merge combines tags from both caps, subset keeps only specified tags
 function test026_mergeAndSubset() {
   const cap1 = CapUrn.fromString(test0051_Urn('generate'));
-  const cap2 = CapUrn.fromString('cap:in="media:textable";ext=pdf;format=binary;out="media:"');
+  const cap2 = CapUrn.fromString('cap:in="media:enc=utf-8";ext=pdf;format=binary;out="media:"');
 
   // Merge (other takes precedence)
   const merged = cap1.merge(cap2);
-  assertEqual(merged.getInSpec(), 'media:textable', 'Merge should take inSpec from other');
+  assertEqual(merged.getInSpec(), 'media:enc=utf-8', 'Merge should take inSpec from other');
   assertEqual(merged.getOutSpec(), 'media:', 'Merge should take outSpec from other');
   assert(merged.hasMarkerTag('generate'), 'Merge should keep original tags');
   assertEqual(merged.getTag('ext'), 'pdf', 'Merge should add other tags');
@@ -492,7 +498,7 @@ function test026_mergeAndSubset() {
   const sub = merged.subset(['ext']);
   assertEqual(sub.getTag('ext'), 'pdf', 'Subset should keep ext');
   assert(!sub.hasMarkerTag('generate'), 'Subset should drop the generate marker');
-  assertEqual(sub.getInSpec(), 'media:textable', 'Subset should preserve inSpec');
+  assertEqual(sub.getInSpec(), 'media:enc=utf-8', 'Subset should preserve inSpec');
 }
 
 // TEST027: Test with_wildcard_tag sets tag to wildcard, including in/out
@@ -724,7 +730,7 @@ function test890_directionSemanticMatching() {
     'cap:in="media:";generate-thumbnail;out="media:image;png;thumbnail"'
   );
   const pdfRequest = CapUrn.fromString(
-    'cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"'
+    'cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"'
   );
   assert(genericCap.accepts(pdfRequest), 'Generic wildcard cap must accept pdf request');
 
@@ -736,7 +742,7 @@ function test890_directionSemanticMatching() {
 
   // Reverse: specific pdf cap does NOT accept generic bytes request
   const pdfCap = CapUrn.fromString(
-    'cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"'
+    'cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"'
   );
   const genericRequest = CapUrn.fromString(
     'cap:in="media:";generate-thumbnail;out="media:image;png;thumbnail"'
@@ -776,7 +782,7 @@ function test891_directionSemanticSpecificity() {
     'cap:in="media:";generate-thumbnail;out="media:image;png;thumbnail"'
   );
   const specificCap = CapUrn.fromString(
-    'cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"'
+    'cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"'
   );
 
   // generic:
@@ -788,20 +794,20 @@ function test891_directionSemanticSpecificity() {
     'out=image;png;thumbnail(6) + in=media:(0) + generate-thumbnail marker(2) = 60002');
   // specific:
   //   out=media:image;png;thumbnail -> 6
-  //   in=media:pdf                  -> 2
+  //   in=media:ext=pdf              -> 4 (ext=pdf is an exact-value tag, not a bare marker)
   //   y: generate-thumbnail marker  -> 2
-  //   spec_C = 10000*6 + 100*2 + 2 = 60202
-  assertEqual(specificCap.specificity(), 10000*6 + 100*2 + 2,
-    'out=image;png;thumbnail(6) + in=pdf(2) + generate-thumbnail marker(2) = 60202');
+  //   spec_C = 10000*6 + 100*4 + 2 = 60402
+  assertEqual(specificCap.specificity(), 10000*6 + 100*4 + 2,
+    'out=image;png;thumbnail(6) + in=ext=pdf(4) + generate-thumbnail marker(2) = 60402');
   assert(specificCap.specificity() > genericCap.specificity(), 'pdf should be more specific');
 
   // CapMatcher should prefer more specific
   const pdfRequest = CapUrn.fromString(
-    'cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"'
+    'cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"'
   );
   const best = CapMatcher.findBestMatch([genericCap, specificCap], pdfRequest);
   assert(best !== null, 'Should find a match');
-  assertEqual(best.getInSpec(), 'media:pdf', 'Should prefer more specific pdf cap');
+  assertEqual(best.getInSpec(), 'media:ext=pdf', 'Should prefer more specific pdf cap');
 }
 
 // ============================================================================
@@ -863,21 +869,9 @@ function test060_wrongPrefixFails() {
   );
 }
 
-// TEST061: Test is_binary returns true when textable tag is absent (binary = not textable)
-function test061_isBinary() {
-  // Binary types: no textable tag
-  assert(MediaUrn.fromString(MEDIA_IDENTITY).isBinary(), 'MEDIA_IDENTITY (media:) should be binary');
-  assert(MediaUrn.fromString(MEDIA_PNG).isBinary(), 'MEDIA_PNG should be binary');
-  assert(MediaUrn.fromString(MEDIA_PDF).isBinary(), 'MEDIA_PDF should be binary');
-  assert(MediaUrn.fromString('media:video').isBinary(), 'media:video should be binary');
-  assert(MediaUrn.fromString('media:epub').isBinary(), 'media:epub should be binary');
-  // Textable types: is_binary is false
-  assert(!MediaUrn.fromString('media:textable').isBinary(), 'media:textable should not be binary');
-  assert(!MediaUrn.fromString('media:textable;record').isBinary(), 'textable map should not be binary');
-  assert(!MediaUrn.fromString(MEDIA_STRING).isBinary(), 'MEDIA_STRING should not be binary');
-  assert(!MediaUrn.fromString(MEDIA_JSON).isBinary(), 'MEDIA_JSON should not be binary');
-  assert(!MediaUrn.fromString(MEDIA_MD).isBinary(), 'MEDIA_MD should not be binary');
-}
+// TEST061: REMOVED — the binary/text distinction no longer exists in the
+// vocabulary (isBinary() was deleted from MediaUrn; everything is bytes).
+// Encoding is now expressed by the orthogonal `enc=` tag, exercised by TEST067.
 
 // TEST062: Test is_record returns true when record marker tag is present indicating key-value structure
 function test062_isRecord() {
@@ -885,7 +879,7 @@ function test062_isRecord() {
   assert(MediaUrn.fromString('media:custom;record').isRecord(), 'custom;record should be record');
   assert(MediaUrn.fromString(MEDIA_JSON).isRecord(), 'MEDIA_JSON should be record');
   // Without record marker, is_record is false
-  assert(!MediaUrn.fromString('media:textable').isRecord(), 'plain textable should not be record');
+  assert(!MediaUrn.fromString('media:enc=utf-8').isRecord(), 'plain text should not be record');
   assert(!MediaUrn.fromString(MEDIA_STRING).isRecord(), 'MEDIA_STRING should not be record');
   assert(!MediaUrn.fromString(MEDIA_STRING_LIST).isRecord(), 'MEDIA_STRING_LIST should not be record');
 }
@@ -897,7 +891,7 @@ function test063_isScalar() {
   assert(MediaUrn.fromString(MEDIA_NUMBER).isScalar(), 'MEDIA_NUMBER should be scalar');
   assert(MediaUrn.fromString(MEDIA_BOOLEAN).isScalar(), 'MEDIA_BOOLEAN should be scalar');
   assert(MediaUrn.fromString(MEDIA_OBJECT).isScalar(), 'MEDIA_OBJECT (record but scalar) should be scalar');
-  assert(MediaUrn.fromString('media:textable').isScalar(), 'plain textable should be scalar');
+  assert(MediaUrn.fromString('media:enc=utf-8').isScalar(), 'plain text should be scalar');
   // With list marker, is_scalar is false
   assert(!MediaUrn.fromString(MEDIA_STRING_LIST).isScalar(), 'MEDIA_STRING_LIST should not be scalar');
   assert(!MediaUrn.fromString(MEDIA_OBJECT_LIST).isScalar(), 'MEDIA_OBJECT_LIST should not be scalar');
@@ -917,27 +911,34 @@ function test065_isOpaque() {
   assert(MediaUrn.fromString(MEDIA_STRING).isOpaque(), 'MEDIA_STRING should be opaque');
   assert(MediaUrn.fromString(MEDIA_STRING_LIST).isOpaque(), 'MEDIA_STRING_LIST (list but no record) should be opaque');
   assert(MediaUrn.fromString(MEDIA_PDF).isOpaque(), 'MEDIA_PDF should be opaque');
-  assert(MediaUrn.fromString('media:textable').isOpaque(), 'plain textable should be opaque');
+  assert(MediaUrn.fromString('media:enc=utf-8').isOpaque(), 'plain text should be opaque');
   // With record marker, is_opaque is false
   assert(!MediaUrn.fromString(MEDIA_OBJECT).isOpaque(), 'MEDIA_OBJECT should not be opaque');
   assert(!MediaUrn.fromString(MEDIA_JSON).isOpaque(), 'MEDIA_JSON should not be opaque');
 }
 
-// TEST066: Test is_json returns true only when json marker tag is present for JSON representation
+// TEST066: Test is_json returns true only when fmt=json content-format tag is present
 function test066_isJson() {
   assert(MediaUrn.fromString(MEDIA_JSON).isJson(), 'MEDIA_JSON should be json');
+  assert(MediaUrn.fromString('media:custom;fmt=json').isJson(), 'fmt=json should be json');
+  // record alone does not mean JSON representation
   assert(!MediaUrn.fromString(MEDIA_OBJECT).isJson(), 'MEDIA_OBJECT should not be json');
+  assert(!MediaUrn.fromString('media:enc=utf-8').isJson(), 'plain text should not be json');
 }
 
-// TEST067: Test is_text returns true only when textable marker tag is present
+// TEST067: Text-representability is now carried by the orthogonal `enc=` tag
+// (the old text marker and isText() are gone). A media is "text" iff it
+// declares an encoding.
 function test067_isText() {
-  assert(MediaUrn.fromString(MEDIA_STRING).isText(), 'MEDIA_STRING should be text');
-  assert(MediaUrn.fromString(MEDIA_INTEGER).isText(), 'MEDIA_INTEGER should be text');
-  assert(MediaUrn.fromString(MEDIA_JSON).isText(), 'MEDIA_JSON should be text');
-  // Without textable tag, is_text is false
-  assert(!MediaUrn.fromString(MEDIA_IDENTITY).isText(), 'MEDIA_IDENTITY should not be text');
-  assert(!MediaUrn.fromString(MEDIA_PNG).isText(), 'MEDIA_PNG should not be text');
-  assert(!MediaUrn.fromString(MEDIA_OBJECT).isText(), 'MEDIA_OBJECT (no textable) should not be text');
+  // Has enc= → text-representable
+  assert(MediaUrn.fromString(MEDIA_STRING).getTag('enc') !== undefined, 'MEDIA_STRING should have enc');
+  assert(MediaUrn.fromString(MEDIA_BOOLEAN).getTag('enc') !== undefined, 'MEDIA_BOOLEAN should have enc');
+  // No enc= → not text-representable
+  assert(MediaUrn.fromString(MEDIA_INTEGER).getTag('enc') === undefined, 'MEDIA_INTEGER should not have enc');
+  assert(MediaUrn.fromString(MEDIA_JSON).getTag('enc') === undefined, 'MEDIA_JSON should not have enc');
+  assert(MediaUrn.fromString(MEDIA_IDENTITY).getTag('enc') === undefined, 'MEDIA_IDENTITY should not have enc');
+  assert(MediaUrn.fromString(MEDIA_PNG).getTag('enc') === undefined, 'MEDIA_PNG should not have enc');
+  assert(MediaUrn.fromString(MEDIA_OBJECT).getTag('enc') === undefined, 'MEDIA_OBJECT should not have enc');
 }
 
 // TEST068: Test is_void returns true when void flag or type=void tag is present
@@ -1006,7 +1007,7 @@ function test075_accepts() {
 // TEST076: Test specificity increases with more tags for ranking conformance
 function test076_specificity() {
   const s1 = MediaUrn.fromString('media:');
-  const s2 = MediaUrn.fromString('media:pdf');
+  const s2 = MediaUrn.fromString('media:ext=pdf');
   const s3 = MediaUrn.fromString('media:image;png;thumbnail');
   assert(s2.specificity() > s1.specificity(), 'pdf should be more specific than wildcard');
   assert(s3.specificity() > s2.specificity(), 'image;png;thumbnail should be more specific than pdf');
@@ -1082,7 +1083,7 @@ function test093_resolveUnresolvableFailsHard() {
 // TEST097: N/A for JS (Rust validation function)
 // TEST098: N/A for JS
 
-// TEST099: Test ResolvedMediaDef is_binary returns true when textable tag is absent
+// TEST099: Test ResolvedMediaDef is_binary returns true when enc tag is absent
 function test099_resolvedIsBinary() {
   const spec = new MediaDef('application/octet-stream', null, null, 'Binary', null, MEDIA_IDENTITY);
   assert(spec.isBinary(), 'Resolved binary spec should be binary');
@@ -1112,7 +1113,7 @@ function test103_resolvedIsJson() {
   assert(spec.isJSON(), 'Resolved json spec should be JSON');
 }
 
-// TEST104: Test ResolvedMediaDef is_text returns true when textable tag is present
+// TEST104: Test ResolvedMediaDef is_text returns true when enc tag is present
 function test104_resolvedIsText() {
   const spec = new MediaDef('text/plain', null, null, 'String', null, MEDIA_STRING);
   assert(spec.isText(), 'Resolved string spec should be text');
@@ -1164,13 +1165,13 @@ function test106_metadataWithValidation() {
 function test107_extensionsPropagation() {
   const mediaDefs = [
     {
-      urn: 'media:pdf',
+      urn: 'media:ext=pdf',
       media_type: 'application/pdf',
       title: 'PDF Document',
       extensions: ['pdf']
     }
   ];
-  const resolved = resolveMediaUrn('media:pdf', mediaDefs);
+  const resolved = resolveMediaUrn('media:ext=pdf', mediaDefs);
   assert(Array.isArray(resolved.extensions), 'Extensions should be an array');
   assertEqual(resolved.extensions.length, 1, 'Should have one extension');
   assertEqual(resolved.extensions[0], 'pdf', 'Should have pdf extension');
@@ -1179,7 +1180,7 @@ function test107_extensionsPropagation() {
 // TEST108: Test creating new cap with URN, title, and command verifies correct initialization
 function test108_extensionsSerialization() {
   // Test that MediaDef can hold extensions correctly
-  const spec = new MediaDef('application/pdf', null, null, 'PDF', null, 'media:pdf', null, null, ['pdf']);
+  const spec = new MediaDef('application/pdf', null, null, 'PDF', null, 'media:ext=pdf', null, null, ['pdf']);
   assert(Array.isArray(spec.extensions), 'Extensions should be array');
   assertEqual(spec.extensions[0], 'pdf', 'Should have pdf extension');
 }
@@ -1284,9 +1285,9 @@ function test116_capArgConstructors() {
 function test150_capManifestJsonSerialization() {
   const capUrn = CapUrn.fromString(test0051_Urn('extract;target=metadata'));
   const cap = new Cap(capUrn, 'Extract Metadata', 'extract-metadata');
-  cap.addArg(new CapArg('media:pdf', true, [new ArgSource({ stdin: 'media:pdf' })]));
+  cap.addArg(new CapArg('media:ext=pdf', true, [new ArgSource({ stdin: 'media:ext=pdf' })]));
   cap.addArg(new CapArg(
-    'media:chunk-size;textable;numeric',
+    'media:chunk-size;enc=utf-8;numeric',
     false,
     [new ArgSource({ cli_flag: '--chunk-size' })],
     {
@@ -1296,7 +1297,7 @@ function test150_capManifestJsonSerialization() {
     }
   ));
   cap.addArg(new CapArg(
-    'media:timestamps;textable;bool',
+    'media:bool;enc=utf-8;timestamps',
     false,
     [new ArgSource({ cli_flag: '--timestamps' })],
     {
@@ -1382,34 +1383,34 @@ function test597_capArgWithFullDefinition() {
 // registry name we passed. This is exactly the shape the renderer depends on.
 function test0052_CapFabAddCapPopulatesEdgesAndNodes() {
   const graph = new CapFab();
-  const cap = makeGraphCap('media:pdf', 'media:textable', 'PDF to Text');
+  const cap = makeGraphCap('media:ext=pdf', 'media:enc=utf-8', 'PDF to Text');
   graph.addCap(cap, 'registry');
 
   const edges = graph.getEdges();
   assertEqual(edges.length, 1, 'Graph must have one edge after a single addCap');
-  assertEqual(edges[0].fromUrn, 'media:pdf', 'Edge fromUrn must be cap in_spec');
-  assertEqual(edges[0].toUrn, 'media:textable', 'Edge toUrn must be cap out_spec');
+  assertEqual(edges[0].fromUrn, 'media:ext=pdf', 'Edge fromUrn must be cap in_spec');
+  assertEqual(edges[0].toUrn, 'media:enc=utf-8', 'Edge toUrn must be cap out_spec');
   assertEqual(edges[0].registryName, 'registry', 'Edge must carry the registry name passed to addCap');
 
   const nodes = graph.getNodes();
-  assert(nodes.has('media:pdf'), 'from_spec must appear as a node');
-  assert(nodes.has('media:textable'), 'to_spec must appear as a node');
+  assert(nodes.has('media:ext=pdf'), 'from_spec must appear as a node');
+  assert(nodes.has('media:enc=utf-8'), 'to_spec must appear as a node');
 }
 
 // getOutgoing takes a concrete source URN and returns edges whose from_spec
 // the source conforms to. It must NOT be a plain string lookup.
 function test0053_CapFabGetOutgoingConformsToMatching() {
   const graph = new CapFab();
-  graph.addCap(makeGraphCap('media:textable', 'media:embedding-vector', 'Embed text'), 'registry');
+  graph.addCap(makeGraphCap('media:enc=utf-8', 'media:embedding-vector', 'Embed text'), 'registry');
 
-  // 'media:txt;textable' conforms to 'media:textable' — renderer relies on
+  // 'media:enc=utf-8;ext=txt' conforms to 'media:enc=utf-8' — renderer relies on
   // this for the browse-mode fan-out from specific source URNs to caps that
   // accept a broader media pattern.
-  const outgoingFromSpecific = graph.getOutgoing('media:txt;textable');
+  const outgoingFromSpecific = graph.getOutgoing('media:enc=utf-8;ext=txt');
   assertEqual(outgoingFromSpecific.length, 1, 'Specific URN must match broader cap input');
 
   // The broad URN still matches its own edge.
-  const outgoingFromBroad = graph.getOutgoing('media:textable');
+  const outgoingFromBroad = graph.getOutgoing('media:enc=utf-8');
   assertEqual(outgoingFromBroad.length, 1, 'Exact URN must match');
 
   // A totally unrelated URN must not match.
@@ -1421,8 +1422,8 @@ function test0053_CapFabGetOutgoingConformsToMatching() {
 // the renderer colours/groups edges by provenance in browse mode.
 function test0057_CapFabDistinctRegistryNames() {
   const graph = new CapFab();
-  graph.addCap(makeGraphCap('media:pdf', 'media:textable', 'PDF to Text'), 'providers');
-  graph.addCap(makeGraphCap('media:textable', 'media:embedding-vector', 'Embed'), 'cartridges');
+  graph.addCap(makeGraphCap('media:ext=pdf', 'media:enc=utf-8', 'PDF to Text'), 'providers');
+  graph.addCap(makeGraphCap('media:enc=utf-8', 'media:embedding-vector', 'Embed'), 'cartridges');
 
   const edges = graph.getEdges();
   assertEqual(edges.length, 2, 'Two caps must produce two edges');
@@ -1452,7 +1453,7 @@ function test157_stdinSourceFromFileReference() {
   const trackedFileId = 'tracked-file-123';
   const originalPath = '/path/to/original.pdf';
   const securityBookmark = new Uint8Array([0x62, 0x6f, 0x6f, 0x6b]);
-  const mediaUrn = 'media:pdf';
+  const mediaUrn = 'media:ext=pdf';
 
   const source = StdinSource.fromFileReference(trackedFileId, originalPath, securityBookmark, mediaUrn);
   assert(source !== null, 'Should create source');
@@ -1488,15 +1489,15 @@ function test159_stdinSourceWithBinaryContent() {
 
 // TEST274: Test CapArgumentValue::new stores media_urn and raw byte value
 function test274_capArgumentValueNew() {
-  const arg = new CapArgumentValue('media:model-spec;textable', new Uint8Array([103, 112, 116, 45, 52]));
-  assertEqual(arg.mediaUrn, 'media:model-spec;textable', 'mediaUrn must match');
+  const arg = new CapArgumentValue('media:enc=utf-8;model-spec', new Uint8Array([103, 112, 116, 45, 52]));
+  assertEqual(arg.mediaUrn, 'media:enc=utf-8;model-spec', 'mediaUrn must match');
   assertEqual(arg.value.length, 5, 'value must have 5 bytes');
 }
 
 // TEST275: Test CapArgumentValue::from_str converts string to UTF-8 bytes
 function test275_capArgumentValueFromStr() {
-  const arg = CapArgumentValue.fromStr('media:string;textable', 'hello world');
-  assertEqual(arg.mediaUrn, 'media:string;textable', 'mediaUrn must match');
+  const arg = CapArgumentValue.fromStr('media:enc=utf-8;string', 'hello world');
+  assertEqual(arg.mediaUrn, 'media:enc=utf-8;string', 'mediaUrn must match');
   assertEqual(new TextDecoder().decode(arg.value), 'hello world', 'value must decode correctly');
 }
 
@@ -1508,7 +1509,7 @@ function test276_capArgumentValueAsStrValid() {
 
 // TEST277: Test CapArgumentValue::value_as_str fails for non-UTF-8 binary data
 function test277_capArgumentValueAsStrInvalidUtf8() {
-  const arg = new CapArgumentValue('media:pdf', new Uint8Array([0xFF, 0xFE, 0x80]));
+  const arg = new CapArgumentValue('media:ext=pdf', new Uint8Array([0xFF, 0xFE, 0x80]));
   let threw = false;
   try {
     arg.valueAsStr();
@@ -1539,7 +1540,7 @@ function test283_capArgumentValueLargeBinary() {
   for (let i = 0; i < 10000; i++) {
     data[i] = i % 256;
   }
-  const arg = new CapArgumentValue('media:pdf', data);
+  const arg = new CapArgumentValue('media:ext=pdf', data);
   assertEqual(arg.value.length, 10000, 'large binary must preserve all bytes');
   assertEqual(arg.value[0], 0, 'first byte check');
   assertEqual(arg.value[255], 255, 'byte 255 check');
@@ -1555,9 +1556,8 @@ const { TaggedUrn } = require('tagged-urn');
 // TEST304: Test MEDIA_AVAILABILITY_OUTPUT constant parses as valid media URN with correct tags
 function test304_mediaAvailabilityOutputConstant() {
   const urn = TaggedUrn.fromString(MEDIA_AVAILABILITY_OUTPUT);
-  assert(urn.getTag('textable') !== undefined, 'model-availability must be textable');
+  assertEqual(urn.getTag('enc'), 'utf-8', 'model-availability must carry enc=utf-8');
   assertEqual(urn.getTag('record'), '*', 'model-availability must be record');
-  assert(urn.getTag('textable') !== undefined, 'model-availability must not be binary (has textable)');
   const reparsed = TaggedUrn.fromString(urn.toString());
   assert(urn.conformsTo(reparsed), 'roundtrip must match original');
 }
@@ -1565,9 +1565,8 @@ function test304_mediaAvailabilityOutputConstant() {
 // TEST305: Test MEDIA_PATH_OUTPUT constant parses as valid media URN with correct tags
 function test305_mediaPathOutputConstant() {
   const urn = TaggedUrn.fromString(MEDIA_PATH_OUTPUT);
-  assert(urn.getTag('textable') !== undefined, 'model-path must be textable');
+  assertEqual(urn.getTag('enc'), 'utf-8', 'model-path must carry enc=utf-8');
   assertEqual(urn.getTag('record'), '*', 'model-path must be record');
-  assert(urn.getTag('textable') !== undefined, 'model-path must not be binary (has textable)');
   const reparsed = TaggedUrn.fromString(urn.toString());
   assert(urn.conformsTo(reparsed), 'roundtrip must match original');
 }
@@ -1617,7 +1616,7 @@ function test309_modelAvailabilityAndPathAreDistinct() {
   assert(avail.toString() !== path.toString(), 'availability and path must be distinct');
 }
 
-// TEST310: llm_generate_text_urn() produces a valid cap URN with textable in/out specs
+// TEST310: llm_generate_text_urn() produces a valid cap URN with enc=utf-8 in/out specs
 function test310_llmGenerateTextUrn() {
   const urn = llmGenerateTextUrn();
   assert(urn.hasMarkerTag('generate_text'), 'Must have generate_text marker');
@@ -1663,9 +1662,9 @@ function test312_allUrnBuildersProduceValidUrns() {
 
 function test0059_JS_buildExtensionIndex() {
   const mediaDefs = [
-    { urn: 'media:pdf', media_type: 'application/pdf', extensions: ['pdf'] },
+    { urn: 'media:ext=pdf', media_type: 'application/pdf', extensions: ['pdf'] },
     { urn: 'media:image;jpeg', media_type: 'image/jpeg', extensions: ['jpg', 'jpeg'] },
-    { urn: 'media:json;textable', media_type: 'application/json', extensions: ['json'] }
+    { urn: 'media:fmt=json', media_type: 'application/json', extensions: ['json'] }
   ];
   const index = buildExtensionIndex(mediaDefs);
   assert(index instanceof Map, 'Should return a Map');
@@ -1674,15 +1673,15 @@ function test0059_JS_buildExtensionIndex() {
   assert(index.has('jpg'), 'Should have jpg');
   assert(index.has('jpeg'), 'Should have jpeg');
   assert(index.has('json'), 'Should have json');
-  assertEqual(index.get('pdf')[0], 'media:pdf', 'pdf should map correctly');
+  assertEqual(index.get('pdf')[0], 'media:ext=pdf', 'pdf should map correctly');
 }
 
 // TEST0069: J s media urns for extension
 function test0069_JS_mediaUrnsForExtension() {
   const mediaDefs = [
-    { urn: 'media:pdf', media_type: 'application/pdf', extensions: ['pdf'] },
-    { urn: 'media:json;textable;record', media_type: 'application/json', extensions: ['json'] },
-    { urn: 'media:json;textable;list', media_type: 'application/json', extensions: ['json'] }
+    { urn: 'media:ext=pdf', media_type: 'application/pdf', extensions: ['pdf'] },
+    { urn: 'media:fmt=json;record', media_type: 'application/json', extensions: ['json'] },
+    { urn: 'media:fmt=json;list', media_type: 'application/json', extensions: ['json'] }
   ];
 
   const pdfUrns = mediaUrnsForExtension('pdf', mediaDefs);
@@ -1709,7 +1708,7 @@ function test0069_JS_mediaUrnsForExtension() {
 // TEST0070: J s get extension mappings
 function test0070_JS_getExtensionMappings() {
   const mediaDefs = [
-    { urn: 'media:pdf', media_type: 'application/pdf', extensions: ['pdf'] },
+    { urn: 'media:ext=pdf', media_type: 'application/pdf', extensions: ['pdf'] },
     { urn: 'media:image;jpeg', media_type: 'image/jpeg', extensions: ['jpg', 'jpeg'] }
   ];
   const mappings = getExtensionMappings(mediaDefs);
@@ -1803,7 +1802,7 @@ function test0082_JS_mediaDefDocumentationPropagatesThroughResolve() {
   const body = '## Markdown body\n\nWith `code` and a [link](https://example.com).';
   const mediaDefs = [
     {
-      urn: 'media:doc-test;textable',
+      urn: 'media:doc-test;enc=utf-8',
       media_type: 'text/plain',
       title: 'Documented',
       description: 'short desc',
@@ -1811,20 +1810,20 @@ function test0082_JS_mediaDefDocumentationPropagatesThroughResolve() {
     }
   ];
 
-  const resolved = resolveMediaUrn('media:doc-test;textable', mediaDefs);
+  const resolved = resolveMediaUrn('media:doc-test;enc=utf-8', mediaDefs);
   assertEqual(resolved.documentation, body, 'documentation must propagate into MediaDef');
   // The short description must remain distinct from the long markdown
   // body — they are different fields with different semantics.
   assertEqual(resolved.description, 'short desc', 'description must remain distinct from documentation');
 
   // Missing documentation must collapse to null, not '' or undefined.
-  const noDoc = resolveMediaUrn('media:doc-test;textable', [
-    { urn: 'media:doc-test;textable', media_type: 'text/plain', title: 'No Doc' }
+  const noDoc = resolveMediaUrn('media:doc-test;enc=utf-8', [
+    { urn: 'media:doc-test;enc=utf-8', media_type: 'text/plain', title: 'No Doc' }
   ]);
   assertEqual(noDoc.documentation, null, 'Missing documentation must resolve to null');
 
-  const emptyDoc = resolveMediaUrn('media:doc-test;textable', [
-    { urn: 'media:doc-test;textable', media_type: 'text/plain', title: 'Empty', documentation: '' }
+  const emptyDoc = resolveMediaUrn('media:doc-test;enc=utf-8', [
+    { urn: 'media:doc-test;enc=utf-8', media_type: 'text/plain', title: 'Empty', documentation: '' }
   ]);
   assertEqual(emptyDoc.documentation, null, 'Empty documentation string must collapse to null');
 }
@@ -1884,15 +1883,15 @@ const sampleRegistry = {
       cap_groups: [
         {
           name: 'pdf-processing',
-          adapter_urns: ['media:pdf'],
+          adapter_urns: ['media:ext=pdf'],
           caps: [
             {
-              urn: 'cap:in="media:pdf";disbind;out="media:disbound-page;textable;list"',
+              urn: 'cap:in="media:ext=pdf";disbind;out="media:disbound-page;enc=utf-8;list"',
               title: 'Disbind PDF',
               description: 'Extract pages'
             },
             {
-              urn: 'cap:in="media:pdf";extract-metadata;out="media:file-metadata;textable;record"',
+              urn: 'cap:in="media:ext=pdf";extract-metadata;out="media:enc=utf-8;file-metadata;record"',
               title: 'Extract Metadata',
               description: 'Get PDF metadata'
             }
@@ -1929,10 +1928,10 @@ const sampleRegistry = {
       cap_groups: [
         {
           name: 'text-processing',
-          adapter_urns: ['media:txt;textable'],
+          adapter_urns: ['media:enc=utf-8;ext=txt'],
           caps: [
             {
-              urn: 'cap:in="media:txt;textable";disbind;out="media:disbound-page;textable;list"',
+              urn: 'cap:in="media:enc=utf-8;ext=txt";disbind;out="media:disbound-page;enc=utf-8;list"',
               title: 'Disbind Text',
               description: 'Extract text pages'
             }
@@ -1974,7 +1973,7 @@ const sampleRegistry = {
             adapter_urns: ['media:json'],
             caps: [
               {
-                urn: 'cap:in="media:json";pretty;out="media:json;textable"',
+                urn: 'cap:in="media:json";pretty;out="media:fmt=json"',
                 title: 'Pretty Print JSON',
                 description: 'Format JSON',
                 command: 'pretty'
@@ -2252,13 +2251,13 @@ function test328_cartridgeRepoServerGetByCategory() {
 function test329_cartridgeRepoServerGetByCap() {
   const server = new CartridgeRepoServer(sampleRegistry);
 
-  const disbindCap = 'cap:in="media:pdf";disbind;out="media:disbound-page;textable;list"';
+  const disbindCap = 'cap:in="media:ext=pdf";disbind;out="media:disbound-page;enc=utf-8;list"';
   const cartridges = server.getCartridgesByCap(disbindCap);
 
   assert(cartridges.length === 1, 'Should find 1 cartridge with this cap');
   assert(cartridges[0].id === 'pdfcartridge', 'Should be pdfcartridge');
 
-  const metadataCap = 'cap:in="media:pdf";extract-metadata;out="media:file-metadata;textable;record"';
+  const metadataCap = 'cap:in="media:ext=pdf";extract-metadata;out="media:enc=utf-8;file-metadata;record"';
   const metadataCartridges = server.getCartridgesByCap(metadataCap);
   assert(metadataCartridges.length === 1, 'Should find metadata cap');
 }
@@ -2301,7 +2300,7 @@ function test331_cartridgeRepoClientGetSuggestions() {
 
   client.updateCache('https://example.com/api/cartridges', cartridges);
 
-  const disbindCap = 'cap:in="media:pdf";disbind;out="media:disbound-page;textable;list"';
+  const disbindCap = 'cap:in="media:ext=pdf";disbind;out="media:disbound-page;enc=utf-8;list"';
   const suggestions = client.getSuggestionsForCap(disbindCap);
 
   assert(suggestions.length === 1, 'Should find 1 suggestion');
@@ -2316,7 +2315,7 @@ function test331_cartridgeRepoClientGetSuggestions() {
   assert(suggestions[0].capTitle === 'Disbind PDF', 'Should have cap title');
 
   // Nightly cap should also surface a suggestion, with channel set to nightly.
-  const prettyCap = 'cap:in="media:json";pretty;out="media:json;textable"';
+  const prettyCap = 'cap:in="media:json";pretty;out="media:fmt=json"';
   const nightlySuggestions = client.getSuggestionsForCap(prettyCap);
   assert(nightlySuggestions.length === 1, 'Should find nightly cap suggestion');
   assert(nightlySuggestions[0].channel === 'nightly', 'Should report nightly channel');
@@ -2425,7 +2424,7 @@ function test335_cartridgeRepoServerClientIntegration() {
   assert(cartridge.buildForPlatform('darwin-arm64') !== null, 'Cartridge should have darwin-arm64 build');
 
   // Client can get suggestions
-  const capUrn = 'cap:in="media:pdf";disbind;out="media:disbound-page;textable;list"';
+  const capUrn = 'cap:in="media:ext=pdf";disbind;out="media:disbound-page;enc=utf-8;list"';
   const suggestions = client.getSuggestionsForCap(capUrn);
   assert(suggestions.length === 1, 'Should get suggestions');
   assert(suggestions[0].cartridgeId === 'pdfcartridge', 'Should suggest correct cartridge');
@@ -2437,6 +2436,314 @@ function test335_cartridgeRepoServerClientIntegration() {
   assert(searchResults[0].id === cartridge.id, 'Search and client should agree');
 }
 
+// ============================================================================
+// Host-compatibility resolution (cartridge_repo.rs: TEST1849-TEST1853)
+// ============================================================================
+
+// Construct a cartridge whose versions/platform-builds are fully specified.
+// `versions` is given newest-first as [version, [[platform, format, pkgName], ...]];
+// `version` (the "latest" field) is set to the first entry. Mirrors the Rust
+// test helper cartridge_with_versions.
+function cartridgeWithVersions(id, versions) {
+  const versionMap = {};
+  const available = [];
+  for (const [ver, builds] of versions) {
+    available.push(ver);
+    versionMap[ver] = {
+      releaseDate: '2026-02-07',
+      changelog: [],
+      minAppVersion: '',
+      builds: builds.map(([plat, fmt, name]) => ({
+        platform: plat,
+        packages: [{
+          name,
+          sha256: 'deadbeef',
+          size: 4242,
+          url: `https://cartridges.machinefabric.com/${name}`,
+          format: fmt,
+        }],
+      })),
+    };
+  }
+  const latest = versions.length > 0 ? versions[0][0] : '';
+  return new CartridgeInfo({
+    id,
+    name: id,
+    version: latest,
+    description: '',
+    author: '',
+    teamId: 'TEAM123',
+    signedAt: '2026-02-07T00:00:00Z',
+    minAppVersion: '',
+    pageUrl: '',
+    categories: [],
+    tags: [],
+    cap_groups: [],
+    versions: versionMap,
+    availableVersions: available,
+    channel: 'release',
+    registryUrl: 'https://example.com/cartridges',
+  });
+}
+
+// TEST1849: latest version has a host build → Compatible, resolving to the
+// latest version and that platform's native-format package.
+function test1849_resolveForHostCompatibleLatest() {
+  const cartridge = cartridgeWithVersions('c', [
+    ['1.2.0', [['darwin-arm64', 'pkg', 'c-1.2.0.pkg'], ['linux-x86_64', 'deb', 'c-1.2.0.deb']]],
+    ['1.1.0', [['darwin-arm64', 'pkg', 'c-1.1.0.pkg']]],
+  ]);
+
+  const r = cartridge.resolveForHost('linux-x86_64');
+  assertEqual(r.status, CompatStatus.COMPATIBLE, 'latest with host build is Compatible');
+  assertEqual(r.resolvedVersion, '1.2.0', 'resolves to the latest version');
+  assertEqual(r.resolvedPackage.name, 'c-1.2.0.deb', 'resolves to native-format package');
+  assertEqual(r.resolvedPackage.format, 'deb', 'package format is deb');
+  assert(r.reason === null, 'Compatible carries no reason');
+  assertEqual(r.hostPlatform, 'linux-x86_64', 'host platform echoed back');
+}
+
+// TEST1850: the latest version lacks a host build but an older version has one
+// → CompatibleOutdated, resolving to the NEWEST older version with a host build
+// (not the oldest), with a reason naming both the latest and the resolved.
+function test1850_resolveForHostCompatibleOutdated() {
+  const cartridge = cartridgeWithVersions('c', [
+    ['1.3.0', [['darwin-arm64', 'pkg', 'c-1.3.0.pkg']]],
+    ['1.2.0', [['darwin-arm64', 'pkg', 'c-1.2.0.pkg'], ['linux-x86_64', 'deb', 'c-1.2.0.deb']]],
+    ['1.1.0', [['linux-x86_64', 'deb', 'c-1.1.0.deb']]],
+  ]);
+
+  const r = cartridge.resolveForHost('linux-x86_64');
+  assertEqual(r.status, CompatStatus.COMPATIBLE_OUTDATED, 'latest lacks host build → CompatibleOutdated');
+  assertEqual(r.resolvedVersion, '1.2.0', 'newest-with-host-build is 1.2.0, not oldest 1.1.0');
+  assertEqual(r.resolvedPackage.name, 'c-1.2.0.deb', 'resolves to 1.2.0 deb package');
+  assert(r.reason !== null, 'outdated carries a reason');
+  assert(r.reason.includes('1.3.0'), `reason names the latest: ${r.reason}`);
+  assert(r.reason.includes('1.2.0'), `reason names the resolved: ${r.reason}`);
+}
+
+// TEST1851: no version ships a host build → Incompatible, no resolved
+// version/package, reason states the host platform.
+function test1851_resolveForHostIncompatible() {
+  const cartridge = cartridgeWithVersions('c', [
+    ['1.2.0', [['darwin-arm64', 'pkg', 'c-1.2.0.pkg']]],
+    ['1.1.0', [['darwin-arm64', 'pkg', 'c-1.1.0.pkg']]],
+  ]);
+
+  const r = cartridge.resolveForHost('windows-x86_64');
+  assertEqual(r.status, CompatStatus.INCOMPATIBLE, 'no host build → Incompatible');
+  assert(r.resolvedVersion === null, 'no resolved version when Incompatible');
+  assert(r.resolvedPackage === null, 'no resolved package when Incompatible');
+  assert(r.reason.includes('windows-x86_64'), `reason names the host platform: ${r.reason}`);
+}
+
+// TEST1852: a host build whose packages[] is empty AND has no legacy `package`
+// ships no installer; resolution must SKIP it (not resolve to an un-downloadable
+// version) and fall through to an older usable version.
+function test1852_resolveForHostSkipsBuildWithNoInstaller() {
+  const cartridge = cartridgeWithVersions('c', [
+    ['2.0.0', [['linux-x86_64', 'deb', 'c-2.0.0.deb']]],
+    ['1.0.0', [['linux-x86_64', 'deb', 'c-1.0.0.deb']]],
+  ]);
+  // Make 2.0.0's linux build ship nothing installable.
+  const v2 = cartridge.versions['2.0.0'];
+  v2.builds[0].packages = [];
+  delete v2.builds[0].package;
+
+  const r = cartridge.resolveForHost('linux-x86_64');
+  // 2.0.0 is skipped (no installer); newest USABLE host build is 1.0.0.
+  assertEqual(r.status, CompatStatus.COMPATIBLE_OUTDATED, '2.0.0 skipped → CompatibleOutdated to 1.0.0');
+  assertEqual(r.resolvedVersion, '1.0.0', 'resolves to the older usable version');
+  assertEqual(r.resolvedPackage.name, 'c-1.0.0.deb', 'resolves to 1.0.0 deb package');
+}
+
+// TEST1853: hostPlatform() returns a normalized {os}-{arch} string with arch
+// aarch64/arm64 mapped to arm64 — the exact form the registry uses.
+function test1853_hostPlatformNormalizedForm() {
+  const p = hostPlatform();
+  const dash = p.indexOf('-');
+  assert(dash > 0, `host_platform must be os-arch, got ${p}`);
+  const os = p.slice(0, dash);
+  const arch = p.slice(dash + 1);
+  assert((os === 'darwin' || os === 'linux' || os === 'windows') || os.length > 0, `os segment present: ${os}`);
+  // The registry never uses the raw "aarch64"; it must be normalized.
+  assert(arch !== 'aarch64', 'arch must be normalized to arm64');
+}
+
+// ============================================================================
+// Build-env registry identity (manifest.rs: TEST1872-TEST1874)
+// ============================================================================
+
+// TEST1872: a non-empty MFR_CARTRIDGE_REGISTRY_URL passes through verbatim —
+// a published build reports exactly the URL it was compiled with.
+function test1872_registryUrlFromBuildEnvPassesThroughNonempty() {
+  const url = 'https://cartridges.machinefabric.com/manifest';
+  assertEqual(registryUrlFromBuildEnv(url), url, 'non-empty URL passes through verbatim');
+}
+
+// TEST1873: an unset env (null/undefined) yields null — a dev build has no
+// baked registry and loads only `dev/` cartridges.
+function test1873_registryUrlFromBuildEnvNoneForDev() {
+  assert(registryUrlFromBuildEnv(null) === null, 'null env → null (dev build)');
+  assert(registryUrlFromBuildEnv(undefined) === null, 'absent env → null (dev build)');
+}
+
+// TEST1874: an exported-but-empty env ('') is neither a dev build nor a valid
+// identity and MUST fail hard, so the build can never silently hash the empty
+// string into a fake registry slug.
+function test1874_registryUrlFromBuildEnvRejectsEmptyString() {
+  let threw = false;
+  try {
+    registryUrlFromBuildEnv('');
+  } catch (e) {
+    threw = true;
+    assert(e.message.includes('MFR_CARTRIDGE_REGISTRY_URL must be unset'), `panic message names the variable: ${e.message}`);
+  }
+  assert(threw, 'empty string must fail hard');
+}
+
+// ============================================================================
+// Cartridge discovery (cartridge_discovery.rs: TEST1875-TEST1878)
+// ============================================================================
+
+// Lay down `{root}/{slug}/{channel}/{name}/{version}/`. When `cartridgeJson`
+// is provided, also write it plus an executable `entry` binary so readFromDir
+// accepts the directory and discovery reaches its own identity checks. Mirrors
+// the Rust test helper install_fixture.
+function discoveryInstallFixture(root, slug, channelFolder, name, version, cartridgeJson, entry) {
+  const fs = require('fs');
+  const path = require('path');
+  const dir = path.join(root, slug, channelFolder, name, version);
+  fs.mkdirSync(dir, { recursive: true });
+  if (cartridgeJson !== null && cartridgeJson !== undefined) {
+    fs.writeFileSync(path.join(dir, 'cartridge.json'), cartridgeJson);
+    const entryPath = path.join(dir, entry);
+    fs.writeFileSync(entryPath, '#!/bin/sh\nexit 0\n');
+    fs.chmodSync(entryPath, 0o755);
+  }
+}
+
+function discoveryDevCartridgeJson(channel, fabricManifestVersion) {
+  return JSON.stringify({
+    name: 'cart', version: '1.0.0', channel, registry_url: null, entry: 'cart',
+    installed_at: '2024-01-01T00:00:00Z', fabric_manifest_version: fabricManifestVersion,
+  });
+}
+
+function discoveryRegistryCartridgeJson(url, channel, fmv) {
+  return JSON.stringify({
+    name: 'cart', version: '1.0.0', channel, registry_url: url, entry: 'cart',
+    installed_at: '2024-01-01T00:00:00Z', fabric_manifest_version: fmv,
+  });
+}
+
+function discoveryMakeTempRoot() {
+  const fs = require('fs');
+  const os = require('os');
+  const path = require('path');
+  return fs.mkdtempSync(path.join(os.tmpdir(), 'capdag-disc-'));
+}
+
+function discoveryRemoveRoot(root) {
+  const fs = require('fs');
+  try { fs.rmSync(root, { recursive: true, force: true }); } catch (_e) { /* best effort */ }
+}
+
+function discoveryExpectIncompatible(out, kind) {
+  assertEqual(out.length, 1, 'expected exactly one discovered entry');
+  assertEqual(out[0].kind, 'incompatible', 'entry must be incompatible');
+  assertEqual(out[0].error.kind, kind, `wrong attachment-error kind: ${out[0].error.message}`);
+}
+
+// TEST1875: scan-all — a registry slug folder AND the dev slot present on disk
+// are BOTH scanned, regardless of the host's own baked registry. Both fixtures
+// lack a real bifaci binary, so both end at HandshakeFailed — proving discovery
+// REACHED them (was not filtered out by a registry pin). A registry-pin
+// rejection would instead surface BadInstallation and never probe.
+async function test1875_scanAllReachesBothDevAndRegistrySlugs() {
+  const root = discoveryMakeTempRoot();
+  try {
+    const url = 'https://cartridges.example.com/manifest';
+    const rslug = slugForSync(url);
+    // Host baked for a DIFFERENT registry than the on-disk registry cartridge.
+    const host = new DiscoveryIdentity({ channel: 'nightly', registryUrl: 'https://other.example.com/manifest', fabricManifestVersion: 1 });
+    discoveryInstallFixture(root, 'dev', 'nightly', 'devcart', '1.0.0', discoveryDevCartridgeJson('nightly', 1), 'cart');
+    discoveryInstallFixture(root, rslug, 'nightly', 'regcart', '1.0.0', discoveryRegistryCartridgeJson(url, 'nightly', 1), 'cart');
+    const out = await discoverCartridges(root, host);
+    assertEqual(out.length, 2, `both slugs must be scanned, got ${out.length}`);
+    for (const c of out) {
+      assertEqual(c.kind, 'incompatible', 'both reach the probe stage');
+      assertEqual(c.error.kind, CartridgeAttachmentErrorKind.HANDSHAKE_FAILED,
+        `both reached the probe (not registry-pin-rejected): ${c.error.message}`);
+    }
+  } finally {
+    discoveryRemoveRoot(root);
+  }
+}
+
+// TEST1876: only the host's channel subtree is scanned. A cartridge under a
+// slug's `release/` folder is invisible to a nightly host even though the slug
+// folder is present (its `nightly/` subtree is absent).
+async function test1876_otherChannelSubtreeIsSkipped() {
+  const root = discoveryMakeTempRoot();
+  try {
+    const url = 'https://cartridges.example.com/manifest';
+    const rslug = slugForSync(url);
+    discoveryInstallFixture(root, rslug, 'release', 'regcart', '1.0.0', discoveryRegistryCartridgeJson(url, 'release', 1), 'cart');
+    const out = await discoverCartridges(root, new DiscoveryIdentity({ channel: 'nightly', registryUrl: null, fabricManifestVersion: 1 }));
+    assertEqual(out.length, 0, 'a release-only slug must be invisible to a nightly host');
+  } finally {
+    discoveryRemoveRoot(root);
+  }
+}
+
+// TEST1877: a registry cartridge hand-copied under the WRONG registry slug
+// folder fails the three-place rule (BadInstallation) — scan-all does not mean
+// "accept anywhere"; placement must still be self-consistent.
+async function test1877_registryCartridgeUnderWrongSlugIsBadInstall() {
+  const root = discoveryMakeTempRoot();
+  try {
+    const url = 'https://cartridges.example.com/manifest';
+    const wrongSlug = slugForSync('https://somewhere-else.example.com/manifest');
+    const json = discoveryRegistryCartridgeJson(url, 'nightly', 1);
+    discoveryInstallFixture(root, wrongSlug, 'nightly', 'cart', '1.0.0', json, 'cart');
+    const out = await discoverCartridges(root, new DiscoveryIdentity({ channel: 'nightly', registryUrl: null, fabricManifestVersion: 1 }));
+    discoveryExpectIncompatible(out, CartridgeAttachmentErrorKind.BAD_INSTALLATION);
+  } finally {
+    discoveryRemoveRoot(root);
+  }
+}
+
+// TEST1878: a cartridge marked `installed_from: bundle` with no baked hash in
+// BUNDLED_PROVIDER_HASHES (empty in this mirror) is rejected as BadInstallation
+// — the bundled-integrity gate fires before the probe. Non-macOS only: on macOS
+// the baked-hash path is intentionally absent (OS code-signature is the guard),
+// so a bundled provider is accepted there and would instead end at the probe.
+async function test1878_bundledProviderWithoutBakedHashIsRejected() {
+  if (process.platform === 'darwin') {
+    // Mirrors the Rust #[cfg(not(target_os = "macos"))] gate: on macOS the
+    // baked-hash path does not exist, so this scenario is not exercised.
+    return;
+  }
+  const root = discoveryMakeTempRoot();
+  try {
+    // Dev slug (null registry) but installed_from=bundle — placement is
+    // self-consistent (null→dev), so it passes readFromDir and reaches the
+    // bundled-hash gate, which has no baked entry → BadInstallation.
+    const json = JSON.stringify({
+      name: 'cart', version: '1.0.0', channel: 'nightly', registry_url: null, entry: 'cart',
+      installed_at: '2024-01-01T00:00:00Z', installed_from: 'bundle', fabric_manifest_version: 1,
+    });
+    discoveryInstallFixture(root, 'dev', 'nightly', 'cart', '1.0.0', json, 'cart');
+    const out = await discoverCartridges(root, new DiscoveryIdentity({ channel: 'nightly', registryUrl: null, fabricManifestVersion: 1 }));
+    discoveryExpectIncompatible(out, CartridgeAttachmentErrorKind.BAD_INSTALLATION);
+    assert(out[0].error.message.includes('bundled provider integrity'),
+      `message should name the bundled-integrity failure: ${out[0].error.message}`);
+  } finally {
+    discoveryRemoveRoot(root);
+  }
+}
+
 // ============================================================================
 // media_urn.rs: TEST1294-TEST1302 (MediaUrn predicates)
 // ============================================================================
@@ -2521,37 +2828,36 @@ function test0086_isCollection() {
 
 // TEST1302: predicates are consistent with constants — every constant triggers exactly the expected predicates
 function test1302_predicateConstantConsistency() {
-  // MEDIA_INTEGER must be numeric, text, scalar, NOT binary/bool/image/audio/video
+  // MEDIA_INTEGER must be numeric, scalar, NOT enc-bearing/bool/image/list.
+  // Integers carry no enc= (a number is not a character-encoded string).
   const intUrn = MediaUrn.fromString(MEDIA_INTEGER);
   assert(intUrn.isNumeric(), 'MEDIA_INTEGER must be numeric');
-  assert(intUrn.isText(), 'MEDIA_INTEGER must be text');
+  assert(intUrn.getTag('enc') === undefined, 'MEDIA_INTEGER must not carry enc');
   assert(intUrn.isScalar(), 'MEDIA_INTEGER must be scalar');
-  assert(!intUrn.isBinary(), 'MEDIA_INTEGER must not be binary');
   assert(!intUrn.isBool(), 'MEDIA_INTEGER must not be bool');
   assert(!intUrn.isImage(), 'MEDIA_INTEGER must not be image');
   assert(!intUrn.isList(), 'MEDIA_INTEGER must not be list');
 
-  // MEDIA_BOOLEAN must be bool, text, scalar, NOT numeric
+  // MEDIA_BOOLEAN must be bool, enc-bearing, scalar, NOT numeric
   const boolUrn = MediaUrn.fromString(MEDIA_BOOLEAN);
   assert(boolUrn.isBool(), 'MEDIA_BOOLEAN must be bool');
-  assert(boolUrn.isText(), 'MEDIA_BOOLEAN must be text');
+  assert(boolUrn.getTag('enc') === 'utf-8', 'MEDIA_BOOLEAN must carry enc=utf-8');
   assert(boolUrn.isScalar(), 'MEDIA_BOOLEAN must be scalar');
   assert(!boolUrn.isNumeric(), 'MEDIA_BOOLEAN must not be numeric');
 
-  // MEDIA_JSON must be json, text, record, scalar, NOT binary
+  // MEDIA_JSON must be json, record, scalar, NOT list — and carries no enc
+  // (fmt= is the content-format axis, orthogonal to enc=).
   const jsonUrn = MediaUrn.fromString(MEDIA_JSON);
   assert(jsonUrn.isJson(), 'MEDIA_JSON must be json');
-  assert(jsonUrn.isText(), 'MEDIA_JSON must be text');
+  assert(jsonUrn.getTag('enc') === undefined, 'MEDIA_JSON must not carry enc');
   assert(jsonUrn.isRecord(), 'MEDIA_JSON must be record');
   assert(jsonUrn.isScalar(), 'MEDIA_JSON must be scalar (no list marker)');
-  assert(!jsonUrn.isBinary(), 'MEDIA_JSON must not be binary');
   assert(!jsonUrn.isList(), 'MEDIA_JSON must not be list');
 
-  // MEDIA_VOID is void, NOT text/numeric — but IS binary (no textable tag)
+  // MEDIA_VOID is void, NOT numeric, and carries no enc tag
   const voidUrn = MediaUrn.fromString(MEDIA_VOID);
   assert(voidUrn.isVoid(), 'MEDIA_VOID must be void');
-  assert(!voidUrn.isText(), 'MEDIA_VOID must not be text');
-  assert(voidUrn.isBinary(), 'MEDIA_VOID must be binary (no textable tag)');
+  assert(voidUrn.getTag('enc') === undefined, 'MEDIA_VOID must not carry enc');
   assert(!voidUrn.isNumeric(), 'MEDIA_VOID must not be numeric');
 }
 
@@ -2593,13 +2899,13 @@ function test1304_withInOutSpec() {
   assertEqual(changedOut.getOutSpec(), 'media:string', 'withOutSpec should change outSpec');
 
   // Chain both
-  const changedBoth = cap.withInSpec('media:pdf').withOutSpec(MEDIA_TXT);
-  assertEqual(changedBoth.getInSpec(), 'media:pdf', 'Chain should set inSpec');
-  assertEqual(changedBoth.getOutSpec(), 'media:ext=txt;textable', 'Chain should set outSpec');
+  const changedBoth = cap.withInSpec('media:ext=pdf').withOutSpec(MEDIA_TXT);
+  assertEqual(changedBoth.getInSpec(), 'media:ext=pdf', 'Chain should set inSpec');
+  assertEqual(changedBoth.getOutSpec(), 'media:enc=utf-8;ext=txt', 'Chain should set outSpec');
 
   const identity = CapUrn.fromString('cap:effect=none');
   assertThrows(
-    () => identity.withOutSpec('media:pdf'),
+    () => identity.withOutSpec('media:ext=pdf'),
     ErrorCodes.ILLEGAL_DECLARATION,
     'withOutSpec must revalidate admissibility'
   );
@@ -2882,7 +3188,7 @@ function test652_capIdentityConstantWorks() {
 // TEST653: invalid effect=none declarations fail at construction.
 function test653_invalidEffectNoneDeclarationRejected() {
   assertThrows(
-    () => CapUrn.fromString('cap:in=media:pdf;out=media:textable;effect=none'),
+    () => CapUrn.fromString('cap:in="media:ext=pdf";effect=none;out="media:enc=utf-8"'),
     ErrorCodes.ILLEGAL_DECLARATION,
     'invalid effect=none declaration must fail at construction'
   );
@@ -2892,7 +3198,7 @@ function test653_invalidEffectNoneDeclarationRejected() {
 function test654_effectNonePreservesRuntimeMedia() {
   const decimate = CapUrn.fromString('cap:decimate-sequence;effect=none');
   const png = MediaUrn.fromString('media:image;png');
-  const pdf = MediaUrn.fromString('media:pdf');
+  const pdf = MediaUrn.fromString('media:ext=pdf');
   assertEqual(decimate.inferRuntimeOutputMedia(png).toString(), png.toString(), 'effect=none should preserve png');
   assertEqual(decimate.inferRuntimeOutputMedia(pdf).toString(), pdf.toString(), 'effect=none should preserve pdf');
 }
@@ -2911,7 +3217,7 @@ function test655_effectDeclaredUsesDeclaredOutput() {
 // TEST656: invalid effect=none declarations fail hard at construction.
 function test656_invalidEffectNoneFailsHard() {
   assertThrows(
-    () => CapUrn.fromString('cap:in=media:pdf;out=media:textable;effect=none'),
+    () => CapUrn.fromString('cap:in="media:ext=pdf";effect=none;out="media:enc=utf-8"'),
     ErrorCodes.ILLEGAL_DECLARATION,
     'invalid effect=none declaration must fail at construction'
   );
@@ -2944,7 +3250,7 @@ function test0088_Machine_whitespaceOnly() {
 // TEST0089: Machine header only no wirings
 function test0089_Machine_headerOnlyNoWirings() {
   assertThrowsWithCode(
-    () => Machine.fromString('[extract cap:in="media:pdf";extract;out="media:txt;textable"]'),
+    () => Machine.fromString('[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]'),
     MachineSyntaxErrorCodes.NO_EDGES
   );
 }
@@ -2953,8 +3259,8 @@ function test0089_Machine_headerOnlyNoWirings() {
 function test0090_Machine_duplicateAlias() {
   assertThrowsWithCode(
     () => Machine.fromString(
-      '[ex cap:in="media:pdf";extract;out="media:txt;textable"]' +
-      '[ex cap:in="media:pdf";summarize;out="media:txt;textable"]' +
+      '[ex cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
+      '[ex cap:in="media:ext=pdf";summarize;out="media:enc=utf-8;ext=txt"]' +
       '[a -> ex -> b]'
     ),
     MachineSyntaxErrorCodes.DUPLICATE_ALIAS
@@ -2964,40 +3270,40 @@ function test0090_Machine_duplicateAlias() {
 // TEST0094: Machine simple linear chain
 function test0094_Machine_simpleLinearChain() {
   const g = Machine.fromString(
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
     '[doc -> extract -> text]'
   );
   assertEqual(g.edgeCount(), 1);
   const edge = g.edges()[0];
   assertEqual(edge.sources.length, 1);
-  assert(edge.sources[0].isEquivalent(MediaUrn.fromString('media:pdf')),
-    'Source should be media:pdf');
-  assert(edge.target.isEquivalent(MediaUrn.fromString('media:txt;textable')),
-    'Target should be media:txt;textable');
+  assert(edge.sources[0].isEquivalent(MediaUrn.fromString('media:ext=pdf')),
+    'Source should be media:ext=pdf');
+  assert(edge.target.isEquivalent(MediaUrn.fromString('media:enc=utf-8;ext=txt')),
+    'Target should be media:enc=utf-8;ext=txt');
   assertEqual(edge.isLoop, false);
 }
 
 // TEST0095: Machine two step chain
 function test0095_Machine_twoStepChain() {
   const g = Machine.fromString(
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
-    '[embed cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"]' +
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
+    '[embed cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"]' +
     '[doc -> extract -> text]' +
     '[text -> embed -> vectors]'
   );
   assertEqual(g.edgeCount(), 2);
-  assert(g.edges()[0].sources[0].isEquivalent(MediaUrn.fromString('media:pdf')),
-    'First edge source should be media:pdf');
-  assert(g.edges()[1].target.isEquivalent(MediaUrn.fromString('media:embedding-vector;record;textable')),
-    'Second edge target should be media:embedding-vector;record;textable');
+  assert(g.edges()[0].sources[0].isEquivalent(MediaUrn.fromString('media:ext=pdf')),
+    'First edge source should be media:ext=pdf');
+  assert(g.edges()[1].target.isEquivalent(MediaUrn.fromString('media:embedding-vector;enc=utf-8;record')),
+    'Second edge target should be media:embedding-vector;enc=utf-8;record');
 }
 
 // TEST0096: Machine fan out
 function test0096_Machine_fanOut() {
   const g = Machine.fromString(
-    '[meta cap:in="media:pdf";extract-metadata;out="media:file-metadata;record;textable"]' +
-    '[outline cap:in="media:pdf";extract-outline;out="media:document-outline;record;textable"]' +
-    '[thumb cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"]' +
+    '[meta cap:in="media:ext=pdf";extract-metadata;out="media:enc=utf-8;file-metadata;record"]' +
+    '[outline cap:in="media:ext=pdf";extract-outline;out="media:document-outline;enc=utf-8;record"]' +
+    '[thumb cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"]' +
     '[doc -> meta -> metadata]' +
     '[doc -> outline -> outline_data]' +
     '[doc -> thumb -> thumbnail]'
@@ -3005,17 +3311,17 @@ function test0096_Machine_fanOut() {
   assertEqual(g.edgeCount(), 3);
   for (const edge of g.edges()) {
     assertEqual(edge.sources.length, 1);
-    assert(edge.sources[0].isEquivalent(MediaUrn.fromString('media:pdf')),
-      'All fan-out sources should be media:pdf');
+    assert(edge.sources[0].isEquivalent(MediaUrn.fromString('media:ext=pdf')),
+      'All fan-out sources should be media:ext=pdf');
   }
 }
 
 // TEST0097: Machine fan in secondary assigned by prior wiring
 function test0097_Machine_fanInSecondaryAssignedByPriorWiring() {
   const g = Machine.fromString(
-    '[thumb cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"]' +
-    '[model_dl cap:in="media:model-spec;textable";download;out="media:model-spec;textable"]' +
-    '[describe cap:in="media:image;png";describe-image;out="media:image-description;textable"]' +
+    '[thumb cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"]' +
+    '[model_dl cap:in="media:enc=utf-8;model-spec";download;out="media:enc=utf-8;model-spec"]' +
+    '[describe cap:in="media:image;png";describe-image;out="media:enc=utf-8;image-description"]' +
     '[doc -> thumb -> thumbnail]' +
     '[spec_input -> model_dl -> model_spec]' +
     '[(thumbnail, model_spec) -> describe -> description]'
@@ -3027,7 +3333,7 @@ function test0097_Machine_fanInSecondaryAssignedByPriorWiring() {
 // TEST0098: Machine fan in secondary unassigned gets wildcard
 function test0098_Machine_fanInSecondaryUnassignedGetsWildcard() {
   const g = Machine.fromString(
-    '[describe cap:in="media:image;png";describe-image;out="media:image-description;textable"]\n' +
+    '[describe cap:in="media:image;png";describe-image;out="media:enc=utf-8;image-description"]\n' +
     '[(thumbnail, model_spec) -> describe -> description]'
   );
   assertEqual(g.edges().length, 1);
@@ -3039,7 +3345,7 @@ function test0098_Machine_fanInSecondaryUnassignedGetsWildcard() {
 // TEST0111: Machine loop edge
 function test0111_Machine_loopEdge() {
   const g = Machine.fromString(
-    '[p2t cap:in="media:disbound-page;textable";page-to-text;out="media:txt;textable"]' +
+    '[p2t cap:in="media:disbound-page;enc=utf-8";page-to-text;out="media:enc=utf-8;ext=txt"]' +
     '[pages -> LOOP p2t -> texts]'
   );
   assertEqual(g.edgeCount(), 1);
@@ -3058,7 +3364,7 @@ function test0112_Machine_undefinedAliasFails() {
 function test0113_Machine_nodeAliasCollision() {
   assertThrowsWithCode(
     () => Machine.fromString(
-      '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
+      '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
       '[extract -> extract -> text]'
     ),
     MachineSyntaxErrorCodes.NODE_ALIAS_COLLISION
@@ -3069,8 +3375,8 @@ function test0113_Machine_nodeAliasCollision() {
 function test0114_Machine_conflictingMediaTypesFail() {
   assertThrowsWithCode(
     () => Machine.fromString(
-      '[cap1 cap:in="media:txt;textable";a;out="media:pdf"]' +
-      '[cap2 cap:in="media:audio;wav";b;out="media:txt;textable"]' +
+      '[cap1 cap:in="media:enc=utf-8;ext=txt";a;out="media:ext=pdf"]' +
+      '[cap2 cap:in="media:audio;wav";b;out="media:enc=utf-8;ext=txt"]' +
       '[src -> cap1 -> mid]' +
       '[mid -> cap2 -> dst]'
     ),
@@ -3081,8 +3387,8 @@ function test0114_Machine_conflictingMediaTypesFail() {
 // TEST0117: Machine multiline format
 function test0117_Machine_multilineFormat() {
   const g = Machine.fromString(
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]\n' +
-    '[embed cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"]\n' +
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]\n' +
+    '[embed cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"]\n' +
     '[doc -> extract -> text]\n' +
     '[text -> embed -> vectors]\n'
   );
@@ -3092,11 +3398,11 @@ function test0117_Machine_multilineFormat() {
 // TEST0118: Machine different aliases same graph
 function test0118_Machine_differentAliasesSameGraph() {
   const g1 = Machine.fromString(
-    '[ex cap:in="media:pdf";extract;out="media:txt;textable"]' +
+    '[ex cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
     '[a -> ex -> b]'
   );
   const g2 = Machine.fromString(
-    '[xt cap:in="media:pdf";extract;out="media:txt;textable"]' +
+    '[xt cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
     '[x -> xt -> y]'
   );
   assert(g1.isEquivalent(g2), 'Different aliases should produce equivalent graphs');
@@ -3113,7 +3419,7 @@ function test0119_Machine_malformedInputFails() {
 // TEST0120: Machine unterminated bracket fails
 function test0120_Machine_unterminatedBracketFails() {
   assertThrowsWithCode(
-    () => parseMachine('[extract cap:in=media:pdf'),
+    () => parseMachine('[extract cap:in=media:ext=pdf'),
     MachineSyntaxErrorCodes.PARSE_ERROR
   );
 }
@@ -3122,22 +3428,22 @@ function test0120_Machine_unterminatedBracketFails() {
 
 function test0121_Machine_lineBasedSimpleChain() {
   const g = Machine.fromString(
-    'extract cap:in="media:pdf";extract;out="media:txt;textable"\n' +
+    'extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"\n' +
     'doc -> extract -> text'
   );
   assertEqual(g.edgeCount(), 1);
   const edge = g.edges()[0];
-  assert(edge.sources[0].isEquivalent(MediaUrn.fromString('media:pdf')),
-    'Source should be media:pdf');
-  assert(edge.target.isEquivalent(MediaUrn.fromString('media:txt;textable')),
-    'Target should be media:txt;textable');
+  assert(edge.sources[0].isEquivalent(MediaUrn.fromString('media:ext=pdf')),
+    'Source should be media:ext=pdf');
+  assert(edge.target.isEquivalent(MediaUrn.fromString('media:enc=utf-8;ext=txt')),
+    'Target should be media:enc=utf-8;ext=txt');
 }
 
 // TEST0122: Machine line based two step chain
 function test0122_Machine_lineBasedTwoStepChain() {
   const g = Machine.fromString(
-    'extract cap:in="media:pdf";extract;out="media:txt;textable"\n' +
-    'embed cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"\n' +
+    'extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"\n' +
+    'embed cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"\n' +
     'doc -> extract -> text\n' +
     'text -> embed -> vectors'
   );
@@ -3147,7 +3453,7 @@ function test0122_Machine_lineBasedTwoStepChain() {
 // TEST0123: Machine line based loop
 function test0123_Machine_lineBasedLoop() {
   const g = Machine.fromString(
-    'p2t cap:in="media:disbound-page;textable";page-to-text;out="media:txt;textable"\n' +
+    'p2t cap:in="media:disbound-page;enc=utf-8";page-to-text;out="media:enc=utf-8;ext=txt"\n' +
     'pages -> LOOP p2t -> texts'
   );
   assertEqual(g.edgeCount(), 1);
@@ -3157,9 +3463,9 @@ function test0123_Machine_lineBasedLoop() {
 // TEST0124: Machine line based fan in
 function test0124_Machine_lineBasedFanIn() {
   const g = Machine.fromString(
-    'thumb cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"\n' +
-    'model_dl cap:in="media:model-spec;textable";download;out="media:model-spec;textable"\n' +
-    'describe cap:in="media:image;png";describe-image;out="media:image-description;textable"\n' +
+    'thumb cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"\n' +
+    'model_dl cap:in="media:enc=utf-8;model-spec";download;out="media:enc=utf-8;model-spec"\n' +
+    'describe cap:in="media:image;png";describe-image;out="media:enc=utf-8;image-description"\n' +
     'doc -> thumb -> thumbnail\n' +
     'spec_input -> model_dl -> model_spec\n' +
     '(thumbnail, model_spec) -> describe -> description'
@@ -3171,7 +3477,7 @@ function test0124_Machine_lineBasedFanIn() {
 // TEST0125: Machine mixed bracketed and line based
 function test0125_Machine_mixedBracketedAndLineBased() {
   const g = Machine.fromString(
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]\n' +
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]\n' +
     'doc -> extract -> text'
   );
   assertEqual(g.edgeCount(), 1);
@@ -3180,11 +3486,11 @@ function test0125_Machine_mixedBracketedAndLineBased() {
 // TEST0126: Machine line based equivalent to bracketed
 function test0126_Machine_lineBasedEquivalentToBracketed() {
   const g1 = Machine.fromString(
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
     '[doc -> extract -> text]'
   );
   const g2 = Machine.fromString(
-    'extract cap:in="media:pdf";extract;out="media:txt;textable"\n' +
+    'extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"\n' +
     'doc -> extract -> text'
   );
   assert(g1.isEquivalent(g2), 'Line-based and bracketed must produce equivalent graphs');
@@ -3194,9 +3500,9 @@ function test0126_Machine_lineBasedEquivalentToBracketed() {
 function test0127_Machine_lineBasedFormatSerialization() {
   const g = new Machine([
     new MachineEdge(
-      [MediaUrn.fromString('media:pdf')],
-      CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-      MediaUrn.fromString('media:txt;textable'),
+      [MediaUrn.fromString('media:ext=pdf')],
+      CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+      MediaUrn.fromString('media:enc=utf-8;ext=txt'),
       false
     ),
   ]);
@@ -3216,15 +3522,15 @@ function test0127_Machine_lineBasedFormatSerialization() {
 function test0128_Machine_lineBasedAndBracketedParseSameGraph() {
   const g = new Machine([
     new MachineEdge(
-      [MediaUrn.fromString('media:pdf')],
-      CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-      MediaUrn.fromString('media:txt;textable'),
+      [MediaUrn.fromString('media:ext=pdf')],
+      CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+      MediaUrn.fromString('media:enc=utf-8;ext=txt'),
       false
     ),
     new MachineEdge(
-      [MediaUrn.fromString('media:txt;textable')],
-      CapUrn.fromString('cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"'),
-      MediaUrn.fromString('media:embedding-vector;record;textable'),
+      [MediaUrn.fromString('media:enc=utf-8;ext=txt')],
+      CapUrn.fromString('cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"'),
+      MediaUrn.fromString('media:embedding-vector;enc=utf-8;record'),
       false
     ),
   ]);
@@ -3241,15 +3547,15 @@ function test0128_Machine_lineBasedAndBracketedParseSameGraph() {
 
 function test0129_Machine_edgeEquivalenceSameUrns() {
   const e1 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   const e2 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   assert(e1.isEquivalent(e2), 'Same URNs should be equivalent');
@@ -3258,15 +3564,15 @@ function test0129_Machine_edgeEquivalenceSameUrns() {
 // TEST0130: Machine edge equivalence different cap urns
 function test0130_Machine_edgeEquivalenceDifferentCapUrns() {
   const e1 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   const e2 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";summarize;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";summarize;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   assert(!e1.isEquivalent(e2), 'Different cap URNs should not be equivalent');
@@ -3275,15 +3581,15 @@ function test0130_Machine_edgeEquivalenceDifferentCapUrns() {
 // TEST0131: Machine edge equivalence different targets
 function test0131_Machine_edgeEquivalenceDifferentTargets() {
   const e1 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   const e2 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:json;record;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:fmt=json;record'),
     false
   );
   assert(!e1.isEquivalent(e2), 'Different targets should not be equivalent');
@@ -3292,15 +3598,15 @@ function test0131_Machine_edgeEquivalenceDifferentTargets() {
 // TEST0132: Machine edge equivalence different loop flag
 function test0132_Machine_edgeEquivalenceDifferentLoopFlag() {
   const e1 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   const e2 = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     true
   );
   assert(!e1.isEquivalent(e2), 'Different loop flags should not be equivalent');
@@ -3309,15 +3615,15 @@ function test0132_Machine_edgeEquivalenceDifferentLoopFlag() {
 // TEST0133: Machine edge equivalence source order independent
 function test0133_Machine_edgeEquivalenceSourceOrderIndependent() {
   const e1 = new MachineEdge(
-    [MediaUrn.fromString('media:txt;textable'), MediaUrn.fromString('media:model-spec;textable')],
-    CapUrn.fromString('cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"'),
-    MediaUrn.fromString('media:embedding-vector;record;textable'),
+    [MediaUrn.fromString('media:enc=utf-8;ext=txt'), MediaUrn.fromString('media:enc=utf-8;model-spec')],
+    CapUrn.fromString('cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"'),
+    MediaUrn.fromString('media:embedding-vector;enc=utf-8;record'),
     false
   );
   const e2 = new MachineEdge(
-    [MediaUrn.fromString('media:model-spec;textable'), MediaUrn.fromString('media:txt;textable')],
-    CapUrn.fromString('cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"'),
-    MediaUrn.fromString('media:embedding-vector;record;textable'),
+    [MediaUrn.fromString('media:enc=utf-8;model-spec'), MediaUrn.fromString('media:enc=utf-8;ext=txt')],
+    CapUrn.fromString('cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"'),
+    MediaUrn.fromString('media:embedding-vector;enc=utf-8;record'),
     false
   );
   assert(e1.isEquivalent(e2), 'Source order should not matter for equivalence');
@@ -3326,15 +3632,15 @@ function test0133_Machine_edgeEquivalenceSourceOrderIndependent() {
 // TEST0134: Machine edge equivalence different source count
 function test0134_Machine_edgeEquivalenceDifferentSourceCount() {
   const e1 = new MachineEdge(
-    [MediaUrn.fromString('media:txt;textable')],
-    CapUrn.fromString('cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"'),
-    MediaUrn.fromString('media:embedding-vector;record;textable'),
+    [MediaUrn.fromString('media:enc=utf-8;ext=txt')],
+    CapUrn.fromString('cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"'),
+    MediaUrn.fromString('media:embedding-vector;enc=utf-8;record'),
     false
   );
   const e2 = new MachineEdge(
-    [MediaUrn.fromString('media:txt;textable'), MediaUrn.fromString('media:model-spec;textable')],
-    CapUrn.fromString('cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"'),
-    MediaUrn.fromString('media:embedding-vector;record;textable'),
+    [MediaUrn.fromString('media:enc=utf-8;ext=txt'), MediaUrn.fromString('media:enc=utf-8;model-spec')],
+    CapUrn.fromString('cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"'),
+    MediaUrn.fromString('media:embedding-vector;enc=utf-8;record'),
     false
   );
   assert(!e1.isEquivalent(e2), 'Different source counts should not be equivalent');
@@ -3346,12 +3652,12 @@ function test0135_Machine_graphEquivalenceSameEdges() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g1 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const g2 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   assert(g1.isEquivalent(g2), 'Same edges should be equivalent');
 }
@@ -3362,12 +3668,12 @@ function test0136_Machine_graphEquivalenceReorderedEdges() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g1 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const g2 = new Machine([
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
   ]);
   assert(g1.isEquivalent(g2), 'Reordered edges should still be equivalent');
 }
@@ -3378,11 +3684,11 @@ function test0137_Machine_graphNotEquivalentDifferentEdgeCount() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g1 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
   ]);
   const g2 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   assert(!g1.isEquivalent(g2), 'Different edge counts should not be equivalent');
 }
@@ -3393,10 +3699,10 @@ function test0138_Machine_graphNotEquivalentDifferentCap() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g1 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
   ]);
   const g2 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";summarize;out="media:txt;textable"', 'media:txt;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";summarize;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
   ]);
   assert(!g1.isEquivalent(g2), 'Different caps should not be equivalent');
 }
@@ -3421,13 +3727,13 @@ function test0141_Machine_rootSourcesLinearChain() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const roots = g.rootSources();
   assertEqual(roots.length, 1);
-  assert(roots[0].isEquivalent(MediaUrn.fromString('media:pdf')),
-    'Root source should be media:pdf');
+  assert(roots[0].isEquivalent(MediaUrn.fromString('media:ext=pdf')),
+    'Root source should be media:ext=pdf');
 }
 
 // TEST0142: Machine leaf targets linear chain
@@ -3436,21 +3742,21 @@ function test0142_Machine_leafTargetsLinearChain() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const leaves = g.leafTargets();
   assertEqual(leaves.length, 1);
-  assert(leaves[0].isEquivalent(MediaUrn.fromString('media:embedding-vector;record;textable')),
-    'Leaf target should be media:embedding-vector;record;textable');
+  assert(leaves[0].isEquivalent(MediaUrn.fromString('media:embedding-vector;enc=utf-8;record')),
+    'Leaf target should be media:embedding-vector;enc=utf-8;record');
 }
 
 // TEST0143: Machine root sources fan in
 function test0143_Machine_rootSourcesFanIn() {
   const e = new MachineEdge(
-    [MediaUrn.fromString('media:txt;textable'), MediaUrn.fromString('media:model-spec;textable')],
-    CapUrn.fromString('cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"'),
-    MediaUrn.fromString('media:embedding-vector;record;textable'),
+    [MediaUrn.fromString('media:enc=utf-8;ext=txt'), MediaUrn.fromString('media:enc=utf-8;model-spec')],
+    CapUrn.fromString('cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"'),
+    MediaUrn.fromString('media:embedding-vector;enc=utf-8;record'),
     false
   );
   const g = new Machine([e]);
@@ -3461,21 +3767,21 @@ function test0143_Machine_rootSourcesFanIn() {
 // TEST0144: Machine display edge
 function test0144_Machine_displayEdge() {
   const e = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   const display = e.toString();
-  assert(display.includes('media:pdf'), 'Display should contain media:pdf');
+  assert(display.includes('media:ext=pdf'), 'Display should contain media:ext=pdf');
 }
 
 // TEST0145: Machine display graph
 function test0145_Machine_displayGraph() {
   const e = new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   );
   assertEqual(new Machine([e]).toString(), 'Machine(1 edges)');
@@ -3486,9 +3792,9 @@ function test0145_Machine_displayGraph() {
 
 function test0146_Machine_serializeSingleEdge() {
   const g = new Machine([new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   )]);
   const notation = g.toMachineNotation();
@@ -3505,8 +3811,8 @@ function test0147_Machine_serializeTwoEdgeChain() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const notation = g.toMachineNotation();
   const bracketCount = (notation.match(/\[/g) || []).length;
@@ -3521,9 +3827,9 @@ function test0148_Machine_serializeEmptyGraph() {
 // TEST0149: Machine roundtrip single edge
 function test0149_Machine_roundtripSingleEdge() {
   const original = new Machine([new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   )]);
   const notation = original.toMachineNotation();
@@ -3538,8 +3844,8 @@ function test0151_Machine_roundtripTwoEdgeChain() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const original = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const notation = original.toMachineNotation();
   const reparsed = Machine.fromString(notation);
@@ -3553,9 +3859,9 @@ function test0152_Machine_roundtripFanOut() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const original = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract-metadata;out="media:file-metadata;record;textable"', 'media:file-metadata;record;textable'),
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract-outline;out="media:document-outline;record;textable"', 'media:document-outline;record;textable'),
-    mkEdge('media:pdf', 'cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"', 'media:image;png;thumbnail'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract-metadata;out="media:enc=utf-8;file-metadata;record"', 'media:enc=utf-8;file-metadata;record'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract-outline;out="media:document-outline;enc=utf-8;record"', 'media:document-outline;enc=utf-8;record'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"', 'media:image;png;thumbnail'),
   ]);
   const notation = original.toMachineNotation();
   const reparsed = Machine.fromString(notation);
@@ -3566,9 +3872,9 @@ function test0152_Machine_roundtripFanOut() {
 // TEST0153: Machine roundtrip loop edge
 function test0153_Machine_roundtripLoopEdge() {
   const original = new Machine([new MachineEdge(
-    [MediaUrn.fromString('media:disbound-page;textable')],
-    CapUrn.fromString('cap:in="media:disbound-page;textable";page-to-text;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:disbound-page;enc=utf-8')],
+    CapUrn.fromString('cap:in="media:disbound-page;enc=utf-8";page-to-text;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     true
   )]);
   const notation = original.toMachineNotation();
@@ -3583,8 +3889,8 @@ function test0154_Machine_serializationIsDeterministic() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const n1 = g.toMachineNotation();
   const n2 = g.toMachineNotation();
@@ -3597,12 +3903,12 @@ function test0155_Machine_reorderedEdgesProduceSameNotation() {
     [MediaUrn.fromString(src)], CapUrn.fromString(cap), MediaUrn.fromString(tgt), false
   );
   const g1 = new Machine([
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
   ]);
   const g2 = new Machine([
-    mkEdge('media:txt;textable', 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable'),
-    mkEdge('media:pdf', 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable'),
+    mkEdge('media:enc=utf-8;ext=txt', 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record'),
+    mkEdge('media:ext=pdf', 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt'),
   ]);
   assertEqual(g1.toMachineNotation(), g2.toMachineNotation(),
     'Same graph with reordered edges must produce identical notation');
@@ -3611,9 +3917,9 @@ function test0155_Machine_reorderedEdgesProduceSameNotation() {
 // TEST0160: Machine multiline serialize format
 function test0160_Machine_multilineSerializeFormat() {
   const g = new Machine([new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   )]);
   const multi = g.toMachineNotationMultiline();
@@ -3627,9 +3933,9 @@ function test0160_Machine_multilineSerializeFormat() {
 // no privileged `op` tag to derive a friendlier name from.
 function test0161_Machine_aliasFromOpTag() {
   const g = new Machine([new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   )]);
   const notation = g.toMachineNotation();
@@ -3639,9 +3945,9 @@ function test0161_Machine_aliasFromOpTag() {
 // TEST0162: Machine alias fallback without op tag
 function test0162_Machine_aliasFallbackWithoutOpTag() {
   const g = new Machine([new MachineEdge(
-    [MediaUrn.fromString('media:pdf')],
-    CapUrn.fromString('cap:in="media:pdf";out="media:txt;textable"'),
-    MediaUrn.fromString('media:txt;textable'),
+    [MediaUrn.fromString('media:ext=pdf')],
+    CapUrn.fromString('cap:in="media:ext=pdf";out="media:enc=utf-8;ext=txt"'),
+    MediaUrn.fromString('media:enc=utf-8;ext=txt'),
     false
   )]);
   const notation = g.toMachineNotation();
@@ -3652,15 +3958,15 @@ function test0162_Machine_aliasFallbackWithoutOpTag() {
 function test0163_Machine_duplicateOpTagsDisambiguated() {
   const g = new Machine([
     new MachineEdge(
-      [MediaUrn.fromString('media:pdf')],
-      CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"'),
-      MediaUrn.fromString('media:txt;textable'),
+      [MediaUrn.fromString('media:ext=pdf')],
+      CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"'),
+      MediaUrn.fromString('media:enc=utf-8;ext=txt'),
       false
     ),
     new MachineEdge(
-      [MediaUrn.fromString('media:pdf')],
-      CapUrn.fromString('cap:in="media:pdf";extract;out="media:json;record;textable"'),
-      MediaUrn.fromString('media:json;record;textable'),
+      [MediaUrn.fromString('media:ext=pdf')],
+      CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:fmt=json;record"'),
+      MediaUrn.fromString('media:fmt=json;record'),
       false
     ),
   ]);
@@ -3674,9 +3980,9 @@ function test0163_Machine_duplicateOpTagsDisambiguated() {
 function test0164_Machine_builderSingleEdge() {
   const builder = new MachineBuilder();
   builder.addEdge(
-    ['media:pdf'],
-    'cap:in="media:pdf";extract;out="media:txt;textable"',
-    'media:txt;textable'
+    ['media:ext=pdf'],
+    'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"',
+    'media:enc=utf-8;ext=txt'
   );
   const g = builder.build();
   assertEqual(g.edgeCount(), 1);
@@ -3687,9 +3993,9 @@ function test0164_Machine_builderSingleEdge() {
 function test0165_Machine_builderWithLoop() {
   const builder = new MachineBuilder();
   builder.addEdge(
-    ['media:disbound-page;textable'],
-    'cap:in="media:disbound-page;textable";page-to-text;out="media:txt;textable"',
-    'media:txt;textable',
+    ['media:disbound-page;enc=utf-8'],
+    'cap:in="media:disbound-page;enc=utf-8";page-to-text;out="media:enc=utf-8;ext=txt"',
+    'media:enc=utf-8;ext=txt',
     true
   );
   const g = builder.build();
@@ -3699,8 +4005,8 @@ function test0165_Machine_builderWithLoop() {
 // TEST0166: Machine builder chaining
 function test0166_Machine_builderChaining() {
   const g = new MachineBuilder()
-    .addEdge(['media:pdf'], 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable')
-    .addEdge(['media:txt;textable'], 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable')
+    .addEdge(['media:ext=pdf'], 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt')
+    .addEdge(['media:enc=utf-8;ext=txt'], 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record')
     .build();
   assertEqual(g.edgeCount(), 2);
 }
@@ -3708,11 +4014,11 @@ function test0166_Machine_builderChaining() {
 // TEST0167: Machine builder equivalent to parsed
 function test0167_Machine_builderEquivalentToParsed() {
   const parsed = Machine.fromString(
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
     '[doc -> extract -> text]'
   );
   const built = new MachineBuilder()
-    .addEdge(['media:pdf'], 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable')
+    .addEdge(['media:ext=pdf'], 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt')
     .build();
   assert(parsed.isEquivalent(built),
     'Builder-constructed graph should be equivalent to parsed graph');
@@ -3721,8 +4027,8 @@ function test0167_Machine_builderEquivalentToParsed() {
 // TEST0168: Machine builder round trip
 function test0168_Machine_builderRoundTrip() {
   const built = new MachineBuilder()
-    .addEdge(['media:pdf'], 'cap:in="media:pdf";extract;out="media:txt;textable"', 'media:txt;textable')
-    .addEdge(['media:txt;textable'], 'cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"', 'media:embedding-vector;record;textable')
+    .addEdge(['media:ext=pdf'], 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'media:enc=utf-8;ext=txt')
+    .addEdge(['media:enc=utf-8;ext=txt'], 'cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"', 'media:embedding-vector;enc=utf-8;record')
     .build();
   const notation = built.toMachineNotation();
   const reparsed = Machine.fromString(notation);
@@ -3732,54 +4038,54 @@ function test0168_Machine_builderRoundTrip() {
 // --- CapUrn.isEquivalent/isComparable tests ---
 
 function test0169_Machine_capUrnIsEquivalent() {
-  const a = CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"');
-  const b = CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"');
+  const a = CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"');
+  const b = CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"');
   assert(a.isEquivalent(b), 'Same cap URNs should be equivalent');
-  const c = CapUrn.fromString('cap:in="media:pdf";summarize;out="media:txt;textable"');
+  const c = CapUrn.fromString('cap:in="media:ext=pdf";summarize;out="media:enc=utf-8;ext=txt"');
   assert(!a.isEquivalent(c), 'Different cap URNs should not be equivalent');
 }
 
 // TEST0170: Machine cap urn is comparable
 function test0170_Machine_capUrnIsComparable() {
-  const general = CapUrn.fromString('cap:in="media:pdf";out="media:txt;textable"');
-  const specific = CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"');
+  const general = CapUrn.fromString('cap:in="media:ext=pdf";out="media:enc=utf-8;ext=txt"');
+  const specific = CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"');
   assert(general.isComparable(specific), 'General should be comparable to specific');
   assert(specific.isComparable(general), 'isComparable should be symmetric');
 }
 
 // TEST0171: Machine cap urn in media urn
 function test0171_Machine_capUrnInMediaUrn() {
-  const cap = CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"');
+  const cap = CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"');
   const inUrn = cap.inMediaUrn();
   assert(inUrn instanceof MediaUrn, 'inMediaUrn should return MediaUrn');
-  assert(inUrn.isEquivalent(MediaUrn.fromString('media:pdf')), 'inMediaUrn should be media:pdf');
+  assert(inUrn.isEquivalent(MediaUrn.fromString('media:ext=pdf')), 'inMediaUrn should be media:ext=pdf');
 }
 
 // TEST0172: Machine cap urn out media urn
 function test0172_Machine_capUrnOutMediaUrn() {
-  const cap = CapUrn.fromString('cap:in="media:pdf";extract;out="media:txt;textable"');
+  const cap = CapUrn.fromString('cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"');
   const outUrn = cap.outMediaUrn();
   assert(outUrn instanceof MediaUrn, 'outMediaUrn should return MediaUrn');
-  assert(outUrn.isEquivalent(MediaUrn.fromString('media:txt;textable')), 'outMediaUrn should be media:txt;textable');
+  assert(outUrn.isEquivalent(MediaUrn.fromString('media:enc=utf-8;ext=txt')), 'outMediaUrn should be media:enc=utf-8;ext=txt');
 }
 
 // --- MediaUrn.isEquivalent/isComparable tests ---
 
 function test0173_Machine_mediaUrnIsEquivalent() {
-  const a = MediaUrn.fromString('media:pdf');
-  const b = MediaUrn.fromString('media:pdf');
+  const a = MediaUrn.fromString('media:ext=pdf');
+  const b = MediaUrn.fromString('media:ext=pdf');
   assert(a.isEquivalent(b), 'Same media URNs should be equivalent');
-  const c = MediaUrn.fromString('media:txt;textable');
+  const c = MediaUrn.fromString('media:enc=utf-8;ext=txt');
   assert(!a.isEquivalent(c), 'Different media URNs should not be equivalent');
 }
 
 // TEST0174: Machine media urn is comparable
 function test0174_Machine_mediaUrnIsComparable() {
-  const general = MediaUrn.fromString('media:textable');
-  const specific = MediaUrn.fromString('media:txt;textable');
+  const general = MediaUrn.fromString('media:enc=utf-8');
+  const specific = MediaUrn.fromString('media:enc=utf-8;ext=txt');
   assert(general.isComparable(specific), 'General should be comparable to specific');
   assert(specific.isComparable(general), 'isComparable should be symmetric');
-  const unrelated = MediaUrn.fromString('media:pdf');
+  const unrelated = MediaUrn.fromString('media:ext=pdf');
   assert(!general.isComparable(unrelated), 'Unrelated should not be comparable');
 }
 
@@ -3788,7 +4094,7 @@ function test0174_Machine_mediaUrnIsComparable() {
 // ============================================================================
 
 function test0175_Machine_parseMachineWithAST_headerLocation() {
-  const input = '[extract cap:in="media:pdf";extract;out="media:txt;textable"][doc -> extract -> text]';
+  const input = '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"][doc -> extract -> text]';
   const result = parseMachineWithAST(input);
   assert(result.statements.length === 2, 'Should have 2 statements');
   const stmt = result.statements[0];
@@ -3805,7 +4111,7 @@ function test0175_Machine_parseMachineWithAST_headerLocation() {
 
 // TEST0176: Machine parse machine with a s t wiring location
 function test0176_Machine_parseMachineWithAST_wiringLocation() {
-  const input = '[extract cap:in="media:pdf";extract;out="media:txt;textable"]\n[doc -> extract -> text]';
+  const input = '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]\n[doc -> extract -> text]';
   const result = parseMachineWithAST(input);
   assert(result.statements.length === 2, 'Should have 2 statements');
   const wiring = result.statements[1];
@@ -3820,7 +4126,7 @@ function test0176_Machine_parseMachineWithAST_wiringLocation() {
 
 // TEST0177: Machine parse machine with a s t multiline positions
 function test0177_Machine_parseMachineWithAST_multilinePositions() {
-  const input = '[extract cap:in="media:pdf";extract;out="media:txt;textable"]\n[doc -> extract -> text]';
+  const input = '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]\n[doc -> extract -> text]';
   const result = parseMachineWithAST(input);
   const headerLoc = result.statements[0].location;
   const wiringLoc = result.statements[1].location;
@@ -3831,7 +4137,7 @@ function test0177_Machine_parseMachineWithAST_multilinePositions() {
 // TEST0178: Machine parse machine with a s t fan in source locations
 function test0178_Machine_parseMachineWithAST_fanInSourceLocations() {
   const input = [
-    '[describe cap:in="media:image;png";describe-image;out="media:image-description;textable"]',
+    '[describe cap:in="media:image;png";describe-image;out="media:enc=utf-8;image-description"]',
     '[(thumbnail, model_spec) -> describe -> description]'
   ].join('\n');
   const result = parseMachineWithAST(input);
@@ -3843,8 +4149,8 @@ function test0178_Machine_parseMachineWithAST_fanInSourceLocations() {
 // TEST0179: Machine parse machine with a s t alias map
 function test0179_Machine_parseMachineWithAST_aliasMap() {
   const input = [
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]',
-    '[embed cap:in="media:txt;textable";embed;out="media:embedding-vector;record;textable"]',
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]',
+    '[embed cap:in="media:enc=utf-8;ext=txt";embed;out="media:embedding-vector;enc=utf-8;record"]',
     '[doc -> extract -> text]',
     '[text -> embed -> vectors]',
   ].join('\n');
@@ -3862,14 +4168,14 @@ function test0179_Machine_parseMachineWithAST_aliasMap() {
 // TEST0180: Machine parse machine with a s t node media
 function test0180_Machine_parseMachineWithAST_nodeMedia() {
   const input = [
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]',
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]',
     '[doc -> extract -> text]',
   ].join('\n');
   const result = parseMachineWithAST(input);
   assert(result.nodeMedia.has('doc'), 'nodeMedia should have doc');
   assert(result.nodeMedia.has('text'), 'nodeMedia should have text');
-  assertEqual(result.nodeMedia.get('doc').toString(), 'media:pdf', 'doc should be media:pdf');
-  assertEqual(result.nodeMedia.get('text').toString(), 'media:textable;txt', 'text should be media:textable;txt');
+  assertEqual(result.nodeMedia.get('doc').toString(), 'media:ext=pdf', 'doc should be media:ext=pdf');
+  assertEqual(result.nodeMedia.get('text').toString(), 'media:enc=utf-8;ext=txt', 'text should be media:enc=utf-8;ext=txt');
 }
 
 // TEST0181: Machine error location parse error
@@ -3887,8 +4193,8 @@ function test0181_Machine_errorLocation_parseError() {
 function test0182_Machine_errorLocation_duplicateAlias() {
   try {
     parseMachine(
-      '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
-      '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
+      '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
+      '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
       '[doc -> extract -> text]'
     );
     throw new Error('Expected MachineSyntaxError');
@@ -3915,7 +4221,7 @@ function test0183_Machine_errorLocation_undefinedAlias() {
 
 function test0184_Machine_toMermaid_linearChain() {
   const machine = Machine.fromString(
-    '[extract cap:in="media:pdf";extract;out="media:txt;textable"]' +
+    '[extract cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"]' +
     '[doc -> extract -> text]'
   );
   const mermaid = machine.toMermaid();
@@ -3924,8 +4230,8 @@ function test0184_Machine_toMermaid_linearChain() {
   // serializer (the input alias name is not preserved in the rendered
   // diagram — it's a serialization artefact, not part of the machine).
   assert(mermaid.includes('edge_0'), 'Should include edge_0 label');
-  assert(mermaid.includes('media:pdf'), 'Should include media:pdf node');
-  assert(mermaid.includes('media:textable;txt'), 'Should include media:textable;txt node');
+  assert(mermaid.includes('media:ext=pdf'), 'Should include media:ext=pdf node');
+  assert(mermaid.includes('media:enc=utf-8;ext=txt'), 'Should include media:enc=utf-8;ext=txt node');
   assert(mermaid.includes('-->'), 'Should include arrow');
   // Root source and leaf target should both be stadium shape
   assert(mermaid.includes('(['), 'Should have stadium shape nodes');
@@ -3934,7 +4240,7 @@ function test0184_Machine_toMermaid_linearChain() {
 // TEST0185: Machine to mermaid loop edge
 function test0185_Machine_toMermaid_loopEdge() {
   const machine = Machine.fromString(
-    '[p2t cap:in="media:disbound-page;textable";page-to-text;out="media:txt;textable"]' +
+    '[p2t cap:in="media:disbound-page;enc=utf-8";page-to-text;out="media:enc=utf-8;ext=txt"]' +
     '[pages -> LOOP p2t -> texts]'
   );
   const mermaid = machine.toMermaid();
@@ -3953,7 +4259,7 @@ function test0186_Machine_toMermaid_emptyGraph() {
 // TEST0187: Machine to mermaid fan in
 function test0187_Machine_toMermaid_fanIn() {
   const machine = Machine.fromString(
-    '[describe cap:in="media:image;png";describe-image;out="media:image-description;textable"]' +
+    '[describe cap:in="media:image;png";describe-image;out="media:enc=utf-8;image-description"]' +
     '[(thumbnail, model_spec) -> describe -> description]'
   );
   const mermaid = machine.toMermaid();
@@ -3965,8 +4271,8 @@ function test0187_Machine_toMermaid_fanIn() {
 // TEST0188: Machine to mermaid fan out
 function test0188_Machine_toMermaid_fanOut() {
   const input = [
-    '[meta cap:in="media:pdf";extract-metadata;out="media:file-metadata;record;textable"]',
-    '[thumb cap:in="media:pdf";generate-thumbnail;out="media:image;png;thumbnail"]',
+    '[meta cap:in="media:ext=pdf";extract-metadata;out="media:enc=utf-8;file-metadata;record"]',
+    '[thumb cap:in="media:ext=pdf";generate-thumbnail;out="media:image;png;thumbnail"]',
     '[doc -> meta -> metadata]',
     '[doc -> thumb -> thumbnail]'
   ].join('');
@@ -3975,8 +4281,8 @@ function test0188_Machine_toMermaid_fanOut() {
   // Should have 2 edges
   const arrowCount = (mermaid.match(/-->/g) || []).length;
   assertEqual(arrowCount, 2, 'Fan-out should produce 2 arrows');
-  // The root source (media:pdf) should appear once as a node definition
-  assert(mermaid.includes('media:pdf'), 'Should include media:pdf');
+  // The root source (media:ext=pdf) should appear once as a node definition
+  assert(mermaid.includes('media:ext=pdf'), 'Should include media:ext=pdf');
 }
 
 // ============================================================================
@@ -3985,36 +4291,36 @@ function test0188_Machine_toMermaid_fanOut() {
 
 function test0189_Machine_capRegistryEntry_construction() {
   const entry = new FabricRegistryEntry({
-    urn: 'cap:in="media:pdf";extract;out="media:txt;textable"',
+    urn: 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"',
     title: 'PDF Extractor',
     command: 'extract',
     cap_description: 'Extracts text from PDF',
-    args: [{ media_urn: 'media:pdf', required: true }],
-    output: { media_urn: 'media:txt;textable', output_description: 'Extracted text' },
+    args: [{ media_urn: 'media:ext=pdf', required: true }],
+    output: { media_urn: 'media:enc=utf-8;ext=txt', output_description: 'Extracted text' },
     media_defs: [],
     urn_tags: { op: 'extract' },
-    in_spec: 'media:pdf',
-    out_spec: 'media:txt;textable',
+    in_spec: 'media:ext=pdf',
+    out_spec: 'media:enc=utf-8;ext=txt',
     in_media_title: 'PDF Document',
     out_media_title: 'Text'
   });
-  assertEqual(entry.urn, 'cap:in="media:pdf";extract;out="media:txt;textable"', 'URN should match');
+  assertEqual(entry.urn, 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"', 'URN should match');
   assertEqual(entry.title, 'PDF Extractor', 'Title should match');
   assertEqual(entry.description, 'Extracts text from PDF', 'Description should match');
-  assertEqual(entry.inSpec, 'media:pdf', 'inSpec should match');
-  assertEqual(entry.outSpec, 'media:txt;textable', 'outSpec should match');
+  assertEqual(entry.inSpec, 'media:ext=pdf', 'inSpec should match');
+  assertEqual(entry.outSpec, 'media:enc=utf-8;ext=txt', 'outSpec should match');
   assertEqual(entry.urnTags.op, 'extract', 'op tag should match');
 }
 
 // TEST0190: Machine media registry entry construction
 function test0190_Machine_mediaRegistryEntry_construction() {
   const entry = new MediaRegistryEntry({
-    urn: 'media:pdf',
+    urn: 'media:ext=pdf',
     title: 'PDF Document',
     media_type: 'application/pdf',
     description: 'Portable Document Format'
   });
-  assertEqual(entry.urn, 'media:pdf', 'URN should match');
+  assertEqual(entry.urn, 'media:ext=pdf', 'URN should match');
   assertEqual(entry.title, 'PDF Document', 'Title should match');
   assertEqual(entry.mediaType, 'application/pdf', 'Media type should match');
   assertEqual(entry.description, 'Portable Document Format', 'Description should match');
@@ -4117,7 +4423,7 @@ function test0195_Renderer_cardinalityFromCap_findsStdinArgNotFirstArg() {
   // A naive implementation that reads args[0] would see `cli-only` (not a
   // sequence) and report 1→1 even though the stdin arg is a sequence.
   const cap = {
-    urn: 'cap:in="media:textable;list";transcribe;out="media:textable"',
+    urn: 'cap:in="media:enc=utf-8;list";transcribe;out="media:enc=utf-8"',
     args: [
       {
         display_name: 'cli-only',
@@ -4149,7 +4455,7 @@ function test0196_Renderer_cardinalityFromCap_scalarDefaultsWhenFieldsMissing()
 function test0197_Renderer_cardinalityFromCap_outputOnlySequence() {
   // One scalar stdin arg, output is a sequence: expects 1→n.
   const cap = {
-    urn: 'cap:in="media:textable";generate;out="media:textable;list"',
+    urn: 'cap:in="media:enc=utf-8";generate;out="media:enc=utf-8;list"',
     args: [{ sources: [{ stdin: {} }], is_sequence: false }],
     output: { is_sequence: true },
   };
@@ -4242,10 +4548,10 @@ function test0204_Renderer_buildBrowseGraphData_rejectsMissingMediaTitles() {
   try {
     rendererBuildBrowseGraphData([
       {
-        urn: 'cap:in="media:pdf";extract;out="media:txt;textable"',
+        urn: 'cap:in="media:ext=pdf";extract;out="media:enc=utf-8;ext=txt"',
         title: 'Extract Text',
-        in_spec: 'media:pdf',
-        out_spec: 'media:txt;textable',
+        in_spec: 'media:ext=pdf',
+        out_spec: 'media:enc=utf-8;ext=txt',
         in_media_title: 'PDF',
         out_media_title: '',
       },
@@ -4341,10 +4647,10 @@ function test0207_Renderer_classifyStrandCapSteps_capFlags() {
   // have neither.
   const steps = [
     makeForEachStep('media:pdf;list'),
-    makeCapStep('cap:in="media:pdf";a;out="media:image;png"', 'a', 'media:pdf', 'media:image;png', false, false),
+    makeCapStep('cap:in="media:ext=pdf";a;out="media:image;png"', 'a', 'media:ext=pdf', 'media:image;png', false, false),
     makeCapStep('cap:in="media:image;png";b;out="media:jpg"', 'b', 'media:image;png', 'media:jpg', false, false),
-    makeCapStep('cap:in="media:jpg";c;out="media:txt"', 'c', 'media:jpg', 'media:txt', false, false),
-    makeCollectStep('media:txt'),
+    makeCapStep('cap:in="media:jpg";c;out="media:ext=txt"', 'c', 'media:jpg', 'media:ext=txt', false, false),
+    makeCollectStep('media:ext=txt'),
   ];
   const { capStepIndices, capFlags } = rendererClassifyStrandCapSteps(steps);
   assertEqual(capStepIndices.length, 3, 'three cap steps');
@@ -4455,12 +4761,12 @@ function test0211_Renderer_buildStrandGraphData_foreachCollectSpan() {
     target_media_urn: 'media:txt;list',
     steps: [
       makeForEachStep('media:pdf;list'),
-      makeCapStep('cap:in="media:pdf";extract;out="media:txt"', 'extract', 'media:pdf', 'media:txt', false, false),
-      makeCollectStep('media:txt'),
+      makeCapStep('cap:in="media:ext=pdf";extract;out="media:ext=txt"', 'extract', 'media:ext=pdf', 'media:ext=txt', false, false),
+      makeCollectStep('media:ext=txt'),
     ],
   }, {
     'media:pdf;list': 'PDF List',
-    'media:txt': 'Plain Text',
+    'media:ext=txt': 'Plain Text',
     'media:txt;list': 'Text List',
   });
   const built = rendererBuildStrandGraphData(payload);
@@ -4603,12 +4909,12 @@ function test0215_Renderer_collapseStrand_singleCapBodyKeepsCapOwnLabel() {
     target_media_urn: 'media:txt;list',
     steps: [
       makeForEachStep('media:pdf;list'),
-      makeCapStep('cap:in="media:pdf";extract;out="media:txt"', 'extract', 'media:pdf', 'media:txt', false, false),
-      makeCollectStep('media:txt'),
+      makeCapStep('cap:in="media:ext=pdf";extract;out="media:ext=txt"', 'extract', 'media:ext=pdf', 'media:ext=txt', false, false),
+      makeCollectStep('media:ext=txt'),
     ],
   }, {
     'media:pdf;list': 'PDF List',
-    'media:txt': 'Plain Text',
+    'media:ext=txt': 'Plain Text',
     'media:txt;list': 'Text List',
   });
   const built = rendererBuildStrandGraphData(payload);
@@ -4741,7 +5047,7 @@ function test0217_Renderer_collapseStrand_standaloneCollectCollapses() {
 function test0218_Renderer_collapseStrand_sequenceProducingCapBeforeForeach() {
   // Regression test mirroring the user's real strand:
   // [Cap_disbind (output_is_sequence=true), ForEach, Cap_make_decision],
-  // source = media:pdf, target = media:decision (equivalent to
+  // source = media:ext=pdf, target = media:decision (equivalent to
   // the last cap's to_spec).
   //
   // Expected render shape after collapse:
@@ -4756,15 +5062,15 @@ function test0218_Renderer_collapseStrand_sequenceProducingCapBeforeForeach() {
   //   No separate output node because step_2's to_spec equals the
   //       strand target.
   const payload = withMediaDisplayNames({
-    source_media_urn: 'media:pdf',
+    source_media_urn: 'media:ext=pdf',
     target_media_urn: 'media:decision',
     steps: [
-      makeCapStep('cap:in="media:pdf";disbind;out="media:page"', 'Disbind', 'media:pdf', 'media:page', false, true),
+      makeCapStep('cap:in="media:ext=pdf";disbind;out="media:page"', 'Disbind', 'media:ext=pdf', 'media:page', false, true),
       makeForEachStep('media:page'),
       makeCapStep('cap:in="media:page";decide;out="media:decision"', 'Make a Decision', 'media:page', 'media:decision', false, false),
     ],
   }, {
-    'media:pdf': 'PDF',
+    'media:ext=pdf': 'PDF',
     'media:page': 'Page',
     'media:decision': 'Decision',
   });
@@ -4904,12 +5210,12 @@ function test0223_Renderer_buildRunGraphData_pagesSuccessesAndFailures() {
   // failures.
   const strand = {
     source_media_urn: 'media:pdf;list',
-    target_media_urn: 'media:txt',
+    target_media_urn: 'media:ext=txt',
     steps: [
       makeForEachStep('media:pdf;list'),
-      makeCapStep('cap:in="media:pdf";a;out="media:image;png"', 'a', 'media:pdf', 'media:image;png', false, false),
-      makeCapStep('cap:in="media:image;png";b;out="media:txt"', 'b', 'media:image;png', 'media:txt', false, false),
-      makeCollectStep('media:txt'),
+      makeCapStep('cap:in="media:ext=pdf";a;out="media:image;png"', 'a', 'media:ext=pdf', 'media:image;png', false, false),
+      makeCapStep('cap:in="media:image;png";b;out="media:ext=txt"', 'b', 'media:image;png', 'media:ext=txt', false, false),
+      makeCollectStep('media:ext=txt'),
     ],
   };
   const outcomes = [];
@@ -4924,7 +5230,7 @@ function test0223_Renderer_buildRunGraphData_pagesSuccessesAndFailures() {
       saved_paths: [],
       total_bytes: 0,
       duration_ms: 0,
-      failed_cap: 'cap:in="media:image;png";b;out="media:txt"',
+      failed_cap: 'cap:in="media:image;png";b;out="media:ext=txt"',
       error: 'oom',
     });
   }
@@ -4932,9 +5238,9 @@ function test0223_Renderer_buildRunGraphData_pagesSuccessesAndFailures() {
     resolved_strand: strand,
     media_display_names: {
       'media:pdf;list': 'PDF List',
-      'media:pdf': 'PDF',
+      'media:ext=pdf': 'PDF',
       'media:image;png': 'PNG',
-      'media:txt': 'Text',
+      'media:ext=txt': 'Text',
     },
     body_outcomes: outcomes,
     visible_success_count: 3,
@@ -4971,19 +5277,19 @@ function test0224_Renderer_buildRunGraphData_failureWithoutFailedCapRendersFullT
   // replica emits 1 entry node + 1 body cap node = 2 nodes.
   const strand = {
     source_media_urn: 'media:pdf;list',
-    target_media_urn: 'media:txt',
+    target_media_urn: 'media:ext=txt',
     steps: [
       makeForEachStep('media:pdf;list'),
-      makeCapStep('cap:in="media:pdf";a;out="media:txt"', 'a', 'media:pdf', 'media:txt', false, false),
-      makeCollectStep('media:txt'),
+      makeCapStep('cap:in="media:ext=pdf";a;out="media:ext=txt"', 'a', 'media:ext=pdf', 'media:ext=txt', false, false),
+      makeCollectStep('media:ext=txt'),
     ],
   };
   const payload = {
     resolved_strand: strand,
     media_display_names: {
       'media:pdf;list': 'PDF List',
-      'media:pdf': 'PDF',
-      'media:txt': 'Text',
+      'media:ext=pdf': 'PDF',
+      'media:ext=txt': 'Text',
     },
     body_outcomes: [
       { body_index: 0, success: false, cap_urns: [], saved_paths: [], total_bytes: 0, duration_ms: 0, error: 'unknown' },
@@ -5074,10 +5380,10 @@ function test0226_Renderer_buildRunGraphData_backboneHasNoForeachNode() {
   // step_2 (Decision, merged target). No separate `for each` or
   // `collect` boxes.
   const strand = {
-    source_media_urn: 'media:pdf',
+    source_media_urn: 'media:ext=pdf',
     target_media_urn: 'media:decision',
     steps: [
-      makeCapStep('cap:in="media:pdf";disbind;out="media:page"', 'Disbind', 'media:pdf', 'media:page', false, true),
+      makeCapStep('cap:in="media:ext=pdf";disbind;out="media:page"', 'Disbind', 'media:ext=pdf', 'media:page', false, true),
       makeForEachStep('media:page'),
       makeCapStep('cap:in="media:page";decide;out="media:decision"', 'Make a Decision', 'media:page', 'media:decision', false, false),
     ],
@@ -5085,7 +5391,7 @@ function test0226_Renderer_buildRunGraphData_backboneHasNoForeachNode() {
   const payload = {
     resolved_strand: strand,
     media_display_names: {
-      'media:pdf': 'PDF',
+      'media:ext=pdf': 'PDF',
       'media:page': 'Page',
       'media:decision': 'Decision',
     },
@@ -5123,10 +5429,10 @@ function test0227_Renderer_buildRunGraphData_allFailedDropsTargetPlaceholder() {
   // doesn't see a stale "Decision" placeholder alongside their
   // failed replicas.
   const strand = {
-    source_media_urn: 'media:pdf',
+    source_media_urn: 'media:ext=pdf',
     target_media_urn: 'media:decision',
     steps: [
-      makeCapStep('cap:in="media:pdf";disbind;out="media:page"', 'Disbind', 'media:pdf', 'media:page', false, true),
+      makeCapStep('cap:in="media:ext=pdf";disbind;out="media:page"', 'Disbind', 'media:ext=pdf', 'media:page', false, true),
       makeForEachStep('media:page'),
       makeCapStep('cap:in="media:page";decide;out="media:decision"', 'Make a Decision', 'media:page', 'media:decision', false, false),
     ],
@@ -5135,7 +5441,7 @@ function test0227_Renderer_buildRunGraphData_allFailedDropsTargetPlaceholder() {
   const payload = {
     resolved_strand: strand,
     media_display_names: {
-      'media:pdf': 'PDF',
+      'media:ext=pdf': 'PDF',
       'media:page': 'Page',
       'media:decision': 'Decision',
     },
@@ -5194,10 +5500,10 @@ function test0228_Renderer_buildRunGraphData_unclosedForeachSuccessNoMerge() {
   //                                    → body_n_0 (per-body Decision)
   //   (no merge edge back into the backbone)
   const strand = {
-    source_media_urn: 'media:pdf',
+    source_media_urn: 'media:ext=pdf',
     target_media_urn: 'media:decision',
     steps: [
-      makeCapStep('cap:in="media:pdf";disbind;out="media:page"', 'Disbind', 'media:pdf', 'media:page', false, true),
+      makeCapStep('cap:in="media:ext=pdf";disbind;out="media:page"', 'Disbind', 'media:ext=pdf', 'media:page', false, true),
       makeForEachStep('media:page'),
       makeCapStep('cap:in="media:page";decide;out="media:decision"', 'Make a Decision', 'media:page', 'media:decision', false, false),
     ],
@@ -5205,7 +5511,7 @@ function test0228_Renderer_buildRunGraphData_unclosedForeachSuccessNoMerge() {
   const payload = {
     resolved_strand: strand,
     media_display_names: {
-      'media:pdf': 'PDF',
+      'media:ext=pdf': 'PDF',
       'media:page': 'Page',
       'media:decision': 'Decision',
     },
@@ -5258,16 +5564,16 @@ function test0229_Renderer_buildRunGraphData_closedForeachSuccessMergesAtCollect
     target_media_urn: 'media:txt;list',
     steps: [
       makeForEachStep('media:pdf;list'),
-      makeCapStep('cap:in="media:pdf";extract;out="media:txt"', 'extract', 'media:pdf', 'media:txt', false, false),
-      makeCollectStep('media:txt'),
+      makeCapStep('cap:in="media:ext=pdf";extract;out="media:ext=txt"', 'extract', 'media:ext=pdf', 'media:ext=txt', false, false),
+      makeCollectStep('media:ext=txt'),
     ],
   };
   const payload = {
     resolved_strand: strand,
     media_display_names: {
       'media:pdf;list': 'PDF List',
-      'media:pdf': 'PDF',
-      'media:txt': 'Text',
+      'media:ext=pdf': 'PDF',
+      'media:ext=txt': 'Text',
       'media:txt;list': 'Text List',
     },
     body_outcomes: [
@@ -5427,7 +5733,7 @@ function test0235_Renderer_buildEditorGraphData_rejectsEdgeWithMissingSource() {
 // ---------------- resolved-machine builder ----------------
 
 function test0236_Renderer_buildResolvedMachineGraphData_singleStrandLinearChain() {
-  // A single-strand machine: media:pdf → extract → media:txt
+  // A single-strand machine: media:ext=pdf → extract → media:ext=txt
   // → embed → media:embedding. Two edges, three nodes, no
   // loops, no fan-in. Tests the basic shape — nodes and
   // edges flow through verbatim from the resolved machine
@@ -5436,28 +5742,28 @@ function test0236_Renderer_buildResolvedMachineGraphData_singleStrandLinearChain
     strands: [
       {
         nodes: [
-          { id: 'n0', urn: 'media:pdf', title: 'PDF' },
-          { id: 'n1', urn: 'media:txt;textable', title: 'Plain Text' },
+          { id: 'n0', urn: 'media:ext=pdf', title: 'PDF' },
+          { id: 'n1', urn: 'media:enc=utf-8;ext=txt', title: 'Plain Text' },
           { id: 'n2', urn: 'media:embedding;record', title: 'Embedding Record' },
         ],
         edges: [
           {
             alias: 'edge_0',
-            cap_urn: 'cap:in=media:pdf;extract;out=media:txt;textable',
+            cap_urn: 'cap:in="media:ext=pdf";extract;out=media:enc=utf-8;ext=txt',
             title: 'Extract Text',
             is_loop: false,
             assignment: [
-              { cap_arg_media_urn: 'media:pdf', source_node: 'n0' },
+              { cap_arg_media_urn: 'media:ext=pdf', source_node: 'n0' },
             ],
             target_node: 'n1',
           },
           {
             alias: 'edge_1',
-            cap_urn: 'cap:in=media:textable;embed;out=media:embedding;record',
+            cap_urn: 'cap:in=media:enc=utf-8;embed;out=media:embedding;record',
             title: 'Generate Embedding',
             is_loop: false,
             assignment: [
-              { cap_arg_media_urn: 'media:textable', source_node: 'n1' },
+              { cap_arg_media_urn: 'media:enc=utf-8', source_node: 'n1' },
             ],
             target_node: 'n2',
           },
@@ -5493,17 +5799,17 @@ function test0237_Renderer_buildResolvedMachineGraphData_loopEdgeGetsLoopClass()
     strands: [
       {
         nodes: [
-          { id: 'n0', urn: 'media:page;textable', title: 'Page' },
-          { id: 'n1', urn: 'media:decision;json;record;textable', title: 'Decision Record' },
+          { id: 'n0', urn: 'media:enc=utf-8;page', title: 'Page' },
+          { id: 'n1', urn: 'media:decision;fmt=json;record', title: 'Decision Record' },
         ],
         edges: [
           {
             alias: 'edge_0',
-            cap_urn: 'cap:in=media:textable;make-decision;out=media:decision;json;record;textable',
+            cap_urn: 'cap:in=media:enc=utf-8;make-decision;out=media:decision;fmt=json;record',
             title: 'Make Decision',
             is_loop: true,
             assignment: [
-              { cap_arg_media_urn: 'media:textable', source_node: 'n0' },
+              { cap_arg_media_urn: 'media:enc=utf-8', source_node: 'n0' },
             ],
             target_node: 'n1',
           },
@@ -5530,18 +5836,18 @@ function test0238_Renderer_buildResolvedMachineGraphData_fanInProducesEdgePerAss
       {
         nodes: [
           { id: 'n0', urn: 'media:image;png', title: 'PNG Image' },
-          { id: 'n1', urn: 'media:model-spec;textable', title: 'Model Spec' },
-          { id: 'n2', urn: 'media:image-description;textable', title: 'Image Description' },
+          { id: 'n1', urn: 'media:enc=utf-8;model-spec', title: 'Model Spec' },
+          { id: 'n2', urn: 'media:enc=utf-8;image-description', title: 'Image Description' },
         ],
         edges: [
           {
             alias: 'edge_0',
-            cap_urn: 'cap:in=media:image;png;describe-image;out=media:image-description;textable',
+            cap_urn: 'cap:in=media:image;png;describe-image;out=media:enc=utf-8;image-description',
             title: 'Describe Image',
             is_loop: false,
             assignment: [
               { cap_arg_media_urn: 'media:image;png', source_node: 'n0' },
-              { cap_arg_media_urn: 'media:model-spec;textable', source_node: 'n1' },
+              { cap_arg_media_urn: 'media:enc=utf-8;model-spec', source_node: 'n1' },
             ],
             target_node: 'n2',
           },
@@ -5571,17 +5877,17 @@ function test0239_Renderer_buildResolvedMachineGraphData_multiStrandKeepsStrands
     strands: [
       {
         nodes: [
-          { id: 'n0', urn: 'media:pdf', title: 'PDF' },
-          { id: 'n1', urn: 'media:txt;textable', title: 'Plain Text' },
+          { id: 'n0', urn: 'media:ext=pdf', title: 'PDF' },
+          { id: 'n1', urn: 'media:enc=utf-8;ext=txt', title: 'Plain Text' },
         ],
         edges: [
           {
             alias: 'edge_0',
-            cap_urn: 'cap:in=media:pdf;extract;out=media:txt;textable',
+            cap_urn: 'cap:in="media:ext=pdf";extract;out=media:enc=utf-8;ext=txt',
             title: 'Extract Text',
             is_loop: false,
             assignment: [
-              { cap_arg_media_urn: 'media:pdf', source_node: 'n0' },
+              { cap_arg_media_urn: 'media:ext=pdf', source_node: 'n0' },
             ],
             target_node: 'n1',
           },
@@ -5591,17 +5897,17 @@ function test0239_Renderer_buildResolvedMachineGraphData_multiStrandKeepsStrands
       },
       {
         nodes: [
-          { id: 'n2', urn: 'media:json;record;textable', title: 'JSON Record' },
-          { id: 'n3', urn: 'media:csv;list;record;textable', title: 'CSV Rows' },
+          { id: 'n2', urn: 'media:fmt=json;record', title: 'JSON Record' },
+          { id: 'n3', urn: 'media:fmt=csv;list;record', title: 'CSV Rows' },
         ],
         edges: [
           {
             alias: 'edge_1',
-            cap_urn: 'cap:in=media:json;record;textable;convert-format;out=media:csv;list;record;textable',
+            cap_urn: 'cap:in=media:fmt=json;record;convert-format;out=media:fmt=csv;list;record',
             title: 'Convert Format',
             is_loop: false,
             assignment: [
-              { cap_arg_media_urn: 'media:json;record;textable', source_node: 'n2' },
+              { cap_arg_media_urn: 'media:fmt=json;record', source_node: 'n2' },
             ],
             target_node: 'n3',
           },
@@ -5633,7 +5939,7 @@ function test0240_Renderer_buildResolvedMachineGraphData_duplicateNodeIdAcrossSt
   const payload = {
     strands: [
       {
-        nodes: [{ id: 'n0', urn: 'media:pdf', title: 'PDF' }],
+        nodes: [{ id: 'n0', urn: 'media:ext=pdf', title: 'PDF' }],
         edges: [],
         input_anchor_nodes: ['n0'],
         output_anchor_nodes: ['n0'],
@@ -5733,7 +6039,7 @@ function test1801_kindSourceWhenInputIsVoid() {
   const warm = CapUrn.fromString('cap:in=media:void;out="media:model-artifact";warm');
   assertEqual(warm.kind(), CapKind.SOURCE, 'warm cap is a Source');
 
-  const gen = CapUrn.fromString('cap:in=media:void;out=media:textable');
+  const gen = CapUrn.fromString('cap:in=media:void;out="media:enc=utf-8"');
   assertEqual(gen.kind(), CapKind.SOURCE, 'in=void with concrete out is a Source');
 }
 
@@ -5742,7 +6048,7 @@ function test1802_kindSinkWhenOutputIsVoid() {
   const discard = CapUrn.fromString('cap:discard;in=media:;out=media:void');
   assertEqual(discard.kind(), CapKind.SINK, 'discard cap is a Sink');
 
-  const log = CapUrn.fromString('cap:in="media:json;textable";log;out=media:void');
+  const log = CapUrn.fromString('cap:in="media:fmt=json";log;out=media:void');
   assertEqual(log.kind(), CapKind.SINK, 'log cap is a Sink');
 }
 
@@ -5759,7 +6065,7 @@ function test1803_kindEffectWhenBothSidesVoid() {
 // TEST1804: Transform classifier — at least one side non-void, and
 // the cap is not the bare identity.
 function test1804_kindTransformForNormalDataProcessors() {
-  const extract = CapUrn.fromString('cap:extract;in=media:pdf;out="media:record;textable"');
+  const extract = CapUrn.fromString('cap:extract;in="media:ext=pdf";out="media:enc=utf-8;record"');
   assertEqual(extract.kind(), CapKind.TRANSFORM, 'extract is a Transform');
 
   const labeled = CapUrn.fromString('cap:passthrough;in=media:;out=media:');
@@ -5812,13 +6118,13 @@ function test1805_kindInvariantUnderCanonicalSpellings() {
   const cases = [
     { a: 'cap:effect=none', b: 'cap:in=media:;out=media:;effect=none', expected: CapKind.IDENTITY },
     {
-      a: 'cap:extract;in=media:pdf;out=media:textable',
-      b: 'cap:extract;in="media:pdf";out="media:textable"',
+      a: 'cap:extract;in="media:ext=pdf";out="media:enc=utf-8"',
+      b: 'cap:extract;in="media:ext=pdf";out="media:enc=utf-8"',
       expected: CapKind.TRANSFORM,
     },
     {
-      a: 'cap:in=media:void;out=media:textable;warm',
-      b: 'cap:warm;out=media:textable;in=media:void',
+      a: 'cap:in=media:void;out="media:enc=utf-8";warm',
+      b: 'cap:warm;out="media:enc=utf-8";in=media:void',
       expected: CapKind.SOURCE,
     },
   ];
@@ -6017,9 +6323,9 @@ function test1843_rejectInvalidCombinations() {
 
 // TEST1844: out-axis difference dominates combined in+y differences.
 function test1844_axisWeightingOutDominates() {
-  const bigOut = CapUrn.fromString('cap:in=media:;out="media:record;textable"');
+  const bigOut = CapUrn.fromString('cap:in=media:;out="media:enc=utf-8;record"');
   const bigInAndY = CapUrn.fromString(
-    'cap:in=media:pdf;out=media:record;!constrained;?target;extract;stage!=alpha;target2=metadata;ver?=draft'
+    'cap:in="media:ext=pdf";out=media:record;!constrained;?target;extract;stage!=alpha;target2=metadata;ver?=draft'
   );
   assert(bigOut.specificity() > bigInAndY.specificity(),
     'out-axis difference must dominate combined in+y differences');
@@ -6027,7 +6333,7 @@ function test1844_axisWeightingOutDominates() {
 
 // TEST1845: With equal out, in-axis dominates over y-axis.
 function test1845_axisWeightingInDominatesY() {
-  const bigIn = CapUrn.fromString('cap:in=media:pdf;out=media:record');
+  const bigIn = CapUrn.fromString('cap:in="media:ext=pdf";out=media:record');
   const bigY = CapUrn.fromString(
     'cap:in=media:;out=media:record;!constrained;?target;extract;stage!=alpha;target2=metadata;ver?=draft'
   );
@@ -6049,7 +6355,7 @@ function test1846_axisWeightingDecodedLayout() {
 
 // TEST1847: Cap with version=0 round-trips with no `version` key on wire
 function test1847_capVersionZeroOmittedOnWire() {
-  const urn = CapUrn.fromString('cap:in="media:void";test-op;out="media:record;textable"');
+  const urn = CapUrn.fromString('cap:in="media:void";test-op;out="media:enc=utf-8;record"');
   const cap = new Cap(urn, 'Test Cap', 'test-op');
   // version defaults to 0
   assertEqual(cap.version, 0, 'Default version should be 0');
@@ -6061,7 +6367,7 @@ function test1847_capVersionZeroOmittedOnWire() {
 
 // TEST1848: Cap with version=N round-trips with `version: N` on wire
 function test1848_capVersionNonZeroOnWire() {
-  const urn = CapUrn.fromString('cap:in="media:void";versioned-op;out="media:record;textable"');
+  const urn = CapUrn.fromString('cap:in="media:void";versioned-op;out="media:enc=utf-8;record"');
   const cap = new Cap(urn, 'Versioned Cap', 'versioned-op');
   cap.version = 42;
   const json = cap.toJSON();
@@ -6144,7 +6450,7 @@ async function runTests() {
   // media_urn.rs: TEST060-TEST078
   console.log('\n--- media_urn.rs ---');
   runTest('TEST060: wrong_prefix_fails', test060_wrongPrefixFails);
-  runTest('TEST061: is_binary', test061_isBinary);
+  console.log('  SKIP TEST061: REMOVED (binary/text distinction gone; see TEST067 for enc=)');
   runTest('TEST062: is_record', test062_isRecord);
   runTest('TEST063: is_scalar', test063_isScalar);
   runTest('TEST064: is_list', test064_isList);
@@ -6258,6 +6564,27 @@ async function runTests() {
   runTest('TEST334: cartridge_repo_client_needs_sync', test334_cartridgeRepoClientNeedsSync);
   runTest('TEST335: cartridge_repo_server_client_integration', test335_cartridgeRepoServerClientIntegration);
 
+  // cartridge_repo.rs: TEST1849-TEST1853 (host-compatibility resolution)
+  console.log('\n--- cartridge_repo.rs (resolve_for_host) ---');
+  runTest('TEST1849: resolve_for_host_compatible_latest', test1849_resolveForHostCompatibleLatest);
+  runTest('TEST1850: resolve_for_host_compatible_outdated', test1850_resolveForHostCompatibleOutdated);
+  runTest('TEST1851: resolve_for_host_incompatible', test1851_resolveForHostIncompatible);
+  runTest('TEST1852: resolve_for_host_skips_build_with_no_installer', test1852_resolveForHostSkipsBuildWithNoInstaller);
+  runTest('TEST1853: host_platform_normalized_form', test1853_hostPlatformNormalizedForm);
+
+  // manifest.rs: TEST1872-TEST1874 (registry_url_from_build_env)
+  console.log('\n--- manifest.rs (registry_url_from_build_env) ---');
+  runTest('TEST1872: registry_url_from_build_env_passes_through_nonempty', test1872_registryUrlFromBuildEnvPassesThroughNonempty);
+  runTest('TEST1873: registry_url_from_build_env_none_for_dev', test1873_registryUrlFromBuildEnvNoneForDev);
+  runTest('TEST1874: registry_url_from_build_env_rejects_empty_string', test1874_registryUrlFromBuildEnvRejectsEmptyString);
+
+  // cartridge_discovery.rs: TEST1875-TEST1878 (scan-all discovery)
+  console.log('\n--- cartridge_discovery.rs (discover_cartridges) ---');
+  await runTest('TEST1875: scan_all_reaches_both_dev_and_registry_slugs', test1875_scanAllReachesBothDevAndRegistrySlugs);
+  await runTest('TEST1876: other_channel_subtree_is_skipped', test1876_otherChannelSubtreeIsSkipped);
+  await runTest('TEST1877: registry_cartridge_under_wrong_slug_is_bad_install', test1877_registryCartridgeUnderWrongSlugIsBadInstall);
+  await runTest('TEST1878: bundled_provider_without_baked_hash_is_rejected', test1878_bundledProviderWithoutBakedHashIsRejected);
+
   // media_urn.rs: TEST1312-TEST1315, TEST1298-TEST1302 (MediaUrn predicates)
   console.log('\n--- media_urn.rs (predicates) ---');
   runTest('TEST1312: is_image', test1312_isImage);