relay-flow 0.2.0-alpha → 0.2.2-alpha

package/internal/execution/goworkflows/node_runtime_test.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"path/filepath"
+	"reflect"
 	"testing"
 	"time"
 
@@ -189,7 +190,7 @@ func TestNodeRuntimeSessionRegistrationKeepsOldSessionBoundToOldVisit(t *testing
 
 func TestEnsureNodeRuntimeUsesDirectIDsAndFallsBackFresh(t *testing.T) {
 	ctx := context.Background()
-	fr := &runtimeTestRunner{createErr: runner.ErrSessionUnavailable}
+	fr := &runtimeTestRunner{}
 	fh := &runtimeTestHarness{}
 	db := openProjectionDB(t, filepath.Join(t.TempDir(), "state.db"))
 	defer db.Close()
@@ -219,11 +220,20 @@ func TestEnsureNodeRuntimeUsesDirectIDsAndFallsBackFresh(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if rt.TerminalID == "" || rt.TerminalID == "dead-term" || rt.SessionID != "" {
+	if rt.TerminalID == "" || rt.TerminalID == "dead-term" || rt.SessionID != "dead-session" {
 		t.Fatalf("failed direct IDs not replaced atomically: %+v", rt)
 	}
-	if fr.findCalls != 0 || fh.buildCalls != 2 || fr.createCalls != 2 {
-		t.Fatalf("fallback used discovery or wrong launch count: find=%d build=%d create=%d", fr.findCalls, fh.buildCalls, fr.createCalls)
+	if fr.findCalls != 2 || fh.buildCalls != 1 || fr.createCalls != 1 {
+		t.Fatalf("stored-ID replacement calls: find=%d build=%d create=%d", fr.findCalls, fh.buildCalls, fr.createCalls)
+	}
+	if len(fr.findIDs) != 2 || fr.findIDs[0] != "dead-term" || fr.findIDs[1] != "dead-term" {
+		t.Fatalf("FindTerminal IDs = %v, want [dead-term dead-term]", fr.findIDs)
+	}
+	if len(fh.resumeIDs) != 1 || fh.resumeIDs[0] != "dead-session" {
+		t.Fatalf("BuildCommand ResumeIDs = %v, want [dead-session]", fh.resumeIDs)
+	}
+	if !reflect.DeepEqual(fh.rendered, []harness.PromptKind{harness.PromptInitial}) {
+		t.Fatalf("dead-terminal rendered prompts = %v, want initial", fh.rendered)
 	}
 	for _, prompt := range fh.prompts {
 		if prompt != "work" {
@@ -248,15 +258,19 @@ func TestEnsureNodeRuntimeInitialLaunchAppendsCustomInstructions(t *testing.T) {
 		t.Fatal(err)
 	}
 	fh := &runtimeTestHarness{}
-	a := &Activities{Runner: &runtimeTestRunner{}, Harness: fh, Runs: p}
+	fr := &runtimeTestRunner{}
+	a := &Activities{Runner: fr, Harness: fh, Runs: p}
 	nw := run.NodeWork{Work: run.Work{RunID: id}, Node: "implement", NodeVisitID: "visit-first"}
-	spec := harness.LaunchSpec{RunID: id, NodeVisitID: "visit-first", Node: "implement", Agent: "build", Prompt: "standard prompt", NudgePrompt: "custom instructions"}
+	spec := harness.LaunchSpec{RunID: id, NodeVisitID: "visit-first", Node: "implement", NodeType: workflow.NodeHITL, Agent: "build", Prompt: "standard prompt", NudgePrompt: "custom instructions"}
 	if err := a.EnsureNodeRuntime(ctx, nw, "", spec, NodeRuntime{}); err != nil {
 		t.Fatal(err)
 	}
-	if len(fh.prompts) != 1 || fh.prompts[0] != "standard prompt\n\ncustom instructions" {
+	if len(fh.prompts) != 1 || fh.prompts[0] != "work\n\ncustom instructions" {
 		t.Fatalf("initial prompt = %q", fh.prompts)
 	}
+	if len(fr.statuses) != 1 || fr.statuses[0] != runner.WorkspaceStatusInReview {
+		t.Fatalf("HITL workspace statuses = %v, want in-review", fr.statuses)
+	}
 }
 
 func TestEnsureNodeRuntimeSendFailureClosesLiveTerminal(t *testing.T) {
@@ -288,16 +302,22 @@ func TestEnsureNodeRuntimeSendFailureClosesLiveTerminal(t *testing.T) {
 	if fr.closeCalls != 1 || fr.closedIDs[0] != "live-old" {
 		t.Fatalf("old live terminal not closed before replacement: %+v", fr.closedIDs)
 	}
-	if len(fr.sentTexts) != 1 || fr.sentTexts[0] != "New feedback was added to the comments section of your mailbox subtask PAY-234. Read it.\n\nRead the latest review feedback." {
+	if len(fr.sentTexts) != 1 || fr.sentTexts[0] != "feedback\n\nRead the latest review feedback." {
 		t.Fatalf("live revisit prompt = %q", fr.sentTexts)
 	}
 	if len(fh.prompts) != 1 || fh.prompts[0] != "work\n\nRead the latest review feedback." {
 		t.Fatalf("revisit replacement prompt = %q", fh.prompts)
 	}
 	rt, _ := p.getNodeRuntime(ctx, id, "implement")
-	if rt.TerminalID == "live-old" || rt.SessionID != "" {
+	if rt.TerminalID == "live-old" || rt.SessionID != "session-old" {
 		t.Fatalf("send failure did not replace IDs: %+v", rt)
 	}
+	if len(fh.resumeIDs) != 1 || fh.resumeIDs[0] != "session-old" {
+		t.Fatalf("replacement ResumeIDs = %v, want [session-old]", fh.resumeIDs)
+	}
+	if !reflect.DeepEqual(fh.rendered, []harness.PromptKind{harness.PromptFeedback, harness.PromptInitial}) {
+		t.Fatalf("rendered prompts = %v, want feedback then replacement initial", fh.rendered)
+	}
 }
 
 func TestEnsureNodeRuntimeSameVisitSendsNothing(t *testing.T) {
@@ -325,6 +345,10 @@ func TestEnsureNodeRuntimeSameVisitSendsNothing(t *testing.T) {
 	if len(fr.sentTexts) != 0 || fr.createCalls != 0 {
 		t.Fatalf("same visit sent=%q creates=%d", fr.sentTexts, fr.createCalls)
 	}
+	fh := a.Harness.(*runtimeTestHarness)
+	if len(fh.rendered) != 0 || fh.buildCalls != 0 {
+		t.Fatalf("same visit rendered=%v buildCalls=%d, want silence", fh.rendered, fh.buildCalls)
+	}
 }
 
 func TestEnsureNodeRuntimeRejectsStaleVisitWithoutLaunch(t *testing.T) {
@@ -412,14 +436,16 @@ func TestEngineRuntimePolicyDefaultsKeepBoth(t *testing.T) {
 }
 
 type runtimeTestRunner struct {
-	createErr   error
 	findCalls   int
+	findIDs     []string
 	createCalls int
 	live        bool
+	liveID      string
 	sendErr     error
 	sentTexts   []string
 	closeCalls  int
 	closedIDs   []string
+	statuses    []string
 }
 
 func (*runtimeTestRunner) DiscoverRepos(context.Context) ([]runner.RepoCandidate, error) {
@@ -429,8 +455,17 @@ func (*runtimeTestRunner) ValidateRepo(context.Context, string, string) error {
 func (*runtimeTestRunner) EnsureEnvironment(context.Context, runner.RunSpec) (runner.Environment, error) {
 	return runner.Environment{ID: "env"}, nil
 }
-func (r *runtimeTestRunner) InspectTerminal(_ context.Context, terminal runner.Terminal) (runner.Terminal, bool, error) {
-	return terminal, r.live, nil
+func (r *runtimeTestRunner) SetEnvironmentStatus(_ context.Context, _ runner.Environment, status string) error {
+	r.statuses = append(r.statuses, status)
+	return nil
+}
+func (r *runtimeTestRunner) FindTerminal(_ context.Context, terminal runner.Terminal) (runner.Terminal, bool, error) {
+	r.findCalls++
+	r.findIDs = append(r.findIDs, terminal.ID)
+	if !r.live || (r.liveID != "" && terminal.ID != r.liveID) {
+		return runner.Terminal{}, false, nil
+	}
+	return terminal, true, nil
 }
 func (r *runtimeTestRunner) SendTerminal(_ context.Context, _ runner.Terminal, text string) error {
 	r.sentTexts = append(r.sentTexts, text)
@@ -438,16 +473,9 @@ func (r *runtimeTestRunner) SendTerminal(_ context.Context, _ runner.Terminal, t
 }
 func (r *runtimeTestRunner) CreateTerminal(context.Context, runner.Environment, string, runner.Command) (runner.Terminal, error) {
 	r.createCalls++
-	if r.createErr != nil {
-		err := r.createErr
-		r.createErr = nil
-		return runner.Terminal{}, err
-	}
-	return runner.Terminal{ID: "fresh-term"}, nil
-}
-func (r *runtimeTestRunner) FindTerminal(context.Context, runner.Environment, string) (runner.Terminal, bool, error) {
-	r.findCalls++
-	return runner.Terminal{}, false, nil
+	r.live = true
+	r.liveID = "fresh-term"
+	return runner.Terminal{ID: r.liveID}, nil
 }
 func (r *runtimeTestRunner) CloseTerminal(_ context.Context, terminal runner.Terminal) error {
 	r.closeCalls++
@@ -455,7 +483,12 @@ func (r *runtimeTestRunner) CloseTerminal(_ context.Context, terminal runner.Ter
 	r.live = false
 	return nil
 }
-func (r *runtimeTestRunner) EnsureTerminal(ctx context.Context, env runner.Environment, title string, command runner.Command) (runner.Terminal, error) {
+func (r *runtimeTestRunner) EnsureTerminal(ctx context.Context, env runner.Environment, stored runner.Terminal, title string, command runner.Command) (runner.Terminal, error) {
+	if terminal, ok, err := r.FindTerminal(ctx, stored); err != nil {
+		return runner.Terminal{}, err
+	} else if ok {
+		return terminal, nil
+	}
 	return r.CreateTerminal(ctx, env, title, command)
 }
 func (*runtimeTestRunner) CloseTerminals(context.Context, runner.RunSpec) error { return nil }
@@ -464,8 +497,23 @@ func (*runtimeTestRunner) CleanupRun(context.Context, runner.RunSpec) error
 type runtimeTestHarness struct {
 	buildCalls int
 	prompts    []string
+	resumeIDs  []string
+	rendered   []harness.PromptKind
+}
+
+func (h *runtimeTestHarness) RenderPrompt(kind harness.PromptKind, _ harness.PromptData, nudge string) (string, error) {
+	h.rendered = append(h.rendered, kind)
+	prompt := "work"
+	if kind == harness.PromptFeedback {
+		prompt = "feedback"
+	}
+	if nudge != "" {
+		prompt += "\n\n" + nudge
+	}
+	return prompt, nil
 }
 
+func (*runtimeTestHarness) SetupRepo(context.Context, string) error             { return nil }
 func (*runtimeTestHarness) ValidateAgent(context.Context, string, string) error { return nil }
 func (*runtimeTestHarness) FindSession(context.Context, string, string) (harness.Session, bool, error) {
 	return harness.Session{}, false, nil
@@ -473,6 +521,7 @@ func (*runtimeTestHarness) FindSession(context.Context, string, string) (harness
 func (h *runtimeTestHarness) BuildCommand(spec harness.LaunchSpec) (runner.Command, error) {
 	h.buildCalls++
 	h.prompts = append(h.prompts, spec.Prompt)
+	h.resumeIDs = append(h.resumeIDs, spec.ResumeID)
 	return runner.Command{Executable: "opencode", Args: []string{spec.ResumeID}}, nil
 }
 

package/internal/execution/goworkflows/recovery_test.go

@@ -490,7 +490,7 @@ func TestTerminalReconcile(t *testing.T) {
 	terminalsBefore := fr.liveTerminals()
 	relaunchBefore := log.count("ensureTerminal:PAY-101:coding")
 	buildBefore := log.count("buildCommand:")
-	inspectBefore := log.count("inspectTerminal:")
+	inspectBefore := log.count("findTerminalID:")
 
 	// Healthy terminal: EnsureRun checks the persisted direct handle and,
 	// finding it live, sends no reconcile and relaunches
@@ -502,7 +502,7 @@ func TestTerminalReconcile(t *testing.T) {
 		t.Fatal(err)
 	}
 	time.Sleep(300 * time.Millisecond)
-	if log.count("inspectTerminal:") == inspectBefore {
+	if log.count("findTerminalID:") == inspectBefore {
 		t.Fatal("repeated EnsureRun never checked the persisted terminal handle")
 	}
 	if got := log.count("buildCommand:") - buildBefore; got != 0 {
@@ -759,8 +759,8 @@ func recoverTickets(ctx context.Context, engine *goworkflows.Engine, sys *fakeTa
 		return err
 	}
 	rm := &run.RunManager{Executor: engine, Runs: engine}
-	specsFor := func(w *workflow.Workflow, key string) []task.MailboxSpec {
-		return goworkflows.MailboxSpecs(w, key)
+	specsFor := func(system task.System, work run.Work, w *workflow.Workflow) ([]task.MailboxSpec, error) {
+		return goworkflows.RenderMailboxSpecs(system, work, w)
 	}
 	return recoverpkg.FromTaskSystem(ctx, reg, fr, rm, specsFor)
 }
@@ -792,7 +792,7 @@ func TestServeRecoverRebuildsFreshRuns(t *testing.T) {
 		RepoName: "payments", RepoPath: "/srv/payments", TicketKey: "PAY-101",
 	}
 	env, _ := fr.EnsureEnvironment(context.Background(), survSpec)
-	_, _ = fr.EnsureTerminal(context.Background(), env, "PAY-101:coding", runner.Command{})
+	_, _ = fr.EnsureTerminal(context.Background(), env, runner.Terminal{}, "PAY-101:coding", runner.Command{})
 
 	deps := goworkflows.Dependencies{Repos: repoRegistryWith("payments", sys), Runner: fr, Harness: fh}
 
@@ -821,7 +821,7 @@ func TestServeRecoverRebuildsFreshRuns(t *testing.T) {
 	if err != nil || preRuntime.TerminalID == "" {
 		t.Fatalf("pre-loss runtime = %+v, %v", preRuntime, err)
 	}
-	inspectBeforeRecover := log.count("inspectTerminal:")
+	inspectBeforeRecover := log.count("findTerminalID:")
 	pc, pcancel := context.WithTimeout(context.Background(), 30*time.Second)
 	_ = preEngine.Shutdown(pc)
 	pcancel()
@@ -871,7 +871,7 @@ func TestServeRecoverRebuildsFreshRuns(t *testing.T) {
 			t.Fatalf("%s recovery reused pre-loss terminal ID %q", key, rt.TerminalID)
 		}
 	}
-	if log.count("inspectTerminal:") != inspectBeforeRecover {
+	if log.count("findTerminalID:") != inspectBeforeRecover {
 		t.Fatalf("recover used pre-loss direct terminal IDs: %v", log.all())
 	}
 	if log.count("closeTerminals:") == 0 {

package/internal/execution/goworkflows/report_contract_fixture_test.go

@@ -0,0 +1,31 @@
+package goworkflows
+
+import (
+	"encoding/json"
+	"os"
+	"testing"
+
+	"github.com/rajpopat27/relay-flow/internal/run"
+)
+
+func TestSharedReportContractFixtureRendersCommentValues(t *testing.T) {
+	b, err := os.ReadFile("../../../testdata/report-contract.json")
+	if err != nil {
+		t.Fatal(err)
+	}
+	var fixtures map[string]struct {
+		Envelope       run.ReportRequest `json:"envelope"`
+		SummaryReport  string            `json:"summaryReport"`
+		FeedbackReport string            `json:"feedbackReport"`
+	}
+	if err := json.Unmarshal(b, &fixtures); err != nil {
+		t.Fatal(err)
+	}
+	fixture := fixtures["work"]
+	if got := renderSummaryReport(fixture.Envelope.Report); got != fixture.SummaryReport {
+		t.Fatalf("summaryReport mismatch\ngot:\n%s\nwant:\n%s", got, fixture.SummaryReport)
+	}
+	if got := renderFeedbackReport(fixture.Envelope.Report); got != fixture.FeedbackReport {
+		t.Fatalf("feedbackReport mismatch\ngot:\n%s\nwant:\n%s", got, fixture.FeedbackReport)
+	}
+}

package/internal/execution/goworkflows/retry_log_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 // 9.6: the info-level retry record must never embed argv payloads
-// (acli --body, orca --command carrying the agent prompt + RELAY_FLOW_*
+// (Jira/Orca request bodies or commands carrying prompts and RELAY_FLOW_*
 // env, JQL). sanitizeRetryMessage strips each "[args...]: " span while
 // preserving the surrounding wrap context and trailing stderr fragment.
 func TestSanitizeRetryMessage(t *testing.T) {
@@ -19,25 +19,25 @@ func TestSanitizeRetryMessage(t *testing.T) {
 		mustContain []string
 	}{
 		{
-			name: "acli comment with body payload",
-			in:   `acli [jira workitem comment create --key PAY-1 --body SECRET-BODY --json]: exit status 1: permission denied`,
-			mustNot: []string{"SECRET-BODY", "--body", "--key PAY-1"},
+			name:        "acli comment with body payload",
+			in:          `acli [jira workitem comment create --key PAY-1 --body SECRET-BODY --json]: exit status 1: permission denied`,
+			mustNot:     []string{"SECRET-BODY", "--body", "--key PAY-1"},
 			mustContain: []string{"acli", "exit status 1", "permission denied"},
 		},
 		{
-			name: "orca create with command payload",
-			in:   `ensure run X: orca terminal create: orca [terminal create --worktree name:PAY-1 --title PAY-1:coding --command 'RELAY_FLOW_RUN_ID=r1 opencode --agent coder PROMPT-TEXT']: exit status 1: closed`,
-			mustNot: []string{"PROMPT-TEXT", "RELAY_FLOW_RUN_ID=r1", "--command", "--title PAY-1:coding"},
+			name:        "orca create with command payload",
+			in:          `ensure run X: orca terminal create: orca [terminal create --worktree name:PAY-1 --title PAY-1:coding --command 'RELAY_FLOW_RUN_ID=r1 opencode --agent coder PROMPT-TEXT']: exit status 1: closed`,
+			mustNot:     []string{"PROMPT-TEXT", "RELAY_FLOW_RUN_ID=r1", "--command", "--title PAY-1:coding"},
 			mustContain: []string{"ensure run X", "orca terminal create", "exit status 1", "closed"},
 		},
 		{
-			name: "no brackets passes through",
-			in:   "plain failure",
+			name:        "no brackets passes through",
+			in:          "plain failure",
 			mustContain: []string{"plain failure"},
 		},
 		{
-			name: "unterminated bracket passes through",
-			in:   "weird [unterminated",
+			name:        "unterminated bracket passes through",
+			in:          "weird [unterminated",
 			mustContain: []string{"weird"},
 		},
 	}

package/internal/harness/contract_test.go

@@ -23,6 +23,8 @@ type fakeHarness struct {
 	session map[string]harness.Session // title -> session
 }
 
+var _ harness.Harness = (*fakeHarness)(nil)
+
 func newFakeHarness() *fakeHarness {
 	return &fakeHarness{
 		agents:  map[string]bool{"build": true},
@@ -30,6 +32,8 @@ func newFakeHarness() *fakeHarness {
 	}
 }
 
+func (f *fakeHarness) SetupRepo(context.Context, string) error { return nil }
+
 func (f *fakeHarness) ValidateAgent(_ context.Context, _, agent string) error {
 	if !f.agents[agent] {
 		return errUnknownAgent
@@ -42,6 +46,14 @@ func (f *fakeHarness) FindSession(_ context.Context, _, title string) (harness.S
 	return s, ok, nil
 }
 
+func (f *fakeHarness) RenderPrompt(_ harness.PromptKind, data harness.PromptData, nudge string) (string, error) {
+	prompt := data.TaskSystem + ":" + data.Ticket + ":" + data.Mailbox
+	if nudge != "" {
+		prompt += "\n\n" + nudge
+	}
+	return prompt, nil
+}
+
 func (f *fakeHarness) BuildCommand(spec harness.LaunchSpec) (runner.Command, error) {
 	// The fake mirrors the required env contract; the real opencode harness
 	// builds the executable/args. NEXT_STEPS_JSON carries the legal targets
@@ -141,6 +153,9 @@ func TestBuildCommandEnvContract(t *testing.T) {
 	if cmd.Env["RELAY_FLOW_TICKET"] != "PAY-101" || cmd.Env["RELAY_FLOW_NODE"] != "coding" {
 		t.Fatalf("ticket/node env wrong: %v", cmd.Env)
 	}
+	if _, ok := cmd.Env["RELAY_FLOW_NODE_VISIT_ID"]; ok {
+		t.Fatalf("internal node visit ID leaked into harness env: %v", cmd.Env)
+	}
 
 	// NEXT_STEPS_JSON must decode to the legal targets and their when
 	// explanations, not just exist.

package/internal/harness/factory.go

@@ -9,8 +9,12 @@ import (
 	"github.com/rajpopat27/relay-flow/internal/config"
 )
 
-// Factory constructs a Harness from root harness config.
-type Factory func(config.RawValues) (Harness, error)
+// Factory constructs a Harness from root harness config and supplies the
+// selected harness's init defaults without coupling core to an adapter.
+type Factory struct {
+	DefaultConfig func() config.RawValues
+	New           func(config.RawValues) (Harness, error)
+}
 
 var (
 	registryMu sync.RWMutex
@@ -35,7 +39,25 @@ func New(name string, cfg config.RawValues) (Harness, error) {
 	if !ok {
 		return nil, fmt.Errorf("harness: unknown plugin %q (registered: %s)", name, strings.Join(Names(), ", "))
 	}
-	return f(cfg)
+	return f.New(config.Merge(defaultConfig(f), cfg))
+}
+
+// Defaults returns a fresh copy of the named harness's root config defaults.
+func Defaults(name string) (config.RawValues, error) {
+	registryMu.RLock()
+	f, ok := registry[name]
+	registryMu.RUnlock()
+	if !ok {
+		return nil, fmt.Errorf("harness: unknown plugin %q (registered: %s)", name, strings.Join(Names(), ", "))
+	}
+	return config.Merge(defaultConfig(f)), nil
+}
+
+func defaultConfig(f Factory) config.RawValues {
+	if f.DefaultConfig == nil {
+		return nil
+	}
+	return f.DefaultConfig()
 }
 
 // ValidateName returns an error listing registered names when name is not

package/internal/harness/harness.go

@@ -1,7 +1,7 @@
-// Package harness defines the harness contract: agent validation, session
-// discovery, resume syntax, and launch command construction. The runner
-// executes the returned command; the harness never manipulates runner
-// state.
+// Package harness defines the harness contract: repository setup, prompt
+// rendering, agent validation, session discovery, resume syntax, and launch
+// command construction. The runner executes the returned command; the harness
+// never manipulates runner state.
 package harness
 
 import (
@@ -17,6 +17,29 @@ type Session struct {
 	Title string
 }
 
+type PromptKind string
+
+const (
+	PromptInitial  PromptKind = "initial"
+	PromptFeedback PromptKind = "feedback"
+)
+
+// 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
+}
+
 type LaunchSpec struct {
 	RunID       identity.RunID
 	NodeVisitID identity.NodeVisitID
@@ -30,12 +53,15 @@ type LaunchSpec struct {
 	Title       string
 	Prompt      string
 	NudgePrompt string
+	PromptData  PromptData
 	NextSteps   []workflow.Route
 	ResumeID    string
 }
 
 type Harness interface {
+	SetupRepo(ctx context.Context, repoPath string) error
 	ValidateAgent(ctx context.Context, repoPath, agent string) error
 	FindSession(ctx context.Context, repoPath, title string) (Session, bool, error)
+	RenderPrompt(kind PromptKind, data PromptData, nudgeTemplate string) (string, error)
 	BuildCommand(spec LaunchSpec) (runner.Command, error)
 }

package/internal/harness/opencode/opencode.go

@@ -15,36 +15,94 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"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"
 )
 
-// Config is the adapter-owned root harnessConfig. OpenCode takes no
-// configuration; any key is rejected.
-type Config struct{}
+const (
+	defaultInitialPrompt = `Task system: {{taskSystem}}
+Use the {{taskSystem}} tools to read the parent ticket {{ticket}}.
+
+Your mailbox is {{mailbox}}. Read its description and comments for node instructions and feedback.`
+	defaultFeedbackPrompt = `New feedback was added to the comments section of your mailbox subtask {{mailbox}}. Read it.`
+	defaultHITLPrompt     = `Before submitting your report, present the complete proposed report through OpenCode's built-in Question tool with exactly two options: Approve and Reject. Submit it only after an explicit Approve answer.`
+)
+
+var promptVarPattern = regexp.MustCompile(`\{\{([^{}]*)\}\}`)
+
+var knownPromptVars = map[string]bool{
+	"taskSystem": true, "ticket": true, "workflow": true, "repo": true,
+	"node": true, "nodeType": true, "agent": true, "nodeDescription": true,
+	"nextSteps": true, "mailbox": true,
+}
+
+// Config is the adapter-owned root harnessConfig.
+type Config struct {
+	Initial  string `yaml:"initial"`
+	Feedback string `yaml:"feedback"`
+	HITL     string `yaml:"hitl"`
+}
+
+// DefaultConfig is written by relay-flow init and also fills omitted values
+// when older or hand-written config is loaded.
+func DefaultConfig() config.RawValues {
+	return config.RawValues{
+		"initial":  defaultInitialPrompt,
+		"feedback": defaultFeedbackPrompt,
+		"hitl":     defaultHITLPrompt,
+	}
+}
 
 func init() {
-	harness.Register("opencode", func(raw config.RawValues) (harness.Harness, error) {
-		var cfg Config
-		if err := config.DecodeStrict(raw, &cfg); err != nil {
-			return nil, fmt.Errorf("opencode harnessConfig: %w", err)
-		}
-		return New(), nil
+	harness.Register("opencode", harness.Factory{
+		DefaultConfig: DefaultConfig,
+		New: func(raw config.RawValues) (harness.Harness, error) {
+			var cfg Config
+			if err := config.DecodeStrict(raw, &cfg); err != nil {
+				return nil, fmt.Errorf("opencode harnessConfig: %w", err)
+			}
+			for name, tmpl := range map[string]string{
+				"initial":  cfg.Initial,
+				"feedback": cfg.Feedback,
+				"hitl":     cfg.HITL,
+			} {
+				if err := validateTemplate(tmpl); err != nil {
+					return nil, fmt.Errorf("opencode harnessConfig templates.%s: %w", name, err)
+				}
+			}
+			return New(cfg), nil
+		},
 	})
 }
 
 // Harness implements harness.Harness for OpenCode. It is safe for
 // concurrent use; the seams below are only swapped by tests before use.
 type Harness struct {
+	templates Config
 	// listAgents is the test seam; nil → real `opencode agent list`.
 	listAgents func(ctx context.Context) ([]string, error)
 }
 
 // New returns the production Harness.
-func New() *Harness { return &Harness{} }
+func New(cfg ...Config) *Harness {
+	if len(cfg) > 0 {
+		return &Harness{templates: cfg[0]}
+	}
+	return &Harness{templates: Config{
+		Initial: defaultInitialPrompt, Feedback: defaultFeedbackPrompt, HITL: defaultHITLPrompt,
+	}}
+}
+
+// SetupRepo ensures the relay-flow runtime plugin is configured for OpenCode
+// in the registered repository.
+func (h *Harness) SetupRepo(_ context.Context, repoPath string) error {
+	return setupRepo(repoPath)
+}
 
 // ValidateAgent reports whether name is a known OpenCode agent for the
 // repo, per `opencode agent list` (agent names are the unindented first
@@ -75,6 +133,26 @@ func (h *Harness) FindSession(context.Context, string, string) (harness.Session,
 	return harness.Session{}, false, nil
 }
 
+// RenderPrompt renders the selected session prompt, appends HITL approval
+// instructions for HITL nodes, then renders and appends the node's nudge
+// template.
+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
+	case harness.PromptFeedback:
+		tmpl = h.templates.Feedback
+	default:
+		return "", fmt.Errorf("opencode: unknown prompt kind %q", kind)
+	}
+	prompt := renderTemplate(tmpl, data)
+	if data.NodeType == workflow.NodeHITL {
+		prompt = appendPrompt(prompt, renderTemplate(h.templates.HITL, data))
+	}
+	return appendPrompt(prompt, renderTemplate(nudgeTemplate, data)), nil
+}
+
 // BuildCommand returns the structured opencode invocation with the
 // required RELAY_FLOW_* env. spec.ResumeID non-empty resumes the prior
 // session (`opencode --session <id>`); empty is a fresh launch. The
@@ -164,3 +242,40 @@ func listAgents(ctx context.Context) ([]string, error) {
 	}
 	return names, nil
 }
+
+func validateTemplate(tmpl string) error {
+	for _, match := range promptVarPattern.FindAllStringSubmatch(tmpl, -1) {
+		if !knownPromptVars[match[1]] {
+			return fmt.Errorf("unknown template variable {{%s}}", match[1])
+		}
+	}
+	return nil
+}
+
+func renderTemplate(tmpl string, data harness.PromptData) string {
+	values := map[string]string{
+		"taskSystem":      data.TaskSystem,
+		"ticket":          data.Ticket,
+		"workflow":        data.Workflow,
+		"repo":            data.Repo,
+		"node":            data.Node,
+		"nodeType":        string(data.NodeType),
+		"agent":           data.Agent,
+		"nodeDescription": data.NodeDescription,
+		"nextSteps":       data.NextSteps,
+		"mailbox":         data.Mailbox,
+	}
+	return promptVarPattern.ReplaceAllStringFunc(tmpl, func(match string) string {
+		return values[promptVarPattern.FindStringSubmatch(match)[1]]
+	})
+}
+
+func appendPrompt(prompt, extra string) string {
+	if extra == "" {
+		return prompt
+	}
+	if prompt == "" {
+		return extra
+	}
+	return prompt + "\n\n" + extra
+}