--- name: setup-git description: > Initialize safe version control, including an optional commit of the tree before setup changes it. Trigger when the user asks to initialize version control, add ignore rules, or make the first commit. This action owns first-time git setup only. Before the first commit, ask once which unknown hidden files and review paths to keep tracked. When loaded for the pre-change snapshot, commit the current tree before other setup writes, then return. metadata: role: helper modelTier: small --- # Set Up Git ## Pre-change snapshot Run this section only when `setup-ml-project` loaded this skill for the pre-change snapshot. Do not run Lookup. Do not `scaffold`. Do not ask whether later stages commit. Then return to `setup-ml-project`. 1. Run `python -m skore_skills git snapshot`. 2. `action` `skip` and `reason` `already`: return. Do not persist again. 3. `action` `skip` and `reason` `clean` or `nothing_to_commit`: persist `python -m skore_skills policy set git.snapshot skipped`, then return. Do not ask. Do not `git commit`. 4. `action` `ask`: **AskUserQuestion**. Recommend committing. In 2–4 lines, say this commit records the workspace as it is now, so the user can return to it before setup changes anything. It does not change whether later stages commit. A file link is an addition, never the context. - No: persist `python -m skore_skills policy set git.snapshot declined`. Do not `git init`, `git add`, or `git commit`. Return. - Yes: continue. Persist `python -m skore_skills policy set git.snapshot committed` after the commit exits 0. 5. On yes, if `repo` is false, run `git init -b main` before adding files. The initial branch is `main`. Do not `git config`. Do not name that branch `master`. 6. If `ambiguous_dotfiles` or `review_paths` is non-empty, ask **once** which of those paths to keep tracked. List every hidden path and each review `path` with its `kind`. Say that paths they do not keep are ignored. Do not ask a second question for the other list. Copy paths from the JSON. Then: - `ambiguous_dotfiles` was non-empty → `python -m skore_skills git ignore-merge --decide` plus `--keep ` for each chosen hidden path (no `--keep` if they keep none). - `review_paths` was non-empty → `python -m skore_skills git review-decide` with `--keep ` for each chosen path and `--ignore ` for every other path in that list (no `--keep` if they keep none). Pass a folder path through with its trailing slash. Empty lists: do not ask, and do not run `git ignore-merge`. Never `--keep` `.env` or `.skore`. Exit code 2 from those commands is structured JSON, not a command failure. 7. `git status`. `git add -- ` only `staged` paths that are not still listed in `review_paths`, plus hidden paths the user kept. Never stage `.env`, `.skore`, `.venv`, `.pixi`, or another must-ignore tool directory. Never stage a review path that was not kept. 8. `git commit -m ""`. The subject states that this is the workspace before setup changes it. Only this section uses that subject. ## Lookup Run `status` first. Take the first row that matches, then run its steps from the Sequence below. Do not stop after reading the table. | `policy.git.autocommit` | Situation | Steps | Ask | Commit | |---|---|---|---|---| | `on` or `off`, user asks to change it | HEAD exists, or the new value is `off` | 1, 9 | the autocommit question only | no | | `on` or `off`, user asks to change it | new value `on`, no HEAD | 1, 7, 8, 9 | autocommit, then one keep question if `review_paths` is non-empty | yes | | `null` | any | 2, 3, 4, then only the Ask and Commit of the row for the persisted answer. Do not run steps 2 or 3 again | autocommit once | per that row | | `off` | any | 2, 3, 5, 9 | nothing | no | | `on` | `policy.git.snapshot` is `committed` and `git status` is dirty | 2, 3, 7, 8, 9 | one keep question only if `ambiguous_dotfiles` or `review_paths` is non-empty | yes, the setup changes only | | `on` | HEAD exists | 2, 3, 6, 9 | nothing | no | | `on` | no HEAD | 2, 3, 7, 8, 9 | one keep question only if `ambiguous_dotfiles` or `review_paths` is non-empty | yes | The keep question is one question. After step 3 it lists every hidden path and every review `path` with its `kind`. The change-to-`on` row did not run ignore-merge: list only `review_paths`. Exit code 2 from `git ignore-merge`, `git review`, or `git review-decide` is structured JSON, not a command failure. ## Sequence 1. Run `python -m skore_skills status`. If the user asked to change the commit choice and `policy.git.autocommit` is already `on` or `off`, re-ask that question and persist `on` or `off`. Do not `git init`. Do not `git ignore-merge`. If the new value is `on` and the repo has no HEAD yet, continue at the first-commit review (step 7). If the new value is `off`, or `on` and HEAD exists, stop this sequence: use the return rule in step 9 and do not continue at step 2. Do not invent another commit. Later stages follow the new value. Otherwise, if autocommit is already `on` or `off`, do not ask that question again. 2. If there is no `.git` directory, run `git init -b main`. The initial branch is `main`. Do not run `git config`. Do not name that branch `master`. Do not rename a branch that already exists. 3. Run `python -m skore_skills git ignore-merge`. Keep the JSON `ambiguous_dotfiles` list. Exit code 2 is that structured list, not a command failure. Do not ask yet. 4. If `policy.git.autocommit` is `null`, ask **once**: should later stages persist with `git commit` (`on`) or never (`off`)? State in 2–4 lines what the answer authorizes — commits at the end of later stages, starting with the first commit this turn — and which paths stay ignored; a file link is an addition, never the context. Persist with `python -m skore_skills policy set git.autocommit on` or `off`. That answer is also consent for the first commit. It does not authorize tracking `ambiguous_dotfiles` or `review_paths`. When `setup-ml-project` already persisted `on` or `off` this turn, do not ask again. 5. If autocommit is `off`, stop. Do not ask which files to keep. Do not `git commit`. Use the return rule in step 9. 6. If autocommit is `on` and HEAD exists, stop after ignore-merge. Do not use this step when `policy.git.snapshot` is `committed` and `git status` is dirty; that row commits the setup changes. Do not ask which files to keep. Do not invent another commit. Later stages use `python -m skore_skills git end-turn --stage ` then `persist-ml-git`, where `` is `setup`, `data_analysis`, `implement`, `evaluate`, or `backlog`. When that skill is not installed, those stages report the pending paths instead of committing. 7. If autocommit is `on` and (this repo has no HEAD yet, or `policy.git.snapshot` is `committed` and `git status` is dirty), run `python -m skore_skills git review`. When `git.snapshot` is `committed`, the step 8 commit is only the changes since that snapshot. Do not ask to snapshot again. When this step is reached from step 1, ignore-merge did not run: use only `review_paths`. If `ambiguous_dotfiles` and `review_paths` are both empty, do not ask. If either list is non-empty, ask **once** which of those paths to keep tracked. List every hidden path and each review `path` with its `kind`. Say that paths they do not keep are ignored. Do not ask a second question for the other list. Copy paths from the JSON; do not reclassify them. Do not ask about file size, artifacts, or datasets when `review_paths` is empty, and do not ask about hidden files when `ambiguous_dotfiles` is empty. Then: - `ambiguous_dotfiles` was non-empty → re-run `python -m skore_skills git ignore-merge --decide` plus `--keep ` for each chosen hidden path (no `--keep` if they keep none). - `review_paths` was non-empty → `python -m skore_skills git review-decide` with `--keep ` for each chosen path and `--ignore ` for every other path in that list (no `--keep` if they keep none). Pass a folder path through with its trailing slash so the ignore line is that folder. Exit code 2 from `git review` or `git review-decide` is the structured review outcome, not a generic command failure: read its JSON. The question in this step is that decision; do not ask again. If `review-decide` still lists paths, rerun it with the same choices. Run only the command for a list that was non-empty. Do not re-ask paths gone from the next JSON. Never `--keep` `.env` or `.skore`. 8. Then `git status`. `git add -- ` only paths that are not still listed in `review_paths`, and `git commit -m ""` from this setup turn. The subject describes the files committed now. It does not say this commit is the state before setup changes. Do not ask a second time about autocommit. Never stage `.env` or `.skore`. 9. When `setup-ml-project` dispatched this turn and is in this session, return control to it. Otherwise load `triage-ml-task` if `status.skills` reports it installed, else stop. ## Stop conditions - Never overwrite `.gitignore`; `git ignore-merge` unions packaged rules. - Never stage `.env`, `.skore`, or a review path that was not kept. - Never split hidden files and review paths into two questions before the first commit. - Never push, create a remote, amend, rebase, or set git identity. - The initial branch is `main`. Do not name it `master`. Do not rename a branch that already exists. - Do not call `python -m skore_skills git end-turn --stage …` to create the first commit. - The pre-change snapshot does not `scaffold`. It does not run `git ignore-merge` unless `ambiguous_dotfiles` was non-empty. - Lookup does not use the pre-change snapshot commit subject.