@aperant/framework 0.6.7 → 0.7.3

package/dist/cli/util/aperant-section.mjs

@@ -0,0 +1,127 @@
+/**
+ * util/aperant-section.mjs — generator for the CLAUDE.md / AGENTS.md
+ * "## Aperant Framework" section (FRAMEWORK-BUG-023).
+ *
+ * Replaces the previously-hardcoded `APT_SECTION` constant in copy.mjs.
+ * The skill TABLE is rebuilt from `discoverSkills` (filesystem source of
+ * truth — same helper the router uses at runtime) so install and runtime
+ * can never disagree about the catalog.
+ *
+ * Curated-doc risk: the appendix template
+ * (`templates/aperant-claude-md-appendix.md`) still contains hand-written
+ * sub-sections — "Fast Path Guarantee", "Discoverability —
+ * `apt-tools modes list`", "Feature Registry", "Config". These are small
+ * (~30 lines), rarely change, and rot would be visible (sections about
+ * non-existent features). Acceptable tradeoff per plan §Approach (c).
+ */
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { getTrustedSkillSources } from '../config/load.mjs';
+import { discoverSkills } from '../route/skill-discover.mjs';
+const SECTION_START = '<!-- APT:framework-start -->';
+const SECTION_END = '<!-- APT:framework-end -->';
+const SECTION_HEADING = '## Aperant Framework';
+const APPENDIX_REL_PATH = ['templates', 'aperant-claude-md-appendix.md'];
+/**
+ * Escape a SKILL `description` for safe inclusion as a markdown table cell.
+ * The only character we have to defend against is the pipe (`|`) — it
+ * terminates the table column. `apt:triage` ships with a literal `|` in
+ * its description, so this is a live case, not a theoretical one.
+ *
+ * @param {string} text
+ * @returns {string}
+ */
+function escapePipes(text) {
+    return text.replace(/\|/g, '\\|');
+}
+/**
+ * Deterministic sort: the bare `apt` router skill first, then ASCII-sorted
+ * by `name`. The router goes first so the generated table mirrors the user's
+ * mental model — the entry point, then everything reachable from it.
+ *
+ * @param {{ name: string }} a
+ * @param {{ name: string }} b
+ * @returns {number}
+ */
+function sortSkills(a, b) {
+    if (a.name === 'apt' && b.name !== 'apt')
+        return -1;
+    if (b.name === 'apt' && a.name !== 'apt')
+        return 1;
+    return a.name.localeCompare(b.name);
+}
+/**
+ * Build the full "## Aperant Framework" section, wrapped in the
+ * `<!-- APT:framework-* -->` markers.
+ *
+ * @param {Object} opts
+ * @param {string} opts.canonicalRoot   Absolute path to the framework root
+ *                                       (the directory that contains
+ *                                       `templates/aperant-claude-md-appendix.md`).
+ * @param {string} opts.targetDir       Project root (passed to discoverSkills).
+ * @param {string} [opts.cli]           Host CLI label (forwarded to
+ *                                       getTrustedSkillSources so the install
+ *                                       root for the runtime is included).
+ * @returns {string}                     The full section, including markers
+ *                                       and trailing newline before the
+ *                                       end-marker. No leading newline.
+ */
+export function buildAptSection({ canonicalRoot, targetDir, cli }) {
+    const trustedSkillSources = getTrustedSkillSources(targetDir, cli);
+    const discovered = discoverSkills({ targetDir, trustedSkillSources });
+    const skills = discovered.skills
+        .filter((s) => s.user_invocable === true && s.internal === false)
+        .slice()
+        .sort(sortSkills);
+    const rows = skills.map((s) => `| \`/${s.name}\` | ${escapePipes(s.description)} |`);
+    const tableBlock = [
+        '### Available Skills',
+        '| Skill | Description |',
+        '|-------|-------------|',
+        ...rows,
+    ].join('\n');
+    const appendixPath = join(canonicalRoot, ...APPENDIX_REL_PATH);
+    let appendix;
+    try {
+        appendix = readFileSync(appendixPath, 'utf-8').replace(/\n+$/, '');
+    }
+    catch (cause) {
+        const err = new Error(`aperant-section: template not found at ${appendixPath} — re-install the framework package`, { cause });
+        err.code = 'aperant-section.template-missing';
+        throw err;
+    }
+    const body = [SECTION_HEADING, '', appendix, '', tableBlock].join('\n');
+    return `${SECTION_START}\n${body}\n${SECTION_END}`;
+}
+/**
+ * Extract the `/apt:<slug>` (or bare `/apt`) row IDs from the
+ * `<!-- APT:framework-* -->` section of an existing instruction file.
+ * Returns `[]` when the file has no APT section.
+ *
+ * Used by `injectInstructionFile` to detect foreign rows that would be
+ * silently clobbered by a regeneration — see `--force-overwrite-catalog`.
+ *
+ * @param {string} text   Full instruction-file contents.
+ * @returns {string[]}    Row IDs in file order, e.g. `['/apt', '/apt:quick', …]`.
+ */
+export function extractAptSectionRowIds(text) {
+    const match = text.match(/<!-- APT:framework-start -->([\s\S]*?)<!-- APT:framework-end -->/);
+    if (!match)
+        return [];
+    // Strip HTML comments (including multiline) before scanning for row IDs so
+    // that commented-out example rows don't trigger false-positive foreign-row exits.
+    const section = match[1].replace(/<!--[\s\S]*?-->/g, '');
+    const ids = [];
+    // Match table rows whose first cell is `/apt` or `/apt:<slug>` wrapped in
+    // backticks. The leading `|` plus optional whitespace anchors us to a
+    // markdown table cell; the trailing backtick + ` |` anchors the column
+    // boundary so we don't match prose mentions like "the `/apt` router".
+    const rowRe = /^\|\s*`(\/apt(?::[a-z0-9-]+)?)`\s*\|/gm;
+    let m = rowRe.exec(section);
+    while (m !== null) {
+        ids.push(m[1]);
+        m = rowRe.exec(section);
+    }
+    return ids;
+}
+//# sourceMappingURL=aperant-section.mjs.map

package/dist/cli/util/aperant-section.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"aperant-section.mjs","sourceRoot":"","sources":["../../../src/cli/util/aperant-section.mjs"],"names":[],"mappings":"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"}

package/dist/cli/util/copy.d.mts

@@ -1,3 +1,30 @@
 export function copyDirRecursive(src: any, dest: any): void;
-export function injectInstructionFile(filePath: any): "updated" | "created";
+/**
+ * Write the (already-generated) APT section into `filePath`. Creates the
+ * file if missing; replaces the section in-place if the markers are
+ * present.
+ *
+ * FRAMEWORK-BUG-023 — before overwriting an existing section, extract the
+ * row IDs in the on-disk file and compare to the row IDs in the freshly
+ * generated section. If the file contains rows that are NOT in the
+ * generated set ("foreign rows"), the regen would silently clobber them.
+ * In that case we abort and let the caller surface a structured error.
+ * The `--force-overwrite-catalog` escape hatch flips `force: true`.
+ *
+ * @param {string} filePath
+ * @param {Object} opts
+ * @param {string} opts.aptSection   Output of buildAptSection() — wrapped
+ *                                    in `<!-- APT:framework-* -->` markers.
+ * @param {boolean} [opts.force=false]
+ *                                    Bypass the foreign-row check.
+ * @returns {{ status: 'created' | 'updated' | 'aborted-foreign-rows', written: boolean, foreignRowIds?: string[] }}
+ */
+export function injectInstructionFile(filePath: string, { aptSection, force }: {
+    aptSection: string;
+    force?: boolean | undefined;
+}): {
+    status: "created" | "updated" | "aborted-foreign-rows";
+    written: boolean;
+    foreignRowIds?: string[];
+};
 //# sourceMappingURL=copy.d.mts.map

package/dist/cli/util/copy.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"copy.d.mts","sourceRoot":"","sources":["../../../src/cli/util/copy.mjs"],"names":[],"mappings":"AAiBA,4DAWC;AAiDD,4EAiBC"}
+{"version":3,"file":"copy.d.mts","sourceRoot":"","sources":["../../../src/cli/util/copy.mjs"],"names":[],"mappings":"AAwBA,4DAWC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,gDARW,MAAM,yBAEd;IAAqB,UAAU,EAAvB,MAAM;IAES,KAAK;CAE5B,GAAU;IAAE,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,sBAAsB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CA0BlH"}

package/dist/cli/util/copy.mjs

@@ -1,11 +1,18 @@
 /**
  * copy.mjs — filesystem copy + instruction-file injection helpers (C29).
  *
- * `copyDirRecursive` is a pure leaf; `injectInstructionFile` owns the
- * CLAUDE.md / AGENTS.md "<!-- APT:framework-* -->" section template.
+ * `copyDirRecursive` is a pure leaf. `injectInstructionFile` owns the
+ * CLAUDE.md / AGENTS.md "<!-- APT:framework-* -->" section write path.
+ *
+ * The APT section TEXT is no longer assembled here — it is generated by
+ * `util/aperant-section.mjs#buildAptSection` and passed in (FRAMEWORK-BUG-023).
+ * Callers compute the section once (from the filesystem skill catalog) and
+ * hand it to this helper. The defensive foreign-row check stays in this
+ * file so the read/compare/write happens atomically against `filePath`.
  */
 import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, } from 'node:fs';
 import { join } from 'node:path';
+import { extractAptSectionRowIds } from './aperant-section.mjs';
 export function copyDirRecursive(src, dest) {
     mkdirSync(dest, { recursive: true });
     for (const entry of readdirSync(src, { withFileTypes: true })) {
@@ -19,63 +26,44 @@ export function copyDirRecursive(src, dest) {
         }
     }
 }
-const APT_SECTION = `<!-- APT:framework-start -->
-## Aperant Framework
-
-This project uses the [Aperant Framework](https://github.com/Mikalsen-AI/aperant-cloud-desktop/tree/main/packages/framework) for AI-assisted development.
-
-### Available Skills
-| Skill | Description |
-|-------|-------------|
-| \`/apt\` | Smart router — auto-detects context, routes to the right skill |
-| \`/apt:quick\` | Fast task execution — skip planning, go straight to implementation |
-| \`/apt:discuss\` | Interactive decision-making — assumptions, gray areas, power mode |
-| \`/apt:debug\` | Systematic debugging with persistent state across context resets |
-| \`/apt:scan\` | Scan codebase to build/refresh the feature registry (recommended after setup) |
-| \`/apt:plan\` | Analyze a task, investigate codebase, produce spec + implementation plan |
-| \`/apt:execute\` | Implement subtasks from a plan with atomic commits |
-| \`/apt:verify\` | Score implementation on 4 dimensions (correctness, completeness, quality, coverage) |
-| \`/apt:verify-proof\` | Visual proof verification — screenshots, video, HTML report with feature checklists |
-| \`/apt:review\` | 6-pass inline code review (logic / security / quality / architecture / performance / docs-coherence) with auto-fix pipeline |
-| \`/apt:pr-review\` | Multi-agent PR review — 6 parallel specialists, validator, fixer, self-reviewer (owned / external authorship) |
-| \`/apt:run\` | Full pipeline: plan → execute → verify → review |
-| \`/apt:roundtable\` | 10-agent structured debate for complex decisions |
-| \`/apt:stress-test\` | Scenario simulation to catch gaps in plans |
-| \`/apt:ship\` | Create PR with QA scores and decision traceability |
-| \`/apt:pause\` | Human-initiated session handoff — save state when YOU need to stop (not for agent-initiated bailouts) |
-| \`/apt:resume\` | Restore context from a paused session and route to next action |
-| \`/apt:docs\` | Generate/update documentation verified against the actual codebase |
-| \`/apt:setup\` | Change framework preferences (verification style, multi-model, branching) |
-
-### Feature Registry
-The feature registry (\`.aperant/features/\`) is a living inventory of every interactive
-feature in the app. It's the source of truth for what to verify and review.
-
-- **Created by:** \`/apt:scan\` (initial scan or full refresh)
-- **Updated by:** \`/apt:execute\` post-step (\`apt-tools features-audit --apply-stubs\` auto-registers new UI/core/hook/IPC files per the docs-coherence policy)
-- **Consumed by:** \`/apt:verify-proof\` (generates test cases from registry)
-- **Checked by:** \`/apt:review\` Pass 6 (flags unregistered new components, applies stubs for auto-update policies)
-
-Run \`/apt:scan\` after setting up Aperant on a brownfield project, or after major changes.
-
-### Config
-- Settings: \`.aperant/config.json\` (run \`/apt:setup\` to change)
-- Features: \`.aperant/features/\` (feature registry -- run \`/apt:scan\` to create)
-- State: \`.aperant/state.json\` (execution state)
-- Evidence: \`.aperant/proof/\` (proof reports and screenshots)
-- Prompts: \`.aperant/prompts/\` (agent prompt templates)
-<!-- APT:framework-end -->`;
-export function injectInstructionFile(filePath) {
+/**
+ * Write the (already-generated) APT section into `filePath`. Creates the
+ * file if missing; replaces the section in-place if the markers are
+ * present.
+ *
+ * FRAMEWORK-BUG-023 — before overwriting an existing section, extract the
+ * row IDs in the on-disk file and compare to the row IDs in the freshly
+ * generated section. If the file contains rows that are NOT in the
+ * generated set ("foreign rows"), the regen would silently clobber them.
+ * In that case we abort and let the caller surface a structured error.
+ * The `--force-overwrite-catalog` escape hatch flips `force: true`.
+ *
+ * @param {string} filePath
+ * @param {Object} opts
+ * @param {string} opts.aptSection   Output of buildAptSection() — wrapped
+ *                                    in `<!-- APT:framework-* -->` markers.
+ * @param {boolean} [opts.force=false]
+ *                                    Bypass the foreign-row check.
+ * @returns {{ status: 'created' | 'updated' | 'aborted-foreign-rows', written: boolean, foreignRowIds?: string[] }}
+ */
+export function injectInstructionFile(filePath, { aptSection, force = false }) {
     const existing = existsSync(filePath) ? readFileSync(filePath, 'utf-8') : '';
     if (existing.includes('<!-- APT:framework-start -->')) {
-        // Update existing section in-place
-        const updated = existing.replace(/<!-- APT:framework-start -->[\s\S]*?<!-- APT:framework-end -->/, APT_SECTION);
+        if (!force) {
+            const existingIds = new Set(extractAptSectionRowIds(existing));
+            const generatedIds = new Set(extractAptSectionRowIds(aptSection));
+            const foreignRowIds = [...existingIds].filter((id) => !generatedIds.has(id));
+            if (foreignRowIds.length > 0) {
+                return { status: 'aborted-foreign-rows', written: false, foreignRowIds };
+            }
+        }
+        const updated = existing.replace(/<!-- APT:framework-start -->[\s\S]*?<!-- APT:framework-end -->/, aptSection);
         writeFileSync(filePath, updated, 'utf-8');
-        return 'updated';
+        return { status: 'updated', written: true };
     }
-    // Append
+    // Append (greenfield create — no foreign-row concern).
     const separator = existing.length > 0 ? '\n\n' : '';
-    writeFileSync(filePath, existing + separator + APT_SECTION + '\n', 'utf-8');
-    return 'created';
+    writeFileSync(filePath, existing + separator + aptSection + '\n', 'utf-8');
+    return { status: 'created', written: true };
 }
 //# sourceMappingURL=copy.mjs.map

package/dist/cli/util/copy.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"copy.mjs","sourceRoot":"","sources":["../../../src/cli/util/copy.mjs"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACN,YAAY,EACZ,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACZ,aAAa,GACb,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,MAAM,UAAU,gBAAgB,CAAC,GAAG,EAAE,IAAI;IACzC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACpC,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACpC,CAAC;aAAM,CAAC;YACP,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAChC,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BA6CO,CAAA;AAE3B,MAAM,UAAU,qBAAqB,CAAC,QAAQ;IAC7C,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAE5E,IAAI,QAAQ,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,CAAC;QACvD,mCAAmC;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAC/B,gEAAgE,EAChE,WAAW,CACX,CAAA;QACD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QACzC,OAAO,SAAS,CAAA;IACjB,CAAC;IAED,SAAS;IACT,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;IACnD,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,IAAI,EAAE,OAAO,CAAC,CAAA;IAC3E,OAAO,SAAS,CAAA;AACjB,CAAC"}
+{"version":3,"file":"copy.mjs","sourceRoot":"","sources":["../../../src/cli/util/copy.mjs"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EACN,YAAY,EACZ,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACZ,aAAa,GACb,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,MAAM,UAAU,gBAAgB,CAAC,GAAG,EAAE,IAAI;IACzC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACpC,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACpC,CAAC;aAAM,CAAC;YACP,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAChC,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,GAAG,KAAK,EAAE;IAC5E,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAE5E,IAAI,QAAQ,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAA;YAC9D,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC,CAAA;YACjE,MAAM,aAAa,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAC5E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAA;YACzE,CAAC;QACF,CAAC;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAC/B,gEAAgE,EAChE,UAAU,CACV,CAAA;QACD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QACzC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC5C,CAAC;IAED,uDAAuD;IACvD,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;IACnD,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI,EAAE,OAAO,CAAC,CAAA;IAC1E,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC5C,CAAC"}

package/dist/cli/util/semver.d.mts

@@ -0,0 +1,17 @@
+/**
+ * Compare two semver-shape strings. Returns -1 / 0 / 1. Ignores
+ * pre-release + build metadata (sufficient for "min version" checks
+ * where we only care about the MAJOR.MINOR.PATCH triple).
+ *
+ * @param {string} a
+ * @param {string} b
+ * @returns {-1 | 0 | 1}
+ */
+export function compareVersions(a: string, b: string): -1 | 0 | 1;
+/**
+ * util/semver.mjs — shared semver helpers used by route/drift-detect.mjs
+ * and util/version-preflight.mjs. Extracted to avoid duplication (QUA-002).
+ */
+/** Semver-shape pattern — mirrors install/update-chips.mjs:64. */
+export const SEMVER_RE: RegExp;
+//# sourceMappingURL=semver.d.mts.map

package/dist/cli/util/semver.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"semver.d.mts","sourceRoot":"","sources":["../../../src/cli/util/semver.mjs"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH,mCAJW,MAAM,KACN,MAAM,GACJ,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAYtB;AA3BD;;;GAGG;AAEH,kEAAkE;AAClE,+BAAmF"}

package/dist/cli/util/semver.mjs

@@ -0,0 +1,29 @@
+/**
+ * util/semver.mjs — shared semver helpers used by route/drift-detect.mjs
+ * and util/version-preflight.mjs. Extracted to avoid duplication (QUA-002).
+ */
+/** Semver-shape pattern — mirrors install/update-chips.mjs:64. */
+export const SEMVER_RE = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/;
+/**
+ * Compare two semver-shape strings. Returns -1 / 0 / 1. Ignores
+ * pre-release + build metadata (sufficient for "min version" checks
+ * where we only care about the MAJOR.MINOR.PATCH triple).
+ *
+ * @param {string} a
+ * @param {string} b
+ * @returns {-1 | 0 | 1}
+ */
+export function compareVersions(a, b) {
+    const pa = a.split(/[-+]/, 1)[0].split('.').map(Number);
+    const pb = b.split(/[-+]/, 1)[0].split('.').map(Number);
+    for (let i = 0; i < 3; i++) {
+        const av = pa[i] ?? 0;
+        const bv = pb[i] ?? 0;
+        if (av < bv)
+            return -1;
+        if (av > bv)
+            return 1;
+    }
+    return 0;
+}
+//# sourceMappingURL=semver.mjs.map

package/dist/cli/util/semver.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"semver.mjs","sourceRoot":"","sources":["../../../src/cli/util/semver.mjs"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,kEAAkE;AAClE,MAAM,CAAC,MAAM,SAAS,GAAG,0DAA0D,CAAA;AAEnF;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,CAAC,EAAE,CAAC;IACnC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvD,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACrB,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACrB,IAAI,EAAE,GAAG,EAAE;YAAE,OAAO,CAAC,CAAC,CAAA;QACtB,IAAI,EAAE,GAAG,EAAE;YAAE,OAAO,CAAC,CAAA;IACtB,CAAC;IACD,OAAO,CAAC,CAAA;AACT,CAAC"}

package/dist/cli/util/skill-installs.d.mts

@@ -1,14 +1,70 @@
-export function getSkillInstallSurfaces(projectDir: any): {
-    version_file: string;
+/**
+ * @typedef {Object} SkillInstallSurface
+ * @property {string} host                       Backward-compat host id.
+ * @property {string} runtime                    Canonical runtime id (from RUNTIMES).
+ * @property {string} install_root               Absolute path of the runtime install root.
+ * @property {string} manifest_path              Absolute path of apt-file-manifest.json.
+ * @property {string|null} legacy_version_file   Absolute path of the legacy .apt-version stamp, or null.
+ */
+/**
+ * Return one install-surface descriptor per runtime in `RUNTIMES`.
+ *
+ * @param {string} projectDir
+ * @returns {SkillInstallSurface[]}
+ */
+export function getSkillInstallSurfaces(projectDir: string): SkillInstallSurface[];
+/**
+ * @typedef {Object} SkillInstallState
+ * @property {string} host
+ * @property {string} runtime
+ * @property {string} install_root
+ * @property {string} manifest_path
+ * @property {string|null} legacy_version_file
+ * @property {boolean} installed
+ * @property {string|null} installed_version
+ * @property {boolean} stale
+ * @property {'manifest' | 'manifest-malformed' | 'legacy_version_file' | null} source
+ */
+/**
+ * Read each surface's install state. See the file header for the
+ * precedence rules.
+ *
+ * @param {string} projectDir
+ * @param {string} frameworkVersion
+ * @returns {SkillInstallState[]}
+ */
+export function readSkillInstallState(projectDir: string, frameworkVersion: string): SkillInstallState[];
+export type SkillInstallSurface = {
+    /**
+     * Backward-compat host id.
+     */
     host: string;
-    skills_dir: string;
-}[];
-export function readSkillInstallState(projectDir: any, frameworkVersion: any): {
+    /**
+     * Canonical runtime id (from RUNTIMES).
+     */
+    runtime: string;
+    /**
+     * Absolute path of the runtime install root.
+     */
+    install_root: string;
+    /**
+     * Absolute path of apt-file-manifest.json.
+     */
+    manifest_path: string;
+    /**
+     * Absolute path of the legacy .apt-version stamp, or null.
+     */
+    legacy_version_file: string | null;
+};
+export type SkillInstallState = {
+    host: string;
+    runtime: string;
+    install_root: string;
+    manifest_path: string;
+    legacy_version_file: string | null;
     installed: boolean;
     installed_version: string | null;
     stale: boolean;
-    version_file: string;
-    host: string;
-    skills_dir: string;
-}[];
+    source: "manifest" | "manifest-malformed" | "legacy_version_file" | null;
+};
 //# sourceMappingURL=skill-installs.d.mts.map

package/dist/cli/util/skill-installs.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-installs.d.mts","sourceRoot":"","sources":["../../../src/cli/util/skill-installs.mjs"],"names":[],"mappings":"AAOA;;;;IAeC;AAED;;;;;;;IAYC"}
+{"version":3,"file":"skill-installs.d.mts","sourceRoot":"","sources":["../../../src/cli/util/skill-installs.mjs"],"names":[],"mappings":"AA+CA;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,oDAHW,MAAM,GACJ,mBAAmB,EAAE,CAgBjC;AAED;;;;;;;;;;;GAWG;AAEH;;;;;;;GAOG;AACH,kDAJW,MAAM,oBACN,MAAM,GACJ,iBAAiB,EAAE,CAoD/B;;;;;UApGa,MAAM;;;;aACN,MAAM;;;;kBACN,MAAM;;;;mBACN,MAAM;;;;yBACN,MAAM,GAAC,IAAI;;;UA2BX,MAAM;aACN,MAAM;kBACN,MAAM;mBACN,MAAM;yBACN,MAAM,GAAC,IAAI;eACX,OAAO;uBACP,MAAM,GAAC,IAAI;WACX,OAAO;YACP,UAAU,GAAG,oBAAoB,GAAG,qBAAqB,GAAG,IAAI"}

package/dist/cli/util/skill-installs.mjs

@@ -1,34 +1,143 @@
 /**
- * skill-installs.mjs — shared skill install surfaces per host.
+ * skill-installs.mjs — shared skill install surfaces per runtime (BUG-022).
+ *
+ * Source of truth for "what does the framework have installed on this
+ * project, per runtime, and is it current?" — the post-022 implementation
+ * is manifest-aware:
+ *
+ *   1. Per surface, prefer `apt-file-manifest.json` (the v0.6.7+ runtime
+ *      manifest). When present and valid, `framework_version` is the
+ *      authoritative answer.
+ *   2. Manifest present but malformed → reported as `installed: true`,
+ *      `stale: true`, `source: 'manifest-malformed'`. Don't silently
+ *      report healthy.
+ *   3. Else fall back to `legacy_version_file` (the pre-manifest
+ *      `.apt-version` stamp; only defined for codex via
+ *      `LEGACY_INSTALL_PATHS` today). `source: 'legacy_version_file'`.
+ *   4. Else → not installed for this surface.
+ *
+ * The surface array is derived from `RUNTIMES` (single source of truth in
+ * `runtime-detect.mjs`) so adding a new runtime there auto-extends every
+ * downstream diagnostic. The legacy fallback path is only populated for
+ * runtimes that declare a legacy topology in `LEGACY_INSTALL_PATHS`.
+ *
+ * Backward-compat: `host` field stays `'claude-code'` for the claude
+ * runtime (the statusline chip + several other consumers key on this
+ * exact string). The new `runtime` field exposes the descriptor id
+ * (`'claude'`, `'codex'`, …) for callers that want the canonical name.
  */
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync, readFileSync, statSync } from 'node:fs';
 import { join, resolve } from 'node:path';
+import { LEGACY_INSTALL_PATHS } from '../install/legacy-paths.mjs';
+import { MANIFEST_FILENAME, readManifest } from '../install/manifest.mjs';
+import { RUNTIMES } from '../install/runtime-detect.mjs';
+/**
+ * Map a runtime descriptor id to the `host` value historical consumers
+ * expect. The Claude runtime is the only one with a non-identity mapping
+ * (`'claude' → 'claude-code'`) — every other id is its own host string.
+ *
+ * @param {string} runtimeId
+ * @returns {string}
+ */
+function hostFor(runtimeId) {
+    return runtimeId === 'claude' ? 'claude-code' : runtimeId;
+}
+/**
+ * @typedef {Object} SkillInstallSurface
+ * @property {string} host                       Backward-compat host id.
+ * @property {string} runtime                    Canonical runtime id (from RUNTIMES).
+ * @property {string} install_root               Absolute path of the runtime install root.
+ * @property {string} manifest_path              Absolute path of apt-file-manifest.json.
+ * @property {string|null} legacy_version_file   Absolute path of the legacy .apt-version stamp, or null.
+ */
+/**
+ * Return one install-surface descriptor per runtime in `RUNTIMES`.
+ *
+ * @param {string} projectDir
+ * @returns {SkillInstallSurface[]}
+ */
 export function getSkillInstallSurfaces(projectDir) {
     const root = resolve(projectDir);
-    return [
-        {
-            host: 'claude-code',
-            skills_dir: join(root, '.claude', 'skills'),
-        },
-        {
-            host: 'codex',
-            skills_dir: join(root, '.agents', 'skills'),
-        },
-    ].map((surface) => ({
-        ...surface,
-        version_file: join(surface.skills_dir, '.apt-version'),
-    }));
+    return RUNTIMES.map((descriptor) => {
+        const install_root = join(root, descriptor.installRoot);
+        const legacyTopology = LEGACY_INSTALL_PATHS[descriptor.id];
+        const legacy_version_file = legacyTopology ? join(root, legacyTopology.version_file) : null;
+        return {
+            host: hostFor(descriptor.id),
+            runtime: descriptor.id,
+            install_root,
+            manifest_path: join(install_root, MANIFEST_FILENAME),
+            legacy_version_file,
+        };
+    });
 }
+/**
+ * @typedef {Object} SkillInstallState
+ * @property {string} host
+ * @property {string} runtime
+ * @property {string} install_root
+ * @property {string} manifest_path
+ * @property {string|null} legacy_version_file
+ * @property {boolean} installed
+ * @property {string|null} installed_version
+ * @property {boolean} stale
+ * @property {'manifest' | 'manifest-malformed' | 'legacy_version_file' | null} source
+ */
+/**
+ * Read each surface's install state. See the file header for the
+ * precedence rules.
+ *
+ * @param {string} projectDir
+ * @param {string} frameworkVersion
+ * @returns {SkillInstallState[]}
+ */
 export function readSkillInstallState(projectDir, frameworkVersion) {
     return getSkillInstallSurfaces(projectDir).map((surface) => {
-        const installed_version = existsSync(surface.version_file)
-            ? readFileSync(surface.version_file, 'utf-8').trim()
-            : null;
+        const manifestExists = existsSync(surface.manifest_path);
+        if (manifestExists) {
+            const manifest = readManifest(surface.install_root);
+            if (manifest && typeof manifest.framework_version === 'string') {
+                return {
+                    ...surface,
+                    installed: true,
+                    installed_version: manifest.framework_version,
+                    stale: manifest.framework_version !== frameworkVersion,
+                    source: /** @type {const} */ ('manifest'),
+                };
+            }
+            // Manifest file present but parser rejected it (malformed JSON,
+            // missing required fields, …). Don't silently report healthy.
+            return {
+                ...surface,
+                installed: true,
+                installed_version: null,
+                stale: true,
+                source: /** @type {const} */ ('manifest-malformed'),
+            };
+        }
+        if (surface.legacy_version_file && existsSync(surface.legacy_version_file)) {
+            try {
+                if (statSync(surface.legacy_version_file).isFile()) {
+                    const version = readFileSync(surface.legacy_version_file, 'utf-8').trim();
+                    return {
+                        ...surface,
+                        installed: true,
+                        installed_version: version,
+                        stale: version !== frameworkVersion,
+                        source: /** @type {const} */ ('legacy_version_file'),
+                    };
+                }
+            }
+            catch {
+                /* fall through to "not installed" */
+            }
+        }
         return {
             ...surface,
-            installed: installed_version !== null,
-            installed_version,
-            stale: installed_version !== null && installed_version !== frameworkVersion,
+            installed: false,
+            installed_version: null,
+            stale: false,
+            source: null,
         };
     });
 }

package/dist/cli/util/skill-installs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"skill-installs.mjs","sourceRoot":"","sources":["../../../src/cli/util/skill-installs.mjs"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,UAAU,uBAAuB,CAAC,UAAU;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAChC,OAAO;QACN;YACC,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC;SAC3C;QACD;YACC,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC;SAC3C;KACD,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,OAAO;QACV,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;KACtD,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAU,EAAE,gBAAgB;IACjE,OAAO,uBAAuB,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1D,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC;YACzD,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE;YACpD,CAAC,CAAC,IAAI,CAAA;QACP,OAAO;YACN,GAAG,OAAO;YACV,SAAS,EAAE,iBAAiB,KAAK,IAAI;YACrC,iBAAiB;YACjB,KAAK,EAAE,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,gBAAgB;SAC3E,CAAA;IACF,CAAC,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"skill-installs.mjs","sourceRoot":"","sources":["../../../src/cli/util/skill-installs.mjs"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAExD;;;;;;;GAOG;AACH,SAAS,OAAO,CAAC,SAAS;IACzB,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAA;AAC1D,CAAC;AAED;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,UAAU;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAChC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,CAAA;QACvD,MAAM,cAAc,GAAG,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;QAC1D,MAAM,mBAAmB,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC3F,OAAO;YACN,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,UAAU,CAAC,EAAE;YACtB,YAAY;YACZ,aAAa,EAAE,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC;YACpD,mBAAmB;SACnB,CAAA;IACF,CAAC,CAAC,CAAA;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AAEH;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,UAAU,EAAE,gBAAgB;IACjE,OAAO,uBAAuB,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1D,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QACxD,IAAI,cAAc,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;YACnD,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,iBAAiB,KAAK,QAAQ,EAAE,CAAC;gBAChE,OAAO;oBACN,GAAG,OAAO;oBACV,SAAS,EAAE,IAAI;oBACf,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;oBAC7C,KAAK,EAAE,QAAQ,CAAC,iBAAiB,KAAK,gBAAgB;oBACtD,MAAM,EAAE,oBAAoB,CAAC,CAAC,UAAU,CAAC;iBACzC,CAAA;YACF,CAAC;YACD,gEAAgE;YAChE,8DAA8D;YAC9D,OAAO;gBACN,GAAG,OAAO;gBACV,SAAS,EAAE,IAAI;gBACf,iBAAiB,EAAE,IAAI;gBACvB,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,oBAAoB,CAAC,CAAC,oBAAoB,CAAC;aACnD,CAAA;QACF,CAAC;QAED,IAAI,OAAO,CAAC,mBAAmB,IAAI,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC5E,IAAI,CAAC;gBACJ,IAAI,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;oBACpD,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;oBACzE,OAAO;wBACN,GAAG,OAAO;wBACV,SAAS,EAAE,IAAI;wBACf,iBAAiB,EAAE,OAAO;wBAC1B,KAAK,EAAE,OAAO,KAAK,gBAAgB;wBACnC,MAAM,EAAE,oBAAoB,CAAC,CAAC,qBAAqB,CAAC;qBACpD,CAAA;gBACF,CAAC;YACF,CAAC;YAAC,MAAM,CAAC;gBACR,qCAAqC;YACtC,CAAC;QACF,CAAC;QAED,OAAO;YACN,GAAG,OAAO;YACV,SAAS,EAAE,KAAK;YAChB,iBAAiB,EAAE,IAAI;YACvB,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;SACZ,CAAA;IACF,CAAC,CAAC,CAAA;AACH,CAAC"}