Fix problems found in QA pass of build 1792795001

internal/agents/lead.go

@@ -310,6 +310,9 @@ func (m *Manager) leadTurnEnded(ctx context.Context, l *live, res endResult) err
 	if handoff {
 		payload["handoff"] = true
 	}
+	if interrupted {
+		payload["interrupted"] = true
+	}
 	err := m.emit(ctx, l, agentActor, "turn.ended", payload)
 	if err != nil {
 		return err

internal/agents/manager.go

@@ -1003,11 +1003,15 @@ func (m *Manager) pump(l *live) {
 	m.mu.Lock()
 	delete(m.live, l.id)
 	closing := m.closing
-	quiet := closing || l.stopping
+	stopping := l.stopping
 	interrupted := l.interrupted
 	m.mu.Unlock()
 
-	orphaned := len(l.subagents) > 0 && !closing
+	if closing {
+		return
+	}
+
+	orphaned := len(l.subagents) > 0
 	if orphaned {
 		err := m.store.SetSubagents(ctx, l.id, 0, "byre")
 		if err != nil {
@@ -1015,8 +1019,8 @@ func (m *Manager) pump(l *live) {
 		}
 	}
 
-	if quiet {
-		m.logUndelivered(ctx, l.id, "agent process ended while closing or stopping")
+	if stopping {
+		m.logUndelivered(ctx, l.id, "agent process ended while stopping")
 		return
 	}
 
@@ -1259,6 +1263,9 @@ func (m *Manager) turnEnded(ctx context.Context, l *live, res endResult) error {
 	if l.member != "" {
 		payload["member"] = l.member
 	}
+	if interrupted {
+		payload["interrupted"] = true
+	}
 	owner := m.ownsTask(l.id)
 	if owner {
 		defer m.endMergeTurn(l.id, false)

internal/agents/review.go

@@ -119,9 +119,13 @@ func (m *Manager) beginReviews(ctx context.Context, ref store.SnapshotRef) error
 	if project.ReviewWorkflow == "" {
 		return finished(api.ReviewStateFailed, "", fmt.Sprintf("project %s has no review workflow", project.Name))
 	}
-	changes, err := git.Compare(ctx, project.RepoPath, project.DefaultBranch, snap.CommitSha, snap.TreeSha, "")
+	base, err := m.reviewBase(ctx, task, project)
 	if err != nil {
-		return finished(api.ReviewStateFailed, project.ReviewWorkflow, fmt.Sprintf("byre couldn't compare snapshot #%d with %s: %v", snap.N, project.DefaultBranch, err))
+		return err
+	}
+	changes, err := git.Compare(ctx, project.RepoPath, base, snap.CommitSha, snap.TreeSha, "")
+	if err != nil {
+		return finished(api.ReviewStateFailed, project.ReviewWorkflow, fmt.Sprintf("byre couldn't compare snapshot #%d with %s: %v", snap.N, base, err))
 	}
 	if len(changes.Files) == 0 {
 		slog.Info("review skipped, snapshot has no diff", "task", task.Id, "snapshot", snap.N)
@@ -232,7 +236,11 @@ func (m *Manager) launchReviewer(ctx context.Context, task api.Task, project api
 }
 
 func (m *Manager) reviewPrompt(ctx context.Context, task api.Task, project api.Project, snap api.Snapshot, def api.WorkflowDefinition, stage string, inputs []api.Review) (string, error) {
-	changes, err := git.Compare(ctx, project.RepoPath, project.DefaultBranch, snap.CommitSha, snap.TreeSha, "")
+	base, err := m.reviewBase(ctx, task, project)
+	if err != nil {
+		return "", err
+	}
+	changes, err := git.Compare(ctx, project.RepoPath, base, snap.CommitSha, snap.TreeSha, "")
 	if err != nil {
 		return "", err
 	}
@@ -244,7 +252,7 @@ func (m *Manager) reviewPrompt(ctx context.Context, task api.Task, project api.P
 	b := &strings.Builder{}
 	fmt.Fprintf(b, "Review the work of the agent on the byre task %q, as reviewer %q of the project's review workflow %q.\n\n%s\n\n", task.Title, stage, project.ReviewWorkflow, strings.TrimSpace(workflow.Get(def, stage).Prompt))
 	fmt.Fprintf(b, "It is snapshot #%d of the task, commit %s, checked out in your working directory. The change is all of the task's work, `git diff %s %s` (from the merge-base with %s); %d files changed:\n",
-		snap.N, snap.CommitSha, changes.Base, snap.CommitSha, project.DefaultBranch, len(changes.Files))
+		snap.N, snap.CommitSha, changes.Base, snap.CommitSha, base, len(changes.Files))
 	for i, f := range changes.Files {
 		if i == maxReviewFiles {
 			fmt.Fprintf(b, "- … and %d more\n", len(changes.Files)-maxReviewFiles)
@@ -262,6 +270,17 @@ func (m *Manager) reviewPrompt(ctx context.Context, task api.Task, project api.P
 	return b.String(), nil
 }
 
+func (m *Manager) reviewBase(ctx context.Context, task api.Task, project api.Project) (string, error) {
+	if task.ParentTaskId == nil || task.WorkflowStage != nil {
+		return project.DefaultBranch, nil
+	}
+	parent, err := m.store.GetTask(ctx, *task.ParentTaskId)
+	if err != nil {
+		return "", err
+	}
+	return parent.Branch, nil
+}
+
 func quote(s string) string {
 	lines := strings.Split(strings.TrimSpace(s), "\n")
 	for i, l := range lines {

internal/agents/snapshots.go

@@ -269,12 +269,12 @@ func (m *Manager) takeSnapshotTool(l *live) mcp.Tool {
 			if err != nil {
 				return "", err
 			}
-			return "Worktree committed to the task's branch, and snapshot requested. If the project has a review workflow, its reviewers check it against the default branch; their findings come to you together once the workflow finishes.", nil
+			return "Worktree committed to the task's branch, and snapshot requested. If the project has a review workflow, its reviewers check it against the default branch (a subtask's against its parent's branch); their findings come to you together once the workflow finishes.", nil
 		},
 	}
 }
 
-const takeSnapshotDescription = "Commit and snapshot a task's worktree now: byre commits the whole worktree, uncommitted work included, to the task's branch, and returns once that commit is made. It then snapshots that commit on byre's own ref for the task (refs/byre/tasks/<task>/snap/<n>). If the project has a review workflow, its reviewers check all of the task's work against the default branch, using each stage's model and instructions; findings arrive together once the workflow finishes. " +
+const takeSnapshotDescription = "Commit and snapshot a task's worktree now: byre commits the whole worktree, uncommitted work included, to the task's branch, and returns once that commit is made. It then snapshots that commit on byre's own ref for the task (refs/byre/tasks/<task>/snap/<n>). If the project has a review workflow, its reviewers check all of the task's work against the default branch (a subtask's against its parent's branch), using each stage's model and instructions; findings arrive together once the workflow finishes. " +
 	"byre already does this at the end of every turn that changes files; call this to review work mid-turn, or to retry a review that failed (it snapshots even when nothing changed since the last snapshot)."
 
 func (m *Manager) dropSnapshots(repo, taskID string) error {