claude-remote-cli 3.4.0 → 3.4.1

package/dist/server/git.js

@@ -178,6 +178,10 @@ async function getPrForBranch(repoPath, branch, options = {}) {
         return null;
     try {
         const data = JSON.parse(stdout);
+        // Only return OPEN PRs — gh pr view returns merged/closed PRs too
+        if (data.state !== 'OPEN') {
+            return null;
+        }
         return {
             number: data.number,
             title: data.title,
@@ -272,4 +276,37 @@ async function getWorkingTreeDiff(repoPath, exec = execFileAsync) {
         return { additions: 0, deletions: 0 };
     }
 }
-export { listBranches, normalizeBranchNames, getActivityFeed, getCiStatus, getPrForBranch, getUnresolvedCommentCount, switchBranch, getCommitsAhead, getCurrentBranch, getWorkingTreeDiff, };
+/**
+ * Convert a git branch name to a human-readable display name.
+ * "fix-mobile-scroll-bug" → "Fix mobile scroll bug"
+ * "feature/add-auth"      → "Add auth"
+ */
+function branchToDisplayName(branch) {
+    const stripped = branch.replace(/^(feature|fix|chore|refactor|docs|test|ci|build)\//i, '');
+    const words = stripped.replace(/[-_]/g, ' ').trim();
+    if (!words)
+        return branch;
+    return words.charAt(0).toUpperCase() + words.slice(1);
+}
+async function isBranchStale(repoPath, branch, options = {}) {
+    const run = options.exec || execFileAsync;
+    try {
+        for (const base of ['main', 'master']) {
+            try {
+                const { stdout } = await run('git', ['rev-list', '--count', `${base}..${branch}`], { cwd: repoPath, timeout: 5000 });
+                const count = parseInt(stdout.trim(), 10);
+                if (count === 0)
+                    return true;
+                return false;
+            }
+            catch {
+                continue;
+            }
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+export { listBranches, normalizeBranchNames, getActivityFeed, getCiStatus, getPrForBranch, getUnresolvedCommentCount, switchBranch, getCommitsAhead, getCurrentBranch, getWorkingTreeDiff, branchToDisplayName, isBranchStale, };

package/dist/server/index.js

@@ -16,7 +16,7 @@ import { setupWebSocket } from './ws.js';
 import { WorktreeWatcher, WORKTREE_DIRS, isValidWorktreePath, parseWorktreeListPorcelain, parseAllWorktrees } from './watcher.js';
 import { isInstalled as serviceIsInstalled } from './service.js';
 import { extensionForMime, setClipboardImage } from './clipboard.js';
-import { listBranches } from './git.js';
+import { listBranches, isBranchStale } from './git.js';
 import * as push from './push.js';
 import { createWorkspaceRouter } from './workspaces.js';
 import { MOUNTAIN_NAMES } from './types.js';
@@ -559,10 +559,30 @@ async function main() {
         let resolvedBranch = '';
         let isMountainName = false;
         if (worktreePath) {
+            // Check if the worktree's branch is stale (merged/at base) and needs a fresh name
+            const currentBranchResult = await execFileAsync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: worktreePath }).catch(() => null);
+            const currentBranch = currentBranchResult?.stdout.trim();
+            if (currentBranch && !needsBranchRename) {
+                const stale = await isBranchStale(worktreePath, currentBranch);
+                if (stale) {
+                    // Generate unique temp branch: <mountain>-<short-timestamp>
+                    const mountainName = worktreePath.split('/').pop() || 'branch';
+                    const suffix = Date.now().toString(36).slice(-4);
+                    const tempBranch = `${mountainName}-${suffix}`;
+                    try {
+                        await execFileAsync('git', ['checkout', '-b', tempBranch], { cwd: worktreePath });
+                    }
+                    catch {
+                        await execFileAsync('git', ['branch', '-m', tempBranch], { cwd: worktreePath }).catch(() => { });
+                    }
+                    isMountainName = true;
+                }
+            }
             // Only use --continue if:
             // 1. Not a brand-new worktree (needsBranchRename flag)
             // 2. A prior Claude session exists in this directory (.claude/ dir present)
-            const hasPriorSession = !needsBranchRename && fs.existsSync(path.join(worktreePath, '.claude'));
+            // 3. Branch is not stale (isMountainName means we just created a fresh branch)
+            const hasPriorSession = !needsBranchRename && !isMountainName && fs.existsSync(path.join(worktreePath, '.claude'));
             args = hasPriorSession ? [...AGENT_CONTINUE_ARGS[resolvedAgent], ...baseArgs] : [...baseArgs];
             cwd = worktreePath;
             sessionRepoPath = worktreePath;

package/dist/server/sessions.js

@@ -295,7 +295,7 @@ async function fetchMetaForSession(session) {
     if (branch) {
         try {
             const pr = await getPrForBranch(repoPath, branch);
-            if (pr && pr.state === 'OPEN') {
+            if (pr) {
                 prNumber = pr.number;
                 additions = pr.additions;
                 deletions = pr.deletions;

package/dist/server/ws.js

@@ -3,6 +3,7 @@ import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import * as sessions from './sessions.js';
 import { writeMeta } from './config.js';
+import { branchToDisplayName } from './git.js';
 const execFileAsync = promisify(execFile);
 const BRANCH_POLL_INTERVAL_MS = 3000;
 const BRANCH_POLL_MAX_ATTEMPTS = 10;
@@ -20,12 +21,13 @@ function startBranchWatcher(session, broadcastEvent, cfgPath) {
             const currentBranch = stdout.trim();
             if (currentBranch && currentBranch !== originalBranch) {
                 clearInterval(timer);
+                const displayName = branchToDisplayName(currentBranch);
                 session.branchName = currentBranch;
-                session.displayName = currentBranch;
-                broadcastEvent('session-renamed', { sessionId: session.id, branchName: currentBranch, displayName: currentBranch });
+                session.displayName = displayName;
+                broadcastEvent('session-renamed', { sessionId: session.id, branchName: currentBranch, displayName });
                 writeMeta(cfgPath, {
                     worktreePath: session.repoPath,
-                    displayName: currentBranch,
+                    displayName,
                     lastActivity: new Date().toISOString(),
                     branchName: currentBranch,
                 });
@@ -147,16 +149,17 @@ function setupWebSocket(server, authenticatedTokens, watcher, configPath) {
                     ptySession._renameBuffer = '';
                 const enterIndex = str.indexOf('\r');
                 if (enterIndex === -1) {
-                    // Buffer without passthrough — don't echo to PTY during buffering.
-                    // Previously we wrote to PTY here for echo and used Ctrl+U to undo on Enter,
-                    // but Ctrl+U doesn't work reliably in Claude Code's Ink/React TUI.
                     ptySession._renameBuffer += str;
+                    ptySession.pty.write(str); // Echo to terminal so user sees what they type
                     return;
                 }
                 // Enter detected — send rename prompt + full message to PTY in one shot
                 const buffered = ptySession._renameBuffer;
                 const beforeEnter = buffered + str.slice(0, enterIndex);
                 const afterEnter = str.slice(enterIndex); // includes the \r
+                // Clear the echoed input line before writing the full prompt+message
+                const clearLine = '\r' + ' '.repeat(Math.min(beforeEnter.length + 2, 200)) + '\r';
+                ptySession.pty.write(clearLine);
                 const renamePrompt = `Before doing anything else, rename the current git branch using \`git branch -m <new-name>\`. Choose a short, descriptive kebab-case branch name based on the task below.${ptySession.branchRenamePrompt ? ' User preferences: ' + ptySession.branchRenamePrompt : ''} Do not ask for confirmation — just rename and proceed.\n\n`;
                 ptySession.pty.write(renamePrompt + beforeEnter + afterEnter);
                 ptySession.needsBranchRename = false;

package/dist/test/branch-rename.test.js

@@ -1,6 +1,7 @@
 import { test, describe } from 'node:test';
 import assert from 'node:assert/strict';
 import { MOUNTAIN_NAMES } from '../server/types.js';
+import { branchToDisplayName } from '../server/git.js';
 describe('MOUNTAIN_NAMES', () => {
     test('contains 30 mountain names', () => {
         assert.equal(MOUNTAIN_NAMES.length, 30);
@@ -26,3 +27,19 @@ describe('MOUNTAIN_NAMES', () => {
         assert.equal(name3, 'everest'); // wraps back to start
     });
 });
+describe('branchToDisplayName', () => {
+    test('converts kebab-case to sentence case', () => {
+        assert.equal(branchToDisplayName('fix-mobile-scroll-bug'), 'Fix mobile scroll bug');
+    });
+    test('strips common branch prefixes', () => {
+        assert.equal(branchToDisplayName('feature/add-auth'), 'Add auth');
+        assert.equal(branchToDisplayName('fix/api-timeout'), 'Api timeout');
+        assert.equal(branchToDisplayName('chore/update-deps'), 'Update deps');
+    });
+    test('handles simple names', () => {
+        assert.equal(branchToDisplayName('lhotse'), 'Lhotse');
+    });
+    test('handles underscores', () => {
+        assert.equal(branchToDisplayName('fix_the_thing'), 'Fix the thing');
+    });
+});

package/package.json

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