diff --git a/.opencode/agents/engineer.md b/.opencode/agents/engineer.md
index d31fd17f88..b85205f031 100644
--- a/.opencode/agents/engineer.md
+++ b/.opencode/agents/engineer.md
@@ -31,3 +31,7 @@ Requirements:
   exact commands).
 * Make small and logical commits following the commit guideline described in
   `CONTRIBUTING.md`. Commit only when explicitly asked.
+- Do not guess or hallucinate git author information (Name or Email). Never include the
+  `--author` flag in git commands unless specifically instructed by the user for a unique
+  case; assume the local environment is already configured. Allow git commit to
+  automatically pull the identity from the local git config `user.name` and `user.email`.
diff --git a/.opencode/agents/testing.md b/.opencode/agents/testing.md
index 299b5a7112..17c19aade1 100644
--- a/.opencode/agents/testing.md
+++ b/.opencode/agents/testing.md
@@ -31,3 +31,7 @@ Requirements:
   commands).
 * Make small and logical commits following the commit guideline described in
   `CONTRIBUTING.md`. Commit only when explicitly asked.
+- Do not guess or hallucinate git author information (Name or Email). Never include the
+  `--author` flag in git commands unless specifically instructed by the user for a unique
+  case; assume the local environment is already configured. Allow git commit to
+  automatically pull the identity from the local git config `user.name` and `user.email`.