@xn-intenton-z2a/agentic-lib 7.1.56 → 7.1.58

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

@@ -198,23 +198,8 @@ jobs:
                   core.warning(`Could not merge PR #${pr.number}: ${e.message}`);
                 }
               } else if (fullPr.mergeable_state === 'dirty' || fullPr.mergeable === false) {
-                const isStale = new Date(pr.updated_at) < prCutoff;
-                if (isStale) {
-                  // Close stale conflicting PR
-                  core.info(`Closing stale conflicting PR #${pr.number}`);
-                  await github.rest.pulls.update({ owner, repo, pull_number: pr.number, state: 'closed' });
-                  try {
-                    await github.rest.git.deleteRef({ owner, repo, ref: `heads/${pr.head.ref}` });
-                  } catch (e) { /* branch may already be gone */ }
-                  closedPRs.push(pr.number);
-                } else {
-                  // Remove automerge label from conflicting but fresh PR
-                  try {
-                    await github.rest.issues.removeLabel({ owner, repo, issue_number: pr.number, name: 'automerge' });
-                    await github.rest.issues.createComment({ owner, repo, issue_number: pr.number,
-                      body: 'Automerge label removed — PR has conflicts. Resolve and re-add label to retry.' });
-                  } catch (e) { /* label may not exist */ }
-                }
+                // Conflicting PR — leave it for fix-stuck to resolve instead of deleting
+                core.info(`PR #${pr.number} has merge conflicts — fix-stuck job will attempt resolution`);
               }
               // If unstable/unknown: skip, next run handles
             }
@@ -450,7 +435,7 @@ jobs:
               return;
             }
 
-            // Find PRs with failing checks on agentic branches
+            // Find PRs with failing checks or merge conflicts on agentic branches
             const { data: openPRs } = await github.rest.pulls.list({
               owner, repo, state: 'open', per_page: 10,
             });
@@ -460,12 +445,19 @@ 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) continue;
+
+              if (!hasFailing && !hasConflicts) continue;
 
               // Check fix attempt count
               const { data: fixRuns } = await github.rest.actions.listWorkflowRuns({
@@ -478,24 +470,60 @@ jobs:
                 continue;
               }
 
-              core.info(`Will attempt to fix PR #${pr.number}`);
+              const reason = hasConflicts ? 'merge conflicts' : 'failing checks';
+              core.info(`Will attempt to fix PR #${pr.number} (${reason})`);
               core.exportVariable('FIX_PR_NUMBER', String(pr.number));
+              core.exportVariable('FIX_REASON', reason);
               break;
             }
 
-      - name: Checkout PR branch and fix
+      - name: Checkout PR branch
         if: env.FIX_PR_NUMBER != ''
         run: |
           gh pr checkout ${{ env.FIX_PR_NUMBER }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Fix failing code
-        if: env.FIX_PR_NUMBER != ''
+      - name: "Tier 1: Auto-resolve trivial merge conflicts"
+        if: env.FIX_PR_NUMBER != '' && env.FIX_REASON == 'merge conflicts'
+        id: trivial-resolve
+        run: |
+          git fetch origin main
+          if git merge origin/main --no-edit 2>/dev/null; then
+            echo "resolved=clean" >> $GITHUB_OUTPUT
+          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
+              npm install 2>/dev/null || true
+              git add package-lock.json 2>/dev/null || true
+              git commit --no-edit
+              echo "resolved=trivial" >> $GITHUB_OUTPUT
+            else
+              git merge --abort
+              echo "resolved=none" >> $GITHUB_OUTPUT
+              echo "non_trivial<<EOF" >> $GITHUB_OUTPUT
+              echo "$NON_TRIVIAL" >> $GITHUB_OUTPUT
+              echo "EOF" >> $GITHUB_OUTPUT
+            fi
+          fi
+
+      - name: "Tier 2: LLM fix (conflicts or failing checks)"
+        if: |
+          env.FIX_PR_NUMBER != '' &&
+          (env.FIX_REASON != 'merge conflicts' ||
+           steps.trivial-resolve.outputs.resolved == 'none')
         uses: ./.github/agentic-lib/actions/agentic-step
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+          NON_TRIVIAL_FILES: ${{ steps.trivial-resolve.outputs.non_trivial }}
         with:
           task: "fix-code"
           config: ${{ needs.params.outputs.config-path }}
@@ -508,7 +536,7 @@ jobs:
         if: env.FIX_PR_NUMBER != ''
         uses: ./.github/agentic-lib/actions/commit-if-changed
         with:
-          commit-message: "agentic-step: fix failing tests"
+          commit-message: "agentic-step: fix failing tests / resolve conflicts"
 
   # ─── Review: close resolved issues, enhance with criteria ──────────
   review-features:

package/package.json

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

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

@@ -96,7 +96,7 @@ async function run() {
     if (result.tokensUsed) core.setOutput("tokens-used", String(result.tokensUsed));
     if (result.model) core.setOutput("model", result.model);
 
-    // Log to intentïon.md
+    // Log to intentïon.md (commit-if-changed excludes this on non-default branches)
     const intentionFilepath = config.intentionBot?.intentionFilepath;
     if (intentionFilepath) {
       logActivity({

package/src/actions/agentic-step/tasks/fix-code.js

@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-only
 // Copyright (C) 2025-2026 Polycode Limited
-// tasks/fix-code.js — Fix failing tests on a PR
+// tasks/fix-code.js — Fix failing tests or resolve merge conflicts on a PR
 //
-// Given a PR number with failing tests, analyzes the test output,
-// generates fixes using the Copilot SDK, and pushes a commit.
+// Given a PR number, detects merge conflicts or failing checks and resolves them.
+// Conflict resolution: reads files with conflict markers, asks the LLM to resolve.
+// Failing checks: analyzes test output, generates code fixes.
 
 import * as core from "@actions/core";
+import { readFileSync } from "fs";
 import { execSync } from "child_process";
 import { runCopilotTask, formatPathsSection } from "../copilot.js";
 
@@ -37,7 +39,90 @@ function fetchRunLog(runId) {
 }
 
 /**
- * Fix failing code on a pull request.
+ * Resolve merge conflicts on a PR using the Copilot SDK.
+ * Called when the workflow has started a `git merge origin/main` that left
+ * conflict markers in non-trivial files (listed in NON_TRIVIAL_FILES env var).
+ *
+ * @param {Object} params
+ * @returns {Promise<Object>} Result with outcome, tokensUsed, model
+ */
+async function resolveConflicts({ config, pr, prNumber, instructions, model, writablePaths, testCommand }) {
+  const nonTrivialEnv = process.env.NON_TRIVIAL_FILES || "";
+  const conflictedPaths = nonTrivialEnv
+    .split("\n")
+    .map((f) => f.trim())
+    .filter(Boolean);
+
+  if (conflictedPaths.length === 0) {
+    core.info(`PR #${prNumber} has conflicts but no non-trivial files listed. Returning nop.`);
+    return { outcome: "nop", details: "No non-trivial conflict files to resolve" };
+  }
+
+  core.info(`Resolving ${conflictedPaths.length} conflicted file(s) on PR #${prNumber}`);
+
+  const conflicts = conflictedPaths.map((f) => {
+    try {
+      return { name: f, content: readFileSync(f, "utf8") };
+    } catch (err) {
+      core.warning(`Could not read conflicted file ${f}: ${err.message}`);
+      return { name: f, content: "(could not read)" };
+    }
+  });
+
+  const agentInstructions = instructions || "Resolve the merge conflicts while preserving the PR's intended changes.";
+  const readOnlyPaths = config.readOnlyPaths;
+
+  const prompt = [
+    "## Instructions",
+    agentInstructions,
+    "",
+    `## Pull Request #${prNumber}: ${pr.title}`,
+    "",
+    pr.body || "(no description)",
+    "",
+    "## Task: Resolve Merge Conflicts",
+    "The PR branch has been merged with main but has conflicts in the files below.",
+    "Each file contains git conflict markers (<<<<<<< / ======= / >>>>>>>).",
+    "Resolve each conflict by keeping the PR's intended changes while incorporating",
+    "any non-conflicting updates from main.",
+    "",
+    `## Conflicted Files (${conflicts.length})`,
+    ...conflicts.map((f) => `### ${f.name}\n\`\`\`\n${f.content}\n\`\`\``),
+    "",
+    formatPathsSection(writablePaths, readOnlyPaths, config),
+    "",
+    "## Constraints",
+    "- Remove ALL conflict markers (<<<<<<, =======, >>>>>>>)",
+    "- Preserve the PR's feature/fix intent",
+    `- Run \`${testCommand}\` to validate your resolution`,
+  ].join("\n");
+
+  const t = config.tuning || {};
+  const { tokensUsed, inputTokens, outputTokens, cost } = await runCopilotTask({
+    model,
+    systemMessage: `You are resolving git merge conflicts on PR #${prNumber}. Write resolved versions of each conflicted file, removing all conflict markers. Preserve the PR's feature intent while incorporating main's updates.`,
+    prompt,
+    writablePaths,
+    tuning: t,
+  });
+
+  core.info(`Conflict resolution completed (${tokensUsed} tokens)`);
+
+  return {
+    outcome: "conflicts-resolved",
+    tokensUsed,
+    inputTokens,
+    outputTokens,
+    cost,
+    model,
+    details: `Resolved ${conflicts.length} conflicted file(s) on PR #${prNumber}`,
+  };
+}
+
+/**
+ * Fix failing code or resolve merge conflicts on a pull request.
+ *
+ * Priority: conflicts first (if NON_TRIVIAL_FILES env is set), then failing checks.
  *
  * @param {Object} context - Task context from index.js
  * @returns {Promise<Object>} Result with outcome, tokensUsed, model
@@ -49,8 +134,15 @@ export async function fixCode(context) {
     throw new Error("fix-code task requires pr-number input");
   }
 
-  // Fetch the PR and check runs
+  // Fetch the PR
   const { data: pr } = await octokit.rest.pulls.get({ ...repo, pull_number: Number(prNumber) });
+
+  // If we have non-trivial conflict files from the workflow's Tier 1 step, resolve them
+  if (process.env.NON_TRIVIAL_FILES) {
+    return resolveConflicts({ config, pr, prNumber, instructions, model, writablePaths, testCommand });
+  }
+
+  // Otherwise, check for failing checks
   const { data: checkRuns } = await octokit.rest.checks.listForRef({ ...repo, ref: pr.head.sha, per_page: 10 });
 
   const failedChecks = checkRuns.check_runs.filter((cr) => cr.conclusion === "failure");

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

@@ -26,6 +26,11 @@ runs:
         git config --local user.email 'action@github.com'
         git config --local user.name 'GitHub Actions[bot]'
         git add -A
+        # Unstage log files on non-default branches to avoid merge conflicts
+        REF="${{ inputs.push-ref }}"
+        if [ -n "$REF" ] && [ "$REF" != "main" ] && [ "$REF" != "master" ]; then
+          git reset HEAD -- 'intentïon.md' 'intention.md' 2>/dev/null || true
+        fi
         if git diff --cached --quiet; then
           echo "No changes to commit"
         elif git diff --cached --name-only | grep -qvE '(intentïon\.md|intention\.md)$'; then

package/src/agents/agent-apply-fix.md

@@ -11,3 +11,15 @@ and maintain the integrity of the codebase's primary purpose.
 You may complete the implementation of a feature and/or bring the code output in line with the README
 or other documentation. Do as much as you can all at once so that the build runs (even with nothing
 to build) and the tests pass and the main at least doesn't output an error.
+
+## Merge Conflict Resolution
+
+When resolving merge conflicts (files containing <<<<<<< / ======= / >>>>>>> markers):
+
+1. **Understand both sides**: The HEAD side (above =======) is the PR's changes. The incoming side
+   (below =======) is from main. Understand what each side intended before choosing.
+2. **Preserve PR intent**: The PR was created for a reason — keep its feature/fix changes.
+3. **Incorporate main's updates**: If main added new code that doesn't conflict with the PR's
+   purpose, include it.
+4. **Remove ALL markers**: Every <<<<<<, =======, and >>>>>>> line must be removed.
+5. **Run tests**: After resolving, run the test command to validate the resolution compiles and passes.

package/src/seeds/zero-package.json

@@ -14,7 +14,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@xn-intenton-z2a/agentic-lib": "^7.1.56"
+    "@xn-intenton-z2a/agentic-lib": "^7.1.58"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.0.18",