Skip to content

feat(code): add linked branch db model#1594

Merged
adboio merged 1 commit into
mainfrom
04-09-feat_code_add_linked_branch_db_model
Apr 10, 2026
Merged

feat(code): add linked branch db model#1594
adboio merged 1 commit into
mainfrom
04-09-feat_code_add_linked_branch_db_model

Conversation

@adboio
Copy link
Copy Markdown
Contributor

@adboio adboio commented Apr 9, 2026

Problem

there is no persistent store that says "this task belongs to this branch"

this makes it very difficult to build a good UX around the end-of-task workflow

Changes

adds infra for a new linkedBranch field on the workspace model

no behavior changes in this PR, just setting things up

How did you test this?

manually (upstack)

Copy link
Copy Markdown
Contributor Author

adboio commented Apr 9, 2026

@adboio adboio requested a review from a team April 9, 2026 18:20
@adboio adboio marked this pull request as ready for review April 9, 2026 18:21
@adboio adboio force-pushed the 04-09-feat_code_add_linked_branch_db_model branch 2 times, most recently from 42b9a45 to c513b99 Compare April 9, 2026 18:36
@adboio adboio force-pushed the 04-09-feat_code_add_linked_branch_db_model branch from c513b99 to 473e4f5 Compare April 9, 2026 18:37
@adboio adboio merged commit 817e5e0 into main Apr 10, 2026
16 checks passed
@adboio adboio deleted the 04-09-feat_code_add_linked_branch_db_model branch April 10, 2026 15:35
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. -->
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.

2 participants