integration: surface integration branch and tips in gs ll#1255
Open
ed-irl wants to merge 2 commits into
Open
Conversation
This was referenced Jun 12, 2026
Collaborator
Author
This was referenced Jun 12, 2026
Open
dc1dd02 to
b0668b4
Compare
28adf10 to
41432f4
Compare
b0668b4 to
784a6ab
Compare
41432f4 to
2b66da9
Compare
The integration branch was previously invisible to the log commands: users could only learn about it via 'gs integration show'. That made it easy to forget which tips were participating, or to overlook the integration entirely when scanning the stack with 'gs ll'. Show the integration as a standalone top row of 'gs ls' and 'gs ll' (rendered with a magenta '◆' marker and a "[integration: N tips]" annotation), and mark each configured tip in the normal tree with a trailing "[integration-tip]" badge so the relationship reads at a glance. The integration item is wired into the list handler as a synthetic BranchItem with no base and no aboves, then exposed as a separate root in the branchtree graph so it renders before the trunk tree. The JSON output gains an "integration" record on the integration row and an "integrationTip" boolean on tip rows for programmatic consumers. No tree edges are drawn between the integration row and its tips: that fan-in does not fit cleanly into the existing top-down layout and the markers already convey the relationship clearly enough.
6e42b20 to
1df251c
Compare
241a02f to
157630c
Compare
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.
The integration branch was previously invisible to the log commands:
users could only learn about it via 'gs integration show'. That made
it easy to forget which tips were participating, or to overlook the
integration entirely when scanning the stack with 'gs ll'.
Show the integration as a standalone top row of 'gs ls' and 'gs ll'
(rendered with a magenta '◆' marker and a "[integration: N tips]"
annotation), and mark each configured tip in the normal tree with a
trailing "[integration-tip]" badge so the relationship reads at a
glance.
The integration item is wired into the list handler as a synthetic
BranchItem with no base and no aboves, then exposed as a separate
root in the branchtree graph so it renders before the trunk tree.
The JSON output gains an "integration" record on the integration
row and an "integrationTip" boolean on tip rows for programmatic
consumers.
No tree edges are drawn between the integration row and its tips:
that fan-in does not fit cleanly into the existing top-down layout
and the markers already convey the relationship clearly enough.