relay-flow 0.2.2-alpha → 0.2.4-alpha

package/internal/runner/herdr/herdrcli/testdata/snapshot.json

@@ -0,0 +1,213 @@
+{
+  "id": "cli:api:snapshot",
+  "result": {
+    "snapshot": {
+      "agents": [],
+      "focused_pane_id": "w1:p1",
+      "focused_tab_id": "w1:t1",
+      "focused_workspace_id": "w1",
+      "layouts": [
+        {
+          "area": {
+            "height": 39,
+            "width": 94,
+            "x": 26,
+            "y": 1
+          },
+          "focused_pane_id": "w1:p1",
+          "panes": [
+            {
+              "focused": true,
+              "pane_id": "w1:p1",
+              "rect": {
+                "height": 39,
+                "width": 94,
+                "x": 26,
+                "y": 1
+              }
+            }
+          ],
+          "splits": [],
+          "tab_id": "w1:t1",
+          "workspace_id": "w1",
+          "zoomed": false
+        },
+        {
+          "area": {
+            "height": 39,
+            "width": 94,
+            "x": 26,
+            "y": 1
+          },
+          "focused_pane_id": "w2:p1",
+          "panes": [
+            {
+              "focused": true,
+              "pane_id": "w2:p1",
+              "rect": {
+                "height": 39,
+                "width": 94,
+                "x": 26,
+                "y": 1
+              }
+            }
+          ],
+          "splits": [],
+          "tab_id": "w2:t1",
+          "workspace_id": "w2",
+          "zoomed": false
+        },
+        {
+          "area": {
+            "height": 39,
+            "width": 94,
+            "x": 26,
+            "y": 1
+          },
+          "focused_pane_id": "w2:p2",
+          "panes": [
+            {
+              "focused": true,
+              "pane_id": "w2:p2",
+              "rect": {
+                "height": 39,
+                "width": 94,
+                "x": 26,
+                "y": 1
+              }
+            }
+          ],
+          "splits": [],
+          "tab_id": "w2:t2",
+          "workspace_id": "w2",
+          "zoomed": false
+        }
+      ],
+      "panes": [
+        {
+          "agent_status": "unknown",
+          "cwd": "/work/payments",
+          "focused": true,
+          "foreground_cwd": "/work/payments",
+          "pane_id": "w1:p1",
+          "revision": 1,
+          "scroll": {
+            "max_offset_from_bottom": 0,
+            "offset_from_bottom": 0,
+            "viewport_rows": 39
+          },
+          "tab_id": "w1:t1",
+          "terminal_id": "term_65a5cfcc8c6361",
+          "terminal_title": "relay@relay-host:/work/payments",
+          "terminal_title_stripped": "relay@relay-host:/work/payments",
+          "workspace_id": "w1"
+        },
+        {
+          "agent_status": "unknown",
+          "cwd": "/work/worktrees/payments/pay-101",
+          "focused": false,
+          "foreground_cwd": "/work/worktrees/payments/pay-101",
+          "pane_id": "w2:p1",
+          "revision": 1,
+          "scroll": {
+            "max_offset_from_bottom": 0,
+            "offset_from_bottom": 0,
+            "viewport_rows": 39
+          },
+          "tab_id": "w2:t1",
+          "terminal_id": "term_65a5cfcc8cd9e2",
+          "terminal_title": "relay@relay-host:~/.herdr/worktrees/repo/pay-101",
+          "terminal_title_stripped": "relay@relay-host:~/.herdr/worktrees/repo/pay-101",
+          "workspace_id": "w2"
+        },
+        {
+          "agent_status": "unknown",
+          "cwd": "/work/worktrees/payments/pay-101",
+          "focused": false,
+          "foreground_cwd": "/work/worktrees/payments/pay-101",
+          "label": "PAY-101:coding",
+          "pane_id": "w2:p2",
+          "revision": 2,
+          "scroll": {
+            "max_offset_from_bottom": 0,
+            "offset_from_bottom": 0,
+            "viewport_rows": 39
+          },
+          "tab_id": "w2:t2",
+          "terminal_id": "term_65a5cfcc913e03",
+          "terminal_title": "sleep 300",
+          "terminal_title_stripped": "sleep 300",
+          "workspace_id": "w2"
+        }
+      ],
+      "protocol": 20,
+      "tabs": [
+        {
+          "agent_status": "unknown",
+          "focused": true,
+          "label": "1",
+          "number": 1,
+          "pane_count": 1,
+          "tab_id": "w1:t1",
+          "workspace_id": "w1"
+        },
+        {
+          "agent_status": "unknown",
+          "focused": false,
+          "label": "1",
+          "number": 1,
+          "pane_count": 1,
+          "tab_id": "w2:t1",
+          "workspace_id": "w2"
+        },
+        {
+          "agent_status": "unknown",
+          "focused": false,
+          "label": "PAY-101:coding",
+          "number": 2,
+          "pane_count": 1,
+          "tab_id": "w2:t2",
+          "workspace_id": "w2"
+        }
+      ],
+      "version": "0.8.2",
+      "workspaces": [
+        {
+          "active_tab_id": "w1:t1",
+          "agent_status": "unknown",
+          "focused": true,
+          "label": "repo",
+          "number": 1,
+          "pane_count": 1,
+          "tab_count": 1,
+          "workspace_id": "w1",
+          "worktree": {
+            "checkout_path": "/work/payments",
+            "is_linked_worktree": false,
+            "repo_key": "/work/payments/.git",
+            "repo_name": "repo",
+            "repo_root": "/work/payments"
+          }
+        },
+        {
+          "active_tab_id": "w2:t1",
+          "agent_status": "unknown",
+          "focused": false,
+          "label": "PAY-101",
+          "number": 2,
+          "pane_count": 2,
+          "tab_count": 2,
+          "workspace_id": "w2",
+          "worktree": {
+            "checkout_path": "/work/worktrees/payments/pay-101",
+            "is_linked_worktree": true,
+            "repo_key": "/work/payments/.git",
+            "repo_name": "repo",
+            "repo_root": "/work/payments"
+          }
+        }
+      ]
+    },
+    "type": "session_snapshot"
+  }
+}

package/internal/runner/herdr/herdrcli/testdata/strict-herdr.sh

@@ -0,0 +1,175 @@
+#!/bin/sh
+# Strict fake `herdr`. It accepts only the exact production command shapes and
+# reproduces the observed transport contract of herdr 0.8.2:
+#   success -> result envelope on stdout, exit 0 (pane run prints nothing)
+#   failure -> error envelope on stderr, exit 1, empty stdout
+set -eu
+
+fail() {
+  printf 'unsupported or malformed herdr invocation:' >&2
+  for arg in "$@"; do
+    printf ' <%s>' "$arg" >&2
+  done
+  printf '\n' >&2
+  exit 64
+}
+
+# The wrapper supplies selector configuration through the environment rather
+# than adding session/socket flags to every Herdr command.
+check_selector() {
+  actual_name=$1
+  expected_name=$2
+  eval "expected_set=\${${expected_name}+x}"
+  if [ "$expected_set" = x ]; then
+    eval "expected=\${${expected_name}-}"
+    eval "actual=\${${actual_name}-}"
+    [ "$actual" = "$expected" ] || fail "wrong $actual_name: $actual"
+  else
+    eval "actual_set=\${${actual_name}+x}"
+    [ "$actual_set" != x ] || fail "ambient $actual_name leaked"
+  fi
+}
+
+check_selector HERDR_SESSION HERDR_EXPECT_SESSION
+check_selector HERDR_SOCKET_PATH HERDR_EXPECT_SOCKET_PATH
+
+fixture_path() {
+  fixture_dir=${HERDR_FIXTURE_DIR-}
+  [ -n "$fixture_dir" ] || fail "HERDR_FIXTURE_DIR is unset"
+  [ -f "$fixture_dir/$1" ] || fail "missing fixture: $1"
+  printf '%s' "$fixture_dir/$1"
+}
+
+emit_result() { cat "$(fixture_path "$1")"; exit 0; }
+
+# Herdr writes error envelopes to stderr and exits 1.
+emit_error() { cat "$(fixture_path "$1")" >&2; exit 1; }
+
+check_absolute_cwd() {
+  case "$1" in
+    /*) ;;
+    *) fail "--cwd must be absolute: $1" ;;
+  esac
+}
+
+check_value() {
+  [ -n "$1" ] || fail "empty positional value"
+  case "$1" in
+    -*) fail "unexpected flag in positional value: $1" ;;
+  esac
+}
+
+case "$#:${1-}:${2-}" in
+  2:api:snapshot)
+    emit_result snapshot.json
+    ;;
+  4:worktree:list)
+    [ "$3" = --cwd ] || fail "$@"
+    check_absolute_cwd "$4"
+    case "$4" in
+      *not-a-repo) emit_error error-not-git-worktree.json ;;
+      *) emit_result worktree-list.json ;;
+    esac
+    ;;
+  11:worktree:create)
+    [ "$3" = --cwd ] || fail "$@"
+    check_absolute_cwd "$4"
+    [ "$5" = --branch ] || fail "$@"
+    check_value "$6"
+    [ "$7" = --base ] || fail "$@"
+    check_value "$8"
+    [ "$9" = --label ] || fail "$@"
+    check_value "${10}"
+    [ "${11}" = --no-focus ] || fail "$@"
+    emit_result worktree-create.json
+    ;;
+  9:worktree:open)
+    [ "$3" = --cwd ] || fail "$@"
+    check_absolute_cwd "$4"
+    [ "$5" = --branch ] || fail "$@"
+    check_value "$6"
+    [ "$7" = --label ] || fail "$@"
+    check_value "$8"
+    [ "$9" = --no-focus ] || fail "$@"
+    case "$6" in
+      MISSING-*) emit_error error-worktree-not-found.json ;;
+    esac
+    emit_result worktree-open.json
+    ;;
+  9:tab:create)
+    [ "$3" = --workspace ] || fail "$@"
+    check_value "$4"
+    [ "$5" = --cwd ] || fail "$@"
+    check_absolute_cwd "$6"
+    [ "$7" = --label ] || fail "$@"
+    check_value "$8"
+    [ "$9" = --no-focus ] || fail "$@"
+    emit_result tab-create.json
+    ;;
+  4:tab:list)
+    [ "$3" = --workspace ] || fail "$@"
+    check_value "$4"
+    case "$4" in
+      empty) emit_result empty-tabs.json ;;
+      missing) emit_error error-workspace-not-found.json ;;
+      *) emit_result tab-list.json ;;
+    esac
+    ;;
+  4:pane:list)
+    [ "$3" = --workspace ] || fail "$@"
+    check_value "$4"
+    case "$4" in
+      empty) emit_result empty-panes.json ;;
+      missing) emit_error error-workspace-not-found.json ;;
+      *) emit_result pane-list.json ;;
+    esac
+    ;;
+  3:pane:get)
+    check_value "$3"
+    case "$3" in
+      malformed) emit_result malformed.json ;;
+      warning) printf 'captured warning\n' >&2; emit_result pane-get.json ;;
+      missing) emit_error error-pane-not-found.json ;;
+      *) emit_result pane-get.json ;;
+    esac
+    ;;
+  4:pane:process-info)
+    [ "$3" = --pane ] || fail "$@"
+    check_value "$4"
+    case "$4" in
+      shell) emit_result pane-process-info-shell.json ;;
+      missing) emit_error error-pane-not-found.json ;;
+      *) emit_result pane-process-info.json ;;
+    esac
+    ;;
+  4:pane:rename)
+    check_value "$3"
+    check_value "$4"
+    emit_result pane-rename.json
+    ;;
+  4:pane:run)
+    # COMMAND is deliberately one logical argument: a command containing
+    # spaces or newlines must arrive as the same argument the wrapper passed
+    # to exec.CommandContext. Herdr prints nothing on success.
+    check_value "$3"
+    [ -n "$4" ] || fail "empty command"
+    exit 0
+    ;;
+  3:pane:close)
+    check_value "$3"
+    case "$3" in
+      missing) emit_error error-pane-not-found.json ;;
+      *) emit_result pane-close.json ;;
+    esac
+    ;;
+  3:workspace:close)
+    check_value "$3"
+    case "$3" in
+      missing) emit_error error-workspace-not-found.json ;;
+      *) emit_result workspace-close.json ;;
+    esac
+    ;;
+  *)
+    fail "$@"
+    ;;
+esac

package/internal/runner/herdr/herdrcli/testdata/tab-create.json

@@ -0,0 +1,31 @@
+{
+  "id": "cli:tab:create",
+  "result": {
+    "root_pane": {
+      "agent_status": "unknown",
+      "cwd": "/work/worktrees/payments/pay-101",
+      "focused": false,
+      "foreground_cwd": "/work/worktrees/payments/pay-101",
+      "pane_id": "w2:p2",
+      "revision": 0,
+      "scroll": {
+        "max_offset_from_bottom": 0,
+        "offset_from_bottom": 0,
+        "viewport_rows": 39
+      },
+      "tab_id": "w2:t2",
+      "terminal_id": "term_65a5cfcc913e03",
+      "workspace_id": "w2"
+    },
+    "tab": {
+      "agent_status": "unknown",
+      "focused": false,
+      "label": "PAY-101:coding",
+      "number": 2,
+      "pane_count": 1,
+      "tab_id": "w2:t2",
+      "workspace_id": "w2"
+    },
+    "type": "tab_created"
+  }
+}

package/internal/runner/herdr/herdrcli/testdata/tab-list.json

@@ -0,0 +1,26 @@
+{
+  "id": "cli:tab:list",
+  "result": {
+    "tabs": [
+      {
+        "agent_status": "unknown",
+        "focused": false,
+        "label": "1",
+        "number": 1,
+        "pane_count": 1,
+        "tab_id": "w2:t1",
+        "workspace_id": "w2"
+      },
+      {
+        "agent_status": "unknown",
+        "focused": false,
+        "label": "PAY-101:coding",
+        "number": 2,
+        "pane_count": 1,
+        "tab_id": "w2:t2",
+        "workspace_id": "w2"
+      }
+    ],
+    "type": "tab_list"
+  }
+}

package/internal/runner/herdr/herdrcli/testdata/workspace-close.json

@@ -0,0 +1,6 @@
+{
+  "id": "cli:workspace:close",
+  "result": {
+    "type": "ok"
+  }
+}

package/internal/runner/herdr/herdrcli/testdata/worktree-create.json

@@ -0,0 +1,58 @@
+{
+  "id": "cli:worktree:create",
+  "result": {
+    "root_pane": {
+      "agent_status": "unknown",
+      "cwd": "/work/worktrees/payments/pay-101",
+      "focused": false,
+      "foreground_cwd": "/work/worktrees/payments/pay-101",
+      "pane_id": "w2:p1",
+      "revision": 0,
+      "scroll": {
+        "max_offset_from_bottom": 0,
+        "offset_from_bottom": 0,
+        "viewport_rows": 40
+      },
+      "tab_id": "w2:t1",
+      "terminal_id": "term_65a5cfcc8cd9e2",
+      "workspace_id": "w2"
+    },
+    "tab": {
+      "agent_status": "unknown",
+      "focused": false,
+      "label": "1",
+      "number": 1,
+      "pane_count": 1,
+      "tab_id": "w2:t1",
+      "workspace_id": "w2"
+    },
+    "type": "worktree_created",
+    "workspace": {
+      "active_tab_id": "w2:t1",
+      "agent_status": "unknown",
+      "focused": false,
+      "label": "PAY-101",
+      "number": 2,
+      "pane_count": 1,
+      "tab_count": 1,
+      "workspace_id": "w2",
+      "worktree": {
+        "checkout_path": "/work/worktrees/payments/pay-101",
+        "is_linked_worktree": true,
+        "repo_key": "/work/payments/.git",
+        "repo_name": "repo",
+        "repo_root": "/work/payments"
+      }
+    },
+    "worktree": {
+      "branch": "PAY-101",
+      "is_bare": false,
+      "is_detached": false,
+      "is_linked_worktree": true,
+      "is_prunable": false,
+      "label": "repo",
+      "open_workspace_id": "w2",
+      "path": "/work/worktrees/payments/pay-101"
+    }
+  }
+}

package/internal/runner/herdr/herdrcli/testdata/worktree-list.json

@@ -0,0 +1,35 @@
+{
+  "id": "cli:worktree:list",
+  "result": {
+    "source": {
+      "repo_key": "/work/payments/.git",
+      "repo_name": "repo",
+      "repo_root": "/work/payments",
+      "source_checkout_path": "/work/payments",
+      "source_workspace_id": "w1"
+    },
+    "type": "worktree_list",
+    "worktrees": [
+      {
+        "branch": "main",
+        "is_bare": false,
+        "is_detached": false,
+        "is_linked_worktree": false,
+        "is_prunable": false,
+        "label": "repo",
+        "open_workspace_id": "w1",
+        "path": "/work/payments"
+      },
+      {
+        "branch": "PAY-101",
+        "is_bare": false,
+        "is_detached": false,
+        "is_linked_worktree": true,
+        "is_prunable": false,
+        "label": "repo",
+        "open_workspace_id": "w2",
+        "path": "/work/worktrees/payments/pay-101"
+      }
+    ]
+  }
+}

package/internal/runner/herdr/herdrcli/testdata/worktree-open.json

@@ -0,0 +1,59 @@
+{
+  "id": "cli:worktree:open",
+  "result": {
+    "already_open": true,
+    "root_pane": {
+      "agent_status": "unknown",
+      "cwd": "/work/worktrees/payments/pay-101",
+      "focused": false,
+      "foreground_cwd": "/work/worktrees/payments/pay-101",
+      "pane_id": "w2:p1",
+      "revision": 0,
+      "scroll": {
+        "max_offset_from_bottom": 0,
+        "offset_from_bottom": 0,
+        "viewport_rows": 39
+      },
+      "tab_id": "w2:t1",
+      "terminal_id": "term_65a5cfcc8cd9e2",
+      "workspace_id": "w2"
+    },
+    "tab": {
+      "agent_status": "unknown",
+      "focused": false,
+      "label": "1",
+      "number": 1,
+      "pane_count": 1,
+      "tab_id": "w2:t1",
+      "workspace_id": "w2"
+    },
+    "type": "worktree_opened",
+    "workspace": {
+      "active_tab_id": "w2:t1",
+      "agent_status": "unknown",
+      "focused": false,
+      "label": "PAY-101",
+      "number": 2,
+      "pane_count": 1,
+      "tab_count": 1,
+      "workspace_id": "w2",
+      "worktree": {
+        "checkout_path": "/work/worktrees/payments/pay-101",
+        "is_linked_worktree": true,
+        "repo_key": "/work/payments/.git",
+        "repo_name": "repo",
+        "repo_root": "/work/payments"
+      }
+    },
+    "worktree": {
+      "branch": "PAY-101",
+      "is_bare": false,
+      "is_detached": false,
+      "is_linked_worktree": true,
+      "is_prunable": false,
+      "label": "repo",
+      "open_workspace_id": "w2",
+      "path": "/work/worktrees/payments/pay-101"
+    }
+  }
+}

package/internal/server/api_test.go

@@ -3,8 +3,10 @@ package server_test
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
+	"strings"
 	"testing"
 	"time"
 
@@ -211,6 +213,58 @@ func TestRepoAndRunEndpoints(t *testing.T) {
 	}
 }
 
+func TestRunRestartEndpointReturnsFreshAttempt(t *testing.T) {
+	want := run.Run{
+		ID: "payments/basicFlow/PAY-101~attempt~2", LogicalID: "payments/basicFlow/PAY-101", AttemptID: 2,
+		Repo: "payments", Workflow: "basicFlow", Ticket: task.TicketRef{Key: "PAY-101"}, State: run.StateStarting,
+	}
+	fake := &fakeServices{restartRun: want}
+	c, cleanup := startHandler(t, fake)
+	defer cleanup()
+
+	code, env := do(t, c, http.MethodPost, "http://relay/runs/by-ticket/PAY-101/restart", nil)
+	if code != http.StatusOK || !env.OK {
+		t.Fatalf("POST restart: code=%d env=%+v", code, env)
+	}
+	if !bytes.Contains(env.Data, []byte(`"attemptId":2`)) ||
+		!bytes.Contains(env.Data, []byte(`"logicalRunId":"payments/basicFlow/PAY-101"`)) {
+		t.Fatalf("restart response omitted attempt identity: %s", env.Data)
+	}
+	if len(fake.restarts) != 1 || fake.restarts[0] != "PAY-101" {
+		t.Fatalf("restart calls = %v", fake.restarts)
+	}
+}
+
+func TestRunRestartConflictMapsTo409(t *testing.T) {
+	fake := &fakeServices{restartErr: fmt.Errorf("%w: ticket is still canceling", run.ErrRestartConflict)}
+	c, cleanup := startHandler(t, fake)
+	defer cleanup()
+	code, env := do(t, c, http.MethodPost, "http://relay/runs/by-ticket/PAY-101/restart", nil)
+	if code != http.StatusConflict || env.OK || env.Error == nil || !strings.Contains(env.Error.Message, "ticket is still canceling") {
+		t.Fatalf("restart conflict: code=%d env=%+v", code, env)
+	}
+}
+
+func TestBlockedRunGetShowsStatusAction(t *testing.T) {
+	blocked := run.Run{
+		ID: "payments/basicFlow/PAY-101~attempt~2", LogicalID: "payments/basicFlow/PAY-101", AttemptID: 2,
+		State: run.StateBlocked, CurrentNode: "start",
+		Ticket:    task.TicketRef{Key: "PAY-101"},
+		LastError: "Human-owned ticket status \"Blocked\" conflicts with the workflow start transition. Move ticket PAY-101 to an allowed active start status; relay-flow will retry automatically",
+	}
+	c, cleanup := startHandler(t, &fakeServices{runs: []run.Run{blocked}})
+	defer cleanup()
+	code, env := do(t, c, http.MethodGet, "http://relay/runs/by-ticket/PAY-101", nil)
+	if code != http.StatusOK || !env.OK {
+		t.Fatalf("GET blocked run: code=%d env=%+v", code, env)
+	}
+	for _, want := range []string{`"state":"blocked"`, `"currentNode":"start"`, `allowed active start status`, `automatically`} {
+		if !bytes.Contains(env.Data, []byte(want)) {
+			t.Fatalf("blocked run response missing %q: %s", want, env.Data)
+		}
+	}
+}
+
 func TestRunEndpointsExposeRetryDetails(t *testing.T) {
 	next := time.Now().UTC().Add(time.Minute)
 	retrying := run.Run{