Move the rest of internal to pkg

dgageot · dgageot · commit 9d9cafae6f8b · 2025-09-16T12:46:38.000+02:00
Signed-off-by: David Gageot &lt;david.gageot@docker.com&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/root/.cache,id=docker-ai-$TARGETPLATFORM \
     --mount=type=secret,id=telemetry_endpoint,env=TELEMETRY_ENDPOINT \
     --mount=type=secret,id=telemetry_header,env=TELEMETRY_HEADER <<EOT
     set -ex
-    xx-go build -trimpath -ldflags "-s -w -X 'github.com/docker/cagent/cmd/root.Version=$GIT_TAG' -X 'github.com/docker/cagent/cmd/root.Commit=$GIT_COMMIT' -X 'github.com/docker/cagent/cmd/root.BuildTime=$BUILD_DATE' -X 'github.com/docker/cagent/internal/telemetry.TelemetryEndpoint=$TELEMETRY_ENDPOINT' -X 'github.com/docker/cagent/internal/telemetry.TelemetryAPIKey=$TELEMETRY_API_KEY' -X 'github.com/docker/cagent/internal/telemetry.TelemetryHeader=$TELEMETRY_HEADER'" -o /binaries/cagent-$TARGETOS-$TARGETARCH .
+    xx-go build -trimpath -ldflags "-s -w -X 'github.com/docker/cagent/cmd/root.Version=$GIT_TAG' -X 'github.com/docker/cagent/cmd/root.Commit=$GIT_COMMIT' -X 'github.com/docker/cagent/cmd/root.BuildTime=$BUILD_DATE' -X 'github.com/docker/cagent/pkg/telemetry.TelemetryEndpoint=$TELEMETRY_ENDPOINT' -X 'github.com/docker/cagent/pkg/telemetry.TelemetryAPIKey=$TELEMETRY_API_KEY' -X 'github.com/docker/cagent/pkg/telemetry.TelemetryHeader=$TELEMETRY_HEADER'" -o /binaries/cagent-$TARGETOS-$TARGETARCH .
     file /binaries/cagent-$TARGETos-$TARGETARCH
     xx-verify --static /binaries/cagent-$TARGETOS-$TARGETARCH
     if [ "$TARGETOS" = "windows" ]; then
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -12,7 +12,7 @@ vars:
     sh: date -u +"%Y-%m-%dT%H:%M:%SZ"
   GO_SOURCES: "**/*.go"
   BUILD_ARGS: '--build-arg GIT_TAG="{{.GIT_TAG}}" --build-arg GIT_COMMIT="{{.GIT_COMMIT}}" --build-arg BUILD_DATE="{{.BUILD_DATE}}" --secret id=telemetry_api_key,env=TELEMETRY_API_KEY --secret id=telemetry_endpoint,env=TELEMETRY_ENDPOINT --secret id=telemetry_header,env=TELEMETRY_HEADER'
-  LDFLAGS: '-X "github.com/docker/cagent/internal/version.Version={{.GIT_TAG}}" -X "github.com/docker/cagent/internal/version.Commit={{.GIT_COMMIT}}" -X "github.com/docker/cagent/internal/version.BuildTime={{.BUILD_DATE}}" -X "github.com/docker/cagent/internal/telemetry.TelemetryEndpoint={{.TELEMETRY_ENDPOINT}}" -X "github.com/docker/cagent/internal/telemetry.TelemetryAPIKey={{.TELEMETRY_API_KEY}}" -X "github.com/docker/cagent/internal/telemetry.TelemetryHeader={{.TELEMETRY_HEADER}}"'
+  LDFLAGS: '-X "github.com/docker/cagent/pkg/version.Version={{.GIT_TAG}}" -X "github.com/docker/cagent/pkg/version.Commit={{.GIT_COMMIT}}" -X "github.com/docker/cagent/pkg/version.BuildTime={{.BUILD_DATE}}" -X "github.com/docker/cagent/pkg/telemetry.TelemetryEndpoint={{.TELEMETRY_ENDPOINT}}" -X "github.com/docker/cagent/pkg/telemetry.TelemetryAPIKey={{.TELEMETRY_API_KEY}}" -X "github.com/docker/cagent/pkg/telemetry.TelemetryHeader={{.TELEMETRY_HEADER}}"'
 
 tasks:
   default:
diff --git a/cmd/root/api.go b/cmd/root/api.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/cagent/internal/telemetry"
 	"github.com/docker/cagent/pkg/config"
 	"github.com/docker/cagent/pkg/server"
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/teamloader"
+	"github.com/docker/cagent/pkg/telemetry"
 )
 
 var (
diff --git a/cmd/root/build.go b/cmd/root/build.go
@@ -3,8 +3,8 @@ package root
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/docker/cagent/internal/telemetry"
 	"github.com/docker/cagent/pkg/oci"
+	"github.com/docker/cagent/pkg/telemetry"
 )
 
 var (
diff --git a/cmd/root/catalog.go b/cmd/root/catalog.go
@@ -10,7 +10,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/cagent/internal/telemetry"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root/eval.go b/cmd/root/eval.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/cagent/internal/telemetry"
 	"github.com/docker/cagent/pkg/evaluation"
 	"github.com/docker/cagent/pkg/teamloader"
+	"github.com/docker/cagent/pkg/telemetry"
 )
 
 func NewEvalCmd() *cobra.Command {
diff --git a/cmd/root/feedback.go b/cmd/root/feedback.go
@@ -3,7 +3,7 @@ package root
 import (
 	"fmt"
 
-	"github.com/docker/cagent/internal/telemetry"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root/new.go b/cmd/root/new.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/cagent/internal/creator"
-	"github.com/docker/cagent/internal/telemetry"
+	"github.com/docker/cagent/pkg/creator"
 	"github.com/docker/cagent/pkg/runtime"
+	"github.com/docker/cagent/pkg/telemetry"
 )
 
 var (
diff --git a/cmd/root/pull.go b/cmd/root/pull.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/cagent/internal/telemetry"
 	"github.com/docker/cagent/pkg/remote"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/google/go-containerregistry/pkg/crane"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/root/push.go b/cmd/root/push.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/docker/cagent/internal/telemetry"
 	"github.com/docker/cagent/pkg/content"
 	"github.com/docker/cagent/pkg/oci"
 	"github.com/docker/cagent/pkg/remote"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/google/go-containerregistry/pkg/crane"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/root/readme.go b/cmd/root/readme.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/docker/cagent/internal/telemetry"
 	"github.com/docker/cagent/pkg/config"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root/root.go b/cmd/root/root.go
@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/cagent/internal/config"
-	"github.com/docker/cagent/internal/telemetry"
-	"github.com/docker/cagent/internal/version"
 	"github.com/docker/cagent/pkg/environment"
+	"github.com/docker/cagent/pkg/paths"
+	"github.com/docker/cagent/pkg/telemetry"
+	"github.com/docker/cagent/pkg/version"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +27,7 @@ var (
 // isFirstRun checks if this is the first time cagent is being run
 // It creates a marker file in the user's config directory
 func isFirstRun() bool {
-	configDir := config.GetConfigDir()
+	configDir := paths.GetConfigDir()
 	markerFile := filepath.Join(configDir, ".cagent_first_run")
 
 	// Check if marker file exists
@@ -174,7 +174,7 @@ func setupLogging(cmd *cobra.Command) error {
 		// Determine path from flag or default to <dataDir>/cagent.debug.log
 		path := strings.TrimSpace(logFilePath)
 		if path == "" {
-			dataDir := config.GetDataDir()
+			dataDir := paths.GetDataDir()
 			path = filepath.Join(dataDir, "cagent.debug.log")
 		} else {
 			if path == "~" || strings.HasPrefix(path, "~/") {
diff --git a/cmd/root/run.go b/cmd/root/run.go
@@ -20,8 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"go.opentelemetry.io/otel"
 
-	"github.com/docker/cagent/internal/app"
-	"github.com/docker/cagent/internal/telemetry"
+	"github.com/docker/cagent/pkg/app"
 	"github.com/docker/cagent/pkg/chat"
 	"github.com/docker/cagent/pkg/content"
 	"github.com/docker/cagent/pkg/evaluation"
@@ -30,6 +29,7 @@ import (
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/team"
 	"github.com/docker/cagent/pkg/teamloader"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/docker/cagent/pkg/tui"
 )
 
diff --git a/cmd/root/version.go b/cmd/root/version.go
@@ -3,8 +3,8 @@ package root
 import (
 	"fmt"
 
-	"github.com/docker/cagent/internal/telemetry"
-	"github.com/docker/cagent/internal/version"
+	"github.com/docker/cagent/pkg/telemetry"
+	"github.com/docker/cagent/pkg/version"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/app/app.go b/pkg/app/app.go
diff --git a/pkg/creator/agent.go b/pkg/creator/agent.go
diff --git a/pkg/creator/instructions.txt b/pkg/creator/instructions.txt
diff --git a/pkg/paths/paths.go b/pkg/paths/paths.go
@@ -1,4 +1,4 @@
-package config
+package paths
 
 import (
 	"os"
diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/cagent/internal/telemetry"
 	"github.com/docker/cagent/pkg/agent"
 	"github.com/docker/cagent/pkg/chat"
 	"github.com/docker/cagent/pkg/modelsdev"
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/team"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/docker/cagent/pkg/tools"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -22,11 +22,11 @@ import (
 	"github.com/labstack/echo/v4/middleware"
 	"gopkg.in/yaml.v3"
 
-	"github.com/docker/cagent/internal/creator"
 	"github.com/docker/cagent/pkg/api"
 	"github.com/docker/cagent/pkg/config"
 	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/content"
+	"github.com/docker/cagent/pkg/creator"
 	"github.com/docker/cagent/pkg/desktop"
 	"github.com/docker/cagent/pkg/oci"
 	"github.com/docker/cagent/pkg/remote"
diff --git a/pkg/telemetry/client.go b/pkg/telemetry/client.go
diff --git a/pkg/telemetry/context.go b/pkg/telemetry/context.go
diff --git a/pkg/telemetry/events.go b/pkg/telemetry/events.go
diff --git a/pkg/telemetry/global.go b/pkg/telemetry/global.go
diff --git a/pkg/telemetry/http.go b/pkg/telemetry/http.go
diff --git a/pkg/telemetry/telemetry.go b/pkg/telemetry/telemetry.go
diff --git a/pkg/telemetry/telemetry_test.go b/pkg/telemetry/telemetry_test.go
diff --git a/pkg/telemetry/types.go b/pkg/telemetry/types.go
diff --git a/pkg/telemetry/utils.go b/pkg/telemetry/utils.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/docker/cagent/internal/config"
+	"github.com/docker/cagent/pkg/paths"
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
 )
@@ -65,7 +65,7 @@ func getTelemetryHeader() string {
 
 // getUserUUIDFilePath returns the path to the user UUID file
 func getUserUUIDFilePath() string {
-	configDir := config.GetConfigDir()
+	configDir := paths.GetConfigDir()
 	return filepath.Join(configDir, "user-uuid")
 }
 
diff --git a/pkg/tui/components/messages/messages.go b/pkg/tui/components/messages/messages.go
@@ -11,7 +11,7 @@ import (
 	"github.com/charmbracelet/glamour/v2/styles"
 	"github.com/charmbracelet/lipgloss/v2"
 
-	"github.com/docker/cagent/internal/app"
+	"github.com/docker/cagent/pkg/app"
 	"github.com/docker/cagent/pkg/runtime"
 	"github.com/docker/cagent/pkg/tools"
 	"github.com/docker/cagent/pkg/tui/components/message"
diff --git a/pkg/tui/components/statusbar/statusbar.go b/pkg/tui/components/statusbar/statusbar.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/charmbracelet/bubbles/v2/key"
 	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/docker/cagent/internal/version"
 	"github.com/docker/cagent/pkg/tui/core"
 	"github.com/docker/cagent/pkg/tui/styles"
+	"github.com/docker/cagent/pkg/version"
 )
 
 // StatusBar represents the status bar component that displays key bindings help
diff --git a/pkg/tui/components/tool/tool.go b/pkg/tui/components/tool/tool.go
@@ -10,7 +10,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/glamour/v2"
 
-	"github.com/docker/cagent/internal/app"
+	"github.com/docker/cagent/pkg/app"
 	"github.com/docker/cagent/pkg/tui/core/layout"
 	"github.com/docker/cagent/pkg/tui/styles"
 	"github.com/docker/cagent/pkg/tui/types"
diff --git a/pkg/tui/dialog/tool_confirmation.go b/pkg/tui/dialog/tool_confirmation.go
@@ -10,7 +10,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 
-	"github.com/docker/cagent/internal/app"
+	"github.com/docker/cagent/pkg/app"
 	"github.com/docker/cagent/pkg/tools"
 	"github.com/docker/cagent/pkg/tui/components/todo"
 	"github.com/docker/cagent/pkg/tui/core"
diff --git a/pkg/tui/page/chat/chat.go b/pkg/tui/page/chat/chat.go
@@ -7,7 +7,7 @@ import (
 	"github.com/charmbracelet/bubbles/v2/key"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/docker/cagent/internal/app"
+	"github.com/docker/cagent/pkg/app"
 	"github.com/docker/cagent/pkg/tui/components/editor"
 	"github.com/docker/cagent/pkg/tui/components/messages"
 	"github.com/docker/cagent/pkg/tui/components/sidebar"
diff --git a/pkg/tui/tui.go b/pkg/tui/tui.go
@@ -7,9 +7,9 @@ import (
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 
-	"github.com/docker/cagent/internal/app"
-	"github.com/docker/cagent/internal/telemetry"
+	"github.com/docker/cagent/pkg/app"
 	"github.com/docker/cagent/pkg/runtime"
+	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/docker/cagent/pkg/tui/components/statusbar"
 	"github.com/docker/cagent/pkg/tui/dialog"
 	chatpage "github.com/docker/cagent/pkg/tui/page/chat"
diff --git a/pkg/version/version.go b/pkg/version/version.go

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package root`
`3`	`3`	`import (`
`4`	`4`	`"github.com/spf13/cobra"`
`5`	`5`
`6`		`- "github.com/docker/cagent/internal/telemetry"`
`7`	`6`	`"github.com/docker/cagent/pkg/oci"`
	`7`	`+ "github.com/docker/cagent/pkg/telemetry"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"text/tabwriter"`
`11`	`11`	`"time"`
`12`	`12`
`13`		`- "github.com/docker/cagent/internal/telemetry"`
	`13`	`+ "github.com/docker/cagent/pkg/telemetry"`
`14`	`14`	`"github.com/spf13/cobra"`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/spf13/cobra"`
`7`	`7`
`8`		`- "github.com/docker/cagent/internal/telemetry"`
`9`	`8`	`"github.com/docker/cagent/pkg/evaluation"`
`10`	`9`	`"github.com/docker/cagent/pkg/teamloader"`
	`10`	`+ "github.com/docker/cagent/pkg/telemetry"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func NewEvalCmd() *cobra.Command {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package root`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/docker/cagent/internal/telemetry"`
	`6`	`+ "github.com/docker/cagent/pkg/telemetry"`
`7`	`7`	`"github.com/spf13/cobra"`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/spf13/cobra"`
`10`	`10`
`11`		`- "github.com/docker/cagent/internal/creator"`
`12`		`- "github.com/docker/cagent/internal/telemetry"`
	`11`	`+ "github.com/docker/cagent/pkg/creator"`
`13`	`12`	`"github.com/docker/cagent/pkg/runtime"`
	`13`	`+ "github.com/docker/cagent/pkg/telemetry"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"path/filepath"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/docker/cagent/internal/telemetry"`
`11`	`10`	`"github.com/docker/cagent/pkg/remote"`
	`11`	`+ "github.com/docker/cagent/pkg/telemetry"`
`12`	`12`	`"github.com/google/go-containerregistry/pkg/crane"`
`13`	`13`	`"github.com/spf13/cobra"`
`14`	`14`	`)`