feat(code): enable branch linking for local tasks#1595
Merged
adboio merged 1 commit intoApr 13, 2026
Conversation
Contributor
Author
This stack of pull requests is managed by Graphite. Learn more about stacking. |
This was referenced Apr 9, 2026
0b99da5 to
920a050
Compare
42b9a45 to
c513b99
Compare
3851b2a to
9deb3b7
Compare
c513b99 to
473e4f5
Compare
jonathanlab
approved these changes
Apr 10, 2026
| const defaultBranch = await getDefaultBranch(folderPath); | ||
| if (branchName === defaultBranch) return; | ||
| } catch { | ||
| // If we can't determine the default branch, still allow linking |
Contributor
There was a problem hiding this comment.
I'm not sure if that's the right choice here. Maybe we can fall back to a more sensible catch all here (e.g. main/master etc) :thinking_face:
Contributor
Author
There was a problem hiding this comment.
good looks, wasn't sure if this was best option... maybe we can just block linking in this case? i expect it'd be rare, i can pop a posthog event here so we can monitor
473e4f5 to
817e5e0
Compare
9deb3b7 to
804359b
Compare
804359b to
ab59a63
Compare
ab59a63 to
75a5057
Compare
Contributor
Author
adboio
added a commit
that referenced
this pull request
Apr 20, 2026
## Problem we want task isolation, but we can only do so much with local tasks, since they are simply not in an isolated environment downstack #1594 + #1595 add automatic branch linking to tasks, so when an agent touches a file, or an agent/human creates a branch from posthog code, we associate that branch to that task now, we need a way to keep the user in the loop on what's happening, and steer them in the right direction <!-- Who is this for and what problem does it solve? --> <!-- Closes #ISSUE_ID --> ## Changes adds a UI warning if you send a prompt in a task that has a linked branch, but that branch is not currently checked out details: - hooks into tiptap with a new `onBeforeSend`so prompt is never lost if you cancel - the warning is "blocking" in the sense that you have to make a decision. you can: - "continue anyway" -> ignore the warning, agent works in your current branch - automatic branch linking will still occur and maybe overwrite the current link, per the standard rules (see #1595 ) - "switch branch" - checks out the task's linked branch - warns if there are uncommitted changes on current branch. this does not block, and surfaces errors from the switch (if any) in the dialog <!-- What did you change and why? --> <!-- If there are frontend changes, include screenshots. --> ## How did you test this? manually <!-- Describe what you tested -- manual steps, automated tests, or both. --> <!-- If you're an agent, only list tests you actually ran. -->
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.

Problem
to build a good task wrap-up flow, we need to know which branch belongs to a given task
Changes
adds automatic branch linking for local tasks. no UI/UX around this yet, nothing uses this data yet, just storing it
agent scenarios:
ui scenarios:
How did you test this?
manually