johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,614 Commits 2 Branches 0 Tags
2cb97e4d22e71b7f280a548972a53b3388a47453
Commit Graph

918 Commits

Author SHA1 Message Date
Steve Yegge
2cb97e4d22 Update beads JSONL 2025-11-06 18:53:07 -08:00
Steve Yegge
bae701af13 Add bd-6ku3: Fix TestMigrateHashIDs test failure 2025-11-06 18:53:02 -08:00
Steve Yegge
7eea30acde Update beads JSONL 
Amp-Thread-ID: https://ampcode.com/threads/T-65a9b3f9-0552-4587-bb8f-34c2b98781b1
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-06 18:52:37 -08:00
Steve Yegge
96269763c0 Update beads database with comments 2025-11-06 18:49:46 -08:00
Steve Yegge
e85740167b Sync beads database 
Amp-Thread-ID: https://ampcode.com/threads/T-dc29c5ad-ff33-401a-9546-4d5ca1d8421b
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-06 18:49:31 -08:00
Steve Yegge
510934ff19 bd sync: 2025-11-06 18:49:09 2025-11-06 18:49:09 -08:00
Steve Yegge
c731c45f0c Update beads JSONL 
Amp-Thread-ID: https://ampcode.com/threads/T-5e744954-8a08-4697-960e-5f2a88d50c54
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-06 18:48:53 -08:00
Steve Yegge
b7395128a9 bd sync: 2025-11-06 18:47:43 2025-11-06 18:47:43 -08:00
Steve Yegge
fa811300bd Sync beads issues 
Amp-Thread-ID: https://ampcode.com/threads/T-932dcf45-76f2-4994-9b5c-a6eb20a86036
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-06 18:19:31 -08:00
Steve Yegge
70a3361d77 bd sync: 2025-11-06 18:19:21 2025-11-06 18:19:21 -08:00
Steve Yegge
b201eecd55 bd sync: 2025-11-06 17:52:29 2025-11-06 17:52:30 -08:00
Steve Yegge
f9108ff498 bd sync: 2025-11-06 17:31:18 2025-11-06 17:31:18 -08:00
Steve Yegge
5fff4edcb6 bd sync: 2025-11-06 16:14:27 2025-11-06 16:14:27 -08:00
Steve Yegge
6424ebdada Add comprehensive tests for merge driver auto-config in bd init 
- Test auto-install in quiet mode (bd init --quiet)
- Test --skip-merge-driver flag
- Test detection of already-installed merge driver (no duplication)
- Test append to existing .gitattributes (preserve content)
- Test non-git repo gracefully skips merge driver
- Test git config has correct merge.beads.driver settings

Fixes: bd-csvy
Amp-Thread-ID: https://ampcode.com/threads/T-b237be26-6dd8-4d4e-9b9d-b460ace8ce72
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-06 15:57:51 -08:00
Steve Yegge
725e43d49c Sync beads database 2025-11-06 15:52:11 -08:00
Steve Yegge
5f95d05a39 Update beads database: closed bd-kazt 2025-11-06 15:52:01 -08:00
Steve Yegge
f475c13064 bd sync: 2025-11-06 15:41:51 2025-11-06 15:41:51 -08:00
Steve Yegge
4b1e96bd3f Fix linting errors in vendored merge code 
- Check error returns from Fprintln and Sync
- Remove unused 'merged' parameter from hasConflict
- Remaining gosec G304 warnings are baseline (file paths from git, not user input)
 2025-11-06 15:41:36 -08:00
Steve Yegge
dcb6eb27a8 Vendor beads-merge by @neongreen for native bd merge command 
- Vendored beads-merge algorithm into internal/merge/ with full MIT license attribution
- Created bd merge command as native wrapper (no external binary needed)
- Updated bd init to auto-configure git merge driver (both interactive and --quiet)
- Removed obsolete test files that were incompatible with vendored version
- Added merge to noDbCommands list so it can run standalone
- Tested: successful merge and conflict detection work correctly

Closes bd-bzfy

Thanks to @neongreen for permission to vendor!
See: https://github.com/neongreen/mono/issues/240
Original: https://github.com/neongreen/mono/tree/main/beads-merge

Amp-Thread-ID: https://ampcode.com/threads/T-f0fe7c4c-13e7-486b-b073-fc64b81eeb4b
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-06 15:38:48 -08:00
Steve Yegge
d4c97d9f70 bd sync: 2025-11-06 15:30:20 2025-11-06 15:30:20 -08:00
Steve Yegge
c4eddf0de4 bd sync: 2025-11-06 15:00:10 2025-11-06 15:00:10 -08:00
Steve Yegge
5c59a3dfec bd sync: 2025-11-06 13:02:45 2025-11-06 13:02:45 -08:00
Steve Yegge
cee9cbaba7 Clean up test binary 2025-11-06 13:02:35 -08:00
Steve Yegge
4f0da2cd9d bd sync: 2025-11-06 13:02:14 2025-11-06 13:02:14 -08:00
Steve Yegge
2ea2a0f010 Update beads issues 2025-11-06 10:53:55 -08:00
Steve Yegge
22b3e95c02 bd sync: 2025-11-05 23:29:07 2025-11-05 23:29:09 -08:00
Steve Yegge
a1c3494c43 bd sync: 2025-11-05 20:40:10 2025-11-05 20:40:10 -08:00
Steve Yegge
5a22327d67 Merge beads metadata 2025-11-05 20:39:59 -08:00
Steve Yegge
155ec6aeeb bd sync: 2025-11-05 20:39:52 2025-11-05 20:39:52 -08:00
Steve Yegge
df1c74ef1e bd sync: 2025-11-05 2025-11-05 20:00:30 -08:00
Steve Yegge
a67142f714 bd sync: 2025-11-05 19:33:07 2025-11-05 19:33:07 -08:00
Steve Yegge
75dcb0da1c bd sync: 2025-11-05 19:27:33 2025-11-05 19:27:33 -08:00
Steve Yegge
91bad1585d bd sync: 2025-11-05 19:22:12 2025-11-05 19:22:12 -08:00
Steve Yegge
5fdb555cd3 bd sync: 2025-11-05 19:17:14 2025-11-05 19:17:14 -08:00
Steve Yegge
7b60fa0ba9 bd sync: 2025-11-05 19:12:54 2025-11-05 19:12:54 -08:00
Steve Yegge
8bf6f20387 File bd-5ots: SearchIssues N+1 query bug 2025-11-05 19:12:08 -08:00
Steve Yegge
235f4e7cfa chore: Final beads sync 2025-11-05 19:04:39 -08:00
Steve Yegge
236d4e56b6 chore: Update beads issue tracker 
Amp-Thread-ID: https://ampcode.com/threads/T-b4d124a2-447e-47d1-8124-d7c5dab9a97b
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-05 19:04:31 -08:00
Steve Yegge
c20aabe263 bd sync: 2025-11-05 19:03:47 2025-11-05 19:04:14 -08:00
Steve Yegge
a1583a1b24 bd sync: 2025-11-05 18:43:51 2025-11-05 18:43:51 -08:00
Steve Yegge
fa38a69fcb bd sync: 2025-11-05 18:28:45 2025-11-05 18:28:45 -08:00
Steve Yegge
b6fad0e618 bd sync: 2025-11-05 18:09:54 2025-11-05 18:09:54 -08:00
Steve Yegge
5854bbfef7 Sync database state to JSONL 2025-11-05 17:51:46 -08:00
Steve Yegge
082f5ce6f9 Update issue timestamps 2025-11-05 17:50:36 -08:00
Steve Yegge
369a0fb7a9 bd sync: 2025-11-05 17:38:17 2025-11-05 17:38:18 -08:00
Steve Yegge
f7a45dd0ba bd sync: 2025-11-05 15:27:36 2025-11-05 15:27:36 -08:00
Steve Yegge
8e41df301f Update beads issue tracker (landing the plane) 2025-11-05 15:26:27 -08:00
Steve Yegge
279a1c48f6 Update beads issue tracker 
Amp-Thread-ID: https://ampcode.com/threads/T-1844b7c3-fd46-49c0-95fe-86fe341485e9
Co-authored-by: Amp <amp@ampcode.com>
 2025-11-05 15:26:19 -08:00
Steve Yegge
1814803b96 bd sync: 2025-11-05 14:36:44 2025-11-05 14:36:44 -08:00
Steve Yegge
0d07346a11 bd sync: 2025-11-05 14:31:39 2025-11-05 14:31:41 -08:00