Fix --green retry counter reset after pushing new commits

When --green pushes a fix commit, it should reset the retry counter to 0
since it's a new commit that deserves its own set of retry attempts.

Previous behavior:
- Attempt 1: Check commit A, fail, fix, push commit B, retryCount = 1
- Attempt 2: Check commit B, fail, fix, push commit C, retryCount = 2
- Attempt 3: Check commit C, fail, give up (retryCount >= maxRetries-1)

Fixed behavior:
- Attempt 1: Check commit A, fail, fix, push commit B, retryCount = 0
- Attempt 1: Check commit B, fail, fix, push commit C, retryCount = 0
- Attempt 1: Check commit C, fail, fix, push commit D, retryCount = 0
- (continues with proper retry attempts for each new commit)

Also adds 15-second wait after pushing to allow new CI run to start.

Author: jdalton

scripts/claude.mjs

@@ -8,9 +8,11 @@ import { spawn } from 'node:child_process'
 import { existsSync, promises as fs } from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { parseArgs } from '@socketsecurity/lib/argv/parse'
+
 import colors from 'yoctocolors-cjs'
 
+import { parseArgs } from '@socketsecurity/lib/argv/parse'
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const rootPath = path.join(__dirname, '..')
 const parentPath = path.join(rootPath, '..')
@@ -3395,7 +3397,15 @@ Let's work through this together to get CI passing.`
         currentSha = newShaResult.stdout.trim()
         pushTime = Date.now()
 
-        retryCount++
+        // Reset retry count for new commit - it deserves its own attempts
+        log.substep(
+          `New commit ${currentSha.substring(0, 7)}, resetting retry counter`,
+        )
+        retryCount = 0
+
+        // Wait for new CI run to start
+        log.substep('Waiting 15 seconds for new CI run to start...')
+        await new Promise(resolve => setTimeout(resolve, 15_000))
         continue
       }
 
@@ -3589,6 +3599,8 @@ Fix all issues by making necessary file changes. Be direct, don't ask questions.
           },
         )
 
+        let pushedNewCommit = false
+
         if (fixStatusResult.stdout.trim()) {
           log.progress('Committing CI fixes')
 
@@ -3636,14 +3648,28 @@ Fix all issues by making necessary file changes. Be direct, don't ask questions.
             )
             currentSha = newShaResult.stdout.trim()
             pushTime = Date.now()
+            pushedNewCommit = true
+
+            // Reset retry count for new commit - it deserves its own attempts
+            log.substep(
+              `New commit ${currentSha.substring(0, 7)}, resetting retry counter`,
+            )
+            retryCount = 0
+
+            // Wait for new CI run to start
+            log.substep('Waiting 15 seconds for new CI run to start...')
+            await new Promise(resolve => setTimeout(resolve, 15_000))
           } else {
             log.warn(
               `Git commit failed: ${commitResult.stderr || commitResult.stdout}`,
             )
           }
         }
 
-        retryCount++
+        // Only increment retry count if we didn't push a new commit
+        if (!pushedNewCommit) {
+          retryCount++
+        }
       } else {
         log.error(`CI still failing after ${maxRetries} attempts`)
         log.substep(