- Notifications
You must be signed in to change notification settings - Fork1k
chore: pull in cherry picks for v2.24#18674
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
(cherry picked from commit688d2ee)
(cherry picked from commit8e0b6f8)
(cherry picked from commitfdf458e)
#18574)When no preset is selected:<img width="1097" alt="Screenshot 2025-06-25 at 15 49 51"src="https://github.com/user-attachments/assets/96f1244a-58f1-4e59-b6ac-9319339c764f"/>When a preset is selected:<img width="1097" alt="Screenshot 2025-06-25 at 15 50 00"src="https://github.com/user-attachments/assets/d0853169-ff93-4b1a-beaf-11012a9a02fb"/>Existing frontend stories provide enough validation to cover thisfeature. No further testing is required.---------Co-authored-by: Susana Ferreira <susana@coder.com>(cherry picked from commit634144f)
This PR removes the prebuilds experiment and allows the use of prebuildswithout opting into an experiment.(cherry picked from commitc6e0ba1)
Fixescoder/internal#706Context for the implementation herecoder/internal#706 (comment)Synchronously starts dev containers defined in terraform with our`DevcontainerCLI` abstraction, instead of piggybacking off of our`agentscripts` package. This gives us more control over logs, instead ofbeing reliant on packages which may or may not exist in theuser-provided image.(cherry picked from commitc4e4fe8)
(cherry picked from commit3c4d920)
The incorrect assumption that slugs were unique per-agent was made whenthe subagent API was implemented. Whilst this PR doesn't completelyenforce that, we instead compute a stable hash to prefix the slug thatshould provide a reasonable level of probability that the slug will beunique.(cherry picked from commit6c713d5)
This PR replaces the use of the **container** ID with the**devcontainer** ID. This is a breaking change. This allows rebuilding adevcontainer when there is no valid container ID.(cherry picked from commitf2d229e)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>(cherry picked from commit5ae320e)
This PR makes the devcontainer logs have fewer whitespace lines.(cherry picked from commit98c77fe)
No actual exploit here as far as I can tell, but doing a string checkwithout parsing was flagged by a scanner.(cherry picked from commit05f6d69)
)**Before:****After:**(cherry picked from commit59a6541)
(cherry picked from commit8ee2668)
(cherry picked from commit6d305df)
…API responses (#18640)Previously in#18635 we delayed the containers API `Init` to avoid producingerrors due to Docker and `@devcontainers/cli` not yet being installed by startupscripts. This had an adverse effect on the UX via UI responsiveness as thedetection of devcontainers was greatly delayed.This change splits `Init` into `Init` and `Start` so that we can immediatelyafter `Init` start serving known devcontainers (defined in Terraform), improvingthe UX.Related#18635Related#18640(cherry picked from commit0f3a1e9)
**Demo:**https://github.com/user-attachments/assets/cc80b768-197e-42a0-9326-f30c9d9038e3(cherry picked from commit8eebb4f)
When creating a new task, the following error was getting returned:**Error:**```json{ "message": "Validation failed.", "validations": [ { "field": "template_id", "detail": "Validation failed for tag \"excluded_with\" with value: \"42205a38-845c-4186-8475-f002e0936d53\"" }, { "field": "template_version_id", "detail": "Validation failed for tag \"excluded_with\" with value: \"22b1c4b7-432d-4eb5-9341-cd8efacb8f46\"" } ]}```Caused by#18623(cherry picked from commit4095330)
(cherry picked from commitf89e057)
sreya approved these changesJun 30, 2025
Previously, we displayed apps in iframes on the task page withoutwaiting for them to initialize. This would result in 502 errors shown tothe user. This PR makes sure that we only display the app after itinitializes.### Before<img width="1920" alt="Screenshot 2025-06-30 at 14 59 07 (2)"src="https://github.com/user-attachments/assets/63564ac9-abce-4a0c-b58e-b988772fae82"/>(cherry picked from commit22c5e84)
We were discarding all "working" updates from the screen watcher becausewe cannot tell the difference between the agent or user changing thescreen, but it makes sense to accept it as the very first update,because the agent could be working but neglected to report that fact, soyou would never get an initial "working" update (it would justeventually go straight to "idle").Also messages can start at zero, so I made a fix for that as well,although the first message will be from the LLM and we ignorethose anyway, so this probably has no actual effect, but seems moretechnically correct.And it seems I forgot to actually update the last message ID, whichalso does not actually matter for user messages (since I think theSSE endpoint will not re-emit a user message it has already emitted),but seems more technically correct to check.Lastly, if we have the screen watcher, ignore the agent's self-reportedstate and always use "working" since it is unreliable. The idle state willeventually be caught by the watcher.(cherry picked from commitfc7700a)
When the workspace is off, we set a disabled text/stroke color, but forthe idle icon that also needs a fill, this only changed the outlinemaking it look weird. Instead, move the disabled logic into thecomponent so we can apply a matching fill.I felt it looked too thick with both the outline and fill, so I alsoremoved the outline.Really I think maybe the workspace status should be a separate columnrather than disabling these icons, but this maintains the status quo.Before with mismatching stroke and fill color:After with disabled fill and stroke removal:Enabled fill and stroke removal:(cherry picked from commit48bb534)
…es (#18689)## DescriptionThis PR adds a warning to the prebuilds documentation aboutincompatibility with Workspace schedule (autostart/autostop), dormancy,and DevContainers. These configurations can interfere with prebuildbehavior and should be avoided for now.Preview:(cherry picked from commit57a6d59)
e5a74a7
intorelease/2.24 30 of 32 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pulling in cherry picks for v2.24.
https://www.notion.so/coderhq/Cherry-Picks-2-24-0-222d579be59280329d10dd27d7e1b3fc?showMoveTo=true&saveParent=true