GitHub Sync

Agents created from a Git template automatically get sync configured. The default mode is Source (pull-only).

Before every push, Trinity rebuilds the agent's .gitignore around its own rules and then untracks anything the rules now cover:

# >>> Trinity default ignore rules — managed; your own rules go BELOW and win >>>
   (caches, virtualenvs, local databases, generated content, …)
# <<< Trinity default ignore rules <<<
   (the agent's own rules, in their original order)
# >>> Trinity protected rules — managed; NOT overridable >>>
   (credential files and the agent's .trinity/ state)
# <<< Trinity protected rules <<<

The order is the point. Git is last-match-wins, so the managed defaults sit above the agent's own rules and a !negation the agent wrote keeps winning — a file the agent chose to keep is never silently untracked by the platform's defaults. The protected floor at the bottom cannot be overridden, so a stray rule can never re-track a credential file or drop the agent's .trinity/ hooks. The rebuild is idempotent: an unchanged file is left untouched, so the auto-sync loop has nothing to re-commit.

A Push then reports what the sweep changed. The sync response and the git_sync MCP result carry removed_paths (tracked → untracked by this push), unignored_paths (newly un-ignored and committed by this same push), and shadowed_negations (a !rule of yours that a managed pattern still overrides — the deciding pattern is named); the Git tab's toast and the commit message state the untracked and un-ignored counts and paths. When a push actually changed what is tracked, Trinity also files an operator-queue notice — Push untracked files that now match .gitignore, Push committed files that were previously gitignored, or Push changed which files are tracked (.gitignore sweep) — naming the paths, so an unattended scheduled sync cannot untrack files for weeks without anyone noticing. Find it on the Operations page. A newly un-ignored path that was a secret is already in the remote's history: rotate it and remove the rule.

One limit, reported rather than fixed: many default patterns are directory-form (node_modules/, content/), and git never descends into an excluded directory, so a negation beneath one is inert wherever it sits. Such rules appear under shadowed_negations.

Agents created without a Git repository can be connected after the fact:

When sync can't complete cleanly, Trinity opens the Git Conflict Modal with a plain-English explanation and operator-readable resolution options. The modal classifies the conflict into one of six cases:

Each class renders a title, bullet-point explanation, and recommendation. Raw git stderr is hidden inside a collapsible <details> for developers.

Parallel history

Trinity detects parallel history at modal open by computing the common ancestor (git merge-base HEAD origin/<branch>). When no shared ancestor exists and the upstream is ahead, the modal replaces the standard Pull First / Force Push buttons with a clearer choice:

Branch ownership enforcement

Working branches are ownership-locked at the database layer. If two agent instances try to push to the same branch simultaneously, the losing push fails with a "stale info — remote SHA has moved" error. Retry the sync; the winner's state is already upstream.

This is enforced silently — you only see the error if you trigger parallel syncs (e.g. UI + scheduled job at the same moment).

Trinity supports Gitea, GitHub Enterprise Server, and other Git hosts via two environment variables on the backend:

Trailing slashes are stripped automatically. Defaults target github.com and https://api.github.com— existing deployments need no changes. Agent creation and sync flows work identically regardless of the underlying host.