@codeyam/codeyam-cli 0.1.0-staging.28f73cf → 0.1.0-staging.323686

package/codeyam-cli/src/utils/database.js

@@ -1,6 +1,7 @@
 import { setupSecrets } from "./secrets.js";
-import { generateSha, loadBranches, loadProject, upsertBranches, upsertCommits, upsertProjects, } from "../../../packages/supabase/index.js";
+import { generateSha, loadBranches, loadProject, upsertBranches, upsertCommits, upsertProjects, } from "../../../packages/database/index.js";
 import { randomUUID } from 'crypto';
+import { execSync } from 'child_process';
 import path from 'path';
 import { getProjectRoot } from "../state.js";
 import { updateCommitBranchesInDb } from "../../../packages/github/index.js";
@@ -152,8 +153,52 @@ export async function ensureLocalBranch(project) {
  */
 export async function createFakeCommit(project, branch, files) {
     await initializeEnvironment();
+    const projectRoot = getProjectRoot();
     // Generate unique commit SHA
     const sha = generateSha(`${project.slug}-local-${Date.now()}-${Math.random()}`);
+    // Generate git diff for each file to support proper change detection
+    const commitFiles = files.map((fileName) => {
+        let patch = '';
+        if (projectRoot) {
+            try {
+                // Get the diff between HEAD and the working copy
+                // This captures both staged and unstaged changes
+                patch = execSync(`git diff HEAD -- "${fileName}"`, {
+                    cwd: projectRoot,
+                    encoding: 'utf8',
+                    stdio: ['pipe', 'pipe', 'ignore'],
+                    maxBuffer: 1024 * 1024 * 10, // 10MB buffer for large diffs
+                });
+                // If no diff from HEAD, check if it's a new untracked file
+                if (!patch) {
+                    // For untracked files, generate a patch showing all lines as additions
+                    try {
+                        const fileContent = execSync(`cat "${fileName}"`, {
+                            cwd: projectRoot,
+                            encoding: 'utf8',
+                            stdio: ['pipe', 'pipe', 'ignore'],
+                        });
+                        if (fileContent) {
+                            const lines = fileContent.split('\n');
+                            patch = `@@ -0,0 +1,${lines.length} @@\n${lines.map((l) => `+${l}`).join('\n')}`;
+                        }
+                    }
+                    catch {
+                        // File might not exist, that's ok
+                    }
+                }
+            }
+            catch {
+                // Git diff failed, leave patch empty
+                // This can happen if the file is new and untracked
+            }
+        }
+        return {
+            fileName,
+            status: 'modified',
+            patch,
+        };
+    });
     const commit = {
         sha,
         projectId: project.id,
@@ -167,11 +212,7 @@ export async function createFakeCommit(project, branch, files) {
         },
         committedAt: new Date().toISOString(),
         parents: [], // No parents for simplicity
-        files: files.map((fileName) => ({
-            fileName,
-            status: 'modified', // Safe default for analysis
-            patch: '', // Empty patch is fine - system doesn't require it
-        })),
+        files: commitFiles,
         metadata: {
             baseline: false,
             receivedAt: new Date().toISOString(),
@@ -191,4 +232,49 @@ export async function createFakeCommit(project, branch, files) {
     });
     return createdCommits[0];
 }
+/**
+ * Create a baseline commit using a real git SHA.
+ *
+ * Unlike createFakeCommit which generates a random SHA, this uses the actual
+ * git HEAD SHA. This makes baselineSha meaningful for debugging and
+ * reproducibility.
+ *
+ * The commit is still marked with local:// URL to indicate it was created
+ * by the CLI (not fetched from GitHub).
+ */
+export async function createBaselineCommit(project, branch, realGitSha) {
+    await initializeEnvironment();
+    const commit = {
+        sha: realGitSha,
+        projectId: project.id,
+        branchId: branch.id,
+        message: `Baseline at ${realGitSha.substring(0, 8)}`,
+        url: `local://codeyam/${project.slug}/${realGitSha}`,
+        htmlUrl: `local://codeyam/${project.slug}/${realGitSha}`,
+        author: {
+            username: 'local-dev',
+            avatarUrl: 'https://github.com/identicons/local-dev.png',
+        },
+        committedAt: new Date().toISOString(),
+        parents: [],
+        files: [], // Baseline doesn't track specific changed files
+        metadata: {
+            baseline: true,
+            receivedAt: new Date().toISOString(),
+        },
+    };
+    const createdCommits = await upsertCommits({
+        projectId: project.id,
+        commits: [commit],
+    });
+    if (!createdCommits || createdCommits.length === 0) {
+        throw new Error('Failed to create baseline commit');
+    }
+    await updateCommitBranchesInDb({
+        projectId: project.id,
+        commit: createdCommits[0],
+        branch,
+    });
+    return createdCommits[0];
+}
 //# sourceMappingURL=database.js.map

package/codeyam-cli/src/utils/database.js.map

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

package/codeyam-cli/src/utils/entityCache.js

@@ -1,4 +1,4 @@
-import { loadEntities, loadAnalyses } from "../../../packages/supabase/index.js";
+import { loadEntities, loadAnalyses } from "../../../packages/database/index.js";
 /**
  * Cache for entities and analyses to reduce database queries and memory usage
  * Features:

package/codeyam-cli/src/utils/entityMetadata.js

@@ -1,5 +1,5 @@
 import { getBatchFileMetadataForAllFiles } from "./fileMetadata.js";
-import { upsertEntities } from "../../../packages/supabase/index.js";
+import { upsertEntities } from "../../../packages/database/index.js";
 /**
  * Populate editedAt and isUncommitted metadata for entities in files
  * This is used during CLI initialization and when detecting changes

package/codeyam-cli/src/utils/entityVersioning.js

@@ -1,4 +1,4 @@
-import { loadEntities } from "../../../packages/supabase/index.js";
+import { loadEntities } from "../../../packages/database/index.js";
 /**
  * Entity states based on commit status and simulation availability
  */

package/codeyam-cli/src/utils/fileWatcher.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import ts from 'typescript';
-import { upsertEntities, upsertEntityBranches, loadEntities, loadProject, deleteEntities, generateSha, loadAnalyses, loadFilePaths, } from "../../../packages/supabase/index.js";
+import { upsertEntities, upsertEntityBranches, loadEntities, loadProject, deleteEntities, generateSha, loadAnalyses, loadFilePaths, } from "../../../packages/database/index.js";
 import { getEntityMetadata, getUncommittedFiles, getEntityLineRange, getFileDiffContext, isEntityUncommittedWithContext, } from "./fileMetadata.js";
 import { ProjectAnalyzer, getAllEntityNodes } from "../../../packages/analyze/index.js";
 import getFilesWithEntitiesFromRepo from "../../../background/src/lib/virtualized/project/getFilesWithEntitiesFromRepo.js";
@@ -9,7 +9,7 @@ import createEntitiesAndSortFiles from "../../../background/src/lib/virtualized/
 import { populateEntityMetadata } from "./entityMetadata.js";
 import { getLatestCommittedVersion, shouldCreateNewVersion, } from "./entityVersioning.js";
 import { deleteAnalysisFiles } from "./cleanupAnalysisFiles.js";
-import { loadProject as loadProjectWithSlug } from "../../../packages/supabase/index.js";
+import { loadProject as loadProjectWithSlug } from "../../../packages/database/index.js";
 import { loadGitignorePatterns, shouldIgnorePath } from "./pathIgnoring.js";
 import { EntityCache } from "./entityCache.js";
 import { FolderBurstDetector } from "./folderBurstDetector.js";

package/codeyam-cli/src/utils/generateReport.js

@@ -4,8 +4,8 @@ import { execSync } from 'child_process';
 import { getVersionInfo } from "./versionInfo.js";
 const CODEYAM_TMP = '/tmp/codeyam';
 const CODEYAM_API_BASE = process.env.CODEYAM_API_BASE || 'https://dev.codeyam.com';
-const MAX_REPORT_SIZE_MB = 200;
-const MAX_REPORT_SIZE_BYTES = MAX_REPORT_SIZE_MB * 1024 * 1024;
+const MAX_BUNDLE_SIZE_MB = 500;
+const MAX_BUNDLE_SIZE_BYTES = MAX_BUNDLE_SIZE_MB * 1024 * 1024;
 function execGit(args, cwd) {
     try {
         return execSync(`git ${args}`, {
@@ -31,6 +31,22 @@ export function formatBytes(bytes) {
 export function getGitUserEmail(projectRoot) {
     return execGit('config user.email', projectRoot);
 }
+/**
+ * Read the debug report from .codeyam/debug-report.md if it exists.
+ * This is the markdown analysis document, distinct from the bundle upload.
+ */
+export function getDebugReport(projectRoot) {
+    const reportPath = path.join(projectRoot, '.codeyam', 'debug-report.md');
+    if (!fs.existsSync(reportPath)) {
+        return null;
+    }
+    try {
+        return fs.readFileSync(reportPath, 'utf8');
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Get recent high-level log entries (CodeYam Log Level 1)
  */
@@ -50,19 +66,156 @@ export function getRecentLogActivity(projectSlug, limit = 20) {
     }
 }
 /**
- * Generate a debug report archive.
- * This is the core logic shared between CLI and webserver.
+ * Check if the server already has a base tarball for this commit
+ */
+async function checkBaseExists(baseSha) {
+    try {
+        const response = await fetch(`${CODEYAM_API_BASE}/api/reports/check-base`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ baseSha }),
+        });
+        if (!response.ok) {
+            // If check fails, assume we need to upload
+            return false;
+        }
+        const { hasBase } = (await response.json());
+        return hasBase;
+    }
+    catch {
+        // Network error - assume we need to upload
+        return false;
+    }
+}
+/**
+ * Generate the base tarball using git archive.
+ * This contains the clean state at HEAD.
+ */
+function generateBase(projectRoot, outputPath) {
+    try {
+        execSync(`git archive HEAD | gzip > "${outputPath}"`, {
+            cwd: projectRoot,
+            stdio: 'pipe',
+            shell: '/bin/bash',
+        });
+    }
+    catch (error) {
+        throw new Error(`Failed to create base archive: ${error.message}`);
+    }
+}
+/**
+ * Generate the delta tarball containing:
+ * - .codeyam/ directory (always)
+ * - tracked.patch (git diff --binary HEAD)
+ * - untracked files
+ * - codeyam-log.txt
+ * - debug-report.md (if exists)
+ * - screenshot.jpg
+ * - meta.json
+ */
+function generateDelta(options) {
+    const { projectRoot, projectSlug, outputPath, metadata, screenshot, onProgress, } = options;
+    const log = onProgress || (() => { });
+    const timestamp = Date.now();
+    const stagingDir = path.join(CODEYAM_TMP, `delta-staging-${timestamp}`);
+    const deltaDir = path.join(stagingDir, 'delta');
+    fs.mkdirSync(deltaDir, { recursive: true });
+    try {
+        // 1. Generate tracked changes patch
+        // Note: execGit().trim() strips the trailing newline, but git patches require it
+        const patchContent = execGit('diff --binary HEAD', projectRoot) || '';
+        fs.writeFileSync(path.join(deltaDir, 'tracked.patch'), patchContent ? patchContent + '\n' : '');
+        // 2. Copy untracked files (respecting .gitignore)
+        const untrackedFiles = execGit('ls-files --others --exclude-standard', projectRoot);
+        if (untrackedFiles) {
+            const untrackedDir = path.join(deltaDir, 'untracked');
+            fs.mkdirSync(untrackedDir, { recursive: true });
+            for (const file of untrackedFiles.split('\n').filter(Boolean)) {
+                const srcPath = path.join(projectRoot, file);
+                const destPath = path.join(untrackedDir, file);
+                if (fs.existsSync(srcPath)) {
+                    const destDir = path.dirname(destPath);
+                    fs.mkdirSync(destDir, { recursive: true });
+                    const stat = fs.statSync(srcPath);
+                    if (stat.isFile()) {
+                        fs.copyFileSync(srcPath, destPath);
+                    }
+                }
+            }
+        }
+        // 3. Copy .codeyam directory (always included in delta)
+        const codeyamDir = path.join(projectRoot, '.codeyam');
+        if (fs.existsSync(codeyamDir)) {
+            const destCodeyamDir = path.join(deltaDir, 'codeyam');
+            fs.cpSync(codeyamDir, destCodeyamDir, { recursive: true });
+        }
+        // 4. Add metadata file
+        fs.writeFileSync(path.join(deltaDir, 'meta.json'), JSON.stringify(metadata, null, 2));
+        // 5. Add log file
+        const logSourcePath = path.join(CODEYAM_TMP, 'local-dev', projectSlug, 'codeyam', 'log.txt');
+        if (fs.existsSync(logSourcePath)) {
+            fs.copyFileSync(logSourcePath, path.join(deltaDir, 'codeyam-log.txt'));
+        }
+        else {
+            fs.writeFileSync(path.join(deltaDir, 'codeyam-log.txt'), '# Log file not found\n');
+        }
+        // 6. Add debug report if exists (from /codeyam:diagnose workflow)
+        const debugReportPath = path.join(projectRoot, '.codeyam', 'debug-report.md');
+        if (fs.existsSync(debugReportPath)) {
+            fs.copyFileSync(debugReportPath, path.join(deltaDir, 'debug-report.md'));
+            log('Debug report included');
+        }
+        // 7. Add screenshot if provided
+        if (screenshot && screenshot.length > 0) {
+            fs.writeFileSync(path.join(deltaDir, 'screenshot.jpg'), screenshot);
+            log(`Screenshot included (${formatBytes(screenshot.length)})`);
+        }
+        // Create the delta tarball
+        try {
+            execSync(`tar -czf "${outputPath}" -C "${stagingDir}" delta`, {
+                stdio: 'pipe',
+            });
+        }
+        catch (tarError) {
+            throw new Error(`tar failed: ${tarError.message}`);
+        }
+    }
+    finally {
+        // Cleanup staging
+        fs.rmSync(stagingDir, { recursive: true, force: true });
+    }
+}
+/**
+ * Generate a debug bundle with base/delta deduplication.
+ * Checks if the server already has the base, and only generates it if needed.
+ *
+ * "Bundle" = the tarball upload (base + delta).
+ * The bundle may contain a "debug report" (markdown analysis) in feedback.debugReport.
  */
-export function generateReportArchive(options) {
-    const { projectRoot, projectSlug, outputPath, feedback, screenshot, onProgress, } = options;
-    const report = onProgress || (() => { });
-    report('Gathering metadata...');
-    const gitSha = execGit('rev-parse HEAD', projectRoot) || 'unknown';
+export async function generateBundleArchive(options) {
+    const { projectRoot, projectSlug, feedback, screenshot, onProgress } = options;
+    const log = onProgress || (() => { });
+    log('Gathering metadata...');
+    // Verify HEAD exists (require at least one commit)
+    const gitSha = execGit('rev-parse HEAD', projectRoot);
+    if (!gitSha) {
+        throw new Error('At least one commit is required to generate a bundle. Please commit your changes first.');
+    }
     const gitBranch = execGit('rev-parse --abbrev-ref HEAD', projectRoot) || 'unknown';
     const gitStatus = execGit('status --porcelain', projectRoot);
     const gitRemoteUrl = execGit('remote get-url origin', projectRoot);
     const isDirty = gitStatus !== null && gitStatus.length > 0;
     const versionInfo = getVersionInfo(projectSlug);
+    // Check for debug report and include in feedback if present
+    const debugReport = getDebugReport(projectRoot);
+    let enrichedFeedback = feedback;
+    if (debugReport) {
+        enrichedFeedback = {
+            ...(feedback || { issueType: 'other', source: 'cli' }),
+            debugReport,
+        };
+        log('Found debug report from /codeyam:diagnose workflow');
+    }
     const metadata = {
         timestamp: new Date().toISOString(),
         projectSlug,
@@ -81,103 +234,76 @@ export function generateReportArchive(options) {
             platform: process.platform,
             arch: process.arch,
         },
-        feedback,
+        feedback: enrichedFeedback,
     };
-    report('Preparing report...');
-    const gitFiles = execGit('ls-files --cached --others --exclude-standard', projectRoot);
-    if (gitFiles === null) {
-        throw new Error('Could not run git ls-files. Is this a git repository?');
-    }
-    // Build file list: git files + .codeyam + .git
-    const fileList = new Set(gitFiles.split('\n').filter(Boolean));
-    fileList.add('.codeyam');
-    fileList.add('.git');
-    // Create staging directory with all files
-    // Structure: report/
-    //   project/     <- actual project files
-    //   report-meta.json
-    //   codeyam-log.txt
-    //   screenshot.jpg
     const timestamp = Date.now();
-    const stagingDir = path.join(CODEYAM_TMP, `report-staging-${timestamp}`);
-    const reportDir = path.join(stagingDir, 'report');
-    const projectDir = path.join(reportDir, 'project');
-    fs.mkdirSync(projectDir, { recursive: true });
-    try {
-        // Copy project files to staging (into project/ subdirectory)
-        for (const file of fileList) {
-            const srcPath = path.join(projectRoot, file);
-            const destPath = path.join(projectDir, file);
-            if (fs.existsSync(srcPath)) {
-                const destDir = path.dirname(destPath);
-                fs.mkdirSync(destDir, { recursive: true });
-                const stat = fs.statSync(srcPath);
-                if (stat.isDirectory()) {
-                    fs.cpSync(srcPath, destPath, { recursive: true });
-                }
-                else {
-                    fs.copyFileSync(srcPath, destPath);
-                }
-            }
-        }
-        // Add metadata file (at report root, alongside project/)
-        fs.writeFileSync(path.join(reportDir, 'report-meta.json'), JSON.stringify(metadata, null, 2));
-        // Add log file (at report root, alongside project/)
-        const logSourcePath = path.join(CODEYAM_TMP, 'local-dev', projectSlug, 'codeyam', 'log.txt');
-        if (fs.existsSync(logSourcePath)) {
-            fs.copyFileSync(logSourcePath, path.join(reportDir, 'codeyam-log.txt'));
-        }
-        else {
-            fs.writeFileSync(path.join(reportDir, 'codeyam-log.txt'), '# Log file not found\n');
-        }
-        // Add screenshot if provided (at report root, alongside project/)
-        if (screenshot && screenshot.length > 0) {
-            fs.writeFileSync(path.join(reportDir, 'screenshot.jpg'), screenshot);
-            report(`Screenshot included (${formatBytes(screenshot.length)})`);
-        }
-        report('Creating archive...');
-        const defaultOutputPath = path.join(CODEYAM_TMP, `report-${projectSlug}-${timestamp}.tar.gz`);
-        const finalOutputPath = outputPath || defaultOutputPath;
-        try {
-            execSync(`tar -czf "${finalOutputPath}" -C "${stagingDir}" report`, {
-                stdio: 'pipe',
-            });
-        }
-        catch (tarError) {
-            throw new Error(`tar failed: ${tarError.message}`);
-        }
-        // Validate size
-        const stats = fs.statSync(finalOutputPath);
-        if (stats.size > MAX_REPORT_SIZE_BYTES) {
-            fs.unlinkSync(finalOutputPath);
-            throw new Error(`Report too large: ${formatBytes(stats.size)} (max: ${MAX_REPORT_SIZE_MB} MB). Try removing large files from the project or adding them to .gitignore`);
-        }
-        return {
-            path: finalOutputPath,
-            metadata,
-            size: stats.size,
-        };
+    const basePath = path.join(CODEYAM_TMP, `base-${gitSha}-${timestamp}.tar.gz`);
+    const deltaPath = path.join(CODEYAM_TMP, `delta-${projectSlug}-${timestamp}.tar.gz`);
+    // Check if server already has this base
+    log('Checking for existing base...');
+    const serverHasBase = await checkBaseExists(gitSha);
+    let baseSize = null;
+    if (!serverHasBase) {
+        log('Generating base archive...');
+        generateBase(projectRoot, basePath);
+        const baseStats = fs.statSync(basePath);
+        baseSize = baseStats.size;
+        log(`Base archive: ${formatBytes(baseSize)}`);
     }
-    finally {
-        // Cleanup staging
-        fs.rmSync(stagingDir, { recursive: true, force: true });
+    else {
+        log('Server already has base, skipping...');
+    }
+    log('Generating delta archive...');
+    generateDelta({
+        projectRoot,
+        projectSlug,
+        outputPath: deltaPath,
+        metadata,
+        screenshot,
+        onProgress,
+    });
+    const deltaStats = fs.statSync(deltaPath);
+    const deltaSize = deltaStats.size;
+    log(`Delta archive: ${formatBytes(deltaSize)}`);
+    // Validate total size
+    const totalSize = (baseSize || 0) + deltaSize;
+    if (totalSize > MAX_BUNDLE_SIZE_BYTES) {
+        // Cleanup
+        if (fs.existsSync(basePath))
+            fs.unlinkSync(basePath);
+        fs.unlinkSync(deltaPath);
+        throw new Error(`Bundle too large: ${formatBytes(totalSize)} (max: ${MAX_BUNDLE_SIZE_MB} MB). Try removing large files from the project or adding them to .gitignore`);
     }
+    return {
+        basePath: serverHasBase ? null : basePath,
+        deltaPath,
+        metadata,
+        baseSha: gitSha,
+        baseSize,
+        deltaSize,
+    };
 }
 /**
- * Upload a report archive to CodeYam servers.
+ * Upload a debug bundle to CodeYam servers.
+ * Uploads base (if provided) and delta in parallel.
  */
-export async function uploadReport(options) {
-    const { archivePath, projectSlug, metadata, onProgress } = options;
-    const report = onProgress || (() => { });
-    const stats = fs.statSync(archivePath);
-    report('Requesting upload URL...');
-    // Request presigned URL
+export async function uploadBundle(options) {
+    const { basePath, deltaPath, projectSlug, metadata, baseSha, deltaSize, onProgress, } = options;
+    const log = onProgress || (() => { });
+    const deltaStats = fs.statSync(deltaPath);
+    const baseStats = basePath ? fs.statSync(basePath) : null;
+    const totalSize = deltaStats.size + (baseStats?.size || 0);
+    log('Requesting upload URLs...');
+    // Request presigned URLs
     const requestResponse = await fetch(`${CODEYAM_API_BASE}/api/reports/request-upload`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
             projectSlug,
-            fileSizeBytes: stats.size,
+            fileSizeBytes: totalSize,
+            baseSha,
+            needsBaseUpload: basePath !== null,
+            deltaSizeBytes: deltaSize,
             metadata: {
                 timestamp: metadata.timestamp,
                 git: metadata.git,
@@ -191,19 +317,35 @@ export async function uploadReport(options) {
         const errorData = (await requestResponse.json());
         throw new Error(errorData.error || `Server returned ${requestResponse.status}`);
     }
-    const { reportId, uploadUrl } = (await requestResponse.json());
-    report('Uploading report...');
-    // Upload to S3
-    const fileBuffer = fs.readFileSync(archivePath);
-    const uploadResponse = await fetch(uploadUrl, {
+    const { reportId, deltaUploadUrl, baseUploadUrl } = (await requestResponse.json());
+    // Upload base and delta in parallel
+    const uploads = [];
+    if (basePath && baseUploadUrl) {
+        log('Uploading base...');
+        const baseBuffer = fs.readFileSync(basePath);
+        uploads.push(fetch(baseUploadUrl, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/gzip' },
+            body: baseBuffer,
+        }).then((response) => {
+            if (!response.ok) {
+                throw new Error(`Base upload failed: ${response.status}`);
+            }
+        }));
+    }
+    log('Uploading delta...');
+    const deltaBuffer = fs.readFileSync(deltaPath);
+    uploads.push(fetch(deltaUploadUrl, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/gzip' },
-        body: fileBuffer,
-    });
-    if (!uploadResponse.ok) {
-        throw new Error(`Upload failed: ${uploadResponse.status}`);
-    }
-    report('Confirming upload...');
+        body: deltaBuffer,
+    }).then((response) => {
+        if (!response.ok) {
+            throw new Error(`Delta upload failed: ${response.status}`);
+        }
+    }));
+    await Promise.all(uploads);
+    log('Confirming upload...');
     // Confirm upload
     const confirmResponse = await fetch(`${CODEYAM_API_BASE}/api/reports/confirm-upload`, {
         method: 'POST',
@@ -214,6 +356,11 @@ export async function uploadReport(options) {
         const errorData = (await confirmResponse.json());
         throw new Error(errorData.error || `Confirm failed: ${confirmResponse.status}`);
     }
-    return { reportId };
+    // Cleanup local files
+    if (basePath && fs.existsSync(basePath)) {
+        fs.unlinkSync(basePath);
+    }
+    fs.unlinkSync(deltaPath);
+    return { bundleId: reportId };
 }
 //# sourceMappingURL=generateReport.js.map