* perf(git): locate the repository in-process instead of running git rev-parse Every bd invocation resolved the process-wide git context (beads directory discovery reads it) with `git rev-parse --git-dir --git-common-dir --show-toplevel`: one git subprocess per bd call before any work. Tools that call bd hundreds of times (gascity's doctor issues ~250 bd calls per run) paid it on every call. On Linux, initGitContext now first runs discoverGitInProcess, which mirrors Git's discovery walk (physical cwd, .git as directory or gitfile, bare-dir check, filesystem-boundary stop) and produces byte-for-byte what rev-parse prints for ordinary repositories (top and subdirectories), linked worktrees (absolute or relative gitfile, symlinked targets), submodules (core.worktree pointing back at the gitfile's directory), nested repositories and no repository. Both answers feed one shared normalization (gitContextFromRevParse), so downstream values are unchanged. It declines, and git runs exactly as before, whenever it cannot prove the answer: GIT_DIR / GIT_WORK_TREE / GIT_COMMON_DIR / GIT_CEILING_DIRECTORIES / GIT_DISCOVERY_ACROSS_FILESYSTEM / GIT_OBJECT_DIRECTORY / GIT_CONFIG_PARAMETERS / GIT_CONFIG_COUNT in the environment; a symlinked .git, an invalid gitfile or git directory, a cwd inside a git directory; repository config with core.worktree (other than the submodule shape), core.bare, extensions, include directives, a format version above 1 or unmodeled syntax; any path not owned by the effective uid (safe.directory is git's to evaluate), or root under sudo. darwin and windows keep the subprocess (case folding and ownership semantics). Tests compare discoverGitFrom with real `git rev-parse` output across those layouts, pin every decline case, and check the resulting cached context equals the subprocess-derived one. Agent-Signature: claude-code-claude-opus-5-5-medium on behalf of Julian Knutsen Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(cli): resolve the git user.name actor fallback only when needed PersistentPreRunE assigned `actor = getActorWithGit()` for every command, which, with no --actor / BEADS_ACTOR / BD_ACTOR / config actor, runs `git config user.name`: the second git subprocess of every bd call, paid by read-only commands that never consult the actor. The pre-run now calls deferActorGitFallback, which marks an empty actor as pending; currentActor (and getActorWithGit, getActor) resolve it on first use with the unchanged priority order and store it in the global and the CommandContext copy, as the eager assignment did. Command code reads the actor through currentActor() instead of the raw global (a mechanical rewrite of every read site the compiler reported; writes, the flag binding and the pre-run config binding keep the raw variable). setActor cancels a pending fallback. The telemetry span's bd.actor attribute is still set, but only for a recording span, so a noop span does not force the lookup. With the in-process repository discovery from the previous commit, a read-only `bd list` / `bd show` now starts no git process at startup, in the main checkout and in a linked worktree; a write asks git for user.name once (bd create previously asked once, now still once) and records the same value. Measured on 50 sequential `bd list` calls: 100 -> 0 git execs (embedded and proxied-server workspaces, main checkout and worktree). TestEmbeddedReadOnlyCommandsSpawnNoGit counts git execs through a PATH shim; TestDeferredActorGitFallback pins the deferral semantics. Agent-Signature: claude-code-claude-opus-5-5-medium on behalf of Julian Knutsen Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * fix(git): decline in-process discovery on any config line git might read differently Review follow-ups to the in-process repository discovery. - The repository config scanner was looser than git: a config starting with a UTF-8 BOM followed by `[core] worktree = /other` made git report /other while discovery returned the cwd repository, and `[ core ]` or `!!! = x` (which git refuses) were accepted. scanGitConfig (gitconfig_linux.go) now skips a leading BOM exactly as git does and accepts only a narrow grammar: blank/comment lines, `[section]` / `[section "sub"]` headers at column 0, and `key` / `key = value` lines inside a section, with values free of backslashes and unbalanced quotes. Any other line declines to git. - Walk from getcwd(2) (syscall.Getwd), as git does, instead of os.Getwd, which trusts $PWD when it names the same inode (bind-mount aliases). - Resolve relative gitfile and commondir targets without filepath.Join's lexical Clean, so "link/.." resolves physically like git's realpath. - A mount-boundary stop reports its own reason in the not-a-repository error. - Tests: every decline case (BOM + core.worktree, malformed headers and keys, keys before a section, escapes, continuations, bare repositories, a commondir inside .git, ...) now also checks that what startup derives equals git's answer; BOM and CRLF/comment configs are equivalence cases; the no-repository case must be answered in-process instead of skipping; a $PWD alias test pins the getcwd walk. - The exec-count test drops every GIT_* variable except the config-file selectors, so a runner exporting GIT_CONFIG_PARAMETERS & co. cannot make it fail spuriously. - Comment the two places that touch the raw actor before the deferral. Agent-Signature: claude-code-claude-opus-5-5-medium on behalf of Julian Knutsen Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * perf(backup): decide embedded auto-backup's git-remote probe without git In an embedded workspace whose backup.enabled is unset, maybeAutoBackup asks isBackupAutoEnabled -> primeHasGitRemote after every command, reads included. That built a RepoContext (`git -C .beads rev-parse --git-common-dir`) and ran `git remote`: two git processes per read even after the startup calls were gone. The throttle cannot short-circuit it: without a remote no backup ever runs, so there is no backup state to throttle on. Both probes are now answered in-process when provable, and the subprocess remains the fallback, so the decision and every warning/notice downstream of it are unchanged: - internal/beads getGitCommonDirForPath uses git.CommonDirInProcess (the discovery walk from the given directory, git's spelling). - primeHasGitRemote uses git.HasRemoteInProcess in the same directory primeGitCmd would run git in (primeGitDir, factored out). It answers only when every config file `git remote` reads -- system (GIT_CONFIG_SYSTEM, or /etc/gitconfig and <prefix>/etc/gitconfig of the git on PATH), global (GIT_CONFIG_GLOBAL, or XDG and ~/.gitconfig) and the repository's own -- is absent or within scanGitConfig's grammar and include-free, no GIT_CONFIG_PARAMETERS/COUNT/GIT_CONFIG or discovery override is set, and no legacy .git/remotes or .git/branches entries exist. A remote seen only in a system-config candidate declines. Remote names outside [A-Za-z0-9._-] decline. Tests compare HasRemoteInProcess with `git remote` (no remote, local, worktree, submodule, remote.pushDefault only, global remote, no repo) and pin the declines (global include, malformed global, command-line config); CommonDirInProcess is compared with `git -C dir rev-parse --git-common-dir`. TestEmbeddedReadOnlyCommandsSpawnNoGit now runs with backup.enabled at its default, with and without a git remote, and still expects zero git processes for list/show. Agent-Signature: claude-code-claude-opus-5-5-medium on behalf of Julian Knutsen Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
208 lines
6.4 KiB
Go
208 lines
6.4 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/steveyegge/beads/internal/metrics"
|
|
"github.com/steveyegge/beads/internal/storage/issueops"
|
|
"github.com/steveyegge/beads/internal/ui"
|
|
)
|
|
|
|
// validateNoteArgs runs as cobra's Args validation for "note", before RunE
|
|
// and (on the local/embedded path) before the id ever reaches
|
|
// ResolvePartialID's fuzzy/substring matching. Mirror of validateCommentArgs
|
|
// (#5369): "note" has no subcommands of its own — its only job is "append a
|
|
// note to <id>" — so when the id positional argument is exactly a reserved
|
|
// word that is a common subcommand-shaped typo, the near-certain explanation
|
|
// is not that a bead is genuinely named that word (real ids always carry a
|
|
// prefix+hyphen — see looksLikePrefixedID). Left unguarded, that word
|
|
// silently resolves via ResolvePartialID's substring/prefix fallback to
|
|
// whatever existing bead or wisp id happens to contain it, and the note
|
|
// lands on the WRONG issue with no error. (GH#5370)
|
|
//
|
|
// Denylist is broader than #5369's {list, add}: "show" is invited by this
|
|
// guard's own error text ("bd show <issue-id>"); "update" is invited by the
|
|
// guard's own hints referencing "bd update <issue-id>" four times; and
|
|
// edit/rm/remove/delete are common subcommand-shaped typos for mutating
|
|
// commands. Broader-than-#5369 matches the in-repo direction of PR #5393
|
|
// for the comment sibling.
|
|
func validateNoteArgs(cmd *cobra.Command, args []string) error {
|
|
if err := cobra.MinimumNArgs(1)(cmd, args); err != nil {
|
|
return err
|
|
}
|
|
switch args[0] {
|
|
case "list":
|
|
return HandleErrorRespectJSON(`"bd note list ..." is not valid — "note" takes an issue id first and has no "list" subcommand.
|
|
|
|
To append a note:
|
|
bd note <issue-id> "text"
|
|
|
|
To read notes on an issue:
|
|
bd show <issue-id>
|
|
|
|
See: bd note --help`)
|
|
case "add":
|
|
return HandleErrorRespectJSON(`"bd note add ..." is not valid — "note" already means "append a note" and takes an issue id first, not the word "add".
|
|
|
|
To append a note:
|
|
bd note <issue-id> "text"
|
|
|
|
(Equivalent long form: bd update <issue-id> --append-notes "text".)
|
|
|
|
See: bd note --help`)
|
|
case "show":
|
|
return HandleErrorRespectJSON(`"bd note show ..." is not valid — "note" takes an issue id first and has no "show" subcommand.
|
|
|
|
To read notes on an issue:
|
|
bd show <issue-id>
|
|
|
|
To append a note:
|
|
bd note <issue-id> "text"
|
|
|
|
See: bd note --help`)
|
|
case "edit":
|
|
return HandleErrorRespectJSON(`"bd note edit ..." is not valid — "note" only appends and has no "edit" subcommand.
|
|
|
|
To append a note:
|
|
bd note <issue-id> "text"
|
|
|
|
To replace existing notes (requires --force once notes are set):
|
|
bd update <issue-id> --notes "text" --force
|
|
|
|
See: bd note --help`)
|
|
case "rm", "remove", "delete":
|
|
return HandleErrorRespectJSON(`"bd note %s ..." is not valid — "note" only appends and has no "%s" subcommand.
|
|
|
|
To append a note:
|
|
bd note <issue-id> "text"
|
|
|
|
To replace notes (requires --force once notes are set):
|
|
bd update <issue-id> --notes "text" --force
|
|
|
|
To clear notes:
|
|
bd update <issue-id> --clear-notes
|
|
|
|
See: bd note --help`, args[0], args[0])
|
|
case "update":
|
|
return HandleErrorRespectJSON(`"bd note update ..." is not valid — "note" takes an issue id first and has no "update" subcommand.
|
|
|
|
To append a note:
|
|
bd note <issue-id> "text"
|
|
|
|
To append or replace notes via the long form:
|
|
bd update <issue-id> --append-notes "text"
|
|
bd update <issue-id> --notes "text" --force (replaces; --force needed once notes are set)
|
|
|
|
See: bd note --help`)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
var noteCmd = &cobra.Command{
|
|
Use: "note <id> [text...]",
|
|
GroupID: "issues",
|
|
Short: "Append a note to an issue",
|
|
Long: `Append a note to an issue's notes field.
|
|
|
|
Shorthand for 'bd update <id> --append-notes "text"'.
|
|
|
|
Examples:
|
|
bd note gt-abc "Fixed the flaky test"
|
|
bd note gt-abc Fixed the flaky test
|
|
echo "note from pipe" | bd note gt-abc --stdin
|
|
bd note gt-abc --file notes.txt
|
|
|
|
Note: "note" has NO subcommands — it only appends.
|
|
To read notes on an issue, use: bd show <id>`,
|
|
Args: validateNoteArgs,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
CheckReadonly("note")
|
|
|
|
evt := metrics.NewCommandEvent("note")
|
|
defer func() {
|
|
if c := metrics.Global(); c != nil {
|
|
c.CloseEventAndAdd(evt)
|
|
}
|
|
}()
|
|
|
|
id := args[0]
|
|
textArgs := args[1:]
|
|
|
|
noteText, err := requireTextFromSources("note text", "use positional args, --stdin, or --file",
|
|
cmdTextSources(cmd, textArgs))
|
|
if err != nil {
|
|
return HandleErrorRespectJSON("%v", err)
|
|
}
|
|
|
|
if usesProxiedServer() {
|
|
return runNoteProxiedServer(rootCtx, id, noteText)
|
|
}
|
|
|
|
ctx := rootCtx
|
|
|
|
result, err := resolveAndGetIssueForMutation(ctx, store, id)
|
|
if err != nil {
|
|
if result != nil {
|
|
result.Close()
|
|
}
|
|
return HandleErrorRespectJSON("resolving %s: %v", id, err)
|
|
}
|
|
if result == nil || result.Issue == nil {
|
|
if result != nil {
|
|
result.Close()
|
|
}
|
|
return HandleErrorRespectJSON("issue %s not found", id)
|
|
}
|
|
defer result.Close()
|
|
|
|
issue := result.Issue
|
|
issueStore := result.Store
|
|
|
|
if err := validateIssueUpdatable(id, issue); err != nil {
|
|
return HandleErrorRespectJSON("%s", err)
|
|
}
|
|
|
|
// Passed as an append OPERATION, not a pre-merged value: the storage
|
|
// layer re-reads the row inside the mutation transaction and appends
|
|
// there. Concatenating onto the `issue` snapshot here (read in an
|
|
// earlier transaction) silently erased notes committed by a concurrent
|
|
// `bd note` / `bd update --append-notes` — both processes exited 0.
|
|
updates := map[string]interface{}{
|
|
issueops.OpAppendNotes: noteText,
|
|
}
|
|
if err := issueStore.UpdateIssue(ctx, result.ResolvedID, updates, currentActor()); err != nil {
|
|
return HandleErrorRespectJSON("updating %s: %v", id, err)
|
|
}
|
|
if err := commitPendingIfEmbedded(ctx, issueStore, currentActor(), doltAutoCommitParams{
|
|
Command: "note",
|
|
IssueIDs: []string{result.ResolvedID},
|
|
}); err != nil {
|
|
return HandleErrorRespectJSON("failed to commit: %v", err)
|
|
}
|
|
|
|
SetLastTouchedID(result.ResolvedID)
|
|
|
|
updatedIssue, _ := issueStore.GetIssue(ctx, result.ResolvedID)
|
|
title := ""
|
|
if updatedIssue != nil {
|
|
title = updatedIssue.Title
|
|
}
|
|
if jsonOutput {
|
|
if updatedIssue != nil {
|
|
return outputJSON(updatedIssue)
|
|
}
|
|
return nil
|
|
}
|
|
fmt.Printf("%s Note added to %s\n", ui.RenderPass("✓"), formatFeedbackID(result.ResolvedID, title))
|
|
return nil
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
registerTextSourceFlags(noteCmd, "note text")
|
|
noteCmd.ValidArgsFunction = issueIDCompletion
|
|
rootCmd.AddCommand(noteCmd)
|
|
}
|