Fix agent identifier extraction for .agent.md and .agent files

pkg/workflow/engine_helpers.go

@@ -76,7 +76,7 @@ func GetBaseInstallationSteps(config EngineInstallConfig, workflowData *Workflow
 // This is used by the Copilot CLI which expects agent identifiers, not full paths.
 //
 // Parameters:
-//   - agentFile: The relative path to the agent file (e.g., ".github/agents/test-agent.md")
+//   - agentFile: The relative path to the agent file (e.g., ".github/agents/test-agent.md" or ".github/agents/test-agent.agent.md")
 //
 // Returns:
 //   - string: The agent identifier (e.g., "test-agent")
@@ -85,6 +85,9 @@ func GetBaseInstallationSteps(config EngineInstallConfig, workflowData *Workflow
 //
 //	identifier := ExtractAgentIdentifier(".github/agents/my-agent.md")
 //	// Returns: "my-agent"
+//
+//	identifier := ExtractAgentIdentifier(".github/agents/my-agent.agent.md")
+//	// Returns: "my-agent"
 func ExtractAgentIdentifier(agentFile string) string {
 	engineHelpersLog.Printf("Extracting agent identifier from: %s", agentFile)
 	// Extract the base filename from the path
@@ -94,8 +97,11 @@ func ExtractAgentIdentifier(agentFile string) string {
 		filename = agentFile[lastSlash+1:]
 	}
 
-	// Remove the .md extension using TrimSuffix (unconditionally safe)
+	// Remove extensions in order: .agent.md, then .md, then .agent
+	// This handles all possible agent file naming conventions
+	filename = strings.TrimSuffix(filename, ".agent.md")
 	filename = strings.TrimSuffix(filename, ".md")
+	filename = strings.TrimSuffix(filename, ".agent")
 
 	return filename
 }

pkg/workflow/engine_helpers_test.go

@@ -249,6 +249,36 @@ func TestExtractAgentIdentifier(t *testing.T) {
 			input:    ".github/agents/test-agent",
 			expected: "test-agent",
 		},
+		{
+			name:     "custom agent file with .agent.md extension",
+			input:    ".github/agents/speckit-dispatcher.agent.md",
+			expected: "speckit-dispatcher",
+		},
+		{
+			name:     "custom agent file simple path",
+			input:    ".github/agents/test-agent.agent.md",
+			expected: "test-agent",
+		},
+		{
+			name:     "custom agent file with path",
+			input:    "../agents/technical-doc-writer.agent.md",
+			expected: "technical-doc-writer",
+		},
+		{
+			name:     "custom agent file with underscores",
+			input:    ".github/agents/my_custom_agent.agent.md",
+			expected: "my_custom_agent",
+		},
+		{
+			name:     "agent file with only .agent extension",
+			input:    ".github/agents/test-agent.agent",
+			expected: "test-agent",
+		},
+		{
+			name:     "agent file with .agent extension in path",
+			input:    "../agents/my-agent.agent",
+			expected: "my-agent",
+		},
 	}
 
 	for _, tt := range tests {