@tanagram/cli 0.4.11 → 0.4.14

package/main.go

@@ -2,19 +2,30 @@ package main
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/tanagram/cli/commands"
 	"github.com/tanagram/cli/metrics"
 	"github.com/tanagram/cli/tui"
 	"github.com/tanagram/cli/utils"
+	"golang.org/x/term"
 )
 
 // Version is set in install.js via `-X` ldflags
 var Version = "dev"
 
+var (
+	flagLogLevel  = flag.String("log-level", "info", "log level: debug, info, warn, error")
+	flagLogFormat = flag.String("log-format", "text", "log format: text or json")
+	flagLogFile   = flag.String("log-file", "", "log output file path (defaults to stderr if not specified)")
+)
+
 func main() {
 	metrics.SetVersion(Version)
 	metrics.Init()
@@ -30,16 +41,50 @@ func main() {
 		os.Exit(exitCode)
 	}()
 
+	flag.Parse()
+
 	// Get subcommand (default to "run" if none provided)
 	subcommand := "run"
-	if len(os.Args) > 1 {
-		subcommand = os.Args[1]
+	args := flag.Args()
+	if len(args) > 0 {
+		subcommand = args[0]
 	}
 
 	metrics.Track("cli.start", map[string]interface{}{
 		"subcommand": subcommand,
 	})
 
+	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
+		// Claude expects communication (i.e. `stop` hook output) to come on `stderr`,
+		// Which means we want to send log output (i.e. not output-to-Claude) to `stdout`.
+		logOutput = os.Stdout
+	}
+	if *flagLogFile != "" {
+		logPath, logErr := createLogFile(*flagLogFile)
+		if logErr != nil {
+			slog.Error("Error setting up logging", "error", logErr)
+			exitCode = 1
+			return
+		}
+		logFile, logErr := os.OpenFile(logPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		if logErr != nil {
+			slog.Error("Error opening log file", "error", logErr)
+			exitCode = 1
+			return
+		}
+		defer logFile.Close()
+		logOutput = logFile
+	}
+	isTTY := term.IsTerminal(int(os.Stdout.Fd()))
+	logger := newLogger(*flagLogLevel, *flagLogFormat, logOutput, isTTY)
+	slog.SetDefault(logger)
+
+	slog.Info("Running CLI with args",
+		"args", os.Args[1:],
+	)
+
 	// THIS IS A HUGE HACK
 	// Cursor runs its hooks in the ~/.cursor directory as cwd
 	// Claude runs its hooks directly as a subprocess, with your terminal directory as cwd
@@ -54,11 +99,11 @@ func main() {
 				WorkspaceRoots []string `json:"workspace_roots"`
 			}
 			if err := json.Unmarshal(input, &payload); err != nil {
-				fmt.Fprintf(os.Stderr, "Error parsing input: %v\n", err)
+				slog.Error("Error parsing input", "error", err)
 			} else if len(payload.WorkspaceRoots) > 0 {
 				os.Chdir(payload.WorkspaceRoots[0])
 			} else {
-				fmt.Fprintf(os.Stderr, "No workspace roots found\n")
+				slog.Warn("No workspace roots found")
 			}
 		}
 	}
@@ -71,7 +116,7 @@ func main() {
 		})
 		// Auto-setup hooks on first run
 		if err := commands.EnsureHooksConfigured(); err != nil {
-			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+			slog.Error("Failed to configure hooks", "error", err)
 			exitCode = 1
 			return
 		}
@@ -87,7 +132,7 @@ func main() {
 		})
 		// Auto-setup hooks on first run
 		if err := commands.EnsureHooksConfigured(); err != nil {
-			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+			slog.Error("Failed to configure hooks", "error", err)
 			exitCode = 1
 			return
 		}
@@ -98,7 +143,7 @@ func main() {
 		})
 		// Auto-setup hooks on first run
 		if err := commands.EnsureHooksConfigured(); err != nil {
-			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+			slog.Error("Failed to configure hooks", "error", err)
 			exitCode = 1
 			return
 		}
@@ -152,7 +197,7 @@ func main() {
 		})
 		choice, err := tui.RunWelcomeScreen()
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+			slog.Error("Welcome screen failed", "error", err)
 			exitCode = 1
 			return
 		}
@@ -183,7 +228,7 @@ func main() {
 		})
 		err := tui.RunPuzzleEditor()
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+			slog.Error("Puzzle editor failed", "error", err)
 			exitCode = 1
 			return
 		}
@@ -206,7 +251,7 @@ func main() {
 			"command": subcommand,
 			"error":   err.Error(),
 		})
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		slog.Error("Command failed", "command", subcommand, "error", err)
 		exitCode = 1
 		return
 	}
@@ -255,8 +300,8 @@ HOOK WORKFLOW:
   When configured with 'tanagram config claude' or 'tanagram config cursor':
   
   Claude Code:
-  1. PreToolUse (Edit|Write): Creates snapshot before Claude makes changes
-  2. PostToolUse (Edit|Write): Checks only Claude's changes against policies
+  1. SessionStart: Creates snapshot before Claude makes changes
+  2. Stop: Checks only Claude's changes against policies
   
   Cursor:
   1. beforeSubmitPrompt: Creates snapshot before agent starts working
@@ -266,3 +311,58 @@ HOOK WORKFLOW:
 `
 	fmt.Print(help)
 }
+
+func newLogger(levelStr, format string, output io.Writer, isTTY bool) *slog.Logger {
+	var lvl slog.Level
+	switch strings.ToLower(levelStr) {
+	case "debug":
+		lvl = slog.LevelDebug
+	case "info":
+		lvl = slog.LevelInfo
+	case "warn", "warning":
+		lvl = slog.LevelWarn
+	case "error":
+		lvl = slog.LevelError
+	default:
+		lvl = slog.LevelInfo
+	}
+
+	opts := &slog.HandlerOptions{
+		Level: lvl,
+	}
+
+	var h slog.Handler
+	switch strings.ToLower(format) {
+	case "json":
+		h = slog.NewJSONHandler(output, opts)
+	default:
+		if isTTY {
+			opts.ReplaceAttr = func(groups []string, a slog.Attr) slog.Attr {
+				if a.Key == slog.TimeKey || a.Key == slog.LevelKey {
+					return slog.Attr{}
+				}
+				return a
+			}
+		}
+		h = slog.NewTextHandler(output, opts)
+	}
+
+	return slog.New(h)
+}
+
+func createLogFile(logFilePath string) (string, error) {
+	logPath := logFilePath
+	if strings.HasPrefix(logPath, "~/") {
+		home, err := os.UserHomeDir()
+		if err != nil {
+			return "", fmt.Errorf("getting home directory: %w", err)
+		}
+		logPath = filepath.Join(home, logPath[2:])
+	}
+
+	if err := os.MkdirAll(filepath.Dir(logPath), 0755); err != nil {
+		return "", fmt.Errorf("creating log directory: %w", err)
+	}
+
+	return logPath, nil
+}

package/package.json

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

package/utils/process.go

@@ -30,9 +30,10 @@ func GetParentProcess() string {
 			return
 		}
 
-		// Cursor runs hooks via `node` or `zsh` (I've seen both) in ~/.cursor
+		// Cursor runs hooks via `node` or a shell (I've seen both) in ~/.cursor
 		// Handle this case and make life easier for users of this function.
-		if name == "node" || name == "zsh" {
+		// `pwsh` is powershell: https://chatgpt.com/share/6927b015-2738-8000-ab6d-792e05c9401b
+		if name == "node" || name == "zsh" || name == "bash" || name == "fish" || name == "sh" || strings.Contains(name, "pwsh") {
 			cwd, err := parent.Cwd()
 			if err == nil && strings.Contains(cwd, ".cursor") {
 				parentProcessName = "cursor"