codemodctl 0.1.35 → 0.1.36

package/dist/cli.mjs

@@ -118,39 +118,34 @@ const createPrCommand = defineCommand({
 				process.exit(1);
 			}
 			{
-				const headSha = await $`git rev-parse HEAD`;
-				const branchInfo = await $`git log --oneline -1`;
-				console.log(`Pushing HEAD=${headSha.stdout.trim()} (${branchInfo.stdout.trim()}) to refs/heads/${codemodBranchName}`);
-				const lsRemote = await $({ reject: false })`git -c http.version=HTTP/1.1 ls-remote origin refs/heads/${codemodBranchName}`;
-				console.log(`Remote ref: ${lsRemote.stdout.trim() || "(branch does not exist)"}`);
+				const localHead = (await $`git rev-parse HEAD`).stdout.trim();
+				const currentBranch = (await $`git rev-parse --abbrev-ref HEAD`).stdout.trim();
+				console.log(`Pushing branch=${currentBranch} sha=${localHead} to origin/${codemodBranchName}`);
 				const maxRetries = 3;
 				let pushed = false;
 				for (let attempt = 1; attempt <= maxRetries; attempt++) {
 					const pushResult = await $({
-						env: process.env.DEBUG ? {
-							GIT_TRACE: "1",
-							GIT_CURL_VERBOSE: "1"
-						} : {},
+						env: { GIT_TRACE_PACKET: "1" },
 						reject: false
-					})`git -c http.version=HTTP/1.1 -c http.postBuffer=524288000 push origin HEAD:refs/heads/${codemodBranchName} --force`;
+					})`git -c http.version=HTTP/1.1 -c http.postBuffer=524288000 push --verbose origin ${codemodBranchName} --force`;
+					console.log(`Push stdout: ${pushResult.stdout}`);
+					console.error(`Push stderr (last 2000 chars): ${pushResult.stderr.slice(-2e3)}`);
 					if (pushResult.exitCode === 0) {
 						pushed = true;
 						break;
 					}
-					if (pushResult.stderr?.includes("Everything up-to-date")) {
-						console.log("Branch already up-to-date on remote.");
-						pushed = true;
-						break;
-					}
-					console.error(`Push attempt ${attempt}/${maxRetries} failed (exit code ${pushResult.exitCode}):\n${pushResult.stderr}`);
+					console.error(`Push attempt ${attempt}/${maxRetries} failed (exit code ${pushResult.exitCode})`);
 					if (attempt < maxRetries) {
 						const delay = attempt * 2e3;
 						console.log(`Retrying in ${delay / 1e3}s...`);
 						await new Promise((r) => setTimeout(r, delay));
 					}
 				}
-				if (!pushed) {
-					console.error("Error: Failed to push changes after all retries");
+				if (!pushed) if ((await $({ reject: false })`git -c http.version=HTTP/1.1 ls-remote --exit-code origin refs/heads/${codemodBranchName}`).exitCode === 0) {
+					console.log("Push reported failure but branch exists on remote — continuing.");
+					pushed = true;
+				} else {
+					console.error("Error: Failed to push changes and branch does not exist on remote.");
 					process.exit(1);
 				}
 				console.log(`Pushed branch to origin: ${codemodBranchName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemodctl",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "CLI tool and utilities for workflow engine operations, file sharding, and codeowner analysis",
   "type": "module",
   "exports": {