relay-flow 0.3.10-alpha → 0.3.12-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" {
@@ -407,7 +408,7 @@ func runGraph(ctx temporalworkflow.Context, start run.Start, state *workflowStat
 			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,
 		}
@@ -516,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
@@ -569,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
 	}
 
@@ -859,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/operations.go

@@ -210,7 +210,7 @@ func (e *Engine) SubmitReport(ctx context.Context, req run.ReportRequest) (run.R
 		return run.ReportAck{}, err
 	}
 	if err := wf.ValidateReport(req.Node, req.Report); err != nil {
-		return run.ReportAck{Accepted: false}, err
+		return run.ReportAck{}, &run.InvalidReportError{Reason: err.Error()}
 	}
 	if err := c.SignalWorkflow(ctx, string(req.RunID), "", reportSignalName, reportSignal{
 		ReportID: req.ReportID, Node: req.Node, NodeVisitID: state.CurrentNodeVisitID, Report: req.Report,

package/internal/execution/temporal/operations_test.go

@@ -3,6 +3,7 @@ package temporal
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"testing"
 	"time"
 
@@ -11,10 +12,84 @@ import (
 	"github.com/rajpopat27/relay-flow/internal/task"
 	"github.com/rajpopat27/relay-flow/internal/workflow"
 	commonpb "go.temporal.io/api/common/v1"
+	enumspb "go.temporal.io/api/enums/v1"
+	historypb "go.temporal.io/api/history/v1"
 	workflowpb "go.temporal.io/api/workflow/v1"
+	"go.temporal.io/sdk/client"
+	"go.temporal.io/sdk/converter"
 	_ "modernc.org/sqlite"
 )
 
+type reportValidationClient struct {
+	client.Client
+	start    run.Start
+	signaled bool
+}
+
+func (c *reportValidationClient) QueryWorkflow(context.Context, string, string, string, ...interface{}) (converter.EncodedValue, error) {
+	return reportValidationValue{}, nil
+}
+
+type reportValidationValue struct{}
+
+func (reportValidationValue) HasValue() bool { return true }
+func (reportValidationValue) Get(dest interface{}) error {
+	*(dest.(*ReportStateSnapshot)) = ReportStateSnapshot{
+		State: run.StateWaiting, CurrentNode: "coding", CurrentNodeVisitID: "visit-1",
+	}
+	return nil
+}
+
+func (c *reportValidationClient) GetWorkflowHistory(context.Context, string, string, bool, enumspb.HistoryEventFilterType) client.HistoryEventIterator {
+	payload, _ := converter.GetDefaultDataConverter().ToPayloads(c.start)
+	return &reportValidationHistory{event: &historypb.HistoryEvent{
+		EventType: enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_STARTED,
+		Attributes: &historypb.HistoryEvent_WorkflowExecutionStartedEventAttributes{
+			WorkflowExecutionStartedEventAttributes: &historypb.WorkflowExecutionStartedEventAttributes{Input: payload},
+		},
+	}}
+}
+
+func (c *reportValidationClient) SignalWorkflow(context.Context, string, string, string, interface{}) error {
+	c.signaled = true
+	return nil
+}
+
+type reportValidationHistory struct {
+	event *historypb.HistoryEvent
+	read  bool
+}
+
+func (h *reportValidationHistory) HasNext() bool { return !h.read }
+func (h *reportValidationHistory) Next() (*historypb.HistoryEvent, error) {
+	h.read = true
+	return h.event, nil
+}
+
+func TestTemporalSubmitReportRejectsInvalidReportBeforeSignal(t *testing.T) {
+	client := &reportValidationClient{start: run.Start{Workflow: workflow.Workflow{
+		Name: "test", Nodes: map[string]workflow.Node{
+			"coding": {Type: workflow.NodeAgent, OnSuccess: []workflow.Route{{Target: "end"}}},
+			"end":    {},
+		},
+	}}}
+	engine := &Engine{client: client}
+	report := workflow.Report{
+		Status: workflow.OutcomeSuccess, NextStep: "end",
+		Summary:  workflow.Summary{Completed: "done", Commits: "None", NotCompleted: "None", IssuesDiscovered: "None", Verification: "None", Notes: "None"},
+		Feedback: workflow.Feedback{ReasonForNextStep: "None", RequiredActions: "needs work", RelevantContext: "None", ExpectedResult: "None"},
+	}
+	ack, err := engine.SubmitReport(context.Background(), run.ReportRequest{
+		RunID: "run-1", Node: "coding", ReportID: "message-1", Report: report,
+	})
+	if !errors.Is(err, run.ErrInvalidReport) || ack.Accepted || client.signaled {
+		t.Fatalf("invalid Temporal report: ack=%+v err=%v signaled=%v", ack, err, client.signaled)
+	}
+	if want := `report selects "end": every feedback field must be "None" because end has no mailbox`; err.Error() != want {
+		t.Fatalf("validation message = %q, want %q", err, want)
+	}
+}
+
 func TestApplyTemporalProjectionStateRebuildsCanceledTimingIdempotently(t *testing.T) {
 	started := time.Now().UTC().Add(-time.Minute)
 	finished := started.Add(30 * time.Second)

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 {

package/internal/harness/opencode/opencode.go

@@ -137,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
 }
 
@@ -204,6 +216,7 @@ 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
 	}

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.10-alpha"
+const configuredPlugin = "relay-flow-plugin@0.3.12-alpha"
 
 func TestBuildCommandArgv(t *testing.T) {
 	t.Setenv("RELAY_FLOW_HOME", "/var/lib/relay-flow-test")
@@ -105,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.10-alpha"
+const relayFlowPlugin = "relay-flow-plugin@0.3.12-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

@@ -150,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
@@ -160,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)
 	}
@@ -170,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
 	}
@@ -213,6 +225,7 @@ 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
 	}

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

@@ -61,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)
 	}
 }

package/internal/run/run.go

@@ -120,6 +120,16 @@ type ReportAck struct {
 	Duplicate bool `json:"duplicate"`
 }
 
+// ErrInvalidReport identifies permanent semantic report-validation failures.
+var ErrInvalidReport = errors.New("invalid report")
+
+// InvalidReportError keeps the validation message intact while allowing
+// callers to classify it with errors.Is(err, ErrInvalidReport).
+type InvalidReportError struct{ Reason string }
+
+func (e *InvalidReportError) Error() string        { return e.Reason }
+func (e *InvalidReportError) Is(target error) bool { return target == ErrInvalidReport }
+
 // ErrRestartConflict means the ticket cannot accept an explicit restart in
 // its current durable state. Server handlers map it to HTTP 409.
 var ErrRestartConflict = errors.New("restart conflict")

package/internal/server/api_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -150,6 +151,36 @@ func TestReportEndpointAcceptsJSON(t *testing.T) {
 	}
 }
 
+func TestReportValidationErrorPreservesCodeAndMessageThroughClient(t *testing.T) {
+	const message = "NEXT STEP is end, so FEEDBACK must be exactly None."
+	fake := &fakeServices{reportErr: &run.InvalidReportError{Reason: message}}
+	c, cleanup := startHandler(t, fake)
+	defer cleanup()
+	body := []byte(`{"runId":"run-1","node":"coding","reportId":"message-1","report":{"status":"success","nextStep":"end"}}`)
+	status, env := do(t, c, http.MethodPost, "http://relay/reports", body)
+	if status != http.StatusBadRequest || env.Error == nil || env.Error.Code != "invalidReport" || env.Error.Message != message {
+		t.Fatalf("invalid report response: status=%d env=%+v", status, env)
+	}
+
+	dir := t.TempDir()
+	_, cleanupSocket := startHandlerOnSocket(t, dir, fake)
+	defer cleanupSocket()
+	client := server.NewClient(filepath.Join(dir, "server.sock"))
+	_, err := client.SubmitReport(context.Background(), run.ReportRequest{
+		RunID: "run-1", Node: "coding", ReportID: "message-1",
+		Report: workflow.Report{Status: workflow.OutcomeSuccess, NextStep: "end"},
+	})
+	var apiErr *server.APIError
+	if !errors.As(err, &apiErr) || apiErr.Code != "invalidReport" || apiErr.Message != message || apiErr.StatusCode != http.StatusBadRequest {
+		t.Fatalf("Go client lost structured validation error: %v", err)
+	}
+	fake.reportErr = errors.New("temporary backend failure")
+	status, env = do(t, c, http.MethodPost, "http://relay/reports", body)
+	if status != http.StatusInternalServerError || env.Error == nil || env.Error.Code != "internalError" {
+		t.Fatalf("temporary failure misclassified: status=%d env=%+v", status, env)
+	}
+}
+
 func TestProcessedReportIDBypassesReportBodyValidation(t *testing.T) {
 	runID := "payments/basicFlow/PAY-101"
 	reportID := "session-1:message-1"

package/internal/server/client.go

@@ -38,6 +38,16 @@ func (c *Client) httpClient() *http.Client {
 	}
 }
 
+// APIError retains the server's machine-readable code and agent-readable
+// message separately so callers need not parse formatted error text.
+type APIError struct {
+	Code       string
+	Message    string
+	StatusCode int
+}
+
+func (e *APIError) Error() string { return fmt.Sprintf("server %s: %s", e.Code, e.Message) }
+
 // call performs one HTTP request against the socket server and decodes
 // the standard envelope. Non-2xx responses return an error carrying the
 // server-provided code and message.
@@ -77,7 +87,7 @@ func (c *Client) call(ctx context.Context, method, path string, body []byte, out
 	}
 	if !env.OK {
 		if env.Error != nil {
-			return fmt.Errorf("server %s: %s", env.Error.Code, env.Error.Message)
+			return &APIError{Code: env.Error.Code, Message: env.Error.Message, StatusCode: resp.StatusCode}
 		}
 		return fmt.Errorf("server returned not-ok (HTTP %d)", resp.StatusCode)
 	}

package/internal/server/fixture_test.go

@@ -36,6 +36,7 @@ type fakeServices struct {
 	runtimeAck         run.NodeRuntimeRegistrationAck
 	processedReports   map[string]bool
 	submittedReports   int
+	reportErr          error
 	restartRun         run.Run
 	restartErr         error
 	restarts           []string
@@ -125,6 +126,9 @@ func (f *fakeServices) SubmitReport(ctx context.Context, _ run.ReportRequest) (r
 		case <-ctx.Done():
 		}
 	}
+	if f.reportErr != nil {
+		return run.ReportAck{}, f.reportErr
+	}
 	return run.ReportAck{Accepted: true}, nil
 }
 

package/internal/server/server.go

@@ -130,6 +130,8 @@ func writeEnv(w http.ResponseWriter, status int, env envelope) {
 // anything else is an unexpected 500.
 func mapErr(w http.ResponseWriter, err error) {
 	switch {
+	case errors.Is(err, run.ErrInvalidReport):
+		writeErr(w, http.StatusBadRequest, "invalidReport", err.Error())
 	case errors.Is(err, run.ErrRestartConflict):
 		writeErr(w, http.StatusConflict, "conflict", err.Error())
 	case errors.Is(err, run.ErrNotFound):