claude-remote-cli 3.1.1 → 3.3.0

package/dist/server/ws.js

@@ -2,15 +2,10 @@ import { WebSocketServer } from 'ws';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import * as sessions from './sessions.js';
-import { onSdkEvent, sendMessage as sdkSendMessage, handlePermission as sdkHandlePermission } from './sdk-handler.js';
 import { writeMeta } from './config.js';
 const execFileAsync = promisify(execFile);
-const BACKPRESSURE_HIGH = 1024 * 1024; // 1MB
-const BACKPRESSURE_LOW = 512 * 1024; // 512KB
 const BRANCH_POLL_INTERVAL_MS = 3000;
 const BRANCH_POLL_MAX_ATTEMPTS = 10;
-const RENAME_CORE = `rename the current git branch using \`git branch -m <new-name>\` to a short, descriptive kebab-case name based on the task I'm asking about. Do not include any ticket numbers or prefixes.`;
-const SDK_BRANCH_RENAME_INSTRUCTION = `Before responding to my message, first ${RENAME_CORE} After renaming, proceed with my request normally.\n\n`;
 function startBranchWatcher(session, broadcastEvent, cfgPath) {
     const originalBranch = session.branchName;
     let attempts = 0;
@@ -88,7 +83,7 @@ function setupWebSocket(server, authenticatedTokens, watcher, configPath) {
             });
             return;
         }
-        // PTY/SDK channel: /ws/:sessionId
+        // PTY channel: /ws/:sessionId
         const match = request.url && request.url.match(/^\/ws\/([a-f0-9]+)$/);
         if (!match) {
             socket.write('HTTP/1.1 404 Not Found\r\n\r\n');
@@ -112,15 +107,6 @@ function setupWebSocket(server, authenticatedTokens, watcher, configPath) {
         const session = sessionMap.get(ws);
         if (!session)
             return;
-        if (session.mode === 'sdk') {
-            handleSdkConnection(ws, session);
-            return;
-        }
-        // PTY mode — existing behavior
-        if (session.mode !== 'pty') {
-            ws.close(1008, 'Session mode does not support PTY streaming');
-            return;
-        }
         const ptySession = session;
         let dataDisposable = null;
         let exitDisposable = null;
@@ -190,87 +176,12 @@ function setupWebSocket(server, authenticatedTokens, watcher, configPath) {
                 ptySession.onPtyReplacedCallbacks.splice(idx, 1);
         });
     });
-    function handleSdkConnection(ws, session) {
-        // Send session info
-        const sessionInfo = JSON.stringify({
-            type: 'session_info',
-            mode: 'sdk',
-            sessionId: session.id,
-        });
-        if (ws.readyState === ws.OPEN)
-            ws.send(sessionInfo);
-        // Replay stored events (send as-is — client expects raw SdkEvent shape)
-        for (const event of session.events) {
-            if (ws.readyState !== ws.OPEN)
-                break;
-            ws.send(JSON.stringify(event));
-        }
-        // Subscribe to live events with backpressure
-        let paused = false;
-        const unsubscribe = onSdkEvent(session.id, (event) => {
-            if (ws.readyState !== ws.OPEN)
-                return;
-            // Backpressure check
-            if (ws.bufferedAmount > BACKPRESSURE_HIGH) {
-                paused = true;
-                return;
-            }
-            ws.send(JSON.stringify(event));
-        });
-        // Periodically check if we can resume
-        const backpressureInterval = setInterval(() => {
-            if (paused && ws.bufferedAmount < BACKPRESSURE_LOW) {
-                paused = false;
-            }
-        }, 100);
-        // Handle incoming messages
-        ws.on('message', (msg) => {
-            const str = msg.toString();
-            try {
-                const parsed = JSON.parse(str);
-                if (parsed.type === 'message' && typeof parsed.text === 'string') {
-                    if (parsed.text.length > 100_000)
-                        return;
-                    if (session.needsBranchRename) {
-                        session.needsBranchRename = false;
-                        sdkSendMessage(session.id, SDK_BRANCH_RENAME_INSTRUCTION + parsed.text);
-                        if (configPath)
-                            startBranchWatcher(session, broadcastEvent, configPath);
-                    }
-                    else {
-                        sdkSendMessage(session.id, parsed.text);
-                    }
-                    return;
-                }
-                if (parsed.type === 'permission' && typeof parsed.requestId === 'string' && typeof parsed.approved === 'boolean') {
-                    sdkHandlePermission(session.id, parsed.requestId, parsed.approved);
-                    return;
-                }
-                if (parsed.type === 'resize' && typeof parsed.cols === 'number' && typeof parsed.rows === 'number') {
-                    // TODO: wire up companion shell — currently open_companion message is unhandled server-side
-                    return;
-                }
-                if (parsed.type === 'open_companion') {
-                    // TODO: spawn companion PTY in session CWD and relay via terminal_data/terminal_exit frames
-                    return;
-                }
-            }
-            catch (_) {
-                // Not JSON — ignore for SDK sessions
-            }
-        });
-        ws.on('close', () => {
-            unsubscribe();
-            clearInterval(backpressureInterval);
-        });
-        ws.on('error', () => {
-            unsubscribe();
-            clearInterval(backpressureInterval);
-        });
-    }
     sessions.onIdleChange((sessionId, idle) => {
         broadcastEvent('session-idle-changed', { sessionId, idle });
     });
+    sessions.onSessionEnd((sessionId, repoPath, branchName) => {
+        broadcastEvent('session-ended', { sessionId, repoPath, branchName });
+    });
     return { wss, broadcastEvent };
 }
 export { setupWebSocket };

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.1",
+  "version": "3.3.0",
   "description": "Remote web interface for Claude Code CLI sessions",
   "type": "module",
   "main": "dist/server/index.js",
@@ -42,7 +42,6 @@
   "license": "MIT",
   "author": "Donovan Yohan",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.77",
     "@tanstack/svelte-query": "^6.0.18",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^6.0.0",