fix(deps): update gastown patch and pin beads to Go 1.24 compatible version
All checks were successful
CI / check (push) Successful in 5m25s

- Update gastown-fix-agent-bead-address-title.patch line numbers (326→315)
  for current upstream gastown source
- Remove obsolete gastown patches (rig-prefix, copydir-symlinks) that are
  now handled upstream
- Pin beads to 55e733c (v0.47.2) which uses Go 1.24.0 - newer versions
  require Go 1.25.6 which isn't in nixpkgs-unstable yet
- Remove beads-search-query-optimization.patch as it targets newer code

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-02-03 13:18:46 -08:00
parent 6cf63e86c1
commit a851c2551c
4 changed files with 17 additions and 29 deletions

13
flake.lock generated
View File

@@ -8,15 +8,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769405733, "lastModified": 1768533782,
"narHash": "sha256-WpROnW0dRi5ub0SlpKrMBs3pYlSBY4xw22hnTNvBMgI=", "narHash": "sha256-+5wZHjGfe2bf+FUDc99avz+ASc8Qx34QVkd85s0VU/U=",
"owner": "steveyegge", "owner": "steveyegge",
"repo": "beads", "repo": "beads",
"rev": "6e82d1e2eea121ce5dc0964d554879f8b0c08563", "rev": "55e733cf624a94c63257a657970f1fc9a287883d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "steveyegge", "owner": "steveyegge",
"ref": "55e733c",
"repo": "beads", "repo": "beads",
"type": "github" "type": "github"
} }
@@ -81,11 +82,11 @@
"gastown": { "gastown": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769538736, "lastModified": 1770098007,
"narHash": "sha256-A33gyS/ERUCFcaFG9PJdIHfIOafguqkRe+DuIZteH5s=", "narHash": "sha256-CFlN57BXlR5FobTChdE2GgdIGx4xJcFFCk1E5Q98cSQ=",
"owner": "steveyegge", "owner": "steveyegge",
"repo": "gastown", "repo": "gastown",
"rev": "177094a2335786d1d450fd9e14b935877291c004", "rev": "13461161063bf7b2365fe5fd4df88e32c3ba2a28",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -43,7 +43,9 @@
}; };
beads = { beads = {
url = "github:steveyegge/beads"; # Pinned to 55e733c (v0.47.2) - uses Go 1.24.0 which is available in nixpkgs
# Later versions require Go 1.25.6 which isn't in nixpkgs-unstable yet
url = "github:steveyegge/beads/55e733c";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };

View File

@@ -5,20 +5,9 @@ with lib;
let let
cfg = config.home.roles.development; cfg = config.home.roles.development;
# FIXME: Temporary override for upstream beads vendorHash mismatch # Use beads package from flake input
# Remove after upstream fix: https://github.com/steveyegge/beads/issues/XXX # Pinned to 0.47.2 in flake.nix due to Go 1.25.6 requirement in newer versions
beadsPackage = globalInputs.beads.packages.${system}.default.overrideAttrs (old: { beadsPackage = globalInputs.beads.packages.${system}.default;
vendorHash = "sha256-YU+bRLVlWtHzJ1QPzcKJ70f+ynp8lMoIeFlm+29BNPE=";
# Performance fix: avoid WHERE IN (8000+ IDs) query pattern that hammers Dolt CPU
# See: hq-ihwsj - bd list uses inefficient WHERE IN (all_ids) query pattern
# The fix changes SearchIssues to SELECT all columns directly instead of:
# 1. SELECT id FROM issues WHERE ... -> collect IDs
# 2. SELECT * FROM issues WHERE id IN (all_ids) -> 8000+ placeholder IN clause
patches = (old.patches or []) ++ [
./beads-search-query-optimization.patch
];
});
# Gastown - multi-agent workspace manager (no upstream flake.nix yet) # Gastown - multi-agent workspace manager (no upstream flake.nix yet)
# Source is tracked via flake input for renovate updates # Source is tracked via flake input for renovate updates
@@ -47,14 +36,10 @@ let
./gastown-fix-validate-recipient.patch ./gastown-fix-validate-recipient.patch
# Fix agentBeadToAddress to use title field for hq- prefixed beads # Fix agentBeadToAddress to use title field for hq- prefixed beads
./gastown-fix-agent-bead-address-title.patch ./gastown-fix-agent-bead-address-title.patch
# Fix agentBeadToAddress to handle rig-specific prefixes (j-, sc-, etc.)
./gastown-fix-agent-bead-rig-prefix.patch
# Fix crew/polecat home paths: remove incorrect /rig suffix # Fix crew/polecat home paths: remove incorrect /rig suffix
./gastown-fix-role-home-paths.patch ./gastown-fix-role-home-paths.patch
# Fix town root detection: don't map to Mayor (causes spurious mismatch warnings) # Fix town root detection: don't map to Mayor (causes spurious mismatch warnings)
./gastown-fix-town-root-detection.patch ./gastown-fix-town-root-detection.patch
# Fix copyDir to handle symlinks (broken symlinks cause "no such file" errors)
./gastown-fix-copydir-symlinks.patch
# Statusline optimization: skip expensive beads queries for detached sessions # Statusline optimization: skip expensive beads queries for detached sessions
# Reduces Dolt CPU from ~70% to ~20% by caching and early-exit # Reduces Dolt CPU from ~70% to ~20% by caching and early-exit
./gastown-statusline-optimization.patch ./gastown-statusline-optimization.patch

View File

@@ -1,15 +1,15 @@
diff --git a/internal/mail/router.go b/internal/mail/router.go diff --git a/internal/mail/router.go b/internal/mail/router.go
--- a/internal/mail/router.go --- a/internal/mail/router.go
+++ b/internal/mail/router.go +++ b/internal/mail/router.go
@@ -326,7 +326,10 @@ func agentBeadToAddress(bead *agentBead) string { @@ -315,7 +315,10 @@ func agentBeadToAddress(bead *agentBead) string {
} }
// Fall back to parsing description for role_type and rig // For other hq- agents, fall back to description parsing
- return parseAgentAddressFromDescription(bead.Description) - return parseAgentAddressFromDescription(bead.Description)
+ if bead.Title != "" && strings.Contains(bead.Title, "/") { + if bead.Title != "" && strings.Contains(bead.Title, "/") {
+ return bead.Title + return bead.Title
+ } + }
+ return parseAgentAddressFromDescription(bead.Description) + return parseAgentAddressFromDescription(bead.Description)
} }
// Handle gt- prefixed IDs (legacy format) // Handle gt- prefixed IDs (legacy format)