Merge branch 'docker:main' into nebius-provider

Author: shivaylamba

cmd/root/exec.go

@@ -1,13 +1,21 @@
 package root
 
-import "github.com/spf13/cobra"
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/telemetry"
+)
 
 func NewExecCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "exec <agent-name>",
 		Short: "Execute an agent",
 		Args:  cobra.RangeArgs(1, 2),
-		RunE:  execCommand,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return execCommand(cmd.Context(), args)
+		},
 	}
 
 	cmd.PersistentFlags().StringVarP(&agentName, "agent", "a", "root", "Name of the agent to run")
@@ -23,3 +31,9 @@ func NewExecCmd() *cobra.Command {
 
 	return cmd
 }
+
+func execCommand(ctx context.Context, args []string) error {
+	telemetry.TrackCommand("exec", args)
+	setupOtel(ctx)
+	return doRunCommand(ctx, args, true)
+}

cmd/root/feedback.go

@@ -5,11 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/docker/cagent/pkg/feedback"
 	"github.com/docker/cagent/pkg/telemetry"
 )
 
-var FeedbackLink = "https://docker.qualtrics.com/jfe/form/SV_cNsCIg92nQemlfw"
-
 // NewFeedbackCmd creates a new feedback command
 func NewFeedbackCmd() *cobra.Command {
 	return &cobra.Command{
@@ -19,7 +18,7 @@ func NewFeedbackCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
 			telemetry.TrackCommand("feedback", args)
-			fmt.Println("Feel free to give feedback:\n", FeedbackLink)
+			fmt.Println("Feel free to give feedback:\n", feedback.FeedbackLink)
 		},
 	}
 }

cmd/root/new.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/docker/cagent/pkg/cli"
 	"github.com/docker/cagent/pkg/creator"
 	"github.com/docker/cagent/pkg/input"
 	"github.com/docker/cagent/pkg/runtime"
@@ -54,19 +55,19 @@ func NewNewCmd() *cobra.Command {
 					switch {
 					case os.Getenv("ANTHROPIC_API_KEY") != "":
 						modelProvider = "anthropic"
-						fmt.Printf("%s\n\n", white("ANTHROPIC_API_KEY found, using Anthropic"))
+						fmt.Printf("%s\n\n", cli.White("ANTHROPIC_API_KEY found, using Anthropic"))
 					case os.Getenv("OPENAI_API_KEY") != "":
 						modelProvider = "openai"
-						fmt.Printf("%s\n\n", white("OPENAI_API_KEY found, using OpenAI"))
+						fmt.Printf("%s\n\n", cli.White("OPENAI_API_KEY found, using OpenAI"))
 					case os.Getenv("GOOGLE_API_KEY") != "":
 						modelProvider = "google"
-						fmt.Printf("%s\n\n", white("GOOGLE_API_KEY found, using Google"))
+						fmt.Printf("%s\n\n", cli.White("GOOGLE_API_KEY found, using Google"))
 					default:
 						modelProvider = "dmr"
-						fmt.Printf("%s\n\n", yellow("⚠️ No provider credentials found, defaulting to Docker Model Runner (DMR)"))
+						fmt.Printf("%s\n\n", cli.Yellow("⚠️ No provider credentials found, defaulting to Docker Model Runner (DMR)"))
 					}
 					if modelParam == "" {
-						fmt.Printf("%s\n\n", white("use \"--model provider/model\" to use a different model"))
+						fmt.Printf("%s\n\n", cli.White("use \"--model provider/model\" to use a different model"))
 					}
 				} else {
 					// Using Models Gateway; default to Anthropic if not specified
@@ -78,10 +79,10 @@ func NewNewCmd() *cobra.Command {
 			if len(args) > 0 {
 				prompt = strings.Join(args, " ")
 			} else {
-				fmt.Printf("%s\n", blue("------- Welcome to %s! -------", bold(AppName)))
-				fmt.Printf("%s\n\n", white("         (Ctrl+C to exit)"))
-				fmt.Printf("%s\n\n", blue("What should your agent/agent team do? (describe its purpose)"))
-				fmt.Print(blue("> "))
+				fmt.Printf("%s\n", cli.Blue("------- Welcome to %s! -------", cli.Bold(AppName)))
+				fmt.Printf("%s\n\n", cli.White("         (Ctrl+C to exit)"))
+				fmt.Printf("%s\n\n", cli.Blue("What should your agent/agent team do? (describe its purpose)"))
+				fmt.Print(cli.Blue("> "))
 
 				var err error
 				prompt, err = input.ReadLine(ctx, os.Stdin)
@@ -112,34 +113,34 @@ func NewNewCmd() *cobra.Command {
 						fmt.Println()
 						llmIsTyping = false
 					}
-					printToolCall(e.ToolCall)
+					cli.PrintToolCall(e.ToolCall)
 				case *runtime.ToolCallResponseEvent:
 					if llmIsTyping {
 						fmt.Println()
 						llmIsTyping = false
 					}
-					printToolCallResponse(e.ToolCall, e.Response)
+					cli.PrintToolCallResponse(e.ToolCall, e.Response)
 				case *runtime.ErrorEvent:
 					if llmIsTyping {
 						fmt.Println()
 						llmIsTyping = false
 					}
-					printError(fmt.Errorf("%s", e.Error))
+					cli.PrintError(fmt.Errorf("%s", e.Error))
 				case *runtime.MaxIterationsReachedEvent:
 					if llmIsTyping {
 						fmt.Println()
 						llmIsTyping = false
 					}
 
-					result := promptMaxIterationsContinue(ctx, e.MaxIterations)
+					result := cli.PromptMaxIterationsContinue(ctx, e.MaxIterations)
 					switch result {
-					case ConfirmationApprove:
-						rt.Resume(ctx, string(runtime.ResumeTypeApprove))
-					case ConfirmationReject:
-						rt.Resume(ctx, string(runtime.ResumeTypeReject))
+					case cli.ConfirmationApprove:
+						rt.Resume(ctx, runtime.ResumeTypeApprove)
+					case cli.ConfirmationReject:
+						rt.Resume(ctx, runtime.ResumeTypeReject)
 						return nil
-					case ConfirmationAbort:
-						rt.Resume(ctx, string(runtime.ResumeTypeReject))
+					case cli.ConfirmationAbort:
+						rt.Resume(ctx, runtime.ResumeTypeReject)
 					}
 				}
 			}

cmd/root/otel.go

@@ -16,7 +16,7 @@ import (
 const AppName = "cagent"
 
 // initOTelSDK initializes OpenTelemetry SDK with OTLP exporter
-func initOTelSDK(ctx context.Context) (shutdown func(context.Context) error, err error) {
+func initOTelSDK(ctx context.Context) (err error) {
 	res, err := resource.Merge(
 		resource.Default(),
 		resource.NewWithAttributes(
@@ -26,7 +26,7 @@ func initOTelSDK(ctx context.Context) (shutdown func(context.Context) error, err
 		),
 	)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create resource: %w", err)
+		return fmt.Errorf("failed to create resource: %w", err)
 	}
 
 	var traceExporter trace.SpanExporter
@@ -39,7 +39,7 @@ func initOTelSDK(ctx context.Context) (shutdown func(context.Context) error, err
 			otlptracehttp.WithInsecure(), // TODO: make configurable
 		)
 		if err != nil {
-			return nil, fmt.Errorf("failed to create trace exporter: %w", err)
+			return fmt.Errorf("failed to create trace exporter: %w", err)
 		}
 	}
 
@@ -59,5 +59,10 @@ func initOTelSDK(ctx context.Context) (shutdown func(context.Context) error, err
 	tp := trace.NewTracerProvider(tracerProviderOpts...)
 	otel.SetTracerProvider(tp)
 
-	return tp.Shutdown, nil
+	go func() {
+		<-ctx.Done()
+		_ = tp.Shutdown(context.Background())
+	}()
+
+	return nil
 }

cmd/root/root.go

@@ -15,6 +15,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/cagent/pkg/environment"
+	"github.com/docker/cagent/pkg/feedback"
 	"github.com/docker/cagent/pkg/paths"
 	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/docker/cagent/pkg/version"
@@ -83,9 +84,6 @@ func NewRootCmd() *cobra.Command {
 					}(),
 				})))
 			}
-			if cmd.DisplayName() != "exec" && os.Getenv("CAGENT_HIDE_FEEDBACK_LINK") != "1" {
-				_, _ = cmd.OutOrStdout().Write([]byte("\nFor any feedback, please visit: " + FeedbackLink + "\n\n"))
-			}
 
 			telemetry.SetGlobalTelemetryDebugMode(debugMode)
 			return nil
@@ -146,7 +144,7 @@ For any feedback, please visit: %s
 We collect anonymous usage data to help improve cagent. To disable:
   - Set environment variable: TELEMETRY_ENABLED=false
 
-`, FeedbackLink)
+`, feedback.FeedbackLink)
 		_, _ = os.Stderr.WriteString(startupMsg)
 	}