Repository navigation
[FEATURE]: Add includeGitInstructions config option to control git instruction injection in tool prompts #23014
Description
Problem
OpenCode currently hardcodes git commit/PR workflow instructions (~1,300 tokens per turn) into the Bash tool's description template. These instructions are always injected with no way to disable them.
For users who:
- Have their own git workflow instructions via plugins (e.g., oh-my-opencode's
git-masterskill) - Use custom AGENTS.md/CLAUDE.md rules for git behavior
- Want to maximize context window for complex tasks
...these hardcoded instructions waste significant tokens every turn.
Measured token impact
Extracted from compiled binary (v1.4.7) and measured with tiktoken:
| Section | Tokens (cl100k_base) | Chars |
|---|---|---|
# Committing changes with git |
806 | 3,702 |
# Creating pull requests |
404 | 1,909 |
# Other common operations |
4 | 24 |
| Total | 1,259 | 5,795 |
Cumulative cost (resent every turn):
| Scenario | Token waste | Cost (Opus @ $15/M input) |
|---|---|---|
| 50-turn session | ~63K | $0.94 |
| 10 sessions/day | ~630K | $9.44 |
| Monthly (22 work days) | ~13.8M | $207.74 |
Claude Code comparison
Claude Code already implements this via:
- Setting:
includeGitInstructions: falseinsettings.json - Env var:
CLAUDE_CODE_DISABLE_GIT_INSTRUCTIONS=1 - Source:
src/utils/gitSettings.ts→shouldIncludeGitInstructions()
When disabled, it removes the commit/PR instruction blocks from the Bash tool prompt and git status from system context.
Proposed Solution
Add an includeGitInstructions config option (default: true for backward compatibility):
{
"$schema": "https://opencode.ai/config.json",
"includeGitInstructions": false
}And/or an environment variable:
OPENCODE_DISABLE_GIT_INSTRUCTIONS=1Implementation hint
In the bash tool description builder, add a conditional check before including the git sections:
if (shouldIncludeGitInstructions()) {
description += GIT_COMMIT_INSTRUCTIONS + GIT_PR_INSTRUCTIONS
}Impact
- Token savings: ~1,300 tokens per turn
- Backward compatible: Default
truepreserves current behavior - Precedent: Claude Code already ships this feature
Environment
- OpenCode version: 1.4.7
- OS: macOS (Darwin, ARM64)
- Using oh-my-opencode plugin with custom git workflow skills
Activity
github-actions commentedon Apr 17, 2026
This issue might be a duplicate of existing issues. Please check:
Please review that issue and consider whether your request adds something distinct (e.g., the explicit config toggle / env var approach vs. moving to system prompt). If so, it may be worth clarifying the difference.
ChungHwemo commentedon Apr 17, 2026
Token measurement correction
I ran actual measurements against the compiled binary (v1.4.7). The extracted git instructions (
# Committing changes with git+# Creating pull requests+# Other common operations) are:Raw text
Token counts
Per-section breakdown (cl100k_base)
# Committing changes with git# Creating pull requests# Other common operationsCumulative cost (these tokens are resent every turn)
Correcting my original estimate: it's ~1,300 tokens/turn, not ~3,000+. Still significant over time.
Methodology
github-actions commentedon Jul 5, 2026
To stay organized issues are automatically closed after 60 days of no activity. If the issue is still relevant please open a new one.