sudocode 1.1.17 → 1.1.18-dev.0

package/node_modules/@sudocode-ai/cli/dist/markdown.js

@@ -0,0 +1,329 @@
+/**
+ * Markdown parser with frontmatter support
+ */
+import matter from "gray-matter";
+import * as fs from "fs";
+import { getSpec } from "./operations/specs.js";
+import { getIssue } from "./operations/issues.js";
+import { createFeedbackAnchor } from "./operations/feedback-anchors.js";
+/**
+ * Parse markdown file with YAML frontmatter
+ * @param content - Markdown content to parse
+ * @param db - Optional database for validating cross-references
+ * @param outputDir - Optional output directory for loading config metadata
+ */
+export function parseMarkdown(content, db, outputDir) {
+    const parsed = matter(content);
+    // Extract cross-references from content
+    const references = extractCrossReferences(parsed.content, db);
+    return {
+        data: parsed.data,
+        content: parsed.content,
+        raw: content,
+        references,
+    };
+}
+/**
+ * Parse markdown file from disk
+ * @param filePath - Path to markdown file
+ * @param db - Optional database for validating cross-references
+ * @param outputDir - Optional output directory for loading config metadata
+ */
+export function parseMarkdownFile(filePath, db, outputDir) {
+    const content = fs.readFileSync(filePath, "utf8");
+    return parseMarkdown(content, db, outputDir);
+}
+/**
+ * Convert character index to line number
+ */
+function getLineNumber(content, charIndex) {
+    const beforeMatch = content.substring(0, charIndex);
+    return beforeMatch.split("\n").length;
+}
+/**
+ * Convert FeedbackAnchor to LocationAnchor (strips tracking fields)
+ */
+function feedbackAnchorToLocationAnchor(feedbackAnchor) {
+    return {
+        section_heading: feedbackAnchor.section_heading,
+        section_level: feedbackAnchor.section_level,
+        line_number: feedbackAnchor.line_number,
+        line_offset: feedbackAnchor.line_offset,
+        text_snippet: feedbackAnchor.text_snippet,
+        context_before: feedbackAnchor.context_before,
+        context_after: feedbackAnchor.context_after,
+        content_hash: feedbackAnchor.content_hash,
+    };
+}
+/**
+ * Extract cross-references from markdown content
+ * Supports formats:
+ * - [[i-x7k9]] or [[s-14sh]] - hash-based entity reference
+ * - [[@i-x7k9]] - entity reference with @ prefix (for clarity)
+ * - [[i-x7k9|Display Text]] - with custom display text
+ * - [[i-x7k9]]{ blocks } - with relationship type (shorthand)
+ * - [[i-x7k9]]{ type: blocks } - with relationship type (explicit)
+ * - [[i-x7k9|Display]]{ blocks } - combination of display text and type
+ *
+ * If db is provided, validates references against the database and determines entity type.
+ * Only returns references to entities that actually exist.
+ *
+ * If db is not provided, determines entity type from hash-based ID prefix (i- or s-).
+ */
+export function extractCrossReferences(content, db) {
+    const references = [];
+    // Pattern: [[optional-@][entity-id][|display-text]]optional-metadata
+    // Supports hash-based IDs only:
+    // - [[i-x7k9]] or [[s-14sh]]
+    // - [[i-x7k9|Display Text]]
+    // - [[i-x7k9]]{ blocks }
+    // - [[i-x7k9]]{ type: depends-on }
+    const refPattern = /\[\[(@)?([is]-[0-9a-z]{4,8})(?:\|([^\]]+))?\]\](?:\{\s*(?:type:\s*)?([a-z-]+)\s*\})?/gi;
+    let match;
+    while ((match = refPattern.exec(content)) !== null) {
+        const hasAt = match[1] === "@";
+        const id = match[2];
+        const displayText = match[3]?.trim();
+        const relationshipType = match[4]?.trim();
+        // Create location anchor for this reference
+        let anchor;
+        try {
+            const lineNumber = getLineNumber(content, match.index);
+            const feedbackAnchor = createFeedbackAnchor(content, lineNumber, match.index);
+            anchor = feedbackAnchorToLocationAnchor(feedbackAnchor);
+        }
+        catch (error) {
+            // If anchor creation fails, continue without it
+            anchor = undefined;
+        }
+        if (db) {
+            let entityType = null;
+            try {
+                const spec = getSpec(db, id);
+                if (spec) {
+                    entityType = "spec";
+                }
+            }
+            catch (error) { }
+            if (!entityType) {
+                try {
+                    const issue = getIssue(db, id);
+                    if (issue) {
+                        entityType = "issue";
+                    }
+                }
+                catch (error) { }
+            }
+            if (entityType) {
+                references.push({
+                    match: match[0],
+                    id,
+                    type: entityType,
+                    index: match.index,
+                    displayText,
+                    relationshipType,
+                    anchor,
+                });
+            }
+        }
+        else {
+            // Determine type from hash-based ID prefix
+            // Hash IDs always use i- for issues, s- for specs
+            const type = id.startsWith("i-") ? "issue" : "spec";
+            references.push({
+                match: match[0],
+                id,
+                type,
+                index: match.index,
+                displayText,
+                relationshipType,
+                anchor,
+            });
+        }
+    }
+    return references;
+}
+/**
+ * Stringify frontmatter and content back to markdown
+ */
+export function stringifyMarkdown(data, content) {
+    return matter.stringify(content, data);
+}
+/**
+ * Update frontmatter in an existing markdown file
+ * Preserves content unchanged
+ */
+export function updateFrontmatter(originalContent, updates) {
+    const parsed = matter(originalContent);
+    // Merge updates into existing frontmatter
+    const merged = {
+        ...parsed.data,
+        ...updates,
+    };
+    // Remove keys with undefined values (allows explicit removal of fields)
+    const newData = Object.fromEntries(Object.entries(merged).filter(([_, value]) => value !== undefined));
+    return matter.stringify(parsed.content, newData);
+}
+/**
+ * Update frontmatter in a file
+ */
+export function updateFrontmatterFile(filePath, updates) {
+    const content = fs.readFileSync(filePath, "utf8");
+    const updated = updateFrontmatter(content, updates);
+    fs.writeFileSync(filePath, updated, "utf8");
+}
+/**
+ * Check if a file has frontmatter
+ */
+export function hasFrontmatter(content) {
+    return content.trimStart().startsWith("---");
+}
+/**
+ * Create markdown with frontmatter
+ */
+export function createMarkdown(data, content) {
+    return stringifyMarkdown(data, content);
+}
+/**
+ * Write markdown file with frontmatter
+ */
+export function writeMarkdownFile(filePath, data, content) {
+    const markdown = createMarkdown(data, content);
+    fs.writeFileSync(filePath, markdown, "utf8");
+}
+/**
+ * Remove frontmatter from markdown content
+ */
+export function removeFrontmatter(content) {
+    const parsed = matter(content);
+    return parsed.content;
+}
+/**
+ * Get only frontmatter data from markdown
+ */
+export function getFrontmatter(content) {
+    const parsed = matter(content);
+    return parsed.data;
+}
+/**
+ * Parse feedback section from issue markdown content
+ * Looks for "## Spec Feedback Provided" section
+ */
+export function parseFeedbackSection(content) {
+    const feedback = [];
+    // Look for "## Spec Feedback Provided" section
+    const feedbackSectionMatch = content.match(/^## Spec Feedback Provided\s*$/m);
+    if (!feedbackSectionMatch) {
+        return feedback;
+    }
+    const startIndex = feedbackSectionMatch.index + feedbackSectionMatch[0].length;
+    // Find the end of this section (next ## heading or end of content)
+    const remainingContent = content.slice(startIndex);
+    const endMatch = remainingContent.match(/^## /m);
+    const sectionContent = endMatch
+        ? remainingContent.slice(0, endMatch.index)
+        : remainingContent;
+    // Parse individual feedback items (### heading for each)
+    const feedbackPattern = /^### (FB-\d+) → ([a-z]+-\d+)(?: \((.*?)\))?\s*\n\*\*Type:\*\* (.+?)\s*\n\*\*Location:\*\* (.*?)\s*\n\*\*Status:\*\* (.+?)\s*\n\n([\s\S]*?)(?=\n###|$)/gm;
+    let match;
+    while ((match = feedbackPattern.exec(sectionContent)) !== null) {
+        const [, id, specId, specTitle, type, locationStr, status, content] = match;
+        // Parse location string: "## Section Name, line 45 ✓" or "line 45 ⚠" or "Unknown ✗"
+        const locationMatch = locationStr.match(/(?:(.+?),\s+)?line (\d+)\s*([✓⚠✗])/);
+        const feedbackData = {
+            id,
+            specId,
+            specTitle: specTitle || undefined,
+            type: type.trim(),
+            location: {
+                section: locationMatch?.[1]?.trim(),
+                line: locationMatch?.[2] ? parseInt(locationMatch[2]) : undefined,
+                status: locationMatch?.[3] === "✓"
+                    ? "valid"
+                    : locationMatch?.[3] === "⚠"
+                        ? "relocated"
+                        : "stale",
+            },
+            status: status.trim(),
+            content: content.trim(),
+            createdAt: "", // Would need to parse from content or get from DB
+        };
+        // Check for resolution
+        const resolutionMatch = content.match(/\*\*Resolution:\*\* (.+)/);
+        if (resolutionMatch) {
+            feedbackData.resolution = resolutionMatch[1].trim();
+        }
+        feedback.push(feedbackData);
+    }
+    return feedback;
+}
+/**
+ * Format feedback data for inclusion in issue markdown
+ */
+export function formatFeedbackForIssue(feedback) {
+    if (feedback.length === 0) {
+        return "";
+    }
+    let output = "\n## Spec Feedback Provided\n\n";
+    for (const fb of feedback) {
+        // Determine status indicator
+        const statusIndicator = fb.location.status === "valid"
+            ? "✓"
+            : fb.location.status === "relocated"
+                ? "⚠"
+                : "✗";
+        // Format location
+        let locationStr = "";
+        if (fb.location.section && fb.location.line) {
+            locationStr = `${fb.location.section}, line ${fb.location.line} ${statusIndicator}`;
+        }
+        else if (fb.location.line) {
+            locationStr = `line ${fb.location.line} ${statusIndicator}`;
+        }
+        else {
+            locationStr = `Unknown ${statusIndicator}`;
+        }
+        const titlePart = fb.specTitle ? ` (${fb.specTitle})` : "";
+        output += `### ${fb.id} → ${fb.specId}${titlePart}\n`;
+        output += `**Type:** ${fb.type}  \n`;
+        output += `**Location:** ${locationStr}  \n`;
+        output += `**Status:** ${fb.status}\n\n`;
+        output += `${fb.content}\n`;
+        if (fb.resolution) {
+            output += `\n**Resolution:** ${fb.resolution}\n`;
+        }
+        output += "\n";
+    }
+    return output;
+}
+/**
+ * Append or update feedback section in issue markdown
+ */
+export function updateFeedbackInIssue(issueContent, feedback) {
+    // Remove existing feedback section if present
+    const feedbackSectionMatch = issueContent.match(/^## Spec Feedback Provided\s*$/m);
+    if (feedbackSectionMatch) {
+        const startIndex = feedbackSectionMatch.index;
+        // Find the end of this section (next ## heading or end of content)
+        const remainingContent = issueContent.slice(startIndex);
+        const endMatch = remainingContent.match(/^## /m);
+        if (endMatch && endMatch.index > 0) {
+            // There's another section after feedback
+            const endIndex = startIndex + endMatch.index;
+            issueContent =
+                issueContent.slice(0, startIndex) + issueContent.slice(endIndex);
+        }
+        else {
+            // Feedback section is at the end
+            issueContent = issueContent.slice(0, startIndex);
+        }
+    }
+    // Append new feedback section
+    const feedbackMarkdown = formatFeedbackForIssue(feedback);
+    if (feedbackMarkdown) {
+        // Ensure there's a blank line before the new section
+        issueContent = issueContent.trimEnd() + "\n" + feedbackMarkdown;
+    }
+    return issueContent;
+}
+//# sourceMappingURL=markdown.js.map

package/node_modules/@sudocode-ai/cli/dist/markdown.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../src/markdown.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAsDxE;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAC3B,OAAe,EACf,EAAsB,EACtB,SAAkB;IAElB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAE/B,wCAAwC;IACxC,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAE9D,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAS;QACtB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,GAAG,EAAE,OAAO;QACZ,UAAU;KACX,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,EAAsB,EACtB,SAAkB;IAElB,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClD,OAAO,aAAa,CAAI,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;AAClD,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,OAAe,EAAE,SAAiB;IACvD,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IACpD,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AACxC,CAAC;AAED;;GAEG;AACH,SAAS,8BAA8B,CACrC,cAAuD;IAEvD,OAAO;QACL,eAAe,EAAE,cAAc,CAAC,eAAe;QAC/C,aAAa,EAAE,cAAc,CAAC,aAAa;QAC3C,WAAW,EAAE,cAAc,CAAC,WAAW;QACvC,WAAW,EAAE,cAAc,CAAC,WAAW;QACvC,YAAY,EAAE,cAAc,CAAC,YAAY;QACzC,cAAc,EAAE,cAAc,CAAC,cAAc;QAC7C,aAAa,EAAE,cAAc,CAAC,aAAa;QAC3C,YAAY,EAAE,cAAc,CAAC,YAAY;KAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAAe,EACf,EAAsB;IAEtB,MAAM,UAAU,GAAqB,EAAE,CAAC;IAExC,qEAAqE;IACrE,gCAAgC;IAChC,6BAA6B;IAC7B,4BAA4B;IAC5B,yBAAyB;IACzB,mCAAmC;IACnC,MAAM,UAAU,GACd,wFAAwF,CAAC;IAE3F,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;QAC/B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QAE1C,4CAA4C;QAC5C,IAAI,MAAkC,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,cAAc,GAAG,oBAAoB,CACzC,OAAO,EACP,UAAU,EACV,KAAK,CAAC,KAAK,CACZ,CAAC;YACF,MAAM,GAAG,8BAA8B,CAAC,cAAc,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,gDAAgD;YAChD,MAAM,GAAG,SAAS,CAAC;QACrB,CAAC;QAED,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,UAAU,GAA4B,IAAI,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC7B,IAAI,IAAI,EAAE,CAAC;oBACT,UAAU,GAAG,MAAM,CAAC;gBACtB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;YAElB,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC/B,IAAI,KAAK,EAAE,CAAC;wBACV,UAAU,GAAG,OAAO,CAAC;oBACvB,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;YACpB,CAAC;YAED,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC,IAAI,CAAC;oBACd,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;oBACf,EAAE;oBACF,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,WAAW;oBACX,gBAAgB;oBAChB,MAAM;iBACP,CAAC,CAAC;YACL,CAAC;QACH,CAAC;aAAM,CAAC;YACN,2CAA2C;YAC3C,kDAAkD;YAClD,MAAM,IAAI,GAAqB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;YAEtE,UAAU,CAAC,IAAI,CAAC;gBACd,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;gBACf,EAAE;gBACF,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,WAAW;gBACX,gBAAgB;gBAChB,MAAM;aACP,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAC/B,IAAO,EACP,OAAe;IAEf,OAAO,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,eAAuB,EACvB,OAAmB;IAEnB,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;IAEvC,0CAA0C;IAC1C,MAAM,MAAM,GAAG;QACb,GAAG,MAAM,CAAC,IAAI;QACd,GAAG,OAAO;KACX,CAAC;IAEF,wEAAwE;IACxE,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CACnE,CAAC;IAEF,OAAO,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACnD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,QAAgB,EAChB,OAAmB;IAEnB,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAC5B,IAAO,EACP,OAAe;IAEf,OAAO,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,IAAO,EACP,OAAe;IAEf,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/C,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAe;IAEf,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC,IAAS,CAAC;AAC1B,CAAC;AAsBD;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAE5C,+CAA+C;IAC/C,MAAM,oBAAoB,GAAG,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAC9E,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GACd,oBAAoB,CAAC,KAAM,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE/D,mEAAmE;IACnE,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,QAAQ;QAC7B,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;QAC3C,CAAC,CAAC,gBAAgB,CAAC;IAErB,yDAAyD;IACzD,MAAM,eAAe,GACnB,yJAAyJ,CAAC;IAE5J,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC/D,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC;QAE5E,oFAAoF;QACpF,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CACrC,oCAAoC,CACrC,CAAC;QAEF,MAAM,YAAY,GAAyB;YACzC,EAAE;YACF,MAAM;YACN,SAAS,EAAE,SAAS,IAAI,SAAS;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE;gBACnC,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBACjE,MAAM,EACJ,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG;oBACxB,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG;wBAC1B,CAAC,CAAC,WAAW;wBACb,CAAC,CAAC,OAAO;aAChB;YACD,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;YACrB,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE;YACvB,SAAS,EAAE,EAAE,EAAE,kDAAkD;SAClE,CAAC;QAEF,uBAAuB;QACvB,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAClE,IAAI,eAAe,EAAE,CAAC;YACpB,YAAY,CAAC,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAAgC;IAEhC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,MAAM,GAAG,iCAAiC,CAAC;IAE/C,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QAC1B,6BAA6B;QAC7B,MAAM,eAAe,GACnB,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,OAAO;YAC5B,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,WAAW;gBAClC,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,GAAG,CAAC;QAEZ,kBAAkB;QAClB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,EAAE,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC5C,WAAW,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,UAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,eAAe,EAAE,CAAC;QACtF,CAAC;aAAM,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC5B,WAAW,GAAG,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,eAAe,EAAE,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,WAAW,eAAe,EAAE,CAAC;QAC7C,CAAC;QAED,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3D,MAAM,IAAI,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,IAAI,CAAC;QACtD,MAAM,IAAI,aAAa,EAAE,CAAC,IAAI,MAAM,CAAC;QACrC,MAAM,IAAI,iBAAiB,WAAW,MAAM,CAAC;QAC7C,MAAM,IAAI,eAAe,EAAE,CAAC,MAAM,MAAM,CAAC;QACzC,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,IAAI,CAAC;QAE5B,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAqB,EAAE,CAAC,UAAU,IAAI,CAAC;QACnD,CAAC;QAED,MAAM,IAAI,IAAI,CAAC;IACjB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,YAAoB,EACpB,QAAgC;IAEhC,8CAA8C;IAC9C,MAAM,oBAAoB,GAAG,YAAY,CAAC,KAAK,CAC7C,iCAAiC,CAClC,CAAC;IAEF,IAAI,oBAAoB,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,oBAAoB,CAAC,KAAM,CAAC;QAE/C,mEAAmE;QACnE,MAAM,gBAAgB,GAAG,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEjD,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAM,GAAG,CAAC,EAAE,CAAC;YACpC,yCAAyC;YACzC,MAAM,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC,KAAM,CAAC;YAC9C,YAAY;gBACV,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAED,8BAA8B;IAC9B,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,qDAAqD;QACrD,YAAY,GAAG,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,gBAAgB,CAAC;IAClE,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}

package/node_modules/@sudocode-ai/cli/dist/merge-resolver.d.ts

@@ -0,0 +1,85 @@
+/**
+ * JSONL merge conflict resolution
+ *
+ * Resolves git merge conflicts in issues.jsonl and specs.jsonl using:
+ * - UUID-based deduplication
+ * - Timestamp-based prioritization
+ * - Metadata merging (relationships, tags)
+ */
+import type { IssueJSONL, SpecJSONL } from "./types.js";
+export type JSONLEntity = IssueJSONL | SpecJSONL | Record<string, any>;
+/**
+ * Conflict section from parsing git conflict markers
+ */
+export interface ConflictSection {
+    type: "clean" | "conflict";
+    lines: string[];
+    ours?: string[];
+    theirs?: string[];
+    marker?: ConflictMarker;
+}
+/**
+ * Conflict marker metadata
+ */
+export interface ConflictMarker {
+    start: number;
+    middle: number;
+    end: number;
+    oursLabel: string;
+    theirsLabel: string;
+}
+/**
+ * Resolution options
+ */
+export interface ResolveOptions {
+    verbose?: boolean;
+}
+/**
+ * Resolution result with statistics
+ */
+export interface ResolvedResult<T> {
+    entities: T[];
+    stats: ResolutionStats;
+}
+/**
+ * Resolution statistics
+ */
+export interface ResolutionStats {
+    totalInput: number;
+    totalOutput: number;
+    conflicts: ConflictResolution[];
+}
+/**
+ * Individual conflict resolution record
+ */
+export interface ConflictResolution {
+    type: "different-uuids" | "same-uuid-different-id" | "same-uuid-same-id";
+    uuid: string;
+    originalIds: string[];
+    resolvedIds: string[];
+    action: string;
+}
+/**
+ * Check if file contains git conflict markers
+ */
+export declare function hasGitConflictMarkers(filePath: string): boolean;
+/**
+ * Parse JSONL file containing git conflict markers
+ * Returns structured representation of clean sections and conflicts
+ */
+export declare function parseMergeConflictFile(content: string): ConflictSection[];
+/**
+ * Merge metadata from multiple versions of same entity
+ */
+export declare function mergeMetadata<T extends JSONLEntity>(entities: T[]): T;
+/**
+ * Resolve all entities using UUID-based deduplication
+ * Handles different UUIDs, same UUID conflicts, and metadata merging
+ */
+export declare function resolveEntities<T extends JSONLEntity>(entities: T[], options?: ResolveOptions): ResolvedResult<T>;
+/**
+ * Three-way merge for git merge driver
+ * Merges base, ours, and theirs versions
+ */
+export declare function mergeThreeWay<T extends JSONLEntity>(base: T[], ours: T[], theirs: T[]): ResolvedResult<T>;
+//# sourceMappingURL=merge-resolver.d.ts.map

package/node_modules/@sudocode-ai/cli/dist/merge-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-resolver.d.ts","sourceRoot":"","sources":["../src/merge-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,EAAE,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,kBAAkB,EAAE,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,iBAAiB,GAAG,wBAAwB,GAAG,mBAAmB,CAAC;IACzE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAW/D;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CA0FzE;AAmCD;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAsDrE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS,WAAW,EACnD,QAAQ,EAAE,CAAC,EAAE,EACb,OAAO,GAAE,cAAmB,GAC3B,cAAc,CAAC,CAAC,CAAC,CAuHnB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,WAAW,EACjD,IAAI,EAAE,CAAC,EAAE,EACT,IAAI,EAAE,CAAC,EAAE,EACT,MAAM,EAAE,CAAC,EAAE,GACV,cAAc,CAAC,CAAC,CAAC,CAMnB"}