@xn-intenton-z2a/agentic-lib 7.4.27 → 7.4.29

package/.github/workflows/agentic-lib-bot.yml

@@ -87,7 +87,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
           sparse-checkout: ${{ env.configPath }}
           sparse-checkout-cone-mode: false
       - name: Normalise params
@@ -116,7 +116,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
 
       - uses: actions/setup-node@v6
         with:

package/.github/workflows/agentic-lib-flow.yml

@@ -96,6 +96,8 @@ jobs:
   update:
     if: inputs.mode != 'skip'
     uses: ./.github/workflows/agentic-lib-update.yml
+    with:
+      skip-tests: 'true'
     secrets: inherit
 
   # ── Phase 0b: Init (purge/reseed/update) ───────────────────────────
@@ -693,7 +695,42 @@ jobs:
           git add BENCHMARK_REPORT_FLOW_*.md
           git diff --staged --quiet && echo "No report to commit" && exit 0
           git commit -m "flow: benchmark report for ${{ inputs.mission-seed }} (${{ inputs.workflow-runs }} runs) [skip ci]"
-          git push origin main || echo "Push failed — report saved as artifact"
+          MAX_RETRIES=3
+          PUSH_SUCCESS=""
+          for attempt in $(seq 1 $MAX_RETRIES); do
+            case $attempt in
+              1)
+                echo "=== Attempt 1: rebase (cleanest) ==="
+                git pull --rebase origin main || {
+                  git rebase --abort 2>/dev/null || true
+                  sleep $((10 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              2)
+                echo "=== Attempt 2: merge (handles non-overlapping changes) ==="
+                git pull --no-rebase origin main || {
+                  git merge --abort 2>/dev/null || true
+                  sleep $((20 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              3)
+                echo "=== Attempt 3: merge -X theirs (accept remote on conflict) ==="
+                git pull -X theirs --no-rebase origin main || {
+                  git merge --abort 2>/dev/null || true
+                  sleep $((30 + RANDOM % 10))
+                  continue
+                }
+                ;;
+            esac
+            git push origin main && { PUSH_SUCCESS="true"; break; }
+            echo "Push failed on attempt $attempt"
+            sleep $((attempt * 10 + RANDOM % 10))
+          done
+          if [ "$PUSH_SUCCESS" != "true" ]; then
+            echo "::warning::Failed to push report after $MAX_RETRIES attempts — saved as artifact"
+          fi
 
       - name: Upload report artifact
         uses: actions/upload-artifact@v4

package/.github/workflows/agentic-lib-init.yml

@@ -48,6 +48,10 @@ on:
         type: string
         required: false
         default: "false"
+      run-workflow:
+        type: string
+        required: false
+        default: "true"
   workflow_dispatch:
     inputs:
       mode:
@@ -131,6 +135,11 @@ on:
         type: boolean
         required: false
         default: false
+      run-workflow:
+        description: "Dispatch agentic-lib-workflow after init completes"
+        type: boolean
+        required: false
+        default: true
 
 permissions: write-all
 
@@ -179,7 +188,7 @@ jobs:
       - uses: actions/checkout@v6
         if: inputs.dry-run == 'true' || inputs.dry-run == true
         with:
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
       - uses: actions/checkout@v6
         if: inputs.dry-run != 'true' && inputs.dry-run != true
         with:
@@ -350,20 +359,47 @@ jobs:
           else
             git commit -m "init ${INIT_MODE} (agentic-lib@${VERSION}) [skip ci]"
           fi
-          for attempt in 1 2 3; do
-            # Use HEAD:refs/heads/main to handle detached HEAD state
-            git push origin HEAD:refs/heads/main && break
-            echo "Push failed (attempt $attempt) — pulling and retrying"
-            git pull --rebase origin main || {
-              echo "Rebase conflict — aborting rebase and retrying"
-              git rebase --abort 2>/dev/null || true
-            }
-            sleep $((attempt * 2))
-            if [ "$attempt" -eq 3 ]; then
-              echo "::error::Failed to push after 3 attempts"
-              exit 1
-            fi
+          MAX_RETRIES=3
+          PUSH_SUCCESS=""
+          for attempt in $(seq 1 $MAX_RETRIES); do
+            # Tiered conflict resolution (mirrors fix-stuck strategy)
+            case $attempt in
+              1)
+                echo "=== Attempt 1: rebase (cleanest) ==="
+                git pull --rebase origin main || {
+                  echo "Rebase conflict on attempt 1 — aborting rebase"
+                  git rebase --abort 2>/dev/null || true
+                  sleep $((10 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              2)
+                echo "=== Attempt 2: merge (handles non-overlapping changes) ==="
+                git pull --no-rebase origin main || {
+                  echo "Merge conflict on attempt 2 — aborting merge"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((20 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              3)
+                echo "=== Attempt 3: merge -X theirs (accept remote on conflict) ==="
+                git pull -X theirs --no-rebase origin main || {
+                  echo "Merge -X theirs failed on attempt 3"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((30 + RANDOM % 10))
+                  continue
+                }
+                ;;
+            esac
+            git push origin HEAD:refs/heads/main && { PUSH_SUCCESS="true"; break; }
+            echo "Push failed on attempt $attempt"
+            sleep $((attempt * 10 + RANDOM % 10))
           done
+          if [ "$PUSH_SUCCESS" != "true" ]; then
+            echo "::error::Failed to push after $MAX_RETRIES attempts"
+            exit 1
+          fi
 
       - name: "Verify schedule registered with GitHub"
         if: github.repository != 'xn-intenton-z2a/agentic-lib' && inputs.schedule != '' && inputs.dry-run != 'true' && inputs.dry-run != true
@@ -440,3 +476,26 @@ jobs:
           script: |
             const summary = `## Job: init\n| Key | Value |\n|-----|-------|\n| Status | ${context.job.status || 'completed'} |\n| Mode | ${{ inputs.mode }} |\n| Dry Run | ${{ inputs.dry-run }} |\n| Create Seed Issues | ${{ inputs.create-seed-issues }} |`;
             core.summary.addRaw(summary).write();
+
+  # Step 3: Dispatch agentic-lib-workflow to start the first cycle
+  dispatch-workflow:
+    needs: [params, init]
+    if: >-
+      !cancelled()
+      && needs.init.result == 'success'
+      && inputs.dry-run != 'true' && inputs.dry-run != true
+      && inputs.run-workflow != 'false' && inputs.run-workflow != false
+      && github.repository != 'xn-intenton-z2a/agentic-lib'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch agentic-lib-workflow
+        env:
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+        run: |
+          echo "Dispatching agentic-lib-workflow to start first cycle..."
+          gh workflow run agentic-lib-workflow.yml \
+            --repo "${{ github.repository }}" \
+            --ref main \
+            -f mode=full \
+            -f dry-run=false
+          echo "Dispatched agentic-lib-workflow"

package/.github/workflows/agentic-lib-schedule.yml

@@ -104,7 +104,7 @@ jobs:
       - uses: actions/checkout@v6
         if: inputs.dry-run == 'true' || inputs.dry-run == true
         with:
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
       - uses: actions/checkout@v6
         if: inputs.dry-run != 'true' && inputs.dry-run != true
         with:
@@ -261,28 +261,57 @@ jobs:
           FREQUENCY="${{ inputs.frequency }}"
           MODEL="${{ inputs.model }}"
           git add .github/workflows/agentic-lib-workflow.yml agentic-lib.toml
-          # Stage removed mission files if maintenance mode deleted them
-          git rm --ignore-unmatch MISSION_COMPLETE.md MISSION_FAILED.md 2>/dev/null || true
+          # Stage removed mission files ONLY if maintenance mode deleted them
+          if [ "$FREQUENCY" = "maintenance" ]; then
+            git rm --ignore-unmatch MISSION_COMPLETE.md MISSION_FAILED.md 2>/dev/null || true
+          fi
           git diff --cached --quiet && echo "No changes to commit" && exit 0
           if [ "$FREQUENCY" = "maintenance" ]; then
             git commit -m "schedule: switch to maintenance mode (weekly, unlimited budget, mission reset)"
           else
             git commit -m "schedule: set to ${FREQUENCY}, model ${MODEL:-gpt-5-mini}"
           fi
-          for attempt in 1 2 3; do
-            # Use HEAD:refs/heads/main to handle detached HEAD state
-            git push origin HEAD:refs/heads/main && break
-            echo "Push failed (attempt $attempt) — pulling and retrying"
-            git pull --rebase origin main || {
-              echo "Rebase conflict — aborting rebase and retrying"
-              git rebase --abort 2>/dev/null || true
-            }
-            sleep $((attempt * 2))
-            if [ "$attempt" -eq 3 ]; then
-              echo "::error::Failed to push after 3 attempts"
-              exit 1
-            fi
+          MAX_RETRIES=3
+          PUSH_SUCCESS=""
+          for attempt in $(seq 1 $MAX_RETRIES); do
+            # Tiered conflict resolution (mirrors fix-stuck strategy)
+            case $attempt in
+              1)
+                echo "=== Attempt 1: rebase (cleanest) ==="
+                git pull --rebase origin main || {
+                  echo "Rebase conflict on attempt 1 — aborting rebase"
+                  git rebase --abort 2>/dev/null || true
+                  sleep $((10 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              2)
+                echo "=== Attempt 2: merge (handles non-overlapping changes) ==="
+                git pull --no-rebase origin main || {
+                  echo "Merge conflict on attempt 2 — aborting merge"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((20 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              3)
+                echo "=== Attempt 3: merge -X theirs (accept remote on conflict) ==="
+                git pull -X theirs --no-rebase origin main || {
+                  echo "Merge -X theirs failed on attempt 3"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((30 + RANDOM % 10))
+                  continue
+                }
+                ;;
+            esac
+            git push origin HEAD:refs/heads/main && { PUSH_SUCCESS="true"; break; }
+            echo "Push failed on attempt $attempt"
+            sleep $((attempt * 10 + RANDOM % 10))
           done
+          if [ "$PUSH_SUCCESS" != "true" ]; then
+            echo "::error::Failed to push after $MAX_RETRIES attempts"
+            exit 1
+          fi
 
       - name: "Problem 2 fix: Verify schedule registered with GitHub"
         if: github.repository != 'xn-intenton-z2a/agentic-lib' && inputs.dry-run != 'true' && inputs.dry-run != true

package/.github/workflows/agentic-lib-update.yml

@@ -107,20 +107,47 @@ jobs:
           git diff --cached --quiet && echo "No changes" && exit 0
           VERSION=$(npx @xn-intenton-z2a/agentic-lib version 2>/dev/null || echo "latest")
           git commit -m "update agentic-lib@${VERSION} [skip ci]"
-          for attempt in 1 2 3; do
-            # Use HEAD:refs/heads/main to handle detached HEAD state
-            git push origin HEAD:refs/heads/main && break
-            echo "Push failed (attempt $attempt) — pulling and retrying"
-            git pull --rebase origin main || {
-              echo "Rebase conflict — aborting rebase and retrying"
-              git rebase --abort 2>/dev/null || true
-            }
-            sleep $((attempt * 2))
-            if [ "$attempt" -eq 3 ]; then
-              echo "::error::Failed to push after 3 attempts"
-              exit 1
-            fi
+          MAX_RETRIES=3
+          PUSH_SUCCESS=""
+          for attempt in $(seq 1 $MAX_RETRIES); do
+            # Tiered conflict resolution (mirrors fix-stuck strategy)
+            case $attempt in
+              1)
+                echo "=== Attempt 1: rebase (cleanest) ==="
+                git pull --rebase origin main || {
+                  echo "Rebase conflict on attempt 1 — aborting rebase"
+                  git rebase --abort 2>/dev/null || true
+                  sleep $((10 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              2)
+                echo "=== Attempt 2: merge (handles non-overlapping changes) ==="
+                git pull --no-rebase origin main || {
+                  echo "Merge conflict on attempt 2 — aborting merge"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((20 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              3)
+                echo "=== Attempt 3: merge -X theirs (accept remote on conflict) ==="
+                git pull -X theirs --no-rebase origin main || {
+                  echo "Merge -X theirs failed on attempt 3"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((30 + RANDOM % 10))
+                  continue
+                }
+                ;;
+            esac
+            git push origin HEAD:refs/heads/main && { PUSH_SUCCESS="true"; break; }
+            echo "Push failed on attempt $attempt"
+            sleep $((attempt * 10 + RANDOM % 10))
           done
+          if [ "$PUSH_SUCCESS" != "true" ]; then
+            echo "::error::Failed to push after $MAX_RETRIES attempts"
+            exit 1
+          fi
 
       - name: Job Summary
         if: always()

package/.github/workflows/agentic-lib-workflow.yml

@@ -139,7 +139,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
           sparse-checkout: |
             ${{ env.configPath }}
             MISSION_COMPLETE.md
@@ -308,7 +308,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
 
       - uses: actions/setup-node@v6
         with:
@@ -351,7 +351,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
 
       - uses: actions/setup-node@v6
         with:
@@ -623,7 +623,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Fetch log and screenshot from log branch
         env:
@@ -735,6 +735,7 @@ jobs:
         with:
           commit-message: "agentic-step: maintain features and library"
           push-ref: ${{ github.ref_name }}
+          fail-on-conflict: "false"
 
       - name: Capture commit SHA
         id: get-sha
@@ -762,7 +763,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ inputs.ref || github.sha }}
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Fetch log and agent logs from log branch
         env:
@@ -830,7 +831,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+          ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
 
       - name: Fetch log and screenshot from log branch
         env:
@@ -895,7 +896,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+          ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
 
       - name: Fetch log, screenshot and state from log branch
         env:
@@ -980,7 +981,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+          ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
 
       - uses: actions/setup-node@v6
         with:
@@ -1366,7 +1367,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+          ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
 
       - uses: actions/setup-node@v6
         with:
@@ -1421,7 +1422,7 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+          ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
 
       - name: Fetch log and screenshot from log branch
         env:
@@ -1722,7 +1723,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-          ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+          ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
 
       - name: Summary
         run: |
@@ -1815,7 +1816,7 @@ jobs:
       && needs.params.result == 'success'
     uses: ./.github/workflows/agentic-lib-test.yml
     with:
-      ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+      ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
     secrets: inherit
 
   # ─── Schedule change (if requested) ────────────────────────────────
@@ -1824,7 +1825,7 @@ jobs:
     if: ${{ !cancelled() && needs.params.outputs.dry-run != 'true' && needs.params.outputs.schedule != '' && needs.params.result == 'success' }}
     uses: ./.github/workflows/agentic-lib-schedule.yml
     with:
-      ref: ${{ needs.maintain.outputs.commit-sha || github.sha }}
+      ref: ${{ needs.maintain.outputs.commit-sha || github.ref }}
       frequency: ${{ needs.params.outputs.schedule }}
       model: ${{ needs.params.outputs.model }}
       profile: ${{ needs.params.outputs.profile }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xn-intenton-z2a/agentic-lib",
-  "version": "7.4.27",
+  "version": "7.4.29",
   "description": "Agentic-lib Agentic Coding Systems SDK powering automated GitHub workflows.",
   "type": "module",
   "scripts": {

package/src/actions/agentic-step/tasks/direct.js

@@ -228,14 +228,26 @@ async function executeMissionComplete(octokit, repo, reason) {
   }
 
   // W3: Disable schedule on mission-complete (Benchmark 011 FINDING-4)
+  // W6: Skip dispatch if schedule is already at target frequency
   try {
-    await octokit.rest.actions.createWorkflowDispatch({
-      ...repo,
-      workflow_id: "agentic-lib-schedule.yml",
-      ref: "main",
-      inputs: { frequency: "off" },
-    });
-    core.info("Dispatched schedule change to off after mission-complete");
+    let skipDispatch = false;
+    try {
+      const tomlContent = readFileSync("agentic-lib.toml", "utf8");
+      const supervisorMatch = tomlContent.match(/^\s*supervisor\s*=\s*"([^"]*)"/m);
+      if (supervisorMatch && supervisorMatch[1] === "off") {
+        core.info("Schedule already off — skipping dispatch");
+        skipDispatch = true;
+      }
+    } catch { /* toml read failed — dispatch anyway */ }
+    if (!skipDispatch) {
+      await octokit.rest.actions.createWorkflowDispatch({
+        ...repo,
+        workflow_id: "agentic-lib-schedule.yml",
+        ref: "main",
+        inputs: { frequency: "off" },
+      });
+      core.info("Dispatched schedule change to off after mission-complete");
+    }
   } catch (err) {
     core.warning(`Could not dispatch schedule change: ${err.message}`);
   }
@@ -315,14 +327,26 @@ async function executeMissionFailed(octokit, repo, reason, metricAssessment) {
   }
 
   // C3: Dispatch schedule change to weekly
+  // W6: Skip dispatch if schedule is already at target frequency
   try {
-    await octokit.rest.actions.createWorkflowDispatch({
-      ...repo,
-      workflow_id: "agentic-lib-schedule.yml",
-      ref: "main",
-      inputs: { frequency: "weekly" },
-    });
-    core.info("Dispatched schedule change to weekly after mission-failed");
+    let skipDispatch = false;
+    try {
+      const tomlContent = readFileSync("agentic-lib.toml", "utf8");
+      const supervisorMatch = tomlContent.match(/^\s*supervisor\s*=\s*"([^"]*)"/m);
+      if (supervisorMatch && supervisorMatch[1] === "weekly") {
+        core.info("Schedule already weekly — skipping dispatch");
+        skipDispatch = true;
+      }
+    } catch { /* toml read failed — dispatch anyway */ }
+    if (!skipDispatch) {
+      await octokit.rest.actions.createWorkflowDispatch({
+        ...repo,
+        workflow_id: "agentic-lib-schedule.yml",
+        ref: "main",
+        inputs: { frequency: "weekly" },
+      });
+      core.info("Dispatched schedule change to weekly after mission-failed");
+    }
   } catch (err) {
     core.warning(`Could not dispatch schedule change: ${err.message}`);
   }

package/src/actions/commit-if-changed/action.yml

@@ -16,6 +16,10 @@ inputs:
     description: "Branch ref to push to (default: current ref_name)"
     required: false
     default: ""
+  fail-on-conflict:
+    description: "Fail the step if push conflicts cannot be resolved (default: true)"
+    required: false
+    default: "true"
 
 runs:
   using: "composite"
@@ -32,6 +36,13 @@ runs:
         git reset HEAD -- 'intentïon.md' 'SCREENSHOT_INDEX.png' 2>/dev/null || true
         git reset HEAD -- agent-log-*.md 2>/dev/null || true
         git reset HEAD -- agentic-lib-state.toml 2>/dev/null || true
+        # W1: Validate test files — reject empty test suites that break vitest
+        for f in $(git diff --cached --name-only --diff-filter=ACM -- '*.test.js' '*.test.ts' '*.test.mjs'); do
+          if [ -f "$f" ] && ! grep -qE '(describe|test|it)\s*\(' "$f"; then
+            echo "::warning::${f} has no test suite (no describe/test/it blocks) — removing from commit"
+            git reset HEAD -- "$f"
+          fi
+        done
         if git diff --cached --quiet; then
           echo "No changes to commit"
         fi
@@ -49,44 +60,75 @@ runs:
           else
             REMOTE_REF_EXISTS="true"
           fi
+          # Determine push command based on ref
+          if [ -n "$REF" ]; then
+            PUSH_CMD="git push origin HEAD:refs/heads/$REF"
+          else
+            PUSH_CMD="git push"
+          fi
+          PULL_TARGET="${REF:+origin $REF}"
           for attempt in $(seq 1 $MAX_RETRIES); do
-            if [ -n "$REF" ]; then
-              if [ "$REMOTE_REF_EXISTS" = "true" ]; then
-                git pull --rebase origin "$REF" || {
-                  echo "Rebase conflict on attempt $attempt — aborting rebase and retrying"
+            # New branch — no pull needed, just push
+            if [ -n "$REF" ] && [ "$REMOTE_REF_EXISTS" != "true" ]; then
+              $PUSH_CMD && { REMOTE_REF_EXISTS="true"; PUSH_SUCCESS="true"; break; } || true
+              sleep $((attempt * 10 + RANDOM % 10))
+              continue
+            fi
+            # Tiered conflict resolution (mirrors fix-stuck strategy)
+            case $attempt in
+              1)
+                echo "=== Attempt 1: rebase (cleanest) ==="
+                git pull --rebase $PULL_TARGET || {
+                  echo "Rebase conflict on attempt 1 — aborting rebase"
                   git rebase --abort 2>/dev/null || true
-                  sleep $((attempt * 2))
+                  sleep $((10 + RANDOM % 10))
                   continue
                 }
-                # After rebase, check if our changes survived (rebase may drop empty commits)
-                LOCAL_SHA=$(git rev-parse HEAD)
-                REMOTE_SHA=$(git rev-parse "origin/$REF" 2>/dev/null || echo "")
-                if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
-                  echo "Rebase dropped local commit (already on remote) — nothing to push"
-                  PUSH_SUCCESS="true"
-                  break
-                fi
+                ;;
+              2)
+                echo "=== Attempt 2: merge (handles non-overlapping changes) ==="
+                git pull --no-rebase $PULL_TARGET || {
+                  echo "Merge conflict on attempt 2 — aborting merge"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((20 + RANDOM % 10))
+                  continue
+                }
+                ;;
+              3)
+                echo "=== Attempt 3: merge -X theirs (accept remote on conflict) ==="
+                git pull -X theirs --no-rebase $PULL_TARGET || {
+                  echo "Merge -X theirs failed on attempt 3"
+                  git merge --abort 2>/dev/null || true
+                  sleep $((30 + RANDOM % 10))
+                  continue
+                }
+                ;;
+            esac
+            # Check if rebase/merge dropped our commit (already on remote)
+            if [ -n "$REF" ]; then
+              LOCAL_SHA=$(git rev-parse HEAD)
+              REMOTE_SHA=$(git rev-parse "origin/$REF" 2>/dev/null || echo "")
+              if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+                echo "Rebase/merge dropped local commit (already on remote) — nothing to push"
+                PUSH_SUCCESS="true"
+                break
               fi
-              # Use HEAD:refs/heads/$REF to handle detached HEAD state
-              # (actions/checkout with a SHA puts us in detached HEAD, so
-              #  "git push origin main" fails with "src refspec main does not match any")
-              git push origin "HEAD:refs/heads/$REF" && { REMOTE_REF_EXISTS="true"; PUSH_SUCCESS="true"; break; }
-            else
-              git pull --rebase || {
-                echo "Rebase conflict on attempt $attempt — aborting rebase and retrying"
-                git rebase --abort 2>/dev/null || true
-                sleep $((attempt * 2))
-                continue
-              }
-              git push && { PUSH_SUCCESS="true"; break; }
             fi
-            echo "Push failed on attempt $attempt, retrying..."
-            sleep $((attempt * 2))
+            $PUSH_CMD && { REMOTE_REF_EXISTS="true"; PUSH_SUCCESS="true"; break; }
+            echo "Push failed on attempt $attempt"
+            sleep $((attempt * 10 + RANDOM % 10))
           done
           # Restore stashed unstaged changes
           git stash pop 2>/dev/null || true
           if [ "$PUSH_SUCCESS" != "true" ]; then
-            echo "::error::Failed to push after $MAX_RETRIES attempts"
-            exit 1
+            FAIL_ON_CONFLICT="${{ inputs.fail-on-conflict }}"
+            if [ "$FAIL_ON_CONFLICT" = "false" ]; then
+              echo "::warning::Failed to push after $MAX_RETRIES attempts — skipping (fail-on-conflict=false)"
+              git rebase --abort 2>/dev/null || true
+              git merge --abort 2>/dev/null || true
+            else
+              echo "::error::Failed to push after $MAX_RETRIES attempts"
+              exit 1
+            fi
           fi
         fi

package/src/seeds/zero-package.json

@@ -17,7 +17,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@xn-intenton-z2a/agentic-lib": "^7.4.27"
+    "@xn-intenton-z2a/agentic-lib": "^7.4.29"
   },
   "devDependencies": {
     "@playwright/test": "^1.58.0",