fix: return to original branch after ci command completes (#728)

* fix: return to original branch after ci command completes

Co-Authored-By: Max Prilutskiy <maks.prilutskiy@gmail.com>

* chore: add changeset for returning to original branch

Co-Authored-By: Max Prilutskiy <maks.prilutskiy@gmail.com>

* refactor: simplify original branch capture

Co-Authored-By: Max Prilutskiy <maks.prilutskiy@gmail.com>

* refactor: use platformKit.platformConfig.baseBranchName for original branch

Co-Authored-By: Max Prilutskiy <maks.prilutskiy@gmail.com>

* refactor: use platformKit.platformConfig.baseBranchName directly without intermediary property

Co-Authored-By: Max Prilutskiy <maks.prilutskiy@gmail.com>

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Max Prilutskiy <maks.prilutskiy@gmail.com>

Author: devin-ai-integration[bot]

.changeset/thick-buses-remember.md

@@ -0,0 +1,5 @@
+---
+"lingo.dev": patch
+---
+
+Return users to their original branch after CI command completes, even when it fails

packages/cli/src/cli/cmd/ci/flows/_base.ts

@@ -5,6 +5,7 @@ export interface IIntegrationFlow {
   preRun?(): Promise<boolean>;
   run(): Promise<boolean>;
   postRun?(): Promise<void>;
+  returnToOriginalBranch?(): Promise<void>;
 }
 
 export abstract class IntegrationFlow implements IIntegrationFlow {

packages/cli/src/cli/cmd/ci/flows/in-branch.ts

@@ -79,6 +79,7 @@ export class InBranchFlow extends IntegrationFlow {
     execSync(`pwd`, { stdio: "inherit" });
     execSync(`ls -la`, { stdio: "inherit" });
 
+
     execSync(`git config --global safe.directory ${process.cwd()}`);
 
     execSync(`git config user.name "${gitConfig.userName}"`);
@@ -116,4 +117,22 @@ export class InBranchFlow extends IntegrationFlow {
 
     return true;
   }
+  async returnToOriginalBranch() {
+    const originalBranch = this.platformKit.platformConfig.baseBranchName;
+    if (originalBranch) {
+      this.ora.start(`Returning to original branch: ${originalBranch}`);
+      
+      try {
+        execSync(`git checkout ${originalBranch}`, { 
+          stdio: "inherit",
+          encoding: "utf8"
+        });
+        this.ora.succeed(`Returned to original branch: ${originalBranch}`);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+        this.ora.fail(`Failed to return to original branch: ${errorMessage}`);
+      }
+    }
+  }
+
 }

packages/cli/src/cli/cmd/ci/index.ts

@@ -74,15 +74,19 @@ export default new Command()
       ? new PullRequestFlow(ora, platformKit)
       : new InBranchFlow(ora, platformKit);
 
-    const canRun = await flow.preRun?.();
-    if (canRun === false) {
-      return;
-    }
+    try {
+      const canRun = await flow.preRun?.();
+      if (canRun === false) {
+        return;
+      }
 
-    const hasChanges = await flow.run();
-    if (!hasChanges) {
-      return;
-    }
+      const hasChanges = await flow.run();
+      if (!hasChanges) {
+        return;
+      }
 
-    await flow.postRun?.();
+      await flow.postRun?.();
+    } finally {
+      await flow.returnToOriginalBranch?.();
+    }
   });