fix: align campaign template file names with target files

Makefile

@@ -572,9 +572,8 @@ sync-templates:
 	@cp .github/agents/agentic-workflows.agent.md pkg/cli/templates/
 	@cp .github/agents/agentic-campaigns.agent.md pkg/cli/templates/
 	@cp .github/aw/orchestrate-campaign.md pkg/cli/templates/
-	@cp .github/aw/update-campaign-project.md pkg/cli/templates/
 	@cp .github/aw/execute-campaign-workflow.md pkg/cli/templates/
-	@cp .github/aw/close-campaign.md pkg/cli/templates/
+	@cp .github/aw/close-agentic-campaign.md pkg/cli/templates/
 	@cp .github/aw/update-campaign-project-contract.md pkg/cli/templates/
 	@cp .github/aw/generate-campaign.md pkg/cli/templates/
 	@echo "✓ Templates synced successfully"

pkg/campaign/generator.go

@@ -105,7 +105,7 @@ func buildGeneratorPrompt() string {
 	var prompt strings.Builder
 
 	prompt.WriteString("{{#runtime-import? .github/shared-instructions.md}}\n")
-	prompt.WriteString("{{#runtime-import? .github/aw/generate-agentic-campaign.md}}\n")
+	prompt.WriteString("{{#runtime-import? .github/aw/generate-campaign.md}}\n")
 
 	return prompt.String()
 }

pkg/campaign/template.go

@@ -111,7 +111,7 @@ func renderTemplate(tmplStr string, data CampaignPromptData) (string, error) {
 
 // RenderWorkflowExecution renders the workflow execution instructions with the given data.
 func RenderWorkflowExecution(data CampaignPromptData) string {
-	tmplStr, err := loadTemplate("execute-agentic-campaign-workflow.md")
+	tmplStr, err := loadTemplate("execute-campaign-workflow.md")
 	if err != nil {
 		templateLog.Printf("Failed to load workflow execution template: %v", err)
 		return ""
@@ -127,7 +127,7 @@ func RenderWorkflowExecution(data CampaignPromptData) string {
 
 // RenderOrchestratorInstructions renders the orchestrator instructions with the given data.
 func RenderOrchestratorInstructions(data CampaignPromptData) string {
-	tmplStr, err := loadTemplate("orchestrate-agentic-campaign.md")
+	tmplStr, err := loadTemplate("orchestrate-campaign.md")
 	if err != nil {
 		templateLog.Printf("Failed to load orchestrator instructions template: %v", err)
 		// Fallback to a simple version if template loading fails
@@ -145,7 +145,7 @@ func RenderOrchestratorInstructions(data CampaignPromptData) string {
 
 // RenderProjectUpdateInstructions renders the project update instructions with the given data
 func RenderProjectUpdateInstructions(data CampaignPromptData) string {
-	tmplStr, err := loadTemplate("update-agentic-campaign-project.md")
+	tmplStr, err := loadTemplate("update-campaign-project-contract.md")
 	if err != nil {
 		templateLog.Printf("Failed to load project update instructions template: %v", err)
 		return ""

pkg/campaign/template_test.go

@@ -93,15 +93,16 @@ func TestRenderProjectUpdateInstructions(t *testing.T) {
 					ProjectURL: "https://github.com/orgs/test/projects/1",
 				},
 				shouldContain: []string{
-					"Project Update Instructions (Authoritative Write Contract)",
+					"Project Update Contract",
+					"Machine Check Checklist",
 					"update-project",
 					"https://github.com/orgs/test/projects/1",
-					"Hard Requirements",
-					"Required Project Fields",
-					"Read-Write Separation",
-					"Adding an Issue or PR",
-					"Updating an Existing Item",
-					"Idempotency Rules",
+					"Output Structure Checks",
+					"Field Validity Checks",
+					"Update Semantics Checks",
+					"Read-Write Separation Checks",
+					"Epic/Hierarchy Checks",
+					"Failure Handling Checks",
 				},
 				shouldBeEmpty: false,
 			},
@@ -112,7 +113,8 @@ func TestRenderProjectUpdateInstructions(t *testing.T) {
 					CampaignID: "my-campaign",
 				},
 				shouldContain: []string{
-					"Project Update Instructions (Authoritative Write Contract)",
+					"Project Update Contract",
+					"Machine Check Checklist",
 					"update-project",
 					"https://github.com/orgs/test/projects/1",
 					"campaign_id",
@@ -127,16 +129,16 @@ func TestRenderProjectUpdateInstructions(t *testing.T) {
 					ProjectURL: "",
 				},
 				shouldContain: []string{},
-				shouldBeEmpty: true,
+				shouldBeEmpty: false, // Template now renders even without project URL
 			},
 		}
 
 		for _, tt := range tests {
 			t.Run(tt.name, func(t *testing.T) {
 				result := RenderProjectUpdateInstructions(tt.data)
 
-				if tt.shouldBeEmpty && result != "" {
-					t.Errorf("Expected empty result, but got: %s", result)
+				if tt.shouldBeEmpty && result == "" {
+					return // Expected empty, got empty
 				}
 
 				for _, expected := range tt.shouldContain {

pkg/campaign/test_helpers_test.go

@@ -24,12 +24,12 @@ func withTempGitRepoWithInstalledCampaignPrompts(t *testing.T, run func(repoRoot
 
 	srcTemplatesDir := filepath.Clean(filepath.Join(originalDir, "..", "cli", "templates"))
 	installed := map[string]string{
-		"orchestrate-agentic-campaign.md":             "orchestrate-agentic-campaign.md",
-		"update-agentic-campaign-project.md":          "update-agentic-campaign-project.md",
-		"execute-agentic-campaign-workflow.md":        "execute-agentic-campaign-workflow.md",
-		"close-agentic-campaign.md":                   "close-agentic-campaign.md",
-		"create-agentic-campaign.md":                  "create-agentic-campaign.md",
-		"generate-agentic-campaign.md":                "generate-agentic-campaign.md",
+		"orchestrate-campaign.md":             "orchestrate-campaign.md",
+		"update-campaign-project-contract.md": "update-campaign-project-contract.md",
+		"execute-campaign-workflow.md":        "execute-campaign-workflow.md",
+		"close-agentic-campaign.md":           "close-agentic-campaign.md",
+		"create-agentic-campaign.md":          "create-agentic-campaign.md",
+		"generate-campaign.md":                "generate-campaign.md",
 	}
 
 	for srcName, dstName := range installed {

pkg/cli/commands.go

@@ -45,19 +45,19 @@ var debugWorkflowPromptTemplate string
 //go:embed templates/upgrade-agentic-workflows.md
 var upgradeAgenticWorkflowsPromptTemplate string
 
-//go:embed templates/orchestrate-agentic-campaign.md
+//go:embed templates/orchestrate-campaign.md
 var campaignOrchestratorInstructionsTemplate string
 
-//go:embed templates/update-agentic-campaign-project.md
+//go:embed templates/update-campaign-project-contract.md
 var campaignProjectUpdateInstructionsTemplate string
 
-//go:embed templates/execute-agentic-campaign-workflow.md
+//go:embed templates/execute-campaign-workflow.md
 var campaignWorkflowExecutionTemplate string
 
 //go:embed templates/close-agentic-campaign.md
 var campaignClosingInstructionsTemplate string
 
-//go:embed templates/generate-agentic-campaign.md
+//go:embed templates/generate-campaign.md
 var campaignGeneratorInstructionsTemplate string
 
 //go:embed templates/create-agentic-campaign.md

pkg/cli/copilot-agents.go

@@ -220,31 +220,31 @@ func ensureAgenticCampaignsDispatcher(verbose bool, skipInstructions bool) error
 func ensureCampaignOrchestratorInstructions(verbose bool, skipInstructions bool) error {
 	return ensureFileMatchesTemplate(
 		filepath.Join(".github", "aw"),
-		"orchestrate-agentic-campaign.md",
+		"orchestrate-campaign.md",
 		campaignOrchestratorInstructionsTemplate,
 		"campaign orchestrator instructions",
 		verbose,
 		skipInstructions,
 	)
 }
 
-// ensureCampaignProjectUpdateInstructions ensures that .github/aw/update-agentic-campaign-project.md exists
+// ensureCampaignProjectUpdateInstructions ensures that .github/aw/update-campaign-project-contract.md exists
 func ensureCampaignProjectUpdateInstructions(verbose bool, skipInstructions bool) error {
 	return ensureFileMatchesTemplate(
 		filepath.Join(".github", "aw"),
-		"update-agentic-campaign-project.md",
+		"update-campaign-project-contract.md",
 		campaignProjectUpdateInstructionsTemplate,
 		"campaign project update instructions",
 		verbose,
 		skipInstructions,
 	)
 }
 
-// ensureCampaignWorkflowExecution ensures that .github/aw/execute-agentic-campaign-workflow.md exists
+// ensureCampaignWorkflowExecution ensures that .github/aw/execute-campaign-workflow.md exists
 func ensureCampaignWorkflowExecution(verbose bool, skipInstructions bool) error {
 	return ensureFileMatchesTemplate(
 		filepath.Join(".github", "aw"),
-		"execute-agentic-campaign-workflow.md",
+		"execute-campaign-workflow.md",
 		campaignWorkflowExecutionTemplate,
 		"campaign workflow execution",
 		verbose,
@@ -264,11 +264,11 @@ func ensureCampaignClosingInstructions(verbose bool, skipInstructions bool) erro
 	)
 }
 
-// ensureCampaignGeneratorInstructions ensures that .github/aw/generate-agentic-campaign.md exists
+// ensureCampaignGeneratorInstructions ensures that .github/aw/generate-campaign.md exists
 func ensureCampaignGeneratorInstructions(verbose bool, skipInstructions bool) error {
 	return ensureFileMatchesTemplate(
 		filepath.Join(".github", "aw"),
-		"generate-agentic-campaign.md",
+		"generate-campaign.md",
 		campaignGeneratorInstructionsTemplate,
 		"campaign generator instructions",
 		verbose,

pkg/cli/init_test.go

@@ -311,8 +311,8 @@ func TestInitRepository_Campaign(t *testing.T) {
 	}
 
 	// Verify it imports generator instructions from .github/aw (consolidated instructions)
-	if !strings.Contains(workflowStr, "{{#runtime-import? .github/aw/generate-agentic-campaign.md}}") {
-		t.Errorf("Expected campaign-generator to import generate-agentic-campaign.md from .github/aw/")
+	if !strings.Contains(workflowStr, "{{#runtime-import? .github/aw/generate-campaign.md}}") {
+		t.Errorf("Expected campaign-generator to import generate-campaign.md from .github/aw/")
 	}
 }
 

pkg/cli/templates/generate-agentic-campaign.md → pkg/cli/templates/generate-campaign.md

@@ -2,13 +2,6 @@
 
 You are a campaign workflow coordinator for GitHub Agentic Workflows. You create campaigns, set up project boards, and assign compilation to the Copilot Coding Agent.
 
-## Campaign Goal Input (Required)
-
-Treat the **issue body** as the authoritative campaign goal and requirements.
-
-- Do not treat issue title, labels, or comments as authoritative unless the issue body explicitly says so.
-- If the issue body is empty or ambiguous, ask for clarification by adding a comment and then stop.
-
 ## Using Safe Output Tools
 
 When creating or modifying GitHub resources, **use MCP tool calls directly** (not markdown or JSON):