@xn-intenton-z2a/agentic-lib 7.4.30 → 7.4.31

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

@@ -1357,12 +1357,14 @@ jobs:
   # ─── Review: close resolved issues, enhance with criteria ──────────
   # W15: Skip review when there are no open issues to review
   review-features:
-    needs: [params, maintain, supervisor, telemetry]
+    needs: [params, maintain, supervisor, telemetry, director]
     if: |
       !cancelled() &&
       (needs.params.outputs.mode == 'full' || needs.params.outputs.mode == 'review-only') &&
       needs.params.result == 'success' &&
-      needs.telemetry.outputs.open-issue-count != '0'
+      needs.telemetry.outputs.open-issue-count != '0' &&
+      needs.director.outputs.decision != 'mission-complete' &&
+      needs.director.outputs.decision != 'mission-failed'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -1716,7 +1718,7 @@ jobs:
 
   # ─── Post-merge: stats, schedule, mission check ────────────────────
   post-merge:
-    needs: [params, maintain, dev, pr-cleanup, implementation-review]
+    needs: [params, maintain, dev, pr-cleanup, implementation-review, director]
     if: ${{ !cancelled() && needs.params.result == 'success' }}
     runs-on: ubuntu-latest
     steps:
@@ -1743,6 +1745,8 @@ jobs:
         if: |
           needs.params.outputs.mission-complete != 'true' &&
           needs.params.outputs.dry-run != 'true' &&
+          needs.director.outputs.decision != 'mission-complete' &&
+          needs.director.outputs.decision != 'mission-failed' &&
           github.repository != 'xn-intenton-z2a/agentic-lib'
         env:
           LOG_BRANCH: ${{ needs.params.outputs.log-branch }}
@@ -1756,6 +1760,8 @@ jobs:
         if: |
           needs.params.outputs.mission-complete != 'true' &&
           needs.params.outputs.dry-run != 'true' &&
+          needs.director.outputs.decision != 'mission-complete' &&
+          needs.director.outputs.decision != 'mission-failed' &&
           github.repository != 'xn-intenton-z2a/agentic-lib'
         with:
           node-version: "24"
@@ -1764,6 +1770,8 @@ jobs:
         if: |
           needs.params.outputs.mission-complete != 'true' &&
           needs.params.outputs.dry-run != 'true' &&
+          needs.director.outputs.decision != 'mission-complete' &&
+          needs.director.outputs.decision != 'mission-failed' &&
           hashFiles('scripts/self-init.sh') != '' && hashFiles('.github/agentic-lib/actions/agentic-step/package.json') == ''
         run: bash scripts/self-init.sh
 
@@ -1771,6 +1779,8 @@ jobs:
         if: |
           needs.params.outputs.mission-complete != 'true' &&
           needs.params.outputs.dry-run != 'true' &&
+          needs.director.outputs.decision != 'mission-complete' &&
+          needs.director.outputs.decision != 'mission-failed' &&
           github.repository != 'xn-intenton-z2a/agentic-lib'
         working-directory: .github/agentic-lib/actions/agentic-step
         run: |
@@ -1784,6 +1794,8 @@ jobs:
         if: |
           needs.params.outputs.mission-complete != 'true' &&
           needs.params.outputs.dry-run != 'true' &&
+          needs.director.outputs.decision != 'mission-complete' &&
+          needs.director.outputs.decision != 'mission-failed' &&
           github.repository != 'xn-intenton-z2a/agentic-lib'
         timeout-minutes: 10
         uses: ./.github/agentic-lib/actions/agentic-step
@@ -1802,6 +1814,8 @@ jobs:
         if: |
           needs.params.outputs.mission-complete != 'true' &&
           needs.params.outputs.dry-run != 'true' &&
+          needs.director.outputs.decision != 'mission-complete' &&
+          needs.director.outputs.decision != 'mission-failed' &&
           github.repository != 'xn-intenton-z2a/agentic-lib'
         env:
           LOG_BRANCH: ${{ needs.params.outputs.log-branch }}

package/package.json

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

package/src/scripts/push-to-logs.sh

@@ -79,10 +79,58 @@ else
 
   for attempt in $(seq 1 $MAX_RETRIES); do
     git push origin "${BRANCH}" && break
-    echo "push-to-logs: push failed (attempt $attempt) — pulling and retrying"
+    echo "push-to-logs: push failed (attempt $attempt) — fetching latest and retrying"
+
+    # Fetch the latest remote state before rebasing
+    git fetch origin "${BRANCH}" 2>/dev/null || true
+
+    # Save our file contents before rebase (they may be lost on conflict)
+    for f in "${FILES[@]}"; do
+      cp "$f" "${TMPDIR}/ours-$(basename "$f")" 2>/dev/null || true
+    done
+
     git pull --rebase origin "${BRANCH}" || {
-      echo "push-to-logs: rebase conflict — aborting and retrying"
-      git rebase --abort 2>/dev/null || true
+      echo "push-to-logs: rebase conflict — resolving state file with merge strategy"
+
+      # For agentic-lib-state.toml conflicts, merge booleans (prefer true) and take max counters
+      STATE_FILE="agentic-lib-state.toml"
+      if git diff --name-only --diff-filter=U 2>/dev/null | grep -q "$STATE_FILE"; then
+        # Get the remote (theirs) version from the rebase base
+        git show "REBASE_HEAD:${STATE_FILE}" > "${TMPDIR}/ours-${STATE_FILE}" 2>/dev/null || true
+        git checkout --theirs "$STATE_FILE" 2>/dev/null || true
+
+        # Merge: for each boolean in our version that is true, set it true in theirs
+        if [ -f "${TMPDIR}/ours-${STATE_FILE}" ]; then
+          # Extract true booleans from our version and apply them
+          while IFS='=' read -r key val; do
+            key=$(echo "$key" | xargs)
+            val=$(echo "$val" | xargs)
+            if [ "$val" = "true" ]; then
+              # Set this key to true in the resolved file (theirs)
+              if grep -q "^${key} = " "$STATE_FILE" 2>/dev/null; then
+                sed -i "s/^${key} = .*/${key} = true/" "$STATE_FILE" 2>/dev/null || \
+                  sed -i'' "s/^${key} = .*/${key} = true/" "$STATE_FILE" 2>/dev/null || true
+              fi
+            fi
+          done < "${TMPDIR}/ours-${STATE_FILE}"
+        fi
+
+        git add "$STATE_FILE"
+      fi
+
+      # Resolve any other conflicting files by taking ours (our log files are authoritative)
+      for f in "${FILES[@]}"; do
+        if git diff --name-only --diff-filter=U 2>/dev/null | grep -q "$(basename "$f")"; then
+          cp "${TMPDIR}/ours-$(basename "$f")" "$f" 2>/dev/null || true
+          git add "$f"
+        fi
+      done
+
+      # Continue the rebase if there are resolved conflicts
+      git rebase --continue 2>/dev/null || {
+        echo "push-to-logs: rebase continue failed — aborting"
+        git rebase --abort 2>/dev/null || true
+      }
     }
     sleep $((attempt * 2))
     if [ "$attempt" -eq "$MAX_RETRIES" ]; then

package/src/seeds/zero-package.json

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