Move extraction functions from tools.go to frontmatter_extraction.go

Co-authored-by: mnkiefer <[email protected]>

Author: Copilot

.github/workflows/agent-performance-analyzer.lock.yml

@@ -130,7 +130,7 @@ func InitRepository(verbose bool, mcp bool, campaign bool, tokens bool, engine s
 
 	// Configure VSCode settings for YAML schema validation
 	initLog.Print("Configuring VSCode YAML schema validation")
-	
+
 	// Write workflow schema to .github/aw/
 	if err := ensureWorkflowSchema(verbose); err != nil {
 		initLog.Printf("Failed to write workflow schema: %v", err)

.github/workflows/campaign-manager.lock.yml

@@ -47,7 +47,7 @@ func (s *VSCodeSettings) UnmarshalJSON(data []byte) error {
 	for k, v := range raw {
 		s.Other[k] = v
 	}
-	
+
 	return nil
 }
 

.github/workflows/workflow-health-manager.lock.yml

@@ -1067,3 +1067,24 @@ func (c *Compiler) addZizmorIgnoreForWorkflowRun(yamlStr string) string {
 
 	return strings.Join(result, "\n")
 }
+
+// extractMapFromFrontmatter is a generic helper to extract a map[string]any from frontmatter
+// This now uses the structured extraction helper for better error handling
+func extractMapFromFrontmatter(frontmatter map[string]any, key string) map[string]any {
+	return ExtractMapField(frontmatter, key)
+}
+
+// extractToolsFromFrontmatter extracts tools section from frontmatter map
+func extractToolsFromFrontmatter(frontmatter map[string]any) map[string]any {
+	return ExtractMapField(frontmatter, "tools")
+}
+
+// extractMCPServersFromFrontmatter extracts mcp-servers section from frontmatter
+func extractMCPServersFromFrontmatter(frontmatter map[string]any) map[string]any {
+	return ExtractMapField(frontmatter, "mcp-servers")
+}
+
+// extractRuntimesFromFrontmatter extracts runtimes section from frontmatter map
+func extractRuntimesFromFrontmatter(frontmatter map[string]any) map[string]any {
+	return ExtractMapField(frontmatter, "runtimes")
+}

pkg/cli/init.go

@@ -191,27 +191,6 @@ func (c *Compiler) applyDefaults(data *WorkflowData, markdownPath string) {
 	}
 }
 
-// extractMapFromFrontmatter is a generic helper to extract a map[string]any from frontmatter
-// This now uses the structured extraction helper for better error handling
-func extractMapFromFrontmatter(frontmatter map[string]any, key string) map[string]any {
-	return ExtractMapField(frontmatter, key)
-}
-
-// extractToolsFromFrontmatter extracts tools section from frontmatter map
-func extractToolsFromFrontmatter(frontmatter map[string]any) map[string]any {
-	return ExtractMapField(frontmatter, "tools")
-}
-
-// extractMCPServersFromFrontmatter extracts mcp-servers section from frontmatter
-func extractMCPServersFromFrontmatter(frontmatter map[string]any) map[string]any {
-	return ExtractMapField(frontmatter, "mcp-servers")
-}
-
-// extractRuntimesFromFrontmatter extracts runtimes section from frontmatter map
-func extractRuntimesFromFrontmatter(frontmatter map[string]any) map[string]any {
-	return ExtractMapField(frontmatter, "runtimes")
-}
-
 // mergeToolsAndMCPServers merges tools, mcp-servers, and included tools
 func (c *Compiler) mergeToolsAndMCPServers(topTools, mcpServers map[string]any, includedTools string) (map[string]any, error) {
 	toolsLog.Printf("Merging tools and MCP servers: topTools=%d, mcpServers=%d", len(topTools), len(mcpServers))