@snapcommit/cli 3.5.0 → 3.6.0

package/dist/commands/cursor-style.js

@@ -504,6 +504,13 @@ async function tryAdvancedConflictResolution() {
 async function resolveConflictWithAI(filename, base, ours, theirs) {
     try {
         const axios = (await Promise.resolve().then(() => __importStar(require('axios')))).default;
+        const { getAuthConfig } = await Promise.resolve().then(() => __importStar(require('../lib/auth')));
+        // Get auth token
+        const authConfig = getAuthConfig();
+        if (!authConfig || !authConfig.token) {
+            console.log(chalk_1.default.yellow('⚠️  Authentication required for AI conflict resolution'));
+            return null;
+        }
         // Get the backend URL from env or default
         const backendUrl = process.env.SNAPCOMMIT_BACKEND_URL || 'https://snapcommit.dev';
         const response = await axios.post(`${backendUrl}/api/ai/resolve-conflict`, {
@@ -511,6 +518,7 @@ async function resolveConflictWithAI(filename, base, ours, theirs) {
             base,
             ours,
             theirs,
+            token: authConfig.token,
         }, {
             headers: {
                 'Content-Type': 'application/json',
@@ -524,6 +532,10 @@ async function resolveConflictWithAI(filename, base, ours, theirs) {
     }
     catch (error) {
         // AI resolution failed - fall back to manual choice
+        if (error.response?.status === 403) {
+            console.log(chalk_1.default.red('\n❌ Subscription required for AI conflict resolution'));
+            console.log(chalk_1.default.cyan('Visit: https://snapcommit.dev/pricing\n'));
+        }
         return null;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapcommit/cli",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Instant AI commits. Beautiful progress tracking. Never write commit messages again.",
   "main": "dist/index.js",
   "bin": {