relay-flow 0.3.10-alpha → 0.3.12-alpha

package/internal/task/jira/jira.go

@@ -66,17 +66,16 @@ const (
 	defaultWorkTaskStatus     = "In Progress"
 	defaultEndParentStatus    = "Done"
 	currentUserAssigneeFilter = "currentUser()"
-	defaultMailboxDescription = `Parent ticket: {{ticket}}
-Workflow: {{workflow}}
-Node: {{node}}
-Node type: {{nodeType}}
-Agent: {{agent}}
-Mailbox: {{mailbox}}
-
-Node work:
+	defaultMailboxDescription = `{{ticket}} / {{node}} — {{nodeType}} — {{agent}}
 {{nodeDescription}}
 
-Read this mailbox's comments for feedback from previous nodes.`
+Success routes:
+{{successRoutes}}
+
+Failure routes:
+{{failureRoutes}}
+
+{{report}}`
 	defaultSummaryComment = `Summary for {{node}}
 
 {{summaryReport}}`
@@ -93,6 +92,7 @@ var knownTextVars = map[string]bool{
 	"nodeDescription": true, "nextSteps": true, "successRoutes": true,
 	"failureRoutes": true, "mailbox": true, "sourceNode": true,
 	"targetNode": true, "summaryReport": true, "feedbackReport": true,
+	"report": true,
 }
 
 // DefaultConfig supplies Jira task-system text defaults for relay-flow init.
@@ -509,6 +509,11 @@ func validateTemplates(templates Templates) error {
 			}
 		}
 	}
+	for _, key := range []string{"report", "ticket", "node", "nodeType", "agent", "nodeDescription", "successRoutes", "failureRoutes"} {
+		if !strings.Contains(templates.MailboxDescription, "{{"+key+"}}") {
+			return fmt.Errorf("mailboxDescription must contain {{%s}}", key)
+		}
+	}
 	if !strings.Contains(templates.SummaryComment, "{{summaryReport}}") {
 		return fmt.Errorf("summaryComment must contain {{summaryReport}}")
 	}
@@ -535,11 +540,11 @@ func (s *system) RenderText(kind task.TextKind, data task.TextData) (string, err
 		"runID": data.RunID, "ticket": data.Ticket,
 		"workflow": data.Workflow, "repo": data.Repo, "node": data.Node,
 		"nodeType": data.NodeType, "agent": data.Agent,
-		"nodeDescription": data.NodeDescription, "nextSteps": data.NextSteps,
+		"nodeDescription": strings.ReplaceAll(data.NodeDescription, "{{ticket}}", data.Ticket), "nextSteps": data.NextSteps,
 		"successRoutes": data.SuccessRoutes, "failureRoutes": data.FailureRoutes,
 		"mailbox": data.Mailbox, "sourceNode": data.SourceNode,
 		"targetNode": data.TargetNode, "summaryReport": data.SummaryReport,
-		"feedbackReport": data.FeedbackReport,
+		"feedbackReport": data.FeedbackReport, "report": data.Report,
 	}
 	return textVarPattern.ReplaceAllStringFunc(tmpl, func(match string) string {
 		return values[textVarPattern.FindStringSubmatch(match)[1]]

package/internal/task/jira/templates_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/rajpopat27/relay-flow/internal/config"
 	"github.com/rajpopat27/relay-flow/internal/run"
 	"github.com/rajpopat27/relay-flow/internal/task"
+	"github.com/rajpopat27/relay-flow/internal/workflow"
 )
 
 func TestTaskTextTemplatesExposeValues(t *testing.T) {
@@ -17,7 +18,7 @@ func TestTaskTextTemplatesExposeValues(t *testing.T) {
 	sys, err := newSystem(context.Background(), &fakeClient{fake: fake}, task.RepoSpec{
 		Name: "payments",
 		RootConfig: config.RawValues{"templates": map[string]any{
-			"mailboxDescription": "mailbox {{runID}}|{{ticket}}|{{workflow}}|{{repo}}|{{node}}|{{nodeType}}|{{agent}}|{{nodeDescription}}|{{nextSteps}}|{{successRoutes}}|{{failureRoutes}}|{{mailbox}}",
+			"mailboxDescription": "mailbox {{runID}}|{{ticket}}|{{workflow}}|{{repo}}|{{node}}|{{nodeType}}|{{agent}}|{{nodeDescription}}|{{nextSteps}}|{{successRoutes}}|{{failureRoutes}}|{{mailbox}}|{{report}}",
 			"summaryComment":     "summary {{sourceNode}}|{{targetNode}}|{{mailbox}}\n{{summaryReport}}",
 			"feedbackComment":    "feedback {{sourceNode}}|{{targetNode}}|{{mailbox}}\n{{feedbackReport}}",
 		}},
@@ -31,7 +32,7 @@ func TestTaskTextTemplatesExposeValues(t *testing.T) {
 		Node: "review", NodeType: "hitl", Agent: "reviewer", NodeDescription: "Review changes.",
 		NextSteps: "implement; end", SuccessRoutes: "end", FailureRoutes: "implement",
 		Mailbox: "PAY-3", SourceNode: "review", TargetNode: "implement",
-		SummaryReport: "COMPLETED:\nreviewed", FeedbackReport: "REQUIRED ACTIONS:\nfix it",
+		SummaryReport: "COMPLETED:\nreviewed", FeedbackReport: "REQUIRED ACTIONS:\nfix it", Report: "STATUS: success | failure",
 	}
 	description, err := sys.RenderText(task.TextMailboxDescription, data)
 	if err != nil {
@@ -52,12 +53,47 @@ func TestTaskTextTemplatesExposeValues(t *testing.T) {
 	}
 }
 
+func TestJiraDefaultMailboxDescriptionIsCompact(t *testing.T) {
+	sys, err := newSystem(context.Background(), &fakeClient{fake: &fakeJira{}}, task.RepoSpec{
+		Name: "payments", RepoConfig: testRepoConfig(nil),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	data := task.TextData{
+		Ticket: "PAY-101", Node: "coder", NodeType: "agent", Agent: "coder",
+		NodeDescription: "Implement the change.", SuccessRoutes: "reviewer — when: ready",
+		FailureRoutes: "coder — when: retry", Report: workflow.ReportFormat,
+	}
+	description, err := sys.RenderText(task.TextMailboxDescription, data)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := "PAY-101 / coder — agent — coder\nImplement the change.\n\nSuccess routes:\nreviewer — when: ready\n\nFailure routes:\ncoder — when: retry\n\n" + workflow.ReportFormat
+	if description != want {
+		t.Fatalf("description = %q, want %q", description, want)
+	}
+	if strings.Contains(description, "comment history") {
+		t.Fatal("Jira description requested comment history")
+	}
+	data.NodeDescription = "Read the parent Jira ticket for this step:\nacli jira workitem view \"{{ticket}}\" --fields \"summary,description\" --json"
+	withParent, err := sys.RenderText(task.TextMailboxDescription, data)
+	if err != nil || !strings.Contains(withParent, `acli jira workitem view "PAY-101" --fields "summary,description" --json`) {
+		t.Fatalf("node-specific parent instruction = %q, %v", withParent, err)
+	}
+}
+
 func TestCommentTemplatesRequireReportValues(t *testing.T) {
 	for _, tc := range []struct {
 		name      string
 		override  map[string]any
 		wantError string
 	}{
+		{name: "description", override: map[string]any{"mailboxDescription": "missing"}, wantError: "mailboxDescription must contain {{report}}"},
+		{name: "report only", override: map[string]any{"mailboxDescription": "{{report}}"}, wantError: "mailboxDescription must contain {{ticket}}"},
+		{name: "no node work", override: map[string]any{"mailboxDescription": strings.Replace(defaultMailboxDescription, "{{nodeDescription}}", "No work provided", 1)}, wantError: "mailboxDescription must contain {{nodeDescription}}"},
+		{name: "no success routes", override: map[string]any{"mailboxDescription": strings.Replace(defaultMailboxDescription, "{{successRoutes}}", "None", 1)}, wantError: "mailboxDescription must contain {{successRoutes}}"},
+		{name: "no failure routes", override: map[string]any{"mailboxDescription": strings.Replace(defaultMailboxDescription, "{{failureRoutes}}", "None", 1)}, wantError: "mailboxDescription must contain {{failureRoutes}}"},
 		{name: "summary", override: map[string]any{"summaryComment": "missing"}, wantError: "summaryComment must contain {{summaryReport}}"},
 		{name: "feedback", override: map[string]any{"feedbackComment": "missing"}, wantError: "feedbackComment must contain {{feedbackReport}}"},
 		{name: "unknown", override: map[string]any{"mailboxDescription": "{{mailboxInstructions}}"}, wantError: "unknown template variable {{mailboxInstructions}}"},

package/internal/task/task.go

@@ -70,6 +70,7 @@ type TextData struct {
 	TargetNode      string
 	SummaryReport   string
 	FeedbackReport  string
+	Report          string
 }
 
 type Target struct {

package/internal/workflow/report.go

@@ -9,6 +9,13 @@ import (
 // represents an intentionally empty section.
 const None = "None"
 
+// ReportFormat is the canonical agent-facing contract. Runtime plugins parse
+// these four fields into the existing structured Report wire shape.
+const ReportFormat = `STATUS: success | failure
+NEXT STEP: <one valid route>
+SUMMARY: <concise result>
+FEEDBACK: <concise handoff, or None when NEXT STEP is end>`
+
 type Summary struct {
 	Completed        string `json:"completed"`
 	Commits          string `json:"commits"`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relay-flow",
-  "version": "0.3.10-alpha",
+  "version": "0.3.12-alpha",
   "description": "Graph-based agent workflow engine — tracker-agnostic, pluggable runners",
   "bin": {
     "relay-flow": "./bin/relay-flow.js",