From 22da851f444adb3dff78f8a30fe795f6536a5e0a Mon Sep 17 00:00:00 2001 From: "anthony.wen" Date: Mon, 27 Apr 2026 14:54:33 -0400 Subject: [PATCH] docs: narrow ATVM e2e cypress git drafting rules Update the ATVM git instructions so controller-repo git drafting and the SSH-prefixed push example only apply when the operator explicitly asks for the e2e cypress repo or a close variation. Align AGENTS.md with git-guide.md so generic ATVM git requests no longer assume the controller repo by default. --- atvm/AGENTS.md | 4 ++-- atvm/git-guide.md | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/atvm/AGENTS.md b/atvm/AGENTS.md index ca75fd0..f6cbd9e 100644 --- a/atvm/AGENTS.md +++ b/atvm/AGENTS.md @@ -66,9 +66,9 @@ This file defines how to operate and maintain the ATVM workspace in `/home/aw/co - Never execute setup or automation commands that require approval until the operator explicitly approves them. - For ATVM run approvals, treat `approve` as run-with-watcher and `approve without watcher` as run-without-watcher. - Treat git/commit requests as a separate approval gate. -- Follow `/home/aw/code/cds/atvm/git-guide.md` for ATVM git command drafting and commit-request handling, including the default controller repo, SSH command prefix, and the rule that phrases such as `create me a git`, `create a git`, `create a git description`, `make me a git`, `make a git`, `make me a git description`, `create me a git description`, and close variations are prepare-only until the operator explicitly approves the displayed commit command. +- Follow `/home/aw/code/cds/atvm/git-guide.md` for ATVM git command drafting and commit-request handling, including the rule that the controller `e2e cypress` repo behavior only applies when the operator explicitly asks for the `e2e cypress` repo or a close variation, the rule to draft plain git commands rather than SSH-wrapped controller login commands unless explicitly requested, the SSH-prefixed push example requirement for that repo, and the rule that phrases such as `create me a git`, `create a git`, `create a git description`, `make me a git`, `make a git`, `make me a git description`, `create me a git description`, and close variations are prepare-only until the operator explicitly approves the displayed commit command. - Never execute `git push` from the assistant for this workspace. -- After creating a local commit, stop and give the operator the exact manual push command reference, defaulting to `git push origin main` unless they explicitly ask for a different remote or branch. +- After creating a local commit for the explicitly requested `e2e cypress` controller repo, stop and give the operator the exact manual SSH-prefixed push command reference from `git-guide.md`, unless they explicitly ask for a different remote or branch. - Do not treat `approve` after a commit as permission to push; pushing requires separate explicit wording and still remains manual-reference-only unless the operator explicitly overrides this workspace rule. - After `cmc-templates.py`, always verify that the generated spec files and the config `specPattern` still include every requested VM before starting `run-sorry-cypress.py`. - If any requested VM is missing after template generation, stop and report the mismatch instead of launching the runner. diff --git a/atvm/git-guide.md b/atvm/git-guide.md index 9524112..5064e69 100644 --- a/atvm/git-guide.md +++ b/atvm/git-guide.md @@ -3,7 +3,10 @@ This file records ATVM-specific git workflow preferences for `/home/aw/code/cds/atvm`. ## Repository Reference -- For ATVM git command drafting, assume the primary operator-managed repo is `/root/cdc-e2e-cyp-12.17.4` unless the operator explicitly says otherwise. +- Do not assume the controller repo by default for every ATVM git request. +- Only switch the default drafted repo to `/root/cdc-e2e-cyp-12.17.4` when the operator explicitly asks for the `e2e cypress` repo or a close variation such as `give me a git for the e2e cypress`. +- When the operator explicitly targets the `e2e cypress` repo, draft the git command itself for that controller repo. +- Do not wrap drafted git commands in an SSH login command to the controller unless the operator explicitly asks for the SSH wrapper too. ## Execution Rule - For this ATVM workspace, do not automatically perform any git-related command. @@ -14,7 +17,7 @@ This file records ATVM-specific git workflow preferences for `/home/aw/code/cds/ - Assume the operator will always run ATVM git commands manually. ## SSH Default -- When drafting git commands for the controller repo and SSH-backed git access is needed, use this exact prefix: +- When drafting git commands for the explicitly requested `e2e cypress` controller repo and SSH-backed git access is needed, use this exact prefix: `GIT_SSH_COMMAND='ssh -i ~/.ssh/id_ed25519_anthony -o IdentitiesOnly=yes'` - Prefer complete copy-pasteable command sequences that include that prefix for `git fetch`, `git pull`, and `git push` examples when applicable. @@ -26,6 +29,7 @@ This file records ATVM-specific git workflow preferences for `/home/aw/code/cds/ - The proposed `git commit` command should match the full proposed message, including the detailed body when one is warranted. - After the proposed commit message, show the exact `git commit` command that would be used. - Write the proposed ATVM git commands to `/tmp/commit.txt`. +- When drafting a commit for the explicitly requested `e2e cypress` controller repo, present the plain `git add ...` / `git commit ...` command sequence the operator should run after logging into the controller repo, not an SSH-wrapped controller-login command. - If the operator asks for a git commit, do not commit immediately. - First show both: - the proposed commit description/message @@ -59,7 +63,9 @@ This file records ATVM-specific git workflow preferences for `/home/aw/code/cds/ - draft the exact remote/branch already established in the current ATVM context - Default generic push form: `GIT_SSH_COMMAND='ssh -i ~/.ssh/id_ed25519_anthony -o IdentitiesOnly=yes' git push` -- When reminding the operator about the push command after a commit proposal or completed commit, display the SSH-prefixed push command without assuming `origin main` unless that remote/branch was explicitly established. +- When reminding the operator about the push command after a commit proposal or completed commit for the explicitly requested `e2e cypress` controller repo, always display the SSH-prefixed push command without assuming `origin main` unless that remote/branch was explicitly established. +- Every commit draft response for the explicitly requested `e2e cypress` controller repo must include the SSH-prefixed push example. +- Every post-commit response for the explicitly requested `e2e cypress` controller repo must include the SSH-prefixed push example. - Write the proposed push command to `/tmp/commit.txt`. ## Commit Scope