@tanagram/cli 0.4.19 → 0.4.20

package/commands/sync_policies.go

@@ -1,16 +1,23 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 
+	"github.com/getsentry/sentry-go"
 	"github.com/tanagram/cli/api"
 	"github.com/tanagram/cli/storage"
 )
 
 // SyncPolicies fetches policies from Tanagram API and saves them locally
-func SyncPolicies() error {
+func SyncPolicies(ctx context.Context) error {
+	span := sentry.StartSpan(ctx, "command.sync_policies")
+	defer span.Finish()
+
 	// Find git root
+	findGitRootSpan := sentry.StartSpan(span.Context(), "storage.find_git_root")
 	gitRoot, err := storage.FindGitRoot()
+	findGitRootSpan.Finish()
 	if err != nil {
 		return fmt.Errorf("not in a git repository: %w", err)
 	}
@@ -18,14 +25,18 @@ func SyncPolicies() error {
 	fmt.Println("Syncing policies from Tanagram...")
 
 	// Create API client
+	createClientSpan := sentry.StartSpan(span.Context(), "api.new_client")
 	client, err := api.NewAPIClient()
+	createClientSpan.Finish()
 	if err != nil {
 		return err
 	}
 
 	// Fetch policies from API
 	fmt.Println("Fetching policies from API...")
+	fetchPoliciesSpan := sentry.StartSpan(span.Context(), "api.get_policies")
 	response, err := client.GetPolicies()
+	fetchPoliciesSpan.Finish()
 	if err != nil {
 		return err
 	}
@@ -49,6 +60,7 @@ func SyncPolicies() error {
 	fmt.Printf("Policies apply to %d repositories\n", len(repoMap))
 
 	// Save policies for each repository
+	savePoliciesSpan := sentry.StartSpan(span.Context(), "storage.save_policies")
 	cloudStorage := storage.NewCloudPolicyStorage(gitRoot)
 	savedCount := 0
 
@@ -66,6 +78,7 @@ func SyncPolicies() error {
 		savedCount++
 		fmt.Printf("  ✓ Saved %d policies for %s\n", len(policies), repoKey)
 	}
+	savePoliciesSpan.Finish()
 
 	// Save metadata
 	orgID := ""

package/go.mod

@@ -6,8 +6,14 @@ require (
 	github.com/anthropics/anthropic-sdk-go v1.17.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/getsentry/sentry-go v0.40.0
+	github.com/getsentry/sentry-go/slog v0.40.0
+	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/posthog/posthog-go v1.6.12
 	github.com/shirou/gopsutil/v3 v3.24.5
+	github.com/zalando/go-keyring v0.2.6
+	golang.org/x/term v0.37.0
 )
 
 require (
@@ -19,7 +25,6 @@ require (
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/danieljoos/wincred v1.2.2 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/getsentry/sentry-go v0.40.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -31,7 +36,6 @@ require (
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
-	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
@@ -43,8 +47,6 @@ require (
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	github.com/zalando/go-keyring v0.2.6 // indirect
 	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
 	golang.org/x/text v0.27.0 // indirect
 )

package/go.sum

@@ -24,13 +24,21 @@ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/getsentry/sentry-go v0.40.0 h1:VTJMN9zbTvqDqPwheRVLcp0qcUcM+8eFivvGocAaSbo=
 github.com/getsentry/sentry-go v0.40.0/go.mod h1:eRXCoh3uvmjQLY6qu63BjUZnaBu5L5WhMV1RwYO8W5s=
+github.com/getsentry/sentry-go/slog v0.40.0 h1:uR2EPL9w6uHw3XB983IAqzqM9mP+fjJpNY9kfob3/Z8=
+github.com/getsentry/sentry-go/slog v0.40.0/go.mod h1:ArRaP+0rsbnJGyvZwYDo/vDQT/YBbOQeOlO+DGW+F9s=
+github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -49,8 +57,12 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posthog/posthog-go v1.6.12 h1:rsOBL/YdMfLJtOVjKJLgdzYmvaL3aIW6IVbAteSe+aI=
@@ -66,6 +78,8 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
@@ -88,6 +102,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=
 github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -97,8 +113,6 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
 golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=

package/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -12,6 +13,7 @@ import (
 	"time"
 
 	"github.com/getsentry/sentry-go"
+	sentryslog "github.com/getsentry/sentry-go/slog"
 	"github.com/tanagram/cli/commands"
 	"github.com/tanagram/cli/metrics"
 	"github.com/tanagram/cli/tui"
@@ -33,15 +35,20 @@ func main() {
 	metrics.Init()
 
 	if err := sentry.Init(sentry.ClientOptions{
-		Dsn:              "https://a967718dd129e143907fe01b4e80cad2@o4509017064472576.ingest.us.sentry.io/4510649104007168",
-		Release:          "tanagram-cli@" + Version,
-		Environment:      getEnvironment(),
-		EnableTracing:    true,
+		Dsn:           "https://a967718dd129e143907fe01b4e80cad2@o4509017064472576.ingest.us.sentry.io/4510649104007168",
+		Release:       "tanagram-cli@" + Version,
+		Environment:   getEnvironment(),
+		EnableTracing: true,
+		// TOOD: Configure sample rate based on environment (1.0 for dev; 0.1 for prod)
+		// Depends on TAN-1968
 		TracesSampleRate: 0.1,
+		EnableLogs:       true,
 	}); err != nil {
 		slog.Warn("Sentry initialization failed", "error", err)
 	}
 
+	ctx := sentry.SetHubOnContext(context.Background(), sentry.CurrentHub())
+
 	exitCode := 0
 	defer func() {
 		if r := recover(); r != nil {
@@ -70,6 +77,12 @@ func main() {
 		"subcommand": subcommand,
 	})
 
+	tx := sentry.StartTransaction(ctx, fmt.Sprintf("cli.%s", subcommand),
+		sentry.WithOpName("command"),
+	)
+	defer tx.Finish()
+	ctx = tx.Context()
+
 	var logOutput io.Writer = os.Stderr
 	if utils.GetParentProcess() == "claude" {
 		// We use "exit-code 2" behavior for claude: https://code.claude.com/docs/en/hooks#simple:-exit-code
@@ -94,11 +107,16 @@ func main() {
 		logOutput = logFile
 	}
 	isTTY := term.IsTerminal(int(os.Stdout.Fd()))
-	logger := newLogger(*flagLogLevel, *flagLogFormat, logOutput, isTTY)
+	logger := newLogger(ctx, *flagLogLevel, *flagLogFormat, logOutput, isTTY)
 	slog.SetDefault(logger)
 
+	utils.SetGlobalTags(map[string]string{
+		"parent_process": utils.GetParentProcess(),
+		"is_tty":         fmt.Sprintf("%t", isTTY),
+	})
+
 	slog.Info("Running CLI with args",
-		"args", os.Args[1:],
+		"args", strings.Join(os.Args[1:], " "),
 	)
 
 	// THIS IS A HUGE HACK
@@ -110,7 +128,7 @@ func main() {
 	// TODO: handle 0 or multiple workspace_roots
 	if utils.GetParentProcess() == "cursor" {
 		input, err := io.ReadAll(os.Stdin)
-		if err == nil {
+		if err == nil && len(input) > 0 {
 			var payload struct {
 				WorkspaceRoots []string `json:"workspace_roots"`
 			}
@@ -131,39 +149,39 @@ func main() {
 			"command": "run",
 		})
 		// Auto-setup hooks on first run
-		if err := commands.EnsureHooksConfigured(); err != nil {
+		if err := commands.EnsureHooksConfigured(ctx); err != nil {
 			slog.Error("Failed to configure hooks", "error", err)
 			exitCode = 1
 			return
 		}
-		err = commands.Run()
+		err = commands.Run(ctx)
 	case "snapshot":
 		metrics.Track("cli.command.execute", map[string]interface{}{
 			"command": "snapshot",
 		})
-		err = commands.Snapshot()
+		err = commands.Snapshot(ctx)
 	case "sync":
 		metrics.Track("cli.command.execute", map[string]interface{}{
 			"command": "sync",
 		})
 		// Auto-setup hooks on first run
-		if err := commands.EnsureHooksConfigured(); err != nil {
+		if err := commands.EnsureHooksConfigured(ctx); err != nil {
 			slog.Error("Failed to configure hooks", "error", err)
 			exitCode = 1
 			return
 		}
-		err = commands.Sync()
+		err = commands.Sync(ctx)
 	case "list":
 		metrics.Track("cli.command.execute", map[string]interface{}{
 			"command": "list",
 		})
 		// Auto-setup hooks on first run
-		if err := commands.EnsureHooksConfigured(); err != nil {
+		if err := commands.EnsureHooksConfigured(ctx); err != nil {
 			slog.Error("Failed to configure hooks", "error", err)
 			exitCode = 1
 			return
 		}
-		err = commands.List()
+		err = commands.List(ctx)
 	case "config":
 		// Handle config subcommands
 		if len(os.Args) < 3 {
@@ -186,7 +204,7 @@ func main() {
 				err = pathErr
 				break
 			}
-			err = commands.ConfigClaude(settingsPath)
+			err = commands.ConfigClaude(ctx, settingsPath)
 		case "cursor":
 			metrics.Track("cli.command.execute", map[string]interface{}{
 				"command": "config.cursor",
@@ -196,12 +214,12 @@ func main() {
 				err = pathErr
 				break
 			}
-			err = commands.ConfigCursor(hooksPath)
+			err = commands.ConfigCursor(ctx, hooksPath)
 		case "list":
 			metrics.Track("cli.command.execute", map[string]interface{}{
 				"command": "config.list",
 			})
-			err = commands.ConfigList()
+			err = commands.ConfigList(ctx)
 		default:
 			fmt.Fprintf(os.Stderr, "Unknown config subcommand: %s\n", subCmd)
 			exitCode = 1
@@ -232,12 +250,12 @@ func main() {
 		metrics.Track("cli.command.execute", map[string]interface{}{
 			"command": "login",
 		})
-		err = commands.Login()
+		err = commands.Login(ctx)
 	case "sync-policies":
 		metrics.Track("cli.command.execute", map[string]interface{}{
 			"command": "sync-policies",
 		})
-		err = commands.SyncPolicies()
+		err = commands.SyncPolicies(ctx)
 	case "version", "-v", "--version":
 		fmt.Println(Version)
 		return
@@ -252,9 +270,8 @@ func main() {
 	}
 
 	if err != nil {
-		sentry.WithScope(func(scope *sentry.Scope) {
-			scope.SetTag("command", subcommand)
-			sentry.CaptureException(err)
+		utils.CaptureError(err, map[string]string{
+			"command": subcommand,
 		})
 		metrics.Track("cli.command.error", map[string]interface{}{
 			"command": subcommand,
@@ -328,7 +345,7 @@ HOOK WORKFLOW:
 	fmt.Print(help)
 }
 
-func newLogger(levelStr, format string, output io.Writer, isTTY bool) *slog.Logger {
+func newLogger(ctx context.Context, levelStr, format string, output io.Writer, isTTY bool) *slog.Logger {
 	var lvl slog.Level
 	switch strings.ToLower(levelStr) {
 	case "debug":
@@ -347,10 +364,10 @@ func newLogger(levelStr, format string, output io.Writer, isTTY bool) *slog.Logg
 		Level: lvl,
 	}
 
-	var h slog.Handler
+	var baseHandler slog.Handler
 	switch strings.ToLower(format) {
 	case "json":
-		h = slog.NewJSONHandler(output, opts)
+		baseHandler = slog.NewJSONHandler(output, opts)
 	default:
 		if isTTY {
 			opts.ReplaceAttr = func(groups []string, a slog.Attr) slog.Attr {
@@ -360,10 +377,60 @@ func newLogger(levelStr, format string, output io.Writer, isTTY bool) *slog.Logg
 				return a
 			}
 		}
-		h = slog.NewTextHandler(output, opts)
+		baseHandler = slog.NewTextHandler(output, opts)
+	}
+
+	sentryHandler := sentryslog.Option{
+		EventLevel: []slog.Level{slog.LevelError, sentryslog.LevelFatal},
+		// LogLevel defaults to `[]slog.Level{slog.LevelDebug, slog.LevelInfo, slog.LevelWarn, slog.LevelError, LevelFatal}`, which seems reasonable
+		AddSource: true,
+	}.NewSentryHandler(ctx)
+
+	return slog.New(newMultiHandler(baseHandler, sentryHandler))
+}
+
+type multiHandler struct {
+	handlers []slog.Handler
+}
+
+func newMultiHandler(handlers ...slog.Handler) *multiHandler {
+	return &multiHandler{handlers: handlers}
+}
+
+func (h *multiHandler) Enabled(ctx context.Context, level slog.Level) bool {
+	for _, handler := range h.handlers {
+		if handler.Enabled(ctx, level) {
+			return true
+		}
+	}
+	return false
+}
+
+func (h *multiHandler) Handle(ctx context.Context, r slog.Record) error {
+	for _, handler := range h.handlers {
+		if handler.Enabled(ctx, r.Level) {
+			if err := handler.Handle(ctx, r); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (h *multiHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+	handlers := make([]slog.Handler, len(h.handlers))
+	for i, handler := range h.handlers {
+		handlers[i] = handler.WithAttrs(attrs)
 	}
+	return &multiHandler{handlers: handlers}
+}
 
-	return slog.New(h)
+func (h *multiHandler) WithGroup(name string) slog.Handler {
+	handlers := make([]slog.Handler, len(h.handlers))
+	for i, handler := range h.handlers {
+		handlers[i] = handler.WithGroup(name)
+	}
+	return &multiHandler{handlers: handlers}
 }
 
 func createLogFile(logFilePath string) (string, error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanagram/cli",
-  "version": "0.4.19",
+  "version": "0.4.20",
   "description": "Tanagram - Catch sloppy code before it ships",
   "main": "index.js",
   "bin": {

package/utils/sentry.go

@@ -0,0 +1,44 @@
+package utils
+
+import (
+	"github.com/getsentry/sentry-go"
+)
+
+// CaptureError captures an error with additional context to Sentry
+func CaptureError(err error, ctx map[string]string) {
+	sentry.WithScope(func(scope *sentry.Scope) {
+		for k, v := range ctx {
+			scope.SetTag(k, v)
+		}
+		sentry.CaptureException(err)
+	})
+}
+
+// AddBreadcrumb adds a breadcrumb to the current Sentry scope
+func AddBreadcrumb(category, message string, level sentry.Level, data map[string]interface{}) {
+	sentry.AddBreadcrumb(&sentry.Breadcrumb{
+		Category: category,
+		Message:  message,
+		Level:    level,
+		Data:     data,
+	})
+}
+
+// SetUserContext sets the user context for Sentry
+func SetUserContext(userID, email string) {
+	sentry.ConfigureScope(func(scope *sentry.Scope) {
+		scope.SetUser(sentry.User{
+			ID:    userID,
+			Email: email,
+		})
+	})
+}
+
+// SetGlobalTags sets global tags for all Sentry events
+func SetGlobalTags(tags map[string]string) {
+	sentry.ConfigureScope(func(scope *sentry.Scope) {
+		for k, v := range tags {
+			scope.SetTag(k, v)
+		}
+	})
+}