@ghl-ai/aw 0.1.36-beta.21 → 0.1.36-beta.23

package/commands/pull.mjs

@@ -80,9 +80,13 @@ export async function pullCommand(args) {
       rebaseOntoOriginMain(localAw);
       if (!silent) log.logStep('Local branch rebased onto latest');
     } catch (e) {
-      // Check if the failure was due to merge conflicts
       const isConflict = e.message?.includes('could not apply') || e.message?.includes('CONFLICT');
-      if (isConflict) {
+      const isAlreadyInProgress = e.message?.includes('rebase-merge') || e.message?.includes('rebase-apply') || e.message?.includes('already in progress');
+
+      if (isAlreadyInProgress) {
+        // A previous conflict is still unresolved — leave it alone, user is working on it
+        if (!silent) log.logWarn('Rebase paused — resolve conflicts in your IDE, then run `aw pull` again.');
+      } else if (isConflict) {
         // Get list of conflicted files
         let conflictedFiles = [];
         try {
@@ -92,12 +96,15 @@ export async function pullCommand(args) {
           conflictedFiles = out.trim().split('\n').filter(Boolean);
         } catch { /* best effort */ }
 
-        // Abort rebase to restore clean state
-        try {
-          execSync(`git -C "${localAw}" rebase --abort`, { stdio: 'pipe' });
-        } catch { /* best effort */ }
+        if (silent) {
+          // Silent mode: do NOT abort — leave conflict markers in files so IDE shows them visually
+          // The user will see the conflict markers in their editor and can resolve from there
+        } else {
+          // Interactive mode: abort and show clear terminal warning
+          try {
+            execSync(`git -C "${localAw}" rebase --abort`, { stdio: 'pipe' });
+          } catch { /* best effort */ }
 
-        if (!silent) {
           log.logWarn('Merge conflict detected — rebase aborted, your branch is unchanged.');
           if (conflictedFiles.length > 0) {
             log.logWarn(`Conflicting file${conflictedFiles.length > 1 ? 's' : ''}:`);

package/constants.mjs

@@ -4,7 +4,7 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 /** Base branch for PRs and sync checkout */
-export const REGISTRY_BASE_BRANCH = 'main';
+export const REGISTRY_BASE_BRANCH = 'test-conflict-detection';
 
 /** Default registry repository */
 export const REGISTRY_REPO = 'GoHighLevel/platform-docs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.36-beta.21",
+  "version": "0.1.36-beta.23",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {