Fix this repository's own install, and find the caller by content

v0.3.0 requires appName and changed the handle, and I updated the template
without updating this repository's own install. Its config had no appName,
so preflight failed, and its caller still triggered on the old prefix, so
no comment could fire. The repository the agent actually works in was
broken by the release.

The drift check then found a flaw in itself. It looked for the caller at
.github/workflows/simplycubed.yml, which is what init writes, but here that
name belongs to the reusable workflow and the caller is
simplycubed-caller.yml. It now finds the caller by the reusable-workflow
call it makes, so a renamed caller is checked and a same-named non-caller
is ignored.

Only two repositories in the org have an install: this one and corp. An
earlier scan reported all fifteen, which was wrong: gh api on a 404 returns
a JSON body, so --jq '.sha' yielded the string "null" and every repo
looked present.

Author: charlesgreen

.github/simplycubed.yml

@@ -5,6 +5,11 @@
 # decides whether a change is good.
 labelPrefix: sc
 
+# The App this repository installed. Comment commands address it:
+# "@simplycubed-code go" on an issue starts work. The caller workflow triggers
+# on this same handle, and preflight fails if the two ever disagree.
+appName: simplycubed-code
+
 gate: make check
 
 prDescription: rich

.github/workflows/simplycubed-caller.yml

@@ -60,7 +60,7 @@ jobs:
     if: >-
       github.event_name == 'issue_comment' &&
       github.event.comment.user.type != 'Bot' &&
-      startsWith(github.event.comment.body, '/simplycubed') &&
+      startsWith(github.event.comment.body, '@simplycubed-code') &&
       contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association)
     uses: simplycubed/code/.github/workflows/simplycubed.yml@main
     with:

cmd/simplycubed/main.go

@@ -459,18 +459,38 @@ func reply(argv []string, body string, stdout io.Writer) error {
 // way — comments simply stop working, with no error anywhere — so it is checked
 // on every run rather than left to be discovered.
 func checkMentionAgreement(repoDir, appName string) error {
-	path := filepath.Join(repoDir, ".github", "workflows", "simplycubed.yml")
-	b, err := os.ReadFile(path)
+	// Find the caller by what it does, not by what it is called. init writes
+	// .github/workflows/simplycubed.yml, but an adopter can rename it, and in
+	// this repository that name belongs to the reusable workflow itself. A check
+	// keyed on the filename would pass on the wrong file, or fail on a valid
+	// install, which is worse than not checking.
+	dir := filepath.Join(repoDir, ".github", "workflows")
+	entries, err := os.ReadDir(dir)
 	if err != nil {
-		// No caller workflow is a valid local setup, not a misconfiguration.
+		// No workflows at all is a valid local setup, not a misconfiguration.
 		return nil
 	}
 	want := "'" + command.MentionFor(appName) + "'"
-	if strings.Contains(string(b), want) {
+	var callers []string
+	for _, e := range entries {
+		if e.IsDir() {
+			continue
+		}
+		path := filepath.Join(dir, e.Name())
+		b, err := os.ReadFile(path)
+		if err != nil || !strings.Contains(string(b), "simplycubed/code/.github/workflows/simplycubed.yml@") {
+			continue
+		}
+		callers = append(callers, path)
+		if strings.Contains(string(b), want) {
+			return nil
+		}
+	}
+	if len(callers) == 0 {
 		return nil
 	}
 	return fmt.Errorf("%w: .github/simplycubed.yml sets appName %q, but %s does not trigger on %s. Comment commands will never fire. Re-run \"simplycubed init --workflow\" to rewrite the trigger from the config",
-		ErrConfigMissing, appName, path, want)
+		ErrConfigMissing, appName, strings.Join(callers, ", "), want)
 }
 
 func preflightCmd(argv []string, stdout io.Writer) error {

cmd/simplycubed/main_test.go

@@ -1290,7 +1290,11 @@ func TestPreflightCatchesHandleDrift(t *testing.T) {
 		if err := os.MkdirAll(filepath.Dir(wf), 0o755); err != nil {
 			t.Fatal(err)
 		}
-		body := "on: [issue_comment]\njobs:\n  comment:\n    if: startsWith(github.event.comment.body, '" + trigger + "')\n"
+		// Must look like a caller: the check finds it by the reusable-workflow
+		// call, not by filename.
+		body := "on: [issue_comment]\njobs:\n  comment:\n" +
+			"    uses: simplycubed/code/.github/workflows/simplycubed.yml@v0.3.0\n" +
+			"    if: startsWith(github.event.comment.body, '" + trigger + "')\n"
 		if err := os.WriteFile(wf, []byte(body), 0o644); err != nil {
 			t.Fatal(err)
 		}
@@ -1417,3 +1421,33 @@ func TestCommandCmdSurfacesConfigProblems(t *testing.T) {
 		t.Fatal("--body with no value must be an error")
 	}
 }
+
+// init writes the caller as simplycubed.yml, but an adopter can rename it, and
+// in this repository that name belongs to the reusable workflow itself. The
+// drift check has to find the caller by what it calls, or it passes on the
+// wrong file and fails on a valid install.
+func TestDriftCheckFindsTheCallerByContentNotFilename(t *testing.T) {
+	t.Setenv("SIMPLYCUBED_AZURE_OPENAI_ENDPOINT", "https://r.openai.azure.com")
+	t.Setenv("SIMPLYCUBED_AZURE_OPENAI_API_KEY", "k")
+
+	dir := repoWithConfigBody(t, "gate: make check\nappName: acme-code\n")
+	wfDir := filepath.Join(dir, ".github", "workflows")
+	if err := os.MkdirAll(wfDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	// A workflow with the canonical name that is not a caller must be ignored.
+	if err := os.WriteFile(filepath.Join(wfDir, "simplycubed.yml"), []byte("on: workflow_call\njobs:\n  run:\n    runs-on: ubuntu-latest\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	// The real caller, under a different name.
+	caller := "on: [issue_comment]\njobs:\n  comment:\n" +
+		"    uses: simplycubed/code/.github/workflows/simplycubed.yml@v0.3.0\n" +
+		"    if: startsWith(github.event.comment.body, '@acme-code')\n"
+	if err := os.WriteFile(filepath.Join(wfDir, "simplycubed-caller.yml"), []byte(caller), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := preflightCmd([]string{"--repo-dir", dir}, io.Discard); err != nil {
+		t.Fatalf("a renamed caller that agrees must pass: %v", err)
+	}
+}