Working With Git

Figure out what the user expects

This user monitors changes via a git GUI client. This not only visualizes agent changes well, but also catches e.g. tests that created files in the wrong place.

If we're not in a development branch

i.e. we're currently on 'main' or 'master': by default, the user expects you to use git only for reading.

You make the code changes; the user will review. They may then revert, hand-edit, commit, or stage some or all of the changes. On their next prompt they expect you to detect the modified state.

'use git only for reading' includes git status, git branch, git show, git log. Don't commit, rebase, checkout, merge, or push without explicit instruction. Leave the staging area alone — the user often accumulates accepted changes there instead of committing at every step.

If we ARE in a development branch

Same default. But if the user asked you to do a series of changes / commits, then commit after each step. You can assume that if you find yourself in a development branch for the step we're working on, then committing changes is safe. Still: don't rebase, checkout, merge, or push without explicit instruction.