Conversation
…ranches Trails can now be created without a branch (entirehq/entire.io#1306). This adds `entire trail link [trail-id] [--branch <name>]` to link a branchless trail to the current or a named branch, with interactive picker and HTTP 409 handling. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Entire-Checkpoint: 7f24ce489b27
There was a problem hiding this comment.
Pull request overview
Adds a new entire trail link subcommand to associate previously branchless trails with a git branch, supporting the “branches optional on trails” workflow.
Changes:
- Registers
entire trail link [trail-id] [--branch <name>], defaulting to the current branch and offering an interactive picker when no ID is provided. - Updates
trail showandtrail listoutput to display(none)for branchless trails. - Adds explicit handling for HTTP 409 Conflict when a branch is already linked to another trail.
| // PATCH the trail to set the branch | ||
| updateReq := api.TrailUpdateRequest{ | ||
| Branch: &branch, | ||
| } |
There was a problem hiding this comment.
The command help/PR intent says this subcommand links branchless trails, but when a trail ID is provided it unconditionally PATCHes the branch and can effectively re-link an already-linked trail to a new branch. Consider fetching the trail first (GET the trail detail endpoint) and refusing when Trail.Branch is already set (or update the command description/introduce an explicit --force to make re-linking intentional).
| if len(branchless) == 0 { | ||
| fmt.Fprintln(w, "No trails without a branch found.") | ||
| fmt.Fprintln(w, "Use 'entire trail create' to create a new trail, or pass a trail ID directly.") | ||
| return "", NewSilentError(errors.New("no branchless trails")) |
There was a problem hiding this comment.
This path prints an error condition to stdout and then returns SilentError. Other commands print user-facing error messages to cmd.ErrOrStderr() before returning SilentError (e.g., cmd/entire/cli/migrate.go:45-46). Consider writing these messages to stderr (cmd.ErrOrStderr()) so scripts/pipes can distinguish normal output from errors.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Comment @cursor review or bugbot run to trigger another review on this PR
Reviewed by Cursor Bugbot for commit cf07d31. Configure here.
| ), | ||
| ) | ||
| if err := form.Run(); err != nil { | ||
| return "", handleFormCancellation(w, "Trail link", err) |
There was a problem hiding this comment.
Form cancellation proceeds with empty trail ID
Medium Severity
When the user cancels the interactive trail picker (Ctrl+C), handleFormCancellation returns nil (by design, for clean cobra exits). But pickBranchlessTrail returns ("", nil), and the caller runTrailLink only checks err != nil, so it continues with an empty trailID. This causes a PATCH request to an invalid URL (trailing / with no ID), resulting in a confusing API error after the "Trail link cancelled." message. Every other call site uses handleFormCancellation as a direct return from RunE, where returning nil correctly signals a clean exit.
Additional Locations (1)
Reviewed by Cursor Bugbot for commit cf07d31. Configure here.
Summary
entire trail link [trail-id] [--branch <name>]subcommand to link a branchless trail to a git branch (companion to entirehq/entire.io#1306 making branches optional on trails)--branchoverrides. Interactive picker when no trail ID is provided (filters to branchless trails only)trail listandtrail showto display(none)for branchless trails instead of an empty stringTest plan
entire trail link <id>links a branchless trail to the current branchentire trail link <id> --branch feat/foolinks to a named branchentire trail link(no args) shows interactive picker of branchless trailsentire trail listshows(none)for branchless trailsentire trail(show) displaysBranch: (none)for branchless trails🤖 Generated with Claude Code
Note
Medium Risk
Adds a new CLI flow that mutates trail state via PATCH and introduces interactive selection and conflict handling; main risk is incorrect branch selection or unexpected API error handling impacting users’ trails.
Overview
Adds a new
entire trail link [trail-id] [--branch <name>]subcommand to attach a previously branchless trail to a git branch (defaulting to the current branch, with an interactive picker when no ID is provided). The command updates the trail viaPATCHand surfaces HTTP409 Conflictas a clear “branch already linked” error.Updates
traildetail and list output to render branchless trails asBranch: (none)/(none)in the table instead of showing an empty value.Reviewed by Cursor Bugbot for commit cf07d31. Configure here.