recomposable 1.1.3 → 1.1.4

package/README.md

@@ -48,6 +48,7 @@ recomposable
 - **Docker Compose Watch** — toggle `docker compose watch` per service, with live output in the log panel
 - **Dependency-aware rebuild** — rebuild a service then automatically restart all its transitive dependents in topological order
 - **Container exec** — run commands inside any container, inline in the bottom panel (`e`) or full-screen (`x`), with `cd` support and command history
+- **Worktree switching** — switch any service to run from a different git worktree (`t`), automatically rebuilds and starts in the target branch
 - **Vim keybindings** — navigate with `j`/`k`, `G`/`gg`, and more
 
 ## Full Log View
@@ -68,6 +69,12 @@ Press `w` to toggle `docker compose watch` for a service. A cyan `W` indicator a
 
 Press `d` to rebuild the selected service and then automatically restart all services that depend on it (transitively), in the correct topological order. Progress is shown step-by-step in the log panel. If the service has no dependents, falls back to a regular rebuild.
 
+## Worktree Switching
+
+Press `t` on any service to switch it to a different git worktree. A picker shows all available worktrees — navigate with `j`/`k`, confirm with `Enter`. The service is automatically stopped, rebuilt, and started from the target worktree's compose file. A `WORKTREE` column appears when services run from multiple branches, with non-main branches highlighted in yellow.
+
+This is useful for end-to-end testing changes across branches without drowning in terminal tabs. Run your main stack on `main`, then switch individual services to feature branches to verify their behavior in the full environment. Particularly handy when letting Claude Code work in worktrees — switch the affected service, verify it end-to-end, and switch back, all from a single terminal.
+
 ## Adding Compose Files
 
 Create a `recomposable.json` file in your project root:
@@ -136,6 +143,7 @@ recomposable -f docker-compose.yml -f docker-compose.prod.yml
 | `x` | Full-screen exec mode |
 | `n` | Toggle no-cache mode (rebuild with `--no-cache` + `--force-recreate`) |
 | `f` / `Enter` | Full-screen log view for selected service |
+| `t` | Switch service to a different git worktree |
 | `l` | Toggle inline log panel |
 | `/` | Search in inline log panel |
 | `G` | Jump to bottom |

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import type { Config, AppState, ServiceGroup } from './lib/types';
+import type { Config, AppState, ServiceGroup, GitWorktree } from './lib/types';
 export interface ModuleState {
     logScanActive: boolean;
     statsPollActive: boolean;
@@ -11,6 +11,7 @@ export declare function createModuleState(): ModuleState;
 export declare function loadConfig(): Config;
 export declare function discoverServices(config: Config): ServiceGroup[];
 export declare function pollStatuses(state: AppState): void;
+export declare function detectMultipleWorktrees(state: AppState): void;
 export declare function pollLogCounts(state: AppState): void;
 export declare function pollContainerStats(state: AppState): void;
 export declare function render(state: AppState): void;
@@ -21,6 +22,9 @@ export declare function doRebuild(state: AppState): void;
 export declare function doRestart(state: AppState): void;
 export declare function doStop(state: AppState): void;
 export declare function doStart(state: AppState): void;
+export declare function mapComposeFileToWorktree(composeFile: string, targetWorktreePath: string): string | null;
+export declare function openWorktreePicker(state: AppState): void;
+export declare function doWorktreeSwitch(state: AppState, targetWorktree: GitWorktree): void;
 export declare function doWatch(state: AppState): void;
 export declare function initDepGraphs(state: AppState): void;
 export declare function doCascadeRebuild(state: AppState): void;

package/dist/index.js

@@ -8,6 +8,7 @@ exports.createModuleState = createModuleState;
 exports.loadConfig = loadConfig;
 exports.discoverServices = discoverServices;
 exports.pollStatuses = pollStatuses;
+exports.detectMultipleWorktrees = detectMultipleWorktrees;
 exports.pollLogCounts = pollLogCounts;
 exports.pollContainerStats = pollContainerStats;
 exports.render = render;
@@ -18,6 +19,9 @@ exports.doRebuild = doRebuild;
 exports.doRestart = doRestart;
 exports.doStop = doStop;
 exports.doStart = doStart;
+exports.mapComposeFileToWorktree = mapComposeFileToWorktree;
+exports.openWorktreePicker = openWorktreePicker;
+exports.doWorktreeSwitch = doWorktreeSwitch;
 exports.doWatch = doWatch;
 exports.initDepGraphs = initDepGraphs;
 exports.doCascadeRebuild = doCascadeRebuild;
@@ -60,7 +64,7 @@ function loadConfig() {
         composeFiles: [],
         pollInterval: 3000,
         logTailLines: 100,
-        logScanPatterns: ['WRN]', 'ERR]'],
+        logScanPatterns: [['WRN]', 'WARNING'], ['ERR]', 'ERROR']],
         logScanLines: 1000,
         logScanInterval: 10000,
         statsInterval: 5000,
@@ -78,7 +82,7 @@ function loadConfig() {
             if (Array.isArray(raw.composeFiles) && raw.composeFiles.every((f) => typeof f === 'string')) {
                 defaults.composeFiles = raw.composeFiles;
             }
-            if (Array.isArray(raw.logScanPatterns) && raw.logScanPatterns.every((p) => typeof p === 'string')) {
+            if (Array.isArray(raw.logScanPatterns) && raw.logScanPatterns.every((p) => typeof p === 'string' || (Array.isArray(p) && p.length > 0 && p.every((s) => typeof s === 'string')))) {
                 defaults.logScanPatterns = raw.logScanPatterns;
             }
             const numericFields = [
@@ -138,14 +142,41 @@ function discoverServices(config) {
 }
 // --- Status Polling ---
 function pollStatuses(state) {
+    // Collect services by their effective file (may differ from group file due to worktree overrides)
+    const fileToServices = new Map();
     for (const group of state.groups) {
         if (group.error)
             continue;
-        const statuses = (0, docker_1.getStatuses)(group.file);
+        for (const service of group.services) {
+            const sk = (0, state_1.statusKey)(group.file, service);
+            const file = (0, state_1.getEffectiveFile)(state, group.file, service);
+            if (!fileToServices.has(file))
+                fileToServices.set(file, []);
+            fileToServices.get(file).push({ sk, service });
+        }
+    }
+    for (const [file, services] of fileToServices) {
+        const statuses = (0, docker_1.getStatuses)(file);
+        const serviceSet = new Set(services.map(s => s.service));
         for (const [svc, st] of statuses) {
-            state.statuses.set((0, state_1.statusKey)(group.file, svc), st);
+            if (serviceSet.has(svc)) {
+                // Store under the original statusKey (group.file based)
+                const match = services.find(s => s.service === svc);
+                if (match)
+                    state.statuses.set(match.sk, st);
+            }
         }
     }
+    detectMultipleWorktrees(state);
+}
+function detectMultipleWorktrees(state) {
+    const worktrees = new Set();
+    for (const st of state.statuses.values()) {
+        if (st.state === 'running' && st.worktree) {
+            worktrees.add(st.worktree);
+        }
+    }
+    state.showWorktreeColumn = worktrees.size > 1;
 }
 // --- Log Pattern Scanning ---
 function pollLogCounts(state) {
@@ -178,14 +209,18 @@ function pollLogCounts(state) {
         child.stderr.on('data', (d) => { output += d.toString(); });
         child.on('close', () => {
             const counts = new Map();
-            for (const pattern of scanPatterns) {
+            for (const entry of scanPatterns) {
+                const group = Array.isArray(entry) ? entry : [entry];
+                const key = group[0];
                 let count = 0;
-                let idx = 0;
-                while ((idx = output.indexOf(pattern, idx)) !== -1) {
-                    count++;
-                    idx += pattern.length;
+                for (const pattern of group) {
+                    let idx = 0;
+                    while ((idx = output.indexOf(pattern, idx)) !== -1) {
+                        count++;
+                        idx += pattern.length;
+                    }
                 }
-                counts.set(pattern, count);
+                counts.set(key, count);
             }
             state.logCounts.set(sk, counts);
             remaining--;
@@ -341,9 +376,10 @@ function updateSelectedLogs(state) {
     if (state.bottomLogLines.has(sk))
         return;
     state.bottomLogLines.set(sk, { action: 'logs', service: entry.service, lines: [] });
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
     moduleState.logFetchTimer = setTimeout(() => {
         moduleState.logFetchTimer = null;
-        startBottomLogTail(state, sk, entry.file, entry.service);
+        startBottomLogTail(state, sk, effectiveFile, entry.service);
     }, 500);
 }
 function startBottomLogTail(state, sk, file, service) {
@@ -384,11 +420,12 @@ function doRebuild(state) {
     const sk = (0, state_1.statusKey)(entry.file, entry.service);
     if (state.rebuilding.has(sk))
         return;
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
     if (state.bottomLogTails.has(sk)) {
         state.bottomLogTails.get(sk).kill('SIGTERM');
         state.bottomLogTails.delete(sk);
     }
-    const child = (0, docker_1.rebuildService)(entry.file, entry.service, { noCache: state.noCache, noDeps: state.noDeps });
+    const child = (0, docker_1.rebuildService)(effectiveFile, entry.service, { noCache: state.noCache, noDeps: state.noDeps });
     state.rebuilding.set(sk, child);
     state.bottomLogLines.set(sk, { action: 'rebuilding', service: entry.service, lines: [] });
     let lineBuf = '';
@@ -432,7 +469,7 @@ function doRebuild(state) {
             if (state.logBuildKey !== sk)
                 info.lines = [];
         }
-        startBottomLogTail(state, sk, entry.file, entry.service);
+        startBottomLogTail(state, sk, effectiveFile, entry.service);
         if (state.mode === state_1.MODE.LIST)
             render(state);
     });
@@ -444,11 +481,12 @@ function doRestart(state) {
     const sk = (0, state_1.statusKey)(entry.file, entry.service);
     if (state.restarting.has(sk) || state.rebuilding.has(sk))
         return;
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
     if (state.bottomLogTails.has(sk)) {
         state.bottomLogTails.get(sk).kill('SIGTERM');
         state.bottomLogTails.delete(sk);
     }
-    const child = (0, docker_1.restartService)(entry.file, entry.service);
+    const child = (0, docker_1.restartService)(effectiveFile, entry.service);
     state.restarting.set(sk, child);
     state.bottomLogLines.set(sk, { action: 'restarting', service: entry.service, lines: [] });
     render(state);
@@ -469,7 +507,7 @@ function doRestart(state) {
             info.action = 'started';
             info.lines = [];
         }
-        startBottomLogTail(state, sk, entry.file, entry.service);
+        startBottomLogTail(state, sk, effectiveFile, entry.service);
         if (state.mode === state_1.MODE.LIST)
             render(state);
     });
@@ -488,7 +526,8 @@ function doStop(state) {
         state.bottomLogTails.get(sk).kill('SIGTERM');
         state.bottomLogTails.delete(sk);
     }
-    const child = (0, docker_1.stopService)(entry.file, entry.service);
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
+    const child = (0, docker_1.stopService)(effectiveFile, entry.service);
     state.stopping.set(sk, child);
     state.bottomLogLines.set(sk, { action: 'stopping', service: entry.service, lines: [] });
     render(state);
@@ -517,7 +556,8 @@ function doStart(state) {
     const st = state.statuses.get(sk);
     if (st && st.state === 'running')
         return;
-    const child = (0, docker_1.startService)(entry.file, entry.service);
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
+    const child = (0, docker_1.startService)(effectiveFile, entry.service);
     state.starting.set(sk, child);
     state.bottomLogLines.set(sk, { action: 'starting', service: entry.service, lines: [] });
     render(state);
@@ -536,11 +576,164 @@ function doStart(state) {
             info.action = 'started';
             info.lines = [];
         }
-        startBottomLogTail(state, sk, entry.file, entry.service);
+        startBottomLogTail(state, sk, effectiveFile, entry.service);
         if (state.mode === state_1.MODE.LIST)
             render(state);
     });
 }
+// --- Worktree Switching ---
+function mapComposeFileToWorktree(composeFile, targetWorktreePath) {
+    const resolved = path_1.default.resolve(composeFile);
+    const dir = path_1.default.dirname(resolved);
+    const gitRoot = (0, docker_1.getGitRoot)(dir);
+    if (!gitRoot)
+        return null;
+    const relPath = path_1.default.relative(gitRoot, resolved);
+    const newFile = path_1.default.join(targetWorktreePath, relPath);
+    try {
+        fs_1.default.accessSync(newFile);
+        return newFile;
+    }
+    catch {
+        return null;
+    }
+}
+function openWorktreePicker(state) {
+    const entry = (0, state_1.selectedEntry)(state);
+    if (!entry)
+        return;
+    const sk = (0, state_1.statusKey)(entry.file, entry.service);
+    if (state.rebuilding.has(sk) || state.restarting.has(sk) || state.stopping.has(sk) || state.starting.has(sk) || state.cascading.has(sk))
+        return;
+    const composeDir = path_1.default.dirname(path_1.default.resolve(entry.file));
+    const worktrees = (0, docker_1.listGitWorktrees)(composeDir);
+    if (worktrees.length <= 1) {
+        state.bottomLogLines.set(sk, { action: 'switch_failed', service: entry.service, lines: ['no other worktrees available — use `git worktree add` to create one'] });
+        state.showBottomLogs = true;
+        render(state);
+        return;
+    }
+    const gitRoot = (0, docker_1.getGitRoot)(composeDir);
+    state.worktreePickerEntries = worktrees;
+    state.worktreePickerActive = true;
+    state.worktreePickerCurrentPath = gitRoot;
+    // Pre-select first non-current worktree
+    const currentIdx = gitRoot ? worktrees.findIndex(w => w.path === gitRoot) : -1;
+    const firstOther = worktrees.findIndex((_, i) => i !== currentIdx);
+    state.worktreePickerCursor = firstOther >= 0 ? firstOther : 0;
+    state.showBottomLogs = true;
+    render(state);
+}
+function doWorktreeSwitch(state, targetWorktree) {
+    const entry = (0, state_1.selectedEntry)(state);
+    if (!entry)
+        return;
+    const service = entry.service;
+    const sk = (0, state_1.statusKey)(entry.file, service);
+    // Close picker
+    state.worktreePickerActive = false;
+    state.worktreePickerEntries = [];
+    state.worktreePickerCursor = 0;
+    // Compute new file from the original group file
+    const newFile = mapComposeFileToWorktree(entry.file, targetWorktree.path);
+    if (!newFile) {
+        state.bottomLogLines.set(sk, {
+            action: 'switch_failed', service,
+            lines: [`compose file not found in worktree "${targetWorktree.branch}" (${targetWorktree.path})`],
+        });
+        render(state);
+        return;
+    }
+    // If target is the same as current effective file, nothing to do
+    const currentEffective = (0, state_1.getEffectiveFile)(state, entry.file, service);
+    if (newFile === currentEffective) {
+        render(state);
+        return;
+    }
+    // Validate service exists in target compose file
+    if (!(0, docker_1.validateServiceInComposeFile)(newFile, service)) {
+        state.bottomLogLines.set(sk, {
+            action: 'switch_failed', service,
+            lines: [`service "${service}" not found in ${path_1.default.basename(newFile)} on branch "${targetWorktree.branch}"`],
+        });
+        render(state);
+        return;
+    }
+    // Show switching progress
+    state.bottomLogLines.set(sk, { action: 'switching', service, lines: [`switching to worktree "${targetWorktree.branch}"...`] });
+    render(state);
+    const performSwitch = () => {
+        // Store the worktree override (or remove if switching back to original)
+        if (newFile === entry.file) {
+            state.worktreeOverrides.delete(sk);
+        }
+        else {
+            state.worktreeOverrides.set(sk, newFile);
+        }
+        // Update bottomLogLines to show rebuild
+        state.bottomLogLines.set(sk, { action: 'switching', service, lines: [`rebuilding in worktree "${targetWorktree.branch}"...`] });
+        // Rebuild in new worktree
+        const child = (0, docker_1.rebuildService)(newFile, service, { noCache: state.noCache, noDeps: state.noDeps });
+        state.rebuilding.set(sk, child);
+        let lineBuf = '';
+        const onData = (data) => {
+            const info = state.bottomLogLines.get(sk);
+            if (!info)
+                return;
+            lineBuf += data.toString();
+            const parts = lineBuf.split(/\r?\n|\r/);
+            lineBuf = parts.pop();
+            const newLines = parts.filter(l => l.trim().length > 0).map(stripAnsi).filter(Boolean);
+            if (newLines.length === 0)
+                return;
+            info.lines.push(...newLines);
+            if (state.mode === state_1.MODE.LIST)
+                throttledRender(state);
+        };
+        child.stdout.on('data', onData);
+        child.stderr.on('data', onData);
+        render(state);
+        child.on('close', (code) => {
+            state.rebuilding.delete(sk);
+            state.containerStatsHistory.delete(sk);
+            state.containerStats.delete(sk);
+            pollStatuses(state);
+            const info = state.bottomLogLines.get(sk);
+            if (code !== 0 && code !== null) {
+                if (info)
+                    info.action = 'build_failed';
+                if (state.mode === state_1.MODE.LIST)
+                    render(state);
+                return;
+            }
+            if (info) {
+                info.action = 'started';
+                info.lines = [];
+            }
+            startBottomLogTail(state, sk, newFile, service);
+            if (state.mode === state_1.MODE.LIST)
+                render(state);
+        });
+    };
+    // If service is running, stop it first (using current effective file)
+    const st = state.statuses.get(sk);
+    if (st && st.state === 'running') {
+        if (state.bottomLogTails.has(sk)) {
+            state.bottomLogTails.get(sk).kill('SIGTERM');
+            state.bottomLogTails.delete(sk);
+        }
+        const stopChild = (0, docker_1.stopService)(currentEffective, service);
+        state.stopping.set(sk, stopChild);
+        render(state);
+        stopChild.on('close', () => {
+            state.stopping.delete(sk);
+            performSwitch();
+        });
+    }
+    else {
+        performSwitch();
+    }
+}
 // --- Watch ---
 function doWatch(state) {
     const entry = (0, state_1.selectedEntry)(state);
@@ -568,7 +761,8 @@ function doWatch(state) {
         render(state);
         return;
     }
-    const child = (0, docker_1.watchService)(entry.file, entry.service);
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
+    const child = (0, docker_1.watchService)(effectiveFile, entry.service);
     state.watching.set(sk, child);
     state.bottomLogLines.set(sk, { action: 'watching', service: entry.service, lines: [] });
     state.showBottomLogs = true;
@@ -666,9 +860,21 @@ function doCascadeRebuild(state) {
     const sk = (0, state_1.statusKey)(entry.file, entry.service);
     if (state.rebuilding.has(sk) || state.cascading.has(sk))
         return;
-    const graph = state.depGraphs.get(entry.file);
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
+    let graph = state.depGraphs.get(effectiveFile);
+    if (!graph) {
+        // Try to parse dep graph for the effective file (may differ from original)
+        try {
+            graph = (0, docker_1.parseDependencyGraph)(effectiveFile);
+            state.depGraphs.set(effectiveFile, graph);
+        }
+        catch {
+            // No graph available, fall back to regular rebuild
+            doRebuild(state);
+            return;
+        }
+    }
     if (!graph) {
-        // No graph available, fall back to regular rebuild
         doRebuild(state);
         return;
     }
@@ -687,7 +893,7 @@ function doCascadeRebuild(state) {
     state.cascading.set(sk, cascade);
     state.bottomLogLines.set(sk, { action: 'cascading', service: entry.service, lines: [] });
     state.showBottomLogs = true;
-    executeCascadeStep(state, entry.file, sk, cascade);
+    executeCascadeStep(state, effectiveFile, sk, cascade);
     render(state);
 }
 function executeCascadeStep(state, file, sk, cascade) {
@@ -947,7 +1153,8 @@ function enterLogs(state) {
     }
     else {
         state.logBuildKey = null;
-        const child = (0, docker_1.tailLogs)(entry.file, entry.service, 200);
+        const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
+        const child = (0, docker_1.tailLogs)(effectiveFile, entry.service, 200);
         state.logChild = child;
         let lineBuf = '';
         const onData = (data) => {
@@ -1013,7 +1220,8 @@ function loadMoreLogHistory(state) {
         nextTail = 'all';
     state.logHistoryLoading = true;
     const snapshotLen = state.logLines.length;
-    const child = (0, docker_1.fetchServiceLogs)(entry.file, entry.service, nextTail);
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
+    const child = (0, docker_1.fetchServiceLogs)(effectiveFile, entry.service, nextTail);
     state.logHistoryChild = child;
     let output = '';
     child.stdout.on('data', (d) => { output += d.toString(); });
@@ -1110,7 +1318,8 @@ function executeBottomSearch(state) {
     state.bottomSearchLoading = true;
     state.bottomSearchTotalMatches = 0;
     render(state);
-    const child = (0, docker_1.fetchServiceLogs)(entry.file, entry.service, 'all');
+    const effectiveFile = (0, state_1.getEffectiveFile)(state, entry.file, entry.service);
+    const child = (0, docker_1.fetchServiceLogs)(effectiveFile, entry.service, 'all');
     state.bottomSearchChild = child;
     let output = '';
     child.stdout.on('data', (d) => { output += d.toString(); });
@@ -1338,6 +1547,34 @@ function handleKeypress(state, key) {
         }
         return;
     }
+    // LIST mode - worktree picker
+    if (state.worktreePickerActive) {
+        if (key === '\x1b') {
+            state.worktreePickerActive = false;
+            state.worktreePickerEntries = [];
+            state.worktreePickerCursor = 0;
+            state.worktreePickerCurrentPath = null;
+            render(state);
+        }
+        else if (key === '\r') {
+            const target = state.worktreePickerEntries[state.worktreePickerCursor];
+            if (target)
+                doWorktreeSwitch(state, target);
+        }
+        else if (key === 'j' || key === '\x1b[B') {
+            state.worktreePickerCursor = Math.min(state.worktreePickerEntries.length - 1, state.worktreePickerCursor + 1);
+            render(state);
+        }
+        else if (key === 'k' || key === '\x1b[A') {
+            state.worktreePickerCursor = Math.max(0, state.worktreePickerCursor - 1);
+            render(state);
+        }
+        else if (key === 'G') {
+            state.worktreePickerCursor = state.worktreePickerEntries.length - 1;
+            render(state);
+        }
+        return;
+    }
     // LIST mode - inline exec input
     if (state.execActive) {
         if (key === '\x1b') {
@@ -1483,6 +1720,9 @@ function handleKeypress(state, key) {
             state.showBottomLogs = !state.showBottomLogs;
             render(state);
             break;
+        case 't':
+            openWorktreePicker(state);
+            break;
         case 'q':
             cleanup(state);
             process.exit(0);
@@ -1536,7 +1776,7 @@ function createInputHandler(state) {
             }
             const ch = buf[0];
             buf = buf.slice(1);
-            if (state.logSearchActive || state.bottomSearchActive || state.mode === state_1.MODE.EXEC || state.execActive) {
+            if (state.logSearchActive || state.bottomSearchActive || state.worktreePickerActive || state.mode === state_1.MODE.EXEC || state.execActive) {
                 handleKeypress(state, ch);
                 continue;
             }
@@ -1636,7 +1876,7 @@ function cleanup(state) {
     if (state.statsTimer) {
         clearInterval(state.statsTimer);
     }
-    process.stdout.write('\x1b[r' + (0, renderer_1.showCursor)() + '\x1b[0m');
+    process.stdout.write('\x1b[r' + (0, renderer_1.showCursor)() + '\x1b[0m\x1b[?1049l');
 }
 // Expose for testing
 function _getModuleState() {
@@ -1647,6 +1887,8 @@ function _setModuleState(ms) {
 }
 // --- Main ---
 function main() {
+    // Enter alternate screen buffer so pre-launch output (e.g. npx install) is hidden
+    process.stdout.write('\x1b[?1049h');
     const config = loadConfig();
     const state = (0, state_1.createState)(config);
     state.groups = discoverServices(config);