@gajae-code/coding-agent 0.18.11 → 0.19.0

package/src/tools/archive-reader.ts

@@ -1,5 +1,26 @@
+import { gunzipSync } from "node:zlib";
 import { ToolError } from "./tool-errors";
 
+const MAX_ARCHIVE_BYTES = 256 * 1024 * 1024;
+const MAX_ARCHIVE_ENTRY_BYTES = 16 * 1024 * 1024;
+const MAX_ARCHIVE_TOTAL_BYTES = 64 * 1024 * 1024;
+const MAX_ARCHIVE_ENTRY_COUNT = 8192;
+const MAX_ARCHIVE_PATH_DEPTH = 48;
+// Round each 512-byte header plus up to 511 bytes of data padding to 1 KiB per entry.
+const MAX_TAR_CONTAINER_BYTES = MAX_ARCHIVE_TOTAL_BYTES + MAX_ARCHIVE_ENTRY_COUNT * 1024 + 1024;
+const MAX_GZIP_LAYERS = 24;
+const ZIP_LOCAL_FILE_HEADER_SIGNATURE = 0x04034b50;
+const ZIP_CENTRAL_DIRECTORY_SIGNATURE = 0x02014b50;
+const ZIP_END_OF_CENTRAL_DIRECTORY_SIGNATURE = 0x06054b50;
+const ZIP64_END_OF_CENTRAL_DIRECTORY_SIGNATURE = 0x06064b50;
+const ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIGNATURE = 0x07064b50;
+const ZIP_DATA_DESCRIPTOR_SIGNATURE = 0x08074b50;
+const ZIP_CENTRAL_DIRECTORY_DIGITAL_SIGNATURE = 0x05054b50;
+const ZIP_UINT16_MAX = 0xffff;
+const ZIP_UINT32_MAX = 0xffff_ffff;
+// fflate inflates a pushed chunk before invoking ondata, so keep each input chunk small.
+const ZIP_INFLATE_CHUNK_BYTES = 512;
+
 let fflateModulePromise: Promise<typeof import("fflate")> | undefined;
 async function loadFflate(): Promise<typeof import("fflate")> {
 	if (!fflateModulePromise) fflateModulePromise = import("fflate");
@@ -75,6 +96,43 @@ function isArchiveDirectoryName(rawPath: string): boolean {
 	return rawPath.endsWith("/") || rawPath.endsWith("\\");
 }
 
+function archiveEntryDepth(rawPath: string): number {
+	const normalized = normalizeArchiveEntryPath(rawPath);
+	if (!normalized) return 0;
+	return normalized.split("/").length;
+}
+function concatBytes(chunks: Uint8Array[], total: number): Uint8Array {
+	const out = new Uint8Array(total);
+	let offset = 0;
+	for (const chunk of chunks) {
+		out.set(chunk, offset);
+		offset += chunk.byteLength;
+	}
+	return out;
+}
+
+function archiveLimitError(kind: "entry" | "total" | "count" | "depth", detail = ""): ToolError {
+	const preview = detail.length > 120 ? `${detail.slice(0, 119)}…` : detail;
+	switch (kind) {
+		case "count":
+			return new ToolError(
+				`Archive has too many entries (limit ${MAX_ARCHIVE_ENTRY_COUNT}). Extract a subset with a dedicated tool.`,
+			);
+		case "total":
+			return new ToolError(
+				`Archive expands past the total limit (${MAX_ARCHIVE_TOTAL_BYTES} bytes). Extract a subset with a dedicated tool.`,
+			);
+		case "depth":
+			return new ToolError(
+				`Archive entry '${preview}' is nested too deeply (limit ${MAX_ARCHIVE_PATH_DEPTH}). Extract a subset with a dedicated tool.`,
+			);
+		case "entry":
+			return new ToolError(
+				`Archive entry '${preview}' expands past the per-entry limit (${MAX_ARCHIVE_ENTRY_BYTES} bytes). Extract a subset with a dedicated tool.`,
+			);
+	}
+}
+
 function upsertArchiveEntry(map: Map<string, ArchiveIndexEntry>, entry: ArchiveIndexEntry): void {
 	const existing = map.get(entry.path);
 	if (!existing) {
@@ -123,70 +181,626 @@ function getArchiveFormatFromPath(filePath: string): ArchiveFormat | undefined {
 	return undefined;
 }
 
-async function readTarEntries(bytes: Uint8Array): Promise<ArchiveIndexEntry[]> {
-	let archive: Bun.Archive;
+function gunzipBounded(bytes: Uint8Array, maxOutputLength: number): Uint8Array {
 	try {
-		archive = new Bun.Archive(bytes);
+		return gunzipSync(bytes, { maxOutputLength });
 	} catch (error) {
+		const code = typeof error === "object" && error !== null && "code" in error ? String(error.code) : "";
+		if (code === "ERR_BUFFER_TOO_LARGE") throw archiveLimitError("total");
 		throw new ToolError(error instanceof Error ? error.message : String(error));
 	}
+}
 
-	let files: Map<string, File>;
-	try {
-		files = await archive.files();
-	} catch (error) {
-		throw new ToolError(error instanceof Error ? error.message : String(error));
+function isGzipBytes(bytes: Uint8Array): boolean {
+	return bytes.byteLength >= 3 && bytes[0] === 0x1f && bytes[1] === 0x8b;
+}
+
+function inflateToTar(bytes: Uint8Array, labeledGzip: boolean): Uint8Array {
+	let payload = bytes;
+	let layers = 0;
+	let totalInflatedBytes = 0;
+	let sawGzip = labeledGzip || isGzipBytes(payload);
+	while (sawGzip) {
+		layers += 1;
+		if (layers > MAX_GZIP_LAYERS) throw archiveLimitError("total");
+		const remaining = MAX_TAR_CONTAINER_BYTES - totalInflatedBytes;
+		if (remaining <= 0) throw archiveLimitError("total");
+		payload = gunzipBounded(payload, remaining);
+		totalInflatedBytes += payload.byteLength;
+		sawGzip = isGzipBytes(payload);
+	}
+	return payload;
+}
+
+function tarText(header: Uint8Array, start: number, length: number): string {
+	let end = start;
+	const stop = start + length;
+	while (end < stop && header[end] !== 0) end += 1;
+	return new TextDecoder().decode(header.subarray(start, end));
+}
+
+function tarOctal(header: Uint8Array, start: number, length: number): number {
+	const text = tarText(header, start, length).trim();
+	if (!text) return 0;
+	if (!/^[0-7]+$/.test(text)) return Number.NaN;
+	return Number.parseInt(text, 8);
+}
+
+function tarEntryName(header: Uint8Array): string {
+	const name = tarText(header, 0, 100);
+	const prefix = tarText(header, 257, 5) === "ustar" ? tarText(header, 345, 155) : "";
+	return prefix ? `${prefix}/${name}` : name;
+}
+
+type PaxOverrides = { path?: string | null; size?: number | null };
+
+function paxOverrides(data: Uint8Array, global = false): PaxOverrides {
+	const out: PaxOverrides = {};
+	const raw = Buffer.from(data).toString("latin1");
+	for (let index = 0; index < raw.length; ) {
+		const space = raw.indexOf(" ", index);
+		const token = space < 0 ? "" : raw.slice(index, space);
+		const length = /^\d+$/.test(token) ? Number(token) : 0;
+		const end = index + length;
+		const eq = space < 0 ? -1 : raw.indexOf("=", space);
+		if (length < 1 || !Number.isSafeInteger(length) || end > raw.length)
+			throw new ToolError("Unsupported tar pax header");
+		if (space >= end || eq < 0 || eq >= end || raw[end - 1] !== "\n")
+			throw new ToolError("Unsupported tar pax header");
+		const key = raw.slice(space + 1, eq);
+		const value = new TextDecoder().decode(data.subarray(eq + 1, end - 1));
+		if (key === "path") out.path = global && value === "" ? null : value;
+		else if (key === "size" && global && value === "") out.size = null;
+		else if (key === "size" && /^\d+$/.test(value) && Number.isSafeInteger(Number(value))) out.size = Number(value);
+		else if (key === "size") throw new ToolError("Unsupported tar size encoding");
+		index = end;
 	}
+	return out;
+}
 
+async function readTarEntries(bytes: Uint8Array, labeledGzip: boolean): Promise<ArchiveIndexEntry[]> {
+	const payload = inflateToTar(bytes, labeledGzip);
+	if (payload.byteLength > MAX_TAR_CONTAINER_BYTES) throw archiveLimitError("total");
 	const entries: ArchiveIndexEntry[] = [];
-	for (const [rawPath, file] of files) {
-		const normalizedPath = normalizeArchiveEntryPath(rawPath);
-		if (!normalizedPath) continue;
-		const mtimeMs = file.lastModified > 0 ? file.lastModified : undefined;
+	let entryCount = 0;
+	let memberBytes = 0;
+	let offset = 0;
+	let longName: string | undefined;
+	let pendingPax: PaxOverrides | undefined;
+	const globalPax: { path?: string; size?: number } = {};
+	while (offset + 512 <= payload.byteLength) {
+		const header = payload.subarray(offset, offset + 512);
+		if (header.every(byte => byte === 0)) break;
+		const headerSize = tarOctal(header, 124, 12);
+		if (!Number.isSafeInteger(headerSize) || headerSize < 0) throw new ToolError("Unsupported tar size encoding");
+		const typeFlag = header[156] ?? 0;
+		const headerName = tarEntryName(header);
+		let size = headerSize;
+		let rawName = typeFlag === 76 ? headerName : (longName ?? headerName);
+		if (typeFlag !== 120 && typeFlag !== 103 && typeFlag !== 76) {
+			rawName = pendingPax?.path ?? globalPax.path ?? rawName;
+			size = pendingPax?.size ?? globalPax.size ?? size;
+			pendingPax = undefined;
+		}
+		entryCount += 1;
+		if (entryCount > MAX_ARCHIVE_ENTRY_COUNT) throw archiveLimitError("count");
+		if (typeFlag < 100 && archiveEntryDepth(rawName) > MAX_ARCHIVE_PATH_DEPTH)
+			throw archiveLimitError("depth", rawName);
+		if (size > MAX_ARCHIVE_TOTAL_BYTES) throw archiveLimitError("total");
+		if (size > MAX_ARCHIVE_ENTRY_BYTES) throw archiveLimitError("entry", rawName);
+		const isRegular = typeFlag === 0 || typeFlag === 48;
+		if (isRegular) {
+			memberBytes += size;
+			if (memberBytes > MAX_ARCHIVE_TOTAL_BYTES) throw archiveLimitError("total");
+		}
+		const dataEnd = offset + 512 + size;
+		if (dataEnd > payload.byteLength) throw new ToolError("Truncated tar entry");
+		const data = payload.subarray(offset + 512, dataEnd);
+		offset += 512 + Math.ceil(size / 512) * 512;
+		if (typeFlag === 120 || typeFlag === 103) {
+			if (typeFlag === 103) {
+				const overrides = paxOverrides(data, true);
+				if (overrides.path === null) delete globalPax.path;
+				else if (overrides.path !== undefined) globalPax.path = overrides.path;
+				if (overrides.size === null) delete globalPax.size;
+				else if (overrides.size !== undefined) globalPax.size = overrides.size;
+			} else pendingPax = paxOverrides(data);
+			continue;
+		}
+		if (typeFlag === 76) {
+			longName = new TextDecoder().decode(data).replace(/\0+$/, "");
+			continue;
+		}
+		longName = undefined;
+		const normalizedPath = normalizeArchiveEntryPath(rawName);
+		if (!normalizedPath || !isRegular) continue;
+		const mtime = tarOctal(header, 136, 12);
+		const mtimeMs = Number.isFinite(mtime) && mtime > 0 ? mtime * 1000 : undefined;
 		entries.push({
 			path: normalizedPath,
 			isDirectory: false,
-			size: file.size,
+			size,
 			mtimeMs,
-			storage: { type: "tar", file },
+			storage: {
+				type: "tar",
+				file: new File([data], normalizedPath, { lastModified: mtimeMs ?? 0 }),
+			},
 		});
 	}
-
 	return entries;
 }
 
-async function readZipEntries(bytes: Uint8Array): Promise<ArchiveIndexEntry[]> {
-	const { unzip } = await loadFflate();
-	const result = Promise.withResolvers<Record<string, Uint8Array>>();
-	unzip(bytes, (error, files) => {
-		if (error) {
-			result.reject(error);
-			return;
+interface ZipDirectoryEntry {
+	name: string;
+	nameBytes: Uint8Array;
+	flags: number;
+	compression: number;
+	crc32: number;
+	compressedSize: number;
+	uncompressedSize: number;
+	localOffset: number;
+}
+
+interface Zip64ExtraNeeds {
+	uncompressedSize: boolean;
+	compressedSize: boolean;
+	localOffset: boolean;
+	diskNumber: boolean;
+}
+
+interface Zip64ExtraValues {
+	uncompressedSize?: number;
+	compressedSize?: number;
+	localOffset?: number;
+	diskNumber?: number;
+}
+
+function invalidZipArchive(): ToolError {
+	return new ToolError("Invalid ZIP archive");
+}
+
+function requireZipRange(view: DataView, offset: number, length: number, end = view.byteLength): void {
+	if (
+		!Number.isSafeInteger(offset) ||
+		!Number.isSafeInteger(length) ||
+		offset < 0 ||
+		length < 0 ||
+		offset + length > end
+	) {
+		throw invalidZipArchive();
+	}
+}
+
+function zipUint64(view: DataView, offset: number, end: number): number {
+	requireZipRange(view, offset, 8, end);
+	const value = view.getBigUint64(offset, true);
+	if (value > BigInt(Number.MAX_SAFE_INTEGER)) throw invalidZipArchive();
+	return Number(value);
+}
+
+function parseZip64Extra(view: DataView, start: number, length: number, needs: Zip64ExtraNeeds): Zip64ExtraValues {
+	const end = start + length;
+	requireZipRange(view, start, length);
+	let zip64Start: number | undefined;
+	let zip64End = 0;
+	for (let offset = start; offset < end; ) {
+		requireZipRange(view, offset, 4, end);
+		const id = view.getUint16(offset, true);
+		const fieldLength = view.getUint16(offset + 2, true);
+		const fieldStart = offset + 4;
+		requireZipRange(view, fieldStart, fieldLength, end);
+		if (id === 0x0001) {
+			if (zip64Start !== undefined) throw invalidZipArchive();
+			zip64Start = fieldStart;
+			zip64End = fieldStart + fieldLength;
 		}
-		result.resolve(files);
+		offset = fieldStart + fieldLength;
+	}
+
+	const needsZip64 = Object.values(needs).some(Boolean);
+	if (zip64Start === undefined) {
+		if (needsZip64) throw invalidZipArchive();
+		return {};
+	}
+
+	const values: Zip64ExtraValues = {};
+	let offset = zip64Start;
+	if (needs.uncompressedSize) {
+		values.uncompressedSize = zipUint64(view, offset, zip64End);
+		offset += 8;
+	}
+	if (needs.compressedSize) {
+		values.compressedSize = zipUint64(view, offset, zip64End);
+		offset += 8;
+	}
+	if (needs.localOffset) {
+		values.localOffset = zipUint64(view, offset, zip64End);
+		offset += 8;
+	}
+	if (needs.diskNumber) {
+		requireZipRange(view, offset, 4, zip64End);
+		values.diskNumber = view.getUint32(offset, true);
+	}
+	return values;
+}
+
+function decodeZipName(bytes: Uint8Array, flags: number): string {
+	if ((flags & 0x0800) !== 0) return new TextDecoder().decode(bytes);
+	let name = "";
+	for (let offset = 0; offset < bytes.byteLength; offset += 0x4000) {
+		name += String.fromCharCode(...bytes.subarray(offset, offset + 0x4000));
+	}
+	return name;
+}
+
+function zipDescriptorEnd(
+	view: DataView,
+	start: number,
+	end: number,
+	entry: ZipDirectoryEntry,
+	zip64Sizes: boolean,
+): number {
+	const matches = (hasSignature: boolean): number | undefined => {
+		let offset = start;
+		if (hasSignature) {
+			if (offset + 4 > end || view.getUint32(offset, true) !== ZIP_DATA_DESCRIPTOR_SIGNATURE) return undefined;
+			offset += 4;
+		}
+		const sizeLength = zip64Sizes ? 8 : 4;
+		if (offset + 4 + sizeLength * 2 > end) return undefined;
+		if (view.getUint32(offset, true) !== entry.crc32) return undefined;
+		const compressedSize = zip64Sizes
+			? view.getBigUint64(offset + 4, true)
+			: BigInt(view.getUint32(offset + 4, true));
+		const uncompressedSize = zip64Sizes
+			? view.getBigUint64(offset + 4 + sizeLength, true)
+			: BigInt(view.getUint32(offset + 4 + sizeLength, true));
+		if (compressedSize !== BigInt(entry.compressedSize) || uncompressedSize !== BigInt(entry.uncompressedSize)) {
+			return undefined;
+		}
+		return offset + 4 + sizeLength * 2;
+	};
+
+	const withSignature = matches(true);
+	const withoutSignature = matches(false);
+	const descriptorEnd = withSignature ?? withoutSignature;
+	if (descriptorEnd === undefined) throw invalidZipArchive();
+	return descriptorEnd;
+}
+
+function validateZipLocalEntry(
+	view: DataView,
+	bytes: Uint8Array,
+	entry: ZipDirectoryEntry,
+	offsetCorrection: number,
+	centralDirectoryStart: number,
+): { entry: ZipDirectoryEntry; endOffset: number } {
+	const localOffset = entry.localOffset + offsetCorrection;
+	requireZipRange(view, localOffset, 30, centralDirectoryStart);
+	if (view.getUint32(localOffset, true) !== ZIP_LOCAL_FILE_HEADER_SIGNATURE) throw invalidZipArchive();
+	const flags = view.getUint16(localOffset + 6, true);
+	const compression = view.getUint16(localOffset + 8, true);
+	const crc32 = view.getUint32(localOffset + 14, true);
+	const compressedSize32 = view.getUint32(localOffset + 18, true);
+	const uncompressedSize32 = view.getUint32(localOffset + 22, true);
+	const nameLength = view.getUint16(localOffset + 26, true);
+	const extraLength = view.getUint16(localOffset + 28, true);
+	const nameStart = localOffset + 30;
+	const extraStart = nameStart + nameLength;
+	requireZipRange(view, nameStart, nameLength + extraLength, centralDirectoryStart);
+	const localName = bytes.subarray(nameStart, extraStart);
+	if (
+		flags !== entry.flags ||
+		compression !== entry.compression ||
+		localName.byteLength !== entry.nameBytes.byteLength ||
+		localName.some((byte, index) => byte !== entry.nameBytes[index])
+	) {
+		throw invalidZipArchive();
+	}
+
+	const zip64Sizes = compressedSize32 === ZIP_UINT32_MAX || uncompressedSize32 === ZIP_UINT32_MAX;
+	const zip64 = parseZip64Extra(view, extraStart, extraLength, {
+		uncompressedSize: uncompressedSize32 === ZIP_UINT32_MAX,
+		compressedSize: compressedSize32 === ZIP_UINT32_MAX,
+		localOffset: false,
+		diskNumber: false,
 	});
+	const compressedSize = compressedSize32 === ZIP_UINT32_MAX ? zip64.compressedSize : compressedSize32;
+	const uncompressedSize = uncompressedSize32 === ZIP_UINT32_MAX ? zip64.uncompressedSize : uncompressedSize32;
+	if (compressedSize === undefined || uncompressedSize === undefined) throw invalidZipArchive();
+
+	const hasDescriptor = (flags & 0x0008) !== 0;
+	if (hasDescriptor) {
+		if (crc32 !== 0 && crc32 !== entry.crc32) throw invalidZipArchive();
+		if (compressedSize !== 0 && compressedSize !== entry.compressedSize) throw invalidZipArchive();
+		if (uncompressedSize !== 0 && uncompressedSize !== entry.uncompressedSize) throw invalidZipArchive();
+	} else if (
+		crc32 !== entry.crc32 ||
+		compressedSize !== entry.compressedSize ||
+		uncompressedSize !== entry.uncompressedSize
+	) {
+		throw invalidZipArchive();
+	}
 
-	let files: Record<string, Uint8Array>;
-	try {
-		files = await result.promise;
-	} catch (error) {
-		throw new ToolError(error instanceof Error ? error.message : String(error));
+	const dataStart = extraStart + extraLength;
+	const dataEnd = dataStart + entry.compressedSize;
+	if (dataEnd > centralDirectoryStart) throw invalidZipArchive();
+	const endOffset = hasDescriptor
+		? zipDescriptorEnd(view, dataEnd, centralDirectoryStart, entry, zip64Sizes)
+		: dataEnd;
+	return { entry: { ...entry, localOffset }, endOffset };
+}
+
+function readZipDirectory(bytes: Uint8Array): ZipDirectoryEntry[] {
+	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	const searchStart = Math.max(0, bytes.byteLength - 22 - ZIP_UINT16_MAX);
+	let lastError: unknown;
+	for (let offset = searchStart; offset <= bytes.byteLength - 22; offset++) {
+		if (view.getUint32(offset, true) !== ZIP_END_OF_CENTRAL_DIRECTORY_SIGNATURE) continue;
+		const commentLength = view.getUint16(offset + 20, true);
+		if (offset + 22 + commentLength !== bytes.byteLength) continue;
+		try {
+			return parseZipDirectoryAt(bytes, view, offset);
+		} catch (error) {
+			lastError = error;
+		}
+	}
+	if (lastError instanceof Error) throw lastError;
+	throw invalidZipArchive();
+}
+
+function parseZipDirectoryAt(bytes: Uint8Array, view: DataView, endOffset: number): ZipDirectoryEntry[] {
+	const diskNumber = view.getUint16(endOffset + 4, true);
+	const centralDiskNumber = view.getUint16(endOffset + 6, true);
+	const entriesOnDisk16 = view.getUint16(endOffset + 8, true);
+	const entryCount16 = view.getUint16(endOffset + 10, true);
+	const centralSize32 = view.getUint32(endOffset + 12, true);
+	const centralOffset32 = view.getUint32(endOffset + 16, true);
+	if (
+		diskNumber !== 0 ||
+		centralDiskNumber !== 0 ||
+		(entriesOnDisk16 !== ZIP_UINT16_MAX && entriesOnDisk16 !== entryCount16)
+	) {
+		throw invalidZipArchive();
+	}
+
+	const needsZip64 =
+		entriesOnDisk16 === ZIP_UINT16_MAX ||
+		entryCount16 === ZIP_UINT16_MAX ||
+		centralSize32 === ZIP_UINT32_MAX ||
+		centralOffset32 === ZIP_UINT32_MAX;
+	const locatorOffset = endOffset - 20;
+	const hasZip64Locator =
+		locatorOffset >= 0 && view.getUint32(locatorOffset, true) === ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIGNATURE;
+	if (needsZip64 && !hasZip64Locator) throw invalidZipArchive();
+
+	let entryCount: number;
+	let centralSize: number;
+	let centralOffset: number;
+	let centralDirectoryEnd: number;
+	if (hasZip64Locator) {
+		const locatorDisk = view.getUint32(locatorOffset + 4, true);
+		const zip64EndOffset = zipUint64(view, locatorOffset + 8, locatorOffset + 20);
+		const totalDisks = view.getUint32(locatorOffset + 16, true);
+		if (locatorDisk !== 0 || totalDisks !== 1) throw invalidZipArchive();
+		requireZipRange(view, zip64EndOffset, 56, locatorOffset);
+		if (view.getUint32(zip64EndOffset, true) !== ZIP64_END_OF_CENTRAL_DIRECTORY_SIGNATURE) throw invalidZipArchive();
+		const zip64RecordSize = zipUint64(view, zip64EndOffset + 4, locatorOffset);
+		if (zip64RecordSize < 44 || zip64EndOffset + 12 + zip64RecordSize !== locatorOffset) throw invalidZipArchive();
+		if (view.getUint32(zip64EndOffset + 16, true) !== 0 || view.getUint32(zip64EndOffset + 20, true) !== 0) {
+			throw invalidZipArchive();
+		}
+		const entriesOnDisk = zipUint64(view, zip64EndOffset + 24, locatorOffset);
+		entryCount = zipUint64(view, zip64EndOffset + 32, locatorOffset);
+		centralSize = zipUint64(view, zip64EndOffset + 40, locatorOffset);
+		centralOffset = zipUint64(view, zip64EndOffset + 48, locatorOffset);
+		if (entriesOnDisk !== entryCount) throw invalidZipArchive();
+		if (
+			(entriesOnDisk16 !== ZIP_UINT16_MAX && entriesOnDisk16 !== entriesOnDisk) ||
+			(entryCount16 !== ZIP_UINT16_MAX && entryCount16 !== entryCount) ||
+			(centralSize32 !== ZIP_UINT32_MAX && centralSize32 !== centralSize) ||
+			(centralOffset32 !== ZIP_UINT32_MAX && centralOffset32 !== centralOffset)
+		) {
+			throw invalidZipArchive();
+		}
+		centralDirectoryEnd = zip64EndOffset;
+	} else {
+		entryCount = entryCount16;
+		centralSize = centralSize32;
+		centralOffset = centralOffset32;
+		centralDirectoryEnd = endOffset;
+	}
+	if (entryCount > MAX_ARCHIVE_ENTRY_COUNT) throw archiveLimitError("count");
+	if (centralSize > centralDirectoryEnd) throw invalidZipArchive();
+	const centralDirectoryStart = centralDirectoryEnd - centralSize;
+	const offsetCorrection = centralDirectoryStart - centralOffset;
+	if (offsetCorrection < 0) throw invalidZipArchive();
+
+	const directoryEntries: ZipDirectoryEntry[] = [];
+	let totalUncompressed = 0;
+	let offset = centralDirectoryStart;
+	for (let index = 0; index < entryCount; index++) {
+		requireZipRange(view, offset, 46, centralDirectoryEnd);
+		if (view.getUint32(offset, true) !== ZIP_CENTRAL_DIRECTORY_SIGNATURE) throw invalidZipArchive();
+		const flags = view.getUint16(offset + 8, true);
+		const compression = view.getUint16(offset + 10, true);
+		const crc32 = view.getUint32(offset + 16, true);
+		const compressedSize32 = view.getUint32(offset + 20, true);
+		const uncompressedSize32 = view.getUint32(offset + 24, true);
+		const nameLength = view.getUint16(offset + 28, true);
+		const extraLength = view.getUint16(offset + 30, true);
+		const commentLength = view.getUint16(offset + 32, true);
+		const diskStart16 = view.getUint16(offset + 34, true);
+		const localOffset32 = view.getUint32(offset + 42, true);
+		const nameStart = offset + 46;
+		const extraStart = nameStart + nameLength;
+		const recordLength = 46 + nameLength + extraLength + commentLength;
+		requireZipRange(view, offset, recordLength, centralDirectoryEnd);
+		const zip64 = parseZip64Extra(view, extraStart, extraLength, {
+			uncompressedSize: uncompressedSize32 === ZIP_UINT32_MAX,
+			compressedSize: compressedSize32 === ZIP_UINT32_MAX,
+			localOffset: localOffset32 === ZIP_UINT32_MAX,
+			diskNumber: diskStart16 === ZIP_UINT16_MAX,
+		});
+		const uncompressedSize = uncompressedSize32 === ZIP_UINT32_MAX ? zip64.uncompressedSize : uncompressedSize32;
+		const compressedSize = compressedSize32 === ZIP_UINT32_MAX ? zip64.compressedSize : compressedSize32;
+		const localOffset = localOffset32 === ZIP_UINT32_MAX ? zip64.localOffset : localOffset32;
+		const diskStart = diskStart16 === ZIP_UINT16_MAX ? zip64.diskNumber : diskStart16;
+		if (
+			uncompressedSize === undefined ||
+			compressedSize === undefined ||
+			localOffset === undefined ||
+			diskStart !== 0
+		) {
+			throw invalidZipArchive();
+		}
+		const nameBytes = bytes.subarray(nameStart, extraStart);
+		const name = decodeZipName(nameBytes, flags);
+		if (uncompressedSize > MAX_ARCHIVE_ENTRY_BYTES) throw archiveLimitError("entry", name);
+		totalUncompressed += uncompressedSize;
+		if (totalUncompressed > MAX_ARCHIVE_TOTAL_BYTES) throw archiveLimitError("total");
+		directoryEntries.push({
+			name,
+			nameBytes,
+			flags,
+			compression,
+			crc32,
+			compressedSize,
+			uncompressedSize,
+			localOffset,
+		});
+		offset += recordLength;
+	}
+	if (offset < centralDirectoryEnd) {
+		requireZipRange(view, offset, 6, centralDirectoryEnd);
+		const signatureLength = view.getUint16(offset + 4, true);
+		if (
+			view.getUint32(offset, true) !== ZIP_CENTRAL_DIRECTORY_DIGITAL_SIGNATURE ||
+			offset + 6 + signatureLength !== centralDirectoryEnd
+		) {
+			throw invalidZipArchive();
+		}
+		offset = centralDirectoryEnd;
+	}
+	if (offset !== centralDirectoryEnd) throw invalidZipArchive();
+
+	const localEntries = directoryEntries
+		.map(entry => validateZipLocalEntry(view, bytes, entry, offsetCorrection, centralDirectoryStart))
+		.sort((left, right) => left.entry.localOffset - right.entry.localOffset);
+	for (let index = 1; index < localEntries.length; index++) {
+		const previous = localEntries[index - 1];
+		const current = localEntries[index];
+		if (previous && current && current.entry.localOffset < previous.endOffset) throw invalidZipArchive();
 	}
+	return localEntries.map(item => item.entry);
+}
 
+async function readZipEntries(bytes: Uint8Array): Promise<ArchiveIndexEntry[]> {
+	const directoryEntries = readZipDirectory(bytes);
+	const { Inflate } = await loadFflate();
+	// Feed validated member ranges directly so descriptor signatures cannot truncate stored or deflate data.
+	let activeInflateBudget:
+		| {
+				entryBytes: number;
+				fileName: string;
+		  }
+		| undefined;
+	class CappedZipInflate {
+		ondata: (error: Error | null, data: Uint8Array, final: boolean) => void = () => {};
+		#failed = false;
+		#inflater: InstanceType<typeof Inflate>;
+		constructor() {
+			const budget = activeInflateBudget;
+			if (!budget) throw new ToolError("Missing ZIP inflate budget");
+			// Inflate consumes compressed chunks incrementally, avoiding a member-sized compressed copy.
+			this.#inflater = new Inflate((data, final) => {
+				const entryRemaining = MAX_ARCHIVE_ENTRY_BYTES - budget.entryBytes;
+				const totalRemaining = MAX_ARCHIVE_TOTAL_BYTES - totalUncompressed;
+				if (data.byteLength > Math.min(entryRemaining, totalRemaining)) {
+					this.#failed = true;
+					throw archiveLimitError(entryRemaining <= totalRemaining ? "entry" : "total", budget.fileName);
+				}
+				budget.entryBytes += data.byteLength;
+				this.ondata(null, data, final);
+			});
+		}
+		push(data: Uint8Array, final: boolean): void {
+			if (this.#failed) return;
+			try {
+				this.#inflater.push(data, final);
+			} catch (error) {
+				this.#failed = true;
+				this.ondata(error instanceof Error ? error : new Error(String(error)), new Uint8Array(0), true);
+			}
+		}
+	}
 	const entries: ArchiveIndexEntry[] = [];
-	for (const [rawPath, fileBytes] of Object.entries(files)) {
-		const normalizedPath = normalizeArchiveEntryPath(rawPath);
+	let totalUncompressed = 0;
+	const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+	for (const expected of directoryEntries) {
+		const normalizedPath = normalizeArchiveEntryPath(expected.name);
 		if (!normalizedPath) continue;
-		const isDirectory = isArchiveDirectoryName(rawPath);
+		if (archiveEntryDepth(expected.name) > MAX_ARCHIVE_PATH_DEPTH) throw archiveLimitError("depth", expected.name);
+		const isDirectory = isArchiveDirectoryName(expected.name);
+		const nameLength = view.getUint16(expected.localOffset + 26, true);
+		const extraLength = view.getUint16(expected.localOffset + 28, true);
+		const dataStart = expected.localOffset + 30 + nameLength + extraLength;
+		const dataEnd = dataStart + expected.compressedSize;
+		if (dataEnd > bytes.byteLength) throw invalidZipArchive();
+		const compressed = bytes.subarray(dataStart, dataEnd);
+		const chunks: Uint8Array[] = [];
+		let entryBytes = 0;
+		let failed: ToolError | undefined;
+		const take = (data: Uint8Array, final: boolean) => {
+			if (failed) return;
+			const size = data.byteLength;
+			if (entryBytes + size > MAX_ARCHIVE_ENTRY_BYTES) failed = archiveLimitError("entry", normalizedPath);
+			else if (totalUncompressed + size > MAX_ARCHIVE_TOTAL_BYTES) failed = archiveLimitError("total");
+			else {
+				entryBytes += size;
+				totalUncompressed += size;
+				if (size > 0 && !isDirectory) chunks.push(data);
+			}
+			if (final && !failed && entryBytes !== expected.uncompressedSize) failed = invalidZipArchive();
+		};
+		if (expected.compression === 0) take(compressed, true);
+		else if (expected.compression !== 8) throw invalidZipArchive();
+		else {
+			activeInflateBudget = { entryBytes: 0, fileName: normalizedPath };
+			const inflator = new CappedZipInflate();
+			inflator.ondata = (error, data, final) => {
+				if (error) failed = new ToolError(error.message);
+				else take(data ?? new Uint8Array(0), final);
+			};
+			try {
+				if (compressed.byteLength === 0) {
+					inflator.push(compressed, true);
+				} else {
+					for (let offset = 0; offset < compressed.byteLength && !failed; offset += ZIP_INFLATE_CHUNK_BYTES) {
+						const end = Math.min(offset + ZIP_INFLATE_CHUNK_BYTES, compressed.byteLength);
+						inflator.push(compressed.subarray(offset, end), end === compressed.byteLength);
+					}
+				}
+			} catch (error) {
+				if (!failed) failed = new ToolError(error instanceof Error ? error.message : String(error));
+			} finally {
+				activeInflateBudget = undefined;
+			}
+		}
+		if (failed) throw failed;
 		entries.push({
 			path: normalizedPath,
 			isDirectory,
-			size: isDirectory ? 0 : fileBytes.byteLength,
-			storage: isDirectory ? undefined : { type: "zip", bytes: fileBytes },
+			size: isDirectory ? 0 : entryBytes,
+			storage: isDirectory
+				? undefined
+				: { type: "zip", bytes: expected.compression === 0 ? compressed : concatBytes(chunks, entryBytes) },
 		});
 	}
 
-	return entries;
+	return [
+		...entries.reduce((map, entry) => map.set(entry.path, entry), new Map<string, ArchiveIndexEntry>()).values(),
+	];
 }
 
 export function parseArchivePathCandidates(filePath: string): ArchivePathCandidate[] {
@@ -325,8 +939,7 @@ export async function openArchive(filePath: string): Promise<ArchiveReader> {
 	}
 
 	// F20: cap the compressed archive read so opening a multi-GB archive cannot buffer it
-	// whole into memory. (Zip-bomb expanded-size bounding would need a streaming inflate.)
-	const MAX_ARCHIVE_BYTES = 256 * 1024 * 1024;
+	// whole into memory. Inflate stops at one entry, the total, the entry count, and path depth.
 	const file = Bun.file(filePath);
 	if (file.size > MAX_ARCHIVE_BYTES) {
 		throw new ToolError(
@@ -334,6 +947,6 @@ export async function openArchive(filePath: string): Promise<ArchiveReader> {
 		);
 	}
 	const bytes = await file.bytes();
-	const entries = format === "zip" ? await readZipEntries(bytes) : await readTarEntries(bytes);
+	const entries = format === "zip" ? await readZipEntries(bytes) : await readTarEntries(bytes, format === "tar.gz");
 	return new ArchiveReader(format, entries);
 }