@pushpalsdev/cli 1.0.63 → 1.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushpalsdev/cli",
-  "version": "1.0.63",
+  "version": "1.0.64",
   "description": "PushPals terminal CLI for LocalBuddy -> RemoteBuddy orchestration",
   "license": "MIT",
   "repository": {

package/runtime/sandbox/apps/workerpals/src/execute_job.ts

@@ -2614,11 +2614,43 @@ export async function syncHiddenRefWithRemoteBranchByRebase(
 
     const trackedCodex = await git(repo, ["ls-files", "--error-unmatch", "--", ".codex"]);
     if (trackedCodex.ok) {
-      return {
-        ok: false,
-        error:
-          "Tracked .codex path blocks branch sync. Move Codex state outside the repo worktree before retrying.",
-      };
+      const restoreTrackedCodex = await git(repo, [
+        "restore",
+        "--source=HEAD",
+        "--staged",
+        "--worktree",
+        "--",
+        ".codex",
+      ]);
+      if (!restoreTrackedCodex.ok) {
+        return {
+          ok: false,
+          error:
+            `Tracked .codex path blocks branch sync and could not be restored to HEAD: ` +
+            `${combinedGitOutput(restoreTrackedCodex)}`,
+        };
+      }
+
+      const trackedCodexStatus = await git(repo, ["status", "--porcelain", "--", ".codex"]);
+      if (!trackedCodexStatus.ok) {
+        return {
+          ok: false,
+          error:
+            `Tracked .codex path blocks branch sync and its status could not be verified: ` +
+            `${combinedGitOutput(trackedCodexStatus)}`,
+        };
+      }
+      if (trackedCodexStatus.stdout.trim().length > 0) {
+        return {
+          ok: false,
+          error:
+            "Tracked .codex path blocks branch sync because local changes remain after restore. " +
+            "Move Codex state outside the repo worktree before retrying.",
+        };
+      }
+
+      console.warn("[WorkerPals] Preserved tracked .codex sentinel before branch sync.");
+      return { ok: true };
     }
 
     try {