fix: avoid finalizing zip early

Author: Hweinstock

packages/core/src/amazonq/util/zipProjectUtil.ts

@@ -23,14 +23,13 @@ interface ZipProjectCustomizations {
     computeSideEffects?: (file: CollectFilesResultItem) => Promise<void> | void
 }
 
-export async function zipProject(
+export async function addToZip(
     repoRootPaths: string[],
     workspaceFolders: CurrentWsFolders,
     collectFilesOptions: CollectFilesOptions,
-    customizations?: ZipProjectCustomizations,
-    options?: ZipProjectOptions
-): Promise<ZippedWorkspaceResult> {
-    const zip = options?.zip ?? new ZipStream()
+    zip: ZipStream,
+    customizations?: ZipProjectCustomizations
+) {
     const files = await collectFiles(repoRootPaths, workspaceFolders, collectFilesOptions)
     const zippedFiles = new Set()
     let totalBytes: number = 0
@@ -74,11 +73,28 @@ export async function zipProject(
         }
     }
 
+    return { zip, totalBytesAdded: totalBytes }
+}
+
+export async function zipProject(
+    repoRootPaths: string[],
+    workspaceFolders: CurrentWsFolders,
+    collectFilesOptions: CollectFilesOptions,
+    customizations?: ZipProjectCustomizations,
+    options?: ZipProjectOptions
+): Promise<ZippedWorkspaceResult> {
+    const { zip, totalBytesAdded } = await addToZip(
+        repoRootPaths,
+        workspaceFolders,
+        collectFilesOptions,
+        options?.zip ?? new ZipStream(),
+        customizations
+    )
     const zipResult = await zip.finalize()
     const zipFileBuffer = zipResult.streamBuffer.getContents() || Buffer.from('')
     return {
         zipFileBuffer,
         zipFileChecksum: zipResult.hash,
-        totalFileBytes: totalBytes,
+        totalFileBytes: totalBytesAdded,
     }
 }

packages/core/src/codewhisperer/util/zipUtil.ts

@@ -30,7 +30,7 @@ import { ProjectZipError } from '../../amazonqTest/error'
 import { removeAnsi } from '../../shared/utilities/textUtilities'
 import { normalize } from '../../shared/utilities/pathUtils'
 import { ZipStream } from '../../shared/utilities/zipStream'
-import { zipProject } from '../../amazonq/util/zipProjectUtil'
+import { addToZip } from '../../amazonq/util/zipProjectUtil'
 
 export interface ZipMetadata {
     rootDir: string
@@ -453,17 +453,11 @@ export class ZipUtil {
             this._totalSize += file.fileSizeBytes
         }
 
-        await zipProject(
-            projectPaths,
-            workspaceFolders,
-            collectFilesOptions,
-            {
-                isExcluded,
-                checkForError,
-                computeSideEffects,
-            },
-            { zip }
-        )
+        await addToZip(projectPaths, workspaceFolders, collectFilesOptions, zip, {
+            isExcluded,
+            checkForError,
+            computeSideEffects,
+        })
     }
 
     protected processOtherFiles(zip: ZipStream, languageCount: Map<CodewhispererLanguage, number>) {