fix: keep v1 attachments on molecule flow

Author: julianknutsen

cmd/gc/cmd_sling_test.go

@@ -2823,7 +2823,7 @@ func TestBatchAutoBurnStaleMolecules(t *testing.T) {
 	assertStoreRoutedTo(t, deps.Store, "BL-2", "mayor")
 }
 
-func TestOnFormulaPoolAttachmentRoutesLegacyStepsToTarget(t *testing.T) {
+func TestOnFormulaPoolAttachmentKeepsLegacyStepsPrivate(t *testing.T) {
 	dir := testFormulaDir(t)
 	content := `
 formula = "multi-step"
@@ -2896,17 +2896,14 @@ needs = ["prep"]
 		if bead.ParentID == "BL-42" {
 			t.Fatalf("internal bead %s ParentID = %q, want not outer bead", bead.ID, bead.ParentID)
 		}
-		// Regression for #796: legacy [[steps]] formulas must stamp
-		// gc.routed_to on every internal step bead so EffectiveWorkQuery
-		// tier-3 and pool scale_check see the work. The sling target is
-		// "repo/polecat".
 		if bead.Ref == "" {
 			continue
 		}
-		if got := bead.Metadata["gc.routed_to"]; got != a.QualifiedName() {
-			t.Fatalf("internal bead %s gc.routed_to = %q, want %q", bead.ID, got, a.QualifiedName())
+		if got := bead.Metadata["gc.routed_to"]; got != "" {
+			t.Fatalf("internal legacy bead %s gc.routed_to = %q, want empty; attached v1 formulas should route only the source bead", bead.ID, got)
 		}
 	}
+	assertStoreRoutedTo(t, deps.Store, "BL-42", a.QualifiedName())
 }
 
 func TestBatchSkipsClosedMolecules(t *testing.T) {

internal/graphroute/graphroute.go

@@ -457,9 +457,12 @@ func DecorateGraphWorkflowRecipe(recipe *formula.Recipe, routeVars map[string]st
 
 // ApplyGraphRouting decorates a compiled recipe with routing metadata.
 // For graph.v2 workflows it delegates to DecorateGraphWorkflowRecipe. For
-// legacy [[steps]] recipes it stamps gc.routed_to on every non-root step
-// so EffectiveWorkQuery tier-3 and pool scale_check can see the work
-// (fixes #796). Returns early with no effect when cfg is nil.
+// standalone legacy [[steps]] recipes it stamps gc.routed_to on every
+// non-root step so EffectiveWorkQuery tier-3 and pool scale_check can see
+// the work (fixes #796). Attached legacy formulas intentionally stay on the
+// molecule_id flow: only the source bead is routed, and the internal molecule
+// steps remain private instructions for the assignee. Returns early with no
+// effect when cfg is nil.
 func ApplyGraphRouting(recipe *formula.Recipe, a *config.Agent, routedTo string, vars map[string]string, sourceBeadID, scopeKind, scopeRef, storeRef string, store beads.Store, cityName string, cfg *config.City, deps Deps) error {
 	if recipe == nil || cfg == nil {
 		return nil
@@ -470,6 +473,9 @@ func ApplyGraphRouting(recipe *formula.Recipe, a *config.Agent, routedTo string,
 	// and Agent deep-copy on every controller tick that dispatches a legacy
 	// order.
 	if !IsCompiledGraphWorkflow(recipe) {
+		if strings.TrimSpace(sourceBeadID) != "" {
+			return nil
+		}
 		stampLegacyRecipeRouting(recipe, routedTo)
 		return nil
 	}

internal/graphroute/graphroute_test.go

@@ -133,6 +133,24 @@ func TestApplyGraphRouting_LegacyNilAgent(t *testing.T) {
 	}
 }
 
+func TestApplyGraphRouting_LegacyAttachmentDoesNotStampSteps(t *testing.T) {
+	r := &formula.Recipe{
+		Name: "mol-legacy",
+		Steps: []formula.RecipeStep{
+			{ID: "mol-legacy", IsRoot: true, Metadata: map[string]string{}},
+			{ID: "mol-legacy.step1", Metadata: map[string]string{}},
+		},
+	}
+	a := config.Agent{Name: "worker", MaxActiveSessions: intPtr(1)}
+	err := ApplyGraphRouting(r, &a, "worker", nil, "source-1", "", "", "", nil, "city", &config.City{}, Deps{})
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if _, ok := r.Steps[1].Metadata["gc.routed_to"]; ok {
+		t.Errorf("attached legacy step gc.routed_to was stamped; v1 attachments should use source molecule_id flow")
+	}
+}
+
 func TestApplyGraphRouting_LegacyNilCfg(t *testing.T) {
 	// ApplyGraphRouting is a no-op whenever cfg is nil.
 	r := &formula.Recipe{

test/acceptance/tutorial_goldens/tutorial04_communication_test.go

@@ -106,22 +106,27 @@ func TestTutorial04Communication(t *testing.T) {
 		}
 	})
 
-	t.Run(`gc session nudge mayor "Check mail and hook status, then act accordingly"`, func(t *testing.T) {
-		out, err := ws.runShell(`gc session nudge mayor "Check mail and hook status, then act accordingly"`, "")
+	communicationNudge := `Review needed: check mail about auth module changes in my-project and coordinate with reviewer`
+	nudgeMayor := func(context string) {
+		out, err := ws.runShell(`gc session nudge mayor "`+communicationNudge+`"`, "")
 		if err != nil {
-			t.Fatalf("gc session nudge mayor: %v\n%s", err, out)
+			t.Fatalf("%s: %v\n%s", context, err, out)
 		}
 		if !strings.Contains(out, "Nudged mayor") && !strings.Contains(out, "Queued nudge for mayor") {
-			t.Fatalf("nudge output mismatch:\n%s", out)
+			t.Fatalf("%s output mismatch:\n%s", context, out)
 		}
+	}
+
+	t.Run(`gc session nudge mayor "Review needed: check mail about auth module changes in my-project and coordinate with reviewer"`, func(t *testing.T) {
+		nudgeMayor("gc session nudge mayor")
 	})
 
 	t.Run("gc session peek mayor --lines 6", func(t *testing.T) {
 		var out string
 		mayorCommunicationVisible := func() bool {
 			var err error
 			out, err = ws.runShell("gc session peek mayor --lines 6", "")
-			if err != nil || strings.TrimSpace(out) == "" {
+			if err != nil {
 				return false
 			}
 			return strings.Contains(out, "Review needed") ||
@@ -134,15 +139,11 @@ func TestTutorial04Communication(t *testing.T) {
 			if out, err := ws.runShell("gc session wake mayor", ""); err != nil {
 				t.Fatalf("wake mayor before communication retry: %v\n%s", err, out)
 			}
-			if out, err := ws.runShell(`gc session nudge mayor "Check mail and hook status, then act accordingly"`, ""); err != nil {
-				t.Fatalf("re-nudge mayor before communication retry: %v\n%s", err, out)
-			}
+			nudgeMayor("re-nudge mayor before communication retry")
 		}
 		if !waitForCondition(t, 45*time.Second, 2*time.Second, mayorCommunicationVisible) {
 			restartCity("mayor still did not surface the communication flow after wake")
-			if out, err := ws.runShell(`gc session nudge mayor "Check mail and hook status, then act accordingly"`, ""); err != nil {
-				t.Fatalf("re-nudge mayor after hidden restart: %v\n%s", err, out)
-			}
+			nudgeMayor("re-nudge mayor after hidden restart")
 		}
 		if !waitForCondition(t, 45*time.Second, 2*time.Second, mayorCommunicationVisible) {
 			t.Fatalf("peek mayor did not surface communication flow in time:\n%s", out)