savepoint 1.0.1 → 1.0.3

package/internal/data/parser_test.go

@@ -146,7 +146,7 @@ objective: "Style the board"
 	}
 }
 
-func TestParseTaskFile_rejectsPhaseOutsideInProgress(t *testing.T) {
+func TestParseTaskFile_allowsPhaseOutsideInProgress(t *testing.T) {
 	p := NewParser()
 	content := `---
 id: E06/T001
@@ -158,12 +158,12 @@ objective: "Style the board"
 # Task`
 
 	_, err := p.ParseTaskFile("test.md", content)
-	if err == nil {
-		t.Fatal("ParseTaskFile() expected invalid phase/status error")
+	if err != nil {
+		t.Fatalf("ParseTaskFile() error = %v, want no error for legacy phase field", err)
 	}
 }
 
-func TestParseTaskFile_rejectsInProgressWithoutPhase(t *testing.T) {
+func TestParseTaskFile_includesDefaultBuildForInProgress(t *testing.T) {
 	p := NewParser()
 	content := `---
 id: E06/T001
@@ -173,9 +173,33 @@ objective: "Style the board"
 
 # Task`
 
-	_, err := p.ParseTaskFile("test.md", content)
-	if err == nil {
-		t.Fatal("ParseTaskFile() expected missing phase error")
+	task, err := p.ParseTaskFile("test.md", content)
+	if err != nil {
+		t.Fatalf("ParseTaskFile() error = %v", err)
+	}
+	if task.Stage != StageBuild {
+		t.Fatalf("ParseTaskFile() expected StageBuild default, got %q", task.Stage)
+	}
+}
+
+func TestParseTaskFile_prefersPhaseOverLegacyStage(t *testing.T) {
+	p := NewParser()
+	content := `---
+id: E06/T001
+status: in_progress
+stage: build
+phase: test
+objective: "Style the board"
+---
+
+# Task`
+
+	task, err := p.ParseTaskFile("test.md", content)
+	if err != nil {
+		t.Fatalf("ParseTaskFile() error = %v", err)
+	}
+	if task.Stage != StageTest {
+		t.Fatalf("Task.Stage = %q, want test from phase", task.Stage)
 	}
 }
 
@@ -220,3 +244,38 @@ Notes here.`
 		t.Errorf("Task.Checklist[1] = %+v, want {Text:\"Second checklist item.\", Done:true}", task.Checklist[1])
 	}
 }
+
+func TestParseTaskFile_joinsHardWrappedChecklistItems(t *testing.T) {
+	p := NewParser()
+	content := `---
+id: E06/T001
+status: planned
+objective: "Style the board"
+---
+
+# Task
+
+## Implementation Plan
+
+- [ ] First sentence spans across a hard markdown line break
+  before it ends. Second sentence stays in the same checklist item.
+- [x] Already checked sentence wraps
+  without becoming another checklist item.
+`
+
+	task, err := p.ParseTaskFile("test.md", content)
+	if err != nil {
+		t.Fatalf("ParseTaskFile() error = %v", err)
+	}
+	if len(task.Checklist) != 2 {
+		t.Fatalf("Task.Checklist len = %d, want 2", len(task.Checklist))
+	}
+	wantFirst := "First sentence spans across a hard markdown line break before it ends. Second sentence stays in the same checklist item."
+	if task.Checklist[0].Text != wantFirst || task.Checklist[0].Done {
+		t.Errorf("Task.Checklist[0] = %+v, want text %q and Done=false", task.Checklist[0], wantFirst)
+	}
+	wantSecond := "Already checked sentence wraps without becoming another checklist item."
+	if task.Checklist[1].Text != wantSecond || !task.Checklist[1].Done {
+		t.Errorf("Task.Checklist[1] = %+v, want text %q and Done=true", task.Checklist[1], wantSecond)
+	}
+}

package/internal/data/task.go

@@ -35,6 +35,7 @@ type Task struct {
 	ID          string        `yaml:"id"`
 	Title       string        `yaml:"title"`
 	Description string        `yaml:"description,omitempty"`
+	Status      string        `yaml:"status,omitempty"`
 	Epic        string        `yaml:"epic"`
 	Release     string        `yaml:"release"`
 	Column      ColumnType    `yaml:"column"`

package/internal/data/write.go

@@ -11,9 +11,88 @@ import (
 )
 
 var ErrMtimeConflict = fmt.Errorf("file modified since last read")
+var ErrProposalNotFound = fmt.Errorf("target text not found in file")
+
+// ApplyProposal replaces the first occurrence of old with newText in the file at path.
+func ApplyProposal(path, old, newText string) error {
+	content, err := os.ReadFile(path)
+	if err != nil {
+		return fmt.Errorf("read %s: %w", path, err)
+	}
+	normalized := normalizeLineEndings(string(content))
+	if !strings.Contains(normalized, old) {
+		return fmt.Errorf("%w: %s", ErrProposalNotFound, path)
+	}
+	updated := strings.Replace(normalized, old, newText, 1)
+	return os.WriteFile(path, []byte(updated), 0644)
+}
+
+// UpdateEpicStatus sets the status field in the frontmatter of an E##-Detail.md file.
+func UpdateEpicStatus(path, status string) error {
+	return updateFrontmatterField(path, "status", status)
+}
+
+// UpdateLastAudited sets the last_audited field in the frontmatter of Design.md.
+func UpdateLastAudited(path, value string) error {
+	return updateFrontmatterField(path, "last_audited", value)
+}
+
+// SplitFrontmatterBody splits content into frontmatter YAML and body.
+func SplitFrontmatterBody(content string) (yamlStr string, body string, err error) {
+	normalized := normalizeLineEndings(content)
+	raw, err := extractFrontmatter(normalized)
+	if err != nil {
+		return "", "", err
+	}
+	delimLen := 4
+	bodyStart := delimLen + len(raw) + delimLen
+	body = ""
+	if bodyStart < len(normalized) {
+		body = normalized[bodyStart:]
+	}
+	return raw, body, nil
+}
+
+func updateFrontmatterField(path, key, value string) error {
+	content, err := os.ReadFile(path)
+	if err != nil {
+		return fmt.Errorf("read %s: %w", path, err)
+	}
+
+	normalized := normalizeLineEndings(string(content))
+
+	raw, body, err := SplitFrontmatterBody(normalized)
+	if err != nil {
+		return fmt.Errorf("extract frontmatter: %w", err)
+	}
+
+	var doc yaml.Node
+	if err := yaml.Unmarshal([]byte(raw), &doc); err != nil {
+		return fmt.Errorf("parse yaml: %w", err)
+	}
+
+	if doc.Kind != yaml.DocumentNode || len(doc.Content) == 0 {
+		return fmt.Errorf("unexpected yaml structure")
+	}
+
+	mapping := doc.Content[0]
+	if mapping.Kind != yaml.MappingNode {
+		return fmt.Errorf("frontmatter is not a mapping")
+	}
+
+	setMappingField(mapping, key, value)
+
+	out, err := yaml.Marshal(&doc)
+	if err != nil {
+		return fmt.Errorf("marshal yaml: %w", err)
+	}
+
+	newContent := "---\n" + strings.TrimSpace(string(out)) + "\n---" + body
+	return os.WriteFile(path, []byte(newContent), 0644)
+}
 
 func WriteTaskStatus(path string, task *Task, expectedMtime time.Time) error {
-	if err := ValidateTaskLifecycle(*task); err != nil {
+	if err := ValidateTaskLifecycle(task); err != nil {
 		return err
 	}
 
@@ -31,9 +110,9 @@ func WriteTaskStatus(path string, task *Task, expectedMtime time.Time) error {
 		return fmt.Errorf("read %s: %w", path, err)
 	}
 
-	normalized := strings.ReplaceAll(string(content), "\r\n", "\n")
+	normalized := normalizeLineEndings(string(content))
 
-	raw, err := extractFrontmatter(normalized)
+	raw, body, err := SplitFrontmatterBody(normalized)
 	if err != nil {
 		return fmt.Errorf("extract frontmatter: %w", err)
 	}
@@ -56,8 +135,10 @@ func WriteTaskStatus(path string, task *Task, expectedMtime time.Time) error {
 
 	if task.Stage == "" {
 		removeMappingField(mapping, "phase")
+		removeMappingField(mapping, "stage")
 	} else {
 		setMappingField(mapping, "phase", string(task.Stage))
+		removeMappingField(mapping, "stage")
 	}
 
 	out, err := yaml.Marshal(&doc)
@@ -65,13 +146,6 @@ func WriteTaskStatus(path string, task *Task, expectedMtime time.Time) error {
 		return fmt.Errorf("marshal yaml: %w", err)
 	}
 
-	delimLen := 4
-	bodyStart := delimLen + len(raw) + delimLen
-	body := ""
-	if bodyStart < len(normalized) {
-		body = normalized[bodyStart:]
-	}
-
 	newContent := "---\n" + strings.TrimSpace(string(out)) + "\n---" + body
 
 	return os.WriteFile(path, []byte(newContent), 0644)
@@ -115,7 +189,7 @@ func WriteRouterState(root string, state *RouterState, expectedMtime time.Time)
 		return fmt.Errorf("read %s: %w", path, err)
 	}
 
-	normalized := strings.ReplaceAll(string(content), "\r\n", "\n")
+	normalized := normalizeLineEndings(string(content))
 
 	startIdx := strings.Index(normalized, stateBlockStart)
 	if startIdx == -1 {

package/internal/data/write_test.go

@@ -206,6 +206,79 @@ objective: "No phase yet"
 	}
 }
 
+func TestWriteTaskStatus_defaultsInProgressPhaseWhenStageMissing(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "task.md")
+	content := `---
+id: E01/T010
+status: planned
+objective: "No phase yet"
+---`
+
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	fi, _ := os.Stat(path)
+
+	task := &Task{
+		ID:     "E01/T010",
+		Column: ColumnInProgress,
+	}
+
+	if err := WriteTaskStatus(path, task, fi.ModTime()); err != nil {
+		t.Fatalf("WriteTaskStatus() error = %v", err)
+	}
+
+	result, _ := os.ReadFile(path)
+
+	if !strings.Contains(string(result), "phase: build") {
+		t.Error("phase field should default to build for in_progress writes")
+	}
+}
+
+func TestWriteTaskStatus_removesLegacyStageField(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "task.md")
+	content := `---
+id: E01/T009
+status: in_progress
+stage: build
+phase: build
+objective: "Legacy mixed fields"
+---`
+
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	fi, _ := os.Stat(path)
+	task := &Task{
+		ID:     "E01/T009",
+		Column: ColumnInProgress,
+		Stage:  StageTest,
+	}
+
+	if err := WriteTaskStatus(path, task, fi.ModTime()); err != nil {
+		t.Fatalf("WriteTaskStatus() error = %v", err)
+	}
+
+	result, _ := os.ReadFile(path)
+	if strings.Contains(string(result), "stage:") {
+		t.Error("legacy stage field should be removed")
+	}
+	if !strings.Contains(string(result), "phase: test") {
+		t.Error("phase field should be updated to test")
+	}
+	parsed, err := NewParser().ParseTaskFile(path, string(result))
+	if err != nil {
+		t.Fatalf("ParseTaskFile() error = %v", err)
+	}
+	if parsed.Stage != StageTest {
+		t.Errorf("Stage = %q, want test", parsed.Stage)
+	}
+}
+
 func TestWriteTaskStatus_preservesBodyWithMultipleLines(t *testing.T) {
 	dir := t.TempDir()
 	path := filepath.Join(dir, "task.md")
@@ -408,6 +481,100 @@ next_action: "Do the thing"
 	}
 }
 
+func TestApplyProposal_replacesText(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "Design.md")
+	content := "# Architecture\n\nOld section text.\n\nMore content."
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := ApplyProposal(path, "Old section text.", "New section text."); err != nil {
+		t.Fatalf("ApplyProposal() error = %v", err)
+	}
+
+	result, _ := os.ReadFile(path)
+	if !strings.Contains(string(result), "New section text.") {
+		t.Error("replacement not applied")
+	}
+	if strings.Contains(string(result), "Old section text.") {
+		t.Error("old text still present")
+	}
+	if !strings.Contains(string(result), "More content.") {
+		t.Error("surrounding content not preserved")
+	}
+}
+
+func TestApplyProposal_missingTarget(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "Design.md")
+	if err := os.WriteFile(path, []byte("some content"), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	err := ApplyProposal(path, "not present", "replacement")
+	if err == nil {
+		t.Fatal("ApplyProposal() expected error for missing target")
+	}
+}
+
+func TestUpdateEpicStatus_setsStatusField(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "E06-Detail.md")
+	content := "---\ntype: epic-design\nstatus: planned\n---\n\n# E06 Body"
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := UpdateEpicStatus(path, "audited"); err != nil {
+		t.Fatalf("UpdateEpicStatus() error = %v", err)
+	}
+
+	result, _ := os.ReadFile(path)
+	if !strings.Contains(string(result), "status: audited") {
+		t.Error("status not updated to audited")
+	}
+	if !strings.Contains(string(result), "# E06 Body") {
+		t.Error("body not preserved")
+	}
+}
+
+func TestUpdateLastAudited_setsField(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "Design.md")
+	content := "---\ntype: project-design\nstatus: active\nlast_audited: v1.1/E05-tasking-permissions\n---\n\n# Body"
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := UpdateLastAudited(path, "v1.1/E06-audit-command"); err != nil {
+		t.Fatalf("UpdateLastAudited() error = %v", err)
+	}
+
+	result, _ := os.ReadFile(path)
+	if !strings.Contains(string(result), "last_audited: v1.1/E06-audit-command") {
+		t.Error("last_audited not updated")
+	}
+}
+
+func TestUpdateLastAudited_addsFieldIfMissing(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "Design.md")
+	content := "---\ntype: project-design\nstatus: active\n---\n\n# Body"
+	if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := UpdateLastAudited(path, "v1.1/E06-audit-command"); err != nil {
+		t.Fatalf("UpdateLastAudited() error = %v", err)
+	}
+
+	result, _ := os.ReadFile(path)
+	if !strings.Contains(string(result), "last_audited: v1.1/E06-audit-command") {
+		t.Error("last_audited not added")
+	}
+}
+
 func TestWriteTaskStatus_noFrontmatter(t *testing.T) {
 	dir := t.TempDir()
 	path := filepath.Join(dir, "task.md")