@panoptic-it-solutions/coolify-setup 1.1.40 → 1.1.42

package/dist/templates/claude-rules.js

@@ -20,30 +20,53 @@ This project uses a trunk-based development workflow with deployment branches:
 | \`staging\` | Staging environment deployment | Staging server |
 | \`main\` | Production environment deployment | Production server |
 
+### Starting Work (IMPORTANT)
+
+**Before starting any work, you MUST:**
+
+1. Pull the latest \`develop\` branch:
+   \`\`\`bash
+   git checkout develop
+   git pull origin develop
+   \`\`\`
+
+2. Create a new branch from \`develop\`:
+   \`\`\`bash
+   # For new features
+   git checkout -b feature/feature-name
+
+   # For bug fixes
+   git checkout -b fix/bug-description
+
+   # For urgent production fixes
+   git checkout -b hotfix/urgent-fix
+   \`\`\`
+
+**NEVER work directly on \`develop\`, \`staging\`, or \`main\` branches.**
+
 ### Workflow
 
-1. **Development**: Create branches from \`develop\`
-   - Features: \`feature/feature-name\`
-   - Fixes: \`fix/bug-description\`
-   - Hotfixes: \`hotfix/urgent-fix\`
+1. **Development**: Create branches from \`develop\` (see above)
 
 2. **Feature Development**: Push feature/fix/hotfix branches
-   - Builds Docker image
-   - Pushes to private registry
+   - Builds Docker image (verification only)
    - Creates PR to \`develop\` branch
 
 3. **Integration**: Merge PR to \`develop\`
-   - Builds Docker image
+   - Builds Docker image (verification only)
    - Creates PR to \`staging\` branch
 
 4. **Staging Deployment**: Merge PR to \`staging\`
+   - Bumps version based on conventional commits
+   - Commits \`chore(release): vX.X.X\`
+   - Creates \`staging-v*\` tag
+   - Builds and pushes Docker image to registry
    - Coolify auto-deploys to staging server
-   - GitHub Actions runs semantic versioning workflow
-   - Creates \`staging-v*\` tags based on conventional commits
    - Creates PR to \`main\` branch
-   - Test changes in staging environment
+   - Creates sync PR to \`develop\` (auto-merges)
 
 5. **Production Deployment**: Merge PR to \`main\`
+   - Creates production tag (\`vX.X.X\`)
    - Coolify auto-deploys to production server
 
 ### Conventional Commits

package/dist/templates/workflow.js

@@ -309,27 +309,17 @@ ${migrationCheck}
               });
               console.log(\`Created sync PR #\${pr.number}\`);
 
-              // Enable auto-merge for sync PR (just version bump)
+              // Merge immediately (just a version bump, no review needed)
               try {
-                await github.graphql(\`
-                  mutation(\$pullRequestId: ID!) {
-                    enablePullRequestAutoMerge(input: {
-                      pullRequestId: \$pullRequestId,
-                      mergeMethod: MERGE
-                    }) {
-                      pullRequest {
-                        autoMergeRequest {
-                          enabledAt
-                        }
-                      }
-                    }
-                  }
-                \`, {
-                  pullRequestId: pr.node_id
+                await github.rest.pulls.merge({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  pull_number: pr.number,
+                  merge_method: 'merge'
                 });
-                console.log(\`Enabled auto-merge for sync PR #\${pr.number}\`);
-              } catch (autoMergeError) {
-                console.log(\`Auto-merge not available: \${autoMergeError.message}\`);
+                console.log(\`Merged sync PR #\${pr.number}\`);
+              } catch (mergeError) {
+                console.log(\`Auto-merge failed (may need manual merge): \${mergeError.message}\`);
               }
             } catch (error) {
               console.log(\`Sync PR creation skipped: \${error.message}\`);

package/package.json

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