ci: inherit gadfly's default swarm (slim caller, re-pin @b02b11d)

steve/gadfly#10 moved the curated swarm (3 cloud + Claude Code sonnet/opus/
opus:max, 5-lens suite) into the reusable workflow's input defaults. Drop this
repo's explicit `with:` swarm block and inherit it — only the consumer-specific
allow-list remains. Re-pin to the post-#10 gadfly commit (@b02b11d).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.gitea/workflows/adversarial-review.yml

@@ -1,8 +1,8 @@
 # Gadfly adversarial review — subscribes to steve/gadfly's reusable workflow and
-# INHERITS its default swarm. This stub holds only the triggers, the actor gate,
-# secret forwarding, and the allow-list; the swarm config (models, lenses,
-# concurrency, timeouts) lives centrally in gadfly's review-reusable.yml so it is
-# tuned in ONE place. Advisory only — never blocks a merge.
+# INHERITS its default swarm (3 cloud models + Claude Code sonnet/opus/opus:max,
+# 5-lens suite). This stub holds only the triggers, the actor gate, secret
+# forwarding, and the allow-list; the swarm config lives centrally in gadfly's
+# review-reusable.yml. Advisory only — never blocks a merge.
 
 name: Adversarial Review (Gadfly)
 
@@ -29,26 +29,24 @@ concurrency:
 jobs:
   review:
     # Security: only trusted users may trigger a secret-bearing run via a PR
-    # comment (pull_request + workflow_dispatch are already trusted). Mirrors the
-    # allowed_users input below (the in-container belt-and-suspenders check) — both
-    # lists must stay in sync; a workflow if: can't read a workflow_call input.
+    # comment (pull_request + workflow_dispatch are already trusted). Mirrors
+    # the allowed_users input below (the in-container belt-and-suspenders check).
     if: >-
       github.event_name != 'issue_comment'
       || (github.event.issue.pull_request
           && (github.actor == 'steve'
               || github.actor == 'fizi'
               || github.actor == 'dazed'))
-    # Tracks gadfly's v1 release tag — a curated pointer re-moved on each release
-    # (unlike @main, which moves on every push). Central swarm tuning propagates
-    # here automatically; the tradeoff vs a full sha pin is that v1 is mutable.
-    uses: steve/gadfly/.gitea/workflows/review-reusable.yml@v1
-    # Least privilege: forward only the review secrets (not `secrets: inherit`,
-    # which would expose every repo secret). GITEA_TOKEN is the automatic token.
+    # Pinned to an immutable gadfly commit (not @main): a push to gadfly can't
+    # silently change the code that runs with our forwarded secrets.
+    uses: steve/gadfly/.gitea/workflows/review-reusable.yml@b02b11d69139843665da4cdbf776bc0b3583490d
+    # Least privilege: forward ONLY the secrets the swarm uses (GITEA_TOKEN is auto).
     secrets:
       OLLAMA_CLOUD_API_KEY:    ${{ secrets.OLLAMA_CLOUD_API_KEY }}
       CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
       GADFLY_FINDINGS_URL:     ${{ secrets.GADFLY_FINDINGS_URL }}
       GADFLY_FINDINGS_TOKEN:   ${{ secrets.GADFLY_FINDINGS_TOKEN }}
     with:
-      # Consumer-specific allow-list; everything else is inherited.
+      # Inherit the default swarm from gadfly's review-reusable.yml; only the
+      # consumer-specific allow-list is set here.
       allowed_users: "steve,fizi,dazed"

run/executor.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
 	"time"
 
 	"gitea.stevedudenhoeffer.com/steve/majordomo/agent"
@@ -321,7 +320,7 @@ func (e *Executor) Run(ctx context.Context, ra RunnableAgent, inv tool.Invocatio
 	// One WithSteer drains BOTH the session mailbox (a tool's AttachImages) and
 	// the critic's nudges before each step.
 	steer := func() []llm.Message { return append(mailbox.drain(), critic.drainSteer()...) }
-	runRes, runErr := runAgent(runCtx, ag, input, inv.Images, agent.WithSteer(steer))
+	runRes, runErr := ag.Run(runCtx, input, agent.WithSteer(steer))
 
 	status := statusFor(runCtx, runErr)
 	if runRes != nil {
@@ -441,28 +440,3 @@ func detach(ctx context.Context) context.Context {
 	_ = cancel // bounded by the timeout; nothing to cancel early
 	return c
 }
-
-// runAgent dispatches the majordomo agent loop. majordomo's Run takes a text-only
-// input arg, so when the invocation carries images they're folded into the first
-// user message (text + image parts) via WithHistory and Run is called with an
-// empty input — the model then sees a multimodal opening turn. The image-less path
-// passes the prompt straight through.
-//
-// The text part is omitted when input is blank (image-only run), matching
-// runSession.AttachImages so no empty TextPart is sent.
-func runAgent(ctx context.Context, ag *agent.Agent, input string, images []llm.ImagePart, opts ...agent.RunOption) (*agent.Result, error) {
-	if len(images) == 0 {
-		return ag.Run(ctx, input, opts...)
-	}
-	parts := make([]llm.Part, 0, len(images)+1)
-	if strings.TrimSpace(input) != "" {
-		parts = append(parts, llm.Text(input))
-	}
-	for _, img := range images {
-		parts = append(parts, img)
-	}
-	// Copy opts before appending so a caller-supplied backing array is never
-	// mutated/aliased (the variadic slice can have spare capacity).
-	opts = append(opts[:len(opts):len(opts)], agent.WithHistory([]llm.Message{llm.UserParts(parts...)}))
-	return ag.Run(ctx, "", opts...)
-}

run/images_test.go

@@ -1,121 +0,0 @@
-package run_test
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"gitea.stevedudenhoeffer.com/steve/majordomo/llm"
-	"gitea.stevedudenhoeffer.com/steve/majordomo/provider/fake"
-
-	"gitea.stevedudenhoeffer.com/steve/executus/run"
-	"gitea.stevedudenhoeffer.com/steve/executus/tool"
-)
-
-// TestExecutorFoldsInitialImages: when the invocation carries Images, they're
-// folded into the first user message (alongside the prompt text) instead of being
-// dropped — majordomo's Run input arg is text-only, so the executor seeds the
-// multimodal opening turn via history.
-func TestExecutorFoldsInitialImages(t *testing.T) {
-	fp := fake.New("fake")
-	fp.Enqueue("m", fake.Reply("saw the image"))
-	m, _ := fp.Model("m")
-
-	img := llm.ImagePart{MIME: "image/png", Data: []byte("PNGDATA")}
-	inv := tool.Invocation{RunID: "r1", Images: []llm.ImagePart{img}}
-	ex := run.New(run.Config{
-		Registry: tool.NewRegistry(),
-		Models:   func(ctx context.Context, _ string) (context.Context, llm.Model, error) { return ctx, m, nil },
-	})
-	res := ex.Run(context.Background(), run.RunnableAgent{ModelTier: "m"}, inv, "describe this")
-	if res.Err != nil {
-		t.Fatalf("run error: %v", res.Err)
-	}
-
-	calls := fp.Calls()
-	if len(calls) == 0 {
-		t.Fatal("no model calls recorded")
-	}
-	// The text + image must be CO-LOCATED in a single user message (not split
-	// across two), so the model reads them as one multimodal turn.
-	coLocated := false
-	for _, msg := range calls[0].Request.Messages {
-		sawImage, sawText := false, false
-		for _, p := range msg.Parts {
-			switch pp := p.(type) {
-			case llm.ImagePart:
-				if string(pp.Data) == "PNGDATA" {
-					sawImage = true
-				}
-			case llm.TextPart:
-				if strings.Contains(pp.Text, "describe this") {
-					sawText = true
-				}
-			}
-		}
-		if sawImage && sawText {
-			coLocated = true
-		}
-	}
-	if !coLocated {
-		t.Error("image + prompt text were not folded into the SAME user message")
-	}
-}
-
-// TestExecutorImageOnlyNoBlankText: an image-only run (blank prompt) must NOT emit
-// an empty TextPart — the message carries just the image, matching
-// runSession.AttachImages's guard.
-func TestExecutorImageOnlyNoBlankText(t *testing.T) {
-	fp := fake.New("fake")
-	fp.Enqueue("m", fake.Reply("saw it"))
-	m, _ := fp.Model("m")
-
-	inv := tool.Invocation{RunID: "r3", Images: []llm.ImagePart{{MIME: "image/png", Data: []byte("IMG")}}}
-	ex := run.New(run.Config{
-		Registry: tool.NewRegistry(),
-		Models:   func(ctx context.Context, _ string) (context.Context, llm.Model, error) { return ctx, m, nil },
-	})
-	res := ex.Run(context.Background(), run.RunnableAgent{ModelTier: "m"}, inv, "   ")
-	if res.Err != nil {
-		t.Fatalf("run error: %v", res.Err)
-	}
-	for _, msg := range fp.Calls()[0].Request.Messages {
-		for _, p := range msg.Parts {
-			if tp, ok := p.(llm.TextPart); ok && strings.TrimSpace(tp.Text) == "" {
-				t.Error("image-only run emitted a blank TextPart")
-			}
-		}
-	}
-}
-
-// TestExecutorTextOnlyUnchanged: with no Images, the prompt flows through as the
-// text input (regression guard that the fold path didn't break the common case).
-func TestExecutorTextOnlyUnchanged(t *testing.T) {
-	fp := fake.New("fake")
-	fp.Enqueue("m", fake.Reply("ok"))
-	m, _ := fp.Model("m")
-
-	ex := run.New(run.Config{
-		Registry: tool.NewRegistry(),
-		Models:   func(ctx context.Context, _ string) (context.Context, llm.Model, error) { return ctx, m, nil },
-	})
-	res := ex.Run(context.Background(), run.RunnableAgent{ModelTier: "m"}, tool.Invocation{RunID: "r2"}, "plain prompt")
-	if res.Err != nil {
-		t.Fatalf("run error: %v", res.Err)
-	}
-	calls := fp.Calls()
-	if len(calls) == 0 {
-		t.Fatal("no model calls recorded")
-	}
-	sawText := false
-	for _, msg := range calls[0].Request.Messages {
-		for _, p := range msg.Parts {
-			if tp, ok := p.(llm.TextPart); ok && strings.Contains(tp.Text, "plain prompt") {
-				sawText = true
-			}
-		}
-	}
-	if !sawText {
-		t.Error("text-only prompt did not reach the model")
-	}
-}