relay-flow 0.3.9-alpha → 0.3.11-alpha

package/internal/execution/temporal/compact_mailbox_test.go

@@ -0,0 +1,56 @@
+package temporal
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/rajpopat27/relay-flow/internal/run"
+	"github.com/rajpopat27/relay-flow/internal/task"
+	"github.com/rajpopat27/relay-flow/internal/workflow"
+)
+
+type compactMailboxRenderer struct{ *lagTaskSystem }
+
+func (*compactMailboxRenderer) RenderText(_ task.TextKind, data task.TextData) (string, error) {
+	return data.Ticket + " / " + data.Node + " — " + data.NodeType + " — " + data.Agent +
+		"\n" + data.NodeDescription + "\nSuccess routes:\n" + data.SuccessRoutes +
+		"\nFailure routes:\n" + data.FailureRoutes + "\n" + data.Report, nil
+}
+
+func TestCompactMailboxTemplateDoesNotAppendGenericInstructions(t *testing.T) {
+	wf := workflow.Workflow{Name: "test", Nodes: map[string]workflow.Node{
+		"coder": {Type: workflow.NodeAgent, Agent: "coder", Description: "Implement", OnSuccess: []workflow.Route{{Target: "end"}}},
+	}}
+	specs, err := RenderMailboxSpecs(&compactMailboxRenderer{&lagTaskSystem{}}, run.Work{
+		Parent: task.TicketRef{Key: "PAY-101"}, Repo: "payments", Workflow: wf.Name,
+	}, &wf)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(specs) != 1 {
+		t.Fatalf("compact mailbox descriptions = %+v", specs)
+	}
+	for _, required := range []string{"PAY-101 / coder — agent — coder", "Implement", "Success routes:\nend", "Failure routes:", workflow.ReportFormat} {
+		if !strings.Contains(specs[0].Description, required) {
+			t.Fatalf("mailbox description lacks %q: %q", required, specs[0].Description)
+		}
+	}
+	if strings.Contains(specs[0].Description, "Required report format:") {
+		t.Fatalf("generic instructions appended to Jira template: %q", specs[0].Description)
+	}
+}
+
+func TestConciseReportRendersOnlySelectedSummaryAndFeedback(t *testing.T) {
+	r := workflow.Report{
+		Summary: workflow.Summary{Completed: "done", Commits: workflow.None, NotCompleted: workflow.None,
+			IssuesDiscovered: workflow.None, Verification: workflow.None, Notes: workflow.None},
+		Feedback: workflow.Feedback{ReasonForNextStep: workflow.None, RequiredActions: "review it",
+			RelevantContext: workflow.None, ExpectedResult: workflow.None},
+	}
+	if got := renderSummaryReport(r); got != "done" {
+		t.Fatalf("summary comment = %q", got)
+	}
+	if got := renderFeedbackReport(r); got != "review it" {
+		t.Fatalf("feedback comment = %q", got)
+	}
+}

package/internal/execution/temporal/interpreter.go

@@ -342,6 +342,7 @@ func runGraph(ctx temporalworkflow.Context, start run.Start, state *workflowStat
 	state.upsertStep(startStep)
 
 	current := target
+	previousFeedback := ""
 	lastStepByNode := map[string]int64{}
 	lastDepthByNode := map[string]int{}
 	for current != "end" {
@@ -402,11 +403,12 @@ func runGraph(ctx temporalworkflow.Context, start run.Start, state *workflowStat
 		spec := harness.LaunchSpec{
 			RunID: start.ID, NodeVisitID: visit, RepoName: start.Repo, RepoPath: start.RepoPath,
 			Workflow: wf.Name, Ticket: start.Ticket.Key, Node: current, NodeType: node.Type,
-			Agent: node.Agent, Title: start.Ticket.Key + ":" + current, NudgePrompt: node.NudgePrompt,
+			AutoReject: node.AutoReject,
+			Agent:      node.Agent, Title: start.Ticket.Key + ":" + current, NudgePrompt: node.NudgePrompt,
 			PromptData: harness.PromptData{
 				TaskSystem: "", Ticket: start.Ticket.Key, Workflow: wf.Name, Repo: start.Repo,
 				Node: current, NodeType: node.Type, Agent: node.Agent, NodeDescription: node.Description,
-				NextSteps: nextStepsText(nextSteps), Mailbox: mailbox.Key,
+				NextSteps: nextStepsText(nextSteps), Mailbox: mailbox.Key, PreviousFeedback: previousFeedback,
 			},
 			NextSteps: nextSteps,
 		}
@@ -515,7 +517,9 @@ func runGraph(ctx temporalworkflow.Context, start run.Start, state *workflowStat
 		stepMessage := accepted.Report.Summary.Completed
 		if accepted.Report.Status == domainworkflow.OutcomeFailure {
 			stepStatus = run.StepFailed
-			stepMessage = accepted.Report.Summary.IssuesDiscovered
+			if accepted.Report.Summary.IssuesDiscovered != domainworkflow.None {
+				stepMessage = accepted.Report.Summary.IssuesDiscovered
+			}
 		}
 		stepFinished := temporalworkflow.Now(ctx).UTC()
 		step.Status, step.FinishedAt, step.Message, step.Route = stepStatus, &stepFinished, stepMessage, accepted.Report.NextStep
@@ -568,6 +572,7 @@ func runGraph(ctx temporalworkflow.Context, start run.Start, state *workflowStat
 			return err
 		}
 		applyRuntimePolicy(state, current, work.Runtime)
+		previousFeedback = accepted.Report.Feedback.RequiredActions
 		current = next
 	}
 
@@ -858,11 +863,19 @@ func applyRuntimePolicy(state *workflowState, node string, policy run.RuntimePol
 }
 
 func renderSummaryReport(r domainworkflow.Report) string {
+	if r.Summary.Commits == domainworkflow.None && r.Summary.NotCompleted == domainworkflow.None &&
+		r.Summary.IssuesDiscovered == domainworkflow.None && r.Summary.Verification == domainworkflow.None && r.Summary.Notes == domainworkflow.None {
+		return r.Summary.Completed
+	}
 	return fmt.Sprintf("COMPLETED:\n%s\n\nCOMMITS:\n%s\n\nNOT COMPLETED:\n%s\n\nISSUES DISCOVERED:\n%s\n\nVERIFICATION:\n%s\n\nNOTES:\n%s",
 		r.Summary.Completed, r.Summary.Commits, r.Summary.NotCompleted, r.Summary.IssuesDiscovered, r.Summary.Verification, r.Summary.Notes)
 }
 
 func renderFeedbackReport(r domainworkflow.Report) string {
+	if r.Summary.Commits == domainworkflow.None && r.Feedback.ReasonForNextStep == domainworkflow.None &&
+		r.Feedback.RelevantContext == domainworkflow.None && r.Feedback.ExpectedResult == domainworkflow.None {
+		return r.Feedback.RequiredActions
+	}
 	return fmt.Sprintf("COMMITS:\n%s\n\nREASON FOR NEXT STEP:\n%s\n\nREQUIRED ACTIONS:\n%s\n\nRELEVANT CONTEXT:\n%s\n\nEXPECTED RESULT:\n%s",
 		r.Summary.Commits, r.Feedback.ReasonForNextStep, r.Feedback.RequiredActions, r.Feedback.RelevantContext, r.Feedback.ExpectedResult)
 }

package/internal/execution/temporal/recovery.go

@@ -6,10 +6,12 @@ import (
 	"fmt"
 	"log/slog"
 	"sort"
-	"strings"
 	"time"
 
 	"github.com/rajpopat27/relay-flow/internal/identity"
+	"github.com/rajpopat27/relay-flow/internal/repo"
+	"github.com/rajpopat27/relay-flow/internal/router"
+	"github.com/rajpopat27/relay-flow/internal/task"
 	enumspb "go.temporal.io/api/enums/v1"
 	"go.temporal.io/api/serviceerror"
 	workflowpb "go.temporal.io/api/workflow/v1"
@@ -145,52 +147,82 @@ func (e *Engine) reconcileClaimedParents(ctx context.Context, visible map[string
 			slog.Warn("Temporal recovery skipping repository with unavailable task system", "repo", rp.Name, "error", rp.TaskSystemError)
 			continue
 		}
+		capabilities, ok := rp.TaskSystem.(task.OwnershipCapabilities)
+		if !ok {
+			slog.Warn("Temporal recovery skipping repository without ownership capabilities", "repo", rp.Name,
+				"outcome", "ownership-capability-missing")
+			continue
+		}
 		tickets, err := rp.TaskSystem.Poll(ctx)
 		if err != nil {
 			return fmt.Errorf("poll repo %q during Temporal recovery: %w", rp.Name, err)
 		}
 		for _, ticket := range tickets {
-			for _, claim := range ticket.WorkflowClaims {
-				if !strings.HasPrefix(claim, "wf:") {
-					continue
-				}
-				workflowName := strings.TrimPrefix(claim, "wf:")
-				var matched bool
-				for _, binding := range rp.Bindings() {
-					if binding.Workflow != nil && binding.Workflow.Name == workflowName {
-						matched = true
-						break
-					}
-				}
-				if !matched {
-					continue
-				}
-				expectedID := identity.NewRunID(rp.Name, workflowName, ticket.Key)
-				if visible[string(expectedID)] {
-					continue
+			// Projection reconciliation only considers claimed parents. Resolve
+			// through the same router as normal polling so ambiguous, unknown,
+			// and owner-mismatched claims cannot restore an execution.
+			if len(ticket.WorkflowClaims) != 1 {
+				continue
+			}
+			wf, err := router.ResolveWorkflow(rp, ticket)
+			if err != nil {
+				var ownerMismatch *router.ClaimOwnerMismatchError
+				if errors.As(err, &ownerMismatch) {
+					slog.Info("Temporal recovery route outcome", "repo", rp.Name, "ticket", ticket.Key,
+						"workflow", ownerMismatch.Workflow, "outcome", "claim-owner-mismatch")
+				} else {
+					slog.Warn("Temporal recovery skipped claimed ticket", "repo", rp.Name, "ticket", ticket.Key, "outcome", "invalid-claim", "error", err)
 				}
-				info, err := e.client.DescribeWorkflowExecution(ctx, string(expectedID), "")
-				if err != nil {
-					var notFound *serviceerror.NotFound
-					if errors.As(err, &notFound) {
-						// This is the documented claim-before-run gap. Record it
-						// for operators, but leave creation to normal polling after
-						// recovery; this path must never start a replacement.
-						slog.Info("Temporal recovery missing claimed execution", "repo", rp.Name, "workflow", workflowName, "ticket", ticket.Key, "runID", string(expectedID))
-						continue
-					}
-					return fmt.Errorf("describe claimed Temporal workflow %s: %w", expectedID, err)
+				continue
+			}
+			workflowName := wf.Name
+			var matched *repo.WorkflowBinding
+			for _, binding := range rp.Bindings() {
+				if binding.Workflow != nil && binding.Workflow.Name == workflowName {
+					candidate := binding
+					matched = &candidate
+					break
 				}
-				if info == nil || info.WorkflowExecutionInfo == nil || info.WorkflowExecutionInfo.Execution == nil ||
-					info.WorkflowExecutionInfo.Type == nil || info.WorkflowExecutionInfo.Type.Name != TicketWorkflowName || info.WorkflowExecutionInfo.TaskQueue != TaskQueue {
+			}
+			if matched == nil {
+				continue
+			}
+			// Existing Temporal executions are restored only after the same
+			// ownership gate used by normal claimed routing. Lifecycle
+			// filters remain intentionally bypassed.
+			if err := capabilities.ValidateOwnership(ctx, ticket.Ref(), workflowName, matched.Workflow.TaskConfig); err != nil {
+				if errors.Is(err, task.ErrOwnershipMismatch) {
+					slog.Info("Temporal recovery route outcome", "repo", rp.Name, "ticket", ticket.Key,
+						"workflow", workflowName, "outcome", "claim-owner-mismatch", "error", err)
 					continue
 				}
-				if !shouldRestoreTemporalExecution(info.WorkflowExecutionInfo, time.Now().UTC(), e.retention) {
+				return fmt.Errorf("poll repo %q ticket %s validate ownership: %w", rp.Name, ticket.Key, err)
+			}
+			expectedID := identity.NewRunID(rp.Name, workflowName, ticket.Key)
+			if visible[string(expectedID)] {
+				continue
+			}
+			info, err := e.client.DescribeWorkflowExecution(ctx, string(expectedID), "")
+			if err != nil {
+				var notFound *serviceerror.NotFound
+				if errors.As(err, &notFound) {
+					// This is the documented claim-before-run gap. Record it
+					// for operators, but leave creation to normal polling after
+					// recovery; this path must never start a replacement.
+					slog.Info("Temporal recovery missing claimed execution", "repo", rp.Name, "workflow", workflowName, "ticket", ticket.Key, "runID", string(expectedID))
 					continue
 				}
-				if err := e.restoreProjection(ctx, info.WorkflowExecutionInfo); err != nil {
-					return fmt.Errorf("restore claimed Temporal workflow %s: %w", expectedID, err)
-				}
+				return fmt.Errorf("describe claimed Temporal workflow %s: %w", expectedID, err)
+			}
+			if info == nil || info.WorkflowExecutionInfo == nil || info.WorkflowExecutionInfo.Execution == nil ||
+				info.WorkflowExecutionInfo.Type == nil || info.WorkflowExecutionInfo.Type.Name != TicketWorkflowName || info.WorkflowExecutionInfo.TaskQueue != TaskQueue {
+				continue
+			}
+			if !shouldRestoreTemporalExecution(info.WorkflowExecutionInfo, time.Now().UTC(), e.retention) {
+				continue
+			}
+			if err := e.restoreProjection(ctx, info.WorkflowExecutionInfo); err != nil {
+				return fmt.Errorf("restore claimed Temporal workflow %s: %w", expectedID, err)
 			}
 		}
 	}

package/internal/harness/harness.go

@@ -24,20 +24,32 @@ const (
 	PromptFeedback PromptKind = "feedback"
 )
 
+// Jira prompt defaults keep each agent read limited to the relevant mailbox.
+// A node that needs its parent's details can request the optional parent-read
+// instruction in its node description.
+const JiraInitialPrompt = `Read the description of your assigned Jira task:
+acli jira workitem view "{{mailbox}}" --fields "summary,description" --json
+
+Follow the work instructions, valid routes, and report format in that description.`
+
+const JiraFeedbackPrompt = `Continue {{node}} from the latest update on your assigned Jira task:
+acli jira workitem comment list --key "{{mailbox}}" --limit 1 --order "-created" --json`
+
 // PromptData is the task-system-neutral data core supplies to the selected
 // harness. Harness templates, including HITL instructions, are rendered only
 // by the harness.
 type PromptData struct {
-	TaskSystem      string
-	Ticket          string
-	Workflow        string
-	Repo            string
-	Node            string
-	NodeType        workflow.NodeType
-	Agent           string
-	NodeDescription string
-	NextSteps       string
-	Mailbox         string
+	TaskSystem       string
+	Ticket           string
+	Workflow         string
+	Repo             string
+	Node             string
+	NodeType         workflow.NodeType
+	Agent            string
+	NodeDescription  string
+	NextSteps        string
+	Mailbox          string
+	PreviousFeedback string
 }
 
 type LaunchSpec struct {
@@ -49,6 +61,7 @@ type LaunchSpec struct {
 	Ticket      string
 	Node        string
 	NodeType    workflow.NodeType
+	AutoReject  bool
 	Agent       string
 	Title       string
 	Prompt      string

package/internal/harness/opencode/opencode.go

@@ -17,6 +17,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/rajpopat27/relay-flow/internal/config"
@@ -136,23 +137,35 @@ func (h *Harness) FindSession(context.Context, string, string) (harness.Session,
 	return harness.Session{}, false, nil
 }
 
-// RenderPrompt renders the selected session prompt, appends the harness-owned
-// HITL/TUI instructions for HITL nodes, then renders and appends the node's
-// nudge template.
+// RenderPrompt renders the selected session prompt and HITL instructions.
+// Jira first launches omit the node nudge so the initial read stays limited
+// to the assigned mailbox description.
 func (h *Harness) RenderPrompt(kind harness.PromptKind, data harness.PromptData, nudgeTemplate string) (string, error) {
 	var tmpl string
 	switch kind {
 	case harness.PromptInitial:
 		tmpl = h.templates.Initial
+		if data.TaskSystem == "jira" && tmpl == defaultInitialPrompt {
+			tmpl = harness.JiraInitialPrompt
+		}
 	case harness.PromptFeedback:
 		tmpl = h.templates.Feedback
+		if data.TaskSystem == "jira" && tmpl == defaultFeedbackPrompt {
+			tmpl = harness.JiraFeedbackPrompt
+		}
 	default:
 		return "", fmt.Errorf("opencode: unknown prompt kind %q", kind)
 	}
 	prompt := renderTemplate(tmpl, data)
-	if data.NodeType == workflow.NodeHITL {
+	if data.TaskSystem == "jira" && data.PreviousFeedback != "" {
+		prompt = appendPrompt(prompt, "Previous step feedback: "+data.PreviousFeedback)
+	}
+	if data.NodeType == workflow.NodeHITL && (data.TaskSystem != "jira" || h.templates.HITL != defaultHITLPrompt) {
 		prompt = appendPrompt(prompt, renderTemplate(h.templates.HITL, data))
 	}
+	if kind == harness.PromptInitial && data.TaskSystem == "jira" {
+		return prompt, nil
+	}
 	return appendPrompt(prompt, renderTemplate(nudgeTemplate, data)), nil
 }
 
@@ -203,9 +216,14 @@ func (h *Harness) BuildCommand(spec harness.LaunchSpec) (runner.Command, error)
 		"RELAY_FLOW_NODE_TYPE":       string(spec.NodeType),
 		"RELAY_FLOW_NUDGE_PROMPT":    spec.NudgePrompt,
 		"RELAY_FLOW_NEXT_STEPS_JSON": string(nextSteps),
+		"RELAY_FLOW_REPORT_FORMAT":   workflow.ReportFormat,
 	} {
 		env[key] = value
 	}
+	if spec.NodeType == workflow.NodeHITL {
+		// HITL policy is launch metadata, not part of the report wire object.
+		env["RELAY_FLOW_AUTO_REJECT"] = strconv.FormatBool(spec.AutoReject)
+	}
 	args := []string{}
 	if spec.ResumeID != "" {
 		args = append(args, "--session", spec.ResumeID)

package/internal/harness/opencode/opencode_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/rajpopat27/relay-flow/internal/workflow"
 )
 
-const configuredPlugin = "relay-flow-plugin@0.3.9-alpha"
+const configuredPlugin = "relay-flow-plugin@0.3.11-alpha"
 
 func TestBuildCommandArgv(t *testing.T) {
 	t.Setenv("RELAY_FLOW_HOME", "/var/lib/relay-flow-test")
@@ -57,6 +57,22 @@ func TestBuildCommandArgv(t *testing.T) {
 	}
 }
 
+func TestBuildCommandCarriesHITLAutoRejectPolicy(t *testing.T) {
+	t.Setenv("RELAY_FLOW_HOME", "/var/lib/relay-flow-test")
+	cmd, err := opencode.New().BuildCommand(harness.LaunchSpec{
+		NodeType:   workflow.NodeHITL,
+		AutoReject: true,
+		Agent:      "reviewer",
+		Prompt:     "review the ticket",
+	})
+	if err != nil {
+		t.Fatalf("BuildCommand: %v", err)
+	}
+	if got := cmd.Env["RELAY_FLOW_AUTO_REJECT"]; got != "true" {
+		t.Fatalf("RELAY_FLOW_AUTO_REJECT = %q, want true", got)
+	}
+}
+
 func TestRenderPromptTemplatesExposeAllValues(t *testing.T) {
 	raw := config.RawValues{
 		"initial":  "initial {{taskSystem}}|{{ticket}}|{{workflow}}|{{repo}}|{{node}}|{{nodeType}}|{{agent}}|{{nodeDescription}}|{{nextSteps}}|{{mailbox}}",
@@ -89,6 +105,30 @@ func TestRenderPromptTemplatesExposeAllValues(t *testing.T) {
 	}
 }
 
+func TestJiraDefaultPromptsUseOnlyMailboxReadsAndSelectedFeedback(t *testing.T) {
+	h := opencode.New()
+	data := harness.PromptData{
+		TaskSystem: "jira", Ticket: "PAY-101", Mailbox: "PAY-234", Node: "coder", NodeType: workflow.NodeHITL,
+	}
+	initial, err := h.RenderPrompt(harness.PromptInitial, data, "Read the latest mailbox feedback.")
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantInitial := "Read the description of your assigned Jira task:\nacli jira workitem view \"PAY-234\" --fields \"summary,description\" --json\n\nFollow the work instructions, valid routes, and report format in that description."
+	if initial != wantInitial {
+		t.Fatalf("Jira initial prompt = %q, want %q", initial, wantInitial)
+	}
+	data.PreviousFeedback = "Review found a missing test; add it."
+	continuation, err := h.RenderPrompt(harness.PromptFeedback, data, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantContinuation := "Continue coder from the latest update on your assigned Jira task:\nacli jira workitem comment list --key \"PAY-234\" --limit 1 --order \"-created\" --json\n\nPrevious step feedback: Review found a missing test; add it."
+	if continuation != wantContinuation {
+		t.Fatalf("Jira continuation = %q, want %q", continuation, wantContinuation)
+	}
+}
+
 func TestHarnessConfigRejectsUnknownPromptVariable(t *testing.T) {
 	_, err := harness.New("opencode", config.RawValues{"initial": "{{unknown}}"})
 	if err == nil || !strings.Contains(err.Error(), "unknown template variable {{unknown}}") {

package/internal/harness/opencode/repo_setup.go

@@ -10,7 +10,7 @@ import (
 	"github.com/rajpopat27/relay-flow/internal/config"
 )
 
-const relayFlowPlugin = "relay-flow-plugin@0.3.9-alpha"
+const relayFlowPlugin = "relay-flow-plugin@0.3.11-alpha"
 
 type jsoncToken struct {
 	kind       byte

package/internal/harness/opencode/task_env_test.go

@@ -51,7 +51,7 @@ func TestBuildCommandWithoutTaskEnvKeepsRelayVariablesOnly(t *testing.T) {
 	if err != nil {
 		t.Fatalf("BuildCommand: %v", err)
 	}
-	if len(cmd.Env) != 9 {
-		t.Fatalf("Env = %#v, want only the nine relay-flow variables", cmd.Env)
+	if len(cmd.Env) != 10 {
+		t.Fatalf("Env = %#v, want only the ten relay-flow variables", cmd.Env)
 	}
 }

package/internal/harness/pi/pi.go

@@ -13,11 +13,13 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/rajpopat27/relay-flow/internal/config"
 	"github.com/rajpopat27/relay-flow/internal/harness"
 	"github.com/rajpopat27/relay-flow/internal/runner"
+	"github.com/rajpopat27/relay-flow/internal/workflow"
 )
 
 const (
@@ -148,7 +150,7 @@ func (*Harness) FindSession(context.Context, string, string) (harness.Session, b
 }
 
 // RenderPrompt renders the selected initial or feedback template and the
-// node's nudge template. Initial prompts use Pi's native prompt-template
+// node's nudge template (except on a Jira first launch). Initial prompts use Pi's native prompt-template
 // command syntax; feedback is sent to an existing session and must remain
 // raw so Pi does not expand the full prompt template again. HITL approval is
 // not encoded in the prompt; the Pi extension asks for approval through
@@ -158,8 +160,14 @@ func (h *Harness) RenderPrompt(kind harness.PromptKind, data harness.PromptData,
 	switch kind {
 	case harness.PromptInitial:
 		tmpl = h.templates.Initial
+		if data.TaskSystem == "jira" && tmpl == defaultInitialPrompt {
+			tmpl = harness.JiraInitialPrompt
+		}
 	case harness.PromptFeedback:
 		tmpl = h.templates.Feedback
+		if data.TaskSystem == "jira" && tmpl == defaultFeedbackPrompt {
+			tmpl = harness.JiraFeedbackPrompt
+		}
 	default:
 		return "", fmt.Errorf("pi: unknown prompt kind %q", kind)
 	}
@@ -168,7 +176,13 @@ func (h *Harness) RenderPrompt(kind harness.PromptKind, data harness.PromptData,
 			return "", err
 		}
 	}
-	prompt := appendPrompt(renderTemplate(tmpl, data), renderTemplate(nudgeTemplate, data))
+	prompt := renderTemplate(tmpl, data)
+	if data.TaskSystem == "jira" && data.PreviousFeedback != "" {
+		prompt = appendPrompt(prompt, "Previous step feedback: "+data.PreviousFeedback)
+	}
+	if kind != harness.PromptInitial || data.TaskSystem != "jira" {
+		prompt = appendPrompt(prompt, renderTemplate(nudgeTemplate, data))
+	}
 	if kind == harness.PromptInitial {
 		return applyPromptTemplate(data.Agent, prompt), nil
 	}
@@ -211,9 +225,14 @@ func (*Harness) BuildCommand(spec harness.LaunchSpec) (runner.Command, error) {
 		"RELAY_FLOW_NODE_TYPE":       string(spec.NodeType),
 		"RELAY_FLOW_NUDGE_PROMPT":    spec.NudgePrompt,
 		"RELAY_FLOW_NEXT_STEPS_JSON": string(nextSteps),
+		"RELAY_FLOW_REPORT_FORMAT":   workflow.ReportFormat,
 	} {
 		env[key] = value
 	}
+	if spec.NodeType == workflow.NodeHITL {
+		// HITL policy is launch metadata, not part of the report wire object.
+		env["RELAY_FLOW_AUTO_REJECT"] = strconv.FormatBool(spec.AutoReject)
+	}
 	args := []string{"--name", spec.Title}
 	if spec.Agent != "default" {
 		args = append(args, "--prompt-template", promptTemplatePath(spec.Agent))

package/internal/harness/pi/pi_test.go

@@ -42,6 +42,7 @@ func TestBuildCommandUsesStrictPiCLIContract(t *testing.T) {
 		"RELAY_FLOW_NODE_TYPE":       string(base.NodeType),
 		"RELAY_FLOW_NUDGE_PROMPT":    base.NudgePrompt,
 		"RELAY_FLOW_NEXT_STEPS_JSON": string(nextSteps),
+		"RELAY_FLOW_REPORT_FORMAT":   workflow.ReportFormat,
 	}
 
 	tests := []struct {
@@ -248,13 +249,13 @@ func runStrictPi(t *testing.T, command runner.Command, cwd, capturePath string)
 		t.Fatalf("read strict Pi capture: %v", err)
 	}
 	fields := strings.Split(string(data), "\x00")
-	if len(fields) < 12 || fields[len(fields)-1] != "" {
+	if len(fields) < 13 || fields[len(fields)-1] != "" {
 		t.Fatalf("malformed strict Pi capture: %q", data)
 	}
 	fields = fields[:len(fields)-1]
 	capture := piCapture{
 		cwd:  fields[0],
-		args: strings.Split(fields[10], "\x1f"),
+		args: strings.Split(fields[11], "\x1f"),
 		env: map[string]string{
 			"RELAY_FLOW_HOME":            fields[1],
 			"RELAY_FLOW_RUN_ID":          fields[2],
@@ -265,6 +266,7 @@ func runStrictPi(t *testing.T, command runner.Command, cwd, capturePath string)
 			"RELAY_FLOW_NODE_TYPE":       fields[7],
 			"RELAY_FLOW_NUDGE_PROMPT":    fields[8],
 			"RELAY_FLOW_NEXT_STEPS_JSON": fields[9],
+			"RELAY_FLOW_REPORT_FORMAT":   fields[10],
 		},
 	}
 	return capture
@@ -325,11 +327,12 @@ fi
 [ -n "${RELAY_FLOW_NODE:-}" ] || exit 3
 [ -n "${RELAY_FLOW_NODE_TYPE:-}" ] || exit 3
 [ -n "${RELAY_FLOW_NEXT_STEPS_JSON:-}" ] || exit 3
+[ -n "${RELAY_FLOW_REPORT_FORMAT:-}" ] || exit 3
 
-printf '%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000' \
+printf '%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000%s\000' \
   "$PWD" "$RELAY_FLOW_HOME" "$RELAY_FLOW_RUN_ID" "$RELAY_FLOW_WORKFLOW" \
   "$RELAY_FLOW_REPO" "$RELAY_FLOW_TICKET" "$RELAY_FLOW_NODE" "$RELAY_FLOW_NODE_TYPE" \
-  "${RELAY_FLOW_NUDGE_PROMPT:-}" "$RELAY_FLOW_NEXT_STEPS_JSON" "$original_args" > "$capture"
+  "${RELAY_FLOW_NUDGE_PROMPT:-}" "$RELAY_FLOW_NEXT_STEPS_JSON" "$RELAY_FLOW_REPORT_FORMAT" "$original_args" > "$capture"
 `
 	if err := os.WriteFile(executable, []byte(script), 0o700); err != nil {
 		t.Fatal(err)

package/internal/harness/pi/prompt_test.go

@@ -29,7 +29,7 @@ func TestPiRenderPromptSubstitutesInitialAndFeedbackData(t *testing.T) {
 	if err != nil {
 		t.Fatalf("RenderPrompt(initial): %v", err)
 	}
-	wantInitial := "Task system: jira\nUse the jira tools to read the parent ticket PAY-101.\n\nYour mailbox is PAY-234. Read its description and comments for node instructions and feedback.\n\nKeep the summary brief, and make the feedback as detailed and actionable as possible for the next agent.\n\nnudge jira|PAY-101|basicFlow|payments|implement|PAY-234|review (when: ready)"
+	wantInitial := "Read the description of your assigned Jira task:\nacli jira workitem view \"PAY-234\" --fields \"summary,description\" --json\n\nFollow the work instructions, valid routes, and report format in that description."
 	if initial != wantInitial {
 		t.Fatalf("initial prompt = %q, want %q", initial, wantInitial)
 	}
@@ -38,10 +38,18 @@ func TestPiRenderPromptSubstitutesInitialAndFeedbackData(t *testing.T) {
 	if err != nil {
 		t.Fatalf("RenderPrompt(feedback): %v", err)
 	}
-	wantFeedback := "New feedback was added to the comments section of your mailbox subtask PAY-234. Read it.\n\nnudge jira|PAY-101|basicFlow|payments|implement|PAY-234|review (when: ready)"
+	wantFeedback := "Continue implement from the latest update on your assigned Jira task:\nacli jira workitem comment list --key \"PAY-234\" --limit 1 --order \"-created\" --json\n\nnudge jira|PAY-101|basicFlow|payments|implement|PAY-234|review (when: ready)"
 	if feedback != wantFeedback {
 		t.Fatalf("feedback prompt = %q, want %q", feedback, wantFeedback)
 	}
+	data.PreviousFeedback = "Add the missing test."
+	continued, err := h.RenderPrompt(harness.PromptFeedback, data, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if want := "Continue implement from the latest update on your assigned Jira task:\nacli jira workitem comment list --key \"PAY-234\" --limit 1 --order \"-created\" --json\n\nPrevious step feedback: Add the missing test."; continued != want {
+		t.Fatalf("Jira Pi continuation = %q, want %q", continued, want)
+	}
 }
 
 func TestPiRenderPromptHonorsNodeNudgeTimingInput(t *testing.T) {
@@ -107,11 +115,11 @@ func TestPiRenderPromptUsesNativeTemplateCommandForInitialNamedAgent(t *testing.
 		Mailbox:    "PAY-234",
 	}
 
-	initial, err := h.RenderPrompt(harness.PromptInitial, data, "nudge {{node}}")
+	initial, err := h.RenderPrompt(harness.PromptInitial, data, "Read the latest mailbox feedback for {{node}}.")
 	if err != nil {
 		t.Fatalf("RenderPrompt(initial): %v", err)
 	}
-	wantInitial := "/coder Task system: jira\nUse the jira tools to read the parent ticket PAY-101.\n\nYour mailbox is PAY-234. Read its description and comments for node instructions and feedback.\n\nKeep the summary brief, and make the feedback as detailed and actionable as possible for the next agent.\n\nnudge implement"
+	wantInitial := "/coder Read the description of your assigned Jira task:\nacli jira workitem view \"PAY-234\" --fields \"summary,description\" --json\n\nFollow the work instructions, valid routes, and report format in that description."
 	if initial != wantInitial {
 		t.Fatalf("initial prompt = %q, want %q", initial, wantInitial)
 	}
@@ -120,7 +128,7 @@ func TestPiRenderPromptUsesNativeTemplateCommandForInitialNamedAgent(t *testing.
 	if err != nil {
 		t.Fatalf("RenderPrompt(feedback): %v", err)
 	}
-	wantFeedback := "New feedback was added to the comments section of your mailbox subtask PAY-234. Read it.\n\nfeedback nudge"
+	wantFeedback := "Continue implement from the latest update on your assigned Jira task:\nacli jira workitem comment list --key \"PAY-234\" --limit 1 --order \"-created\" --json\n\nfeedback nudge"
 	if feedback != wantFeedback {
 		t.Fatalf("feedback prompt = %q, want %q", feedback, wantFeedback)
 	}

package/internal/harness/pi/task_env_test.go

@@ -2,8 +2,24 @@ package pi
 
 import (
 	"testing"
+
+	"github.com/rajpopat27/relay-flow/internal/workflow"
 )
 
+func TestBuildCommandCarriesHITLAutoRejectPolicy(t *testing.T) {
+	t.Setenv("RELAY_FLOW_HOME", "/var/lib/relay-flow-test")
+	spec := launchSpec(t)
+	spec.NodeType = workflow.NodeHITL
+	spec.AutoReject = true
+	cmd, err := (&Harness{}).BuildCommand(spec)
+	if err != nil {
+		t.Fatalf("BuildCommand: %v", err)
+	}
+	if got := cmd.Env["RELAY_FLOW_AUTO_REJECT"]; got != "true" {
+		t.Fatalf("RELAY_FLOW_AUTO_REJECT = %q, want true", got)
+	}
+}
+
 // TestBuildCommandCarriesTaskSystemEnvironment asserts the task-system
 // workspace environment reaches the runner command so agent task commands
 // address the same workspace as relay-flow, and that relay-flow's own
@@ -45,7 +61,7 @@ func TestBuildCommandWithoutTaskEnvKeepsRelayVariablesOnly(t *testing.T) {
 	if err != nil {
 		t.Fatalf("BuildCommand: %v", err)
 	}
-	if len(cmd.Env) != 9 {
-		t.Fatalf("Env = %#v, want only the nine relay-flow variables", cmd.Env)
+	if len(cmd.Env) != 10 {
+		t.Fatalf("Env = %#v, want only the ten relay-flow variables", cmd.Env)
 	}
 }