[Feature]: Upstream merge from 34cef6202b6c2eb0594df0eca412b36daf819ba2

[ashvinnihalani]

Before submitting

• I searched existing issues and did not find a duplicate.
• I am describing a concrete problem or use case, not just a vague idea.

Area

Not sure

Problem or use case

Issue tracking upstream rebase from 34cef62. Notable pingdotgg/t3code#179 has been included so we need to make sure our Kiro-CLI/remote functionality aligns with this.

Proposed solution

1. Refactor our existing Kiro CLI solution to align with the Claude Code solution
2. Run through the refactor

Why this matters

Don't want to create a long living fork

Smallest useful scope

N/A

Alternatives considered

No response

Risks or tradeoffs

No response

Examples or references

No response

Contribution

• I would be open to helping implement this.

[ashvinnihalani]

Prompt given the Codex 5.4 fast:

Cherry-pick each of the upstream only commits. Each cherry-pick should loop the following:

View the diff and the forks modification. Make a deciion if the commit materially changes any of my implementation details
If it does not, apply the cherry-pick, fix minor conflicts run through all the forks test to make sure there are no regreesions
If it does, apply the cherry-pick, fix minor confits, and then stage another commit changing the implementation to match the upstream
If any of the tests fail, immediaitly stop and fix that commit

If there are any commits that are same feature different plumbing, resolve in favor of upstream. The goal is to mimize the drift from upstream