fix(test): keep CI on bd v0.57.0; add SDK-based assertConvoyExists; rewrite cross-rig dep targets to external: form

Reverts bd CLI version bump to v1.0.0 — bd v1.0.0 dropped the cross-DB
literal-ID lookup that several scheduler integration tests rely on
(addBeadDependencyOfType across rigs). v0.57.0 keeps that lookup working
with SDK v1.0.0; the only place the v0.57.0 schema mismatch surfaces is
\`bd show\` against a convoy in HQ, which now goes through the SDK
(assertConvoyExists) instead of the CLI.

Also makes addBeadDependencyOfType resolve cross-rig targets to the
external:<rig>:<id> form so the same helper still works under bd v1.0.0
when we eventually bump again. Switches getBeadDescription/beadHasLabel
to MaybePrependAllowStale so they tolerate either bd version.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: kab0rn

.github/workflows/ci.yml

@@ -175,7 +175,7 @@ jobs:
 
       - name: Install beads (bd)
         if: steps.cache-beads-int.outputs.cache-hit != 'true'
-        run: go install github.com/steveyegge/beads/cmd/bd@v1.0.0
+        run: go install github.com/steveyegge/beads/cmd/bd@v0.57.0
 
       - name: Install gotestsum
         run: go install gotest.tools/gotestsum@latest

.github/workflows/nightly-integration.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Install beads (bd)
         if: steps.cache-beads.outputs.cache-hit != 'true'
-        run: go install github.com/steveyegge/beads/cmd/bd@v1.0.0
+        run: go install github.com/steveyegge/beads/cmd/bd@v0.57.0
 
       - name: Install Dolt
         run: |

internal/cmd/scheduler_integration_test.go

@@ -310,33 +310,10 @@ func TestSchedulerAutoConvoyCreation(t *testing.T) {
 		t.Fatalf("convoy ID not stored in sling context")
 	}
 
-	// Verify: convoy is resolvable via bd show from hq.
-	// --allow-stale is a global flag: must come before the subcommand.
-	// Use Output() so stderr (permission/deprecation warnings) doesn't pollute JSON.
-	showArgs := beads.MaybePrependAllowStale([]string{"show", fields.Convoy, "--json"})
-	cmd := exec.Command("bd", showArgs...)
-	cmd.Dir = hqPath
-	out, err := cmd.Output()
-	if err != nil {
-		stderr := ""
-		if ee, ok := err.(*exec.ExitError); ok {
-			stderr = string(ee.Stderr)
-		}
-		t.Fatalf("bd show convoy %s failed: %v\nstdout: %s\nstderr: %s", fields.Convoy, err, out, stderr)
-	}
-	var convoys []struct {
-		ID        string `json:"id"`
-		IssueType string `json:"issue_type"`
-	}
-	if err := json.Unmarshal(out, &convoys); err != nil {
-		t.Fatalf("parse convoy show (output=%q): %v", out, err)
-	}
-	if len(convoys) == 0 {
-		t.Fatalf("convoy %s not found via bd show", fields.Convoy)
-	}
-	if convoys[0].IssueType != "convoy" {
-		t.Errorf("convoy issue_type = %q, want %q", convoys[0].IssueType, "convoy")
-	}
+	// Verify: convoy is resolvable via the SDK store (bd CLI's `bd show` runs a
+	// schema-dependent SQL path that breaks across CLI/SDK version skews; querying
+	// through the SDK is what production code does anyway).
+	assertConvoyExists(t, hqPath, fields.Convoy)
 
 	// Verify: convoy has a "tracks" dependency pointing to the rig bead.
 	// This is the core cross-rig link: convoy lives in HQ DB, bead in rig DB.
@@ -354,6 +331,46 @@ func TestSchedulerAutoConvoyCreation(t *testing.T) {
 	assertConvoyTracksBead(t, hqPath, fields.Convoy, beadID)
 }
 
+// assertConvoyExists verifies a convoy issue exists in the HQ DB and is of type
+// "convoy". Uses the SDK store directly to avoid bd CLI/SDK schema skew.
+func assertConvoyExists(t *testing.T, hqPath, convoyID string) {
+	t.Helper()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	b := beads.NewWithBeadsDir(hqPath, filepath.Join(hqPath, ".beads"))
+	store, cleanup, err := b.OpenStore(ctx)
+	if err != nil {
+		t.Fatalf("open hq store: %v", err)
+	}
+	defer cleanup()
+
+	var issueType string
+	var found bool
+	txErr := store.RunInTransaction(ctx, "", func(tx beadsdk.Transaction) error {
+		issue, err := tx.GetIssue(ctx, convoyID)
+		if err != nil {
+			return err
+		}
+		if issue == nil {
+			return nil
+		}
+		found = true
+		issueType = string(issue.IssueType)
+		return nil
+	})
+	if txErr != nil {
+		t.Fatalf("get convoy %s: %v", convoyID, txErr)
+	}
+	if !found {
+		t.Fatalf("convoy %s not found in hq store", convoyID)
+	}
+	if issueType != "convoy" {
+		t.Errorf("convoy issue_type = %q, want %q", issueType, "convoy")
+	}
+}
+
 // assertConvoyTracksBead verifies the HQ convoy has a "tracks" dependency
 // referencing the rig bead. The stored depends_on_id is either the bead ID
 // (same-rig) or `external:<rig>:<beadID>` (cross-rig).

internal/cmd/scheduler_test_helpers_test.go

@@ -10,8 +10,10 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"testing"
 
+	"github.com/steveyegge/gastown/internal/beads"
 	"github.com/steveyegge/gastown/internal/config"
 	"github.com/steveyegge/gastown/internal/scheduler/capacity"
 	"github.com/steveyegge/gastown/internal/testutil"
@@ -145,7 +147,8 @@ func createTestBead(t *testing.T, dir, title string) string {
 // Runs bd show --json from dir and inspects the labels array.
 func beadHasLabel(t *testing.T, beadID, label, dir string) bool {
 	t.Helper()
-	cmd := exec.Command("bd", "show", beadID, "--json", "--allow-stale")
+	args := beads.MaybePrependAllowStale([]string{"show", beadID, "--json"})
+	cmd := exec.Command("bd", args...)
 	cmd.Dir = dir
 	out, err := cmd.Output()
 	if err != nil {
@@ -171,7 +174,8 @@ func beadHasLabel(t *testing.T, beadID, label, dir string) bool {
 // getBeadDescription returns the description of a bead via bd show --json.
 func getBeadDescription(t *testing.T, beadID, dir string) string {
 	t.Helper()
-	cmd := exec.Command("bd", "show", beadID, "--json", "--allow-stale")
+	args := beads.MaybePrependAllowStale([]string{"show", beadID, "--json"})
+	cmd := exec.Command("bd", args...)
 	cmd.Dir = dir
 	out, err := cmd.Output()
 	if err != nil {
@@ -220,14 +224,56 @@ func addBeadDependency(t *testing.T, blocked, blocker, dir string) {
 }
 
 // addBeadDependencyOfType adds a dependency with a specific type (e.g., "tracks",
-// "depends_on"). The from bead must exist in the local DB at dir; the to bead can
-// be in a different DB if routes.jsonl is present in dir's .beads/.
+// "depends_on"). The from bead must exist in the local DB at dir; if the to bead
+// lives in a different rig DB (per the town's routes.jsonl), it is rewritten as
+// an external:<rig>:<id> reference, which is bd v1.0.0's required cross-DB form.
 func addBeadDependencyOfType(t *testing.T, from, to, depType, dir string) {
 	t.Helper()
-	cmd := exec.Command("bd", "dep", "add", from, to, "--type="+depType)
+	target := resolveCrossRigTarget(t, dir, from, to)
+	cmd := exec.Command("bd", "dep", "add", from, target, "--type="+depType)
 	cmd.Dir = dir
 	if out, err := cmd.CombinedOutput(); err != nil {
-		t.Fatalf("bd dep add %s %s --type=%s failed: %v\n%s", from, to, depType, err, out)
+		t.Fatalf("bd dep add %s %s --type=%s failed: %v\n%s", from, target, depType, err, out)
+	}
+}
+
+// resolveCrossRigTarget returns `to` unchanged when `from` and `to` share a DB,
+// otherwise returns external:<rig>:<to>. Walks up from dir to find the town
+// .beads/routes.jsonl that maps prefixes → rig paths.
+func resolveCrossRigTarget(t *testing.T, dir, from, to string) string {
+	t.Helper()
+	if strings.HasPrefix(to, "external:") {
+		return to
+	}
+	fromPrefix := beads.ExtractPrefix(from)
+	toPrefix := beads.ExtractPrefix(to)
+	if fromPrefix == "" || toPrefix == "" || fromPrefix == toPrefix {
+		return to
+	}
+	townRoot := findTownRootFromDir(dir)
+	if townRoot == "" {
+		return to
+	}
+	rigName := beads.GetRigNameForPrefix(townRoot, toPrefix)
+	if rigName == "" {
+		return to
+	}
+	return "external:" + rigName + ":" + to
+}
+
+// findTownRootFromDir walks up from start until it finds a .beads/routes.jsonl, then
+// returns that directory. Returns "" if no routes file is found.
+func findTownRootFromDir(start string) string {
+	cur := start
+	for {
+		if _, err := os.Stat(filepath.Join(cur, ".beads", "routes.jsonl")); err == nil {
+			return cur
+		}
+		parent := filepath.Dir(cur)
+		if parent == cur {
+			return ""
+		}
+		cur = parent
 	}
 }