Repository navigation
feat: agent-memory v0.1.3 - #5
Merged
Merged
Conversation
Fixes sync on a memory home that has local changes and is behind upstream. `push` and `pull --agent NAME` commit the allowlisted paths, fetch, rebase local commits onto upstream, then deliver; `startup --pull` supplies its runtime name as the agent, so SessionStart resolves the same case. A plain `pull` updates a clean home and reports any commits still ahead. A rebase conflict aborts, names the conflicting paths and keeps the local commit. Unrelated uncommitted paths are reported and never stashed; local merge commits and a git operation already in progress need manual resolution first. Rebases share the 30 second network timeout.
spbkgw-beep
approved these changes
Sep 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Promotes the 0.1.3 snapshot: 9 files changed, none added. Nothing is removed.
What lands
Fixed: sync on a home with local changes that is behind upstream. In 0.1.2 that home was stuck:
pullrefused because of the uncommitted changes, andpushrefused because the home was behind. Now:pushandpull --agent NAMEcommit the allowlisted paths, fetch, rebase local commits onto upstream, then deliver.startup --pullsupplies its runtime name as the agent, so SessionStart resolves the same case.pullupdates a clean home and reports any commits still ahead.The sync section of
docs/commands.mdand the README describe the new behaviour.Snapshot integrity
Verification
Run against this exact content before the snapshot was taken:
ruff check .is clean.python -m buildandtwine checkboth PASSED for the 0.1.3 sdist and wheel.pullexits 1 (uncommitted changes present) andpush --agentexits 1 (behind upstream by 1 commit).pull --agentexits 0 after it commits the file, rebases onto upstream and delivers; the home ends level with the remote and holds both changes.Merging this and then tagging
v0.1.3publishes to PyPI, with build attestations from thepypienvironment.