@panoptic-it-solutions/coolify-setup 1.1.22 → 1.1.24

package/dist/git.d.ts

@@ -14,5 +14,5 @@ export interface CommitAndPushResult {
     branchName: string;
     warnings: string[];
 }
-export declare function commitAndPushToDevelop(files: string[]): Promise<CommitAndPushResult>;
+export declare function commitAndPushToDevelop(files: string[], originalBranch?: string): Promise<CommitAndPushResult>;
 export declare function setupGitHub(projectName: string): Promise<GitHubSetupResult>;

package/dist/git.js

@@ -33,7 +33,7 @@ function isCorrectRemote(remoteUrl, projectName) {
     ];
     return expectedPatterns.some(pattern => remoteUrl.includes(pattern));
 }
-export async function commitAndPushToDevelop(files) {
+export async function commitAndPushToDevelop(files, originalBranch) {
     const result = {
         committed: false,
         pushed: false,
@@ -44,6 +44,8 @@ export async function commitAndPushToDevelop(files) {
     if (!isGitRepo()) {
         run('git init');
     }
+    // Use passed-in branch name, or detect current branch
+    const sourceBranch = originalBranch || run('git branch --show-current');
     // Stage all specified files (use -A to also stage deletions)
     for (const file of files) {
         try {
@@ -53,26 +55,19 @@ export async function commitAndPushToDevelop(files) {
             // File might not exist, that's ok
         }
     }
-    // Check if there are staged changes
+    // Check if there are staged changes and commit if so
+    let hasNewCommit = false;
     try {
         const status = run('git diff --cached --name-only');
-        if (!status) {
-            result.warnings.push('No changes to commit');
-            return result;
+        if (status) {
+            // Commit the changes
+            run('git commit -m "chore: add Coolify deployment configuration"');
+            result.committed = true;
+            hasNewCommit = true;
         }
     }
     catch {
-        result.warnings.push('Failed to check git status');
-        return result;
-    }
-    // Commit the changes
-    try {
-        run('git commit -m "chore: add Coolify deployment configuration"');
-        result.committed = true;
-    }
-    catch (error) {
-        result.warnings.push(`Failed to commit: ${error}`);
-        return result;
+        // Commit might fail if nothing staged, that's ok
     }
     // Check if remote exists
     const remoteUrl = getGitRemoteUrl();
@@ -82,9 +77,8 @@ export async function commitAndPushToDevelop(files) {
     }
     // Ensure develop branch exists and push to it
     try {
-        const currentBranch = run('git branch --show-current');
-        if (currentBranch === 'develop') {
-            // Pull latest changes with rebase, then push
+        if (sourceBranch === 'develop') {
+            // Already on develop, pull and push
             try {
                 run('git pull --rebase origin develop');
             }
@@ -94,18 +88,24 @@ export async function commitAndPushToDevelop(files) {
             run('git push origin develop');
         }
         else {
-            // Check if develop exists remotely
+            // On a feature branch - need to merge into develop
             try {
                 run('git fetch origin develop');
-                // Develop exists, checkout and merge/rebase current changes
+                // Develop exists remotely, checkout and merge feature branch
                 run('git checkout develop');
-                run('git pull --rebase origin develop');
-                run(`git merge ${currentBranch} --no-edit`);
+                try {
+                    run('git pull --rebase origin develop');
+                }
+                catch {
+                    // Pull might fail, continue
+                }
+                // Merge the source branch (which has the commits)
+                run(`git merge ${sourceBranch} --no-edit`);
                 run('git push origin develop');
             }
             catch {
-                // Develop doesn't exist remotely, create it from current branch
-                run('git push origin HEAD:develop');
+                // Develop doesn't exist remotely, create it from source branch
+                run(`git push origin ${sourceBranch}:develop`);
             }
         }
         result.pushed = true;
@@ -182,6 +182,13 @@ export async function setupGitHub(projectName) {
                 run('git checkout -b develop');
             }
         }
+        // Pull latest changes before pushing to avoid non-fast-forward errors
+        try {
+            run('git pull --rebase origin develop');
+        }
+        catch {
+            // Pull might fail if remote doesn't exist yet, that's ok
+        }
         run('git push origin develop -u');
         result.developBranchCreated = true;
         result.repoPushed = true;

package/dist/index.js

@@ -2,9 +2,18 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import prompts from 'prompts';
+import { execSync } from 'child_process';
 import { detectProject } from './detector.js';
 import { generateFiles } from './generator.js';
 import { setupGitHub, commitAndPushToDevelop } from './git.js';
+function getCurrentBranch() {
+    try {
+        return execSync('git branch --show-current', { encoding: 'utf-8', stdio: 'pipe' }).trim();
+    }
+    catch {
+        return 'develop';
+    }
+}
 async function main() {
     console.log(chalk.bold.cyan('\n🚀 Panoptic Coolify Setup\n'));
     // Detect project type
@@ -113,6 +122,8 @@ async function main() {
             console.log(chalk.green('  ✓ scripts/migrate.ts'));
         }
     }
+    // Save original branch before any git operations (setupGitHub may switch branches)
+    const originalBranch = getCurrentBranch();
     // Setup GitHub first (creates repo/remote if needed)
     if (response.createRepo) {
         console.log(chalk.bold('\nSetting up GitHub...'));
@@ -141,10 +152,13 @@ async function main() {
             for (const warning of result.warnings) {
                 console.log(chalk.yellow(`  ⚠ ${warning}`));
             }
-            // If nothing succeeded, show a failure message
+            // If nothing succeeded, show appropriate failure message
             if (!result.repoCreated && !result.repoPushed && result.warnings.length > 0) {
                 console.log(chalk.red('\n  ✗ GitHub setup did not complete successfully'));
-                console.log(chalk.yellow('  You can manually run: gh repo create Panoptic-IT-Solutions/' + response.projectName));
+                // Only suggest repo create if there's no existing remote
+                if (!result.existingRemote) {
+                    console.log(chalk.yellow('  You can manually run: gh repo create Panoptic-IT-Solutions/' + response.projectName));
+                }
             }
         }
         catch (error) {
@@ -155,7 +169,7 @@ async function main() {
     // Commit and push generated files to develop
     console.log(chalk.bold('\nCommitting and pushing to develop...'));
     try {
-        const commitResult = await commitAndPushToDevelop(generatedFiles);
+        const commitResult = await commitAndPushToDevelop(generatedFiles, originalBranch);
         if (commitResult.committed) {
             console.log(chalk.green('  ✓ Committed changes'));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoptic-it-solutions/coolify-setup",
-  "version": "1.1.22",
+  "version": "1.1.24",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",