Simpler code

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

docs/USAGE.md

@@ -114,41 +114,27 @@ agents:
     commands: # Either mapping or list of singleton maps
       df: "check how much free space i have on my disk"
       ls: "list the files in the current directory"
+      greet: "Say hello to $USER and ask how their day is going"
+      analyze: "Analyze the project named $PROJECT_NAME in the $ENVIRONMENT environment"
 ```
 
-### Running with named commands
-
-- Example YAML forms supported:
-
-```yaml
-commands:
-  df: "check how much free space i have on my disk"
-  ls: "list the files in the current directory"
-  greet: "Say hello to $USER and ask how their day is going"
-  analyze: "Analyze the project named $PROJECT_NAME in the $ENVIRONMENT environment"
-```
-
-```yaml
-commands:
-  - df: "check how much free space i have on my disk"
-  - ls: "list the files in the current directory"
-  - greet: "Say hello to $USER and ask how their day is going"
-```
-
-Commands support environment variable placeholders using `$VARIABLE_NAME` or `${VARIABLE_NAME}` syntax.
-
-Run:
+### Running named commands
 
 ```bash
 cagent run ./agent.yaml /df
 cagent run ./agent.yaml /ls
+
+export USER=alice
+cagent run ./agent.yaml /greet
+
+export PROJECT_NAME=myproject
+export ENVIRONMENT=production
+cagent run ./agent.yaml /analyze
 ```
 
-**Environment Variable Expansion:**
 - Placeholders are expanded during agent loading using available environment variables
 - Undefined variables expand to empty strings (no error is thrown)
 - Both `$VAR` and `${VAR}` syntax are supported
-- This allows dynamic command configuration without manual string interpolation
 
 ### Model Properties
 

examples/env_placeholders.yaml

@@ -2,7 +2,7 @@
 version: "2"
 
 # Example demonstrating environment variable placeholder expansion in commands
-# 
+#
 # This example shows how to use $VARIABLE_NAME or ${VARIABLE_NAME} placeholders
 # in command definitions, which are automatically replaced with environment variable
 # values when the agent is loaded.
@@ -11,7 +11,7 @@ version: "2"
 #   export USER=alice
 #   export PROJECT_NAME=myproject
 #   export ENVIRONMENT=production
-#   
+#
 #   cagent run env_placeholders.yaml -c greet
 #   cagent run env_placeholders.yaml -c analyze
 #   cagent run env_placeholders.yaml -c status
@@ -26,15 +26,15 @@ agents:
     instruction: |
       You are a helpful assistant that responds to user requests.
       Provide clear, concise, and actionable responses.
-    
+
     commands:
       greet: "Say hello to $USER and ask how their day is going"
       analyze: "Analyze the project named $PROJECT_NAME in the $ENVIRONMENT environment and provide insights"
       status: "Check the status of the service ${SERVICE_NAME} and report any issues"
       report: "Generate a comprehensive report for project $PROJECT_NAME owned by $OWNER deployed in $LOCATION"
       inspect: "Inspect the contents of the directory at $WORKING_DIR and summarize what you find"
       help: "Explain what you can do and how to use environment variable placeholders in commands"
-    
+
     toolsets:
       - type: filesystem
       - type: shell

pkg/teamloader/teamloader.go

@@ -115,14 +115,12 @@ func createThinkTool(ctx context.Context, toolset latest.Toolset, parentDir stri
 // Undefined variables are allowed and will expand to empty strings, enabling users to
 // only define the environment variables needed for the commands they actually use.
 func expandCommandPlaceholders(ctx context.Context, commands map[string]string, envProvider environment.Provider) map[string]string {
-	if len(commands) == 0 {
-		return commands
-	}
+	expanded := map[string]string{}
 
-	expanded := make(map[string]string, len(commands))
 	for name, value := range commands {
 		expanded[name] = environment.ExpandLenient(ctx, value, envProvider)
 	}
+
 	return expanded
 }
 
@@ -350,9 +348,6 @@ func Load(ctx context.Context, p string, runtimeConfig config.RuntimeConfig, opt
 	agentsByName := make(map[string]*agent.Agent)
 
 	for name, agentConfig := range cfg.Agents {
-		// Expand environment variable placeholders in commands
-		expandedCommands := expandCommandPlaceholders(ctx, agentConfig.Commands, env)
-
 		opts := []agent.Opt{
 			agent.WithName(name),
 			agent.WithDescription(agentConfig.Description),
@@ -361,7 +356,7 @@ func Load(ctx context.Context, p string, runtimeConfig config.RuntimeConfig, opt
 			agent.WithAddPromptFiles(agentConfig.AddPromptFiles),
 			agent.WithMaxIterations(agentConfig.MaxIterations),
 			agent.WithNumHistoryItems(agentConfig.NumHistoryItems),
-			agent.WithCommands(expandedCommands),
+			agent.WithCommands(expandCommandPlaceholders(ctx, agentConfig.Commands, env)),
 		}
 
 		models, err := getModelsForAgent(ctx, cfg, &agentConfig, env, runtimeConfig)