Merge pull request #966 from dgageot/big-cleanup-2

More cleanup

Author: rumpl

.dockerignore

@@ -4,5 +4,4 @@
 !./**/*.template
 !./**/*.go
 !./**/*.txt
-!./**/*.txt
 !/pkg/config/default-agent.yaml

cmd/root/build.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/docker/cagent/pkg/build"
 	"github.com/docker/cagent/pkg/cli"
-	"github.com/docker/cagent/pkg/filesystem"
 	"github.com/docker/cagent/pkg/telemetry"
 )
 
@@ -44,5 +43,5 @@ func (f *buildFlags) runBuildCommand(cmd *cobra.Command, args []string) error {
 		dockerImageName = args[1]
 	}
 
-	return build.DockerImage(ctx, out, agentFilename, filesystem.AllowAll, dockerImageName, f.opts)
+	return build.DockerImage(ctx, out, agentFilename, dockerImageName, f.opts)
 }

cmd/root/feedback.go

@@ -22,6 +22,6 @@ func newFeedbackCmd() *cobra.Command {
 func runFeedbackCommand(cmd *cobra.Command, args []string) error {
 	telemetry.TrackCommand("feedback", args)
 
-	fmt.Fprintln(cmd.OutOrStdout(), "Feel free to give feedback:\n", feedback.FeedbackLink)
+	fmt.Fprintln(cmd.OutOrStdout(), "Feel free to give feedback:\n", feedback.Link)
 	return nil
 }

cmd/root/root.go

@@ -119,7 +119,7 @@ For any feedback, please visit: %s
 We collect anonymous usage data to help improve cagent. To disable:
   - Set environment variable: TELEMETRY_ENABLED=false
 
-`, feedback.FeedbackLink)
+`, feedback.Link)
 		fmt.Fprint(stderr, startupMsg)
 	}
 

docs/PROVIDERS.md

@@ -2,10 +2,10 @@
 
 ## Add provider alias
 
-Add a new `Alias` to `ProviderAliases` [`pkg/model/provider/provider.go`](https://github.com/docker/cagent/blob/main/pkg/model/provider/provider.go)
+Add a new `Alias` to `Aliases` [`pkg/model/provider/provider.go`](https://github.com/docker/cagent/blob/main/pkg/model/provider/provider.go)
 
 ```go
-var ProviderAliases = map[string]Alias{
+var Aliases = map[string]Alias{
  "requesty": {
   APIType:     "openai",
   BaseURL:     "https://router.requesty.ai/v1",

pkg/a2a/executor_wrapper_test.go

@@ -15,12 +15,12 @@ type mockQueue struct {
 	events []a2a.Event
 }
 
-func (m *mockQueue) Write(ctx context.Context, event a2a.Event) error {
+func (m *mockQueue) Write(_ context.Context, event a2a.Event) error {
 	m.events = append(m.events, event)
 	return nil
 }
 
-func (m *mockQueue) Read(ctx context.Context) (a2a.Event, error) {
+func (m *mockQueue) Read(context.Context) (a2a.Event, error) {
 	return nil, nil
 }
 

pkg/acp/agent.go

@@ -89,7 +89,7 @@ func (a *Agent) Initialize(ctx context.Context, params acp.InitializeRequest) (a
 }
 
 // NewSession implements [acp.Agent]
-func (a *Agent) NewSession(ctx context.Context, params acp.NewSessionRequest) (acp.NewSessionResponse, error) {
+func (a *Agent) NewSession(context.Context, acp.NewSessionRequest) (acp.NewSessionResponse, error) {
 	sid := uuid.New().String()
 	slog.Debug("ACP NewSession called", "session_id", sid)
 
@@ -110,19 +110,19 @@ func (a *Agent) NewSession(ctx context.Context, params acp.NewSessionRequest) (a
 }
 
 // Authenticate implements [acp.Agent]
-func (a *Agent) Authenticate(ctx context.Context, params acp.AuthenticateRequest) (acp.AuthenticateResponse, error) {
+func (a *Agent) Authenticate(context.Context, acp.AuthenticateRequest) (acp.AuthenticateResponse, error) {
 	slog.Debug("ACP Authenticate called")
 	return acp.AuthenticateResponse{}, nil
 }
 
 // LoadSession implements [acp.Agent] (optional, not supported)
-func (a *Agent) LoadSession(ctx context.Context, params acp.LoadSessionRequest) (acp.LoadSessionResponse, error) {
+func (a *Agent) LoadSession(context.Context, acp.LoadSessionRequest) (acp.LoadSessionResponse, error) {
 	slog.Debug("ACP LoadSession called (not supported)")
 	return acp.LoadSessionResponse{}, fmt.Errorf("load session not supported")
 }
 
 // Cancel implements [acp.Agent]
-func (a *Agent) Cancel(ctx context.Context, params acp.CancelNotification) error {
+func (a *Agent) Cancel(_ context.Context, params acp.CancelNotification) error {
 	sid := string(params.SessionId)
 	slog.Debug("ACP Cancel called", "session_id", sid)
 
@@ -138,7 +138,7 @@ func (a *Agent) Cancel(ctx context.Context, params acp.CancelNotification) error
 }
 
 // Prompt implements [acp.Agent]
-func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {
+func (a *Agent) Prompt(_ context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {
 	sid := string(params.SessionId)
 	slog.Debug("ACP Prompt called", "session_id", sid)
 
@@ -201,7 +201,7 @@ func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.Promp
 }
 
 // SetSessionMode implements acp.Agent (optional)
-func (a *Agent) SetSessionMode(ctx context.Context, params acp.SetSessionModeRequest) (acp.SetSessionModeResponse, error) {
+func (a *Agent) SetSessionMode(context.Context, acp.SetSessionModeRequest) (acp.SetSessionModeResponse, error) {
 	// We don't implement session modes, cagent agents have only one mode (for now? ;) ).
 	return acp.SetSessionModeResponse{}, nil
 }
@@ -325,7 +325,7 @@ func (a *Agent) handleMaxIterationsReached(ctx context.Context, acpSess *Session
 	permResp, err := a.conn.RequestPermission(ctx, acp.RequestPermissionRequest{
 		SessionId: acp.SessionId(acpSess.id),
 		ToolCall: acp.RequestPermissionToolCall{
-			ToolCallId: acp.ToolCallId("max_iterations"),
+			ToolCallId: "max_iterations",
 			Title:      acp.Ptr(fmt.Sprintf("Maximum iterations (%d) reached", e.MaxIterations)),
 			Kind:       acp.Ptr(acp.ToolKindExecute),
 			Status:     acp.Ptr(acp.ToolCallStatusPending),
@@ -334,12 +334,12 @@ func (a *Agent) handleMaxIterationsReached(ctx context.Context, acpSess *Session
 			{
 				Kind:     acp.PermissionOptionKindAllowOnce,
 				Name:     "Continue",
-				OptionId: acp.PermissionOptionId("continue"),
+				OptionId: "continue",
 			},
 			{
 				Kind:     acp.PermissionOptionKindRejectOnce,
 				Name:     "Stop",
-				OptionId: acp.PermissionOptionId("stop"),
+				OptionId: "stop",
 			},
 		},
 	})

pkg/api/pagination_test.go

@@ -136,7 +136,7 @@ func TestPaginateMessages_MaxLimit(t *testing.T) {
 }
 
 func TestPaginateMessages_EmptyMessages(t *testing.T) {
-	messages := []session.Message{}
+	var messages []session.Message
 
 	params := PaginationParams{
 		Limit: 10,

pkg/build/build.go

@@ -14,7 +14,6 @@ import (
 	"github.com/goccy/go-yaml"
 
 	"github.com/docker/cagent/pkg/config"
-	"github.com/docker/cagent/pkg/filesystem"
 )
 
 //go:embed Dockerfile.template
@@ -31,7 +30,7 @@ type Printer interface {
 	Println(a ...any)
 }
 
-func DockerImage(ctx context.Context, out Printer, agentFilename string, fs filesystem.FS, dockerImageName string, opts Options) error {
+func DockerImage(ctx context.Context, out Printer, agentFilename, dockerImageName string, opts Options) error {
 	agentSource, err := config.Resolve(agentFilename)
 	if err != nil {
 		return err

pkg/config/auto_test.go

@@ -11,7 +11,7 @@ type mockEnvProvider struct {
 	envVars map[string]string
 }
 
-func (m *mockEnvProvider) Get(ctx context.Context, name string) string {
+func (m *mockEnvProvider) Get(_ context.Context, name string) string {
 	return m.envVars[name]
 }