resolve-rebase-conflicts
Pass
Audited by Gen Agent Trust Hub on Oct 11, 2026
Risk Level: SAFEINDIRECT_PROMPT_INJECTIONEXTERNAL_DOWNLOADSCOMMAND_EXECUTIONDYNAMIC_EXECUTION
Full Analysis
- [INDIRECT_PROMPT_INJECTION]: The skill processes untrusted data from git conflict stages, which could potentially contain malicious instructions. \n
- Ingestion points:
scripts/classify-conflicts.shandscripts/take-side.shread unmerged file versions from the git index. \n - Boundary markers: The skill relies on standard git conflict markers and diff output formatting to delimit content. \n
- Capability inventory: The skill can write files to the repository and stage them via
git add. \n - Sanitization: No explicit sanitization of the file content is performed. \n- [EXTERNAL_DOWNLOADS]: The Python script
scripts/conflict_shape.pyspecifies a requirement for Python 3.14. Theuvtool may download this version from official Python distribution sources if it is not found on the local system. \n- [COMMAND_EXECUTION]: The skill uses shell scripts to automate git operations and includes aPreToolUsehook (scripts/guard-resolve.sh) to block dangerous git flags and prevent staging files with unresolved markers. \n- [DYNAMIC_EXECUTION]: An internal verification step inscripts/resolve-union.shexecutes a hardcoded Python script via a heredoc to verify the integrity of the resolved content.
Audit Metadata