claude-remote-cli 3.1.0 → 3.2.0

package/dist/test/pr-state.test.js

@@ -7,6 +7,7 @@ describe('derivePrAction', () => {
             commitsAhead: 0,
             prState: null,
             ciPassing: 0, ciFailing: 0, ciPending: 0, ciTotal: 0,
+            mergeable: null, unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'none');
@@ -18,6 +19,7 @@ describe('derivePrAction', () => {
             commitsAhead: 3,
             prState: null,
             ciPassing: 0, ciFailing: 0, ciPending: 0, ciTotal: 0,
+            mergeable: null, unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'create-pr');
@@ -29,31 +31,34 @@ describe('derivePrAction', () => {
             commitsAhead: 5,
             prState: 'DRAFT',
             ciPassing: 0, ciFailing: 0, ciPending: 0, ciTotal: 0,
+            mergeable: null, unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'ready-for-review');
         assert.equal(action.color, 'muted');
         assert.equal(action.label, 'Ready for Review');
     });
-    it('returns code-review for open PR with all CI passing', () => {
+    it('returns review-pr for open PR with all CI passing', () => {
         const input = {
             commitsAhead: 2,
             prState: 'OPEN',
             ciPassing: 5, ciFailing: 0, ciPending: 0, ciTotal: 5,
+            mergeable: 'MERGEABLE', unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
-        assert.equal(action.type, 'code-review');
+        assert.equal(action.type, 'review-pr');
         assert.equal(action.color, 'success');
-        assert.equal(action.label, 'Code Review');
+        assert.equal(action.label, 'Review PR');
     });
-    it('returns code-review for open PR with no CI checks', () => {
+    it('returns review-pr for open PR with no CI checks', () => {
         const input = {
             commitsAhead: 1,
             prState: 'OPEN',
             ciPassing: 0, ciFailing: 0, ciPending: 0, ciTotal: 0,
+            mergeable: 'MERGEABLE', unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
-        assert.equal(action.type, 'code-review');
+        assert.equal(action.type, 'review-pr');
         assert.equal(action.color, 'success');
     });
     it('returns fix-errors for open PR with failing CI', () => {
@@ -61,6 +66,7 @@ describe('derivePrAction', () => {
             commitsAhead: 2,
             prState: 'OPEN',
             ciPassing: 6, ciFailing: 2, ciPending: 0, ciTotal: 8,
+            mergeable: 'MERGEABLE', unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'fix-errors');
@@ -72,6 +78,7 @@ describe('derivePrAction', () => {
             commitsAhead: 1,
             prState: 'OPEN',
             ciPassing: 3, ciFailing: 0, ciPending: 2, ciTotal: 5,
+            mergeable: 'MERGEABLE', unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'checks-running');
@@ -83,6 +90,7 @@ describe('derivePrAction', () => {
             commitsAhead: 1,
             prState: 'OPEN',
             ciPassing: 3, ciFailing: 1, ciPending: 1, ciTotal: 5,
+            mergeable: 'MERGEABLE', unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'fix-errors');
@@ -93,6 +101,7 @@ describe('derivePrAction', () => {
             commitsAhead: 0,
             prState: 'MERGED',
             ciPassing: 5, ciFailing: 0, ciPending: 0, ciTotal: 5,
+            mergeable: null, unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'archive-merged');
@@ -104,38 +113,85 @@ describe('derivePrAction', () => {
             commitsAhead: 0,
             prState: 'CLOSED',
             ciPassing: 0, ciFailing: 0, ciPending: 0, ciTotal: 0,
+            mergeable: null, unresolvedCommentCount: 0,
         };
         const action = derivePrAction(input);
         assert.equal(action.type, 'archive-closed');
         assert.equal(action.color, 'muted');
         assert.equal(action.label, 'Archive');
     });
+    it('returns fix-conflicts for open PR with CONFLICTING mergeable', () => {
+        const input = {
+            commitsAhead: 2,
+            prState: 'OPEN',
+            ciPassing: 0, ciFailing: 0, ciPending: 0, ciTotal: 0,
+            mergeable: 'CONFLICTING', unresolvedCommentCount: 0,
+        };
+        const action = derivePrAction(input);
+        assert.equal(action.type, 'fix-conflicts');
+        assert.equal(action.color, 'error');
+        assert.equal(action.label, 'Fix Conflicts');
+    });
+    it('prioritizes fix-conflicts over fix-errors', () => {
+        const input = {
+            commitsAhead: 2,
+            prState: 'OPEN',
+            ciPassing: 0, ciFailing: 3, ciPending: 0, ciTotal: 3,
+            mergeable: 'CONFLICTING', unresolvedCommentCount: 0,
+        };
+        const action = derivePrAction(input);
+        assert.equal(action.type, 'fix-conflicts');
+    });
+    it('returns resolve-comments when unresolved comments > 0 and CI passing', () => {
+        const input = {
+            commitsAhead: 1,
+            prState: 'OPEN',
+            ciPassing: 5, ciFailing: 0, ciPending: 0, ciTotal: 5,
+            mergeable: 'MERGEABLE', unresolvedCommentCount: 3,
+        };
+        const action = derivePrAction(input);
+        assert.equal(action.type, 'resolve-comments');
+        assert.equal(action.color, 'accent');
+        assert.equal(action.label, 'Resolve Comments (3)');
+    });
 });
 describe('getActionPrompt', () => {
     it('returns prompt for create-pr', () => {
-        const prompt = getActionPrompt({ type: 'create-pr', color: 'accent', label: 'Create PR' }, 'feat/my-feature');
+        const prompt = getActionPrompt({ type: 'create-pr', color: 'accent', label: 'Create PR' }, { branchName: 'feat/my-feature' });
         assert.ok(prompt);
         assert.ok(prompt.includes('feat/my-feature'));
         assert.ok(prompt.includes('pull request'));
     });
     it('returns prompt for fix-errors', () => {
-        const prompt = getActionPrompt({ type: 'fix-errors', color: 'error', label: 'Fix Errors 2/8' }, 'bugfix/auth');
+        const prompt = getActionPrompt({ type: 'fix-errors', color: 'error', label: 'Fix Errors 2/8' }, { branchName: 'bugfix/auth' });
         assert.ok(prompt);
         assert.ok(prompt.includes('bugfix/auth'));
         assert.ok(prompt.includes('failing'));
     });
-    it('returns prompt for code-review', () => {
-        const prompt = getActionPrompt({ type: 'code-review', color: 'success', label: 'Code Review' }, 'main');
+    it('returns prompt for review-pr', () => {
+        const prompt = getActionPrompt({ type: 'review-pr', color: 'success', label: 'Review PR' }, { branchName: 'main', prNumber: 42 });
         assert.ok(prompt);
         assert.ok(prompt.includes('Review'));
     });
+    it('returns prompt for fix-conflicts', () => {
+        const prompt = getActionPrompt({ type: 'fix-conflicts', color: 'error', label: 'Fix Conflicts' }, { branchName: 'feat/foo', baseBranch: 'main' });
+        assert.ok(prompt);
+        assert.ok(prompt.includes('main'));
+        assert.ok(prompt.includes('conflict'));
+    });
+    it('returns prompt for resolve-comments', () => {
+        const prompt = getActionPrompt({ type: 'resolve-comments', color: 'accent', label: 'Resolve Comments (3)' }, { branchName: 'feat/foo', prNumber: 7, unresolvedCommentCount: 3 });
+        assert.ok(prompt);
+        assert.ok(prompt.includes('3'));
+        assert.ok(prompt.includes('#7'));
+    });
     it('returns null for archive actions', () => {
-        assert.equal(getActionPrompt({ type: 'archive-merged', color: 'merged', label: 'Archive' }, 'main'), null);
-        assert.equal(getActionPrompt({ type: 'archive-closed', color: 'muted', label: 'Archive' }, 'main'), null);
+        assert.equal(getActionPrompt({ type: 'archive-merged', color: 'merged', label: 'Archive' }, { branchName: 'main' }), null);
+        assert.equal(getActionPrompt({ type: 'archive-closed', color: 'muted', label: 'Archive' }, { branchName: 'main' }), null);
     });
     it('returns null for none and checks-running', () => {
-        assert.equal(getActionPrompt({ type: 'none', color: 'none', label: '' }, 'main'), null);
-        assert.equal(getActionPrompt({ type: 'checks-running', color: 'warning', label: 'Checks Running...' }, 'main'), null);
+        assert.equal(getActionPrompt({ type: 'none', color: 'none', label: '' }, { branchName: 'main' }), null);
+        assert.equal(getActionPrompt({ type: 'checks-running', color: 'warning', label: 'Checks Running...' }, { branchName: 'main' }), null);
     });
 });
 describe('getStatusCssVar', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote-cli",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Remote web interface for Claude Code CLI sessions",
   "type": "module",
   "main": "dist/server/index.js",