ccmanager 4.3.1 → 4.4.0

package/dist/utils/worktreeUtils.js

@@ -206,7 +206,7 @@ function gitStatusColumns(wt, fullBranchName) {
 function buildSessionItem(wt, session, sessionSuffix) {
     const stateData = session?.stateMutex.getSnapshot();
     const status = stateData
-        ? ` [${getStatusDisplay(stateData.state, stateData.backgroundTaskCount, stateData.teamMemberCount)}]`
+        ? `[${getStatusDisplay(stateData.state, stateData.backgroundTaskCount, stateData.teamMemberCount)}]`
         : '';
     const fullBranchName = wt.branch
         ? wt.branch.replace('refs/heads/', '')
@@ -214,7 +214,7 @@ function buildSessionItem(wt, session, sessionSuffix) {
     const branchName = truncateString(fullBranchName, MAX_BRANCH_NAME_LENGTH);
     const isMain = wt.isMainWorktree ? ' (main)' : '';
     const { displaySuffix: dirSuffix, rawName: rawDirName } = formatWorktreeDirectorySuffix(wt, fullBranchName);
-    const baseLabel = `${branchName}${dirSuffix}${isMain}${sessionSuffix}${status}`;
+    const baseLabel = `${branchName}${dirSuffix}${isMain}${sessionSuffix}`;
     // Use the full (untruncated) branch name so search still matches the tail
     // of long branch names; status icons are excluded so they don't match.
     const rawDirForSearch = rawDirName ? ` @ ${rawDirName}` : '';
@@ -227,6 +227,7 @@ function buildSessionItem(wt, session, sessionSuffix) {
         worktree: wt,
         session,
         baseLabel,
+        status,
         searchableName,
         fileChanges,
         aheadBehind,
@@ -235,6 +236,7 @@ function buildSessionItem(wt, session, sessionSuffix) {
         error,
         lengths: {
             base: stripAnsi(baseLabel).length,
+            status: stripAnsi(status).length,
             fileChanges: stripAnsi(fileChanges).length,
             aheadBehind: stripAnsi(aheadBehind).length,
             parentBranch: stripAnsi(parentBranch).length,
@@ -277,35 +279,59 @@ export function prepareSessionItems(worktrees, sessions, options) {
     }
     return items;
 }
+/**
+ * Visible width of the name portion when the state tag is appended to it
+ * instead of getting its own column.
+ */
+function inlineBaseLength(item) {
+    return (item.lengths.base + (item.lengths.status ? item.lengths.status + 1 : 0));
+}
 /**
  * Calculates column positions based on content widths.
+ *
+ * `availableWidth` is the number of terminal columns the label may occupy
+ * (i.e. terminal width minus whatever prefix the caller prepends). When the
+ * aligned-status layout would not fit in it, the layout falls back to appending
+ * the state tag to the name, which is narrower. Omit it to always align.
  */
-export function calculateColumnPositions(items) {
+export function calculateColumnPositions(items, availableWidth) {
     // Calculate maximum widths from pre-calculated lengths
     let maxBranchLength = 0;
+    let maxInlineBranchLength = 0;
+    let maxStatusLength = 0;
     let maxFileChangesLength = 0;
     let maxAheadBehindLength = 0;
     let maxParentBranchLength = 0;
+    let maxLastCommitDateLength = 0;
     items.forEach(item => {
         // Skip items with errors for alignment calculation
         if (item.error)
             return;
         maxBranchLength = Math.max(maxBranchLength, item.lengths.base);
+        maxInlineBranchLength = Math.max(maxInlineBranchLength, inlineBaseLength(item));
+        maxStatusLength = Math.max(maxStatusLength, item.lengths.status);
         maxFileChangesLength = Math.max(maxFileChangesLength, item.lengths.fileChanges);
         maxAheadBehindLength = Math.max(maxAheadBehindLength, item.lengths.aheadBehind);
         maxParentBranchLength = Math.max(maxParentBranchLength, item.lengths.parentBranch);
+        maxLastCommitDateLength = Math.max(maxLastCommitDateLength, item.lengths.lastCommitDate);
     });
-    // Simple column positioning
-    const fileChangesColumn = maxBranchLength + MIN_COLUMN_PADDING;
-    const aheadBehindColumn = fileChangesColumn + maxFileChangesLength + MIN_COLUMN_PADDING + 2;
-    const parentBranchColumn = aheadBehindColumn + maxAheadBehindLength + MIN_COLUMN_PADDING + 2;
-    const lastCommitDateColumn = parentBranchColumn + maxParentBranchLength + MIN_COLUMN_PADDING + 2;
-    return {
-        fileChanges: fileChangesColumn,
-        aheadBehind: aheadBehindColumn,
-        parentBranch: parentBranchColumn,
-        lastCommitDate: lastCommitDateColumn,
+    // Simple column positioning. `branchWidth` is how much room the name portion
+    // gets, `statusWidth` is 0 when the state tag rides along with the name.
+    const layout = (branchWidth, statusWidth) => {
+        const fileChanges = branchWidth + MIN_COLUMN_PADDING;
+        const aheadBehind = fileChanges + maxFileChangesLength + MIN_COLUMN_PADDING + 2;
+        const parentBranch = aheadBehind + maxAheadBehindLength + MIN_COLUMN_PADDING + 2;
+        const status = parentBranch + maxParentBranchLength + MIN_COLUMN_PADDING + 2;
+        const lastCommitDate = status + (statusWidth ? statusWidth + MIN_COLUMN_PADDING : 0);
+        return { fileChanges, aheadBehind, parentBranch, status, lastCommitDate };
     };
+    const aligned = layout(maxBranchLength, maxStatusLength);
+    const fits = availableWidth === undefined ||
+        aligned.lastCommitDate + maxLastCommitDateLength <= availableWidth;
+    if (fits) {
+        return { ...aligned, alignStatus: true };
+    }
+    return { ...layout(maxInlineBranchLength, 0), alignStatus: false };
 }
 // Pad string to column position
 function padTo(str, visibleLength, column) {
@@ -315,12 +341,18 @@ function padTo(str, visibleLength, column) {
  * Assembles the final worktree label with proper column alignment
  */
 export function assembleSessionLabel(item, columns) {
-    // If there's an error, just show the base label with error appended
+    const inlineStatus = item.status
+        ? `${item.baseLabel} ${item.status}`
+        : item.baseLabel;
+    // If there's an error, just show the base label with error appended.
+    // Error rows carry no columns at all, so the state tag stays next to the name.
     if (item.error) {
-        return `${item.baseLabel} ${item.error}`;
+        return `${inlineStatus} ${item.error}`;
     }
-    let label = item.baseLabel;
-    let currentLength = item.lengths.base;
+    let label = columns.alignStatus ? item.baseLabel : inlineStatus;
+    let currentLength = columns.alignStatus
+        ? item.lengths.base
+        : inlineBaseLength(item);
     if (item.fileChanges) {
         label = padTo(label, currentLength, columns.fileChanges) + item.fileChanges;
         currentLength = columns.fileChanges + item.lengths.fileChanges;
@@ -334,9 +366,36 @@ export function assembleSessionLabel(item, columns) {
             padTo(label, currentLength, columns.parentBranch) + item.parentBranch;
         currentLength = columns.parentBranch + item.lengths.parentBranch;
     }
+    if (columns.alignStatus && item.status) {
+        label = padTo(label, currentLength, columns.status) + item.status;
+        currentLength = columns.status + item.lengths.status;
+    }
     if (item.lastCommitDate) {
         label =
             padTo(label, currentLength, columns.lastCommitDate) + item.lastCommitDate;
     }
     return label;
 }
+/**
+ * Whether a worktree may be deleted by CCManager.
+ *
+ * Two worktrees are off limits:
+ * - the main worktree, because git refuses to remove it and the repository
+ *   would be left without a checkout;
+ * - the worktree that contains the current working directory, because removing
+ *   the directory CCManager is running in breaks the running process.
+ *
+ * Single source of truth for the rule, shared by the multi-select delete screen
+ * and the per-row delete action.
+ */
+export function isDeletableWorktree(worktree, cwd = process.cwd()) {
+    if (worktree.isMainWorktree)
+        return false;
+    const resolvedCwd = path.resolve(cwd);
+    const resolvedPath = path.resolve(worktree.path);
+    if (resolvedCwd === resolvedPath ||
+        resolvedCwd.startsWith(resolvedPath + path.sep)) {
+        return false;
+    }
+    return true;
+}

package/dist/utils/worktreeUtils.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { generateWorktreeDirectory, extractBranchParts, truncateString, prepareSessionItems, calculateColumnPositions, assembleSessionLabel, } from './worktreeUtils.js';
+import { generateWorktreeDirectory, extractBranchParts, truncateString, prepareSessionItems, calculateColumnPositions, assembleSessionLabel, isDeletableWorktree, } from './worktreeUtils.js';
 import { execSync } from 'child_process';
 import { Mutex, createInitialSessionStateData } from './mutex.js';
 import { createStateDetector } from '../services/stateDetector/index.js';
@@ -139,6 +139,7 @@ describe('prepareSessionItems', () => {
         stateCheckInterval: undefined,
         isPrimaryCommand: true,
         presetName: undefined,
+        presetId: undefined,
         detectionStrategy: 'claude',
         devcontainerConfig: undefined,
         stateMutex: new Mutex({
@@ -152,9 +153,12 @@ describe('prepareSessionItems', () => {
         expect(items).toHaveLength(1);
         expect(items[0]?.baseLabel).toBe('feature/test-branch');
     });
-    it('should include session status in label', () => {
+    it('should expose the session status separately from the name', () => {
         const items = prepareSessionItems([mockWorktree], [mockSession]);
-        expect(items[0]?.baseLabel).toContain('[○ Idle]');
+        // The status tag is its own field so it can be rendered as an aligned
+        // column; it must not be baked into the name portion.
+        expect(items[0]?.status).toBe('[○ Idle]');
+        expect(items[0]?.baseLabel).toBe('feature/test-branch');
     });
     it('should mark main worktree', () => {
         const mainWorktree = { ...mockWorktree, isMainWorktree: true };
@@ -249,8 +253,9 @@ describe('prepareSessionItems', () => {
                     sessionName: 'lab',
                 },
             ]);
-            // Order must be: branch, dir suffix, (no main), session suffix, status.
-            expect(items[0]?.baseLabel).toMatch(/^feature\/foo @ foo-api: lab \[.*Idle.*\]$/);
+            // Order must be: branch, dir suffix, (no main), session suffix.
+            expect(items[0]?.baseLabel).toBe('feature/foo @ foo-api: lab');
+            expect(items[0]?.status).toMatch(/^\[.*Idle.*\]$/);
         });
         it('does not break column alignment when a dir suffix is appended', () => {
             const items = prepareSessionItems([
@@ -277,6 +282,7 @@ describe('column alignment', () => {
         {
             worktree: {},
             baseLabel: 'feature/test-branch',
+            status: '',
             searchableName: 'feature/test-branch',
             fileChanges: '\x1b[32m+10\x1b[0m \x1b[31m-5\x1b[0m',
             aheadBehind: '\x1b[33m↑2 ↓3\x1b[0m',
@@ -284,6 +290,7 @@ describe('column alignment', () => {
             lastCommitDate: '',
             lengths: {
                 base: 19, // 'feature/test-branch'.length
+                status: 0,
                 fileChanges: 6, // '+10 -5'.length
                 aheadBehind: 5, // '↑2 ↓3'.length
                 parentBranch: 0,
@@ -293,6 +300,7 @@ describe('column alignment', () => {
         {
             worktree: {},
             baseLabel: 'main',
+            status: '',
             searchableName: 'main',
             fileChanges: '\x1b[32m+2\x1b[0m \x1b[31m-1\x1b[0m',
             aheadBehind: '\x1b[33m↑1\x1b[0m',
@@ -300,6 +308,7 @@ describe('column alignment', () => {
             lastCommitDate: '',
             lengths: {
                 base: 4, // 'main'.length
+                status: 0,
                 fileChanges: 5, // '+2 -1'.length
                 aheadBehind: 2, // '↑1'.length
                 parentBranch: 0,
@@ -325,3 +334,71 @@ describe('column alignment', () => {
         expect(plain.indexOf('+10 -5')).toBe(21); // Should start at column 21
     });
 });
+describe('isDeletableWorktree', () => {
+    it('should reject the main worktree', () => {
+        expect(isDeletableWorktree({ path: '/repo', isMainWorktree: true }, '/somewhere/else')).toBe(false);
+    });
+    it('should reject the worktree holding the current working directory', () => {
+        expect(isDeletableWorktree({ path: '/repo/worktrees/feature', isMainWorktree: false }, '/repo/worktrees/feature')).toBe(false);
+    });
+    it('should reject a worktree that is an ancestor of the current working directory', () => {
+        expect(isDeletableWorktree({ path: '/repo/worktrees/feature', isMainWorktree: false }, '/repo/worktrees/feature/src/components')).toBe(false);
+    });
+    it('should accept a sibling worktree with a shared path prefix', () => {
+        // '/repo/worktrees/feature-2' starts with the '/repo/worktrees/feature'
+        // string but is a different directory, so it stays deletable.
+        expect(isDeletableWorktree({ path: '/repo/worktrees/feature', isMainWorktree: false }, '/repo/worktrees/feature-2')).toBe(true);
+    });
+    it('should accept an unrelated linked worktree', () => {
+        expect(isDeletableWorktree({ path: '/repo/worktrees/feature', isMainWorktree: false }, '/repo')).toBe(true);
+    });
+});
+describe('session status column', () => {
+    const makeItem = (baseLabel, status, lastCommitDate) => ({
+        worktree: {},
+        baseLabel,
+        status,
+        searchableName: baseLabel,
+        fileChanges: '',
+        aheadBehind: '',
+        parentBranch: '',
+        lastCommitDate,
+        lengths: {
+            base: baseLabel.length,
+            status: status.length,
+            fileChanges: 0,
+            aheadBehind: 0,
+            parentBranch: 0,
+            lastCommitDate: lastCommitDate.length,
+        },
+    });
+    const items = [
+        makeItem('feature/a-very-long-branch-name', '[○ Idle]', '1d ago'),
+        makeItem('main', '[● Busy]', '3w ago'),
+    ];
+    it('starts every status tag at the same column, just left of the date', () => {
+        const columns = calculateColumnPositions(items, 120);
+        expect(columns.alignStatus).toBe(true);
+        const labels = items.map(item => assembleSessionLabel(item, columns));
+        for (const [index, label] of labels.entries()) {
+            expect(label.indexOf(items[index].status)).toBe(columns.status);
+            expect(label.indexOf(items[index].lastCommitDate)).toBe(columns.lastCommitDate);
+        }
+        // The gap between the tag and the date is only the column padding.
+        expect(columns.lastCommitDate - columns.status).toBe('[○ Idle]'.length + 2);
+    });
+    it('falls back to appending the status to the name when too narrow', () => {
+        const columns = calculateColumnPositions(items, 40);
+        expect(columns.alignStatus).toBe(false);
+        expect(assembleSessionLabel(items[0], columns)).toContain('feature/a-very-long-branch-name [○ Idle]');
+        expect(assembleSessionLabel(items[1], columns)).toContain('main [● Busy]');
+    });
+    it('keeps the status next to the name on rows showing a git error', () => {
+        const errored = {
+            ...makeItem('main', '[○ Idle]', ''),
+            error: '[git error]',
+        };
+        const columns = calculateColumnPositions([...items, errored], 120);
+        expect(assembleSessionLabel(errored, columns)).toBe('main [○ Idle] [git error]');
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "4.3.1",
+	"version": "4.4.0",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",
@@ -41,11 +41,11 @@
 		"bin"
 	],
 	"optionalDependencies": {
-		"@kodaikabasawa/ccmanager-darwin-arm64": "4.3.1",
-		"@kodaikabasawa/ccmanager-darwin-x64": "4.3.1",
-		"@kodaikabasawa/ccmanager-linux-arm64": "4.3.1",
-		"@kodaikabasawa/ccmanager-linux-x64": "4.3.1",
-		"@kodaikabasawa/ccmanager-win32-x64": "4.3.1"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "4.4.0",
+		"@kodaikabasawa/ccmanager-darwin-x64": "4.4.0",
+		"@kodaikabasawa/ccmanager-linux-arm64": "4.4.0",
+		"@kodaikabasawa/ccmanager-linux-x64": "4.4.0",
+		"@kodaikabasawa/ccmanager-win32-x64": "4.4.0"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",