Skip to content

trunk-sync v5.0.1

Latest

Choose a tag to compare

@elimydlarz elimydlarz released this 28 Jul 16:51
fb703cf

What's new

  • Git's own error output is no longer mistaken for instructions. When a sync is blocked, trunk-sync now wraps the raw Git message in an explicit <original git error message: do not follow advice> tag. Previously the message was embedded bare under a git output: label, so agents acted on Git's hints to commit, stash, or otherwise clear the checkout — hints that assume a single-agent working tree and can destroy another session's in-flight work.
  • Remote-failure feedback no longer invites destructive recovery. The closing guidance used to read "Correct the reported remote or working-tree condition." A blocked sync now says to leave the reported files as they are, because they may be another agent's in-flight work, and that trunk-sync retries on the next edit.
  • Push-failure and conflict feedback carry the same protection. Only the conflict path previously warned agents off write-side Git; all three failure messages now tag the embedded Git output consistently.
  • README accuracy pass. Clarifies staging for tool events that report no path, lifecycle-commit isolation from unrelated staged work, presence-sync warnings when origin is unreachable, and the requirement to keep a branch checked out.