automata-cli 0.7.0-develop.321 → 0.7.0-develop.324

package/dist/index.js

@@ -815,10 +815,14 @@ function listRemoteBranches() {
 function createBranchAtHead(branch) {
   return gitCommand(["checkout", "-b", branch]);
 }
+function pathIsIgnored(path) {
+  return run2("git", ["check-ignore", "-q", "--", path]).status === 0;
+}
 function stageAllExcept(excludePaths) {
+  const needed = excludePaths.filter((path) => !pathIsIgnored(path));
   const args = ["add", "-A"];
-  if (excludePaths.length > 0) {
-    args.push("--", ".", ...excludePaths.map((path) => `:(exclude)${path}`));
+  if (needed.length > 0) {
+    args.push("--", ".", ...needed.map((path) => `:(exclude)${path}`));
   }
   return gitCommand(args);
 }
@@ -3763,6 +3767,12 @@ function rescueUncommittedChanges(options, now) {
     );
     return { kind: "would-rescue", branch: target.branch, createdBranch: target.createdBranch };
   }
+  const staged = stageAllExcept([RUN_LOCK_RELATIVE_PATH]);
+  if (!staged.ok) {
+    options.log(`  rescue    FAILED to stage the changes: ${staged.stderr}
+`);
+    return { kind: "failed", step: "stage", detail: staged.stderr };
+  }
   if (target.createdBranch) {
     const created = createBranchAtHead(target.branch);
     if (!created.ok) {
@@ -3771,17 +3781,18 @@ function rescueUncommittedChanges(options, now) {
       return { kind: "failed", step: "branch", detail: created.stderr };
     }
   }
-  const staged = stageAllExcept([RUN_LOCK_RELATIVE_PATH]);
-  if (!staged.ok) {
-    options.log(`  rescue    FAILED to stage the changes: ${staged.stderr}
-`);
-    return { kind: "failed", step: "stage", detail: staged.stderr };
-  }
+  const left = target.createdBranch ? { branch: target.branch, createdBranch: target.branch } : { branch: target.branch };
   const committed = commitStaged(`chore(automata): rescue uncommitted work from ${target.source}`);
   if (!committed.ok) {
-    options.log(`  rescue    FAILED to commit: ${committed.stderr}
+    options.log(`  rescue    FAILED to commit on ${target.branch}: ${committed.stderr}
 `);
-    return { kind: "failed", step: "commit", detail: committed.stderr };
+    if (target.createdBranch) {
+      options.log(
+        `  rescue    ${target.branch} was created by this rescue and carries none of the work; it is left in the checkout
+`
+      );
+    }
+    return { kind: "failed", step: "commit", detail: committed.stderr, ...left };
   }
   const pushed = pushSetUpstream(target.branch);
   if (!pushed.ok) {
@@ -3790,7 +3801,7 @@ function rescueUncommittedChanges(options, now) {
   rescue    the work is committed locally on ${target.branch}; push it by hand before it is lost
 `
     );
-    return { kind: "failed", step: "push", detail: pushed.stderr };
+    return { kind: "failed", step: "push", detail: pushed.stderr, ...left };
   }
   let existing;
   try {
@@ -3800,7 +3811,7 @@ function rescueUncommittedChanges(options, now) {
       `  rescue    committed and pushed ${target.branch}, but could not check for an open PR: ${err.message}
 `
     );
-    return { kind: "failed", step: "pr", detail: err.message };
+    return { kind: "failed", step: "pr", detail: err.message, ...left };
   }
   if (existing !== null) {
     options.log(
@@ -3841,7 +3852,7 @@ function rescueUncommittedChanges(options, now) {
       `  rescue    committed and pushed ${target.branch}, but could not open a draft PR: ${err.message}
 `
     );
-    return { kind: "failed", step: "pr", detail: err.message };
+    return { kind: "failed", step: "pr", detail: err.message, ...left };
   }
 }
 function prepareBase(options) {
@@ -3866,12 +3877,13 @@ function prepareBase(options) {
 `);
   return { ok: true };
 }
-function collectCandidates(options) {
+function collectCandidates(options, rescueBranch) {
   const remote = listRemoteBranches();
   if (remote === null) return null;
   const remoteNames = new Set(remote);
   const current = getCurrentBranch();
   const untouchable = /* @__PURE__ */ new Set([options.baseBranch, current, ...options.protectedBranches]);
+  if (rescueBranch !== null) untouchable.add(rescueBranch);
   return listLocalBranches().filter(
     (branch) => !untouchable.has(branch) && !remoteNames.has(branch)
   );
@@ -3967,8 +3979,8 @@ function pruneCandidate(branch, options) {
     return { kind: "rescued", branch, pr: null, prUrl: null };
   }
 }
-function prune(options) {
-  const candidates = collectCandidates(options);
+function prune(options, rescueBranch) {
+  const candidates = collectCandidates(options, rescueBranch);
   if (candidates === null) {
     options.log(
       "  prune     skipped: could not list origin's branches, so no branch can be shown to have no remote\n"
@@ -3988,12 +4000,46 @@ function runRepoHygiene(options, now = /* @__PURE__ */ new Date()) {
   options.log(options.dryRun ? "\nPre-flight (dry run):\n" : "\nPre-flight:\n");
   const rescue = rescueUncommittedChanges(options, now);
   const base = prepareBase(options);
-  const { outcomes, remoteUnreadable } = prune(options);
+  const { outcomes, remoteUnreadable } = prune(options, rescueCreatedBranch(rescue));
   const degraded = rescue.kind === "failed" || !base.ok || remoteUnreadable || outcomes.some(
     (outcome) => outcome.kind === "kept" && outcome.reason !== "open-pr" || outcome.kind === "rescued" && outcome.pr === null
   );
   return { rescue, base, prunes: outcomes, degraded };
 }
+function rescueCreatedBranch(rescue) {
+  switch (rescue.kind) {
+    case "rescued":
+    case "would-rescue":
+      return rescue.createdBranch ? rescue.branch : null;
+    case "failed":
+      return rescue.createdBranch ?? null;
+    default:
+      return null;
+  }
+}
+function describePreflightFailures(report) {
+  const causes = [];
+  if (report.rescue.kind === "failed") {
+    causes.push(
+      `the rescue failed at the ${report.rescue.step} step (${describeRescueRemains(report.rescue)}): ${report.rescue.detail}`
+    );
+  }
+  if (!report.base.ok) {
+    causes.push(`the base branch ${report.base.step} failed: ${report.base.detail}`);
+  }
+  return causes;
+}
+function describeRescueRemains(rescue) {
+  if (rescue.branch === void 0) return "the tree is still dirty";
+  switch (rescue.step) {
+    case "push":
+      return `the work is committed on ${rescue.branch} but not pushed`;
+    case "pr":
+      return `the work is committed and pushed on ${rescue.branch}, without a draft pull request`;
+    default:
+      return `the tree is still dirty and ${rescue.branch} carries none of it`;
+  }
+}
 
 // src/run/operationLog.ts
 import {
@@ -4787,7 +4833,10 @@ function refuseBeforeRun(base, marker, detail, markerText) {
   }
   return { ...base, outcome: "failed", detail };
 }
-async function processItem(planned, settings, silent) {
+function preflightSuffix(causes) {
+  return causes.length === 0 ? "" : ` [pre-flight: ${causes.join("; ")}]`;
+}
+async function processItem(planned, settings, silent, preflightCauses) {
   progress(`
 ${itemLabel(planned)} ${planned.turn}: ${planned.reason}
 `);
@@ -4817,9 +4866,14 @@ ${itemLabel(planned)} ${planned.turn}: ${planned.reason}
   };
   const prepared = item.turn === "issue-discuss" ? prepareBaseBranch(item.branch) : preparePrBranch(item.branch);
   if (!prepared.ok) {
-    progress(`  skipped: ${prepared.reason} \u2014 ${prepared.detail}
+    const why = preflightSuffix(preflightCauses);
+    progress(`  skipped: ${prepared.reason} \u2014 ${prepared.detail}${why}
 `);
-    return { ...base, outcome: "skipped", detail: `${prepared.reason}: ${prepared.detail}` };
+    return {
+      ...base,
+      outcome: "skipped",
+      detail: `${prepared.reason}: ${prepared.detail}${why}`
+    };
   }
   claimIssue(item, settings);
   if (item.turn === "pr-work" && item.pr !== null && item.prNeedsAssignment) {
@@ -5110,6 +5164,7 @@ ${describePlan(decisions)}`;
   }
   const reports = [];
   const deferred = [];
+  const preflightCauses = describePreflightFailures(hygiene);
   let runsUsed = 0;
   for (const item of items) {
     if (settings.maxRuns > 0 && runsUsed >= settings.maxRuns) {
@@ -5118,7 +5173,7 @@ ${describePlan(decisions)}`;
     }
     let report;
     try {
-      report = await processItem(item, settings, options.silent === true);
+      report = await processItem(item, settings, options.silent === true, preflightCauses);
     } catch (err) {
       progress(`  failed: ${err.message}
 `);
@@ -5272,7 +5327,7 @@ function describeRescue(rescue) {
     case "would-rescue":
       return `would rescue onto ${rescue.branch}`;
     case "failed":
-      return `${rescue.step} failed \u2014 ${rescue.detail}; the tree is still dirty and nothing was discarded`;
+      return `${rescue.step} failed \u2014 ${rescue.detail}; ${describeRescueRemains(rescue)}; nothing was discarded`;
   }
 }
 function describePrune(outcome) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automata-cli",
-  "version": "0.7.0-develop.321",
+  "version": "0.7.0-develop.324",
   "description": "Automata CLI tool",
   "type": "module",
   "engines": {