Skip to content

Fix apply cancellation and make slash commands cancelable #5907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 19, 2025

Conversation

RomneyDa
Copy link
Collaborator

#5694 was intended to make apply cancelable but only worked for jetbrains because of how it was set up.
This PR fixes for VS Code
It also passes abort controllers to slash commands to make them cancelable as well.

@RomneyDa RomneyDa requested a review from a team as a code owner May 29, 2025 20:49
@RomneyDa RomneyDa requested review from sestinj and removed request for a team May 29, 2025 20:49
Copy link

cubic-dev-ai bot commented May 29, 2025

Your cubic subscription is currently inactive. Please reactivate your subscription to receive AI reviews and use cubic.

Copy link

netlify bot commented May 29, 2025

Deploy Preview for continuedev ready!

Name Link
🔨 Latest commit ae97f1d
🔍 Latest deploy log https://app.netlify.com/projects/continuedev/deploys/6852fc5adfbd7800080f10aa
😎 Deploy Preview https://deploy-preview-5907--continuedev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label May 29, 2025
@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels May 29, 2025
@chezsmithy
Copy link
Contributor

@RomneyDa thank you for all your amazing work on solving for being able to cancel various pieces of the experience. I closed my cancel button fix. Noting that my only remaining issue appears to be cancelling "thinking/reasoning" and ending up with unmatched messages in the history.

Copy link
Contributor

@sestinj sestinj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know most of this is just passing around abortController / signal, but at least some part of this should get locked down with a test. otherwise just feels like setting up for whack-a-mole

Proposed one for the keyboard shortcut in the GUI

@@ -139,7 +139,7 @@ export function Chat() {
!e.shiftKey
) {
dispatch(cancelStream());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this would be a quick and high-value thing to test. There's already a setup for the Chat.tsx component in vitest I think, and would just want to spy on ideMessenger to make sure that it calls post("rejectDiff", ...).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added!

@github-project-automation github-project-automation bot moved this from Todo to In Progress in Issues and PRs Jun 1, 2025
Copy link

recurseml bot commented Jun 13, 2025

⚠️ Only 5 files will be analyzed due to processing limits.

Copy link

recurseml bot commented Jun 13, 2025

😱 Found 2 issues. Time to roll up your sleeves! 😱

Copy link
Contributor

@sestinj sestinj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great PR

Moving the inline method out of commands.ts and the test both

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jun 19, 2025
@sestinj sestinj merged commit cf54304 into main Jun 19, 2025
66 of 68 checks passed
@sestinj sestinj deleted the dallin/cancelable-apply-2 branch June 19, 2025 07:03
@github-project-automation github-project-automation bot moved this from In Progress to Done in Issues and PRs Jun 19, 2025
@github-actions github-actions bot locked and limited conversation to collaborators Jun 19, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm This PR has been approved by a maintainer size:L This PR changes 100-499 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants