Getting it into your agent
One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.
git clone --depth 1 https://github.com/allisoneer/agentic_auxilaryWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/commands/allisoneer/agentic_auxilary/sync_with_main_and_resolve_conflicts)<a href="https://agentmods.dev/commands/allisoneer/agentic_auxilary/sync_with_main_and_resolve_conflicts"><img src="https://agentmods.dev/badge/commands/allisoneer/agentic_auxilary/sync_with_main_and_resolve_conflicts/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/commands/allisoneer/agentic_auxilary/sync_with_main_and_resolve_conflicts"><img src="https://agentmods.dev/badge/commands/allisoneer/agentic_auxilary/sync_with_main_and_resolve_conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00019 | $0.01181 |
| Opus 5.5 | $0.00008 | $0.00472 |
| Sonnet 5.5 | $0.00004 | $0.00236 |
| Haiku 4.5 | $0.00002 | $0.00118 |
Grade A, and why
sync_with_main_and_resolve_conflicts scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 1mo ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
How it starts
The opening of the file, as written. The whole thing — 147 lines — stays where its author put it; the contents beside it link to each section on GitHub.
- Local context only (no Linear ticket required).
- Never force-push. Never use rebase in v1.
- If a push is rejected (non-fast-forward) or would require force, STOP with explicit operator instructions.
<workflow_contract>
- Follow all steps in order.
- Use
todowriteand keep exactly one todoin_progress. - All git mutation happens via a Bash child session.
- Conflict auto-resolution is ONLY allowed when ALL eligibility gates pass (see below).
- Stop immediately (ask a question / hand off) when any explicit stop condition is hit.
- Verification must run before declaring success.
- Push is normal
git pushonly; never force-push. </workflow_contract>
<step_1>
Step 1: Establish context + todo list
- Determine current branch (
git branch --show-current) and base ref (defaultorigin/main, fallbackorigin/masterif needed). - Record whether this was invoked manually or by OuterDAG (treat $ARGUMENTS as optional metadata only).
- Create todos for: preflight, fetch+behind check, merge attempt, conflict resolution (if needed), verification, push, summary. </step_1>
<step_2>
Step 2: Preflight safe starting git state (STOP conditions)
In Bash:
git status --porcelain=v2git rev-parse --abbrev-ref HEAD- Detect in-progress operations:
- If rebase in progress: STOP (do not convert to merge automatically).
- If merge in progress with unmerged paths: continue to conflict workflow (Step 4) rather than starting a new merge. STOP if:
- working tree is dirty (uncommitted/untracked changes) AND no merge is in progress
- HEAD is detached
- base ref cannot be resolved after fetch </step_2>
<step_3>
Step 3: Fetch + merge origin/main (no rebase)
In Bash:
git fetch origin --prune- If
origin/mainis already merged (ancestor of HEAD), you may still run verification and push if local commits exist. - Attempt merge:
git merge --no-edit origin/mainIf merge succeeds with no conflicts: proceed to verification (Step 5). If merge reports conflicts: proceed to Step 4. </step_3>
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 1mo ago First seen · 147 lines · 19 tokens per session scan A 9f0bc3c4007a
sync_with_main_and_resolve_conflicts is a command published in the GitHub repository allisoneer/agentic_auxilary (79 stars, last pushed 6d ago), licensed MIT. It adds 19 tokens to every session and 1,181 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-08.
Other commands, from other repositories
merge-conflict-analysis
You are analyzing merge conflicts for PR #${{ pr-number }}.
release-notes
Generate consistent, well-structured release notes from git history. Triggered on release tags following semver patterns (v..) to produce categorized changelog with breaking changes, features, fixes, and contributor attribution.
commit
A command that examines staged Git changes and proposes a commit message using the Conventional Commits format, such as feat, fix, or docs. Git is a tool for tracking changes to code.
repo-audit
Audit a codebase (local or remote GitHub/GitLab) against architecture principles and requirements, surfacing drift, risk, and missing decisions.
pr
Handle the full workflow from current branch state to an open, CI-monitored pull request.
release-plan
A release-planning command for a software change. It documents the release scope, rollback plan, gradual or full rollout, and monitoring before waiting for human approval.