wip

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

Author: dgageot

pkg/agent/agent.go

@@ -14,17 +14,18 @@ import (
 
 // Agent represents an AI agent
 type Agent struct {
-	name            string
-	description     string
-	instruction     string
-	toolsets        []tools.ToolSet
-	toolsetsStarted atomic.Bool
-	models          []provider.Provider
-	subAgents       []*Agent
-	parents         []*Agent
-	addDate         bool
-	toolWrapper     toolWrapper
-	memoryManager   memorymanager.Manager
+	name               string
+	description        string
+	instruction        string
+	toolsets           []tools.ToolSet
+	toolsetsStarted    atomic.Bool
+	models             []provider.Provider
+	subAgents          []*Agent
+	parents            []*Agent
+	addDate            bool
+	addEnvironmentInfo bool
+	toolWrapper        toolWrapper
+	memoryManager      memorymanager.Manager
 }
 
 // New creates a new agent
@@ -54,6 +55,10 @@ func (a *Agent) AddDate() bool {
 	return a.addDate
 }
 
+func (a *Agent) AddEnvironmentInfo() bool {
+	return a.addEnvironmentInfo
+}
+
 // Description returns the agent's description
 func (a *Agent) Description() string {
 	return a.description

pkg/agent/opts.go

@@ -61,6 +61,12 @@ func WithAddDate(addDate bool) Opt {
 	}
 }
 
+func WithAddEnvironmentInfo(addEnvironmentInfo bool) Opt {
+	return func(a *Agent) {
+		a.addEnvironmentInfo = addEnvironmentInfo
+	}
+}
+
 func WithMemoryManager(mm memorymanager.Manager) Opt {
 	return func(a *Agent) {
 		a.memoryManager = mm

pkg/config/v1/types.go

@@ -72,12 +72,13 @@ func (t *Toolset) UnmarshalYAML(unmarshal func(any) error) error {
 
 // AgentConfig represents a single agent configuration
 type AgentConfig struct {
-	Model       string    `json:"model,omitempty" yaml:"model,omitempty"`
-	Description string    `json:"description,omitempty" yaml:"description,omitempty"`
-	Toolsets    []Toolset `json:"toolsets,omitempty" yaml:"toolsets,omitempty"`
-	Instruction string    `json:"instruction,omitempty" yaml:"instruction,omitempty"`
-	SubAgents   []string  `json:"sub_agents,omitempty" yaml:"sub_agents,omitempty"`
-	AddDate     bool      `json:"add_date,omitempty" yaml:"add_date,omitempty"`
+	Model              string    `json:"model,omitempty" yaml:"model,omitempty"`
+	Description        string    `json:"description,omitempty" yaml:"description,omitempty"`
+	Toolsets           []Toolset `json:"toolsets,omitempty" yaml:"toolsets,omitempty"`
+	Instruction        string    `json:"instruction,omitempty" yaml:"instruction,omitempty"`
+	SubAgents          []string  `json:"sub_agents,omitempty" yaml:"sub_agents,omitempty"`
+	AddDate            bool      `json:"add_date,omitempty" yaml:"add_date,omitempty"`
+	AddEnvironmentInfo bool      `json:"add_environment_info,omitempty" yaml:"add_environment_info,omitempty"`
 }
 
 // ModelConfig represents the configuration for a model

pkg/session/environment.go

@@ -0,0 +1,33 @@
+package session
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+)
+
+// getEnvironmentInfo returns formatted environment information including
+// working directory, git repository status, and platform information
+func getEnvironmentInfo(workingDir string) string {
+	return fmt.Sprintf(`Here is useful information about the environment you are running in:
+<env>
+Working directory: %s
+Is directory a git repo: %s
+Platform: %s
+</env>`, workingDir, boolToYesNo(isGitRepo(workingDir)), runtime.GOOS)
+}
+
+// isGitRepo checks if the given directory is a git repository
+func isGitRepo(dir string) bool {
+	_, err := os.Stat(filepath.Join(dir, ".git"))
+	return err == nil
+}
+
+// boolToYesNo converts a boolean to "Yes" or "No" string
+func boolToYesNo(b bool) string {
+	if b {
+		return "Yes"
+	}
+	return "No"
+}

pkg/session/environment_test.go

@@ -0,0 +1,159 @@
+package session
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetEnvironmentInfo(t *testing.T) {
+	tests := []struct {
+		name      string
+		setupFunc func() string
+		expectGit bool
+	}{
+		{
+			name: "with git repo",
+			setupFunc: func() string {
+				tmpDir := t.TempDir()
+				require.NoError(t, os.Mkdir(filepath.Join(tmpDir, ".git"), 0755))
+				return tmpDir
+			},
+			expectGit: true,
+		},
+		{
+			name: "without git repo",
+			setupFunc: func() string {
+				return t.TempDir()
+			},
+			expectGit: false,
+		},
+		{
+			name: "nonexistent directory",
+			setupFunc: func() string {
+				return "/path/that/does/not/exist"
+			},
+			expectGit: false,
+		},
+		{
+			name: "empty directory path",
+			setupFunc: func() string {
+				return ""
+			},
+			expectGit: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			dir := tt.setupFunc()
+			info := getEnvironmentInfo(dir)
+
+			gitStatus := "No"
+			if tt.expectGit {
+				gitStatus = "Yes"
+			}
+
+			expected := `Here is useful information about the environment you are running in:
+	<env>
+	Working directory: ` + dir + `
+	Is directory a git repo: ` + gitStatus + `
+	Platform: ` + runtime.GOOS + `
+	</env>`
+
+			assert.Equal(t, expected, info)
+		})
+	}
+}
+
+func TestIsGitRepo(t *testing.T) {
+	tests := []struct {
+		name      string
+		setupFunc func() string
+	}{
+		{
+			name: "git folder",
+			setupFunc: func() string {
+				tmpDir := t.TempDir()
+				require.NoError(t, os.Mkdir(filepath.Join(tmpDir, ".git"), 0755))
+				return tmpDir
+			},
+		},
+		{
+			name: "git file",
+			setupFunc: func() string {
+				tmpDir := t.TempDir()
+				require.NoError(t, os.WriteFile(filepath.Join(tmpDir, ".git"), []byte("gitdir: /some/other/path"), 0644))
+				return tmpDir
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			dir := tt.setupFunc()
+			assert.True(t, isGitRepo(dir))
+		})
+	}
+}
+
+func TestIsNotGitRepo(t *testing.T) {
+	tests := []struct {
+		name      string
+		setupFunc func() string
+	}{
+		{
+			name: "no git",
+			setupFunc: func() string {
+				return t.TempDir()
+			},
+		},
+		{
+			name: "nonexistent directory",
+			setupFunc: func() string {
+				return "/path/that/does/not/exist"
+			},
+		},
+		{
+			name: "empty path",
+			setupFunc: func() string {
+				return ""
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			dir := tt.setupFunc()
+			assert.False(t, isGitRepo(dir))
+		})
+	}
+}
+
+func TestBoolToYesNo(t *testing.T) {
+	assert.Equal(t, "Yes", boolToYesNo(true))
+	assert.Equal(t, "No", boolToYesNo(false))
+}
+
+func TestGetEnvironmentInfoIntegration(t *testing.T) {
+	wd, err := os.Getwd()
+	require.NoError(t, err)
+
+	info := getEnvironmentInfo(wd)
+
+	assert.Contains(t, info, "Here is useful information about the environment you are running in:")
+	assert.Contains(t, info, "<env>")
+	assert.Contains(t, info, "</env>")
+	assert.Contains(t, info, "Working directory: "+wd)
+	assert.Contains(t, info, "Platform: "+runtime.GOOS)
+
+	if isGitRepo(wd) {
+		assert.Contains(t, info, "Is directory a git repo: Yes")
+	} else {
+		assert.Contains(t, info, "Is directory a git repo: No")
+	}
+}

pkg/session/session.go

@@ -206,14 +206,19 @@ func (s *Session) GetMessages(a *agent.Agent) []chat.Message {
 		})
 	}
 
-	date := ""
+	content := a.Instruction()
+
 	if a.AddDate() {
-		date = "Date today is: " + time.Now().Format("2006-01-02") + "\n"
+		content += "\n\n" + "Today's date: " + time.Now().Format("2006-01-02")
+	}
+
+	if a.AddEnvironmentInfo() {
+		content += "\n\n" + getEnvironmentInfo(s.GetWorkingDir())
 	}
 
 	messages = append(messages, chat.Message{
 		Role:    chat.MessageRoleSystem,
-		Content: a.Instruction() + "\n\n" + date,
+		Content: content,
 	})
 
 	for _, tool := range a.ToolSets() {

pkg/teamloader/teamloader.go

@@ -101,6 +101,7 @@ func Load(ctx context.Context, path string, runConfig latest.RuntimeConfig) (*te
 			agent.WithName(name),
 			agent.WithDescription(agentConfig.Description),
 			agent.WithAddDate(agentConfig.AddDate),
+			agent.WithAddEnvironmentInfo(agentConfig.AddEnvironmentInfo),
 		}
 		models, err := getModelsForAgent(ctx, cfg, &agentConfig, absEnvFiles, options.WithGateway(runConfig.ModelsGateway))
 		if err != nil {