@snapcommit/cli 3.5.0 → 3.7.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/dist/commands/github-connect.js

@@ -117,20 +117,21 @@ function clearGitHubToken() {
  */
 async function githubConnectCommand(tokenArg) {
     console.log(chalk_1.default.bold.cyan('\n╔════════════════════════════════════════╗'));
-    console.log(chalk_1.default.bold.cyan('║      Connect GitHub to SnapCommit      ║'));
+    console.log(chalk_1.default.bold.cyan('║   🐙 Connect GitHub CLI (Optional)    ║'));
     console.log(chalk_1.default.bold.cyan('╚════════════════════════════════════════╝\n'));
-    console.log(chalk_1.default.gray('GitHub integration allows you to:\n'));
+    console.log(chalk_1.default.green('✅ Your GitHub account is already connected via snapcommit.dev!\n'));
+    console.log(chalk_1.default.gray('This CLI token enables GitHub features in your terminal:\n'));
     console.log(chalk_1.default.white('  • Create pull requests'));
     console.log(chalk_1.default.white('  • Check CI/workflow status'));
-    console.log(chalk_1.default.white('  • List and manage PRs'));
+    console.log(chalk_1.default.white('  • Manage issues and PRs'));
     console.log(chalk_1.default.white('  • All with natural language!\n'));
     console.log(chalk_1.default.yellow('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
-    console.log(chalk_1.default.bold.white('How to get your GitHub token:\n'));
+    console.log(chalk_1.default.bold.white('Quick Setup (2 minutes):\n'));
     console.log(chalk_1.default.gray('  1. Go to: ') + chalk_1.default.cyan('https://github.com/settings/tokens'));
     console.log(chalk_1.default.gray('  2. Click "Generate new token (classic)"'));
-    console.log(chalk_1.default.gray('  3. Give it a name: ') + chalk_1.default.white('"SnapCommit"'));
-    console.log(chalk_1.default.gray('  4. Select scopes: ') + chalk_1.default.white('repo, workflow, read:user'));
-    console.log(chalk_1.default.gray('  5. Click "Generate token" and copy it\n'));
+    console.log(chalk_1.default.gray('  3. Name: ') + chalk_1.default.white('"SnapCommit CLI"'));
+    console.log(chalk_1.default.gray('  4. Scopes: ') + chalk_1.default.white('repo, workflow, read:user'));
+    console.log(chalk_1.default.gray('  5. Generate & copy the token\n'));
     console.log(chalk_1.default.yellow('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
     let token = tokenArg;
     if (!token) {

package/dist/lib/auth.js

@@ -101,11 +101,12 @@ async function promptAuth() {
     console.log(chalk_1.default.bold.cyan('╚════════════════════════════════════════╝\n'));
     console.log(chalk_1.default.gray('SnapCommit needs authentication to provide AI-powered features.\n'));
     console.log(chalk_1.default.yellow('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
-    console.log(chalk_1.default.bold.white('Step 1: ') + chalk_1.default.gray('Sign up or log in'));
+    console.log(chalk_1.default.bold.white('Step 1: ') + chalk_1.default.gray('Sign in with GitHub (one-click!)'));
     console.log(chalk_1.default.cyan('  👉 https://snapcommit.dev/login\n'));
-    console.log(chalk_1.default.bold.white('Step 2: ') + chalk_1.default.gray('Go to your dashboard and click "Generate Token"'));
+    console.log(chalk_1.default.bold.white('Step 2: ') + chalk_1.default.gray('Subscribe ($9.99/mo or $100/year)'));
+    console.log(chalk_1.default.cyan('  👉 Choose your plan on the dashboard\n'));
+    console.log(chalk_1.default.bold.white('Step 3: ') + chalk_1.default.gray('Generate & paste your CLI token'));
     console.log(chalk_1.default.cyan('  👉 https://snapcommit.dev/dashboard\n'));
-    console.log(chalk_1.default.bold.white('Step 3: ') + chalk_1.default.gray('Copy the token and paste it below\n'));
     console.log(chalk_1.default.yellow('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
     const token = await askQuestion(chalk_1.default.yellow('🔑 Paste your authentication token: '));
     if (!token || token.trim().length === 0) {

package/dist/repl.js

@@ -90,18 +90,14 @@ async function startREPL() {
         console.log(chalk_1.default.gray('          ') + chalk_1.default.cyan('"check CI status"'));
     }
     console.log(chalk_1.default.gray('  Other: ') + chalk_1.default.cyan('stats') + chalk_1.default.gray(' • ') + chalk_1.default.cyan('cd <path>') + chalk_1.default.gray(' • ') + chalk_1.default.cyan('exit') + chalk_1.default.gray(' • ') + chalk_1.default.cyan('help') + chalk_1.default.gray(' • ') + chalk_1.default.cyan('update\n'));
-    // Show GitHub setup reminder if not connected
+    // Show GitHub setup reminder if not connected (UPDATED FOR OAUTH)
     if (!githubConnected) {
         console.log(chalk_1.default.yellow.bold('┌─────────────────────────────────────────┐'));
-        console.log(chalk_1.default.yellow.bold('│  💡 UNLOCK GITHUB FEATURES!            │'));
+        console.log(chalk_1.default.yellow.bold('│  🐙 GITHUB FEATURES (OPTIONAL)        │'));
         console.log(chalk_1.default.yellow.bold('└─────────────────────────────────────────┘\n'));
-        console.log(chalk_1.default.white('   Create PRs, check CI, manage issues—all with natural language!\n'));
-        console.log(chalk_1.default.cyan.bold('   Quick Setup:'));
-        console.log(chalk_1.default.gray('   1. Run: ') + chalk_1.default.cyan('snap github connect'));
-        console.log(chalk_1.default.gray('   2. Get token: ') + chalk_1.default.cyan('https://github.com/settings/tokens'));
-        console.log(chalk_1.default.gray('   3. Scopes needed: ') + chalk_1.default.white('repo, workflow, read:user'));
-        console.log(chalk_1.default.gray('   4. Paste token when prompted'));
-        console.log(chalk_1.default.gray('   💡 Tip: Set no expiration!\n'));
+        console.log(chalk_1.default.white('   Your GitHub account is already connected via snapcommit.dev!\n'));
+        console.log(chalk_1.default.gray('   To use GitHub features in this CLI, run: ') + chalk_1.default.cyan('snap github connect'));
+        console.log(chalk_1.default.gray('   This creates a CLI token for terminal GitHub API access.\n'));
     }
     console.log(chalk_1.default.gray('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'));
     console.log(chalk_1.default.bold.yellow('🎯 Try it now! Type what you want to do:\n'));

package/package.json

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