Implement add_environment_info

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

CLAUDE.md

@@ -66,7 +66,7 @@ cagent is a multi-agent AI system with hierarchical agent structure and pluggabl
 #### Configuration System (`pkg/config/`)
 
 - **YAML-based configuration**: Declarative agent, model, and tool definitions
-- **Agent properties**: name, model, description, instruction, sub_agents, toolsets, think, todo, memory, add_date
+- **Agent properties**: name, model, description, instruction, sub_agents, toolsets, think, todo, memory, add_date, add_environment_info
 - **Model providers**: openai, anthropic, dmr with configurable parameters
 - **Tool configuration**: MCP tools (local stdio and remote), builtin tools (filesystem, shell)
 

docs/USAGE.md

@@ -80,15 +80,16 @@ During CLI sessions, you can use special commands:
 
 ### Agent Properties
 
-| Property      | Type    | Description                    | Required |
-|---------------|---------|--------------------------------|----------|
-| `name`        | string  | Agent identifier               | ✓        |
-| `model`       | string  | Model reference                | ✓        |
-| `description` | string  | Agent purpose                  | ✓        |
-| `instruction` | string  | Detailed behavior instructions | ✓        |
-| `sub_agents`  | array   | List of sub-agent names        | ✗        |
-| `toolsets`    | array   | Available tools                | ✗        |
-| `add_date`    | boolean | Add current date to context    | ✗        |
+| Property               | Type    | Description                                                     | Required |
+|------------------------|---------|-----------------------------------------------------------------|----------|
+| `name`                 | string  | Agent identifier                                                | ✓        |
+| `model`                | string  | Model reference                                                 | ✓        |
+| `description`          | string  | Agent purpose                                                   | ✓        |
+| `instruction`          | string  | Detailed behavior instructions                                  | ✓        |
+| `sub_agents`           | array   | List of sub-agent names                                         | ✗        |
+| `toolsets`             | array   | Available tools                                                 | ✗        |
+| `add_date`             | boolean | Add current date to context                                     | ✗        |
+| `add_environment_info` | boolean | Add information about the environment (working dir, OS, git...) | ✗        |
 
 #### Example
 
@@ -101,6 +102,7 @@ agents:
     tools: [] # Available tools (optional)
     sub_agents: [] # Sub-agent names (optional)
     add_date: boolean # Add current date to context (optional)
+    add_environment_info: boolean # Add information about the environment (working dir, OS, git...) (optional)
 ```
 
 ### Model Properties

examples/gopher.yaml

@@ -62,7 +62,8 @@ agents:
       - `task build` - Build the application binary 
       - `task test` - Run Go tests
       - `task lint` - Run golangci-lint for code quality
-
+    add_date: true
+    add_environment_info: true
     toolsets:
       - type: think
       - type: filesystem

golang_developer.yaml

@@ -90,7 +90,7 @@ agents:
 
       **Configuration System** (`pkg/config/`):
       - YAML-based declarative agent, model, and tool definitions
-      - Support for agent properties: name, model, description, instruction, sub_agents, toolsets, think, todo, memory, add_date
+      - Support for agent properties: name, model, description, instruction, sub_agents, toolsets, think, todo, memory, add_date, add_environment_info
       - Model provider configuration for openai, anthropic, dmr
       - Tool configuration for MCP tools and builtin tools (filesystem, shell)
 

internal/creator/instructions.txt

@@ -27,6 +27,7 @@ agent_name:
     toolsets: [] # Available tools (optional)
     sub_agents: [] # Sub-agent names (optional)
     add_date: boolean # Add current date to context (optional)
+    add_environment_info: boolean # Add information about the environment (working dir, OS, git...) (optional)
 ```
 
 **Each model can have a list of toolsets**

pkg/session/session.go

@@ -2,6 +2,7 @@ package session
 
 import (
 	"log/slog"
+	"os"
 	"strings"
 	"time"
 
@@ -213,7 +214,12 @@ func (s *Session) GetMessages(a *agent.Agent) []chat.Message {
 	}
 
 	if a.AddEnvironmentInfo() {
-		content += "\n\n" + getEnvironmentInfo(s.GetWorkingDir())
+		wd, err := os.Getwd()
+		if err != nil {
+			slog.Error("getting current working directory for environment info", "error", err)
+		} else {
+			content += "\n\n" + getEnvironmentInfo(wd)
+		}
 	}
 
 	messages = append(messages, chat.Message{