@fission-ai/openspec 1.6.0 → 1.7.0

package/dist/core/specs-apply.js

@@ -7,9 +7,12 @@
 import { promises as fs } from 'fs';
 import path from 'path';
 import chalk from 'chalk';
-import { extractRequirementsSection, parseDeltaSpec, normalizeRequirementName, } from './parsers/requirement-blocks.js';
+import { extractRequirementsSection, foldRequirementName, parseDeltaSpec, normalizeRequirementName, } from './parsers/requirement-blocks.js';
 import { findMainSpecStructureIssues } from './parsers/spec-structure.js';
-import { Validator } from './validation/validator.js';
+import { buildCodeFenceMask } from './parsers/code-fence.js';
+import { MarkdownParser } from './parsers/markdown-parser.js';
+import { MIN_PURPOSE_LENGTH } from './validation/constants.js';
+import { discoverSpecFiles } from '../utils/spec-discovery.js';
 // -----------------------------------------------------------------------------
 // Public API
 // -----------------------------------------------------------------------------
@@ -19,37 +22,27 @@ import { Validator } from './validation/validator.js';
 export async function findSpecUpdates(changeDir, mainSpecsDir) {
     const updates = [];
     const changeSpecsDir = path.join(changeDir, 'specs');
-    try {
-        const entries = await fs.readdir(changeSpecsDir, { withFileTypes: true });
-        for (const entry of entries) {
-            if (entry.isDirectory()) {
-                const specFile = path.join(changeSpecsDir, entry.name, 'spec.md');
-                const targetFile = path.join(mainSpecsDir, entry.name, 'spec.md');
-                try {
-                    await fs.access(specFile);
-                    // Check if target exists
-                    let exists = false;
-                    try {
-                        await fs.access(targetFile);
-                        exists = true;
-                    }
-                    catch {
-                        exists = false;
-                    }
-                    updates.push({
-                        source: specFile,
-                        target: targetFile,
-                        exists,
-                    });
-                }
-                catch {
-                    // Source spec doesn't exist, skip
-                }
-            }
+    // Discover delta specs recursively so nested layouts like
+    // specs/<area>/<capability>/spec.md merge into the same relative path
+    // under the main specs directory (#1353)
+    const discovered = await discoverSpecFiles(changeSpecsDir);
+    for (const { id, specFile } of discovered) {
+        const targetFile = path.join(mainSpecsDir, ...id.split('/'), 'spec.md');
+        // Check if target exists
+        let exists = false;
+        try {
+            await fs.access(targetFile);
+            exists = true;
         }
-    }
-    catch {
-        // No specs directory in change
+        catch {
+            exists = false;
+        }
+        updates.push({
+            id,
+            source: specFile,
+            target: targetFile,
+            exists,
+        });
     }
     return updates;
 }
@@ -58,11 +51,20 @@ export async function findSpecUpdates(changeDir, mainSpecsDir) {
  * Returns the rebuilt content and counts of operations.
  */
 export async function buildUpdatedSpec(update, changeName, options = {}) {
+    // Collected so silent (JSON) callers can surface them; printed live for
+    // human callers at the point they occur.
+    const warnings = [];
+    const warn = (message) => {
+        warnings.push(message);
+        if (!options.silent) {
+            console.log(chalk.yellow(`⚠️  Warning: ${message}`));
+        }
+    };
     // Read change spec content (delta-format expected)
     const changeContent = await fs.readFile(update.source, 'utf-8');
     // Parse deltas from the change spec file
     const plan = parseDeltaSpec(changeContent);
-    const specName = path.basename(path.dirname(update.target));
+    const specName = update.id;
     // Pre-validate duplicates within sections
     const addedNames = new Set();
     for (const add of plan.added) {
@@ -118,6 +120,17 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
     for (const { from, to } of plan.renamed) {
         const fromNorm = normalizeRequirementName(from);
         const toNorm = normalizeRequirementName(to);
+        // A REMOVED naming the FROM side contradicts the rename. This used to
+        // fail incidentally at apply time (the rename consumed the old header,
+        // so REMOVED hit "not found"); now that a missing REMOVED target is a
+        // no-op, the conflict must be rejected explicitly. Compared folded, so
+        // a case/whitespace variant cannot slip past the guard and degrade
+        // into a warned no-op.
+        const removedFoldMatch = [...removedNamesSet].find((r) => foldRequirementName(r) === foldRequirementName(fromNorm));
+        if (removedFoldMatch !== undefined) {
+            throw new Error(`${specName} validation failed - requirement present in multiple sections (RENAMED and REMOVED) for header "### Requirement: ${from}"` +
+                (removedFoldMatch === fromNorm ? '' : ` (REMOVED spells it "${removedFoldMatch}")`));
+        }
         if (modifiedNames.has(fromNorm)) {
             throw new Error(`${specName} validation failed - when a rename exists, MODIFIED must reference the NEW header "### Requirement: ${to}"`);
         }
@@ -132,14 +145,28 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
     }
     const hasAnyDelta = plan.added.length + plan.modified.length + plan.removed.length + plan.renamed.length > 0;
     if (!hasAnyDelta) {
-        throw new Error(`Delta parsing found no operations for ${path.basename(path.dirname(update.source))}. ` +
+        throw new Error(`Delta parsing found no operations for ${update.id}. ` +
             `Provide ADDED/MODIFIED/REMOVED/RENAMED sections in change spec.`);
     }
     // Load or create base target content
+    const deltaPurpose = extractPurposeSection(changeContent);
     let targetContent;
     let isNewSpec = false;
     try {
         targetContent = await fs.readFile(update.target, 'utf-8');
+        // A delta Purpose only seeds a spec that does not exist yet. Say so rather
+        // than dropping it silently - the specs instruction tells authors to write
+        // one for new capabilities, and the delta file looks identical either way.
+        // Only when the spec really does have a different Purpose: claiming it
+        // "already has one" would be false when it has none, and saying anything at
+        // all is noise when the two bodies match.
+        if (deltaPurpose) {
+            const existingPurpose = extractPurposeSection(targetContent);
+            if (existingPurpose && existingPurpose !== deltaPurpose) {
+                warn(`${specName} - delta Purpose ignored; ${specName} already has one. ` +
+                    `Edit ${update.target} directly to change it.`);
+            }
+        }
     }
     catch {
         // Target spec does not exist; MODIFIED and RENAMED are not allowed for new specs
@@ -148,11 +175,25 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
             throw new Error(`${specName}: target spec does not exist; only ADDED requirements are allowed for new specs. MODIFIED and RENAMED operations require an existing spec.`);
         }
         // Warn about REMOVED requirements being ignored for new specs
-        if (plan.removed.length > 0 && !options.silent) {
-            console.log(chalk.yellow(`⚠️  Warning: ${specName} - ${plan.removed.length} REMOVED requirement(s) ignored for new spec (nothing to remove).`));
+        if (plan.removed.length > 0) {
+            warn(`${specName} - ${plan.removed.length} REMOVED requirement(s) ignored for new spec (nothing to remove).`);
         }
         isNewSpec = true;
-        targetContent = buildSpecSkeleton(specName, changeName);
+        targetContent = buildSpecSkeleton(specName, changeName, deltaPurpose);
+        const overview = deltaPurpose ? readableOverview(targetContent, specName) : null;
+        if (deltaPurpose && !overview) {
+            // Keep the placeholder rather than turning this into a failure: these
+            // deltas archived cleanly before the Purpose carry-over existed.
+            targetContent = buildSpecSkeleton(specName, changeName);
+            warn(`${specName} - delta Purpose ignored (it would leave the new spec unreadable); wrote the placeholder Purpose instead.`);
+        }
+        else if (overview && overview.length < MIN_PURPOSE_LENGTH) {
+            // The placeholder always cleared this threshold, so a carried Purpose is
+            // the first way archive can leave a spec that `validate --strict` fails.
+            // Measured on the parsed overview, which is what the validator reads.
+            warn(`${specName} - carried Purpose is under ${MIN_PURPOSE_LENGTH} characters; ` +
+                `openspec validate --strict reports it as too brief.`);
+        }
     }
     const structureIssues = findMainSpecStructureIssues(targetContent);
     if (structureIssues.length > 0) {
@@ -169,10 +210,24 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
     }
     // Apply operations in order: RENAMED → REMOVED → MODIFIED → ADDED
     // RENAMED
+    let renamedApplied = 0;
     for (const r of plan.renamed) {
         const from = normalizeRequirementName(r.from);
         const to = normalizeRequirementName(r.to);
         if (!nameToBlock.has(from)) {
+            // Source gone but target present means the rename was already synced
+            // to the baseline (early-sync pattern) — re-applying it is a no-op,
+            // not a failure. Only a missing source AND target is a genuine error.
+            if (nameToBlock.has(to)) {
+                // Unless a case/whitespace variant of the source still exists (and is
+                // not the target itself, as in a case-only rename): that is a typo'd
+                // header, not an early-synced rename — same guard REMOVED applies.
+                const nearMiss = [...nameToBlock.keys()].find((k) => k !== to && foldRequirementName(k) === foldRequirementName(from));
+                if (nearMiss !== undefined) {
+                    throw new Error(`${specName} RENAMED failed for header "### Requirement: ${r.from}" - source not found, but "### Requirement: ${nameToBlock.get(nearMiss).name}" exists; fix the header to match it exactly`);
+                }
+                continue;
+            }
             throw new Error(`${specName} RENAMED failed for header "### Requirement: ${r.from}" - source not found`);
         }
         if (nameToBlock.has(to)) {
@@ -189,22 +244,33 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
         };
         nameToBlock.delete(from);
         nameToBlock.set(to, renamedBlock);
+        renamedApplied++;
     }
     // REMOVED
+    let removedApplied = 0;
     for (const name of plan.removed) {
         const key = normalizeRequirementName(name);
         if (!nameToBlock.has(key)) {
-            // For new specs, REMOVED requirements are already warned about and ignored
-            // For existing specs, missing requirements are an error
+            // Requirement gone from the baseline means the removal was already
+            // synced (early-sync pattern) — re-applying it is a no-op, not a
+            // failure. One signal does separate that from a mistyped header: a
+            // requirement that differs only in case or interior whitespace still
+            // being present. That is a typo, and stays a hard abort.
+            // For new specs the skip was already warned about above.
             if (!isNewSpec) {
-                throw new Error(`${specName} REMOVED failed for header "### Requirement: ${name}" - not found`);
+                const nearMiss = [...nameToBlock.keys()].find((k) => foldRequirementName(k) === foldRequirementName(key));
+                if (nearMiss !== undefined) {
+                    throw new Error(`${specName} REMOVED failed for header "### Requirement: ${name}" - not found, but "### Requirement: ${nameToBlock.get(nearMiss).name}" exists; fix the header to match it exactly`);
+                }
+                warn(`${specName} - REMOVED requirement "${name}" is not in the current spec; treating it as already removed.`);
             }
-            // Skip removal for new specs (already warned above)
             continue;
         }
         nameToBlock.delete(key);
+        removedApplied++;
     }
     // MODIFIED
+    let modifiedApplied = 0;
     for (const mod of plan.modified) {
         const key = normalizeRequirementName(mod.name);
         const currentBlock = nameToBlock.get(key);
@@ -220,15 +286,31 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
         if (missingScenarios.length > 0) {
             throw new Error(`${specName} MODIFIED failed for header "### Requirement: ${mod.name}" - current spec contains scenario(s) not present in the modified block: ${missingScenarios.map(name => `"${name}"`).join(', ')}. Refresh the change spec before archiving to avoid dropping scenarios.`);
         }
+        // Identical content means the modification was already synced to the
+        // baseline (early-sync pattern) — count only real replacements, so a
+        // fully synced change still takes the "already in sync" write skip
+        // instead of churning normalization differences into the file.
+        if (normalizeBlockRaw(currentBlock.raw) !== normalizeBlockRaw(mod.raw)) {
+            modifiedApplied++;
+        }
         nameToBlock.set(key, mod);
     }
     // ADDED
+    let addedApplied = 0;
     for (const add of plan.added) {
         const key = normalizeRequirementName(add.name);
-        if (nameToBlock.has(key)) {
+        const existing = nameToBlock.get(key);
+        if (existing) {
+            // Identical content means the requirement was already synced to the
+            // baseline (early-sync pattern) — re-applying it is a no-op, not a
+            // conflict. Only differing content is a genuine collision.
+            if (normalizeBlockRaw(existing.raw) === normalizeBlockRaw(add.raw)) {
+                continue;
+            }
             throw new Error(`${specName} ADDED failed for header "### Requirement: ${add.name}" - already exists`);
         }
         nameToBlock.set(key, add);
+        addedApplied++;
     }
     // Duplicates within resulting map are implicitly prevented by key uniqueness.
     // Recompose requirements section preserving original ordering where possible
@@ -260,13 +342,17 @@ export async function buildUpdatedSpec(update, changeName, options = {}) {
     return {
         rebuilt,
         counts: {
-            added: plan.added.length,
-            modified: plan.modified.length,
-            removed: plan.removed.length,
-            renamed: plan.renamed.length,
+            added: addedApplied,
+            modified: modifiedApplied,
+            removed: removedApplied,
+            renamed: renamedApplied,
         },
+        warnings,
     };
 }
+function normalizeBlockRaw(raw) {
+    return raw.replace(/\r\n?/g, '\n').trim();
+}
 /**
  * Write an updated spec to disk.
  */
@@ -277,7 +363,7 @@ export async function writeUpdatedSpec(update, rebuilt, counts, options = {}) {
     await fs.writeFile(update.target, rebuilt);
     if (options.silent)
         return;
-    const specName = path.basename(path.dirname(update.target));
+    const specName = update.id;
     console.log(`Applying changes to ${options.displayPath ?? `openspec/specs/${specName}/spec.md`}:`);
     if (counts.added)
         console.log(`  + ${counts.added} added`);
@@ -288,25 +374,135 @@ export async function writeUpdatedSpec(update, rebuilt, counts, options = {}) {
     if (counts.renamed)
         console.log(`  → ${counts.renamed} renamed`);
 }
+/** Blank out `<!-- ... -->` spans, preserving line count so indices stay aligned. */
+function maskHtmlComments(content) {
+    const blank = (text) => text.replace(/[^\n]/g, ' ');
+    // `--!>` is a comment terminator as well as `-->`.
+    const masked = content.replace(/<!--[\s\S]*?--!?>/g, blank);
+    // A comment that is never closed runs to end of file, so everything after it
+    // is commented out too. Without this an unterminated `<!--` above a
+    // `## Purpose` left the commented-out header looking real (#1413).
+    const unterminated = masked.indexOf('<!--');
+    if (unterminated === -1)
+        return masked;
+    return masked.slice(0, unterminated) + blank(masked.slice(unterminated));
+}
+/**
+ * Read the body of a `## Purpose` section, ignoring markdown that only appears
+ * inside fenced code blocks or HTML comments. Returns undefined when the
+ * section is absent or its body is empty.
+ */
+function extractPurposeSection(content) {
+    const normalized = content.replace(/\r\n?/g, '\n');
+    const lines = normalized.split('\n');
+    // Structure is read from the masked copy so a commented-out or fenced
+    // `## Purpose` is not mistaken for the real one; the body is returned from
+    // the original lines so an author's own comments and fences survive intact.
+    const masked = maskHtmlComments(normalized).split('\n');
+    const fenceMask = buildCodeFenceMask(masked);
+    const isStructural = (i) => !fenceMask[i];
+    const start = masked.findIndex((line, i) => isStructural(i) && /^##\s+Purpose\s*$/i.test(line));
+    if (start === -1)
+        return undefined;
+    let end = masked.length;
+    for (let i = start + 1; i < masked.length; i++) {
+        if (isStructural(i) && /^##\s+/.test(masked[i])) {
+            end = i;
+            break;
+        }
+    }
+    // Emptiness is judged with fenced blocks and HTML comments blanked out, so a
+    // Purpose that is only a code sample or only an unfilled template comment
+    // counts as absent and falls back to the TBD placeholder.
+    const hasProse = masked
+        .slice(start + 1, end)
+        .filter((_, offset) => isStructural(start + 1 + offset))
+        .join('\n')
+        .trim();
+    if (!hasProse)
+        return undefined;
+    const body = lines.slice(start + 1, end).join('\n').trim();
+    return body || undefined;
+}
+/**
+ * The Purpose a new main spec would end up with, or null when carrying the
+ * delta's body over would leave a spec the readers downstream cannot handle.
+ *
+ * Returns the parsed overview rather than a boolean so callers measure the same
+ * string `validate` measures, not the raw slice out of the delta.
+ */
+function readableOverview(skeleton, specName) {
+    // HTML comments are invisible to the spec parsers but not to the file itself:
+    // markdown hidden in one is skipped by the boundary scan yet still lands in
+    // the spec, where it can hide the headers those parsers depend on and blank
+    // the document out in any markdown renderer. Refuse rather than write a spec
+    // that reads differently depending on who is reading it (#1413).
+    //
+    // Only the opener is disqualifying, and only because `maskHtmlComments`
+    // covers unterminated comments too: a comment starting above the section
+    // header therefore always masks the header, leaving no body to carry, so a
+    // body can only hide content behind a `<!--` of its own. A bare `-->` hides
+    // nothing and renders as text - rejecting it would throw away a Purpose over
+    // prose like "ingest --> transform".
+    if (skeleton.includes('<!--'))
+        return null;
+    if (findMainSpecStructureIssues(skeleton).length > 0)
+        return null;
+    try {
+        // A heading or unterminated fence in the body truncates or swallows the
+        // sections around it, so archive would abort or write a spec its own
+        // validator rejects.
+        return new MarkdownParser(skeleton).parseSpec(specName).overview.trim() || null;
+    }
+    catch {
+        return null;
+    }
+}
 /**
- * Build a skeleton spec for new capabilities.
+ * Build a skeleton spec for new capabilities. When the delta spec authored a
+ * `## Purpose`, carry it over instead of the TBD placeholder (#1413) - archive
+ * invents the Purpose for a brand-new main spec either way, and the author's
+ * own wording beats a placeholder they then have to hand-edit.
  */
-export function buildSpecSkeleton(specFolderName, changeName) {
+export function buildSpecSkeleton(specFolderName, changeName, purpose) {
     const titleBase = specFolderName;
-    return `# ${titleBase} Specification\n\n## Purpose\nTBD - created by archiving change ${changeName}. Update Purpose after archive.\n\n## Requirements\n`;
+    const purposeBody = purpose?.trim() || `TBD - created by archiving change ${changeName}. Update Purpose after archive.`;
+    return `# ${titleBase} Specification\n\n## Purpose\n${purposeBody}\n\n## Requirements\n`;
 }
 function findMissingCurrentScenarios(current, incoming) {
-    const incomingScenarioNames = new Set(parseScenarioBlocks(incoming.raw).map((scenario) => scenario.name));
-    return parseScenarioBlocks(current.raw)
-        .filter((scenario) => !incomingScenarioNames.has(scenario.name))
-        .map((scenario) => scenario.name);
+    // Multiplicity-aware: a name present N times in current and M times in
+    // incoming means max(0, N - M) instances are missing. Set membership would
+    // treat N>M as fully covered and let archive silently drop duplicates
+    // (residual #1246 / duplicate-scenario-name blind spot).
+    const remainingIncoming = new Map();
+    for (const scenario of parseScenarioBlocks(incoming.raw)) {
+        const name = scenario.name;
+        remainingIncoming.set(name, (remainingIncoming.get(name) ?? 0) + 1);
+    }
+    const missing = [];
+    for (const scenario of parseScenarioBlocks(current.raw)) {
+        const name = scenario.name;
+        const remaining = remainingIncoming.get(name) ?? 0;
+        if (remaining > 0) {
+            remainingIncoming.set(name, remaining - 1);
+        }
+        else {
+            missing.push(name);
+        }
+    }
+    return missing;
 }
 function parseScenarioBlocks(requirementRaw) {
     const lines = requirementRaw.replace(/\r\n?/g, '\n').split('\n');
+    // A `#### Scenario:` inside a fenced example is not a real scenario. The
+    // validator's countScenarios already ignores fenced lines; the drift check
+    // must agree with it, or a fenced sample can false-abort an archive (or
+    // mask a genuinely dropped scenario).
+    const mask = buildCodeFenceMask(lines);
     const scenarios = [];
     let index = 0;
     while (index < lines.length) {
-        const headerMatch = lines[index].match(/^####\s*Scenario:\s*(.+)\s*$/);
+        const headerMatch = mask[index] ? null : lines[index].match(/^####\s*Scenario:\s*(.+)\s*$/);
         if (!headerMatch) {
             index++;
             continue;
@@ -314,7 +510,7 @@ function parseScenarioBlocks(requirementRaw) {
         const start = index;
         const name = headerMatch[1].trim();
         index++;
-        while (index < lines.length && !/^####\s*Scenario:\s*(.+)\s*$/.test(lines[index])) {
+        while (index < lines.length && (mask[index] || !/^####\s*Scenario:\s*(.+)\s*$/.test(lines[index]))) {
             index++;
         }
         scenarios.push({
@@ -324,105 +520,4 @@ function parseScenarioBlocks(requirementRaw) {
     }
     return scenarios;
 }
-/**
- * Apply all delta specs from a change to main specs.
- *
- * @param projectRoot - The project root directory
- * @param changeName - The name of the change to apply
- * @param options - Options for the operation
- * @returns Result of the operation with counts
- */
-export async function applySpecs(projectRoot, changeName, options = {}) {
-    const changeDir = path.join(projectRoot, 'openspec', 'changes', changeName);
-    const mainSpecsDir = path.join(projectRoot, 'openspec', 'specs');
-    // Verify change exists
-    try {
-        const stat = await fs.stat(changeDir);
-        if (!stat.isDirectory()) {
-            throw new Error(`Change '${changeName}' not found.`);
-        }
-    }
-    catch {
-        throw new Error(`Change '${changeName}' not found.`);
-    }
-    // Find specs to update
-    const specUpdates = await findSpecUpdates(changeDir, mainSpecsDir);
-    if (specUpdates.length === 0) {
-        return {
-            changeName,
-            capabilities: [],
-            totals: { added: 0, modified: 0, removed: 0, renamed: 0 },
-            noChanges: true,
-        };
-    }
-    // Prepare all updates first (validation pass, no writes)
-    const prepared = [];
-    for (const update of specUpdates) {
-        const built = await buildUpdatedSpec(update, changeName);
-        prepared.push({ update, rebuilt: built.rebuilt, counts: built.counts });
-    }
-    // Validate rebuilt specs unless validation is skipped
-    if (!options.skipValidation) {
-        const validator = new Validator();
-        for (const p of prepared) {
-            const specName = path.basename(path.dirname(p.update.target));
-            const report = await validator.validateSpecContent(specName, p.rebuilt);
-            if (!report.valid) {
-                const errors = report.issues
-                    .filter((i) => i.level === 'ERROR')
-                    .map((i) => `  ✗ ${i.message}`)
-                    .join('\n');
-                throw new Error(`Validation errors in rebuilt spec for ${specName}:\n${errors}`);
-            }
-        }
-    }
-    // Build results
-    const capabilities = [];
-    const totals = { added: 0, modified: 0, removed: 0, renamed: 0 };
-    for (const p of prepared) {
-        const capability = path.basename(path.dirname(p.update.target));
-        if (!options.dryRun) {
-            // Write the updated spec
-            const targetDir = path.dirname(p.update.target);
-            await fs.mkdir(targetDir, { recursive: true });
-            await fs.writeFile(p.update.target, p.rebuilt);
-            if (!options.silent) {
-                console.log(`Applying changes to openspec/specs/${capability}/spec.md:`);
-                if (p.counts.added)
-                    console.log(`  + ${p.counts.added} added`);
-                if (p.counts.modified)
-                    console.log(`  ~ ${p.counts.modified} modified`);
-                if (p.counts.removed)
-                    console.log(`  - ${p.counts.removed} removed`);
-                if (p.counts.renamed)
-                    console.log(`  → ${p.counts.renamed} renamed`);
-            }
-        }
-        else if (!options.silent) {
-            console.log(`Would apply changes to openspec/specs/${capability}/spec.md:`);
-            if (p.counts.added)
-                console.log(`  + ${p.counts.added} added`);
-            if (p.counts.modified)
-                console.log(`  ~ ${p.counts.modified} modified`);
-            if (p.counts.removed)
-                console.log(`  - ${p.counts.removed} removed`);
-            if (p.counts.renamed)
-                console.log(`  → ${p.counts.renamed} renamed`);
-        }
-        capabilities.push({
-            capability,
-            ...p.counts,
-        });
-        totals.added += p.counts.added;
-        totals.modified += p.counts.modified;
-        totals.removed += p.counts.removed;
-        totals.renamed += p.counts.renamed;
-    }
-    return {
-        changeName,
-        capabilities,
-        totals,
-        noChanges: false,
-    };
-}
 //# sourceMappingURL=specs-apply.js.map

package/dist/core/store/git.d.ts

@@ -19,5 +19,18 @@ export declare function gitHasRemote(storeRoot: string): Promise<boolean | null>
  * network touch. Null when there is no repository or no origin.
  */
 export declare function gitOriginUrl(storeRoot: string): Promise<string | null>;
+export interface GitTrackingDrift {
+    ahead: number;
+    behind: number;
+}
+/**
+ * Ahead/behind counts of HEAD against its configured upstream tracking
+ * ref, read from local refs only — no fetch, no network. The comparison
+ * is therefore against the current local upstream ref (typically last
+ * updated by fetch, but it may be a local branch), not the live remote.
+ * Null when there is no repository, no upstream, a detached HEAD, or Git
+ * is unavailable: the absence of a comparison is not drift.
+ */
+export declare function gitTrackingDrift(storeRoot: string): Promise<GitTrackingDrift | null>;
 export declare function gitDirectoryHasTrackedFiles(storeRoot: string, relativeDir: string): Promise<boolean | null>;
 //# sourceMappingURL=git.d.ts.map

package/dist/core/store/git.js

@@ -130,6 +130,30 @@ export async function gitOriginUrl(storeRoot) {
     const url = stdout?.trim();
     return url ? url : null;
 }
+/**
+ * Ahead/behind counts of HEAD against its configured upstream tracking
+ * ref, read from local refs only — no fetch, no network. The comparison
+ * is therefore against the current local upstream ref (typically last
+ * updated by fetch, but it may be a local branch), not the live remote.
+ * Null when there is no repository, no upstream, a detached HEAD, or Git
+ * is unavailable: the absence of a comparison is not drift.
+ */
+export async function gitTrackingDrift(storeRoot) {
+    const stdout = await gitProbe(storeRoot, [
+        'rev-list',
+        '--left-right',
+        '--count',
+        '@{upstream}...HEAD',
+    ]);
+    if (stdout === null)
+        return null;
+    const match = stdout.trim().match(/^(\d+)\s+(\d+)$/);
+    if (!match)
+        return null;
+    // `--left-right` orders the counts by side of the `...`: left is @{upstream}
+    // (commits we lack = behind), right is HEAD (commits upstream lacks = ahead).
+    return { behind: Number(match[1]), ahead: Number(match[2]) };
+}
 export async function gitDirectoryHasTrackedFiles(storeRoot, relativeDir) {
     const stdout = await gitProbe(storeRoot, ['ls-files', '--', relativeDir]);
     return stdout === null ? null : stdout.trim().length > 0;