arcane-cli 0.16.2 → 0.16.3

package/dist/assets/.github/prompts/spell-close-session.prompt.md

@@ -101,7 +101,8 @@ Rules:
 
 9. **Stage and commit session-close docs.**
 
-   **Remote-capability check:** classify the state created by `spell-open-session` before branching, staging, push, or PR operations.
+   **Remote-capability check:** classify the state created by `spell-open-session` before branching, staging, push, or PR operations. Check for **not a repository at all** first — every other classification assumes a `.git` directory exists.
+   - **Not a Git repository (EF-05):** `git rev-parse --is-inside-work-tree` fails. Do not attempt any git operation (branch, add, commit, push). Fail closed with: `No Git repository detected. Run \`git init -b main\` first (explicit -b avoids landing on "master" on systems where that's the init.defaultBranch default), then re-run spell-close-session.` This mirrors `spell init`'s own next-steps guidance for the same state.
    - **Usable supported remote/merge path:** requires an authenticated supported provider (`github.com`, `dev.azure.com`, or `visualstudio.com`). Keep the current compliant session/PR/worktree branch, resolve the actual remote name and integration branch, and use the provider-neutral PR path below.
    - **No usable remote/merge path:** remain on the current trunk. Do not create a dead session branch, push, pull, or open a PR. Apply the EF-28 interactive commit approval gate, commit locally on trunk after approval, report `Local-only close: committed on <trunk>; no remote PR/pull performed`, and skip steps 9a, 9c, and 10's remote operations.
    - **Read-only session:** if no repository mutation occurred, do not create a branch or commit.

package/dist/index.js

@@ -1751,13 +1751,50 @@ async function inspectGitRepository(cwd) {
     uncommittedChanges: lines.length === 0 ? 0 : lines.split("\n").length
   };
 }
-async function countUncommittedChanges(cwd) {
+async function correctUnbornMasterDefault(cwd) {
+  let current;
   try {
-    const { stdout } = await runGit(cwd, ["status", "--porcelain", "-uall"]);
-    const lines = stdout.trim();
-    return lines.length === 0 ? 0 : lines.split("\n").length;
+    const { stdout } = await runGit(cwd, ["symbolic-ref", "--short", "HEAD"]);
+    current = stdout.trim();
   } catch {
-    return 0;
+    return { corrected: false, to: "main" };
+  }
+  if (current !== "master") {
+    return { corrected: false, to: "main" };
+  }
+  try {
+    await runGit(cwd, ["rev-parse", "--verify", "HEAD"]);
+    return { corrected: false, to: "main" };
+  } catch {
+  }
+  try {
+    await runGit(cwd, ["rev-parse", "--verify", "refs/heads/main"]);
+    return { corrected: false, to: "main" };
+  } catch {
+  }
+  await runGit(cwd, ["symbolic-ref", "HEAD", "refs/heads/main"]);
+  return { corrected: true, from: current, to: "main" };
+}
+async function ensureLocalPullRebase(cwd) {
+  let rawLocalValue;
+  try {
+    const { stdout } = await runGit(cwd, ["config", "--local", "--get", "pull.rebase"]);
+    rawLocalValue = stdout.trim();
+  } catch {
+    rawLocalValue = void 0;
+  }
+  if (rawLocalValue === void 0) {
+    await runGit(cwd, ["config", "--local", "pull.rebase", "true"]);
+    return { action: "set" };
+  }
+  try {
+    const { stdout } = await runGit(cwd, ["config", "--local", "--type=bool", "--get", "pull.rebase"]);
+    if (stdout.trim() === "false") {
+      return { action: "explicit-false-preserved" };
+    }
+    return { action: "already-set" };
+  } catch {
+    return { action: "already-set" };
   }
 }
 
@@ -1837,21 +1874,42 @@ async function runInit(options, targetDir, assetsDir, packageVersion) {
   console.log(chalk2.hex("#a855f7")(`
   \u2726 Arcane v${packageVersion}
 `));
+  let repoNotFound = false;
   if (!options.dryRun) {
-    const dirtyCount = await countUncommittedChanges(targetDir);
-    if (dirtyCount > 0) {
-      printWarning(`This repo has ${dirtyCount} uncommitted change${dirtyCount === 1 ? "" : "s"}.`);
-      printInfo("Running spell init will add new files to your working tree.");
-      console.log();
-      const continueAnyway = await confirm({
-        message: "Continue anyway?",
-        default: true
-      });
-      if (!continueAnyway) {
-        console.log("\nCancelled. Commit or stash your changes first.");
-        return;
+    const gitState = await inspectGitRepository(targetDir);
+    if (gitState.status === "not-repository") {
+      repoNotFound = true;
+    } else {
+      if (gitState.status === "no-commits") {
+        const correction = await correctUnbornMasterDefault(targetDir);
+        if (correction.corrected) {
+          printInfo(
+            `Repointed the unborn branch from "${correction.from}" to "${correction.to}" (avoids the Git for Windows default-branch trap).`
+          );
+        }
+      }
+      if (gitState.status === "ready" && gitState.uncommittedChanges > 0) {
+        printWarning(
+          `This repo has ${gitState.uncommittedChanges} uncommitted change${gitState.uncommittedChanges === 1 ? "" : "s"}.`
+        );
+        printInfo("Running spell init will add new files to your working tree.");
+        console.log();
+        const continueAnyway = await confirm({
+          message: "Continue anyway?",
+          default: true
+        });
+        if (!continueAnyway) {
+          console.log("\nCancelled. Commit or stash your changes first.");
+          return;
+        }
+        console.log();
+      }
+      const rebaseResult = await ensureLocalPullRebase(targetDir);
+      if (rebaseResult.action === "explicit-false-preserved") {
+        printWarning(
+          "This repo's pull.rebase is explicitly set to false, but Arcane's governance mandates rebase-and-fast-forward (see .arcane/governance/git-conventions.md). Left as-is since you set it explicitly."
+        );
       }
-      console.log();
     }
   }
   let profile = options.profile;
@@ -2000,6 +2058,12 @@ async function runInit(options, targetDir, assetsDir, packageVersion) {
       "Review .arcane/governance/ docs and customize for your project"
     );
   }
+  if (repoNotFound) {
+    printNextStep(
+      step++,
+      'Initialize Git for this project: `git init -b main` (avoids defaulting to "master" on systems where that\'s the system default)'
+    );
+  }
   printNextStep(
     step++,
     "Commit the new files: git add .arcane .github .claude AGENTS.md CLAUDE.md .arcane.json"
@@ -2680,6 +2744,29 @@ async function checkArcaneManifest(targetDir) {
     };
   }
 }
+async function checkPullRebase(targetDir) {
+  const name = "Git pull.rebase (rebase-and-fast-forward mandate)";
+  try {
+    const { stdout } = await runGit(targetDir, ["config", "--type=bool", "--get", "pull.rebase"]);
+    const value = stdout.trim();
+    if (value === "true") {
+      return { name, passed: true, message: "pull.rebase=true" };
+    }
+    return {
+      name,
+      passed: false,
+      message: `pull.rebase resolves to "${value}", not "true" -- a bare \`git pull\` will create merge commits, contradicting git-conventions.md's rebase-and-fast-forward mandate. Run: git config --local pull.rebase true`,
+      blocking: false
+    };
+  } catch {
+    return {
+      name,
+      passed: false,
+      message: "pull.rebase is unset, not a recognized boolean, or this isn't a Git repository -- effective behavior may not be rebase-and-fast-forward, and Git for Windows defaults this to false when unset. Run: git config --local pull.rebase true",
+      blocking: false
+    };
+  }
+}
 function checkIncidentReleaseGate() {
   const result = evaluateIncidentGate(INCIDENT_QUEUE);
   if (result.blocked) {
@@ -2742,7 +2829,8 @@ async function runDoctor(targetDir, options = {}, assetsDir) {
     checkNodeVersion(),
     checkVSCodeExtension("GitHub.copilot-chat", "GitHub Copilot (Chat)"),
     checkArcaneManifest(targetDir),
-    Promise.resolve(checkIncidentReleaseGate())
+    Promise.resolve(checkIncidentReleaseGate()),
+    checkPullRebase(targetDir)
   ]);
   const sessionResults = await checkSessionContinuity(targetDir);
   results.push(...sessionResults);