From adca8fa213c409543a6186b4910c8b60638a5569 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sun, 23 Aug 2026 14:38:40 +0000
Subject: [PATCH] fix(git-github-workflow): include untracked files in stash

Update .agents/skills/git-github-workflow/run.sh to stage all changes
before running the quality gate in agent_commit and use git stash push -u
in agent_post_merge_validate to include untracked files.

Co-authored-by: d-oit <6849456+d-oit@users.noreply.github.com>
---
 .agents/skills/git-github-workflow/run.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.agents/skills/git-github-workflow/run.sh b/.agents/skills/git-github-workflow/run.sh
index 617771c6..ac5eb366 100755
--- a/.agents/skills/git-github-workflow/run.sh
+++ b/.agents/skills/git-github-workflow/run.sh
@@ -233,7 +233,11 @@ agent_commit() {
         BRANCH_NAME="$current_branch"
     fi
     
-    # Run quality gate first
+    # Stage ALL changes before running quality gate so all files are tracked
+    log "Staging ALL changes..."
+    git add -A
+
+    # Run quality gate
     log "Running quality gate..."
     if [[ -x "$REPO_ROOT/scripts/quality_gate.sh" ]]; then
         if ! "$REPO_ROOT/scripts/quality_gate.sh"; then
@@ -244,10 +248,6 @@ agent_commit() {
         warn "quality_gate.sh not found, skipping"
     fi
     
-    # Stage ALL changes
-    log "Staging ALL changes..."
-    git add -A
-    
     # Create commit
     log "Creating commit..."
     if ! git commit -m "$MESSAGE"; then
@@ -549,9 +549,9 @@ agent_post_merge_validate() {
     log "Checking out main branch..."
     cd "$REPO_ROOT"
     
-    # Stash any changes
+    # Stash any changes (including untracked files)
     if [[ -n $(git status --porcelain) ]]; then
-        git stash push -m "workflow-stash-$(date +%s)"
+        git stash push -u -m "workflow-stash-$(date +%s)"
     fi
     
     git checkout main