@fission-ai/openspec 1.13.1 → 1.13.2

package/dist/core/validation/validator.js

@@ -5,7 +5,7 @@ import { MarkdownParser } from '../parsers/markdown-parser.js';
 import { ChangeParser } from '../parsers/change-parser.js';
 import { findSpecUpdates, buildUpdatedSpec } from '../specs-apply.js';
 import { MIN_PURPOSE_LENGTH, MAX_REQUIREMENT_TEXT_LENGTH, VALIDATION_MESSAGES } from './constants.js';
-import { parseDeltaSpec, foldRequirementName, normalizeRequirementName, extractRequirementsSection, findMissingCurrentScenarios, } from '../parsers/requirement-blocks.js';
+import { parseDeltaSpec, foldRequirementName, normalizeRequirementName, extractRequirementsSection, diffScenarioNames, describeScenarioBalance, } from '../parsers/requirement-blocks.js';
 import { extractRequirementBody as extractRequirementBodyShared, containsShallOrMust as containsShallOrMustShared, countScenarios as countScenariosShared, countEmptyScenarios, } from '../parsers/requirement-text.js';
 import { findMainSpecStructureIssues } from '../parsers/spec-structure.js';
 import { FileSystemUtils } from '../../utils/file-system.js';
@@ -639,15 +639,16 @@ export class Validator {
             const current = currentBlockFor(key);
             if (!current)
                 continue;
-            const missing = findMissingCurrentScenarios(current, block);
-            if (missing.length === 0)
+            const diff = diffScenarioNames(current, block);
+            if (diff.missing.length === 0)
                 continue;
             issues.push({
                 level: 'ERROR',
                 path: entryPath,
                 message: `MODIFIED "${block.name}" omits scenario(s) the current spec still has: ` +
-                    `${missing.map(name => `"${name}"`).join(', ')}. ` +
-                    'Copy them into the MODIFIED block (a MODIFIED requirement replaces the whole block, so archive refuses to drop them).',
+                    `${diff.missing.map(name => `"${name}"`).join(', ')}. ` +
+                    `${describeScenarioBalance(diff)} ` +
+                    'Copy the omitted scenarios into the MODIFIED block (a MODIFIED requirement replaces the whole block, so archive refuses to drop them).',
             });
         }
         return issues;

package/dist/utils/file-system.js

@@ -1,5 +1,6 @@
 import * as nodeFs from 'fs';
 import path from 'path';
+import { detectLineEnding, matchLineEnding } from './line-endings.js';
 const fs = nodeFs.promises;
 const { constants: fsConstants } = nodeFs;
 function hasOwnerGroupOrOtherWriteBit(stats) {
@@ -277,8 +278,14 @@ export class FileSystemUtils {
     }
     static async updateFileWithMarkers(filePath, content, startMarker, endMarker) {
         let existingContent = '';
+        // The managed block is composed with '\n', so splicing it into a CRLF file
+        // would leave mixed endings behind. bash reports a stray '\r' in .bashrc as
+        // "$'\r': command not found", so settle the whole file on the convention it
+        // already used. A file that does not exist yet stays LF.
+        let originalContent;
         if (await this.fileExists(filePath)) {
             existingContent = await this.readFile(filePath);
+            originalContent = existingContent;
             const startIndex = findMarkerIndex(existingContent, startMarker);
             const endIndex = startIndex !== -1
                 ? findMarkerIndex(existingContent, endMarker, startIndex + startMarker.length)
@@ -301,7 +308,9 @@ export class FileSystemUtils {
         else {
             existingContent = startMarker + '\n' + content + '\n' + endMarker;
         }
-        await this.writeFile(filePath, existingContent);
+        await this.writeFile(filePath, originalContent === undefined
+            ? existingContent
+            : matchLineEnding(existingContent, originalContent));
     }
     static async ensureWritePermissions(dirPath) {
         try {
@@ -377,14 +386,22 @@ export function removeMarkerBlock(content, startMarker, endMarker) {
     }
     const before = content.substring(0, lineStart);
     const after = content.substring(lineEnd);
+    // The file's own newline, used for every ending this function writes. The
+    // blank-line collapse below rebuilds the separator it matched, so spelling it
+    // '\n' would leave a CRLF file with a mixed pair wherever a run was collapsed
+    // - the stray '\r' that bash reports as "$'\r': command not found".
+    //
+    // Dominant rather than "contains a CRLF anywhere", so that one stray CRLF in
+    // an otherwise-LF file does not pull the whole rewrite to CRLF. This is the
+    // same reading matchLineEnding uses, so both write paths agree.
+    const newline = detectLineEnding(content) ?? '\n';
     // Clean up double blank lines (handle both Unix \n and Windows \r\n)
     let result = before + after;
-    result = result.replace(/(\r?\n){3,}/g, '\n\n');
+    result = result.replace(/(\r?\n){3,}/g, newline + newline);
     // Trim trailing whitespace but preserve leading whitespace and original newline style
     if (result.trimEnd() === '') {
         return '';
     }
-    const newline = content.includes('\r\n') ? '\r\n' : '\n';
     return result.trimEnd() + newline;
 }
 //# sourceMappingURL=file-system.js.map

package/dist/utils/line-endings.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Line-ending helpers.
+ *
+ * Every parser in this codebase normalizes CRLF to LF on the way in, so all
+ * serialization logic can assume '\n'. That leaves the write side responsible
+ * for restoring whatever convention the file already used: without it, editing
+ * one requirement in a CRLF spec rewrites every line of the file and buries the
+ * real change in the diff.
+ */
+export type LineEnding = '\n' | '\r\n';
+/**
+ * The dominant line ending in `content`, or undefined when it holds no line
+ * break to judge from.
+ *
+ * Mixed files resolve to whichever ending is more common, with CRLF winning a
+ * tie: a file that is mostly CRLF is a CRLF file that picked up a stray LF, and
+ * settling the whole file on one ending is what keeps later diffs small.
+ */
+export declare function detectLineEnding(content: string): LineEnding | undefined;
+/**
+ * Re-apply `ending` to LF-normalized `content`.
+ *
+ * Normalizes to LF first, so the result is uniform even if the caller passed
+ * content that already contained CRLF.
+ */
+export declare function applyLineEnding(content: string, ending: LineEnding): string;
+/**
+ * Rewrite `content` to match the convention of `original`.
+ *
+ * When `original` has no line break to learn from, `content` is left as LF —
+ * the portable default this project writes new files with.
+ */
+export declare function matchLineEnding(content: string, original: string): string;
+//# sourceMappingURL=line-endings.d.ts.map

package/dist/utils/line-endings.js

@@ -0,0 +1,46 @@
+/**
+ * Line-ending helpers.
+ *
+ * Every parser in this codebase normalizes CRLF to LF on the way in, so all
+ * serialization logic can assume '\n'. That leaves the write side responsible
+ * for restoring whatever convention the file already used: without it, editing
+ * one requirement in a CRLF spec rewrites every line of the file and buries the
+ * real change in the diff.
+ */
+/**
+ * The dominant line ending in `content`, or undefined when it holds no line
+ * break to judge from.
+ *
+ * Mixed files resolve to whichever ending is more common, with CRLF winning a
+ * tie: a file that is mostly CRLF is a CRLF file that picked up a stray LF, and
+ * settling the whole file on one ending is what keeps later diffs small.
+ */
+export function detectLineEnding(content) {
+    const crlf = content.match(/\r\n/g)?.length ?? 0;
+    // Count LFs not preceded by CR, so CRLF is never also counted as LF.
+    const lf = content.match(/(?<!\r)\n/g)?.length ?? 0;
+    if (crlf === 0 && lf === 0)
+        return undefined;
+    return crlf >= lf ? '\r\n' : '\n';
+}
+/**
+ * Re-apply `ending` to LF-normalized `content`.
+ *
+ * Normalizes to LF first, so the result is uniform even if the caller passed
+ * content that already contained CRLF.
+ */
+export function applyLineEnding(content, ending) {
+    const normalized = content.replace(/\r\n/g, '\n');
+    return ending === '\n' ? normalized : normalized.replace(/\n/g, '\r\n');
+}
+/**
+ * Rewrite `content` to match the convention of `original`.
+ *
+ * When `original` has no line break to learn from, `content` is left as LF —
+ * the portable default this project writes new files with.
+ */
+export function matchLineEnding(content, original) {
+    const ending = detectLineEnding(original);
+    return ending === undefined ? content : applyLineEnding(content, ending);
+}
+//# sourceMappingURL=line-endings.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fission-ai/openspec",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "description": "AI-native system for spec-driven development",
   "keywords": [
     "openspec",
@@ -52,7 +52,7 @@
     "vitest": "^4.1.11"
   },
   "dependencies": {
-    "@inquirer/core": "^11.2.1",
+    "@inquirer/core": "^12.0.0",
     "@inquirer/prompts": "^8.5.2",
     "chalk": "^5.6.2",
     "commander": "^14.0.0",

package/schemas/spec-driven/schema.yaml

@@ -210,6 +210,13 @@ artifacts:
         that task's checkbox description. Use a separate verification task only
         when it checks broader integration or system behavior that spans
         multiple implementation tasks.
+      - Each task group MUST land the tests and documentation its own work
+        calls for. Do NOT collect testing or documentation into a final group -
+        when a late group first exercises work from an early one, the failures
+        cascade back through every group in between and force rework. A group
+        whose work calls for neither, such as scaffolding or dependency setup,
+        carries neither. A final group is for integration checks only, not for
+        the tests and docs an earlier group owed.
 
       Example:
       ```
@@ -224,6 +231,7 @@ artifacts:
 
       - [ ] 2.1 Implement data export function and verify the export test passes
       - [ ] 2.2 Add CSV formatting utilities and verify unit tests cover quoting and delimiters
+      - [ ] 2.3 Document the export API in docs/export.md and verify the documented command runs as written
       ```
 
       Reference specs for what needs to be built, design for how to build it.