fix: accept multiple diffs using cmd+shift+enter

[uinstinct]

Description

When using cmd+shift+enter to accept diffs, accept all the diffs generated during multi_edit instead of accepting only the first one.

AI Code Review

• Team members only: AI review runs automatically when PR is opened or marked ready for review
• Team members can also trigger a review by commenting @continue-review

Checklist

• [] I've read the contributing guide
• [] The relevant docs, if any, have been updated or created
• [] The relevant tests, if any, have been updated or created

Screen recording or screenshot

fix.mp4

Tests

[ What tests were added or updated to ensure the changes work as expected? ]

---

Continue Tasks: ▶️ 1 queued — View all

---

Summary by cubic

Cmd+Shift+Enter now accepts all pending diffs in the visible file, not just the first block. Other files with diffs stay open so you can accept them next.

• Bug Fixes
  • Processes one file at a time via processSingleFileDiff; selects the visible/first pending file from VerticalDiffManager.getAllFilesWithDiffs().
  • Keeps remaining diffs visible by setting continue.diffVisible based on leftover handlers; only refocuses input when none remain.
  • Invokes cancelApply only on reject while preserving edit outcome tracking and auto-format detection.

^{Written for commit e343eb5. Summary will update on new commits.}

[cubic-dev-ai]

No issues found across 2 files

[RomneyDa]

@uinstinct I think since you can only see one diff at a time it should only accept the current diff

[uinstinct]

@uinstinct I think since you can only see one diff at a time it should only accept the current diff

implemented!

[cubic-dev-ai]

2 issues found across 2 files (changes from recent commits).

Prompt for AI agents (all issues)

Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="extensions/vscode/src/diff/vertical/manager.ts">

<violation number="1" location="extensions/vscode/src/diff/vertical/manager.ts:159">
P2: The global document change listener is always disposed in clearForfileUri even when other file diffs remain, so multi-file diff tracking stops for remaining files. The listener should only be disabled when no diffs remain.</violation>
</file>

<file name="extensions/vscode/src/diff/processDiff.ts">

<violation number="1" location="extensions/vscode/src/diff/processDiff.ts:102">
P2: Multi-diff acceptance is no longer implemented: the code now selects only the first file from getAllFilesWithDiffs and processes a single diff, which contradicts the PR objective to accept multiple diffs.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

[cubic-dev-ai]

P2: The global document change listener is always disposed in clearForfileUri even when other file diffs remain, so multi-file diff tracking stops for remaining files. The listener should only be disabled when no diffs remain.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At extensions/vscode/src/diff/vertical/manager.ts, line 159:

<comment>The global document change listener is always disposed in clearForfileUri even when other file diffs remain, so multi-file diff tracking stops for remaining files. The listener should only be disabled when no diffs remain.</comment>

<file context>
@@ -156,16 +156,19 @@ export class VerticalDiffManager {
 
     this.disableDocumentChangeListener();
 
+    const hasRemainingDiffs = this.fileUriToHandler.size > 0;
     void vscode.commands.executeCommand(
       "setContext",
</file context>

[cubic-dev-ai]

P2: Multi-diff acceptance is no longer implemented: the code now selects only the first file from getAllFilesWithDiffs and processes a single diff, which contradicts the PR objective to accept multiple diffs.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At extensions/vscode/src/diff/processDiff.ts, line 102:

<comment>Multi-diff acceptance is no longer implemented: the code now selects only the first file from getAllFilesWithDiffs and processes a single diff, which contradicts the PR objective to accept multiple diffs.</comment>

<file context>
@@ -94,31 +94,30 @@ export async function processDiff(
+  if (!fileUriToProcess) {
+    const allFilesWithDiffs = verticalDiffManager.getAllFilesWithDiffs();
+    if (allFilesWithDiffs.length > 0) {
+      fileUriToProcess = allFilesWithDiffs[0].fileUri;
+      streamId = allFilesWithDiffs[0].streamId;
+    }
</file context>