* feat(github): sync epic/child and blocks relationships to GitHub bd github sync only ever pushed issue content (title/body/labels/state); Epic-child links and beads "blocks" dependencies never reached GitHub's relationships panel. Adds a GitHub relationship-sync pass, mirroring the existing GitLab dependency-link push, using GitHub's sub-issues and issue dependencies REST APIs: - internal/github/client.go: AddSubIssue/ListSubIssues and AddBlockedBy/ListBlockedBy against GitHub's sub_issues and dependencies/blocked_by endpoints. - internal/github/links.go: DependencyLink + LinkResolver, converting beads epic/child parent-child dependencies into GitHub sub-issues and beads "blocks" dependencies into GitHub blocked_by relationships. Idempotent (lists current relationships before creating) and additive (stale remote relationships are left untouched). - cmd/bd/github.go, cmd/bd/sync_push_pull.go: wires the push pass into both `bd github sync` and `bd github push`. Verified against a live GitHub repo (create, list, and idempotent re-push all confirmed via the real API), in addition to httptest-mocked unit tests. Fixes gastownhall/beads#5970 * fix(github): update last_sync after relationship push to prevent sync churn When AddSubIssue or AddBlockedBy is called, GitHub updates the issue's updated_at timestamp as a side effect. Without updating last_sync after the relationship push completes, the next sync would see those issues as 'changed' and pull/push them again, causing unnecessary churn. This fix updates last_sync to the current time after a successful relationship push (only if links were created), accounting for any timestamp changes GitHub made during relationship creation. Fixes continuous sync churn observed when running bd github sync multiple times with no local changes. * fix(github): use relationship reader for link sync * fix(bazel): enumerate links.go and its tests in internal/github BUILD.bazel The base advance added internal/github/BUILD.bazel with explicitly enumerated srcs (gazelle-generated). This PR adds links.go, links_test.go and review_fixes_test.go, which the base-generated enumeration cannot know about, so //internal/github:github failed to build: internal/github/tracker.go:41:35: undefined: LinkResolver internal/github/tracker.go:244:30: undefined: RefScope Regenerated with `bazel run //:gazelle` (not hand-edited). Purely additive; no deps change is needed because links.go only imports //internal/types, already declared. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(github): scope the relationship pass to --parent and report skipped links Maintainer review fixup for PR #5971, adopt-pr review iterations 1 and 3. filterGitHubLinkScopedIssues reimplemented four of the SyncOptions selectors and dropped ParentID, so `bd github sync --push --parent X` narrowed the content push to the subtree and then created GitHub sub-issue and blocked-by links for every GitHub-linked issue in the workspace -- outward API writes on issues the user had excluded. It now resolves the subtree and requires membership in it. The traversal moves from gitlab.go to sync_flags.go as buildSyncDescendantSet, beside the --parent flag that populates the field, and the GitLab and GitHub link passes share the one copy. The doc comments that claimed parity with the engine's push loop now enumerate the selectors this path actually applies, and name the three it does not (State, ExcludeIDPrefix, ExcludeIDPatterns -- no GitHub command sets them today). PushLinkResult.UnsupportedSkipped had no reader anywhere in the repo, so a host without the sub-issue/dependency APIs reported nothing at all. pushGitHubDependencyLinks now emits one curated line for it, and a 404 on the source issue is classified apart from a 404 on the relationship endpoint: collapsing the two reported a deleted, renumbered or permission-hidden issue as an unsupported host. The classifying probe is memoized per issue number, so a source carrying both link types costs one extra read. `bd github push --dry-run` printed "Synced N relationship links" for links it had only planned, because PushLinks counts planned links in Created. The `bd github sync` twin already gated that line on its dry-run flag; the push side now does too. Tests: a table test over filterGitHubLinkScopedIssues with a row per selector -- its three ParentID rows fail without the scope fix -- plus a direct pin that a blocks-edge dependent is not a descendant, and httptest cases driving 404 through the list call, the create call and the source-issue probe. Not fixed here: the PR body still describes a `lastSync` advance that commit ee6d65692 removed from this PR. That is a PR-surface edit, not a code change, and is left to the finalize step. Also not fixed here, and named in buildSyncDescendantSet's doc comment so the shared helper does not read as covering every tracker: the ADO link pass has the same scope hole this commit closes for GitHub. pushADOLinks takes no sync options, so `bd ado sync --push --parent X` still writes ADO relations for the whole workspace. That predates this PR, and ADO is outside its diff. Agent-Signature: claude-code-claude-opus-5-5-max on behalf of Gas City Adopt-PR Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Julian Knutsen <julian@gastownhall.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Gas City Adopt-PR <adopt-pr@gascity.local>
948 lines
26 KiB
Go
948 lines
26 KiB
Go
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/steveyegge/beads/internal/ado"
|
|
"github.com/steveyegge/beads/internal/beads"
|
|
"github.com/steveyegge/beads/internal/github"
|
|
"github.com/steveyegge/beads/internal/gitlab"
|
|
"github.com/steveyegge/beads/internal/jira"
|
|
"github.com/steveyegge/beads/internal/linear"
|
|
"github.com/steveyegge/beads/internal/metrics"
|
|
"github.com/steveyegge/beads/internal/notion"
|
|
"github.com/steveyegge/beads/internal/tracker"
|
|
)
|
|
|
|
// trackerPushPullFlags holds shared flags for push/pull subcommands.
|
|
type trackerPushPullFlags struct {
|
|
dryRun bool
|
|
}
|
|
|
|
// --- ADO push/pull ---
|
|
|
|
var adoPushCmd = &cobra.Command{
|
|
Use: "push [bead-ids...]",
|
|
Short: "Push specific beads to Azure DevOps",
|
|
Long: `Push one or more beads issues to Azure DevOps.
|
|
|
|
Accepts bead IDs as positional arguments.
|
|
Equivalent to: bd ado sync --push-only --issues <ids>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runADOPush,
|
|
}
|
|
|
|
var adoPullCmd = &cobra.Command{
|
|
Use: "pull [refs...]",
|
|
Short: "Pull specific items from Azure DevOps",
|
|
Long: `Pull one or more items from Azure DevOps.
|
|
|
|
Accepts bead IDs or external references as positional arguments.
|
|
Equivalent to: bd ado sync --pull-only --issues <refs>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runADOPull,
|
|
}
|
|
|
|
// --- Jira push/pull ---
|
|
|
|
var jiraPushCmd = &cobra.Command{
|
|
Use: "push [bead-ids...]",
|
|
Short: "Push specific beads to Jira",
|
|
Long: `Push one or more beads issues to Jira.
|
|
|
|
Accepts bead IDs as positional arguments.
|
|
Equivalent to: bd jira sync --push --issues <ids>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runJiraPush,
|
|
}
|
|
|
|
var jiraPullCmd = &cobra.Command{
|
|
Use: "pull [refs...]",
|
|
Short: "Pull specific items from Jira",
|
|
Long: `Pull one or more items from Jira.
|
|
|
|
Accepts bead IDs or external references as positional arguments.
|
|
Equivalent to: bd jira sync --pull --issues <refs>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runJiraPull,
|
|
}
|
|
|
|
// --- Linear push/pull ---
|
|
|
|
var linearPushCmd = &cobra.Command{
|
|
Use: "push [bead-ids...]",
|
|
Short: "Push specific beads to Linear",
|
|
Long: `Push one or more beads issues to Linear.
|
|
|
|
Accepts bead IDs as positional arguments.
|
|
Equivalent to: bd linear sync --push --issues <ids>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runLinearPush,
|
|
}
|
|
|
|
var linearPullCmd = &cobra.Command{
|
|
Use: "pull [refs...]",
|
|
Short: "Pull specific items from Linear",
|
|
Long: `Pull one or more items from Linear.
|
|
|
|
Accepts bead IDs or external references as positional arguments.
|
|
Equivalent to: bd linear sync --pull --issues <refs>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runLinearPull,
|
|
}
|
|
|
|
// --- GitHub push/pull ---
|
|
|
|
var githubPushCmd = &cobra.Command{
|
|
Use: "push [bead-ids...]",
|
|
Short: "Push specific beads to GitHub",
|
|
Long: `Push one or more beads issues to GitHub.
|
|
|
|
Accepts bead IDs as positional arguments.
|
|
Equivalent to: bd github sync --push-only --issues <ids>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runGitHubPush,
|
|
}
|
|
|
|
var githubPullCmd = &cobra.Command{
|
|
Use: "pull [refs...]",
|
|
Short: "Pull specific items from GitHub",
|
|
Long: `Pull one or more items from GitHub.
|
|
|
|
Accepts bead IDs or external references as positional arguments.
|
|
Equivalent to: bd github sync --pull-only --issues <refs>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runGitHubPull,
|
|
}
|
|
|
|
// --- GitLab push/pull ---
|
|
|
|
var gitlabPushCmd = &cobra.Command{
|
|
Use: "push [bead-ids...]",
|
|
Short: "Push specific beads to GitLab",
|
|
Long: `Push one or more beads issues to GitLab.
|
|
|
|
Accepts bead IDs as positional arguments.
|
|
Equivalent to: bd gitlab sync --push-only --issues <ids>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runGitLabPush,
|
|
}
|
|
|
|
var gitlabPullCmd = &cobra.Command{
|
|
Use: "pull [refs...]",
|
|
Short: "Pull specific items from GitLab",
|
|
Long: `Pull one or more items from GitLab.
|
|
|
|
Accepts bead IDs or external references as positional arguments.
|
|
Equivalent to: bd gitlab sync --pull-only --issues <refs>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runGitLabPull,
|
|
}
|
|
|
|
// --- Notion push/pull ---
|
|
|
|
var notionPushCmd = &cobra.Command{
|
|
Use: "push [bead-ids...]",
|
|
Short: "Push specific beads to Notion",
|
|
Long: `Push one or more beads issues to Notion.
|
|
|
|
Accepts bead IDs as positional arguments.
|
|
Equivalent to: bd notion sync --push --issues <ids>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runNotionPush,
|
|
}
|
|
|
|
var notionPullCmd = &cobra.Command{
|
|
Use: "pull [refs...]",
|
|
Short: "Pull specific items from Notion",
|
|
Long: `Pull one or more items from Notion.
|
|
|
|
Accepts bead IDs or external references as positional arguments.
|
|
Equivalent to: bd notion sync --pull --issues <refs>`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: runNotionPull,
|
|
}
|
|
|
|
func init() {
|
|
// ADO push/pull
|
|
adoPushCmd.Flags().Bool("dry-run", false, "Preview push without making changes")
|
|
adoPullCmd.Flags().Bool("dry-run", false, "Preview pull without making changes")
|
|
adoCmd.AddCommand(adoPushCmd)
|
|
adoCmd.AddCommand(adoPullCmd)
|
|
|
|
// Jira push/pull
|
|
jiraPushCmd.Flags().Bool("dry-run", false, "Preview push without making changes")
|
|
jiraPullCmd.Flags().Bool("dry-run", false, "Preview pull without making changes")
|
|
jiraCmd.AddCommand(jiraPushCmd)
|
|
jiraCmd.AddCommand(jiraPullCmd)
|
|
|
|
// Linear push/pull
|
|
linearPushCmd.Flags().Bool("dry-run", false, "Preview push without making changes")
|
|
linearPullCmd.Flags().Bool("dry-run", false, "Preview pull without making changes")
|
|
linearPullCmd.Flags().Bool("relations", false, "Import Linear relations as bd dependencies when pulling")
|
|
linearCmd.AddCommand(linearPushCmd)
|
|
linearCmd.AddCommand(linearPullCmd)
|
|
|
|
// GitHub push/pull
|
|
githubPushCmd.Flags().Bool("dry-run", false, "Preview push without making changes")
|
|
githubPullCmd.Flags().Bool("dry-run", false, "Preview pull without making changes")
|
|
githubCmd.AddCommand(githubPushCmd)
|
|
githubCmd.AddCommand(githubPullCmd)
|
|
|
|
// GitLab push/pull
|
|
gitlabPushCmd.Flags().Bool("dry-run", false, "Preview push without making changes")
|
|
gitlabPullCmd.Flags().Bool("dry-run", false, "Preview pull without making changes")
|
|
gitlabCmd.AddCommand(gitlabPushCmd)
|
|
gitlabCmd.AddCommand(gitlabPullCmd)
|
|
|
|
// Notion push/pull
|
|
notionPushCmd.Flags().Bool("dry-run", false, "Preview push without making changes")
|
|
notionPullCmd.Flags().Bool("dry-run", false, "Preview pull without making changes")
|
|
notionCmd.AddCommand(notionPushCmd)
|
|
notionCmd.AddCommand(notionPullCmd)
|
|
}
|
|
|
|
// outputSyncResult writes sync results as JSON or human-readable text.
|
|
func outputSyncResult(result *tracker.SyncResult, dryRun bool) {
|
|
if jsonOutput {
|
|
enc := json.NewEncoder(os.Stdout)
|
|
enc.SetIndent("", " ")
|
|
_ = enc.Encode(result)
|
|
return
|
|
}
|
|
if dryRun {
|
|
fmt.Println("Dry run mode - no changes will be made")
|
|
}
|
|
if result.Stats.Pulled > 0 {
|
|
fmt.Printf("✓ Pulled %d issues (%d created, %d updated)\n",
|
|
result.Stats.Pulled, result.Stats.Created, result.Stats.Updated)
|
|
}
|
|
if result.Stats.Pushed > 0 {
|
|
fmt.Printf("✓ Pushed %d issues\n", result.Stats.Pushed)
|
|
}
|
|
if dryRun {
|
|
fmt.Println("\nRun without --dry-run to apply changes")
|
|
}
|
|
}
|
|
|
|
// --- ADO implementations ---
|
|
|
|
func runADOPush(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("ado-push")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("ado push")
|
|
}
|
|
|
|
cfg := getADOConfig()
|
|
if err := validateADOConfig(cfg); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
at := &ado.Tracker{}
|
|
if err := at.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing Azure DevOps tracker: %w", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(at, store, actor)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Push: true,
|
|
Pull: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
func runADOPull(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("ado-pull")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID or external reference is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("ado pull")
|
|
}
|
|
|
|
cfg := getADOConfig()
|
|
if err := validateADOConfig(cfg); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
at := &ado.Tracker{}
|
|
if err := at.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing Azure DevOps tracker: %w", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(at, store, actor)
|
|
engine.PullHooks = buildADOPullHooks(ctx, at, false, false, new(int), engine.OnWarning)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Pull: true,
|
|
Push: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
// --- Jira implementations ---
|
|
|
|
func runJiraPush(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("jira-push")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return HandleError("at least one bead ID is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("jira push")
|
|
}
|
|
|
|
trackerStore, err := trackerStoreForCommand(rootCtx)
|
|
if err != nil {
|
|
return HandleError("database not available: %v", err)
|
|
}
|
|
if err := validateJiraConfigForStore(trackerStore); err != nil {
|
|
return HandleError("%v", err)
|
|
}
|
|
|
|
ctx := rootCtx
|
|
jt := &jira.Tracker{}
|
|
if err := jt.Init(ctx, trackerStore); err != nil {
|
|
return HandleError("initializing Jira tracker: %v", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(jt, trackerStore, actor)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
engine.PushHooks = buildJiraPushHooksForStore(ctx, trackerStore)
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Push: true,
|
|
Pull: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
})
|
|
if err != nil {
|
|
return HandleError("sync failed: %v", err)
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
func runJiraPull(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("jira-pull")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return HandleError("at least one bead ID or external reference is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("jira pull")
|
|
}
|
|
|
|
trackerStore, err := trackerStoreForCommand(rootCtx)
|
|
if err != nil {
|
|
return HandleError("database not available: %v", err)
|
|
}
|
|
if err := validateJiraConfigForStore(trackerStore); err != nil {
|
|
return HandleError("%v", err)
|
|
}
|
|
|
|
ctx := rootCtx
|
|
jt := &jira.Tracker{}
|
|
if err := jt.Init(ctx, trackerStore); err != nil {
|
|
return HandleError("initializing Jira tracker: %v", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(jt, trackerStore, actor)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Pull: true,
|
|
Push: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
})
|
|
if err != nil {
|
|
return HandleError("sync failed: %v", err)
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
// --- Linear implementations ---
|
|
|
|
func runLinearPush(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("linear-push")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return HandleError("at least one bead ID is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("linear push")
|
|
}
|
|
|
|
if lockDir := beads.FindBeadsDir(); lockDir != "" {
|
|
syncLock, err := linear.AcquireSyncLock(lockDir, true)
|
|
if err != nil {
|
|
return HandleError("acquiring sync lock: %v", err)
|
|
}
|
|
defer func() {
|
|
if err := syncLock.Release(); err != nil {
|
|
fmt.Fprintf(os.Stderr, "Warning: failed to release sync lock: %v\n", err)
|
|
}
|
|
}()
|
|
}
|
|
|
|
trackerStore, err := trackerStoreForCommand(rootCtx)
|
|
if err != nil {
|
|
return HandleError("database not available: %v", err)
|
|
}
|
|
if err := validateLinearConfigForStore(trackerStore, nil); err != nil {
|
|
return HandleError("%v", err)
|
|
}
|
|
|
|
ctx := rootCtx
|
|
teamIDs := getLinearTeamIDsForStore(ctx, trackerStore, nil)
|
|
if len(teamIDs) > 1 {
|
|
return HandleError("linear push does not support multiple configured teams\nUse: bd linear sync --push --team <TEAM_ID>")
|
|
}
|
|
|
|
lt := &linear.Tracker{}
|
|
lt.SetTeamIDs(teamIDs)
|
|
if err := lt.Init(ctx, trackerStore); err != nil {
|
|
return HandleError("initializing Linear tracker: %v", err)
|
|
}
|
|
if err := lt.ValidatePushStateMappings(ctx); err != nil {
|
|
return HandleError("%v", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(lt, trackerStore, actor)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
engine.PushHooks = buildLinearPushHooksForStore(ctx, trackerStore, lt, len(args) > 0)
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Push: true,
|
|
Pull: false,
|
|
DryRun: dryRun,
|
|
ExcludeEphemeral: true,
|
|
IssueIDs: args,
|
|
})
|
|
if err != nil {
|
|
return HandleError("sync failed: %v", err)
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
func runLinearPull(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("linear-pull")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return HandleError("at least one bead ID or external reference is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
relations, _ := cmd.Flags().GetBool("relations")
|
|
if !dryRun {
|
|
CheckReadonly("linear pull")
|
|
}
|
|
|
|
if lockDir := beads.FindBeadsDir(); lockDir != "" {
|
|
syncLock, err := linear.AcquireSyncLock(lockDir, true)
|
|
if err != nil {
|
|
return HandleError("acquiring sync lock: %v", err)
|
|
}
|
|
defer func() {
|
|
if err := syncLock.Release(); err != nil {
|
|
fmt.Fprintf(os.Stderr, "Warning: failed to release sync lock: %v\n", err)
|
|
}
|
|
}()
|
|
}
|
|
|
|
trackerStore, err := trackerStoreForCommand(rootCtx)
|
|
if err != nil {
|
|
return HandleError("database not available: %v", err)
|
|
}
|
|
if err := validateLinearConfigForStore(trackerStore, nil); err != nil {
|
|
return HandleError("%v", err)
|
|
}
|
|
|
|
ctx := rootCtx
|
|
teamIDs := getLinearTeamIDsForStore(ctx, trackerStore, nil)
|
|
|
|
lt := &linear.Tracker{}
|
|
lt.SetTeamIDs(teamIDs)
|
|
if err := lt.Init(ctx, trackerStore); err != nil {
|
|
return HandleError("initializing Linear tracker: %v", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(lt, trackerStore, actor)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
engine.PullHooks = buildLinearPullHooksForStore(ctx, trackerStore, linearPullHookOptions{
|
|
DryRun: dryRun,
|
|
Actor: actor,
|
|
})
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Pull: true,
|
|
Push: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
DependencySources: linearPullDependencySources(relations),
|
|
})
|
|
if err != nil {
|
|
return HandleError("sync failed: %v", err)
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
// --- GitHub implementations ---
|
|
|
|
func runGitHubPush(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("github-push")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("github push")
|
|
}
|
|
|
|
config := getGitHubConfig()
|
|
if err := validateGitHubConfig(config); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
gt := &github.Tracker{}
|
|
if err := gt.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing GitHub tracker: %w", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(gt, store, actor)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
engine.PushHooks = buildGitHubPushHooks(gt)
|
|
|
|
opts := tracker.SyncOptions{
|
|
Push: true,
|
|
Pull: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
}
|
|
result, err := engine.Sync(ctx, opts)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Relationship push pass, matching `bd github sync`: converge beads
|
|
// epic/child links and "blocks" dependencies among the requested issues
|
|
// into GitHub sub-issues and issue dependencies.
|
|
warnLink := func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
linksPushed := pushGitHubDependencyLinks(ctx, gt, store, opts, dryRun, os.Stdout, warnLink)
|
|
// Under --dry-run PushLinks counts planned links in Created, so this line
|
|
// would affirm writes that never happened; the `bd github sync` twin gates
|
|
// it the same way.
|
|
if linksPushed > 0 && !dryRun && !jsonOutput {
|
|
fmt.Printf("✓ Synced %d relationship links\n", linksPushed)
|
|
}
|
|
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
func runGitHubPull(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("github-pull")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID or external reference is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("github pull")
|
|
}
|
|
|
|
config := getGitHubConfig()
|
|
if err := validateGitHubConfig(config); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
gt := &github.Tracker{}
|
|
if err := gt.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing GitHub tracker: %w", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(gt, store, actor)
|
|
engine.PullHooks = buildGitHubPullHooks(ctx)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Pull: true,
|
|
Push: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
// --- GitLab implementations ---
|
|
|
|
func runGitLabPush(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("gitlab-push")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("gitlab push")
|
|
}
|
|
|
|
config := getGitLabConfig()
|
|
if err := validateGitLabConfig(config); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
gt := &gitlab.Tracker{}
|
|
if err := gt.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing GitLab tracker: %w", err)
|
|
}
|
|
|
|
out := cmd.OutOrStdout()
|
|
engine := tracker.NewEngine(gt, store, actor)
|
|
engine.OnMessage = func(msg string) {
|
|
if !jsonOutput {
|
|
fmt.Fprintln(out, " "+msg)
|
|
}
|
|
}
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
engine.PushHooks = buildGitLabPushHooks()
|
|
|
|
if dryRun && !jsonOutput {
|
|
fmt.Fprintln(out, "Dry run mode - no changes will be made")
|
|
fmt.Fprintln(out)
|
|
}
|
|
|
|
opts := tracker.SyncOptions{
|
|
Push: true,
|
|
Pull: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
}
|
|
result, err := engine.Sync(ctx, opts)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Dependency-link push parity with `bd gitlab sync`: converge beads
|
|
// dependencies among the requested issues into GitLab issue links (and
|
|
// repair epic-child milestones). Without this, `bd gitlab push <ids>`
|
|
// would sync content but silently omit dependency links. Output is
|
|
// rendered here (rather than via outputSyncResult) so the link pass runs
|
|
// before the summary and the --json payload carries the link counts,
|
|
// matching bd gitlab sync.
|
|
var linkWarnings []string
|
|
warnLink := func(msg string) {
|
|
linkWarnings = append(linkWarnings, msg)
|
|
fmt.Fprintf(os.Stderr, "Warning: %s\n", msg)
|
|
}
|
|
linksPushed, linksLicenseSkipped, milestonesUpdated := pushGitLabDependencyLinks(ctx, gt, store, opts, dryRun, out, warnLink)
|
|
|
|
if jsonOutput {
|
|
return outputJSON(gitlabSyncResult{
|
|
DryRun: dryRun,
|
|
Pushed: result.Stats.Pushed,
|
|
Created: result.Stats.Created,
|
|
Updated: result.Stats.Updated,
|
|
Skipped: result.Stats.Skipped,
|
|
Conflicts: result.Stats.Conflicts,
|
|
Errors: result.Stats.Errors,
|
|
LinksPushed: linksPushed,
|
|
LinksLicenseSkipped: linksLicenseSkipped,
|
|
MilestonesUpdated: milestonesUpdated,
|
|
Warnings: append(result.Warnings, linkWarnings...),
|
|
})
|
|
}
|
|
|
|
if dryRun {
|
|
fmt.Fprintln(out)
|
|
fmt.Fprintln(out, "Run without --dry-run to apply changes")
|
|
return nil
|
|
}
|
|
if result.Stats.Pushed > 0 {
|
|
fmt.Fprintf(out, "✓ Pushed %d issues\n", result.Stats.Pushed)
|
|
}
|
|
if linksPushed > 0 {
|
|
fmt.Fprintf(out, "✓ Synced %d dependency links\n", linksPushed)
|
|
}
|
|
if result.Stats.Conflicts > 0 {
|
|
fmt.Fprintf(out, "→ Resolved %d conflicts\n", result.Stats.Conflicts)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func runGitLabPull(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("gitlab-pull")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID or external reference is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("gitlab pull")
|
|
}
|
|
|
|
config := getGitLabConfig()
|
|
if err := validateGitLabConfig(config); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
gt := &gitlab.Tracker{}
|
|
if err := gt.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing GitLab tracker: %w", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(gt, store, actor)
|
|
engine.PullHooks = buildGitLabPullHooks(ctx)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
|
|
result, err := engine.Sync(ctx, tracker.SyncOptions{
|
|
Pull: true,
|
|
Push: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
// --- Notion implementations ---
|
|
|
|
func runNotionPush(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("notion-push")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("notion push")
|
|
}
|
|
|
|
cfg := getNotionConfig()
|
|
auth, err := resolveNotionAuth(cmd.Context())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := validateNotionConfig(cfg, auth); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
nt := ¬ion.Tracker{}
|
|
if err := nt.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing Notion tracker: %w", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(nt, store, actor)
|
|
unsupportedStats := newNotionUnsupportedPushStats()
|
|
engine.PushHooks = buildNotionPushHooks(ctx, nt, unsupportedStats)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
|
|
result, syncErr := engine.Sync(ctx, tracker.SyncOptions{
|
|
Push: true,
|
|
Pull: false,
|
|
DryRun: dryRun,
|
|
ExcludeEphemeral: true,
|
|
IssueIDs: args,
|
|
})
|
|
if syncErr != nil {
|
|
return syncErr
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|
|
|
|
func runNotionPull(cmd *cobra.Command, args []string) error {
|
|
evt := metrics.NewCommandEvent("notion-pull")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
if len(args) == 0 {
|
|
return fmt.Errorf("at least one bead ID or external reference is required")
|
|
}
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
if !dryRun {
|
|
CheckReadonly("notion pull")
|
|
}
|
|
|
|
cfg := getNotionConfig()
|
|
auth, err := resolveNotionAuth(cmd.Context())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := validateNotionConfig(cfg, auth); err != nil {
|
|
return err
|
|
}
|
|
if err := ensureStoreActive(); err != nil {
|
|
return fmt.Errorf("database not available: %w", err)
|
|
}
|
|
|
|
ctx := cmd.Context()
|
|
nt := ¬ion.Tracker{}
|
|
if err := nt.Init(ctx, store); err != nil {
|
|
return fmt.Errorf("initializing Notion tracker: %w", err)
|
|
}
|
|
|
|
engine := tracker.NewEngine(nt, store, actor)
|
|
engine.PullHooks = buildNotionPullHooks(ctx)
|
|
engine.OnMessage = func(msg string) { fmt.Println(" " + msg) }
|
|
engine.OnWarning = func(msg string) { fmt.Fprintf(os.Stderr, "Warning: %s\n", msg) }
|
|
|
|
result, syncErr := engine.Sync(ctx, tracker.SyncOptions{
|
|
Pull: true,
|
|
Push: false,
|
|
DryRun: dryRun,
|
|
IssueIDs: args,
|
|
})
|
|
if syncErr != nil {
|
|
return syncErr
|
|
}
|
|
outputSyncResult(result, dryRun)
|
|
return nil
|
|
}
|