From eb5e03a73945dc64702014a8e073ca2afc97b000 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 7 Jul 2026 16:52:58 +0200 Subject: [PATCH 1/2] rename $BOARD_EDITOR to $DOCKER_AGENT_BOARD_EDITOR Assisted-By: claude-opus-4-5 --- docs/features/board/index.md | 2 +- pkg/board/app.go | 4 ++-- pkg/board/tmux.go | 2 +- pkg/board/tui/dialogs.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/features/board/index.md b/docs/features/board/index.md index 9e34511314..79ec6204bf 100644 --- a/docs/features/board/index.md +++ b/docs/features/board/index.md @@ -46,7 +46,7 @@ Requirements: `tmux` and `git` must be installed. | `n` | Create a card (project + prompt) | | `enter` | Attach to the card's agent (`ctrl+q` detaches) | | `d` | View the card's worktree diff | -| `o` | Open the card's worktree in `$BOARD_EDITOR` (`code`) | +| `o` | Open the card's worktree in `$DOCKER_AGENT_BOARD_EDITOR` (`code`) | | `[` / `]` | Move the card back / forward | | `x` | Delete the card, its session, worktree, and branch | | `p` | Manage projects | diff --git a/pkg/board/app.go b/pkg/board/app.go index ae66a0e6f9..4ec5f1e552 100644 --- a/pkg/board/app.go +++ b/pkg/board/app.go @@ -349,14 +349,14 @@ func (a *App) Diff(cardID string) (string, error) { } // OpenEditor opens the card's worktree in the user's GUI editor: the -// command named by $BOARD_EDITOR, defaulting to VS Code's `code`. The +// command named by $DOCKER_AGENT_BOARD_EDITOR, defaulting to VS Code's `code`. The // editor is started detached and reaped in the background. func (a *App) OpenEditor(cardID string) error { card, err := a.store.GetCard(cardID) if err != nil { return err } - editor := cmp.Or(os.Getenv("BOARD_EDITOR"), "code") + editor := cmp.Or(os.Getenv("DOCKER_AGENT_BOARD_EDITOR"), "code") cmd := exec.CommandContext(a.ctx, editor, card.Worktree) if err := cmd.Start(); err != nil { return fmt.Errorf("open editor (%s): %w", editor, err) diff --git a/pkg/board/tmux.go b/pkg/board/tmux.go index e7d63e1598..62b0d55c36 100644 --- a/pkg/board/tmux.go +++ b/pkg/board/tmux.go @@ -251,7 +251,7 @@ func setSessionHeader(ctx context.Context, name, title, project, worktree string wt := shQuote(worktree) diffCmd := "git -C " + wt + " diff --color=always \"$(git -C " + wt + " merge-base HEAD " + shQuote(upstreamBase(ctx, worktree)) + " || echo HEAD)\" | less -R" - editorCmd := "${BOARD_EDITOR:-code} " + wt + editorCmd := "${DOCKER_AGENT_BOARD_EDITOR:-code} " + wt right := "#[range=user|diff] diff #[norange]·#[range=user|editor] editor #[norange]·" + "#[range=right] #[bold]ctrl+q#[nobold] board #[norange]" diff --git a/pkg/board/tui/dialogs.go b/pkg/board/tui/dialogs.go index f1b571b2de..281f9861f8 100644 --- a/pkg/board/tui/dialogs.go +++ b/pkg/board/tui/dialogs.go @@ -610,7 +610,7 @@ func (d *helpDialog) View(width, _ int) string { {keys.New.Help().Key, "create a card (launches an agent in a worktree)"}, {keys.Attach.Help().Key, keys.Attach.Help().Desc}, {keys.Diff.Help().Key, "view the card's worktree diff"}, - {keys.Editor.Help().Key, keys.Editor.Help().Desc + " ($BOARD_EDITOR, default code)"}, + {keys.Editor.Help().Key, keys.Editor.Help().Desc + " ($DOCKER_AGENT_BOARD_EDITOR, default code)"}, {"[ / ]", "move card (forward sends the column's prompt)"}, {keys.Delete.Help().Key, "delete card, its session and worktree"}, {keys.Projects.Help().Key, keys.Projects.Help().Desc}, From 2565879762b3f7678a6bcfc2bffb915c7c971ac4 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 7 Jul 2026 16:59:03 +0200 Subject: [PATCH 2/2] fix(board): keep legacy $BOARD_EDITOR as a fallback for one release Assisted-By: Claude --- pkg/board/app.go | 3 ++- pkg/board/tmux.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/board/app.go b/pkg/board/app.go index 4ec5f1e552..8f2d67834a 100644 --- a/pkg/board/app.go +++ b/pkg/board/app.go @@ -356,7 +356,8 @@ func (a *App) OpenEditor(cardID string) error { if err != nil { return err } - editor := cmp.Or(os.Getenv("DOCKER_AGENT_BOARD_EDITOR"), "code") + // BOARD_EDITOR is the legacy name, kept as a fallback for one release. + editor := cmp.Or(os.Getenv("DOCKER_AGENT_BOARD_EDITOR"), os.Getenv("BOARD_EDITOR"), "code") cmd := exec.CommandContext(a.ctx, editor, card.Worktree) if err := cmd.Start(); err != nil { return fmt.Errorf("open editor (%s): %w", editor, err) diff --git a/pkg/board/tmux.go b/pkg/board/tmux.go index 62b0d55c36..bb1e4a18a4 100644 --- a/pkg/board/tmux.go +++ b/pkg/board/tmux.go @@ -251,7 +251,7 @@ func setSessionHeader(ctx context.Context, name, title, project, worktree string wt := shQuote(worktree) diffCmd := "git -C " + wt + " diff --color=always \"$(git -C " + wt + " merge-base HEAD " + shQuote(upstreamBase(ctx, worktree)) + " || echo HEAD)\" | less -R" - editorCmd := "${DOCKER_AGENT_BOARD_EDITOR:-code} " + wt + editorCmd := "${DOCKER_AGENT_BOARD_EDITOR:-${BOARD_EDITOR:-code}} " + wt right := "#[range=user|diff] diff #[norange]·#[range=user|editor] editor #[norange]·" + "#[range=right] #[bold]ctrl+q#[nobold] board #[norange]"