Sidecar is a terminal-based workspace for running AI coding agents alongside file trees, task issues, Git diffs, and Jira or GitHub resources in split panes. Developers use it to monitor agent sessions, inspect files and changes, manage workspaces, and handle tasks without leaving one shell. The catalogue entries extend or guide coding-agent workflows used with Sidecar.
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.
npx skills add marcus/sidecar --skill merge-strategygit clone --depth 1 https://github.com/marcus/sidecarWrote 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/skills/marcus/sidecar/merge-strategy)<a href="https://agentmods.dev/skills/marcus/sidecar/merge-strategy"><img src="https://agentmods.dev/badge/skills/marcus/sidecar/merge-strategy/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/skills/marcus/sidecar/merge-strategy"><img src="https://agentmods.dev/badge/skills/marcus/sidecar/merge-strategy.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector warn
SkillSpector: 2 findings, up to high
These are SkillSpector’s own severities. On a checked sample its high-severity flags on skills were ~96% false positives — a documented command, a public API, a “never do X” rule — so we show them as a caution to read, not a verdict. Why →
- high Tool Misuse · line 46 Tool parameters are crafted to achieve unintended or unsafe behavior. Parameter abuse can bypass intended safety checks (e.g. shell=True, --force, dangerous glob patterns).Fix: Validate all tool parameters against an allowlist. Reject dangerous parameter values (shell=True, --force, -rf /) and use safe defaults.
- medium Rogue Agent · line 36 Skill establishes unauthorized persistence across sessions via cron jobs, startup scripts, or state files. Session persistence allows an attacker to maintain access beyond the current interaction.Fix: Remove any persistence mechanisms (cron jobs, startup scripts, state files). Skills should not maintain state across sessions without explicit user consent.
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.00063 | $0.02071 |
| Opus 5.5 | $0.00025 | $0.00828 |
| Sonnet 5.5 | $0.00013 | $0.00414 |
| Haiku 4.5 | $0.00006 | $0.00207 |
Grade A, and why
merge-strategy 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 — 226 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Merge Strategy Configuration
This skill covers sidecar's git merge and pull operations, their current implementation, known gaps, and recommended configuration patterns.
Current Implementation
Git Status Plugin Pull Strategies
Location: internal/plugins/gitstatus/pull_menu.go, internal/plugins/gitstatus/remote.go
The git-status plugin offers four pull strategies via a modal menu:
| Strategy | Command | Use Case |
|---|---|---|
| Pull (merge) | git pull |
Creates merge commit, preserves branch topology |
| Pull (rebase) | git pull --rebase |
Replays local commits on top of upstream |
| Pull (fast-forward only) | git pull --ff-only |
Only pulls if fast-forward possible (safest) |
| Pull (rebase + autostash) | git pull --rebase --autostash |
Rebase with automatic stash/unstash |
Workspace Plugin Merge Workflows
Location: internal/plugins/workspace/merge.go
PR Workflow:
- Push branch to remote
- Create PR via
gh pr create - Wait for PR merge (polling)
- Cleanup: delete worktree, branches, pull base
Direct Merge (No PR) at merge.go:430-498:
1. git fetch origin <baseBranch>
2. git checkout <baseBranch>
3. git pull origin <baseBranch>
4. git merge <branch> --no-ff -m "Merge branch '<branch>'" // Hardcoded --no-ff
5. git push origin <baseBranch>
Post-Merge Pull at merge.go:500-551:
- When on base branch:
git pull --ff-only origin <branch>(hardcoded) - Otherwise:
git fetch+git update-ref
Divergence Resolution at merge.go:644-705:
- Rebase option:
git pull --rebase origin <branch> - Merge option:
git pull origin <branch>
Known Issues and Gaps
- No configurable defaults -- users must select strategy every time
- Limited merge strategies -- direct merge hardcoded to
--no-ff, missing--ff,--ff-only,--squash, rebase-based integration - No squash merge support -- no clean-history option for main branch
- Hardcoded commit messages --
fmt.Sprintf("Merge branch '%s'", branch), no templates - Missing safety options -- no GPG signing, no
--verify-signatures, no--force-with-lease - Autostash inconsistency -- available for pull-rebase but not post-merge pull or divergence resolution
- No upstream tracking config -- remote always
origin, no configurable tracking - Limited conflict recovery -- only abort or dismiss, no continue/skip rebase
- No interactive rebase -- no squash/reorder/edit before merge
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 · 226 lines · 63 tokens per session scan A 4f3a164cec71
merge-strategy is a skill published in the GitHub repository marcus/sidecar (1,091 stars, last pushed 12d ago), licensed MIT. It adds 63 tokens to every session and 2,071 once invoked, about $0.0003 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-08-30.
Other skills, from other repositories
pre-merge
The quality gate. Takes a feature branch from "eng says done" to "checked, fixed and ready for /merge". Runs the project's preflight-resolved pipeline from devkit/policy.json components[]: sync → parallel correctness + security waves → coverage → regression tail → security/migration → PRD-consistency → verdict. A…
github-app-bot-auth
GitHub App bot authentication — setup, token rotation, and cron refresh for jessinra-megumi-dev[bot].
fix-pr-commit-titles
Bulk-rewrite commit titles on a PR branch to match [LKPR-N] format using filter-branch — avoids per-commit hook re-runs.
github-pr-workflow
GitHub PR lifecycle: branch, commit, open, CI, merge.
proposal-filing
File a new Lorekeeper proposal ticket — create markdown, create GitHub issue, commit, push. Use when requesting a new feature, filing a bug, or submitting a product idea.
commit-convention
Git commit convention for Lorekeeper — enforced by commit-msg hook. Covers author identity, ticket tags, and message format for both PM (Akane) and Dev roles.