toasterson/Anima
Watch
0
0
Fork
You've already forked Anima
 0
Code Issues 1 Pull requests 87 Projects Releases Packages Wiki Activity Actions

WIP: Runner: write safe.directory entries to ~/.gitconfig.local, not ~/.gitconfig #603

Draft
toasterson wants to merge 2 commits from claude/wi-01a00afa-runner-write-safe-directory-entries-to-g into main
pull from: claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
merge into: toasterson:main
Conversation 0 Commits 2 Files changed 3 +299
toasterson commented 2026-08-16 15:12:11 +00:00
Owner
Copy link

Anima work item 01a00afa-cfab-7873-9761-9573ba934f48.

Found on armini 2026-08-16: the anima-runner appends [safe] directory = /Users/toasty/ws/.anima-runner/worktrees/<uuid> entries (one per worktree, ~20 accumulated) directly to ~/.gitconfig. That file is a khepri-rendered file that hard-reverts on drift, so every hourly khepri apply silently drops the runner's entries (bit us 2026-08-16; restored by hand).

Fix in the runner: write the safe.directory entries to ~/.gitconfig.local instead — the khepri git render already includes it via [include] path = ~/.gitconfig.local and never manages it, so the runner stops racing the render.

Note: the dotfiles manifest is gaining a machine-scoped glob ([safe] directory = /Users/toasty/ws/.anima-runner/worktrees/*, supported since git 2.46; armini has Apple Git 2.50.1) rendered into ~/.gitconfig on armini, which makes the per-worktree entries redundant — the runner change is belt-and-braces so it degrades cleanly on machines without the glob, and stops mutating a khepri-owned file either way. Consider also pruning stale per-worktree entries the runner previously wrote to ~/.gitconfig.local when their worktrees are gone.

Anima work item `01a00afa-cfab-7873-9761-9573ba934f48`. Found on armini 2026-08-16: the anima-runner appends `[safe] directory = /Users/toasty/ws/.anima-runner/worktrees/<uuid>` entries (one per worktree, ~20 accumulated) directly to `~/.gitconfig`. That file is a khepri-rendered file that hard-reverts on drift, so every hourly `khepri apply` silently drops the runner's entries (bit us 2026-08-16; restored by hand). Fix in the runner: write the safe.directory entries to `~/.gitconfig.local` instead — the khepri git render already includes it via `[include] path = ~/.gitconfig.local` and never manages it, so the runner stops racing the render. Note: the dotfiles manifest is gaining a machine-scoped glob (`[safe] directory = /Users/toasty/ws/.anima-runner/worktrees/*`, supported since git 2.46; armini has Apple Git 2.50.1) rendered into ~/.gitconfig on armini, which makes the per-worktree entries redundant — the runner change is belt-and-braces so it degrades cleanly on machines without the glob, and stops mutating a khepri-owned file either way. Consider also pruning stale per-worktree entries the runner previously wrote to ~/.gitconfig.local when their worktrees are gone.
Anima implementation session.
Anima implementation session.
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin claude/wi-01a00afa-runner-write-safe-directory-entries-to-g:claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git switch claude/wi-01a00afa-runner-write-safe-directory-entries-to-g

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git switch claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git rebase main
git switch main
git merge --ff-only claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git switch claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git rebase main
git switch main
git merge --no-ff claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git switch main
git merge --squash claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git switch main
git merge --ff-only claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git switch main
git merge claude/wi-01a00afa-runner-write-safe-directory-entries-to-g
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Compat/Breaking
Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority
Critical
 The priority is critical

  
Priority
High
 The priority is high

  
Priority
Low
 The priority is low

  
Priority
Medium
 The priority is medium

  
Reviewed
Confirmed
 Issue has been confirmed

  
Reviewed
Duplicate
 This issue or pull request already exists

  
Reviewed
Invalid
 Invalid issue

  
Reviewed
Won't Fix
 This issue won't be fixed

  
Status
Abandoned
 Somebody has started to work on this but abandoned work

  
Status
Blocked
 Something is blocking this issue or pull request

  
Status
Need More Info
 Feedback is required to reproduce issue or to continue work

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
toasterson/Anima!603
No description provided.