npm - claude-remote-cli - Versions diffs - 2.4.5 → 2.4.7 - Mend

claude-remote-cli 2.4.5 → 2.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/frontend/assets/{index-D_vlhnTU.css → index-0GsaVTCt.css} +1 -1
package/dist/frontend/assets/{index-DOfplZTg.js → index-DHmjTDUE.js} +18 -18
package/dist/frontend/index.html +2 -2
package/dist/server/index.js +48 -22
package/dist/server/sessions.js +5 -3
package/dist/server/watcher.js +27 -0
package/dist/test/sessions.test.js +50 -0
package/dist/test/worktrees.test.js +115 -1
package/package.json +1 -1

package/dist/frontend/index.html CHANGED Viewed

@@ -11,8 +11,8 @@
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
   <meta name="theme-color" content="#1a1a1a" />
-  <script type="module" crossorigin src="/assets/index-DOfplZTg.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-D_vlhnTU.css">
+  <script type="module" crossorigin src="/assets/index-DHmjTDUE.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-0GsaVTCt.css">
 </head>
 <body>
   <div id="app"></div>

package/dist/server/index.js CHANGED Viewed

@@ -12,7 +12,7 @@ import { loadConfig, saveConfig, DEFAULTS, readMeta, writeMeta, deleteMeta, ensu
 import * as auth from './auth.js';
 import * as sessions from './sessions.js';
 import { setupWebSocket } from './ws.js';
-import { WorktreeWatcher, WORKTREE_DIRS, isValidWorktreePath } from './watcher.js';
+import { WorktreeWatcher, WORKTREE_DIRS, isValidWorktreePath, parseWorktreeListPorcelain } from './watcher.js';
 import { isInstalled as serviceIsInstalled } from './service.js';
 import { extensionForMime, setClipboardImage } from './clipboard.js';
 const __filename = fileURLToPath(import.meta.url);
@@ -384,7 +384,7 @@ async function main() {
         res.json(response);
     });
     // GET /worktrees?repo=<path> — list worktrees; omit repo to scan all repos in all rootDirs
-    app.get('/worktrees', requireAuth, (req, res) => {
+    app.get('/worktrees', requireAuth, async (req, res) => {
         const repoParam = typeof req.query.repo === 'string' ? req.query.repo : undefined;
         const roots = config.rootDirs || [];
         const worktrees = [];
@@ -397,31 +397,54 @@ async function main() {
             reposToScan = scanAllRepos(roots);
         }
         for (const repo of reposToScan) {
-            for (const dir of WORKTREE_DIRS) {
-                const worktreeDir = path.join(repo.path, dir);
-                let entries;
-                try {
-                    entries = fs.readdirSync(worktreeDir, { withFileTypes: true });
-                }
-                catch (_) {
-                    continue;
-                }
-                for (const entry of entries) {
-                    if (!entry.isDirectory())
-                        continue;
-                    const wtPath = path.join(worktreeDir, entry.name);
-                    const meta = readMeta(CONFIG_PATH, wtPath);
+            // Use git worktree list to discover all worktrees (including those at arbitrary paths)
+            try {
+                const { stdout } = await execFileAsync('git', ['worktree', 'list', '--porcelain'], { cwd: repo.path });
+                const parsed = parseWorktreeListPorcelain(stdout, repo.path);
+                for (const wt of parsed) {
+                    const dirName = wt.path.split('/').pop() || '';
+                    const meta = readMeta(CONFIG_PATH, wt.path);
                     worktrees.push({
-                        name: entry.name,
-                        path: wtPath,
+                        name: dirName,
+                        path: wt.path,
                         repoName: repo.name,
                         repoPath: repo.path,
                         root: repo.root,
-                        displayName: meta ? meta.displayName : '',
-                        lastActivity: meta ? meta.lastActivity : '',
+                        displayName: meta?.displayName || wt.branch || dirName,
+                        lastActivity: meta?.lastActivity || '',
+                        branchName: wt.branch || meta?.branchName || dirName,
                     });
                 }
             }
+            catch {
+                // git worktree list failed — fall back to directory scanning
+                for (const dir of WORKTREE_DIRS) {
+                    const worktreeDir = path.join(repo.path, dir);
+                    let entries;
+                    try {
+                        entries = fs.readdirSync(worktreeDir, { withFileTypes: true });
+                    }
+                    catch (_) {
+                        continue;
+                    }
+                    for (const entry of entries) {
+                        if (!entry.isDirectory())
+                            continue;
+                        const wtPath = path.join(worktreeDir, entry.name);
+                        const meta = readMeta(CONFIG_PATH, wtPath);
+                        worktrees.push({
+                            name: entry.name,
+                            path: wtPath,
+                            repoName: repo.name,
+                            repoPath: repo.path,
+                            root: repo.root,
+                            displayName: meta?.displayName || '',
+                            lastActivity: meta?.lastActivity || '',
+                            branchName: meta?.branchName || entry.name,
+                        });
+                    }
+                }
+            }
         }
         res.json(worktrees);
     });
@@ -555,13 +578,15 @@ async function main() {
                 dirName = 'mobile-' + name + '-' + Date.now().toString(36);
                 resolvedBranch = dirName;
             }
-            const worktreeDir = path.join(repoPath, '.worktrees');
+            const worktreeDir = path.join(repoPath, WORKTREE_DIRS[0]);
             let targetDir = path.join(worktreeDir, dirName);
             if (fs.existsSync(targetDir)) {
                 targetDir = targetDir + '-' + Date.now().toString(36);
                 dirName = path.basename(targetDir);
             }
-            ensureGitignore(repoPath, '.worktrees/');
+            for (const dir of WORKTREE_DIRS) {
+                ensureGitignore(repoPath, dir + '/');
+            }
             try {
                 // Check if branch exists locally or on a remote
                 let branchExists = false;
@@ -605,6 +630,7 @@ async function main() {
             cwd,
             root,
             worktreeName,
+            branchName: branchName || worktreeName,
             displayName,
             command: config.claudeCommand,
             args,

package/dist/server/sessions.js CHANGED Viewed

@@ -11,7 +11,7 @@ let idleChangeCallback = null;
 function onIdleChange(cb) {
     idleChangeCallback = cb;
 }
-function create({ type, repoName, repoPath, cwd, root, worktreeName, displayName, command, args = [], cols = 80, rows = 24, configPath }) {
+function create({ type, repoName, repoPath, cwd, root, worktreeName, branchName, displayName, command, args = [], cols = 80, rows = 24, configPath }) {
     const id = crypto.randomBytes(8).toString('hex');
     const createdAt = new Date().toISOString();
     // Strip CLAUDECODE env var to allow spawning claude inside a claude-managed server
@@ -35,6 +35,7 @@ function create({ type, repoName, repoPath, cwd, root, worktreeName, displayName
         repoName: repoName || '',
         repoPath,
         worktreeName: worktreeName || '',
+        branchName: branchName || worktreeName || '',
         displayName: displayName || worktreeName || repoName || '',
         pty: ptyProcess,
         createdAt,
@@ -97,20 +98,21 @@ function create({ type, repoName, repoPath, cwd, root, worktreeName, displayName
         const tmpDir = path.join(os.tmpdir(), 'claude-remote-cli', id);
         fs.rm(tmpDir, { recursive: true, force: true }, () => { });
     });
-    return { id, type: session.type, root: session.root, repoName: session.repoName, repoPath, worktreeName: session.worktreeName, displayName: session.displayName, pid: ptyProcess.pid, createdAt, lastActivity: createdAt, idle: false };
+    return { id, type: session.type, root: session.root, repoName: session.repoName, repoPath, worktreeName: session.worktreeName, branchName: session.branchName, displayName: session.displayName, pid: ptyProcess.pid, createdAt, lastActivity: createdAt, idle: false };
 }
 function get(id) {
     return sessions.get(id);
 }
 function list() {
     return Array.from(sessions.values())
-        .map(({ id, type, root, repoName, repoPath, worktreeName, displayName, createdAt, lastActivity, idle }) => ({
+        .map(({ id, type, root, repoName, repoPath, worktreeName, branchName, displayName, createdAt, lastActivity, idle }) => ({
         id,
         type,
         root,
         repoName,
         repoPath,
         worktreeName,
+        branchName,
         displayName,
         createdAt,
         lastActivity,

package/dist/server/watcher.js CHANGED Viewed

@@ -8,6 +8,33 @@ export function isValidWorktreePath(worktreePath) {
         return resolved.includes(path.sep + dir + path.sep);
     });
 }
+/**
+ * Parse `git worktree list --porcelain` output into structured entries.
+ * Skips the main worktree (matching repoPath) and bare/detached entries.
+ */
+export function parseWorktreeListPorcelain(stdout, repoPath) {
+    const results = [];
+    const blocks = stdout.split('\n\n').filter(Boolean);
+    for (const block of blocks) {
+        const lines = block.split('\n');
+        let wtPath = '';
+        let branch = '';
+        let bare = false;
+        for (const line of lines) {
+            if (line.startsWith('worktree '))
+                wtPath = line.slice(9);
+            if (line.startsWith('branch refs/heads/'))
+                branch = line.slice(18);
+            if (line === 'bare')
+                bare = true;
+        }
+        // Skip the main worktree (repo root), bare repos, and detached HEAD
+        if (!wtPath || wtPath === repoPath || bare || !branch)
+            continue;
+        results.push({ path: wtPath, branch });
+    }
+    return results;
+}
 export class WorktreeWatcher extends EventEmitter {
     _watchers;
     _debounceTimer;

package/dist/test/sessions.test.js CHANGED Viewed

@@ -214,4 +214,54 @@ describe('sessions', () => {
         const found = sessions.findRepoSession('/tmp/my-repo');
         assert.strictEqual(found, undefined, 'should not match worktree sessions');
     });
+    it('branchName defaults to worktreeName when not specified', () => {
+        const result = sessions.create({
+            repoName: 'test-repo',
+            repoPath: '/tmp',
+            worktreeName: 'dy-feat-my-feature',
+            command: '/bin/echo',
+            args: ['hello'],
+        });
+        createdIds.push(result.id);
+        assert.strictEqual(result.branchName, 'dy-feat-my-feature');
+    });
+    it('branchName is set independently from worktreeName', () => {
+        const result = sessions.create({
+            repoName: 'test-repo',
+            repoPath: '/tmp',
+            worktreeName: 'dy-feat-my-feature',
+            branchName: 'dy/feat/my-feature',
+            command: '/bin/echo',
+            args: ['hello'],
+        });
+        createdIds.push(result.id);
+        assert.strictEqual(result.worktreeName, 'dy-feat-my-feature');
+        assert.strictEqual(result.branchName, 'dy/feat/my-feature');
+    });
+    it('list includes branchName field', () => {
+        const result = sessions.create({
+            repoName: 'test-repo',
+            repoPath: '/tmp',
+            worktreeName: 'my-wt',
+            branchName: 'feat/my-branch',
+            command: '/bin/echo',
+            args: ['hello'],
+        });
+        createdIds.push(result.id);
+        const list = sessions.list();
+        const session = list.find(s => s.id === result.id);
+        assert.ok(session);
+        assert.strictEqual(session.branchName, 'feat/my-branch');
+    });
+    it('branchName defaults to empty string when neither branchName nor worktreeName provided', () => {
+        const result = sessions.create({
+            type: 'repo',
+            repoName: 'test-repo',
+            repoPath: '/tmp',
+            command: '/bin/echo',
+            args: ['hello'],
+        });
+        createdIds.push(result.id);
+        assert.strictEqual(result.branchName, '');
+    });
 });

package/dist/test/worktrees.test.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
-import { WORKTREE_DIRS, isValidWorktreePath } from '../server/watcher.js';
+import { WORKTREE_DIRS, isValidWorktreePath, parseWorktreeListPorcelain } from '../server/watcher.js';
 describe('worktree directories constant', () => {
     it('should include both .worktrees and .claude/worktrees', () => {
         assert.deepEqual(WORKTREE_DIRS, ['.worktrees', '.claude/worktrees']);
@@ -32,6 +32,120 @@ describe('branch name to directory name', () => {
         assert.equal(dirName, 'my-feature');
     });
 });
+describe('parseWorktreeListPorcelain', () => {
+    const repoPath = '/Users/me/code/my-repo';
+    it('should parse a single worktree entry', () => {
+        const stdout = [
+            `worktree ${repoPath}`,
+            'HEAD abc123',
+            'branch refs/heads/main',
+            '',
+            'worktree /Users/me/code/my-repo/.worktrees/feat-branch',
+            'HEAD def456',
+            'branch refs/heads/feat/branch',
+            '',
+        ].join('\n');
+        const result = parseWorktreeListPorcelain(stdout, repoPath);
+        assert.equal(result.length, 1);
+        assert.equal(result[0].path, '/Users/me/code/my-repo/.worktrees/feat-branch');
+        assert.equal(result[0].branch, 'feat/branch');
+    });
+    it('should parse multiple worktree entries', () => {
+        const stdout = [
+            `worktree ${repoPath}`,
+            'HEAD abc123',
+            'branch refs/heads/main',
+            '',
+            'worktree /Users/me/code/my-repo/.worktrees/feat-a',
+            'HEAD def456',
+            'branch refs/heads/feat/a',
+            '',
+            'worktree /Users/me/other-path/extend-cli',
+            'HEAD 789abc',
+            'branch refs/heads/dy/feat/worktree-isolation',
+            '',
+        ].join('\n');
+        const result = parseWorktreeListPorcelain(stdout, repoPath);
+        assert.equal(result.length, 2);
+        assert.equal(result[0].path, '/Users/me/code/my-repo/.worktrees/feat-a');
+        assert.equal(result[0].branch, 'feat/a');
+        assert.equal(result[1].path, '/Users/me/other-path/extend-cli');
+        assert.equal(result[1].branch, 'dy/feat/worktree-isolation');
+    });
+    it('should skip the main worktree (repo root)', () => {
+        const stdout = [
+            `worktree ${repoPath}`,
+            'HEAD abc123',
+            'branch refs/heads/main',
+            '',
+        ].join('\n');
+        const result = parseWorktreeListPorcelain(stdout, repoPath);
+        assert.equal(result.length, 0);
+    });
+    it('should skip bare entries', () => {
+        const stdout = [
+            `worktree ${repoPath}`,
+            'HEAD abc123',
+            'branch refs/heads/main',
+            '',
+            'worktree /some/bare/repo',
+            'HEAD def456',
+            'bare',
+            '',
+        ].join('\n');
+        const result = parseWorktreeListPorcelain(stdout, repoPath);
+        assert.equal(result.length, 0);
+    });
+    it('should skip detached HEAD worktrees (no branch line)', () => {
+        const stdout = [
+            `worktree ${repoPath}`,
+            'HEAD abc123',
+            'branch refs/heads/main',
+            '',
+            'worktree /Users/me/code/my-repo/.worktrees/detached',
+            'HEAD def456',
+            'detached',
+            '',
+        ].join('\n');
+        const result = parseWorktreeListPorcelain(stdout, repoPath);
+        assert.equal(result.length, 0);
+    });
+    it('should handle empty output', () => {
+        const result = parseWorktreeListPorcelain('', repoPath);
+        assert.equal(result.length, 0);
+    });
+    it('should discover worktrees at arbitrary paths outside .worktrees/', () => {
+        const stdout = [
+            `worktree ${repoPath}`,
+            'HEAD abc123',
+            'branch refs/heads/main',
+            '',
+            'worktree /completely/different/path/project-checkout',
+            'HEAD def456',
+            'branch refs/heads/feature/my-feature',
+            '',
+        ].join('\n');
+        const result = parseWorktreeListPorcelain(stdout, repoPath);
+        assert.equal(result.length, 1);
+        assert.equal(result[0].path, '/completely/different/path/project-checkout');
+        assert.equal(result[0].branch, 'feature/my-feature');
+    });
+    it('should handle deeply nested branch names', () => {
+        const stdout = [
+            `worktree ${repoPath}`,
+            'HEAD abc123',
+            'branch refs/heads/main',
+            '',
+            'worktree /Users/me/code/my-repo/.worktrees/dy-feat-deep-nesting',
+            'HEAD def456',
+            'branch refs/heads/dy/feat/deep/nesting/here',
+            '',
+        ].join('\n');
+        const result = parseWorktreeListPorcelain(stdout, repoPath);
+        assert.equal(result.length, 1);
+        assert.equal(result[0].branch, 'dy/feat/deep/nesting/here');
+    });
+});
 describe('CLI worktree arg parsing', () => {
     it('should extract --yolo and leave other args intact', () => {
         const args = ['add', './.worktrees/my-feature', '-b', 'my-feature', '--yolo'];

package/package.json CHANGED Viewed

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