@hexidecibel/companion 0.0.1 → 0.1.1

package/dist/work-group-manager.js

@@ -0,0 +1,610 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkGroupManager = void 0;
+const events_1 = require("events");
+const uuid_1 = require("uuid");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+const child_process_1 = require("child_process");
+const util_1 = require("util");
+const execAsync = (0, util_1.promisify)(child_process_1.exec);
+const STATE_FILE = path.join(os.homedir(), '.companion', 'work-groups.json');
+class WorkGroupManager extends events_1.EventEmitter {
+    groups = new Map();
+    tmux;
+    injector;
+    watcher;
+    monitorInterval = null;
+    constructor(tmux, injector, watcher) {
+        super();
+        this.tmux = tmux;
+        this.injector = injector;
+        this.watcher = watcher;
+        this.loadState();
+        this.startMonitoring();
+        // Listen to watcher events for all sessions (active and non-active)
+        this.watcher.on('status-change', (data) => this.handleStatusChange(data));
+        this.watcher.on('other-session-activity', (data) => this.handleStatusChange(data));
+    }
+    async createWorkGroup(request) {
+        const groupId = (0, uuid_1.v4)();
+        const group = {
+            id: groupId,
+            name: request.name,
+            foremanSessionId: request.foremanSessionId,
+            foremanTmuxSession: request.foremanTmuxSession,
+            status: 'active',
+            workers: [],
+            createdAt: Date.now(),
+            planFile: request.planFile,
+        };
+        // Spawn each worker
+        for (const workerReq of request.workers) {
+            const worker = await this.spawnWorker(request.parentDir, workerReq);
+            group.workers.push(worker);
+        }
+        this.groups.set(groupId, group);
+        this.saveState();
+        this.emitUpdate(group);
+        console.log(`WorkGroupManager: Created group "${group.name}" with ${group.workers.length} workers`);
+        return group;
+    }
+    async spawnWorker(parentDir, request) {
+        const workerId = (0, uuid_1.v4)();
+        const branchName = `parallel/${request.taskSlug}`;
+        const worker = {
+            id: workerId,
+            sessionId: '',
+            tmuxSessionName: '',
+            taskSlug: request.taskSlug,
+            taskDescription: request.taskDescription,
+            branch: branchName,
+            worktreePath: '',
+            status: 'spawning',
+            commits: [],
+            startedAt: Date.now(),
+        };
+        try {
+            // Create git worktree
+            const wtResult = await this.tmux.createWorktree(parentDir, branchName);
+            if (!wtResult.success || !wtResult.worktreePath) {
+                worker.status = 'error';
+                worker.error = wtResult.error || 'Failed to create worktree';
+                return worker;
+            }
+            worker.worktreePath = wtResult.worktreePath;
+            worker.branch = wtResult.branch || branchName;
+            // Create tmux session in the worktree directory
+            const sessionName = this.tmux.generateSessionName(wtResult.worktreePath);
+            const tmuxResult = await this.tmux.createSession(sessionName, wtResult.worktreePath, true);
+            if (!tmuxResult.success) {
+                worker.status = 'error';
+                worker.error = tmuxResult.error || 'Failed to create tmux session';
+                // Clean up worktree on failure
+                await this.tmux.removeWorktree(parentDir, wtResult.worktreePath);
+                return worker;
+            }
+            worker.tmuxSessionName = sessionName;
+            // Derive sessionId from worktree path (same encoding as watcher uses)
+            worker.sessionId = wtResult.worktreePath.replace(/\//g, '-').replace(/^-/, '-');
+            // Wait for Claude CLI to start up
+            await this.waitForCliReady(sessionName);
+            // Inject the worker prompt
+            const prompt = this.buildWorkerPrompt(request);
+            await this.injector.sendInput(prompt, sessionName);
+            worker.status = 'working';
+            // Refresh watcher so it picks up the new session's conversation files
+            await this.watcher.refreshTmuxPaths();
+            console.log(`WorkGroupManager: Spawned worker "${request.taskSlug}" in ${sessionName}`);
+        }
+        catch (err) {
+            worker.status = 'error';
+            worker.error = err instanceof Error ? err.message : String(err);
+            console.error(`WorkGroupManager: Failed to spawn worker "${request.taskSlug}":`, err);
+        }
+        return worker;
+    }
+    buildWorkerPrompt(request) {
+        const fileList = request.files.length > 0
+            ? request.files.map((f) => `- \`${f}\``).join('\n')
+            : '(see plan section below)';
+        return [
+            'You are implementing one item from a parallel work plan. Other items are being',
+            'worked on simultaneously in separate sessions. Stay focused on your task only.',
+            '',
+            `## Task: ${request.taskSlug}`,
+            '',
+            request.planSection,
+            '',
+            '## Scoped Files',
+            fileList,
+            '',
+            '## Rules',
+            '- Only modify files relevant to this task',
+            '- Follow TDD: write tests first, then implement, then refactor',
+            '- Run type check when done (npx tsc --noEmit or equivalent)',
+            '- Commit with a descriptive message when done (do NOT push)',
+            '- If you need clarification, ask — someone is monitoring',
+            '- When finished, your final message should start with "TASK COMPLETE:"',
+            '  followed by a summary of what was done and commit SHAs',
+        ].join('\n');
+    }
+    async waitForCliReady(sessionName, maxWaitMs = 15000) {
+        const startTime = Date.now();
+        while (Date.now() - startTime < maxWaitMs) {
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+            const output = await this.tmux.capturePane(sessionName, 20);
+            // Look for common Claude CLI ready indicators
+            if (output.includes('claude') &&
+                (output.includes('>') || output.includes('$') || output.includes('What'))) {
+                console.log(`WorkGroupManager: CLI ready in ${sessionName} after ${Date.now() - startTime}ms`);
+                return;
+            }
+        }
+        console.log(`WorkGroupManager: CLI wait timeout in ${sessionName}, proceeding anyway`);
+    }
+    handleStatusChange(data) {
+        if (!data.sessionId)
+            return;
+        for (const group of this.groups.values()) {
+            if (group.status !== 'active')
+                continue;
+            for (const worker of group.workers) {
+                if (worker.sessionId !== data.sessionId && worker.tmuxSessionName !== data.sessionId)
+                    continue;
+                if (worker.status === 'completed' || worker.status === 'error')
+                    continue;
+                // Update activity
+                if (data.currentActivity) {
+                    worker.lastActivity = data.currentActivity;
+                }
+                // Check for completion
+                if (data.isWaitingForInput && data.lastMessage?.content) {
+                    const content = data.lastMessage.content;
+                    if (content.startsWith('TASK COMPLETE:') || content.includes('TASK COMPLETE:')) {
+                        worker.status = 'completed';
+                        worker.completedAt = Date.now();
+                        this.detectCommits(worker);
+                        this.saveState();
+                        this.emitUpdate(group);
+                        this.checkGroupCompletion(group);
+                        console.log(`WorkGroupManager: Worker "${worker.taskSlug}" completed`);
+                        return;
+                    }
+                    // Worker is waiting for input (question from Claude)
+                    worker.status = 'waiting';
+                    worker.lastQuestion = this.extractQuestion(content);
+                    this.saveState();
+                    this.emitUpdate(group);
+                    this.emit('worker-waiting', { groupName: group.name, worker });
+                    return;
+                }
+                // Worker is actively working
+                if (!data.isWaitingForInput && worker.status === 'waiting') {
+                    worker.status = 'working';
+                    worker.lastQuestion = undefined;
+                    this.saveState();
+                    this.emitUpdate(group);
+                }
+            }
+        }
+    }
+    extractQuestion(content) {
+        // Try to extract question text and options from the message
+        const lines = content.split('\n').filter((l) => l.trim());
+        const text = lines[0] || content.substring(0, 200);
+        // Look for numbered or bulleted options
+        const options = [];
+        for (const line of lines.slice(1)) {
+            const match = line.match(/^\s*(?:\d+[.)]\s*|[-*]\s+)(.+)/);
+            if (match) {
+                options.push({ label: match[1].trim() });
+            }
+        }
+        return {
+            text,
+            options: options.length > 0 ? options : undefined,
+            timestamp: Date.now(),
+        };
+    }
+    async detectCommits(worker) {
+        if (!worker.worktreePath)
+            return;
+        try {
+            // Get commits on this branch that aren't on the base branch
+            const { stdout } = await execAsync('git log --oneline --format="%H" HEAD ^main 2>/dev/null || git log --oneline --format="%H" HEAD ^master 2>/dev/null || true', { cwd: worker.worktreePath });
+            worker.commits = stdout
+                .trim()
+                .split('\n')
+                .filter((l) => l.length > 0);
+        }
+        catch {
+            // Ignore errors
+        }
+    }
+    checkGroupCompletion(group) {
+        const allDone = group.workers.every((w) => w.status === 'completed' || w.status === 'error');
+        if (allDone) {
+            console.log(`WorkGroupManager: All workers in group "${group.name}" have finished`);
+            this.emit('group-ready-to-merge', { groupId: group.id, name: group.name });
+        }
+    }
+    async dismissWorkGroup(groupId) {
+        const group = this.groups.get(groupId);
+        if (!group)
+            return { success: false };
+        if (group.status === 'completed' || group.status === 'cancelled' || group.status === 'failed') {
+            this.groups.delete(groupId);
+            this.saveState();
+            this.emitUpdate(group);
+            return { success: true };
+        }
+        return { success: false };
+    }
+    getWorkGroups() {
+        return Array.from(this.groups.values());
+    }
+    getWorkGroup(id) {
+        return this.groups.get(id);
+    }
+    getWorkGroupForSession(sessionId) {
+        for (const group of this.groups.values()) {
+            if (group.foremanSessionId === sessionId)
+                return group;
+            for (const worker of group.workers) {
+                if (worker.sessionId === sessionId)
+                    return group;
+            }
+        }
+        return undefined;
+    }
+    async mergeWorkGroup(groupId) {
+        const group = this.groups.get(groupId);
+        if (!group) {
+            return { success: false, error: 'Work group not found' };
+        }
+        const completedWorkers = group.workers.filter((w) => w.status === 'completed');
+        if (completedWorkers.length === 0) {
+            return { success: false, error: 'No completed workers to merge' };
+        }
+        group.status = 'merging';
+        this.saveState();
+        this.emitUpdate(group);
+        // Find the main repo directory from a worker's worktree
+        const firstWorker = group.workers[0];
+        let mainRepoDir;
+        try {
+            const { stdout } = await execAsync('git rev-parse --show-toplevel', {
+                cwd: firstWorker.worktreePath,
+            });
+            // The worktree's toplevel IS the worktree. We need the main repo.
+            // Read the .git file in the worktree to find it.
+            const gitFile = path.join(firstWorker.worktreePath, '.git');
+            if (fs.existsSync(gitFile) && fs.statSync(gitFile).isFile()) {
+                const gitContent = fs.readFileSync(gitFile, 'utf-8').trim();
+                const match = gitContent.match(/gitdir:\s*(.+)/);
+                if (match) {
+                    // gitdir points to .git/worktrees/<name> — go up 3 levels
+                    mainRepoDir = path.resolve(path.dirname(match[1]), '..', '..');
+                }
+                else {
+                    mainRepoDir = stdout.trim();
+                }
+            }
+            else {
+                mainRepoDir = stdout.trim();
+            }
+        }
+        catch (err) {
+            group.status = 'failed';
+            group.error = 'Could not determine main repo directory';
+            this.saveState();
+            this.emitUpdate(group);
+            return { success: false, error: group.error };
+        }
+        // Try octopus merge of completed branches
+        const branches = completedWorkers.map((w) => w.branch);
+        const branchArgs = branches.join(' ');
+        try {
+            // Ensure we're on the right branch in the main repo
+            await execAsync('git checkout main 2>/dev/null || git checkout master', { cwd: mainRepoDir });
+            // Try the merge
+            await execAsync(`git merge ${branchArgs} --no-edit`, {
+                cwd: mainRepoDir,
+            });
+            // Get the merge commit SHA
+            const { stdout: sha } = await execAsync('git rev-parse HEAD', { cwd: mainRepoDir });
+            group.mergeCommit = sha.trim();
+            group.status = 'completed';
+            group.completedAt = Date.now();
+            // Clean up worktrees and branches for completed workers
+            for (const worker of completedWorkers) {
+                await this.cleanupWorker(mainRepoDir, worker, true);
+            }
+            this.saveState();
+            this.emitUpdate(group);
+            console.log(`WorkGroupManager: Merged group "${group.name}" → ${group.mergeCommit}`);
+            return { success: true, mergeCommit: group.mergeCommit };
+        }
+        catch (err) {
+            // Merge conflict — abort and report
+            try {
+                await execAsync('git merge --abort', { cwd: mainRepoDir });
+            }
+            catch {
+                // Ignore abort errors
+            }
+            // Determine which files conflict
+            const conflicts = [];
+            try {
+                const { stdout: statusOutput } = await execAsync('git diff --name-only --diff-filter=U 2>/dev/null || true', { cwd: mainRepoDir });
+                conflicts.push(...statusOutput
+                    .trim()
+                    .split('\n')
+                    .filter((l) => l.length > 0));
+            }
+            catch {
+                // Ignore
+            }
+            group.status = 'active'; // Revert to active so user can retry
+            group.error = `Merge conflict in: ${conflicts.join(', ') || 'unknown files'}`;
+            this.saveState();
+            this.emitUpdate(group);
+            return { success: false, conflicts, error: group.error };
+        }
+    }
+    async cancelWorkGroup(groupId) {
+        const group = this.groups.get(groupId);
+        if (!group) {
+            return { success: false, error: 'Work group not found' };
+        }
+        // Find main repo dir for worktree cleanup
+        let mainRepoDir = null;
+        for (const worker of group.workers) {
+            if (worker.worktreePath) {
+                try {
+                    const gitFile = path.join(worker.worktreePath, '.git');
+                    if (fs.existsSync(gitFile) && fs.statSync(gitFile).isFile()) {
+                        const gitContent = fs.readFileSync(gitFile, 'utf-8').trim();
+                        const match = gitContent.match(/gitdir:\s*(.+)/);
+                        if (match) {
+                            mainRepoDir = path.resolve(path.dirname(match[1]), '..', '..');
+                            break;
+                        }
+                    }
+                }
+                catch {
+                    // Continue
+                }
+            }
+        }
+        // Kill all worker sessions and clean up worktrees
+        for (const worker of group.workers) {
+            if (worker.tmuxSessionName) {
+                await this.tmux.killSession(worker.tmuxSessionName);
+            }
+            if (mainRepoDir) {
+                await this.cleanupWorker(mainRepoDir, worker, true);
+            }
+        }
+        group.status = 'cancelled';
+        group.completedAt = Date.now();
+        this.saveState();
+        this.emitUpdate(group);
+        console.log(`WorkGroupManager: Cancelled group "${group.name}"`);
+        return { success: true };
+    }
+    async retryWorker(groupId, workerId) {
+        const group = this.groups.get(groupId);
+        if (!group)
+            return { success: false, error: 'Work group not found' };
+        const workerIndex = group.workers.findIndex((w) => w.id === workerId);
+        if (workerIndex < 0)
+            return { success: false, error: 'Worker not found' };
+        const oldWorker = group.workers[workerIndex];
+        if (oldWorker.status !== 'error')
+            return { success: false, error: 'Worker is not in error state' };
+        // Clean up old worker
+        if (oldWorker.tmuxSessionName) {
+            await this.tmux.killSession(oldWorker.tmuxSessionName);
+        }
+        // Find parent dir from another worker or from the foreman
+        let parentDir = null;
+        for (const w of group.workers) {
+            if (w.worktreePath && w.id !== workerId) {
+                try {
+                    const gitFile = path.join(w.worktreePath, '.git');
+                    if (fs.existsSync(gitFile)) {
+                        const content = fs.readFileSync(gitFile, 'utf-8').trim();
+                        const match = content.match(/gitdir:\s*(.+)/);
+                        if (match) {
+                            parentDir = path.resolve(path.dirname(match[1]), '..', '..');
+                            break;
+                        }
+                    }
+                }
+                catch {
+                    // Continue
+                }
+            }
+        }
+        if (!parentDir) {
+            return { success: false, error: 'Cannot determine parent repo directory' };
+        }
+        // Clean up old worktree if it exists
+        if (oldWorker.worktreePath) {
+            await this.tmux.removeWorktree(parentDir, oldWorker.worktreePath);
+        }
+        // Re-spawn
+        const newWorker = await this.spawnWorker(parentDir, {
+            taskSlug: oldWorker.taskSlug,
+            taskDescription: oldWorker.taskDescription,
+            planSection: '', // We don't have the original plan section; it was injected at creation
+            files: [],
+        });
+        group.workers[workerIndex] = newWorker;
+        this.saveState();
+        this.emitUpdate(group);
+        return { success: true };
+    }
+    async sendWorkerInput(groupId, workerId, text) {
+        const group = this.groups.get(groupId);
+        if (!group)
+            return { success: false, error: 'Work group not found' };
+        const worker = group.workers.find((w) => w.id === workerId);
+        if (!worker)
+            return { success: false, error: 'Worker not found' };
+        if (!worker.tmuxSessionName)
+            return { success: false, error: 'Worker has no tmux session' };
+        const success = await this.injector.sendInput(text, worker.tmuxSessionName);
+        if (success) {
+            worker.status = 'working';
+            worker.lastQuestion = undefined;
+            this.saveState();
+            this.emitUpdate(group);
+        }
+        return { success };
+    }
+    async cleanupWorker(mainRepoDir, worker, deleteBranch = false) {
+        // Kill tmux session
+        if (worker.tmuxSessionName) {
+            try {
+                await this.tmux.killSession(worker.tmuxSessionName);
+            }
+            catch {
+                // Ignore
+            }
+        }
+        // Remove worktree
+        if (worker.worktreePath) {
+            try {
+                await this.tmux.removeWorktree(mainRepoDir, worker.worktreePath);
+            }
+            catch {
+                // Ignore
+            }
+        }
+        // Delete the branch (best-effort)
+        if (deleteBranch && worker.branch) {
+            try {
+                await execAsync(`git branch -D "${worker.branch}"`, { cwd: mainRepoDir });
+            }
+            catch {
+                // Branch may already be gone
+            }
+        }
+    }
+    startMonitoring() {
+        // Poll every 5 seconds to check for stale workers and update status
+        this.monitorInterval = setInterval(() => this.monitor(), 5000);
+    }
+    async monitor() {
+        for (const group of this.groups.values()) {
+            if (group.status !== 'active')
+                continue;
+            let changed = false;
+            for (const worker of group.workers) {
+                if (worker.status === 'completed' || worker.status === 'error')
+                    continue;
+                // Check if tmux session is still alive
+                if (worker.tmuxSessionName) {
+                    const exists = await this.tmux.sessionExists(worker.tmuxSessionName);
+                    if (!exists && worker.status !== 'spawning') {
+                        worker.status = 'error';
+                        worker.error = 'Tmux session disappeared';
+                        changed = true;
+                        this.emit('worker-error', { groupName: group.name, worker });
+                    }
+                }
+                // Check for worker status via watcher
+                if (worker.sessionId) {
+                    const status = this.watcher.getStatus(worker.sessionId);
+                    if (status.currentActivity && status.currentActivity !== worker.lastActivity) {
+                        worker.lastActivity = status.currentActivity;
+                        changed = true;
+                    }
+                }
+            }
+            if (changed) {
+                this.saveState();
+                this.emitUpdate(group);
+                this.checkGroupCompletion(group);
+            }
+        }
+    }
+    emitUpdate(group) {
+        this.emit('work-group-update', group);
+    }
+    loadState() {
+        try {
+            if (fs.existsSync(STATE_FILE)) {
+                const content = fs.readFileSync(STATE_FILE, 'utf-8');
+                const groups = JSON.parse(content);
+                for (const group of groups) {
+                    // Only restore active/merging groups — completed/cancelled ones are historical
+                    this.groups.set(group.id, group);
+                }
+                console.log(`WorkGroupManager: Loaded ${groups.length} work groups from disk`);
+            }
+        }
+        catch (err) {
+            console.error('WorkGroupManager: Failed to load state:', err);
+        }
+    }
+    saveState() {
+        try {
+            const dir = path.dirname(STATE_FILE);
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, { recursive: true });
+            }
+            const groups = Array.from(this.groups.values());
+            fs.writeFileSync(STATE_FILE, JSON.stringify(groups, null, 2));
+        }
+        catch (err) {
+            console.error('WorkGroupManager: Failed to save state:', err);
+        }
+    }
+    stop() {
+        if (this.monitorInterval) {
+            clearInterval(this.monitorInterval);
+            this.monitorInterval = null;
+        }
+        this.saveState();
+    }
+}
+exports.WorkGroupManager = WorkGroupManager;
+//# sourceMappingURL=work-group-manager.js.map

package/dist/work-group-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"work-group-manager.js","sourceRoot":"","sources":["../src/work-group-manager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hexidecibel/companion",
-  "version": "0.0.1",
+  "version": "0.1.1",
   "description": "Server daemon for Companion - watches coding sessions and serves data to mobile app",
   "main": "dist/index.js",
   "bin": {