@xn-intenton-z2a/agentic-lib 7.1.101 → 7.1.103

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

@@ -231,18 +231,26 @@ jobs:
             const tomlPath = 'agentic-lib.toml';
             if (!fs.existsSync(tomlPath)) return;
             let toml = fs.readFileSync(tomlPath, 'utf8');
-            if (model) {
-              const modelRegex = /(\[tuning\][^\[]*?)(^\s*model\s*=\s*"[^"]*")/m;
-              if (modelRegex.test(toml)) {
-                toml = toml.replace(modelRegex, `$1model = "${model}"`);
-                core.info(`Updated [tuning].model to: ${model}`);
+            // Extract the [tuning] section, then replace within it.
+            // Previous regex [^\[]*? failed when comments contained '[' characters.
+            const tuningSectionRegex = /(\[tuning\])([\s\S]*?)(?=\n\[|$)/;
+            const tuningMatch = toml.match(tuningSectionRegex);
+            if (tuningMatch) {
+              let section = tuningMatch[0];
+              if (model) {
+                const updated = section.replace(/^(\s*model\s*=\s*)"[^"]*"/m, `$1"${model}"`);
+                if (updated !== section) {
+                  toml = toml.replace(section, updated);
+                  section = updated;
+                  core.info(`Updated [tuning].model to: ${model}`);
+                }
               }
-            }
-            if (profile) {
-              const profileRegex = /(\[tuning\][^\[]*?)(^\s*profile\s*=\s*"[^"]*")/m;
-              if (profileRegex.test(toml)) {
-                toml = toml.replace(profileRegex, `$1profile = "${profile}"`);
-                core.info(`Updated [tuning].profile to: ${profile}`);
+              if (profile) {
+                const updated = section.replace(/^(\s*profile\s*=\s*)"[^"]*"/m, `$1"${profile}"`);
+                if (updated !== section) {
+                  toml = toml.replace(section, updated);
+                  core.info(`Updated [tuning].profile to: ${profile}`);
+                }
               }
             }
             fs.writeFileSync(tomlPath, toml);

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

@@ -35,11 +35,12 @@ on:
   workflow_dispatch:
     inputs:
       frequency:
-        description: "How often the workflow should run"
+        description: "How often the workflow should run (maintenance = weekly + remove mission-complete + unlimited budget)"
         required: true
         type: choice
         options:
           - "off"
+          - "maintenance"
           - "weekly"
           - "daily"
           - "hourly"
@@ -95,6 +96,9 @@ jobs:
             const workflowPath = '.github/workflows/agentic-lib-workflow.yml';
             const tomlPath = 'agentic-lib.toml';
 
+            const isMaintenance = frequency === 'maintenance';
+            const effectiveFrequency = isMaintenance ? 'weekly' : frequency;
+
             const SCHEDULE_MAP = {
               off: null,
               weekly: '15 6 * * 1',
@@ -105,11 +109,11 @@ jobs:
 
             // Update agentic-lib-workflow.yml schedule
             let content = fs.readFileSync(workflowPath, 'utf8');
-            const cron = SCHEDULE_MAP[frequency];
+            const cron = SCHEDULE_MAP[effectiveFrequency];
 
-            // Check if the frequency is already set — skip if no-op
+            // Check if the frequency is already set — skip if no-op (but never skip maintenance)
             const supervisorRegex2 = /^\s*supervisor\s*=\s*"([^"]*)"/m;
-            if (fs.existsSync(tomlPath)) {
+            if (!isMaintenance && fs.existsSync(tomlPath)) {
               const currentToml = fs.readFileSync(tomlPath, 'utf8');
               const currentMatch = currentToml.match(supervisorRegex2);
               const currentFreq = currentMatch ? currentMatch[1] : '';
@@ -144,7 +148,17 @@ jobs:
             }
 
             fs.writeFileSync(workflowPath, content);
-            core.info(`Updated workflow schedule to: ${frequency} (cron: ${cron || 'none'})`);
+            core.info(`Updated workflow schedule to: ${effectiveFrequency} (cron: ${cron || 'none'})`);
+
+            // Maintenance mode: remove mission-complete/failed signals
+            if (isMaintenance) {
+              for (const f of ['MISSION_COMPLETE.md', 'MISSION_FAILED.md']) {
+                if (fs.existsSync(f)) {
+                  fs.unlinkSync(f);
+                  core.info(`Maintenance mode: removed ${f}`);
+                }
+              }
+            }
 
             // Update agentic-lib.toml with model and supervisor settings
             if (fs.existsSync(tomlPath)) {
@@ -174,6 +188,15 @@ jobs:
                 }
               }
 
+              // Maintenance mode: set transformation-budget to 0 (unlimited)
+              if (isMaintenance) {
+                const budgetRegex = /^(\s*transformation-budget\s*=\s*)\d+/m;
+                if (budgetRegex.test(toml)) {
+                  toml = toml.replace(budgetRegex, '$10');
+                  core.info('Maintenance mode: set transformation-budget = 0 (unlimited)');
+                }
+              }
+
               fs.writeFileSync(tomlPath, toml);
               core.info(`Updated agentic-lib.toml: model=${model}, supervisor=${frequency}${profile ? ', profile=' + profile : ''}`);
             } else {
@@ -192,8 +215,14 @@ 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
           git diff --cached --quiet && echo "No changes to commit" && exit 0
-          git commit -m "schedule: set to ${FREQUENCY}, model ${MODEL:-gpt-5-mini}"
+          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
             git push origin main && break
             echo "Push failed (attempt $attempt) — pulling and retrying"

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

@@ -35,11 +35,23 @@ on:
   #@dist     - "**/*.yml"
   #@dist     - "**/*.sh"
   workflow_call:
+    inputs:
+      push-screenshot:
+        type: string
+        required: false
+        default: "false"
   workflow_dispatch:
+    inputs:
+      push-screenshot:
+        description: "Push screenshot to main (default: only on schedule)"
+        type: boolean
+        required: false
+        default: false
 
 permissions:
   contents: write
   actions: write
+  issues: write
 
 jobs:
   test:
@@ -92,7 +104,9 @@ jobs:
           if-no-files-found: ignore
 
       - name: Push screenshot on main
-        if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+        if: |
+          github.ref == 'refs/heads/main' &&
+          (github.event_name == 'schedule' || inputs.push-screenshot == 'true' || inputs.push-screenshot == true)
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git config user.name "github-actions[bot]"
@@ -119,7 +133,7 @@ jobs:
     if: >-
       !cancelled()
       && github.ref == 'refs/heads/main'
-      && (github.event_name == 'push' || github.event_name == 'schedule')
+      && (github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_call')
       && github.repository != 'xn-intenton-z2a/agentic-lib'
       && (needs.test.result == 'failure' || needs.behaviour.result == 'failure')
     runs-on: ubuntu-latest
@@ -154,3 +168,92 @@ jobs:
             --repo "${{ github.repository }}" \
             -f mode=full \
             -f message="Build broken on main: agentic-lib-test run ${{ github.run_id }} failed. Please fix."
+
+  # ─── Report instability: create/update GitHub issue on test failure ──
+  report-instability:
+    needs: [test, behaviour]
+    if: >-
+      !cancelled()
+      && github.ref == 'refs/heads/main'
+      && github.repository != 'xn-intenton-z2a/agentic-lib'
+      && (needs.test.result == 'failure' || needs.behaviour.result == 'failure')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Determine failure type
+        id: failure-type
+        run: |
+          UNIT="${{ needs.test.result }}"
+          BEHAVIOUR="${{ needs.behaviour.result }}"
+          if [ "$UNIT" = "failure" ] && [ "$BEHAVIOUR" = "failure" ]; then
+            echo "type=both" >> $GITHUB_OUTPUT
+          elif [ "$UNIT" = "failure" ]; then
+            echo "type=unit" >> $GITHUB_OUTPUT
+          else
+            echo "type=behaviour" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Collect failure logs
+        id: logs
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          RUN_ID="${{ github.run_id }}"
+          # Get failed job logs via gh CLI
+          gh run view "$RUN_ID" --repo "${{ github.repository }}" --log-failed > /tmp/failed-logs.txt 2>&1 || true
+          # Trim to reasonable size (keep last 400 lines — generous context)
+          tail -400 /tmp/failed-logs.txt > /tmp/trimmed-logs.txt
+
+      - name: Create or update instability issue
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const fs = require('fs');
+            const failureType = '${{ steps.failure-type.outputs.type }}';
+            const runId = '${{ github.run_id }}';
+            const runUrl = `https://github.com/${{ github.repository }}/actions/runs/${runId}`;
+            const logs = fs.readFileSync('/tmp/trimmed-logs.txt', 'utf8').slice(0, 60000);
+
+            const title = `instability: ${failureType} test failure on main`;
+            const body = [
+              `## Test Failure Report`,
+              ``,
+              `**Type**: ${failureType}`,
+              `**Run**: [${runId}](${runUrl})`,
+              `**Trigger**: ${context.eventName}`,
+              `**Time**: ${new Date().toISOString()}`,
+              ``,
+              `## Failure Logs`,
+              ``,
+              '```',
+              logs,
+              '```',
+            ].join('\n');
+
+            // Check for existing open instability issue of the same failure type
+            const { data: existing } = await github.rest.issues.listForRepo({
+              ...context.repo, state: 'open', labels: 'instability', per_page: 10,
+            });
+
+            const match = existing.find(i => i.title.includes(failureType));
+            if (match) {
+              // Add a comment with the new failure logs instead of creating a duplicate
+              await github.rest.issues.createComment({
+                ...context.repo, issue_number: match.number,
+                body: `## Recurrence — run [${runId}](${runUrl})\n\n**Trigger**: ${context.eventName}\n**Time**: ${new Date().toISOString()}\n\n` + '```\n' + logs.slice(0, 30000) + '\n```',
+              });
+              core.info(`Updated existing instability issue #${match.number}`);
+            } else {
+              // Ensure instability label exists
+              try {
+                await github.rest.issues.createLabel({
+                  ...context.repo, name: 'instability',
+                  color: 'e11d48', description: 'Automated: test instability on main',
+                });
+              } catch (e) { /* label already exists */ }
+
+              const { data: issue } = await github.rest.issues.create({
+                ...context.repo, title, body,
+                labels: ['instability', 'ready', 'automated'],
+              });
+              core.info(`Created instability issue #${issue.number}`);
+            }

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

@@ -36,6 +36,10 @@ on:
         type: string
         required: false
         default: "true"
+      skipMaintain:
+        type: string
+        required: false
+        default: "false"
       config-path:
         type: string
         required: false
@@ -99,6 +103,11 @@ on:
         type: string
         required: false
         default: ""
+      skipMaintain:
+        description: "Skip maintain job (for testing fix-stuck in isolation)"
+        type: boolean
+        required: false
+        default: false
       dry-run:
         description: "Skip all push/PR/merge operations"
         type: boolean
@@ -319,6 +328,16 @@ jobs:
               labels: i.labels.map(l => l.name),
             }));
 
+            // W7: Check for open instability issues (mechanical priority override)
+            const { data: instabilityIssues } = await github.rest.issues.listForRepo({
+              owner, repo, state: 'open', labels: 'instability',
+              sort: 'created', direction: 'asc', per_page: 10,
+            });
+            const instabilityNumbers = instabilityIssues.map(i => i.number);
+            if (instabilityNumbers.length > 0) {
+              core.info(`Found ${instabilityNumbers.length} instability issue(s): ${instabilityNumbers.join(', ')}`);
+            }
+
             // Open PRs
             const { data: prs } = await github.rest.pulls.list({
               owner, repo, state: 'open', per_page: 10,
@@ -419,6 +438,7 @@ jobs:
 
             const telemetry = {
               issues: issuesSummary,
+              instabilityIssues: instabilityNumbers,
               prs: prsSummary,
               recentRuns: runsSummary,
               mission: mission.slice(0, 500),
@@ -470,7 +490,8 @@ jobs:
     if: |
       !cancelled() &&
       (needs.params.outputs.mode == 'full' || needs.params.outputs.mode == 'maintain-only') &&
-      needs.params.result == 'success'
+      needs.params.result == 'success' &&
+      inputs.skipMaintain != 'true' && inputs.skipMaintain != true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -480,12 +501,16 @@ jobs:
       - name: Check mission-complete signal
         id: mission-check
         run: |
-          if [ -f MISSION_COMPLETE.md ]; then
+          SUPERVISOR=$(grep '^\s*supervisor\s*=' agentic-lib.toml 2>/dev/null | head -1 | sed 's/.*=\s*"\([^"]*\)".*/\1/')
+          if [ -f MISSION_COMPLETE.md ] && [ "$SUPERVISOR" != "maintenance" ]; then
             echo "mission-complete=true" >> $GITHUB_OUTPUT
             echo "Mission is complete — skipping budget-consuming tasks"
             cat MISSION_COMPLETE.md
           else
             echo "mission-complete=false" >> $GITHUB_OUTPUT
+            if [ "$SUPERVISOR" = "maintenance" ] && [ -f MISSION_COMPLETE.md ]; then
+              echo "Maintenance mode — ignoring MISSION_COMPLETE.md"
+            fi
           fi
 
       - uses: actions/setup-node@v6
@@ -640,14 +665,15 @@ jobs:
       - name: Check mission-complete signal
         id: fix-mission-check
         run: |
-          if [ -f MISSION_COMPLETE.md ]; then
+          SUPERVISOR=$(grep '^\s*supervisor\s*=' agentic-lib.toml 2>/dev/null | head -1 | sed 's/.*=\s*"\([^"]*\)".*/\1/')
+          if [ -f MISSION_COMPLETE.md ] && [ "$SUPERVISOR" != "maintenance" ]; then
             echo "mission-complete=true" >> $GITHUB_OUTPUT
             echo "Mission is complete — skipping fix-stuck"
           else
             echo "mission-complete=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Find and fix stuck PRs or broken main build
+      - name: Find stuck PRs or broken main build
         if: steps.fix-mission-check.outputs.mission-complete != 'true'
         uses: actions/github-script@v8
         env:
@@ -663,10 +689,11 @@ jobs:
             if (prNumber) {
               core.info(`Specific PR requested: #${prNumber}`);
               core.exportVariable('FIX_PR_NUMBER', prNumber);
+              core.exportVariable('FIX_REASON', 'requested');
               return;
             }
 
-            // Find PRs with failing checks or merge conflicts on agentic branches
+            // Find automerge PRs on agentic branches — always attempt to sync with main
             const { data: openPRs } = await github.rest.pulls.list({
               owner, repo, state: 'open', per_page: 10,
             });
@@ -677,35 +704,20 @@ jobs:
               if (!hasAutomerge) continue;
               if (!pr.head.ref.startsWith('agentic-lib-') && !pr.head.ref.startsWith('copilot/')) continue;
 
-              // Check for merge conflicts
-              const { data: fullPr } = await github.rest.pulls.get({
-                owner, repo, pull_number: pr.number,
-              });
-              const hasConflicts = fullPr.mergeable_state === 'dirty' || fullPr.mergeable === false;
-
-              // Check if checks are failing
-              const { data: checkRuns } = await github.rest.checks.listForRef({
-                owner, repo, ref: pr.head.sha,
-              });
-              const hasFailing = checkRuns.check_runs.some(c => c.conclusion === 'failure');
-
-              if (!hasFailing && !hasConflicts) continue;
-
-              // Check fix attempt count
-              const { data: fixRuns } = await github.rest.actions.listWorkflowRuns({
-                owner, repo, workflow_id: 'agentic-lib-workflow.yml',
-                branch: pr.head.ref, per_page: maxFixAttempts + 1,
+              // Check fix attempt count via PR comments with marker
+              const { data: comments } = await github.rest.issues.listComments({
+                owner, repo, issue_number: pr.number, per_page: 100,
               });
-              if (fixRuns.total_count >= maxFixAttempts) {
-                core.info(`PR #${pr.number} exceeded fix attempts. Removing automerge.`);
+              const fixAttempts = comments.filter(c => c.body && c.body.includes('<!-- fix-stuck-attempt -->')).length;
+              if (fixAttempts >= maxFixAttempts) {
+                core.info(`PR #${pr.number} exceeded ${maxFixAttempts} fix attempts (${fixAttempts} markers). Removing automerge.`);
                 try { await github.rest.issues.removeLabel({ owner, repo, issue_number: pr.number, name: 'automerge' }); } catch (e) {}
                 continue;
               }
 
-              const reason = hasConflicts ? 'merge conflicts' : 'failing checks';
-              core.info(`Will attempt to fix PR #${pr.number} (${reason})`);
+              core.info(`Will sync PR #${pr.number} with main (attempt ${fixAttempts + 1}/${maxFixAttempts})`);
               core.exportVariable('FIX_PR_NUMBER', String(pr.number));
-              core.exportVariable('FIX_REASON', reason);
+              core.exportVariable('FIX_REASON', 'sync');
               foundPR = true;
               break;
             }
@@ -722,7 +734,6 @@ jobs:
                 if (testRuns.workflow_runs.length > 0) {
                   const latestTest = testRuns.workflow_runs[0];
                   if (latestTest.conclusion === 'failure') {
-                    // Check we haven't already opened a fix branch for this
                     const { data: existingPRs } = await github.rest.pulls.list({
                       owner, repo, state: 'open', head: `${owner}:agentic-lib-fix-main-build`, per_page: 1,
                     });
@@ -749,47 +760,128 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Record fix-stuck attempt on PR
+        if: env.FIX_PR_NUMBER != '' && steps.fix-mission-check.outputs.mission-complete != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr comment "${{ env.FIX_PR_NUMBER }}" --body "<!-- fix-stuck-attempt -->
+          **fix-stuck** attempting to resolve: ${{ env.FIX_REASON }} (run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}))"
+
       - name: Create fix branch for broken main build
         if: env.FIX_MAIN_BUILD == 'true' && steps.fix-mission-check.outputs.mission-complete != 'true'
         run: |
           git checkout -b agentic-lib-fix-main-build
 
-      - name: "Tier 1: Auto-resolve trivial merge conflicts"
-        if: env.FIX_PR_NUMBER != '' && env.FIX_REASON == 'merge conflicts' && steps.fix-mission-check.outputs.mission-complete != 'true'
+      - name: "Sync PR branch with main (incremental conflict resolution)"
+        if: env.FIX_PR_NUMBER != '' && steps.fix-mission-check.outputs.mission-complete != 'true'
         id: trivial-resolve
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          set -e
+          git config user.email 'action@github.com'
+          git config user.name 'GitHub Actions[bot]'
           git fetch origin main
-          if git merge origin/main --no-edit 2>/dev/null; then
-            echo "resolved=clean" >> $GITHUB_OUTPUT
+          BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          RESOLVED=false
+
+          # --- Tier 1: Simple merge (no conflicts) ---
+          echo "=== Tier 1: Simple merge ==="
+          if git merge origin/main --no-edit 2>&1; then
+            echo "Tier 1: merge clean, pushing..."
+            git push origin HEAD:"$BRANCH" 2>&1 && RESOLVED=true || echo "Tier 1: push failed"
           else
-            CONFLICTED=$(git diff --name-only --diff-filter=U)
-            TRIVIAL_PATTERN='intentïon\.md|intention\.md|package-lock\.json'
-            NON_TRIVIAL=$(echo "$CONFLICTED" | grep -vE "$TRIVIAL_PATTERN" || true)
-            if [ -z "$NON_TRIVIAL" ]; then
-              echo "All conflicts are trivial — auto-resolving"
-              for f in $CONFLICTED; do
-                git checkout --theirs "$f"
-                git add "$f"
-              done
+            echo "Tier 1: conflicts detected, aborting..."
+            git merge --abort 2>/dev/null || true
+          fi
+
+          # Check
+          if [ "$RESOLVED" = "true" ]; then
+            sleep 5
+            MERGEABLE=$(gh pr view "${{ env.FIX_PR_NUMBER }}" --json mergeable --jq '.mergeable')
+            echo "After Tier 1: mergeable=$MERGEABLE"
+            if [ "$MERGEABLE" = "CONFLICTING" ]; then
+              echo "Tier 1 pushed but PR still conflicting — continuing"
+              RESOLVED=false
+            fi
+          fi
+
+          # --- Tier 2: Merge preferring main for conflicts (-X theirs) ---
+          if [ "$RESOLVED" != "true" ]; then
+            echo "=== Tier 2: Merge with -X theirs ==="
+            git reset --hard HEAD 2>/dev/null || true
+            if git merge origin/main -X theirs --no-edit 2>&1; then
               npm install 2>/dev/null || true
               git add package-lock.json 2>/dev/null || true
-              git commit --no-edit
-              echo "resolved=trivial" >> $GITHUB_OUTPUT
+              git diff --cached --quiet || git commit --amend --no-edit
+              echo "Tier 2: merge succeeded, pushing..."
+              git push origin HEAD:"$BRANCH" 2>&1 || git push --force-with-lease origin HEAD:"$BRANCH" 2>&1
+              RESOLVED=true
             else
-              git merge --abort
-              echo "resolved=none" >> $GITHUB_OUTPUT
-              echo "non_trivial<<EOF" >> $GITHUB_OUTPUT
-              echo "$NON_TRIVIAL" >> $GITHUB_OUTPUT
-              echo "EOF" >> $GITHUB_OUTPUT
+              echo "Tier 2: merge -X theirs failed, aborting..."
+              git merge --abort 2>/dev/null || true
             fi
           fi
 
-      - name: "Tier 2: LLM fix (conflicts or failing checks)"
+          # Check
+          if [ "$RESOLVED" = "true" ]; then
+            sleep 5
+            MERGEABLE=$(gh pr view "${{ env.FIX_PR_NUMBER }}" --json mergeable --jq '.mergeable')
+            echo "After Tier 2: mergeable=$MERGEABLE"
+            if [ "$MERGEABLE" = "CONFLICTING" ]; then
+              echo "Tier 2 pushed but PR still conflicting — continuing"
+              RESOLVED=false
+            fi
+          fi
+
+          # --- Tier 3: Save source files, reset to main, copy back, force-push ---
+          if [ "$RESOLVED" != "true" ]; then
+            echo "=== Tier 3: Nuclear — save files, reset to main, copy back ==="
+            TMPDIR=$(mktemp -d)
+            for dir in src tests; do
+              [ -d "$dir" ] && cp -r "$dir" "$TMPDIR/" || true
+            done
+            cp package.json "$TMPDIR/" 2>/dev/null || true
+
+            git reset --hard origin/main
+            for dir in src tests; do
+              [ -d "$TMPDIR/$dir" ] && cp -r "$TMPDIR/$dir" ./ || true
+            done
+            cp "$TMPDIR/package.json" . 2>/dev/null || true
+            npm install 2>/dev/null || true
+
+            git add -A
+            if ! git diff --cached --quiet; then
+              git commit -m "fix-stuck: sync with main (resolve conflicts)"
+              git push --force-with-lease origin HEAD:"$BRANCH" 2>&1 && RESOLVED=true
+            else
+              echo "Tier 3: no differences after reset — branch identical to main"
+              RESOLVED=true
+            fi
+            rm -rf "$TMPDIR"
+          fi
+
+          # --- Final check: HARD FAIL if still not resolved ---
+          sleep 5
+          MERGEABLE=$(gh pr view "${{ env.FIX_PR_NUMBER }}" --json mergeable --jq '.mergeable')
+          echo "Final PR mergeable status: $MERGEABLE"
+          if [ "$MERGEABLE" = "CONFLICTING" ]; then
+            echo "::error::PR #${{ env.FIX_PR_NUMBER }} is STILL CONFLICTING after all 3 resolution tiers"
+            exit 1
+          fi
+          if [ "$RESOLVED" != "true" ]; then
+            echo "::error::All 3 tiers failed to resolve PR #${{ env.FIX_PR_NUMBER }}"
+            exit 1
+          fi
+          echo "PR #${{ env.FIX_PR_NUMBER }} successfully synced with main"
+          echo "resolved=true" >> $GITHUB_OUTPUT
+
+      - name: "Tier 2: LLM fix (only for explicitly requested PRs with failing checks)"
         if: |
           env.FIX_PR_NUMBER != '' &&
           steps.fix-mission-check.outputs.mission-complete != 'true' &&
-          (env.FIX_REASON != 'merge conflicts' ||
-           steps.trivial-resolve.outputs.resolved == 'none')
+          env.FIX_REASON == 'requested'
         uses: ./.github/agentic-lib/actions/agentic-step
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -828,9 +920,17 @@ jobs:
 
       - name: Commit and push fixes
         if: github.repository != 'xn-intenton-z2a/agentic-lib' && env.FIX_PR_NUMBER != '' && steps.fix-mission-check.outputs.mission-complete != 'true'
-        uses: ./.github/agentic-lib/actions/commit-if-changed
-        with:
-          commit-message: "agentic-step: fix failing tests / resolve conflicts"
+        run: |
+          git config user.email 'action@github.com'
+          git config user.name 'GitHub Actions[bot]'
+          BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          git add -A
+          if ! git diff --cached --quiet; then
+            git commit -m "agentic-step: fix failing tests / resolve conflicts"
+            git push origin HEAD:"$BRANCH" 2>&1 || git push --force-with-lease origin HEAD:"$BRANCH" 2>&1
+          else
+            echo "No additional changes to push"
+          fi
 
       - name: Commit, push, and open PR for main build fix
         if: github.repository != 'xn-intenton-z2a/agentic-lib' && env.FIX_MAIN_BUILD == 'true' && steps.fix-mission-check.outputs.mission-complete != 'true'
@@ -943,12 +1043,16 @@ jobs:
       - name: Check mission-complete signal
         id: dev-mission-check
         run: |
-          if [ -f MISSION_COMPLETE.md ]; then
+          SUPERVISOR=$(grep '^\s*supervisor\s*=' agentic-lib.toml 2>/dev/null | head -1 | sed 's/.*=\s*"\([^"]*\)".*/\1/')
+          if [ -f MISSION_COMPLETE.md ] && [ "$SUPERVISOR" != "maintenance" ]; then
             echo "mission-complete=true" >> $GITHUB_OUTPUT
             echo "Mission is complete — skipping dev transformation"
             cat MISSION_COMPLETE.md
           else
             echo "mission-complete=false" >> $GITHUB_OUTPUT
+            if [ "$SUPERVISOR" = "maintenance" ] && [ -f MISSION_COMPLETE.md ]; then
+              echo "Maintenance mode — ignoring MISSION_COMPLETE.md"
+            fi
           fi
 
       - name: Find target issue
@@ -962,6 +1066,17 @@ jobs:
               core.setOutput('issue-number', specificIssue);
               return;
             }
+            // W7: Mechanical instability override — prioritise instability issues
+            // before any other ready issues, regardless of supervisor decisions
+            const { data: instabilityIssues } = await github.rest.issues.listForRepo({
+              ...context.repo, state: 'open', labels: 'instability',
+              sort: 'created', direction: 'asc', per_page: 1,
+            });
+            if (instabilityIssues.length > 0) {
+              core.setOutput('issue-number', String(instabilityIssues[0].number));
+              core.info(`Instability override: targeting issue #${instabilityIssues[0].number}: ${instabilityIssues[0].title}`);
+              return;
+            }
             // Find oldest open issue with 'ready' label
             const { data: issues } = await github.rest.issues.listForRepo({
               ...context.repo, state: 'open', labels: 'ready',
@@ -1024,15 +1139,33 @@ jobs:
           echo "tests-passed=true" >> $GITHUB_OUTPUT
           echo "All tests passed"
 
+      - name: Run behaviour tests before committing
+        id: pre-commit-behaviour-test
+        if: steps.issue.outputs.issue-number != '' && steps.pre-commit-test.outputs.tests-passed == 'true' && (hashFiles('playwright.config.js') != '' || hashFiles('playwright.config.ts') != '')
+        run: |
+          npx playwright install --with-deps chromium 2>/dev/null || true
+          npm run build:web 2>/dev/null || true
+          set +e
+          npm run --if-present test:behaviour 2>&1 | tail -30
+          EXIT_CODE=$?
+          set -e
+          if [ $EXIT_CODE -ne 0 ]; then
+            echo "tests-passed=false" >> $GITHUB_OUTPUT
+            echo "WARNING: Behaviour tests failed (exit $EXIT_CODE) — skipping commit and PR"
+            exit 0
+          fi
+          echo "tests-passed=true" >> $GITHUB_OUTPUT
+          echo "Behaviour tests passed"
+
       - name: Commit and push
-        if: github.repository != 'xn-intenton-z2a/agentic-lib' && steps.issue.outputs.issue-number != '' && needs.params.outputs.dry-run != 'true' && steps.pre-commit-test.outputs.tests-passed == 'true'
+        if: github.repository != 'xn-intenton-z2a/agentic-lib' && steps.issue.outputs.issue-number != '' && needs.params.outputs.dry-run != 'true' && steps.pre-commit-test.outputs.tests-passed == 'true' && steps.pre-commit-behaviour-test.outputs.tests-passed != 'false'
         uses: ./.github/agentic-lib/actions/commit-if-changed
         with:
           commit-message: "agentic-step: transform issue #${{ steps.issue.outputs.issue-number }}"
           push-ref: ${{ steps.branch.outputs.branchName }}
 
       - name: Create PR and attempt merge
-        if: github.repository != 'xn-intenton-z2a/agentic-lib' && steps.issue.outputs.issue-number != '' && needs.params.outputs.dry-run != 'true' && steps.pre-commit-test.outputs.tests-passed == 'true'
+        if: github.repository != 'xn-intenton-z2a/agentic-lib' && steps.issue.outputs.issue-number != '' && needs.params.outputs.dry-run != 'true' && steps.pre-commit-test.outputs.tests-passed == 'true' && steps.pre-commit-behaviour-test.outputs.tests-passed != 'false'
         uses: actions/github-script@v8
         with:
           script: |

package/package.json

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

package/src/actions/agentic-step/index.js

@@ -50,7 +50,7 @@ function buildMissionMetrics(config, result, limitsStatus, cumulativeCost, featu
   const metrics = [
     { metric: "Open issues", value: String(openIssues), target: "0", status: openIssues === 0 ? "MET" : "NOT MET" },
     { metric: "Open PRs", value: String(openPrs), target: "0", status: openPrs === 0 ? "MET" : "NOT MET" },
-    { metric: "Issues closed by review (RESOLVED)", value: String(resolvedCount), target: ">= 1", status: resolvedCount >= 1 ? "MET" : "NOT MET" },
+    { metric: "Issues resolved (review or PR merge)", value: String(resolvedCount), target: ">= 1", status: resolvedCount >= 1 ? "MET" : "NOT MET" },
     { metric: "Transformation budget used", value: `${cumulativeCost}/${budgetCap}`, target: budgetCap > 0 ? `< ${budgetCap}` : "unlimited", status: budgetCap > 0 && cumulativeCost >= budgetCap ? "EXHAUSTED" : "OK" },
     { metric: "Cumulative transforms", value: String(cumulativeCost), target: ">= 1", status: cumulativeCost >= 1 ? "MET" : "NOT MET" },
     { metric: "Mission complete declared", value: missionComplete ? "YES" : "NO", target: "—", status: "—" },
@@ -66,7 +66,7 @@ function buildMissionMetrics(config, result, limitsStatus, cumulativeCost, featu
 function buildMissionReadiness(metrics) {
   const openIssues = parseInt(metrics.find((m) => m.metric === "Open issues")?.value || "0", 10);
   const openPrs = parseInt(metrics.find((m) => m.metric === "Open PRs")?.value || "0", 10);
-  const resolved = parseInt(metrics.find((m) => m.metric === "Issues closed by review (RESOLVED)")?.value || "0", 10);
+  const resolved = parseInt(metrics.find((m) => m.metric === "Issues resolved (review or PR merge)")?.value || "0", 10);
   const missionComplete = metrics.find((m) => m.metric === "Mission complete declared")?.value === "YES";
   const missionFailed = metrics.find((m) => m.metric === "Mission failed declared")?.value === "YES";
 
@@ -82,12 +82,12 @@ function buildMissionReadiness(metrics) {
 
   if (conditionsMet) {
     parts.push("Mission complete conditions ARE met.");
-    parts.push(`0 open issues, 0 open PRs, ${resolved} issue(s) closed by review as RESOLVED.`);
+    parts.push(`0 open issues, 0 open PRs, ${resolved} issue(s) resolved.`);
   } else {
     parts.push("Mission complete conditions are NOT met.");
     if (openIssues > 0) parts.push(`${openIssues} open issue(s) remain.`);
     if (openPrs > 0) parts.push(`${openPrs} open PR(s) remain.`);
-    if (resolved < 1) parts.push("No issues have been closed by review as RESOLVED yet.");
+    if (resolved < 1) parts.push("No issues have been resolved yet.");
   }
 
   return parts.join(" ");

package/src/actions/agentic-step/tasks/maintain-features.js

@@ -19,8 +19,8 @@ export async function maintainFeatures(context) {
   const { config, instructions, writablePaths, model, octokit, repo } = context;
   const t = config.tuning || {};
 
-  // Check mission-complete signal
-  if (existsSync("MISSION_COMPLETE.md")) {
+  // Check mission-complete signal (skip in maintenance mode)
+  if (existsSync("MISSION_COMPLETE.md") && config.supervisor !== "maintenance") {
     return { outcome: "nop", details: "Mission already complete (MISSION_COMPLETE.md signal)" };
   }
 

package/src/actions/agentic-step/tasks/maintain-library.js

@@ -19,8 +19,8 @@ export async function maintainLibrary(context) {
   const { config, instructions, writablePaths, model } = context;
   const t = config.tuning || {};
 
-  // Check mission-complete signal
-  if (existsSync("MISSION_COMPLETE.md")) {
+  // Check mission-complete signal (skip in maintenance mode)
+  if (existsSync("MISSION_COMPLETE.md") && config.supervisor !== "maintenance") {
     core.info("Mission is complete — skipping library maintenance");
     return { outcome: "nop", details: "Mission already complete (MISSION_COMPLETE.md signal)" };
   }

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

@@ -184,7 +184,8 @@ async function gatherContext(octokit, repo, config, t) {
     const { data: closedIssuesRaw } = await octokit.rest.issues.listForRepo({
       ...repo,
       state: "closed",
-      per_page: 5,
+      labels: "automated",
+      per_page: 10,
       sort: "updated",
       direction: "desc",
     });
@@ -195,15 +196,27 @@ async function gatherContext(octokit, repo, config, t) {
     for (const ci of closedIssuesFiltered) {
       let closeReason = "closed";
       try {
+        // Check for review-closed (Automated Review Result comment)
         const { data: comments } = await octokit.rest.issues.listComments({
           ...repo,
           issue_number: ci.number,
-          per_page: 1,
+          per_page: 5,
           sort: "created",
           direction: "desc",
         });
-        if (comments.length > 0 && comments[0].body?.includes("Automated Review Result")) {
-          closeReason = "closed by review as RESOLVED";
+        if (comments.some((c) => c.body?.includes("Automated Review Result"))) {
+          closeReason = "RESOLVED";
+        } else {
+          // Check for PR-linked closure (GitHub auto-closes via "Closes #N")
+          const { data: events } = await octokit.rest.issues.listEvents({
+            ...repo,
+            issue_number: ci.number,
+            per_page: 10,
+          });
+          const closedByPR = events.some((e) => e.event === "closed" && e.commit_id);
+          if (closedByPR) {
+            closeReason = "RESOLVED";
+          }
         }
       } catch (_) { /* ignore */ }
       recentlyClosedSummary.push(`#${ci.number}: ${ci.title} — ${closeReason}`);
@@ -631,15 +644,27 @@ async function executeMissionComplete(octokit, repo, params, ctx) {
   }
 
   if (process.env.GITHUB_REPOSITORY !== "xn-intenton-z2a/agentic-lib") {
+    // Only turn off schedule if it's not already off or in maintenance mode
+    let currentSupervisor = "";
     try {
-      await octokit.rest.actions.createWorkflowDispatch({
-        ...repo,
-        workflow_id: "agentic-lib-schedule.yml",
-        ref: "main",
-        inputs: { frequency: "off" },
-      });
-    } catch (err) {
-      core.warning(`Could not set schedule to off: ${err.message}`);
+      const tomlContent = readFileSync("agentic-lib.toml", "utf8");
+      const match = tomlContent.match(/^\s*supervisor\s*=\s*"([^"]*)"/m);
+      if (match) currentSupervisor = match[1];
+    } catch { /* ignore */ }
+
+    if (currentSupervisor === "off" || currentSupervisor === "maintenance") {
+      core.info(`Schedule already "${currentSupervisor}" — not changing on mission-complete`);
+    } else {
+      try {
+        await octokit.rest.actions.createWorkflowDispatch({
+          ...repo,
+          workflow_id: "agentic-lib-schedule.yml",
+          ref: "main",
+          inputs: { frequency: "off" },
+        });
+      } catch (err) {
+        core.warning(`Could not set schedule to off: ${err.message}`);
+      }
     }
 
     // Announce mission complete via bot
@@ -688,15 +713,27 @@ async function executeMissionFailed(octokit, repo, params, ctx) {
   }
 
   if (process.env.GITHUB_REPOSITORY !== "xn-intenton-z2a/agentic-lib") {
+    // Only turn off schedule if it's not already off or in maintenance mode
+    let currentSupervisor = "";
     try {
-      await octokit.rest.actions.createWorkflowDispatch({
-        ...repo,
-        workflow_id: "agentic-lib-schedule.yml",
-        ref: "main",
-        inputs: { frequency: "off" },
-      });
-    } catch (err) {
-      core.warning(`Could not set schedule to off: ${err.message}`);
+      const tomlContent = readFileSync("agentic-lib.toml", "utf8");
+      const match = tomlContent.match(/^\s*supervisor\s*=\s*"([^"]*)"/m);
+      if (match) currentSupervisor = match[1];
+    } catch { /* ignore */ }
+
+    if (currentSupervisor === "off" || currentSupervisor === "maintenance") {
+      core.info(`Schedule already "${currentSupervisor}" — not changing on mission-failed`);
+    } else {
+      try {
+        await octokit.rest.actions.createWorkflowDispatch({
+          ...repo,
+          workflow_id: "agentic-lib-schedule.yml",
+          ref: "main",
+          inputs: { frequency: "off" },
+        });
+      } catch (err) {
+        core.warning(`Could not set schedule to off: ${err.message}`);
+      }
     }
 
     // Announce mission failed via bot
@@ -810,17 +847,18 @@ export async function supervise(context) {
 
   // Strategy A: Deterministic mission-complete fallback
   // If the LLM didn't choose mission-complete but conditions are clearly met, auto-execute it.
-  if (!ctx.missionComplete && !ctx.missionFailed) {
+  // Skip in maintenance mode — maintenance keeps running regardless of mission status.
+  if (!ctx.missionComplete && !ctx.missionFailed && config.supervisor !== "maintenance") {
     const llmChoseMissionComplete = results.some((r) => r.startsWith("mission-complete:"));
     if (!llmChoseMissionComplete) {
-      const resolvedCount = ctx.recentlyClosedSummary.filter((s) => s.includes("closed by review as RESOLVED")).length;
+      const resolvedCount = ctx.recentlyClosedSummary.filter((s) => s.includes("RESOLVED")).length;
       const hasNoOpenIssues = ctx.issuesSummary.length === 0;
       const hasNoOpenPRs = ctx.prsSummary.length === 0;
-      if (hasNoOpenIssues && hasNoOpenPRs && resolvedCount >= 2) {
+      if (hasNoOpenIssues && hasNoOpenPRs && resolvedCount >= 1) {
         core.info(`Deterministic mission-complete: 0 open issues, 0 open PRs, ${resolvedCount} recently resolved — LLM did not detect completion`);
         try {
           const autoResult = await executeMissionComplete(octokit, repo,
-            { reason: `All acceptance criteria satisfied (${resolvedCount} issues closed by review as RESOLVED, 0 open issues, 0 open PRs)` },
+            { reason: `All acceptance criteria satisfied (${resolvedCount} issues resolved, 0 open issues, 0 open PRs)` },
             ctx);
           results.push(autoResult);
         } catch (err) {

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

@@ -26,8 +26,8 @@ export async function transform(context) {
     return { outcome: "nop", details: "No mission file found" };
   }
 
-  // Check mission-complete signal
-  if (existsSync("MISSION_COMPLETE.md")) {
+  // Check mission-complete signal (skip in maintenance mode)
+  if (existsSync("MISSION_COMPLETE.md") && config.supervisor !== "maintenance") {
     core.info("Mission is complete — skipping transformation (MISSION_COMPLETE.md exists)");
     return { outcome: "nop", details: "Mission already complete (MISSION_COMPLETE.md signal)" };
   }

package/src/agents/agent-supervisor.md

@@ -106,6 +106,9 @@ Check the Recent Activity log and Recently Closed Issues for patterns:
 - If the last 3+ cycles show the pattern: create issue → review closes as resolved → no transform → create identical issue, the pipeline is stuck. Check if acceptance criteria are truly met (use `mission-complete`) or if review is wrong (create a more specific issue). If neither works, use `mission-failed`.
 - Look for `transform: nop` or `transform: transformed` patterns in the activity log to distinguish productive iterations from idle ones.
 
+**Dedup deadlock recovery:**
+- If your issue creation is blocked by the dedup guard (similar to a recently closed issue), do NOT retry the same issue title. Instead, create an issue with a different scope — e.g. "fix: resolve failing tests on main" or "fix: align code and test expectations" — with both the `instability` and `ready` labels. This sidesteps the dedup guard and directs the dev job to the actual problem. The `instability` label gives the issue mechanical priority over other `ready` issues.
+
 ## Discussions Awareness
 
 Check the Recent Activity log for discussion bot referrals (lines containing `discussion-request-supervisor`). These indicate a user asked the bot something that requires supervisor action. **Prioritise responding to these referrals.**

package/src/seeds/zero-package.json

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