capdag 0.146.323 → 0.149.334

package/cap-graph-renderer.js

@@ -158,10 +158,10 @@ function layoutForMode(mode) {
     algorithm: 'layered',
     'elk.direction': 'RIGHT',
     'elk.edgeRouting': 'POLYLINE',
-    'elk.layered.spacing.edgeEdgeBetweenLayers': 20,
-    'elk.layered.spacing.edgeNodeBetweenLayers': 30,
-    'elk.spacing.edgeEdge': 15,
-    'elk.spacing.edgeNode': 25,
+    'elk.layered.spacing.edgeEdgeBetweenLayers': 30,
+    'elk.layered.spacing.edgeNodeBetweenLayers': 40,
+    'elk.spacing.edgeEdge': 25,
+    'elk.spacing.edgeNode': 35,
     'elk.layered.crossingMinimization.strategy': 'LAYER_SWEEP',
     'elk.layered.nodePlacement.strategy': 'NETWORK_SIMPLEX',
     'elk.layered.considerModelOrder.strategy': 'NODES_AND_EDGES',
@@ -169,8 +169,8 @@ function layoutForMode(mode) {
   };
   if (mode === 'browse') {
     return Object.assign({}, base, {
-      'elk.layered.spacing.nodeNodeBetweenLayers': 150,
-      'elk.spacing.nodeNode': 50,
+      'elk.layered.spacing.nodeNodeBetweenLayers': 180,
+      'elk.spacing.nodeNode': 90,
     });
   }
   if (mode === 'strand') {

package/capdag.js

@@ -3596,6 +3596,23 @@ class CartridgeCapSummary {
   }
 }
 
+/**
+ * Cartridge cap group from registry
+ */
+class CartridgeCapGroup {
+  constructor(data) {
+    if (!data.name) throw new Error('CapGroup missing name');
+    this.name = data.name;
+    this.caps = (data.caps || []).map(c => new CartridgeCapSummary(c.urn, c.title, c.description || ''));
+    this.adapter_urns = data.adapter_urns || [];
+  }
+
+  /** Flat caps in this group */
+  allCaps() {
+    return this.caps;
+  }
+}
+
 /**
  * Cartridge information from registry
  */
@@ -3610,7 +3627,8 @@ class CartridgeInfo {
     this.teamId = data.teamId || '';
     this.signedAt = data.signedAt || '';
     this.minAppVersion = data.minAppVersion || '';
-    this.caps = (data.caps || []).map(c => new CartridgeCapSummary(c.urn, c.title, c.description || ''));
+    if (!Array.isArray(data.cap_groups)) throw new Error(`CartridgeInfo ${data.id || '?'}: missing cap_groups array`);
+    this.cap_groups = data.cap_groups.map(g => new CartridgeCapGroup(g));
     this.categories = data.categories || [];
     this.tags = data.tags || [];
     // Versions with platform-specific builds
@@ -3618,6 +3636,21 @@ class CartridgeInfo {
     this.availableVersions = data.availableVersions || [];
   }
 
+  /** All caps flattened across all cap_groups, deduplicated by URN */
+  allCaps() {
+    const seen = new Set();
+    const result = [];
+    for (const group of this.cap_groups) {
+      for (const cap of group.caps) {
+        if (!seen.has(cap.urn)) {
+          seen.add(cap.urn);
+          result.push(cap);
+        }
+      }
+    }
+    return result;
+  }
+
   /**
    * Check if cartridge is signed (has team_id and signed_at)
    */
@@ -3697,15 +3730,28 @@ class CartridgeRepoClient {
 
     const data = await response.json();
 
-    if (!data.cartridges || !Array.isArray(data.cartridges)) {
-      throw new Error(`Invalid cartridge registry response from ${repoUrl}: missing cartridges array`);
+    if (!data.cartridges || typeof data.cartridges !== 'object') {
+      throw new Error(`Invalid cartridge registry response from ${repoUrl}: missing cartridges object`);
     }
 
-    return data.cartridges.map(p => new CartridgeInfo(p));
+    // Registry stores cartridges as an object keyed by id; normalize to array.
+    return Object.entries(data.cartridges).map(([id, c]) => new CartridgeInfo({
+      ...c,
+      id,
+      version: c.latestVersion
+    }));
   }
 
   /**
-   * Update cache from registry data
+   * Update cache from registry data.
+   *
+   * The cap-to-cartridges index keys on the *normalized* tagged-URN form
+   * of each cap URN (parse via CapUrn.fromString, then take toString()).
+   * This collapses textually different but canonically identical URNs
+   * (different declared tag order) into the same bucket so that lookups
+   * resolve regardless of how the requester phrased the URN. A cap URN
+   * that fails to parse is a registry corruption: we throw rather than
+   * silently keep the malformed string in the index.
    */
   updateCache(repoUrl, cartridges) {
     const cache = new CartridgeRepoCache(repoUrl);
@@ -3713,11 +3759,12 @@ class CartridgeRepoClient {
     for (const cartridge of cartridges) {
       cache.cartridges.set(cartridge.id, cartridge);
 
-      for (const cap of cartridge.caps) {
-        if (!cache.capToCartridges.has(cap.urn)) {
-          cache.capToCartridges.set(cap.urn, []);
+      for (const cap of cartridge.allCaps()) {
+        const normalized = CapUrn.fromString(cap.urn).toString();
+        if (!cache.capToCartridges.has(normalized)) {
+          cache.capToCartridges.set(normalized, []);
         }
-        cache.capToCartridges.get(cap.urn).push(cartridge.id);
+        cache.capToCartridges.get(normalized).push(cartridge.id);
       }
     }
 
@@ -3760,20 +3807,36 @@ class CartridgeRepoClient {
   }
 
   /**
-   * Get cartridge suggestions for a cap URN
+   * Get cartridge suggestions for a cap URN.
+   *
+   * `capUrn` is parsed via CapUrn.fromString; the parsed-and-
+   * re-serialized form is the canonical key into the cap-to-cartridges
+   * index. Inside each candidate cartridge we walk its caps via
+   * `allCaps()` and match each one with `isEquivalent`, never with
+   * string equality.
    */
   getSuggestionsForCap(capUrn) {
+    const requested = CapUrn.fromString(capUrn);
+    const normalized = requested.toString();
     const suggestions = [];
 
     for (const cache of this.caches.values()) {
-      const cartridgeIds = cache.capToCartridges.get(capUrn);
+      const cartridgeIds = cache.capToCartridges.get(normalized);
       if (!cartridgeIds) continue;
 
       for (const cartridgeId of cartridgeIds) {
         const cartridge = cache.cartridges.get(cartridgeId);
         if (!cartridge) continue;
 
-        const capInfo = cartridge.caps.find(c => c.urn === capUrn);
+        const capInfo = cartridge.allCaps().find(c => {
+          let parsed;
+          try {
+            parsed = CapUrn.fromString(c.urn);
+          } catch (_e) {
+            return false;
+          }
+          return parsed.isEquivalent(requested);
+        });
         if (!capInfo) continue;
 
         const pageUrl = cartridge.pageUrl || cache.repoUrl;
@@ -3782,7 +3845,7 @@ class CartridgeRepoClient {
           cartridgeId: cartridge.id,
           cartridgeName: cartridge.name,
           cartridgeDescription: cartridge.description,
-          capUrn: capUrn,
+          capUrn: normalized,
           capTitle: capInfo.title,
           latestVersion: cartridge.version,
           repoUrl: cache.repoUrl,
@@ -3889,6 +3952,9 @@ class CartridgeRepoServer {
       if (!build.package || !build.package.name) {
         throw new Error(`Cartridge ${id} v${version}: build[${i}] (${build.platform}) missing package.name`);
       }
+      if (!build.package.url) {
+        throw new Error(`Cartridge ${id} v${version}: build[${i}] (${build.platform}) missing package.url`);
+      }
     }
   }
 
@@ -3942,7 +4008,10 @@ class CartridgeRepoServer {
         teamId: cartridge.teamId,
         signedAt: versionData.releaseDate,
         minAppVersion: versionData.minAppVersion || cartridge.minAppVersion,
-        caps: cartridge.caps || [],
+        cap_groups: (() => {
+          if (!Array.isArray(cartridge.cap_groups)) throw new Error(`Cartridge ${id}: missing cap_groups array`);
+          return cartridge.cap_groups;
+        })(),
         categories: cartridge.categories,
         tags: cartridge.tags,
         versions: cartridge.versions,
@@ -3971,18 +4040,25 @@ class CartridgeRepoServer {
   }
 
   /**
-   * Search cartridges by query
+   * Search cartridges by free-text query.
+   *
+   * Matches against cartridge name, description, tags, and cap titles.
+   * Cap URN strings are not substring-matched: a cap URN is a tagged
+   * identifier and substring matching against it is a category error.
+   * Use `getCartridgesByCap` to look up cartridges that provide a
+   * specific cap.
    */
   searchCartridges(query) {
     const cartridges = this.transformToCartridgeArray();
     const lowerQuery = query.toLowerCase();
 
-    return cartridges.filter(p =>
-      p.name.toLowerCase().includes(lowerQuery) ||
-      p.description.toLowerCase().includes(lowerQuery) ||
-      p.tags.some(t => t.toLowerCase().includes(lowerQuery)) ||
-      p.caps.some(c => c.urn.toLowerCase().includes(lowerQuery) || c.title.toLowerCase().includes(lowerQuery))
-    );
+    return cartridges.filter(p => {
+      const allCaps = (p.cap_groups || []).flatMap(g => g.caps || []);
+      return p.name.toLowerCase().includes(lowerQuery) ||
+        p.description.toLowerCase().includes(lowerQuery) ||
+        p.tags.some(t => t.toLowerCase().includes(lowerQuery)) ||
+        allCaps.some(c => c.title.toLowerCase().includes(lowerQuery));
+    });
   }
 
   /**
@@ -3994,11 +4070,29 @@ class CartridgeRepoServer {
   }
 
   /**
-   * Get cartridges that provide a specific cap
+   * Get cartridges that provide a specific cap.
+   *
+   * Both the request URN and each candidate cap URN are parsed via
+   * CapUrn.fromString and matched with `isEquivalent` so caps declared
+   * in any tag order resolve. A malformed input URN throws — there is
+   * no fallback that compares the raw strings.
    */
   getCartridgesByCap(capUrn) {
+    const requested = CapUrn.fromString(capUrn);
     const cartridges = this.transformToCartridgeArray();
-    return cartridges.filter(p => p.caps.some(c => c.urn === capUrn));
+    return cartridges.filter(p =>
+      (p.cap_groups || []).some(g =>
+        (g.caps || []).some(c => {
+          let parsed;
+          try {
+            parsed = CapUrn.fromString(c.urn);
+          } catch (_e) {
+            return false;
+          }
+          return parsed.isEquivalent(requested);
+        })
+      )
+    );
   }
 }
 

package/capdag.test.js

@@ -1651,16 +1651,22 @@ const sampleRegistry = {
       minAppVersion: '1.0.0',
       categories: ['document'],
       tags: ['pdf', 'extractor'],
-      caps: [
+      cap_groups: [
         {
-          urn: 'cap:in="media:pdf";op=disbind;out="media:disbound-page;textable;list"',
-          title: 'Disbind PDF',
-          description: 'Extract pages'
-        },
-        {
-          urn: 'cap:in="media:pdf";op=extract_metadata;out="media:file-metadata;textable;record"',
-          title: 'Extract Metadata',
-          description: 'Get PDF metadata'
+          name: 'pdf-processing',
+          adapter_urns: ['media:pdf'],
+          caps: [
+            {
+              urn: 'cap:in="media:pdf";op=disbind;out="media:disbound-page;textable;list"',
+              title: 'Disbind PDF',
+              description: 'Extract pages'
+            },
+            {
+              urn: 'cap:in="media:pdf";op=extract_metadata;out="media:file-metadata;textable;record"',
+              title: 'Extract Metadata',
+              description: 'Get PDF metadata'
+            }
+          ]
         }
       ],
       latestVersion: '0.81.5325',
@@ -1673,6 +1679,7 @@ const sampleRegistry = {
             platform: 'darwin-arm64',
             package: {
               name: 'pdfcartridge-0.81.5325.pkg',
+              url: 'https://cartridges.machinefabric.com/pdfcartridge/0.81.5325/pdfcartridge-0.81.5325.pkg',
               sha256: '9b68724eb9220ecf01e8ed4f5f80c594fbac2239bc5bf675005ec882ecc5eba0',
               size: 5187485
             }
@@ -1689,11 +1696,17 @@ const sampleRegistry = {
       minAppVersion: '1.0.0',
       categories: ['text'],
       tags: ['txt', 'text'],
-      caps: [
+      cap_groups: [
         {
-          urn: 'cap:in="media:txt;textable";op=disbind;out="media:disbound-page;textable;list"',
-          title: 'Disbind Text',
-          description: 'Extract text pages'
+          name: 'text-processing',
+          adapter_urns: ['media:txt;textable'],
+          caps: [
+            {
+              urn: 'cap:in="media:txt;textable";op=disbind;out="media:disbound-page;textable;list"',
+              title: 'Disbind Text',
+              description: 'Extract text pages'
+            }
+          ]
         }
       ],
       latestVersion: '0.54.6408',
@@ -1706,6 +1719,7 @@ const sampleRegistry = {
             platform: 'darwin-arm64',
             package: {
               name: 'txtcartridge-0.54.6408.pkg',
+              url: 'https://cartridges.machinefabric.com/txtcartridge/0.54.6408/txtcartridge-0.54.6408.pkg',
               sha256: 'abc123',
               size: 821000
             }
@@ -1725,13 +1739,17 @@ function test320_cartridgeInfoConstruction() {
     description: 'A test',
     teamId: 'TEAM123',
     signedAt: '2026-01-01',
-    caps: [{urn: 'cap:in="media:void";op=test;out="media:void"', title: 'Test', description: ''}],
+    cap_groups: [{
+      name: 'test-group',
+      adapter_urns: ['media:void'],
+      caps: [{urn: 'cap:in="media:void";op=test;out="media:void"', title: 'Test', description: ''}]
+    }],
     versions: {
       '1.0.0': {
         releaseDate: '2026-01-01',
         changelog: ['Initial'],
         minAppVersion: '1.0.0',
-        builds: [{platform: 'darwin-arm64', package: {name: 'test-1.0.0.pkg', sha256: 'abc123', size: 100}}]
+        builds: [{platform: 'darwin-arm64', package: {name: 'test-1.0.0.pkg', url: 'https://cartridges.machinefabric.com/testcartridge/1.0.0/test-1.0.0.pkg', sha256: 'abc123', size: 100}}]
       }
     },
     availableVersions: ['1.0.0']
@@ -1739,31 +1757,32 @@ function test320_cartridgeInfoConstruction() {
   const cartridge = new CartridgeInfo(data);
   assert(cartridge.id === 'testcartridge', 'ID should match');
   assert(cartridge.teamId === 'TEAM123', 'Team ID should match');
-  assert(cartridge.caps.length === 1, 'Should have 1 cap');
-  assert(cartridge.caps[0].urn === 'cap:in="media:void";op=test;out="media:void"', 'Cap URN should match');
+  assert(cartridge.cap_groups.length === 1, 'Should have 1 cap_group');
+  assert(cartridge.cap_groups[0].caps[0].urn === 'cap:in="media:void";op=test;out="media:void"', 'Cap URN should match');
+  assert(cartridge.allCaps().length === 1, 'allCaps() should return 1 cap');
 }
 
 // TEST321: CartridgeInfo.is_signed() returns true when signature is present
 function test321_cartridgeInfoIsSigned() {
-  const signed = new CartridgeInfo({id: 'test', teamId: 'TEAM', signedAt: '2026-01-01', caps: []});
+  const signed = new CartridgeInfo({id: 'test', teamId: 'TEAM', signedAt: '2026-01-01', cap_groups: []});
   assert(signed.isSigned() === true, 'Cartridge with teamId and signedAt should be signed');
 
-  const unsigned1 = new CartridgeInfo({id: 'test', teamId: '', signedAt: '2026-01-01', caps: []});
+  const unsigned1 = new CartridgeInfo({id: 'test', teamId: '', signedAt: '2026-01-01', cap_groups: []});
   assert(unsigned1.isSigned() === false, 'Cartridge without teamId should not be signed');
 
-  const unsigned2 = new CartridgeInfo({id: 'test', teamId: 'TEAM', signedAt: '', caps: []});
+  const unsigned2 = new CartridgeInfo({id: 'test', teamId: 'TEAM', signedAt: '', cap_groups: []});
   assert(unsigned2.isSigned() === false, 'Cartridge without signedAt should not be signed');
 }
 
 // TEST322: CartridgeInfo.build_for_platform() returns the build matching the current platform
 function test322_cartridgeInfoBuildForPlatform() {
   const withBuilds = new CartridgeInfo({
-    id: 'test', version: '1.0.0', caps: [],
+    id: 'test', version: '1.0.0', cap_groups: [],
     versions: {
       '1.0.0': {
         builds: [
-          {platform: 'darwin-arm64', package: {name: 'test-darwin.pkg', sha256: 'abc', size: 100}},
-          {platform: 'linux-x86_64', package: {name: 'test-linux.pkg', sha256: 'def', size: 200}}
+          {platform: 'darwin-arm64', package: {name: 'test-darwin.pkg', url: 'https://cartridges.machinefabric.com/test/1.0.0/test-darwin.pkg', sha256: 'abc', size: 100}},
+          {platform: 'linux-x86_64', package: {name: 'test-linux.pkg', url: 'https://cartridges.machinefabric.com/test/1.0.0/test-linux.pkg', sha256: 'def', size: 200}}
         ]
       }
     },
@@ -1784,7 +1803,7 @@ function test322_cartridgeInfoBuildForPlatform() {
   assert(platforms.includes('darwin-arm64'), 'Should include darwin-arm64');
   assert(platforms.includes('linux-x86_64'), 'Should include linux-x86_64');
 
-  const noBuilds = new CartridgeInfo({id: 'test', version: '1.0.0', caps: [], versions: {}, availableVersions: []});
+  const noBuilds = new CartridgeInfo({id: 'test', version: '1.0.0', cap_groups: [], versions: {}, availableVersions: []});
   assert(noBuilds.buildForPlatform('darwin-arm64') === null, 'Should return null when no versions');
   assert(noBuilds.availablePlatforms().length === 0, 'Should have no platforms');
 }
@@ -1837,8 +1856,9 @@ function test324_cartridgeRepoServerTransformToArray() {
   assert(pdf.versions['0.81.5325'].builds[0].package.sha256 === '9b68724eb9220ecf01e8ed4f5f80c594fbac2239bc5bf675005ec882ecc5eba0', 'Should have package SHA256');
   assert(Array.isArray(pdf.availableVersions), 'Should have availableVersions array');
   assert(pdf.availableVersions.includes('0.81.5325'), 'Should include latest version');
-  assert(Array.isArray(pdf.caps), 'Should have caps array');
-  assert(pdf.caps.length === 2, 'Should have 2 caps');
+  assert(Array.isArray(pdf.cap_groups), 'Should have cap_groups array');
+  assert(pdf.cap_groups.length === 1, 'Should have 1 cap_group');
+  assert(pdf.cap_groups[0].caps.length === 2, 'Should have 2 caps in the group');
 }
 
 // TEST325: CartridgeRepoServer.get_cartridges() returns all parsed cartridges
@@ -1933,7 +1953,12 @@ function test331_cartridgeRepoClientGetSuggestions() {
 
   assert(suggestions.length === 1, 'Should find 1 suggestion');
   assert(suggestions[0].cartridgeId === 'pdfcartridge', 'Should suggest pdfcartridge');
-  assert(suggestions[0].capUrn === disbindCap, 'Should have correct cap URN');
+  // The returned capUrn is the canonical (normalized) form. Compare via
+  // tagged-URN equivalence rather than string equality so a tag-order
+  // difference between the request and the canonical form is tolerated.
+  const requested = CapUrn.fromString(disbindCap);
+  const returned = CapUrn.fromString(suggestions[0].capUrn);
+  assert(returned.isEquivalent(requested), 'Should have equivalent cap URN');
   assert(suggestions[0].capTitle === 'Disbind PDF', 'Should have cap title');
 }
 

package/package.json

@@ -40,5 +40,5 @@
     "pretest": "npm run build:parser",
     "test": "node capdag.test.js"
   },
-  "version": "0.146.323"
+  "version": "0.149.334"
 }