@codeyam/codeyam-cli 0.1.0-staging.8421896 → 0.1.0-staging.8778565

package/codeyam-cli/src/webserver/app/lib/git.js

@@ -0,0 +1,396 @@
+import { execSync } from 'child_process';
+import path from 'path';
+import fs from 'fs';
+import { getProjectRoot as getProjectRootFromState } from "../../../state.js";
+export function getGitStatus(rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    try {
+        // Get git status with porcelain format for easy parsing
+        const output = execSync('git status --porcelain', {
+            cwd: workingDir,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'], // Suppress stderr
+        });
+        return parseGitStatus(output);
+    }
+    catch (error) {
+        console.error('Failed to get git status:', error);
+        return [];
+    }
+}
+function parseGitStatus(output) {
+    const lines = output
+        .trim()
+        .split('\n')
+        .filter((line) => line.length > 0);
+    const results = [];
+    for (const line of lines) {
+        // Git status format: XY filename
+        // X = staged status, Y = unstaged status
+        const staged = line[0];
+        const unstaged = line[1];
+        // Skip the two status characters and any following space
+        let filePath = line.slice(2).replace(/^[ \t]+/, '');
+        // Determine the primary status
+        let status;
+        let isStaged = false;
+        let oldPath;
+        if (staged === 'A' || unstaged === 'A') {
+            status = 'added';
+            isStaged = staged === 'A';
+        }
+        else if (staged === 'M' || unstaged === 'M') {
+            status = 'modified';
+            isStaged = staged === 'M';
+        }
+        else if (staged === 'D' || unstaged === 'D') {
+            status = 'deleted';
+            isStaged = staged === 'D';
+        }
+        else if (staged === 'R' || unstaged === 'R') {
+            status = 'renamed';
+            isStaged = staged === 'R';
+            // For renamed files, git shows: "oldfile.txt -> newfile.txt"
+            // Extract both the old and new filenames
+            const arrowIndex = filePath.indexOf(' -> ');
+            if (arrowIndex !== -1) {
+                oldPath = filePath.slice(0, arrowIndex).trim();
+                filePath = filePath.slice(arrowIndex + 4).trim();
+            }
+        }
+        else if (unstaged === '?') {
+            status = 'untracked';
+            isStaged = false;
+        }
+        else {
+            status = 'modified'; // Default fallback
+            isStaged = staged !== ' ' && staged !== '?';
+        }
+        // If it's a directory (ends with /), expand to show individual files
+        if (filePath.endsWith('/')) {
+            const workingDir = process.env.CODEYAM_ROOT_PATH || process.cwd();
+            const fullDirPath = path.join(workingDir, filePath);
+            try {
+                // Recursively find all files in the directory
+                const findFiles = (dir, baseDir) => {
+                    const entries = fs.readdirSync(dir, { withFileTypes: true });
+                    const files = [];
+                    for (const entry of entries) {
+                        const fullPath = path.join(dir, entry.name);
+                        const relativePath = path.relative(workingDir, fullPath);
+                        if (entry.isDirectory()) {
+                            files.push(...findFiles(fullPath, baseDir));
+                        }
+                        else if (entry.isFile()) {
+                            files.push(relativePath);
+                        }
+                    }
+                    return files;
+                };
+                const filesInDir = findFiles(fullDirPath, workingDir);
+                for (const file of filesInDir) {
+                    results.push({
+                        path: file,
+                        status,
+                        staged: isStaged,
+                        ...(oldPath && { oldPath }),
+                    });
+                }
+            }
+            catch (error) {
+                console.error(`Failed to expand directory ${filePath}:`, error);
+                // If we can't expand the directory, just skip it
+            }
+        }
+        else {
+            results.push({
+                path: filePath,
+                status,
+                staged: isStaged,
+                ...(oldPath && { oldPath }),
+            });
+        }
+    }
+    return results;
+}
+export function getFileModificationTime(filePath, rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    const fullPath = path.join(workingDir, filePath);
+    try {
+        // Get the last commit time for this file
+        const output = execSync(`git log -1 --format=%ci "${filePath}"`, {
+            cwd: workingDir,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        });
+        return new Date(output.trim());
+    }
+    catch (error) {
+        // If git log fails, try to get file system modification time
+        try {
+            const stats = fs.statSync(fullPath);
+            return stats.mtime;
+        }
+        catch (fsError) {
+            console.error(`Failed to get modification time for ${filePath}:`, error);
+            return null;
+        }
+    }
+}
+export function isFileUncommitted(filePath, rootPath) {
+    const gitStatus = getGitStatus(rootPath);
+    return gitStatus.some((file) => file.path === filePath);
+}
+export function getCurrentBranch(rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    try {
+        const output = execSync('git branch --show-current', {
+            cwd: workingDir,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        });
+        return output.trim() || null;
+    }
+    catch (error) {
+        console.error('Failed to get current branch:', error);
+        return null;
+    }
+}
+export function getDefaultBranch(rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    try {
+        // Try to get the default branch from remote
+        const output = execSync('git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null || echo ""', {
+            cwd: workingDir,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        });
+        const match = output.trim().match(/refs\/remotes\/origin\/(.+)/);
+        if (match) {
+            return match[1];
+        }
+        // Fallback: check if main or master exists locally
+        try {
+            execSync('git show-ref --verify --quiet refs/heads/main', {
+                cwd: workingDir,
+                stdio: ['pipe', 'pipe', 'ignore'],
+            });
+            return 'main';
+        }
+        catch {
+            // Try master
+            try {
+                execSync('git show-ref --verify --quiet refs/heads/master', {
+                    cwd: workingDir,
+                    stdio: ['pipe', 'pipe', 'ignore'],
+                });
+                return 'master';
+            }
+            catch {
+                // Default to main
+                return 'main';
+            }
+        }
+    }
+    catch (error) {
+        console.error('Failed to get default branch:', error);
+        return 'main';
+    }
+}
+export function getAllBranches(rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    try {
+        const output = execSync('git branch --format="%(refname:short)"', {
+            cwd: workingDir,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        });
+        return output
+            .trim()
+            .split('\n')
+            .filter((branch) => branch.length > 0);
+    }
+    catch (error) {
+        console.error('Failed to get branches:', error);
+        return [];
+    }
+}
+// Helper functions that use getProjectRoot internally
+// These are safe to call from route loaders
+export function getGitStatusForProject() {
+    const rootPath = getProjectRootFromState();
+    return rootPath ? getGitStatus(rootPath) : [];
+}
+export function getCurrentBranchForProject() {
+    const rootPath = getProjectRootFromState();
+    return rootPath ? getCurrentBranch(rootPath) : null;
+}
+export function getDefaultBranchForProject() {
+    const rootPath = getProjectRootFromState();
+    return rootPath ? getDefaultBranch(rootPath) : 'main';
+}
+export function getAllBranchesForProject() {
+    const rootPath = getProjectRootFromState();
+    return rootPath ? getAllBranches(rootPath) : [];
+}
+export function getBranchDiffForProject(baseBranch, compareBranch) {
+    const rootPath = getProjectRootFromState();
+    return rootPath ? getBranchDiff(baseBranch, compareBranch, rootPath) : [];
+}
+export function getBranchDiff(baseBranch, compareBranch, rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    try {
+        // Use three-dot syntax to get changes in compareBranch since it diverged from baseBranch
+        const output = execSync(`git diff --name-status ${baseBranch}...${compareBranch}`, {
+            cwd: workingDir,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        });
+        const lines = output
+            .trim()
+            .split('\n')
+            .filter((line) => line.length > 0);
+        return lines.map((line) => {
+            const parts = line.split('\t');
+            const statusCode = parts[0];
+            let filePath = parts[1];
+            let oldPath;
+            let status;
+            if (statusCode === 'A') {
+                status = 'added';
+            }
+            else if (statusCode === 'M') {
+                status = 'modified';
+            }
+            else if (statusCode === 'D') {
+                status = 'deleted';
+            }
+            else if (statusCode.startsWith('R')) {
+                status = 'renamed';
+                // For renamed files, git diff --name-status shows: "R100\told/path.ts\tnew/path.ts"
+                // parts[1] is old path, parts[2] is new path
+                oldPath = parts[1];
+                filePath = parts[2];
+            }
+            else {
+                status = 'modified'; // Default fallback
+            }
+            return { path: filePath, status, ...(oldPath && { oldPath }) };
+        });
+    }
+    catch (error) {
+        console.error('Failed to get branch diff:', error);
+        return [];
+    }
+}
+export function getFileDiff(filePath, rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    try {
+        // Get the committed version (HEAD)
+        let oldContent = '';
+        try {
+            oldContent = execSync(`git show HEAD:"${filePath}"`, {
+                cwd: workingDir,
+                encoding: 'utf8',
+                stdio: ['pipe', 'pipe', 'ignore'],
+                maxBuffer: 1024 * 1024 * 10,
+            });
+        }
+        catch {
+            // File might be new
+            oldContent = '';
+        }
+        // Get the current working version
+        let newContent = '';
+        try {
+            newContent = fs.readFileSync(path.join(workingDir, filePath), 'utf8');
+        }
+        catch (error) {
+            // File might be deleted
+            console.error(`Failed to read current file ${filePath}:`, error);
+            newContent = '';
+        }
+        return {
+            oldContent,
+            newContent,
+            fileName: filePath,
+        };
+    }
+    catch (error) {
+        console.error(`Failed to get diff for ${filePath}:`, error);
+        return {
+            oldContent: 'Error loading old content',
+            newContent: 'Error loading new content',
+            fileName: filePath,
+        };
+    }
+}
+export function getFileDiffForProject(filePath) {
+    const rootPath = getProjectRootFromState();
+    if (!rootPath) {
+        return {
+            oldContent: 'Error: No project root',
+            newContent: 'Error: No project root',
+            fileName: filePath,
+        };
+    }
+    return getFileDiff(filePath, rootPath);
+}
+export function getBranchFileDiff(filePath, baseBranch, compareBranch, rootPath) {
+    const workingDir = rootPath || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    try {
+        // Get the file content from base branch
+        let oldContent = '';
+        try {
+            oldContent = execSync(`git show ${baseBranch}:"${filePath}"`, {
+                cwd: workingDir,
+                encoding: 'utf8',
+                stdio: ['pipe', 'pipe', 'ignore'],
+                maxBuffer: 1024 * 1024 * 10,
+            });
+        }
+        catch {
+            // File might not exist in base branch
+            oldContent = '';
+        }
+        // Get the file content from compare branch
+        let newContent = '';
+        try {
+            newContent = execSync(`git show ${compareBranch}:"${filePath}"`, {
+                cwd: workingDir,
+                encoding: 'utf8',
+                stdio: ['pipe', 'pipe', 'ignore'],
+                maxBuffer: 1024 * 1024 * 10,
+            });
+        }
+        catch {
+            // File might not exist in compare branch
+            newContent = '';
+        }
+        return {
+            oldContent,
+            newContent,
+            fileName: filePath,
+        };
+    }
+    catch (error) {
+        console.error(`Failed to get branch diff for ${filePath}:`, error);
+        return {
+            oldContent: 'Error loading old content',
+            newContent: 'Error loading new content',
+            fileName: filePath,
+        };
+    }
+}
+export function getBranchFileDiffForProject(filePath, baseBranch, compareBranch) {
+    const rootPath = getProjectRootFromState();
+    if (!rootPath) {
+        return {
+            oldContent: 'Error: No project root',
+            newContent: 'Error: No project root',
+            fileName: filePath,
+        };
+    }
+    return getBranchFileDiff(filePath, baseBranch, compareBranch, rootPath);
+}
+//# sourceMappingURL=git.js.map

package/codeyam-cli/src/webserver/app/lib/git.js.map

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

package/codeyam-cli/src/webserver/backgroundServer.js

@@ -9,9 +9,18 @@ import { dbNotifier } from "./app/lib/dbNotifier.js";
 import { loadEntities, loadAnalyses, updateProjectMetadata, } from "../../../packages/database/index.js";
 import fs from 'fs';
 import path from 'path';
+import { pruneOldTranscripts } from "../utils/transcriptPruning.js";
 // NOTE: NODE_ENV must be set BEFORE this file is imported (see bootstrap.ts)
 // ES module imports are resolved before any code runs, so React/React-DOM
 // will have already chosen their dev/prod builds by the time we get here.
+// Catch-all error handlers — log before the process dies
+// Must be registered before any async code runs
+process.on('uncaughtException', (error) => {
+    console.error('[FATAL] Uncaught exception:', error);
+});
+process.on('unhandledRejection', (reason) => {
+    console.error('[FATAL] Unhandled rejection:', reason);
+});
 // Set process title for Activity Monitor visibility
 if (process.env.CODEYAM_PROCESS_NAME) {
     process.title = process.env.CODEYAM_PROCESS_NAME;
@@ -33,10 +42,17 @@ try {
 catch (error) {
     console.error('Failed to parse project/branch data:', error);
 }
-console.log(`Starting CodeYam background server on port ${port}...`);
+const isEditorMode = project?.metadata?.editorMode === true;
+const startupTime = Date.now();
+function logStartup(message) {
+    const elapsed = ((Date.now() - startupTime) / 1000).toFixed(1);
+    console.log(`[${elapsed}s] ${message}`);
+}
+logStartup(`Starting CodeYam background server on port ${port}${isEditorMode ? ' (editor mode)' : ''}...`);
 let fileWatcher = null;
 let analysisQueue = null;
 let heartbeatInterval = null;
+let rulesWatcher = null;
 // Memory monitoring - log every minute to track memory usage patterns
 setInterval(() => {
     const mem = process.memoryUsage();
@@ -55,13 +71,17 @@ heartbeatInterval = setInterval(() => {
 }, 60000); // Every 60 seconds
 async function main() {
     // Initialize analysis queue with dbNotifier for real-time UI updates
+    logStartup('Initializing analysis queue...');
     analysisQueue = new AnalysisQueue(rootPath, dbNotifier);
     await analysisQueue.start();
-    console.log('📋 Analysis queue initialized');
+    logStartup('📋 Analysis queue initialized');
     // Existing user migration: if the project has entities with analyses but
     // labs.simulations is undefined, auto-enable simulations to avoid breaking
     // existing users when we change the default from true to false
-    if (project?.slug && project.metadata?.labs?.simulations === undefined) {
+    if (!isEditorMode &&
+        project?.slug &&
+        project.metadata?.labs?.simulations === undefined) {
+        logStartup('🔍 Checking migrations...');
         try {
             const entities = await loadEntities({ excludeMetadata: true });
             if (entities && entities.length > 0) {
@@ -73,7 +93,7 @@ async function main() {
                         projectSlug: project.slug,
                         metadataUpdate: { labs: { simulations: true } },
                     });
-                    console.log('🔄 Migrated existing project: simulations auto-enabled');
+                    logStartup('🔄 Migrated existing project: simulations auto-enabled');
                 }
             }
         }
@@ -81,9 +101,10 @@ async function main() {
             console.warn('⚠️  Failed to run labs migration check:', error);
         }
     }
-    // Start file watcher BEFORE the server if we have project and branch info
-    // This ensures the database is in sync with the filesystem before accepting requests
-    if (project?.id && branch?.id) {
+    // In editor mode (empty folder), skip the file watcher — there are no entities to track.
+    // For regular projects, start the file watcher BEFORE the server so the DB is in sync
+    // with the filesystem before accepting requests.
+    if (!isEditorMode && project?.id && branch?.id) {
         try {
             // Load project config to get pathsToIgnore
             let customIgnorePatterns = [];
@@ -100,42 +121,142 @@ async function main() {
             catch (error) {
                 console.warn('⚠️  Failed to load pathsToIgnore from config:', error);
             }
-            // createFileWatcher now awaits start() which includes initial sync
-            // This replaces the old syncUncommittedEntities call with a more complete sync
-            // that also compares code SHAs and creates new entity versions if needed
-            console.log('🔄 Starting file watcher with initial sync...');
-            fileWatcher = await createFileWatcher({
+            const hasGitRepo = fs.existsSync(path.join(rootPath, '.git'));
+            logStartup(`🔄 Starting file watcher${hasGitRepo ? ' with git' : ' (no git repo)'}...`);
+            // Race the file watcher against a 30s timeout to prevent hanging the startup
+            const watcherPromise = createFileWatcher({
                 projectId: project.id,
                 branchId: branch.id,
                 projectRootPath: rootPath,
-                watchGit: true,
+                watchGit: hasGitRepo,
                 customIgnorePatterns,
             });
-            console.log(`👀 Watching for file changes and git commits in ${rootPath}`);
+            const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve(null), 30000));
+            const result = await Promise.race([watcherPromise, timeoutPromise]);
+            if (result) {
+                fileWatcher = result;
+                logStartup(`👀 File watcher ready — watching ${rootPath}`);
+            }
+            else {
+                console.warn('⚠️  File watcher did not start within 30s, continuing without it');
+                // Still wait for it in the background so it can finish later
+                watcherPromise
+                    .then((w) => {
+                    fileWatcher = w;
+                    console.log('👀 File watcher started (late)');
+                })
+                    .catch((err) => {
+                    console.error('File watcher failed:', err);
+                });
+            }
         }
         catch (error) {
             console.error('Failed to start file watcher:', error);
         }
     }
-    // Start server AFTER file watcher is fully initialized
-    // This ensures /api/health only returns 200 when the system is truly ready
-    const { url } = await startRemixServer({
+    else if (isEditorMode) {
+        logStartup('📝 Editor mode — skipping file watcher');
+    }
+    // Start the Remix HTTP server
+    logStartup('🌐 Starting Remix server...');
+    const { url, server } = await startRemixServer({
         port,
         analysisQueue,
         dbNotifier, // Pass the SAME dbNotifier instance to Remix routes
     });
-    console.log(`✅ CodeYam server running at ${url}`);
+    // Attach WebSocket terminal server for dev mode embedded Claude Code
+    logStartup('Attaching terminal server...');
+    const { attachTerminalServer } = await import('./terminalServer.js');
+    attachTerminalServer(server);
+    logStartup(`✅ CodeYam server running at ${url}`);
+    // Self-check: verify the port is actually accessible
+    // Use 127.0.0.1 instead of localhost to avoid IPv6 resolution issues
+    try {
+        const healthRes = await fetch(`http://127.0.0.1:${port}/api/health`);
+        if (healthRes.ok) {
+            logStartup('✅ Health check self-test passed');
+        }
+        else {
+            console.error(`[STARTUP] Health check self-test returned ${healthRes.status}`);
+        }
+    }
+    catch (err) {
+        console.error('[STARTUP] Health check self-test FAILED — port may not be accessible:', err);
+    }
+    // Clean up agent transcript logs older than 14 days
+    pruneOldTranscripts()
+        .then((count) => {
+        if (count > 0)
+            console.log(`🧹 Pruned ${count} old transcript logs`);
+    })
+        .catch((error) => {
+        console.warn('⚠️  Failed to prune old transcripts:', error);
+    });
+    // Watch .claude/rules/ for changes so the memory page auto-refreshes
+    try {
+        const rulesDir = path.join(rootPath, '.claude', 'rules');
+        fs.mkdirSync(rulesDir, { recursive: true });
+        const { default: chokidar } = await import('chokidar');
+        rulesWatcher = chokidar.watch(rulesDir, {
+            persistent: true,
+            ignoreInitial: true,
+            depth: 5,
+        });
+        rulesWatcher
+            .on('add', () => dbNotifier.notifyChange('rules'))
+            .on('change', () => dbNotifier.notifyChange('rules'))
+            .on('unlink', () => dbNotifier.notifyChange('rules'));
+        console.log(`👀 Watching .claude/rules/ for memory page updates`);
+    }
+    catch (error) {
+        console.warn('⚠️  Failed to start rules watcher:', error);
+    }
 }
 main().catch((error) => {
     console.error('❌ Failed to start CodeYam server:', error);
     process.exit(1);
 });
+// Lazy-loaded cleanup for terminal sessions
+let terminalCleanup = null;
+import('./terminalServer.js')
+    .then((mod) => {
+    terminalCleanup = mod.cleanupAllTerminalSessions;
+})
+    .catch(() => { });
+// Kill the editor dev server process group if it's still running
+function killEditorDevServer() {
+    try {
+        const devServer = globalThis.__codeyam_editor_dev_server__;
+        if (devServer?.process?.pid) {
+            console.log(`[shutdown] Killing editor dev server (PID ${devServer.process.pid})...`);
+            try {
+                process.kill(-devServer.process.pid, 'SIGTERM');
+            }
+            catch {
+                try {
+                    devServer.process.kill('SIGTERM');
+                }
+                catch {
+                    // Already dead
+                }
+            }
+        }
+    }
+    catch {
+        // No dev server running
+    }
+}
 // Handle graceful shutdown
 process.on('SIGTERM', () => {
     console.log('📴 CodeYam server shutting down...');
+    killEditorDevServer();
+    terminalCleanup?.();
     if (fileWatcher) {
         fileWatcher.stop();
     }
+    if (rulesWatcher) {
+        void rulesWatcher.close();
+    }
     if (analysisQueue) {
         analysisQueue.pause();
     }
@@ -146,9 +267,14 @@ process.on('SIGTERM', () => {
 });
 process.on('SIGINT', () => {
     console.log('📴 CodeYam server shutting down...');
+    killEditorDevServer();
+    terminalCleanup?.();
     if (fileWatcher) {
         fileWatcher.stop();
     }
+    if (rulesWatcher) {
+        void rulesWatcher.close();
+    }
     if (analysisQueue) {
         analysisQueue.pause();
     }