@agentv/core 4.33.0-next.1 → 4.34.0-next.1

package/dist/index.js

@@ -1014,7 +1014,8 @@ async function inspectResultsRepoGit(repoDir) {
     cwd: repoDir,
     check: false
   });
-  const { dirtyPaths, conflictedPaths } = parseGitPorcelainPaths(porcelain);
+  const { dirtyPaths: allDirtyPaths, conflictedPaths } = parseGitPorcelainPaths(porcelain);
+  const dirtyPaths = allDirtyPaths.filter(isSafeResultsRepoPath);
   const { ahead = 0, behind = 0 } = await getAheadBehind(repoDir, upstream);
   const inProgressConflict = await hasInProgressGitConflict(repoDir);
   let syncStatus = "clean";
@@ -1067,9 +1068,6 @@ function lastErrorForGitInspection(status, inspection) {
     if (status.auto_push === false) {
       return "Results repo has uncommitted changes and auto_push is disabled";
     }
-    if (!areSafeResultsRepoPaths(inspection.dirtyPaths)) {
-      return "Results repo has non-results working tree changes";
-    }
   }
   return void 0;
 }
@@ -1092,10 +1090,11 @@ function withActionFlags(status, flags) {
     commit_created: flags.commitCreated
   };
 }
+function isSafeResultsRepoPath(p) {
+  return p === RESULTS_REPO_RESULTS_DIR || p.startsWith(`${RESULTS_REPO_RESULTS_DIR}/`);
+}
 function areSafeResultsRepoPaths(paths) {
-  return paths.length > 0 && paths.every(
-    (p) => p === RESULTS_REPO_RESULTS_DIR || p.startsWith(`${RESULTS_REPO_RESULTS_DIR}/`)
-  );
+  return paths.length > 0 && paths.every(isSafeResultsRepoPath);
 }
 async function getAheadPaths(repoDir, upstream) {
   if (!upstream) {
@@ -1207,33 +1206,51 @@ async function syncResultsRepoForProject(config) {
           }
         );
       }
-      if (!areSafeResultsRepoPaths(inspection.dirtyPaths)) {
-        const status = withGitInspection(getResultsRepoStatus(normalized), inspection);
-        updateStatusFile(normalized, {
-          last_error: "Results repo has non-results working tree changes"
-        });
-        return withBlockedStatus(status, "Results repo has non-results working tree changes", {
-          pullPerformed,
-          pushPerformed,
-          commitCreated
-        });
-      }
       if ((inspection.behind ?? 0) > 0) {
-        const status = withGitInspection(getResultsRepoStatus(normalized), inspection);
-        const reason = "Results repo has uncommitted result changes and remote changes";
-        updateStatusFile(normalized, { last_error: reason });
-        return withBlockedStatus(status, reason, {
-          pullPerformed,
-          pushPerformed,
-          commitCreated
-        });
+        if (!inspection.upstream) {
+          const status = withGitInspection(getResultsRepoStatus(normalized), inspection);
+          updateStatusFile(normalized, {
+            last_error: "Results repo has no upstream branch to pull from"
+          });
+          return withBlockedStatus(status, "Results repo has no upstream branch to pull from", {
+            pullPerformed,
+            pushPerformed,
+            commitCreated
+          });
+        }
+        try {
+          await runGit(["merge", "--ff-only", inspection.upstream], { cwd: repoDir });
+          pullPerformed = true;
+          inspection = await inspectResultsRepoGit(repoDir);
+        } catch (error) {
+          inspection = await inspectResultsRepoGit(repoDir);
+          const status = withGitInspection(getResultsRepoStatus(normalized), inspection);
+          const reason = `Results repo could not be fast-forwarded: ${getStatusMessage(error)}`;
+          updateStatusFile(normalized, { last_error: reason });
+          return withBlockedStatus(status, reason, {
+            pullPerformed,
+            pushPerformed,
+            commitCreated
+          });
+        }
+      }
+      if (inspection.syncStatus === "dirty") {
+        await runGit(["add", "--all", "--", RESULTS_REPO_RESULTS_DIR], { cwd: repoDir });
+        await runGit(
+          [
+            "commit",
+            "-m",
+            "chore(results): sync local result metadata",
+            "--",
+            RESULTS_REPO_RESULTS_DIR
+          ],
+          {
+            cwd: repoDir
+          }
+        );
+        commitCreated = true;
+        inspection = await inspectResultsRepoGit(repoDir);
       }
-      await runGit(["add", "--all", "--", RESULTS_REPO_RESULTS_DIR], { cwd: repoDir });
-      await runGit(["commit", "-m", "chore(results): sync local result metadata"], {
-        cwd: repoDir
-      });
-      commitCreated = true;
-      inspection = await inspectResultsRepoGit(repoDir);
     }
     if (inspection.syncStatus === "diverged") {
       const status = withGitInspection(getResultsRepoStatus(normalized), inspection);