checkpoint: multi-repo Gitea ingestion, per-project repos, rotation anchor_sha fix

Pre-existing uncommitted work found at session start: rotation now emits anchor_sha on TaskReleased (previously silently dropped by store.Append validation), multi-repo Gitea provider support, per-project git worktree roots, and associated test coverage. Committing as a checkpoint before starting remediation work tracked in AUDIT.md.
2026-07-27 18:15:02 +04:00
parent 325c684eb0
commit ce6f02f9e6
31 changed files with 2717 additions and 320 deletions
@@ -2,7 +2,9 @@ package herdr

 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"path/filepath"
 	"strings"
 	"time"
 )
@@ -15,6 +17,10 @@ type Adapter interface {
 	Occupancy(Session) (float64, error)
 }

+type WorktreeCreator interface {
+	CreateWorktree(context.Context, string, string, string) (string, error)
+}
+
 // TurnBoundary is optional so older herdr deployments remain usable. A true
 // result means the current harness turn has ended and handoff is safe.
 type TurnBoundary interface {
@@ -26,6 +32,18 @@ type RotationSignal interface {
 type PaneExit interface {
 	PaneExited(context.Context, Session) (bool, error)
 }
+
+// AgentStatus is a live, non-lifecycle status reported by herdr. Consumers
+// must not infer task completion or release from it.
+type AgentStatus interface {
+	AgentStatus(context.Context, Session) (string, error)
+}
+type AgentBlocker interface {
+	AgentBlocker(context.Context, Session) (string, error)
+}
+type PaneCapture interface {
+	PaneCapture(context.Context, Session, string) (string, error)
+}
 type CLIAdapter struct {
 	Client  *Client
 	Harness string
@@ -33,15 +51,29 @@ type CLIAdapter struct {
 	Usage   func(string) (Usage, error)
 }

+func (a CLIAdapter) CreateWorktree(ctx context.Context, repo, root, taskID string) (string, error) {
+	path, err := a.Client.Worktree(ctx, repo, filepath.Join(root, taskID), "orchestra/"+taskID)
+	if err != nil {
+		return "", err
+	}
+	if path == "" {
+		return "", fmt.Errorf("adapter: herdr returned empty worktree path")
+	}
+	return path, nil
+}
+
 func (a CLIAdapter) Lease(ctx context.Context, task, worktree string) (Session, error) {
 	if a.Client == nil {
 		return Session{}, fmt.Errorf("adapter: client required")
 	}
-	var s Session
-	e := a.Client.Call(ctx, "pane.create", map[string]string{"harness": a.Harness, "task_id": task, "worktree": worktree}, &s)
-	s.Harness = a.Harness
-	s.Worktree = worktree
-	return s, e
+	s, err := a.Client.StartAgent(ctx, worktree, worktree, "orchestra/"+task, a.Harness, task)
+	if err != nil {
+		return Session{}, err
+	}
+	if err := a.Client.Prompt(ctx, s.PaneID, fmt.Sprintf("Begin Orchestra task %s. Inspect the repository, understand the task context, and proceed with the requested work.", task), 0); err != nil {
+		return Session{}, err
+	}
+	return s, nil
 }
 func (a CLIAdapter) Bootstrap(ctx context.Context, s Session, ref string) error {
 	return a.Client.Prompt(ctx, s.PaneID, fmt.Sprintf("Read handoff %s, validate the anchor and TASK.md, then continue.", ref), time.Minute)
@@ -57,23 +89,96 @@ func (a CLIAdapter) Kill(ctx context.Context, s Session) error {
 	return a.Client.Call(ctx, "pane.kill", s, nil)
 }
 func (a CLIAdapter) AtTurnBoundary(ctx context.Context, s Session) (bool, error) {
-	var r struct {
-		Status string `json:"status"`
-	}
-	if err := a.Client.Call(ctx, "pane.status", s, &r); err != nil {
+	status, err := a.AgentStatus(ctx, s)
+	if err != nil {
 		return false, err
 	}
-	return !IsBusy(r.Status), nil
+	return !IsBusy(status), nil
 }
 func (a CLIAdapter) PaneExited(ctx context.Context, s Session) (bool, error) {
-	var r struct {
-		Status string `json:"status"`
-	}
-	if err := a.Client.Call(ctx, "pane.status", s, &r); err != nil {
+	status, err := a.AgentStatus(ctx, s)
+	if err != nil {
 		return false, err
 	}
-	return strings.EqualFold(r.Status, "exited") || strings.EqualFold(r.Status, "dead"), nil
+	return strings.EqualFold(status, "exited") || strings.EqualFold(status, "dead"), nil
 }
+func (a CLIAdapter) AgentStatus(ctx context.Context, s Session) (string, error) {
+	// Current herdr protocol exposes agent state through agent.get; older
+	// Orchestra code used pane.status, which is not a valid protocol method.
+	var r map[string]any
+	if err := a.Client.Call(ctx, "agent.get", map[string]any{"target": s.PaneID}, &r); err != nil {
+		return "", err
+	}
+	return statusFromAgentResult(r), nil
+}
+
+func (a CLIAdapter) AgentBlocker(ctx context.Context, s Session) (string, error) {
+	var r struct {
+		Read struct {
+			Text string `json:"text"`
+		} `json:"read"`
+	}
+	if err := a.Client.Call(ctx, "pane.read", map[string]any{"pane_id": s.PaneID, "source": "recent"}, &r); err != nil {
+		return "", err
+	}
+	text := strings.TrimSpace(r.Read.Text)
+	lines := strings.Split(text, "\n")
+	for i, raw := range lines {
+		line := strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(raw), "┃"))
+		if !strings.EqualFold(line, "Permission required") && !strings.EqualFold(line, "Approval required") && !strings.HasPrefix(strings.ToLower(line), "waiting for") {
+			continue
+		}
+		for _, next := range lines[i+1:] {
+			command := strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(next), "┃"))
+			if strings.HasPrefix(command, "$ ") {
+				return strings.ToLower(line) + ": shell command `" + strings.TrimSpace(strings.TrimPrefix(command, "$ ")) + "`", nil
+			}
+		}
+		return strings.ToLower(line), nil
+	}
+	return "", nil
+}
+
+func (a CLIAdapter) PaneCapture(ctx context.Context, s Session, source string) (string, error) {
+	if source == "" {
+		source = "recent"
+	}
+	var r struct {
+		Read struct {
+			Text string `json:"text"`
+		} `json:"read"`
+	}
+	if err := a.Client.Call(ctx, "pane.read", map[string]any{"pane_id": s.PaneID, "source": source}, &r); err != nil {
+		return "", err
+	}
+	return r.Read.Text, nil
+}
+
+func statusFromAgentResult(v any) string {
+	if m, ok := v.(map[string]any); ok {
+		for _, key := range []string{"status", "agent_status", "state"} {
+			if s, ok := m[key].(string); ok && s != "" {
+				return s
+			}
+		}
+		for _, child := range m {
+			if s := statusFromAgentResult(child); s != "" {
+				return s
+			}
+		}
+	}
+	if a, ok := v.([]any); ok {
+		for _, child := range a {
+			if s := statusFromAgentResult(child); s != "" {
+				return s
+			}
+		}
+	}
+	return ""
+}
+
+var _ = json.RawMessage{}
+
 func (a CLIAdapter) RotationSignal(ctx context.Context, s Session) (string, error) {
 	var r struct {
 		Reason string `json:"reason"`