fix(gastown): repair malformed patch files for nixos-rebuild
Some checks failed
CI / check (push) Failing after 17m48s

- Remove 'index 0000000..1111111' lines that made patches appear as new files
- Fix hunk line counts in several patches
- Add missing leading spaces to blank context lines
- Temporarily disable statusline optimization patch (needs regenerating)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-01-31 13:20:12 -08:00
parent 56097aefa4
commit 123e7d3b3a
8 changed files with 28 additions and 33 deletions

View File

@@ -55,9 +55,9 @@ let
./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 detached sessions and cache results
# TODO: Statusline optimization patch needs regenerating against current gastown source
# Reduces Dolt CPU from ~70% to ~20% by avoiding beads queries for sessions nobody is watching
./gastown-statusline-optimization.patch
# ./gastown-statusline-optimization.patch
];
meta = with lib; {

View File

@@ -1,8 +1,7 @@
diff --git a/internal/mail/router.go b/internal/mail/router.go
index 0000000..1111111 100644
--- a/internal/mail/router.go
+++ b/internal/mail/router.go
@@ -326,7 +326,11 @@ func agentBeadToAddress(bead *agentBead) string {
@@ -326,7 +326,10 @@ func agentBeadToAddress(bead *agentBead) string {
}
// Fall back to parsing description for role_type and rig

View File

@@ -1,8 +1,7 @@
diff --git a/internal/mail/router.go b/internal/mail/router.go
index 0000000..1111111 100644
--- a/internal/mail/router.go
+++ b/internal/mail/router.go
@@ -330,8 +330,28 @@ func agentBeadToAddress(bead *agentBead) string {
@@ -330,8 +330,29 @@ func agentBeadToAddress(bead *agentBead) string {
}
// Handle gt- prefixed IDs (legacy format)

View File

@@ -1,8 +1,7 @@
diff --git a/internal/git/git.go b/internal/git/git.go
index 0000000..1111111 100644
--- a/internal/git/git.go
+++ b/internal/git/git.go
@@ -73,7 +73,18 @@ func copyDir(src, dest string) error {
@@ -73,7 +73,19 @@ func copyDir(src, dest string) error {
srcPath := filepath.Join(src, entry.Name())
destPath := filepath.Join(dest, entry.Name())
@@ -23,3 +22,4 @@ index 0000000..1111111 100644
if err := copyDir(srcPath, destPath); err != nil {
return err
}

View File

@@ -1,5 +1,4 @@
diff --git a/internal/cmd/role.go b/internal/cmd/role.go
index 0000000..1111111 100644
--- a/internal/cmd/role.go
+++ b/internal/cmd/role.go
@@ -326,11 +326,11 @@ func getRoleHome(role Role, rig, polecat, townRoot string) string {

View File

@@ -1,8 +1,7 @@
diff --git a/internal/cmd/prime.go b/internal/cmd/prime.go
index 0000000..1111111 100644
--- a/internal/cmd/prime.go
+++ b/internal/cmd/prime.go
@@ -276,12 +276,12 @@ func detectRole(cwd, townRoot string) RoleInfo {
@@ -276,11 +276,12 @@ func detectRole(cwd, townRoot string) RoleInfo {
// Check for mayor role
// At town root, or in mayor/ or mayor/rig/

View File

@@ -1,5 +1,4 @@
diff --git a/internal/cmd/statusline.go b/internal/cmd/statusline.go
index 0000000..1111111 100644
--- a/internal/cmd/statusline.go
+++ b/internal/cmd/statusline.go
@@ -6,6 +6,7 @@ import (