A one-line fix should not require a reviewer to reverse-engineer fourteen files
across three subsystems. This skill compares a git diff with its stated intent,
surfaces scope signals, and turns them into keep, split, or justify decisions.
Everything runs locally. The script makes no network calls and does not change
the working tree, index, commits, or branches.
Use the user's one-line intent when available. Keep it concrete, such asfix null dereference in parser or add retry limit to webhook delivery.
If no intent was given, the script falls back to the current branch name. If
that name is generic, detached, or unrelated to the work, ask for one line of
intent before treating relatedness as meaningful.
Run from this skill directory and point --repo at the target repository.
Working tree diff:
python3 scripts/scope_creep.py --repo /path/to/repo \
--intent "fix null dereference in parser" --json
Staged diff:
python3 scripts/scope_creep.py --repo /path/to/repo --staged \
--intent "fix null dereference in parser" --json
Branch diff against a merge base:
python3 scripts/scope_creep.py --repo /path/to/repo --base main \
--intent "fix null dereference in parser" --json
Saved diff or stdin:
python3 scripts/scope_creep.py --diff change.diff --intent "parser fix" --json
git diff --staged | python3 scripts/scope_creep.py --diff - \
--intent "parser fix" --json
Use --hunk-threshold only when the repository has a documented reason to
change the default churn threshold. Do not tune the threshold merely to make a
warning disappear.
Read references/scope-signals.md before making a
recommendation. Treat the classifier as triage evidence, not proof of authorial
intent.
in_scope: file paths with at least one intent/path keyword overlaplikely_creep: paths without overlap, with the reason and detected signalsnew_deps: dependencies introduced in supported manifest formatsapi_renames: nearby removed and added public function or class declarationsconfig_edits: CI, container, build, YAML, and TOML changesstats: churn, subsystem counts, oversized hunks, and formatting-only filesEmpty arrays are evidence too. Say that no signal was detected, not that the
diff is guaranteed to be in scope.
Give every item in likely_creep one disposition:
is direct. Explain the connection in one sentence.
introduces a dependency, API rename, config edit, or large hunk that is not
required for the intent. Name the files or hunks for the follow-up change.
invariant or build constraint that requires it and call out reviewer risk.
Prefer split when evidence is ambiguous. Never claim that a zero overlap score
proves a file is unrelated. Path vocabulary is a cheap, deterministic proxy.
Use this compact structure:
Name file paths and hunk headers. For an oversized mixed hunk, explain that the
script cannot split it automatically and describe the smallest coherent edit.
Ask before applying any split, revert, staging, or commit operation.
scripts/scope_creep.py: deterministic unified-diff parser and classifierreferences/scope-signals.md: signal definitions, thresholds, and limits