relay-flow 0.2.3-alpha → 0.2.5-alpha

package/internal/runner/orca/orca_test.go

@@ -39,9 +39,10 @@ func TestSanitizeErr(t *testing.T) {
 
 // fakeCLI is the orcacli.Client seam used by the Orca runner tests.
 type fakeCLI struct {
-	repos     []orcacli.Repo
-	worktrees []orcacli.Worktree
-	terminals map[string]orcacli.Terminal
+	repos           []orcacli.Repo
+	worktrees       []orcacli.Worktree
+	terminals       map[string]orcacli.Terminal
+	listedTerminals []orcacli.Terminal
 
 	createdBaseBranch string
 	createdParent     string
@@ -82,7 +83,7 @@ func (f *fakeCLI) ShowTerminal(_ context.Context, handle string) (orcacli.Termin
 }
 func (f *fakeCLI) SendTerminal(context.Context, string, string) error { return nil }
 func (f *fakeCLI) ListTerminals(context.Context, string) ([]orcacli.Terminal, error) {
-	return nil, nil
+	return f.listedTerminals, nil
 }
 func (f *fakeCLI) CreateTerminal(_ context.Context, _ string, title, command string) (string, error) {
 	f.createN++
@@ -157,6 +158,34 @@ func TestSetEnvironmentStatus(t *testing.T) {
 	}
 }
 
+func TestDiscoverTerminalByStableTitle(t *testing.T) {
+	fx := &fakeCLI{
+		repos:     []orcacli.Repo{{ID: "r1", DisplayName: "app", Path: "/srv/app"}},
+		worktrees: []orcacli.Worktree{{ID: "wt-PAY-1", RepoID: "r1", DisplayName: "PAY-1"}},
+		listedTerminals: []orcacli.Terminal{
+			{Handle: "term-other", Title: "PAY-1:other", Connected: true},
+			{Handle: "term-node", Title: "PAY-1:implement", Connected: true},
+		},
+	}
+	a, err := New(fx, config.RawValues{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	discoverer, ok := a.(runner.TerminalDiscoverer)
+	if !ok {
+		t.Fatal("Orca runner does not expose recovery terminal discovery")
+	}
+	got, found, err := discoverer.DiscoverTerminal(context.Background(), runner.RunSpec{
+		RepoName: "app", RepoPath: "/srv/app", TicketKey: "PAY-1",
+	}, "PAY-1:implement")
+	if err != nil || !found || got.ID != "term-node" || got.Title != "PAY-1:implement" {
+		t.Fatalf("DiscoverTerminal = %+v, %v, %v", got, found, err)
+	}
+	if fx.createN != 0 {
+		t.Fatalf("terminal discovery created a terminal: %d", fx.createN)
+	}
+}
+
 func TestFindTerminalUsesPersistedID(t *testing.T) {
 	fx := &fakeCLI{terminals: map[string]orcacli.Terminal{
 		"term-stored": {Handle: "term-stored", Title: "PAY-1:implement", Connected: true},

package/internal/runner/runner.go

@@ -56,6 +56,14 @@ type RunSpec struct {
 //
 // Terminal titles are stable and minimal: only "<ticket>:<node>" — never
 // nodeVisitID, workflow name, agent name, or other changing metadata.
+// TerminalDiscoverer is an optional recovery capability. It discovers a
+// currently live run-owned terminal by its stable title without creating a
+// terminal or changing runner state. The core Runner contract remains
+// unchanged for adapters that do not support title discovery.
+type TerminalDiscoverer interface {
+	DiscoverTerminal(ctx context.Context, spec RunSpec, title string) (Terminal, bool, error)
+}
+
 type Runner interface {
 	DiscoverRepos(ctx context.Context) ([]RepoCandidate, error)
 	ValidateRepo(ctx context.Context, name, path string) error

package/internal/task/beads/beads.go

@@ -328,9 +328,6 @@ func (s *system) CompileFilter(workflowTaskConfig config.RawValues) (func(task.T
 		return nil, err
 	}
 	f := cfg.Filters
-	if !hasAssigneeFilter(merged) && cfg.Assignee != "" {
-		f.Assignees = []string{cfg.Assignee}
-	}
 	return func(ticket task.Ticket) bool {
 		if len(f.ParentStatuses) > 0 && !containsExact(f.ParentStatuses, stringField(ticket.Fields, "status")) {
 			return false
@@ -353,19 +350,6 @@ func (s *system) CompileFilter(workflowTaskConfig config.RawValues) (func(task.T
 	}, nil
 }
 
-func hasAssigneeFilter(raw config.RawValues) bool {
-	switch filters := raw["filters"].(type) {
-	case map[string]any:
-		_, ok := filters["assignees"]
-		return ok
-	case config.RawValues:
-		_, ok := filters["assignees"]
-		return ok
-	default:
-		return false
-	}
-}
-
 func containsExact(values []string, want string) bool {
 	for _, value := range values {
 		if value == want {

package/internal/task/beads/config_compatibility_test.go

@@ -50,7 +50,7 @@ func TestBeadsConfigRejectsJiraOnlyFields(t *testing.T) {
 	}
 }
 
-func TestBeadsCompileFilterUsesInheritedTopLevelAssignee(t *testing.T) {
+func TestBeadsCompileFilterDoesNotUseTopLevelAssignee(t *testing.T) {
 	sys := &system{base: config.Merge(DefaultConfig(), config.RawValues{
 		"assignee": "Repo.Bot@Example.com",
 	})}
@@ -58,15 +58,14 @@ func TestBeadsCompileFilterUsesInheritedTopLevelAssignee(t *testing.T) {
 	if err != nil {
 		t.Fatalf("CompileFilter failed: %v", err)
 	}
-	if !match(task.Ticket{Fields: map[string]any{"assignee": "repo.bot@example.COM"}}) {
-		t.Fatal("top-level assignee did not become the default filter")
-	}
-	if match(task.Ticket{Fields: map[string]any{"assignee": "other@example.com"}}) {
-		t.Fatal("ticket assigned to another user matched the default assignee filter")
+	for _, assignee := range []string{"repo.bot@example.COM", "other@example.com"} {
+		if !match(task.Ticket{Fields: map[string]any{"assignee": assignee}}) {
+			t.Fatalf("assignee %q was filtered without filters.assignees", assignee)
+		}
 	}
 }
 
-func TestBeadsExplicitAssigneeFilterOverridesInheritedDefault(t *testing.T) {
+func TestBeadsExplicitAssigneeFilterIsUsed(t *testing.T) {
 	sys := &system{base: config.Merge(DefaultConfig(), config.RawValues{
 		"assignee": "repo@example.com",
 	})}
@@ -84,7 +83,7 @@ func TestBeadsExplicitAssigneeFilterOverridesInheritedDefault(t *testing.T) {
 	}
 	for _, assignee := range []string{"repo@example.com", "workflow@example.com"} {
 		if match(task.Ticket{Fields: map[string]any{"assignee": assignee}}) {
-			t.Fatalf("inherited assignee %q overrode explicit assignee filter", assignee)
+			t.Fatalf("explicit assignee filter accepted %q", assignee)
 		}
 	}
 }

package/internal/task/jira/filters_test.go

@@ -232,6 +232,33 @@ func TestCompileFilterAssigneeMatchesEmail(t *testing.T) {
 	}
 }
 
+func TestCompileFilterCurrentUserMatchesAuthenticatedJiraEmail(t *testing.T) {
+	sys := newSystemWithFake(t, &fakeJira{}).(*system)
+	sys.currentUser = "me@example.com"
+	match, err := sys.CompileFilter(config.RawValues{
+		"filters": map[string]any{"assignees": []any{"currentUser()"}},
+	})
+	if err != nil {
+		t.Fatalf("CompileFilter failed: %v", err)
+	}
+	if !match(task.Ticket{Key: "PAY-1", Fields: map[string]any{"assignee": "ME@EXAMPLE.COM"}}) {
+		t.Fatal("currentUser() did not resolve to the authenticated Jira email")
+	}
+	if match(task.Ticket{Key: "PAY-2", Fields: map[string]any{"assignee": "other@example.com"}}) {
+		t.Fatal("currentUser() matched another Jira assignee")
+	}
+}
+
+func TestCompileFilterCurrentUserRequiresCredentials(t *testing.T) {
+	sys := newSystemWithFake(t, &fakeJira{})
+	_, err := sys.CompileFilter(config.RawValues{
+		"filters": map[string]any{"assignees": []any{"currentUser()"}},
+	})
+	if err == nil || !strings.Contains(err.Error(), "authenticated Jira credentials") {
+		t.Fatalf("CompileFilter error = %v, want authenticated-credentials error", err)
+	}
+}
+
 func TestCompileFilterAssigneeMatchAndMismatch(t *testing.T) {
 	// Assignee is a supported structured filter dimension
 	// (repo-workflow-routing: "parent statuses, issue types, labels, and
@@ -253,7 +280,7 @@ func TestCompileFilterAssigneeMatchAndMismatch(t *testing.T) {
 	}
 }
 
-func TestCompileFilterInheritsEffectiveAssigneeCaseInsensitively(t *testing.T) {
+func TestCompileFilterDoesNotUseEffectiveAssigneeAsFilter(t *testing.T) {
 	sys, err := newSystem(context.Background(), &fakeClient{fake: &fakeJira{}}, task.RepoSpec{
 		Name:       "payments",
 		RootConfig: config.RawValues{"assignee": "root@example.com"},
@@ -266,11 +293,10 @@ func TestCompileFilterInheritsEffectiveAssigneeCaseInsensitively(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !match(task.Ticket{Fields: map[string]any{"assignee": "repo.bot@example.COM"}}) {
-		t.Fatal("effective repo assignee did not match normalized email case-insensitively")
-	}
-	if match(task.Ticket{Fields: map[string]any{"assignee": "other@example.com"}}) {
-		t.Fatal("ticket assigned to another user matched effective assignee")
+	for _, assignee := range []string{"root@example.com", "repo.bot@example.COM", "other@example.com"} {
+		if !match(task.Ticket{Fields: map[string]any{"assignee": assignee}}) {
+			t.Fatalf("assignee %q was filtered without filters.assignees", assignee)
+		}
 	}
 }
 

package/internal/task/jira/jira.go

@@ -53,6 +53,7 @@ const (
 	defaultStartParentStatus  = "In Progress"
 	defaultWorkTaskStatus     = "In Progress"
 	defaultEndParentStatus    = "Done"
+	currentUserAssigneeFilter = "currentUser()"
 	defaultMailboxDescription = `Parent ticket: {{ticket}}
 Workflow: {{workflow}}
 Node: {{node}}
@@ -147,7 +148,12 @@ func init() {
 			if err != nil {
 				return nil, err
 			}
-			return newSystem(ctx, client, spec)
+			sys, err := newSystem(ctx, client, spec)
+			if err != nil {
+				return nil, err
+			}
+			sys.currentUser = strings.TrimSpace(creds.Email)
+			return sys, nil
 		},
 	})
 }
@@ -173,10 +179,11 @@ func sharedClient(site, email, token string) (*jirarest.HTTPClient, error) {
 // system is the repo-bound Jira task.System. It is safe for concurrent use;
 // the REST client owns connection reuse, caches, and request limiting.
 type system struct {
-	cli       jirarest.Client
-	repoName  string
-	base      config.RawValues
-	effective Config // root+repo merged
+	cli         jirarest.Client
+	repoName    string
+	currentUser string
+	base        config.RawValues
+	effective   Config // root+repo merged
 }
 
 func newSystem(ctx context.Context, cli jirarest.Client, spec task.RepoSpec) (*system, error) {
@@ -323,9 +330,11 @@ func (s *system) CompileFilter(workflowTaskConfig config.RawValues) (func(task.T
 		return nil, err
 	}
 	f := cfg.Filters
-	if !hasAssigneeFilter(merged) && cfg.Assignee != "" {
-		f.Assignees = []string{cfg.Assignee}
+	resolvedAssignees, err := s.resolveAssigneeFilters(f.Assignees)
+	if err != nil {
+		return nil, err
 	}
+	f.Assignees = resolvedAssignees
 	return func(t task.Ticket) bool {
 		if len(f.ParentStatuses) > 0 && !contains(f.ParentStatuses, strField(t.Fields, "status")) {
 			return false
@@ -348,17 +357,18 @@ func (s *system) CompileFilter(workflowTaskConfig config.RawValues) (func(task.T
 	}, nil
 }
 
-func hasAssigneeFilter(raw config.RawValues) bool {
-	switch filters := raw["filters"].(type) {
-	case map[string]any:
-		_, ok := filters["assignees"]
-		return ok
-	case config.RawValues:
-		_, ok := filters["assignees"]
-		return ok
-	default:
-		return false
+func (s *system) resolveAssigneeFilters(values []string) ([]string, error) {
+	resolved := make([]string, 0, len(values))
+	for _, value := range values {
+		if value == currentUserAssigneeFilter {
+			if s.currentUser == "" {
+				return nil, fmt.Errorf("jira: filters.assignees value %q requires authenticated Jira credentials", currentUserAssigneeFilter)
+			}
+			value = s.currentUser
+		}
+		resolved = append(resolved, value)
 	}
+	return resolved, nil
 }
 
 // --- Claim ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relay-flow",
-  "version": "0.2.3-alpha",
+  "version": "0.2.5-alpha",
   "description": "Graph-based agent workflow engine — tracker-agnostic, pluggable runners",
   "bin": {
     "relay-flow": "./bin/relay-flow.js",