Merge pull request #1926 from gtardif/more_env_rename

Rename CAGENT_HIDE_TELEMETRY & CAGENT_EXP_DEBUG_LAYOUT. Still support old env vars

Author: dgageot

cmd/root/root.go

@@ -151,9 +151,9 @@ func Execute(ctx context.Context, stdin io.Reader, stdout, stderr io.Writer, arg
 	telemetry.SetGlobalTelemetryVersion(version.Version)
 
 	// Print startup message only on first installation/setup
-	if isFirstRun() && os.Getenv("CAGENT_HIDE_TELEMETRY_BANNER") != "1" {
+	if isFirstRun() && os.Getenv("CAGENT_HIDE_TELEMETRY_BANNER") != "1" && os.Getenv("DOCKER_AGENT_HIDE_TELEMETRY_BANNER") != "1" {
 		welcomeMsg := fmt.Sprintf(`
-Welcome to cagent! 🚀
+Welcome to docker agent! 🚀
 
 For any feedback, please visit: %s
 `, feedback.Link)
@@ -162,7 +162,7 @@ For any feedback, please visit: %s
 		// Only show telemetry notice when telemetry is enabled
 		if telemetry.GetTelemetryEnabled() {
 			telemetryMsg := `
-We collect anonymous usage data to help improve cagent. To disable:
+We collect anonymous usage data to help improve docker agent. To disable:
   - Set environment variable: TELEMETRY_ENABLED=false
 `
 			fmt.Fprint(stderr, telemetryMsg)

misc/perf/poem.yaml

@@ -28,7 +28,7 @@ COPY --from=dind / /
 COPY --from=docker/cagent:edge /cagent /
 WORKDIR /working_dir
 ENV TELEMETRY_ENABLED=false
-ENV CAGENT_HIDE_TELEMETRY_BANNER=1
+ENV DOCKER_AGENT_HIDE_TELEMETRY_BANNER=1
 ENTRYPOINT ["/run.sh", "/cagent", "run", "--exec", "--yolo", "--json"]
 {{if .CopyWorkingDir}}COPY . ./
 {{end}}

pkg/evaluation/Dockerfile.template

@@ -156,7 +156,7 @@ func newModel(width, height int, sessionState *service.SessionState) *model {
 		scrollview:           sv,
 		selectedMessageIndex: -1,
 		inlineEditMsgIndex:   -1,
-		debugLayout:          os.Getenv("CAGENT_EXPERIMENTAL_DEBUG_LAYOUT") == "1",
+		debugLayout:          os.Getenv("DOCKER_AGENT_EXPERIMENTAL_DEBUG_LAYOUT") == "1" || os.Getenv("CAGENT_EXPERIMENTAL_DEBUG_LAYOUT") == "1",
 		renderDirty:          true,
 	}
 }