X Tutup
Skip to content

fix(cli): revert #21583#22000

Merged
johnstcn merged 1 commit intomainfrom
cj/revert/21583
Feb 9, 2026
Merged

fix(cli): revert #21583#22000
johnstcn merged 1 commit intomainfrom
cj/revert/21583

Conversation

@johnstcn
Copy link
Member

@johnstcn johnstcn commented Feb 9, 2026

Relates to coder/internal#1217

This reverts commit f799cba.

@deansheather reported that this breaks ControlMaster.

Investigating alternative fixes to coder/internal#1217

… dies (#21583)"

This reverts commit f799cba.

@deansheather reported that this breaks ControlMaster.

Investigating alternative fixes to coder/internal#1217
@johnstcn johnstcn requested a review from deansheather February 9, 2026 09:38
@johnstcn johnstcn self-assigned this Feb 9, 2026
Copilot AI review requested due to automatic review settings February 9, 2026 09:38
Copy link
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

Reverts the previously introduced parent-process monitoring for coder ssh --stdio, restoring prior behavior due to reported breakage with SSH ControlMaster.

Changes:

  • Removes parent PID polling/cancelation logic for --stdio mode from cli/ssh.go.
  • Removes the hidden --test.force-ppid flag used to simulate parent PID exit behavior.
  • Deletes the associated integration/unit tests that asserted stdio exit-on-parent-death behavior.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
cli/ssh.go Reverts stdio parent-death monitoring, removes the test-only flag, and deletes watchParentContext.
cli/ssh_test.go Removes the integration test covering stdio exit when the parent process dies.
cli/ssh_internal_test.go Removes unit tests for watchParentContext (function removed in revert).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@johnstcn johnstcn changed the title Revert "fix(cli): allow coder ssh --stdio to exit when parent process dies (#21583)" fix(cli): revert #21583 Feb 9, 2026
@johnstcn johnstcn merged commit 93b0007 into main Feb 9, 2026
44 checks passed
@johnstcn johnstcn deleted the cj/revert/21583 branch February 9, 2026 09:56
@github-actions github-actions bot locked and limited conversation to collaborators Feb 9, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

X Tutup