xcode-build-queue 0.1.0 → 0.1.1

package/README.md

@@ -9,15 +9,15 @@ Running multiple Claude Code sessions on the same Xcode project requires separat
 ## How It Works
 
 ```
-┌─────────────┐  ┌─────────────┐  ┌─────────────┐
-│ Claude Code  │  │ Claude Code  │  │ Claude Code  │
-│ (worktree A) │  │ (worktree B) │  │ (worktree C) │
-└──────┬───────┘  └──────┬───────┘  └──────┬───────┘
-       │ snapshot          │ snapshot          │ snapshot
-       └──────────────────┼──────────────────┘
+┌──────────────┐   ┌──────────────┐    ┌──────────────┐
+│ Claude Code  │   │ Claude Code  │    │ Claude Code  │
+│ (worktree A) │   │ (worktree B) │    │ (worktree C) │
+└──────┬───────┘   └──────┬───────┘    └──────┬───────┘
+       │ snapshot         │ snapshot          │ snapshot
+       └──────────────────┼───────────────────┘
                           ▼
                ┌────────────────────┐
-               │  xbq (serial queue) │
+               │ xbq (serial queue) │
                │                    │
                │ checkout snapshot  │
                │ (detached HEAD)    │
@@ -27,8 +27,8 @@ Running multiple Claude Code sessions on the same Xcode project requires separat
                └────────┬───────────┘
                         ▼
                   ┌───────────┐
-                  │ Main Repo  │  ← single DerivedData
-                  │ (warm)     │  ← SPM already resolved
+                  │ Main Repo │  ← single DerivedData
+                  │ (warm)    │  ← SPM already resolved
                   └───────────┘
 ```
 
@@ -44,7 +44,7 @@ Running multiple Claude Code sessions on the same Xcode project requires separat
 ### npm (recommended)
 
 ```bash
-npm install -g xbq
+npm install -g xcode-build-queue
 ```
 
 ### From GitHub

package/dist/executor.js

@@ -13,6 +13,8 @@ async function executeJob(job) {
     const config = (0, config_js_1.loadConfig)();
     const repoPath = (0, utils_js_1.expandPath)(config.main_repo);
     const workspace = config.workspace;
+    // 0. Pre-build safety: ensure main repo is clean and on default branch
+    (0, snapshot_js_1.ensureCleanMainRepo)(repoPath);
     // 1. Stash any uncommitted changes in main repo
     const stashed = stashIfDirty(repoPath);
     try {

package/dist/snapshot.d.ts

@@ -21,3 +21,8 @@ export declare function applySnapshot(repoPath: string, sha: string): void;
  * Clean up the main repo by returning to the default branch.
  */
 export declare function cleanSnapshot(repoPath: string): void;
+/**
+ * Pre-build safety check: ensure the main repo is on its default branch
+ * with no uncommitted changes or stale detached HEAD from a previous run.
+ */
+export declare function ensureCleanMainRepo(repoPath: string): void;

package/dist/snapshot.js

@@ -5,6 +5,7 @@ exports.isInWorktree = isInWorktree;
 exports.createSnapshot = createSnapshot;
 exports.applySnapshot = applySnapshot;
 exports.cleanSnapshot = cleanSnapshot;
+exports.ensureCleanMainRepo = ensureCleanMainRepo;
 const utils_js_1 = require("./utils.js");
 /**
  * Detect the default branch (master, main, develop) for a repo.
@@ -91,9 +92,59 @@ function applySnapshot(repoPath, sha) {
 function cleanSnapshot(repoPath) {
     const defaultBranch = getDefaultBranch(repoPath);
     try {
+        // Discard any index/worktree changes from the snapshot before switching
+        (0, utils_js_1.run)("git reset --hard", { cwd: repoPath, quiet: true });
         (0, utils_js_1.run)(`git checkout ${defaultBranch}`, { cwd: repoPath, quiet: true });
     }
     catch {
-        utils_js_1.log.warn(`Could not return to ${defaultBranch}`);
+        utils_js_1.log.warn(`Could not return to ${defaultBranch} — attempting force cleanup`);
+        try {
+            (0, utils_js_1.run)("git checkout --force " + defaultBranch, { cwd: repoPath, quiet: true });
+        }
+        catch {
+            utils_js_1.log.error(`Failed to restore ${defaultBranch}. Manual cleanup required: cd ${repoPath} && git checkout ${defaultBranch}`);
+        }
+    }
+}
+/**
+ * Pre-build safety check: ensure the main repo is on its default branch
+ * with no uncommitted changes or stale detached HEAD from a previous run.
+ */
+function ensureCleanMainRepo(repoPath) {
+    const defaultBranch = getDefaultBranch(repoPath);
+    // Check if HEAD is detached
+    let isDetached = false;
+    try {
+        (0, utils_js_1.run)("git symbolic-ref HEAD", { cwd: repoPath, quiet: true });
+    }
+    catch {
+        isDetached = true;
+    }
+    if (isDetached) {
+        utils_js_1.log.warn("Main repo is in detached HEAD (stale snapshot?) — recovering...");
+        try {
+            (0, utils_js_1.run)("git reset --hard", { cwd: repoPath, quiet: true });
+            (0, utils_js_1.run)(`git checkout ${defaultBranch}`, { cwd: repoPath, quiet: true });
+            utils_js_1.log.ok(`Recovered to ${defaultBranch}`);
+        }
+        catch {
+            throw new Error(`Main repo stuck in detached HEAD and recovery failed. ` +
+                `Manual fix: cd ${repoPath} && git checkout ${defaultBranch}`);
+        }
+        return;
+    }
+    // Check if on the expected branch
+    const currentBranch = (0, utils_js_1.run)("git branch --show-current", { cwd: repoPath, quiet: true });
+    if (currentBranch !== defaultBranch) {
+        utils_js_1.log.warn(`Main repo on '${currentBranch}' instead of '${defaultBranch}' — switching...`);
+        try {
+            (0, utils_js_1.run)("git reset --hard", { cwd: repoPath, quiet: true });
+            (0, utils_js_1.run)(`git checkout ${defaultBranch}`, { cwd: repoPath, quiet: true });
+            utils_js_1.log.ok(`Switched to ${defaultBranch}`);
+        }
+        catch {
+            throw new Error(`Could not switch main repo to ${defaultBranch}. ` +
+                `Manual fix: cd ${repoPath} && git checkout ${defaultBranch}`);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcode-build-queue",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Serial build queue for Xcode projects with git worktrees",
   "license": "MIT",
   "repository": {