@kb-labs/cli-commands 2.15.0 → 2.17.0

package/dist/index.js

@@ -1112,10 +1112,13 @@ var InMemoryRegistry = class {
    * Returns the colliding key if found, null otherwise.
    */
   _findSystemCollision(manifest, canonicalId) {
-    if (this.systemCommands.has(canonicalId)) return canonicalId;
-    if (this.systemCommands.has(manifest.id)) return manifest.id;
+    if (this.systemCommands.has(canonicalId)) {
+      return canonicalId;
+    }
     const space = canonicalId.replace(/:/g, " ");
-    if (this.systemCommands.has(space)) return space;
+    if (this.systemCommands.has(space)) {
+      return space;
+    }
     return null;
   }
   /**
@@ -3761,23 +3764,24 @@ async function registerManifests(discoveryResults, registry2, options = {}) {
         } catch (hookError) {
           log3.debug(`Lifecycle hooks unavailable for ${manifest.id}: ${hookError.message}`);
         }
-        const existing = globalIds.get(manifest.id);
+        const canonicalKey = manifest.group ? `${manifest.group}:${manifest.id}` : manifest.id;
+        const existing = globalIds.get(canonicalKey);
         if (existing) {
           const collision = checkCollision(manifest, existing, result.source, namespace);
           if (collision.shouldShadow) {
             existing.shadowed = true;
-            globalIds.set(manifest.id, cmd);
+            globalIds.set(canonicalKey, cmd);
             if (logLevel === "info" || logLevel === "debug") {
-              log3.info(`${manifest.id} from ${result.source} shadows ${existing.source} version`);
+              log3.info(`${canonicalKey} from ${result.source} shadows ${existing.source} version`);
             }
           } else {
             cmd.shadowed = true;
             if (logLevel === "info" || logLevel === "debug") {
-              log3.info(`${manifest.id} from ${result.source} shadowed by ${existing.source} version`);
+              log3.info(`${canonicalKey} from ${result.source} shadowed by ${existing.source} version`);
             }
           }
         } else {
-          globalIds.set(manifest.id, cmd);
+          globalIds.set(canonicalKey, cmd);
         }
         const aliasesToCheck = manifest.aliases || [];
         for (const alias of aliasesToCheck) {