Skip to content

cancel token #309936

Merged
meganrogge merged 2 commits intomainfrom
merogge/cts
Apr 14, 2026
Merged

cancel token #309936
meganrogge merged 2 commits intomainfrom
merogge/cts

Conversation

@meganrogge
Copy link
Copy Markdown
Collaborator

fix #309362

Copilot AI review requested due to automatic review settings April 14, 2026 18:37
@meganrogge meganrogge self-assigned this Apr 14, 2026
@meganrogge meganrogge added this to the 1.117.0 milestone Apr 14, 2026
@meganrogge meganrogge enabled auto-merge (squash) April 14, 2026 18:38
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

This PR updates terminal chat output monitoring to ensure an in-progress monitoring loop is properly cancelled before starting a new one, addressing issue #309362.

Changes:

  • Ensure any existing monitoring run is cancelled (so waiting promises can resolve) before starting a new monitoring loop.
  • Update comments to explain why cancellation is needed prior to disposal.
Show a summary per file
File Description
src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts Cancels/disposes an existing monitoring CTS before creating a new one to avoid concurrent monitoring loops.

Copilot's findings

  • Files reviewed: 1/1 changed files
  • Comments generated: 2

…r/tools/monitoring/outputMonitor.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

Screenshot Changes

Base: 5709736b Current: 0239a82d

Changed (3)

chat/aiCustomizations/aiCustomizationManagementEditor/PromptsTabScrolled/Light
Before After
before after
chat/aiCustomizations/aiCustomizationManagementEditor/McpBrowseMode/Light
Before After
before after
editor/inlineCompletions/other/JumpToHint/Dark
Before After
before after

@meganrogge meganrogge merged commit a96ed32 into main Apr 14, 2026
26 checks passed
@meganrogge meganrogge deleted the merogge/cts branch April 14, 2026 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

OutputMonitor.continueMonitoringAsync does not cancel the previous monitoring run before starting a new one

3 participants