@joshski/dust 0.1.96 → 0.1.97

package/dist/loop/git-pull.d.ts

@@ -1,9 +1,9 @@
 import type { spawn as nodeSpawn } from 'node:child_process';
-type GitPullResult = {
+type PullResult = {
     success: true;
 } | {
     success: false;
     message: string;
 };
-export declare function gitPull(cwd: string, spawn: typeof nodeSpawn): Promise<GitPullResult>;
+export declare function gitPull(cwd: string, spawn: typeof nodeSpawn): Promise<PullResult>;
 export {};

package/dist/types.d.ts

@@ -5,7 +5,7 @@
  * the event protocol, workflow tasks, and idea structures.
  */
 export type { AgentSessionEvent, EventMessage } from './agent-events';
-export type { Idea, IdeaOpenQuestion, IdeaOption } from './artifacts/ideas';
+export type { Idea, IdeaOpenQuestion, IdeaOption, ParsedIdeaContent, } from './artifacts/ideas';
 export type { ArtifactType, TaskGraph, TaskGraphNode } from './artifacts/index';
 export type { Task } from './artifacts/tasks';
 export type { CreateIdeaTransitionTaskResult, DecomposeIdeaOptions, IdeaInProgress, OpenQuestionResponse, ParsedCaptureIdeaTask, WorkflowTaskMatch, WorkflowTaskType, } from './artifacts/workflow-tasks';

package/dist/validation.js

@@ -7,50 +7,68 @@ function extractTitle(content) {
   return match ? match[1].trim() : null;
 }
 var MARKDOWN_LINK_PATTERN = /\[([^\]]+)\]\(([^)]+)\)/;
-function extractOpeningSentence(content) {
-  const lines = content.split(`
-`);
-  let h1Index = -1;
+function findH1Index(lines) {
   for (let i = 0;i < lines.length; i++) {
     if (lines[i].match(/^#\s+.+$/)) {
-      h1Index = i;
-      break;
+      return i;
     }
   }
-  if (h1Index === -1) {
-    return null;
+  return -1;
+}
+function findFirstNonBlankLineAfter(lines, startIndex) {
+  for (let i = startIndex + 1;i < lines.length; i++) {
+    if (lines[i].trim() !== "") {
+      return i;
+    }
+  }
+  return -1;
+}
+var LIST_ITEM_PREFIXES = ["-", "*", "+"];
+var STRUCTURAL_PREFIXES = ["#", "```", ">"];
+function isStructuralElement(line) {
+  if (STRUCTURAL_PREFIXES.some((prefix) => line.startsWith(prefix))) {
+    return true;
   }
-  let paragraphStart = -1;
-  for (let i = h1Index + 1;i < lines.length; i++) {
+  if (LIST_ITEM_PREFIXES.some((prefix) => line.startsWith(prefix))) {
+    return true;
+  }
+  return /^\d+\./.test(line);
+}
+function isBlockBreak(line) {
+  return STRUCTURAL_PREFIXES.some((prefix) => line.startsWith(prefix));
+}
+function collectParagraph(lines, startIndex) {
+  const parts = [];
+  for (let i = startIndex;i < lines.length; i++) {
     const line = lines[i].trim();
-    if (line !== "") {
-      paragraphStart = i;
+    if (line === "" || isBlockBreak(line)) {
       break;
     }
+    parts.push(line);
   }
-  if (paragraphStart === -1) {
+  return parts.join(" ");
+}
+function extractFirstSentence(paragraph) {
+  const match = paragraph.match(/^(.+?[.?!])(?:\s|$)/);
+  return match ? match[1] : null;
+}
+function extractOpeningSentence(content) {
+  const lines = content.split(`
+`);
+  const h1Index = findH1Index(lines);
+  if (h1Index === -1) {
     return null;
   }
-  const firstLine = lines[paragraphStart];
-  const trimmedFirstLine = firstLine.trim();
-  if (trimmedFirstLine.startsWith("#") || trimmedFirstLine.startsWith("-") || trimmedFirstLine.startsWith("*") || trimmedFirstLine.startsWith("+") || trimmedFirstLine.match(/^\d+\./) || trimmedFirstLine.startsWith("```") || trimmedFirstLine.startsWith(">")) {
+  const paragraphStart = findFirstNonBlankLineAfter(lines, h1Index);
+  if (paragraphStart === -1) {
     return null;
   }
-  let paragraph = "";
-  for (let i = paragraphStart;i < lines.length; i++) {
-    const line = lines[i].trim();
-    if (line === "")
-      break;
-    if (line.startsWith("#") || line.startsWith("```") || line.startsWith(">")) {
-      break;
-    }
-    paragraph += (paragraph ? " " : "") + line;
-  }
-  const sentenceMatch = paragraph.match(/^(.+?[.?!])(?:\s|$)/);
-  if (!sentenceMatch) {
+  const trimmedFirstLine = lines[paragraphStart].trim();
+  if (isStructuralElement(trimmedFirstLine)) {
     return null;
   }
-  return sentenceMatch[1];
+  const paragraph = collectParagraph(lines, paragraphStart);
+  return extractFirstSentence(paragraph);
 }
 
 // lib/lint/validators/content-validator.ts
@@ -208,6 +226,32 @@ var WORKFLOW_PREFIX_TO_SECTION = {
   "Shelve Idea: ": "Shelves Idea",
   "Expedite Idea: ": "Expedites Idea"
 };
+function validateH2Heading(filePath, line, lineNumber, inOpenQuestions, currentQuestionLine) {
+  const violations = [];
+  if (inOpenQuestions && currentQuestionLine !== null) {
+    violations.push({
+      file: filePath,
+      message: "Question has no options listed beneath it",
+      line: currentQuestionLine
+    });
+  }
+  if (inOpenQuestions && line !== "## Open Questions") {
+    violations.push({
+      file: filePath,
+      message: "Open Questions must be the last section in an idea file. Move this section above ## Open Questions.",
+      line: lineNumber
+    });
+  }
+  const headingText = line.slice(3).trimEnd();
+  if (headingText.toLowerCase() === "open questions" && headingText !== "Open Questions") {
+    violations.push({
+      file: filePath,
+      message: `Heading "${line.trimEnd()}" should be "## Open Questions"`,
+      line: lineNumber
+    });
+  }
+  return violations;
+}
 function validateIdeaOpenQuestions(filePath, content) {
   const violations = [];
   const lines = content.split(`
@@ -221,22 +265,21 @@ function validateIdeaOpenQuestions(filePath, content) {
     const line = lines[i];
     const trimmedLine = line.trimEnd();
     const nonWhitespaceLine = line.trim();
-    if (line.startsWith("## ")) {
-      if (inOpenQuestions && currentQuestionLine !== null) {
-        violations.push({
-          file: filePath,
-          message: "Question has no options listed beneath it",
-          line: currentQuestionLine
-        });
-      }
-      const headingText = line.slice(3).trimEnd();
-      if (headingText.toLowerCase() === "open questions" && headingText !== "Open Questions") {
+    if (inOpenQuestions && line.startsWith("```")) {
+      if (!inOption && !inCodeBlock) {
         violations.push({
           file: filePath,
-          message: `Heading "${line.trimEnd()}" should be "## Open Questions"`,
+          message: topLevelStructureMessage,
           line: i + 1
         });
       }
+      inCodeBlock = !inCodeBlock;
+      continue;
+    }
+    if (inCodeBlock)
+      continue;
+    if (line.startsWith("## ")) {
+      violations.push(...validateH2Heading(filePath, line, i + 1, inOpenQuestions, currentQuestionLine));
       inOpenQuestions = line === "## Open Questions";
       currentQuestionLine = null;
       inOption = false;
@@ -245,19 +288,6 @@ function validateIdeaOpenQuestions(filePath, content) {
     }
     if (!inOpenQuestions)
       continue;
-    if (line.startsWith("```")) {
-      if (!inOption && !inCodeBlock) {
-        violations.push({
-          file: filePath,
-          message: topLevelStructureMessage,
-          line: i + 1
-        });
-      }
-      inCodeBlock = !inCodeBlock;
-      continue;
-    }
-    if (inCodeBlock)
-      continue;
     if (line.startsWith("### ")) {
       inOption = false;
       if (currentQuestionLine !== null) {
@@ -825,8 +855,37 @@ function relativizeViolations(violations, cwd) {
     file: relativizeViolationFilePath(violation.file, cwd)
   }));
 }
-async function validatePatch(fileSystem, dustPath, patch, options = {}) {
-  const cwd = options.cwd ?? process.cwd();
+var CONTENT_DIRS = ["principles", "facts", "ideas", "tasks"];
+function validateContentFile(filePath, content) {
+  const violations = [];
+  const openingSentence = validateOpeningSentence(filePath, content);
+  if (openingSentence)
+    violations.push(openingSentence);
+  const openingSentenceLength = validateOpeningSentenceLength(filePath, content);
+  if (openingSentenceLength)
+    violations.push(openingSentenceLength);
+  const titleFilename = validateTitleFilenameMatch(filePath, content);
+  if (titleFilename)
+    violations.push(titleFilename);
+  return violations;
+}
+function validateTaskFile(filePath, content, ideasPath, overlayFs) {
+  const violations = [];
+  const filenameViolation = validateFilename(filePath);
+  if (filenameViolation)
+    violations.push(filenameViolation);
+  violations.push(...validateTaskHeadings(filePath, content));
+  violations.push(...validateSemanticLinks(filePath, content));
+  const imperativeViolation = validateImperativeOpeningSentence(filePath, content);
+  if (imperativeViolation)
+    violations.push(imperativeViolation);
+  const ideaTransition = validateIdeaTransitionTitle(filePath, content, ideasPath, overlayFs);
+  if (ideaTransition)
+    violations.push(ideaTransition);
+  violations.push(...validateWorkflowTaskBodySection(filePath, content, ideasPath, overlayFs));
+  return violations;
+}
+function parsePatchFiles(dustPath, patch) {
   const absolutePatchFiles = new Map;
   const deletedPaths = new Set;
   for (const [relativePath, content] of Object.entries(patch.files)) {
@@ -837,20 +896,51 @@ async function validatePatch(fileSystem, dustPath, patch, options = {}) {
       absolutePatchFiles.set(absolutePath, content);
     }
   }
-  const overlayFs = createOverlayFileSystem(fileSystem, absolutePatchFiles, deletedPaths);
-  const violations = [];
-  violations.push(...validatePatchRootEntries(fileSystem, dustPath, patch));
-  const contentDirs = ["principles", "facts", "ideas", "tasks"];
+  return { absolutePatchFiles, deletedPaths };
+}
+function collectPatchDirs(patch) {
   const patchDirs = new Set;
   for (const relativePath of Object.keys(patch.files)) {
     const dir = relativePath.split("/")[0];
-    if (contentDirs.includes(dir)) {
+    if (CONTENT_DIRS.includes(dir)) {
       patchDirs.add(dir);
     }
   }
+  return patchDirs;
+}
+async function validatePrincipleRelationships(dustPath, overlayFs) {
+  const allRelationships = [];
+  const principlesPath = `${dustPath}/principles`;
+  try {
+    const existingFiles = await overlayFs.readdir(principlesPath);
+    for (const file of existingFiles) {
+      if (!file.endsWith(".md"))
+        continue;
+      const filePath = `${principlesPath}/${file}`;
+      const content = await overlayFs.readFile(filePath);
+      allRelationships.push(extractPrincipleRelationships(filePath, content));
+    }
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      throw error;
+    }
+  }
+  return [
+    ...validateBidirectionalLinks(allRelationships),
+    ...validateNoCycles(allRelationships)
+  ];
+}
+async function validatePatch(fileSystem, dustPath, patch, options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const { absolutePatchFiles, deletedPaths } = parsePatchFiles(dustPath, patch);
+  const overlayFs = createOverlayFileSystem(fileSystem, absolutePatchFiles, deletedPaths);
+  const violations = [];
+  violations.push(...validatePatchRootEntries(fileSystem, dustPath, patch));
+  const patchDirs = collectPatchDirs(patch);
   for (const dir of patchDirs) {
     violations.push(...await validateContentDirectoryFiles(`${dustPath}/${dir}`, overlayFs));
   }
+  const ideasPath = `${dustPath}/ideas`;
   for (const [relativePath, content] of Object.entries(patch.files)) {
     if (content === null)
       continue;
@@ -859,34 +949,14 @@ async function validatePatch(fileSystem, dustPath, patch, options = {}) {
     const filePath = `${dustPath}/${relativePath}`;
     const dir = relativePath.split("/")[0];
     violations.push(...validateLinks(filePath, content, overlayFs));
-    if (contentDirs.includes(dir)) {
-      const openingSentence = validateOpeningSentence(filePath, content);
-      if (openingSentence)
-        violations.push(openingSentence);
-      const openingSentenceLength = validateOpeningSentenceLength(filePath, content);
-      if (openingSentenceLength)
-        violations.push(openingSentenceLength);
-      const titleFilename = validateTitleFilenameMatch(filePath, content);
-      if (titleFilename)
-        violations.push(titleFilename);
+    if (CONTENT_DIRS.includes(dir)) {
+      violations.push(...validateContentFile(filePath, content));
     }
     if (dir === "ideas") {
       violations.push(...validateIdeaOpenQuestions(filePath, content));
     }
     if (dir === "tasks") {
-      const filenameViolation = validateFilename(filePath);
-      if (filenameViolation)
-        violations.push(filenameViolation);
-      violations.push(...validateTaskHeadings(filePath, content));
-      violations.push(...validateSemanticLinks(filePath, content));
-      const imperativeViolation = validateImperativeOpeningSentence(filePath, content);
-      if (imperativeViolation)
-        violations.push(imperativeViolation);
-      const ideasPath = `${dustPath}/ideas`;
-      const ideaTransition = validateIdeaTransitionTitle(filePath, content, ideasPath, overlayFs);
-      if (ideaTransition)
-        violations.push(ideaTransition);
-      violations.push(...validateWorkflowTaskBodySection(filePath, content, ideasPath, overlayFs));
+      violations.push(...validateTaskFile(filePath, content, ideasPath, overlayFs));
     }
     if (dir === "principles") {
       violations.push(...validatePrincipleHierarchySections(filePath, content));
@@ -895,24 +965,7 @@ async function validatePatch(fileSystem, dustPath, patch, options = {}) {
   }
   const hasPrinciplePatches = Object.keys(patch.files).some((p) => p.startsWith("principles/"));
   if (hasPrinciplePatches) {
-    const allRelationships = [];
-    const principlesPath = `${dustPath}/principles`;
-    try {
-      const existingFiles = await overlayFs.readdir(principlesPath);
-      for (const file of existingFiles) {
-        if (!file.endsWith(".md"))
-          continue;
-        const filePath = `${principlesPath}/${file}`;
-        const content = await overlayFs.readFile(filePath);
-        allRelationships.push(extractPrincipleRelationships(filePath, content));
-      }
-    } catch (error) {
-      if (error.code !== "ENOENT") {
-        throw error;
-      }
-    }
-    violations.push(...validateBidirectionalLinks(allRelationships));
-    violations.push(...validateNoCycles(allRelationships));
+    violations.push(...await validatePrincipleRelationships(dustPath, overlayFs));
   }
   return {
     valid: violations.length === 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joshski/dust",
-  "version": "0.1.96",
+  "version": "0.1.97",
   "description": "Flow state for AI coding agents",
   "type": "module",
   "bin": {