jonah-fleet 1.30.4 → 1.30.5

package/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to `jonah-fleet` will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.30.5](https://github.com/Jonah-Projects/jonah-fleet/compare/v1.30.4...v1.30.5) (2026-10-01)
+
+
+### Bug Fixes
+
+* **worktree:** disambiguate base ref against local origin/main branch ([#519](https://github.com/Jonah-Projects/jonah-fleet/issues/519)) ([1e3e6f2](https://github.com/Jonah-Projects/jonah-fleet/commit/1e3e6f2cdc2e5e774fc050be5686254de935d798))
+
 ## [1.30.4](https://github.com/Jonah-Projects/jonah-fleet/compare/v1.30.3...v1.30.4) (2026-10-01)
 
 

package/dist/index.js

@@ -3854,16 +3854,15 @@ async function createWorktree(repoRoot, options) {
     }
   }
   let baseRef = options.baseRef;
-  if (!baseRef) {
-    try {
-      await execFileAsync3("git", ["rev-parse", "--verify", "origin/main"], { cwd: repoRoot });
-      baseRef = "origin/main";
-    } catch {
+  if (!baseRef || baseRef === "origin/main") {
+    const candidates = ["refs/remotes/origin/main", "refs/heads/main", "main"];
+    baseRef = "HEAD";
+    for (const candidate of candidates) {
       try {
-        await execFileAsync3("git", ["rev-parse", "--verify", "main"], { cwd: repoRoot });
-        baseRef = "main";
+        await execFileAsync3("git", ["rev-parse", "--verify", candidate], { cwd: repoRoot });
+        baseRef = candidate;
+        break;
       } catch {
-        baseRef = "HEAD";
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jonah-fleet",
-  "version": "1.30.4",
+  "version": "1.30.5",
   "description": "Standalone autonomous agent fleet with Symphony orchestration, claim protocols, and continuous improvement loops",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",