canary-test-cli 7.2.0 → 8.0.0

package/dist/engine/skills-cli.js

@@ -71,52 +71,68 @@ function reportEmptyDiscovery(registry, deps) {
             'make them appear. Reinstall, or run from a Canary checkout.');
     }
 }
+/**
+ * Print one source tier: a separating blank line only when an earlier tier
+ * printed, then the header, then its skills. Split out of `listCmd` to pay
+ * down its complexity; every helper here stays at or under the perf-ratchet
+ * warning threshold (10) so the paydown adds no new finding identity.
+ */
+function printTier(deps, header, skills, verbose, printedAbove) {
+    if (printedAbove)
+        deps.out('');
+    deps.out(header);
+    for (const skill of skills)
+        deps.out(formatSkill(skill, verbose));
+}
+function byOverlayName(a, b) {
+    return overlayName(a).localeCompare(overlayName(b));
+}
+/** Overlay skills print one header per overlay, groups sorted by name. */
+function printOverlayGroups(deps, overlay, verbose, printedAbove) {
+    let above = printedAbove;
+    let cur = null;
+    for (const skill of [...overlay].sort(byOverlayName)) {
+        const oname = overlayName(skill);
+        if (oname !== cur) {
+            if (above)
+                deps.out('');
+            deps.out(`${pc.bold('Overlay skills')} ${pc.dim(`(${oname} ${EM_DASH} override bundled):`)}`);
+            cur = oname;
+            above = true;
+        }
+        deps.out(formatSkill(skill, verbose));
+    }
+}
 function listCmd(opts, deps) {
-    const verbose = opts.verbose ?? false;
+    const verbose = opts.verbose === true;
     const registry = deps.makeSkillRegistry();
     const skills = registry.discover();
     if (skills.length === 0) {
         reportEmptyDiscovery(registry, deps);
         return;
     }
-    const bundled = skills.filter((s) => s.source === 'bundled');
-    const overlay = skills.filter((s) => s.source === 'overlay');
-    const globalSkills = skills.filter((s) => s.source === 'global');
-    const local = skills.filter((s) => s.source === 'local');
+    const bySource = (source) => skills.filter((s) => s.source === source);
+    const bundled = bySource('bundled');
+    const overlay = bySource('overlay');
+    const globalSkills = bySource('global');
+    const local = bySource('local');
+    let printed = false;
     if (bundled.length) {
-        deps.out(pc.bold('Bundled skills:'));
-        for (const skill of bundled)
-            deps.out(formatSkill(skill, verbose));
+        printTier(deps, pc.bold('Bundled skills:'), bundled, verbose, printed);
+        printed = true;
     }
     if (overlay.length) {
-        const sorted = [...overlay].sort((a, b) => overlayName(a).localeCompare(overlayName(b)));
-        let idx = 0;
-        let cur = null;
-        for (const skill of sorted) {
-            const oname = overlayName(skill);
-            if (oname !== cur) {
-                if (bundled.length || idx > 0)
-                    deps.out('');
-                deps.out(`${pc.bold('Overlay skills')} ${pc.dim(`(${oname} ${EM_DASH} override bundled):`)}`);
-                cur = oname;
-                idx += 1;
-            }
-            deps.out(formatSkill(skill, verbose));
-        }
+        printOverlayGroups(deps, overlay, verbose, printed);
+        printed = true;
     }
     if (globalSkills.length) {
-        if (bundled.length || overlay.length)
-            deps.out('');
-        deps.out(`${pc.bold('Global skills')} ${pc.dim(`(~/.canary/skills/ ${EM_DASH} override overlay):`)}`);
-        for (const skill of globalSkills)
-            deps.out(formatSkill(skill, verbose));
+        const header = `${pc.bold('Global skills')} ${pc.dim(`(~/.canary/skills/ ${EM_DASH} override overlay):`)}`;
+        printTier(deps, header, globalSkills, verbose, printed);
+        printed = true;
     }
     if (local.length) {
-        if (bundled.length || overlay.length || globalSkills.length)
-            deps.out('');
-        deps.out(`${pc.bold('Local overlay skills')} ${pc.dim('(override global):')}`);
-        for (const skill of local)
-            deps.out(formatSkill(skill, verbose));
+        const header = `${pc.bold('Local overlay skills')} ${pc.dim('(override global):')}`;
+        printTier(deps, header, local, verbose, printed);
     }
 }
 /**

package/dist/engine/workflow-cli.js

@@ -79,29 +79,94 @@ async function discoverCmd(opts, deps) {
         throw new CliExitError(1);
     }
 }
-function showCmd(opts, deps) {
-    const wd = deps.makeWorkflowDiscovery();
+/**
+ * Which project keys `show` should report on.
+ *
+ * `--project` names one; otherwise every cached `.canary/workflow-*.json` is
+ * listed. An unreadable `.canary` yields no keys rather than throwing: a
+ * missing cache is the ordinary first-run state, not an error.
+ */
+function resolveProjectKeys(opts, deps) {
+    if (opts.project)
+        return [opts.project];
     let keys = [];
-    if (opts.project) {
-        keys = [opts.project];
+    const canaryDir = join(deps.cwd(), '.canary');
+    if (existsSync(canaryDir)) {
+        try {
+            keys = readdirSync(canaryDir)
+                .filter((f) => f.startsWith('workflow-') && f.endsWith('.json'))
+                .map((f) => f.slice('workflow-'.length, -'.json'.length));
+        }
+        catch {
+            keys = [];
+        }
     }
-    else {
-        const canaryDir = join(deps.cwd(), '.canary');
-        if (existsSync(canaryDir)) {
-            try {
-                keys = readdirSync(canaryDir)
-                    .filter((f) => f.startsWith('workflow-') && f.endsWith('.json'))
-                    .map((f) => f.slice('workflow-'.length, -'.json'.length));
-            }
-            catch {
-                keys = [];
-            }
+    if (keys.length === 0) {
+        deps.out(pc.yellow('No cached workflow mappings found.'));
+        throw new CliExitError(0);
+    }
+    return keys;
+}
+/** One mapping as JSON: the whole document, or just its semantic roles. */
+function mappingAsJson(mapping, rolesOnly) {
+    if (!rolesOnly)
+        return mapping.toJson();
+    const rolesDict = {};
+    for (const [r, sr] of Object.entries(mapping.semantic_roles)) {
+        rolesDict[r] = { status_name: sr.status_name, issue_type: sr.issue_type };
+    }
+    return jsonIndent2(rolesDict);
+}
+/** `role -> status` lines, indented under a heading. Shared by both modes. */
+function printSemanticRoles(roles, lead, deps) {
+    deps.out(`${lead}${pc.bold('Semantic roles:')}`);
+    for (const [role, sr] of Object.entries(roles)) {
+        deps.out(`    ${role.padEnd(20)} ${'\u{2192}'} '${sr.status_name}'  ${pc.dim(`(${sr.issue_type})`)}`);
+    }
+}
+/** Each issue type, its statuses, and its transitions. */
+function printIssueTypes(issueTypes, deps) {
+    for (const it of issueTypes) {
+        deps.out(`\n  ${pc.bold(it.name)}`);
+        for (const s of it.statuses) {
+            deps.out(`    [${s.category}] ${s.name}`);
         }
-        if (keys.length === 0) {
-            deps.out(pc.yellow('No cached workflow mappings found.'));
-            throw new CliExitError(0);
+        if (it.transitions.length === 0)
+            continue;
+        deps.out('    Transitions:');
+        for (const t of it.transitions) {
+            deps.out(`      ${t.from_status} ${'\u{2192}'} ${t.to_status}  ${pc.dim(`(${t.name})`)}`);
         }
     }
+}
+/**
+ * One cached mapping, rendered for a human.
+ *
+ * Extracted from `showCmd`, which had grown to hold key resolution, JSON
+ * emission and this rendering at once -- and carried the semantic-roles block
+ * TWICE, once per mode, which is why the two had already drifted in their
+ * indentation.
+ */
+function printMapping(key, mapping, rolesOnly, deps) {
+    const confirmedTag = mapping.role_annotations_confirmed
+        ? pc.green('confirmed')
+        : pc.yellow('unconfirmed');
+    deps.out(`\n${pc.bold(key)}  ${pc.dim(`source=${mapping.source}  discovered=${mapping.discovered_at}  roles=${confirmedTag}`)}`);
+    const hasRoles = Object.keys(mapping.semantic_roles).length > 0;
+    if (rolesOnly) {
+        if (hasRoles)
+            printSemanticRoles(mapping.semantic_roles, '  ', deps);
+        else
+            deps.out(`  ${pc.yellow('No semantic roles resolved yet.')}`);
+        return;
+    }
+    printIssueTypes(mapping.issue_types, deps);
+    if (hasRoles)
+        printSemanticRoles(mapping.semantic_roles, '\n  ', deps);
+}
+function showCmd(opts, deps) {
+    const wd = deps.makeWorkflowDiscovery();
+    const keys = resolveProjectKeys(opts, deps);
     let anyFound = false;
     for (const key of keys) {
         const mapping = wd.show(key);
@@ -111,55 +176,10 @@ function showCmd(opts, deps) {
         }
         anyFound = true;
         if (opts.json) {
-            if (opts.rolesOnly) {
-                const rolesDict = {};
-                for (const [r, sr] of Object.entries(mapping.semantic_roles)) {
-                    rolesDict[r] = {
-                        status_name: sr.status_name,
-                        issue_type: sr.issue_type,
-                    };
-                }
-                deps.out(jsonIndent2(rolesDict));
-            }
-            else {
-                deps.out(mapping.toJson());
-            }
-            continue;
-        }
-        const confirmedTag = mapping.role_annotations_confirmed
-            ? pc.green('confirmed')
-            : pc.yellow('unconfirmed');
-        deps.out(`\n${pc.bold(key)}  ${pc.dim(`source=${mapping.source}  discovered=${mapping.discovered_at}  roles=${confirmedTag}`)}`);
-        if (opts.rolesOnly) {
-            if (Object.keys(mapping.semantic_roles).length) {
-                deps.out(`  ${pc.bold('Semantic roles:')}`);
-                for (const [role, sr] of Object.entries(mapping.semantic_roles)) {
-                    deps.out(`    ${role.padEnd(20)} ${'\u{2192}'} '${sr.status_name}'  ${pc.dim(`(${sr.issue_type})`)}`);
-                }
-            }
-            else {
-                deps.out(`  ${pc.yellow('No semantic roles resolved yet.')}`);
-            }
+            deps.out(mappingAsJson(mapping, opts.rolesOnly === true));
             continue;
         }
-        for (const it of mapping.issue_types) {
-            deps.out(`\n  ${pc.bold(it.name)}`);
-            for (const s of it.statuses) {
-                deps.out(`    [${s.category}] ${s.name}`);
-            }
-            if (it.transitions.length) {
-                deps.out('    Transitions:');
-                for (const t of it.transitions) {
-                    deps.out(`      ${t.from_status} ${'\u{2192}'} ${t.to_status}  ${pc.dim(`(${t.name})`)}`);
-                }
-            }
-        }
-        if (Object.keys(mapping.semantic_roles).length) {
-            deps.out(`\n  ${pc.bold('Semantic roles:')}`);
-            for (const [role, sr] of Object.entries(mapping.semantic_roles)) {
-                deps.out(`    ${role.padEnd(20)} ${'\u{2192}'} '${sr.status_name}'  ${pc.dim(`(${sr.issue_type})`)}`);
-            }
-        }
+        printMapping(key, mapping, opts.rolesOnly === true, deps);
     }
     if (!anyFound) {
         throw new CliExitError(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canary-test-cli",
-  "version": "7.2.0",
+  "version": "8.0.0",
   "description": "Canary — AI-powered test automation agent",
   "license": "MIT",
   "repository": {