From 2bb7208bab7beb143e104162a68c3fd84db7bcaf Mon Sep 17 00:00:00 2001
From: Naomi Carrigan <commits@nhcarrigan.com>
Date: Wed, 4 Feb 2026 08:12:51 -0800
Subject: [PATCH] feat: handle package checking better

---
 src/services/gitService.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/services/gitService.ts b/src/services/gitService.ts
index b0d8c8b..293849c 100644
--- a/src/services/gitService.ts
+++ b/src/services/gitService.ts
@@ -333,19 +333,20 @@ const handleNewBranch = async(
   const { path: repoPath } = clonedRepo;
 
   await runGitCommand(logger, repoPath, "git checkout main");
-  await runGitCommand(logger, repoPath, `git checkout -b ${branchName}`);
 
+  // Check if package exists before creating branch
   const currentVersion = await getCurrentVersionOnBranch(repoPath, packageName);
   if (currentVersion === null) {
     void logger.log("warn", `Package ${packageName} not found in package.json`);
-    await runGitCommand(logger, repoPath, "git checkout main");
-    await runGitCommand(logger, repoPath, `git branch -D ${branchName}`);
     return {
       error:  `Package ${packageName} not found in package.json`,
       status: "failed",
     };
   }
 
+  // Only create branch if package exists
+  await runGitCommand(logger, repoPath, `git checkout -b ${branchName}`);
+
   await updatePackageAndCommit({
     logger,
     packageName,