Handle create+delete same path as file replacement

[coolcom200]

Description

This updates file-diff application logic so when Create and Delete target the same path in one request, we treat it as a file replacement instead of conflicting operations.

Before:

Debug Link

After:

Debug Link

Linked Issue

• The linked issue is labeled ready-to-spec or ready-to-implement.
• Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes).

Testing

• Added unit tests for delete+create replacement behavior, create+delete replacement behavior, and mixed delete/create/edit conflict behavior.

• cargo fmt --all -- --check passed.

• cargo clippy --workspace --all-targets --all-features --tests -- -D warnings was not completed locally; CI will validate.

• I have manually tested my changes locally with ./script/run

Agent Mode

• Warp Agent Mode - This PR was created via Warp's AI Agent Mode

CHANGELOG-BUG-FIX: Fix file edit diff application when create and delete target the same path.

Co-Authored-By: Oz oz-agent@warp.dev

[oz-for-oss]

@coolcom200

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

[oz-for-oss]

Overview

This PR updates request-file-edit diff application so same-path create+delete operations are treated as a replacement update, with unit coverage for both operation orders and mixed edit conflicts.

Concerns

• For this user-facing Agent file-edit behavior change, please include screenshots or a short screen recording demonstrating it working end to end. The PR description lists unit tests but does not include visual evidence.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

[szgupta]

This is a V4A codepath only, yeah?

[coolcom200]

This is a V4A codepath only, yeah?

This is the applyFileDiffs tool call but I don't believe this is the V4A code path since that is handle above the code changes made see snippet below.

warp/app/src/ai/blocklist/action_model/execute/request_file_edits/diff_application.rs

Lines 373 to 388 in 5a96c43

	for (file_path, deltas) in v4a_deltas {
	if new_file_paths.contains(&file_path) || deleted_file_paths.contains(&file_path) {
	continue;
	}
	let rename_to = file_renames.get(&file_path).cloned();
	apply_v4a_update(
	file_path,
	deltas,
	rename_to,
	session_context,
	read_file,
	&mut result,
	)
	.await;
	}

The changes made here are mostly targeting the creation and deletion of entire files in one turn.