discard local changes when re-syncing to env

we literally just migrated their unstaged changes to the env, so this
should be equivalent and much more foolproof

Signed-off-by: Alex Suraci <suraci.alex@gmail.com>

Author: vito

cmd/container-use/apply.go

@@ -43,7 +43,7 @@ git commit -m "Add backend API implementation"`,
 
 		env := args[0]
 
-		if err := repo.Apply(ctx, env, os.Stdout); err != nil {
+		if err := repo.Apply(ctx, env, os.Stdout, false); err != nil {
 			return fmt.Errorf("failed to apply environment: %w", err)
 		}
 

environment/integration/merge_test.go

@@ -79,7 +79,7 @@ func TestRepositoryApply(t *testing.T) {
 
 		// Apply the environment (squash merge)
 		var applyOutput bytes.Buffer
-		err = repo.Apply(ctx, env.ID, &applyOutput)
+		err = repo.Apply(ctx, env.ID, &applyOutput, true)
 		require.NoError(t, err, "Apply should succeed: %s", applyOutput.String())
 
 		// Verify we're still on the initial branch
@@ -146,7 +146,7 @@ func TestRepositoryApplyNonExistent(t *testing.T) {
 
 		// Try to apply non-existent environment
 		var applyOutput bytes.Buffer
-		err := repo.Apply(ctx, "non-existent-env", &applyOutput)
+		err := repo.Apply(ctx, "non-existent-env", &applyOutput, true)
 		assert.Error(t, err, "Applying non-existent environment should fail")
 		assert.Contains(t, err.Error(), "not found")
 	})
@@ -203,7 +203,7 @@ func TestRepositoryApplyWithConflicts(t *testing.T) {
 
 		// Try to apply - this should fail due to conflict
 		var applyOutput bytes.Buffer
-		err = repo.Apply(ctx, env.ID, &applyOutput)
+		err = repo.Apply(ctx, env.ID, &applyOutput, true)
 
 		// The apply should fail due to conflict
 		assert.Error(t, err, "Apply should fail due to conflict")

mcpserver/tools.go

@@ -867,7 +867,7 @@ var EnvironmentEnableTrackingTool = &Tool{
 var EnvironmentSyncFromUserTool = &Tool{
 	Definition: newEnvironmentTool(
 		"environment_sync_from_user",
-		"Apply the user's unstaged changes to the environment and apply the environment's to the user's local worktree. ONLY RUN WHEN EXPLICITLY REQUESTED BY THE USER.",
+		"Apply the user's unstaged changes to the environment. ONLY RUN WHEN EXPLICITLY REQUESTED BY THE USER.",
 	),
 	Handler: func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		repo, env, err := openEnvironment(ctx, request)
@@ -899,17 +899,12 @@ var EnvironmentSyncFromUserTool = &Tool{
 			return nil, fmt.Errorf("failed to pull changes to environment: %w", err)
 		}
 
-		if err := repo.Update(ctx, env, request.GetString("explanation", "")); err != nil {
-			return nil, fmt.Errorf("unable to update the environment: %w", err)
-		}
-
 		if err := repo.ResetUserLocalChanges(ctx); err != nil {
 			return nil, fmt.Errorf("unable to reset user's worktree: %w", err)
 		}
 
-		var buf strings.Builder
-		if err := repo.Apply(ctx, env.ID, &buf); err != nil {
-			return nil, fmt.Errorf("unable to apply changes to user's worktree: %w\n\nlogs:\n%s", err, buf.String())
+		if err := repo.Update(ctx, env, request.GetString("explanation", "")); err != nil {
+			return nil, fmt.Errorf("unable to update the environment: %w", err)
 		}
 
 		return mcp.NewToolResultText("Patch applied successfully to the environment:\n\n```patch\n" + string(patch) + "\n```"), nil

repository/repository.go

@@ -293,7 +293,7 @@ func (r *Repository) Update(ctx context.Context, env *environment.Environment, e
 			if currentBranch == env.State.TrackingBranch {
 				// Apply environment changes to the user's working tree
 				var logs strings.Builder
-				if err := r.Apply(ctx, env.ID, &logs); err != nil {
+				if err := r.Apply(ctx, env.ID, &logs, false); err != nil {
 					return fmt.Errorf("failed to apply tracking changes to working tree: %w\n\nlogs:\n%s\n", err, logs.String())
 				}
 			}
@@ -431,7 +431,7 @@ func (r *Repository) Merge(ctx context.Context, id string, w io.Writer) error {
 	return RunInteractiveGitCommand(ctx, r.userRepoPath, w, "merge", "--no-ff", "--autostash", "-m", "Merge environment "+envInfo.ID, "--", "container-use/"+envInfo.ID)
 }
 
-func (r *Repository) Apply(ctx context.Context, id string, w io.Writer) (rerr error) {
+func (r *Repository) Apply(ctx context.Context, id string, w io.Writer, discard bool) (rerr error) {
 	envInfo, err := r.Info(ctx, id)
 	if err != nil {
 		return err
@@ -468,7 +468,7 @@ func (r *Repository) Apply(ctx context.Context, id string, w io.Writer) (rerr er
 	}
 
 	// Apply user changes back
-	if hasUnstagedChanges {
+	if hasUnstagedChanges && !discard {
 		fmt.Fprintf(w, "Restoring user changes...\n")
 
 		// 1. Temporarily commit the agent's changes