mcp: add log and diff tools

Signed-off-by: Andrea Luzzardi <al@dagger.io>

Author: aluzzardi

cmd/cu/checkout.go

@@ -8,8 +8,8 @@ import (
 )
 
 var checkoutCmd = &cobra.Command{
-	Use:               "checkout <env>",
-	Short:             "Switch to an environment's branch locally",
+	Use:   "checkout <env>",
+	Short: "Switch to an environment's branch locally",
 	Long: `Bring an environment's work into your local git workspace.
 This creates a local branch from the environment's state so you can
 explore files in your IDE, make changes, or continue development.`,
@@ -48,4 +48,4 @@ cu checkout fancy-mallard -b my-review-branch`,
 func init() {
 	checkoutCmd.Flags().StringP("branch", "b", "", "Local branch name to use")
 	rootCmd.AddCommand(checkoutCmd)
-}
+}

cmd/cu/delete.go

@@ -8,8 +8,8 @@ import (
 )
 
 var deleteCmd = &cobra.Command{
-	Use:               "delete [<env>...]",
-	Short:             "Delete environments and start fresh",
+	Use:   "delete [<env>...]",
+	Short: "Delete environments and start fresh",
 	Long: `Delete one or more environments and their associated resources.
 This permanently removes the environment's branch and container state.
 Use this when starting over with a different approach.
@@ -80,4 +80,4 @@ cu delete --all`,
 func init() {
 	rootCmd.AddCommand(deleteCmd)
 	deleteCmd.Flags().Bool("all", false, "Delete all environments")
-}
+}

cmd/cu/diff.go

@@ -8,17 +8,21 @@ import (
 )
 
 var diffCmd = &cobra.Command{
-	Use:               "diff <env>",
-	Short:             "Show what files an agent changed",
+	Use:   "diff <env>",
+	Short: "Show what files an agent changed",
 	Long: `Display the code changes made by an agent in an environment.
-Shows a git diff between the environment's state and your current branch.`,
+Shows a git diff of all changes made since the environment was created.
+Use -b to compare against a specific branch instead of showing full diff.`,
 	Args:              cobra.ExactArgs(1),
 	ValidArgsFunction: suggestEnvironments,
-	Example: `# See what changes the agent made
+	Example: `# See what changes the agent made (full diff)
 cu diff fancy-mallard
 
+# Compare against main branch
+cu diff fancy-mallard -b main
+
 # Quick assessment before merging
-cu diff backend-api`,
+cu diff backend-api -b main`,
 	RunE: func(app *cobra.Command, args []string) error {
 		ctx := app.Context()
 
@@ -28,10 +32,13 @@ cu diff backend-api`,
 			return err
 		}
 
-		return repo.Diff(ctx, args[0], os.Stdout)
+		branch, _ := app.Flags().GetString("branch")
+
+		return repo.Diff(ctx, args[0], branch, os.Stdout)
 	},
 }
 
 func init() {
+	diffCmd.Flags().StringP("branch", "b", "", "Compare against specified branch (uses merge-base)")
 	rootCmd.AddCommand(diffCmd)
 }

cmd/cu/list.go

@@ -57,4 +57,4 @@ func init() {
 	listCmd.Flags().BoolP("quiet", "q", false, "Display only environment IDs")
 	listCmd.Flags().BoolP("no-trunc", "", false, "Don't truncate output")
 	rootCmd.AddCommand(listCmd)
-}
+}

cmd/cu/log.go

@@ -8,18 +8,25 @@ import (
 )
 
 var logCmd = &cobra.Command{
-	Use:               "log <env>",
-	Short:             "View what an agent did step-by-step",
+	Use:   "log <env>",
+	Short: "View what an agent did step-by-step",
 	Long: `Display the complete development history for an environment.
 Shows all commits made by the agent plus command execution notes.
-Use -p to include code patches in the output.`,
+Use -p to include code patches in the output.
+Use -b to compare against a specific branch instead of showing full history.`,
 	Args:              cobra.ExactArgs(1),
 	ValidArgsFunction: suggestEnvironments,
-	Example: `# See what agent did
+	Example: `# See what agent did (full history)
 cu log fancy-mallard
 
 # Include code changes
-cu log fancy-mallard -p`,
+cu log fancy-mallard -p
+
+# Compare against main branch
+cu log fancy-mallard -b main
+
+# Compare against main with patches
+cu log fancy-mallard -b main -p`,
 	RunE: func(app *cobra.Command, args []string) error {
 		ctx := app.Context()
 
@@ -30,12 +37,14 @@ cu log fancy-mallard -p`,
 		}
 
 		patch, _ := app.Flags().GetBool("patch")
+		branch, _ := app.Flags().GetString("branch")
 
-		return repo.Log(ctx, args[0], patch, os.Stdout)
+		return repo.Log(ctx, args[0], patch, branch, os.Stdout)
 	},
 }
 
 func init() {
 	logCmd.Flags().BoolP("patch", "p", false, "Generate patch")
+	logCmd.Flags().StringP("branch", "b", "", "Compare against specified branch (uses merge-base)")
 	rootCmd.AddCommand(logCmd)
 }

cmd/cu/watch.go

@@ -35,4 +35,4 @@ cu watch`,
 
 func init() {
 	rootCmd.AddCommand(watchCmd)
-}
+}