@ttmg/cli 0.3.8 → 0.3.9-beta.wasm.1

package/dist/index.js

@@ -38,9 +38,12 @@ var FormData$1 = require('form-data');
 var ttmgPack = require('ttmg-pack');
 var expressStaticGzip = require('express-static-gzip');
 var fileUpload = require('express-fileupload');
+var ttmgWasmtool = require('@anrans001/ttmg-wasmtool');
+var crypto$1 = require('node:crypto');
 var fs$1 = require('node:fs');
 var path$1 = require('node:path');
 var zlib = require('zlib');
+var crypto = require('crypto');
 var promises = require('fs/promises');
 var qs = require('qs');
 
@@ -69,6 +72,8 @@ var http__namespace = /*#__PURE__*/_interopNamespaceDefault(http);
 var dns__namespace = /*#__PURE__*/_interopNamespaceDefault(dns);
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 var glob__namespace = /*#__PURE__*/_interopNamespaceDefault(glob);
+var fs__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(fs$1);
+var path__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(path$1);
 
 async function openUrl(url) {
     const { launch } = await import('chrome-launcher');
@@ -584,17 +589,17 @@ var hasRequiredBrowser;
 function requireBrowser () {
 	if (hasRequiredBrowser) return browser.exports;
 	hasRequiredBrowser = 1;
-	(function (module, exports) {
+	(function (module, exports$1) {
 		/**
 		 * This is the web browser implementation of `debug()`.
 		 */
 
-		exports.formatArgs = formatArgs;
-		exports.save = save;
-		exports.load = load;
-		exports.useColors = useColors;
-		exports.storage = localstorage();
-		exports.destroy = (() => {
+		exports$1.formatArgs = formatArgs;
+		exports$1.save = save;
+		exports$1.load = load;
+		exports$1.useColors = useColors;
+		exports$1.storage = localstorage();
+		exports$1.destroy = (() => {
 			let warned = false;
 
 			return () => {
@@ -609,7 +614,7 @@ function requireBrowser () {
 		 * Colors.
 		 */
 
-		exports.colors = [
+		exports$1.colors = [
 			'#0000CC',
 			'#0000FF',
 			'#0033CC',
@@ -774,7 +779,7 @@ function requireBrowser () {
 		 *
 		 * @api public
 		 */
-		exports.log = console.debug || console.log || (() => {});
+		exports$1.log = console.debug || console.log || (() => {});
 
 		/**
 		 * Save `namespaces`.
@@ -785,9 +790,9 @@ function requireBrowser () {
 		function save(namespaces) {
 			try {
 				if (namespaces) {
-					exports.storage.setItem('debug', namespaces);
+					exports$1.storage.setItem('debug', namespaces);
 				} else {
-					exports.storage.removeItem('debug');
+					exports$1.storage.removeItem('debug');
 				}
 			} catch (error) {
 				// Swallow
@@ -804,7 +809,7 @@ function requireBrowser () {
 		function load() {
 			let r;
 			try {
-				r = exports.storage.getItem('debug') || exports.storage.getItem('DEBUG') ;
+				r = exports$1.storage.getItem('debug') || exports$1.storage.getItem('DEBUG') ;
 			} catch (error) {
 				// Swallow
 				// XXX (@Qix-) should we be logging these?
@@ -840,7 +845,7 @@ function requireBrowser () {
 			}
 		}
 
-		module.exports = requireCommon$1()(exports);
+		module.exports = requireCommon$1()(exports$1);
 
 		const {formatters} = module.exports;
 
@@ -1029,7 +1034,7 @@ var hasRequiredNode;
 function requireNode () {
 	if (hasRequiredNode) return node.exports;
 	hasRequiredNode = 1;
-	(function (module, exports) {
+	(function (module, exports$1) {
 		const tty = require$$1;
 		const util = require$$1$1;
 
@@ -1037,13 +1042,13 @@ function requireNode () {
 		 * This is the Node.js implementation of `debug()`.
 		 */
 
-		exports.init = init;
-		exports.log = log;
-		exports.formatArgs = formatArgs;
-		exports.save = save;
-		exports.load = load;
-		exports.useColors = useColors;
-		exports.destroy = util.deprecate(
+		exports$1.init = init;
+		exports$1.log = log;
+		exports$1.formatArgs = formatArgs;
+		exports$1.save = save;
+		exports$1.load = load;
+		exports$1.useColors = useColors;
+		exports$1.destroy = util.deprecate(
 			() => {},
 			'Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.'
 		);
@@ -1052,7 +1057,7 @@ function requireNode () {
 		 * Colors.
 		 */
 
-		exports.colors = [6, 2, 3, 4, 5, 1];
+		exports$1.colors = [6, 2, 3, 4, 5, 1];
 
 		try {
 			// Optional dependency (as in, doesn't need to be installed, NOT like optionalDependencies in package.json)
@@ -1060,7 +1065,7 @@ function requireNode () {
 			const supportsColor = requireSupportsColor();
 
 			if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) {
-				exports.colors = [
+				exports$1.colors = [
 					20,
 					21,
 					26,
@@ -1149,7 +1154,7 @@ function requireNode () {
 		 *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
 		 */
 
-		exports.inspectOpts = Object.keys(process.env).filter(key => {
+		exports$1.inspectOpts = Object.keys(process.env).filter(key => {
 			return /^debug_/i.test(key);
 		}).reduce((obj, key) => {
 			// Camel-case
@@ -1181,8 +1186,8 @@ function requireNode () {
 		 */
 
 		function useColors() {
-			return 'colors' in exports.inspectOpts ?
-				Boolean(exports.inspectOpts.colors) :
+			return 'colors' in exports$1.inspectOpts ?
+				Boolean(exports$1.inspectOpts.colors) :
 				tty.isatty(process.stderr.fd);
 		}
 
@@ -1208,7 +1213,7 @@ function requireNode () {
 		}
 
 		function getDate() {
-			if (exports.inspectOpts.hideDate) {
+			if (exports$1.inspectOpts.hideDate) {
 				return '';
 			}
 			return new Date().toISOString() + ' ';
@@ -1219,7 +1224,7 @@ function requireNode () {
 		 */
 
 		function log(...args) {
-			return process.stderr.write(util.formatWithOptions(exports.inspectOpts, ...args) + '\n');
+			return process.stderr.write(util.formatWithOptions(exports$1.inspectOpts, ...args) + '\n');
 		}
 
 		/**
@@ -1259,13 +1264,13 @@ function requireNode () {
 		function init(debug) {
 			debug.inspectOpts = {};
 
-			const keys = Object.keys(exports.inspectOpts);
+			const keys = Object.keys(exports$1.inspectOpts);
 			for (let i = 0; i < keys.length; i++) {
-				debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+				debug.inspectOpts[keys[i]] = exports$1.inspectOpts[keys[i]];
 			}
 		}
 
-		module.exports = requireCommon$1()(exports);
+		module.exports = requireCommon$1()(exports$1);
 
 		const {formatters} = module.exports;
 
@@ -3354,27 +3359,6 @@ var ipv4 = {};
 
 var common = {};
 
-var addressError = {};
-
-var hasRequiredAddressError;
-
-function requireAddressError () {
-	if (hasRequiredAddressError) return addressError;
-	hasRequiredAddressError = 1;
-	Object.defineProperty(addressError, "__esModule", { value: true });
-	addressError.AddressError = void 0;
-	class AddressError extends Error {
-	    constructor(message, parseMessage) {
-	        super(message);
-	        this.name = 'AddressError';
-	        this.parseMessage = parseMessage;
-	    }
-	}
-	addressError.AddressError = AddressError;
-	
-	return addressError;
-}
-
 var hasRequiredCommon;
 
 function requireCommon () {
@@ -3383,11 +3367,9 @@ function requireCommon () {
 	Object.defineProperty(common, "__esModule", { value: true });
 	common.isInSubnet = isInSubnet;
 	common.isCorrect = isCorrect;
-	common.prefixLengthFromMask = prefixLengthFromMask;
 	common.numberToPaddedHex = numberToPaddedHex;
 	common.stringToPaddedHex = stringToPaddedHex;
 	common.testBit = testBit;
-	const address_error_1 = /*@__PURE__*/ requireAddressError();
 	function isInSubnet(address) {
 	    if (this.subnetMask < address.subnetMask) {
 	        return false;
@@ -3408,25 +3390,6 @@ function requireCommon () {
 	        return this.parsedSubnet === String(this.subnetMask);
 	    };
 	}
-	/**
-	 * Returns the prefix length (number of leading 1 bits) of a contiguous
-	 * subnet mask. Throws `AddressError` if the mask is non-contiguous (e.g.
-	 * `255.0.255.0`).
-	 */
-	function prefixLengthFromMask(value, totalBits) {
-	    const binary = value.toString(2).padStart(totalBits, '0');
-	    if (binary.length > totalBits) {
-	        throw new address_error_1.AddressError('Invalid subnet mask.');
-	    }
-	    const firstZero = binary.indexOf('0');
-	    if (firstZero === -1) {
-	        return totalBits;
-	    }
-	    if (binary.slice(firstZero).includes('1')) {
-	        throw new address_error_1.AddressError('Invalid subnet mask.');
-	    }
-	    return firstZero;
-	}
 	function numberToPaddedHex(number) {
 	    return number.toString(16).padStart(2, '0');
 	}
@@ -3466,6 +3429,27 @@ function requireConstants$1 () {
 	return constants$1;
 }
 
+var addressError = {};
+
+var hasRequiredAddressError;
+
+function requireAddressError () {
+	if (hasRequiredAddressError) return addressError;
+	hasRequiredAddressError = 1;
+	Object.defineProperty(addressError, "__esModule", { value: true });
+	addressError.AddressError = void 0;
+	class AddressError extends Error {
+	    constructor(message, parseMessage) {
+	        super(message);
+	        this.name = 'AddressError';
+	        this.parseMessage = parseMessage;
+	    }
+	}
+	addressError.AddressError = AddressError;
+	
+	return addressError;
+}
+
 var hasRequiredIpv4;
 
 function requireIpv4 () {
@@ -3497,12 +3481,12 @@ function requireIpv4 () {
 	};
 	Object.defineProperty(ipv4, "__esModule", { value: true });
 	ipv4.Address4 = void 0;
-	const common = __importStar(/*@__PURE__*/ requireCommon());
-	const constants = __importStar(/*@__PURE__*/ requireConstants$1());
-	const address_error_1 = /*@__PURE__*/ requireAddressError();
-	const isCorrect4 = common.isCorrect(constants.BITS);
+	const common = __importStar(requireCommon());
+	const constants = __importStar(requireConstants$1());
+	const address_error_1 = requireAddressError();
 	/**
 	 * Represents an IPv4 address
+	 * @class Address4
 	 * @param {string} address - An IPv4 address string
 	 */
 	class Address4 {
@@ -3515,11 +3499,15 @@ function requireIpv4 () {
 	        this.v4 = true;
 	        /**
 	         * Returns true if the address is correct, false otherwise
+	         * @memberof Address4
+	         * @instance
 	         * @returns {Boolean}
 	         */
-	        this.isCorrect = isCorrect4;
+	        this.isCorrect = common.isCorrect(constants.BITS);
 	        /**
 	         * Returns true if the given address is in the subnet of the current address
+	         * @memberof Address4
+	         * @instance
 	         * @returns {boolean}
 	         */
 	        this.isInSubnet = common.isInSubnet;
@@ -3537,13 +3525,6 @@ function requireIpv4 () {
 	        this.addressMinusSuffix = address;
 	        this.parsedAddress = this.parse(address);
 	    }
-	    /**
-	     * Returns true if the given string is a valid IPv4 address (with optional
-	     * CIDR subnet), false otherwise. Host bits in the subnet portion are
-	     * allowed (e.g. `192.168.1.5/24` is valid); for strict network-address
-	     * validation compare `correctForm()` to `startAddress().correctForm()`,
-	     * or use `networkForm()`.
-	     */
 	    static isValid(address) {
 	        try {
 	            // eslint-disable-next-line no-new
@@ -3554,11 +3535,8 @@ function requireIpv4 () {
 	            return false;
 	        }
 	    }
-	    /**
-	     * Parses an IPv4 address string into its four octet groups and stores the
-	     * result on `this.parsedAddress`. Called automatically by the constructor;
-	     * you typically don't need to call it directly. Throws `AddressError` if
-	     * the input is not a valid IPv4 address.
+	    /*
+	     * Parses a v4 address
 	     */
 	    parse(address) {
 	        const groups = address.split('.');
@@ -3568,110 +3546,45 @@ function requireIpv4 () {
 	        return groups;
 	    }
 	    /**
-	     * Returns the address in correct form: octets joined with `.` and any
-	     * leading zeros stripped (e.g. `192.168.1.1`). For IPv4 this matches the
-	     * canonical dotted-decimal representation.
+	     * Returns the correct form of an address
+	     * @memberof Address4
+	     * @instance
+	     * @returns {String}
 	     */
 	    correctForm() {
 	        return this.parsedAddress.map((part) => parseInt(part, 10)).join('.');
 	    }
 	    /**
-	     * Construct an `Address4` from an address and a dotted-decimal subnet
-	     * mask given as separate strings (e.g. as returned by Node's
-	     * `os.networkInterfaces()`). Throws `AddressError` if the mask is
-	     * non-contiguous (e.g. `255.0.255.0`).
-	     * @example
-	     * var address = Address4.fromAddressAndMask('192.168.1.1', '255.255.255.0');
-	     * address.subnetMask; // 24
-	     */
-	    static fromAddressAndMask(address, mask) {
-	        const bits = common.prefixLengthFromMask(new Address4(mask).bigInt(), constants.BITS);
-	        return new Address4(`${address}/${bits}`);
-	    }
-	    /**
-	     * Construct an `Address4` from an address and a Cisco-style wildcard mask
-	     * given as separate strings (e.g. `0.0.0.255` for a `/24`). The wildcard
-	     * mask is the bitwise inverse of the subnet mask. Throws `AddressError`
-	     * if the mask is non-contiguous (e.g. `0.255.0.255`).
-	     * @example
-	     * var address = Address4.fromAddressAndWildcardMask('10.0.0.1', '0.0.0.255');
-	     * address.subnetMask; // 24
-	     */
-	    static fromAddressAndWildcardMask(address, wildcardMask) {
-	        const wildcard = new Address4(wildcardMask).bigInt();
-	        const allOnes = (BigInt(1) << BigInt(constants.BITS)) - BigInt(1);
-	        // eslint-disable-next-line no-bitwise
-	        const mask = wildcard ^ allOnes;
-	        const bits = common.prefixLengthFromMask(mask, constants.BITS);
-	        return new Address4(`${address}/${bits}`);
-	    }
-	    /**
-	     * Construct an `Address4` from a wildcard pattern with trailing `*`
-	     * octets. The number of trailing wildcards determines the prefix
-	     * length: each `*` represents 8 bits.
-	     *
-	     * Only trailing whole-octet wildcards are supported. Partial-octet
-	     * wildcards (e.g. `192.168.0.1*`) and interior wildcards (e.g.
-	     * `192.*.0.1`) throw `AddressError`.
-	     * @example
-	     * Address4.fromWildcard('192.168.0.*').subnet;   // '/24'
-	     * Address4.fromWildcard('192.168.*.*').subnet;   // '/16'
-	     * Address4.fromWildcard('*.*.*.*').subnet;       // '/0'
-	     */
-	    static fromWildcard(input) {
-	        const groups = input.split('.');
-	        if (groups.length !== constants.GROUPS) {
-	            throw new address_error_1.AddressError('Wildcard pattern must have 4 octets');
-	        }
-	        let firstWildcard = -1;
-	        for (let i = 0; i < groups.length; i++) {
-	            if (groups[i] === '*') {
-	                if (firstWildcard === -1) {
-	                    firstWildcard = i;
-	                }
-	            }
-	            else if (firstWildcard !== -1) {
-	                throw new address_error_1.AddressError('Wildcard `*` must only appear in trailing octets (e.g. `192.168.0.*`)');
-	            }
-	        }
-	        const trailing = firstWildcard === -1 ? 0 : groups.length - firstWildcard;
-	        const replaced = groups.map((g) => (g === '*' ? '0' : g));
-	        const subnetBits = constants.BITS - trailing * 8;
-	        return new Address4(`${replaced.join('.')}/${subnetBits}`);
-	    }
-	    /**
-	     * Converts a hex string to an IPv4 address object. Accepts 8 hex digits
-	     * with optional `:` separators (e.g. `'7f000001'` or `'7f:00:00:01'`).
-	     * Throws `AddressError` for any other length or for non-hex characters.
+	     * Converts a hex string to an IPv4 address object
+	     * @memberof Address4
+	     * @static
 	     * @param {string} hex - a hex string to convert
 	     * @returns {Address4}
 	     */
 	    static fromHex(hex) {
-	        const stripped = hex.replace(/:/g, '');
-	        if (!/^[0-9a-fA-F]{8}$/.test(stripped)) {
-	            throw new address_error_1.AddressError('IPv4 hex must be exactly 8 hex digits');
-	        }
+	        const padded = hex.replace(/:/g, '').padStart(8, '0');
 	        const groups = [];
-	        for (let i = 0; i < 8; i += 2) {
-	            groups.push(parseInt(stripped.slice(i, i + 2), 16));
+	        let i;
+	        for (i = 0; i < 8; i += 2) {
+	            const h = padded.slice(i, i + 2);
+	            groups.push(parseInt(h, 16));
 	        }
 	        return new Address4(groups.join('.'));
 	    }
 	    /**
-	     * Converts an integer into a IPv4 address object. The integer must be a
-	     * non-negative safe integer in the range `[0, 2**32 - 1]`; otherwise
-	     * `AddressError` is thrown.
+	     * Converts an integer into a IPv4 address object
+	     * @memberof Address4
+	     * @static
 	     * @param {integer} integer - a number to convert
 	     * @returns {Address4}
 	     */
 	    static fromInteger(integer) {
-	        if (!Number.isInteger(integer) || integer < 0 || integer > 0xffffffff) {
-	            throw new address_error_1.AddressError('IPv4 integer must be in the range 0 to 2**32 - 1');
-	        }
-	        return Address4.fromHex(integer.toString(16).padStart(8, '0'));
+	        return Address4.fromHex(integer.toString(16));
 	    }
 	    /**
 	     * Return an address from in-addr.arpa form
+	     * @memberof Address4
+	     * @static
 	     * @param {string} arpaFormAddress - an 'in-addr.arpa' form ipv4 address
 	     * @returns {Adress4}
 	     * @example
@@ -3686,15 +3599,17 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Converts an IPv4 address object to a hex string
+	     * @memberof Address4
+	     * @instance
 	     * @returns {String}
 	     */
 	    toHex() {
 	        return this.parsedAddress.map((part) => common.stringToPaddedHex(part)).join(':');
 	    }
 	    /**
-	     * Converts an IPv4 address object to an array of bytes.
-	     *
-	     * To get a Node.js `Buffer`, wrap the result: `Buffer.from(address.toArray())`.
+	     * Converts an IPv4 address object to an array of bytes
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Array}
 	     */
 	    toArray() {
@@ -3702,6 +3617,8 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Converts an IPv4 address object to an IPv6 address group
+	     * @memberof Address4
+	     * @instance
 	     * @returns {String}
 	     */
 	    toGroup6() {
@@ -3714,6 +3631,8 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Returns the address as a `bigint`
+	     * @memberof Address4
+	     * @instance
 	     * @returns {bigint}
 	     */
 	    bigInt() {
@@ -3721,6 +3640,8 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Helper function getting start address.
+	     * @memberof Address4
+	     * @instance
 	     * @returns {bigint}
 	     */
 	    _startAddress() {
@@ -3729,6 +3650,8 @@ function requireIpv4 () {
 	    /**
 	     * The first address in the range given by this address' subnet.
 	     * Often referred to as the Network Address.
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */
 	    startAddress() {
@@ -3737,6 +3660,8 @@ function requireIpv4 () {
 	    /**
 	     * The first host address in the range given by this address's subnet ie
 	     * the first address after the Network Address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */
 	    startAddressExclusive() {
@@ -3745,6 +3670,8 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Helper function getting end address.
+	     * @memberof Address4
+	     * @instance
 	     * @returns {bigint}
 	     */
 	    _endAddress() {
@@ -3753,6 +3680,8 @@ function requireIpv4 () {
 	    /**
 	     * The last address in the range given by this address' subnet
 	     * Often referred to as the Broadcast
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */
 	    endAddress() {
@@ -3761,6 +3690,8 @@ function requireIpv4 () {
 	    /**
 	     * The last host address in the range given by this address's subnet ie
 	     * the last address prior to the Broadcast Address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */
 	    endAddressExclusive() {
@@ -3768,47 +3699,19 @@ function requireIpv4 () {
 	        return Address4.fromBigInt(this._endAddress() - adjust);
 	    }
 	    /**
-	     * The dotted-decimal form of the subnet mask, e.g. `255.255.240.0` for
-	     * a `/20`. Returns an `Address4`; call `.correctForm()` for the string.
-	     * @returns {Address4}
-	     */
-	    subnetMaskAddress() {
-	        return Address4.fromBigInt(BigInt(`0b${'1'.repeat(this.subnetMask)}${'0'.repeat(constants.BITS - this.subnetMask)}`));
-	    }
-	    /**
-	     * The Cisco-style wildcard mask, e.g. `0.0.0.255` for a `/24`. This is
-	     * the bitwise inverse of `subnetMaskAddress()`. Returns an `Address4`;
-	     * call `.correctForm()` for the string.
-	     * @returns {Address4}
-	     */
-	    wildcardMask() {
-	        return Address4.fromBigInt(BigInt(`0b${'0'.repeat(this.subnetMask)}${'1'.repeat(constants.BITS - this.subnetMask)}`));
-	    }
-	    /**
-	     * The network address in CIDR string form, e.g. `192.168.1.0/24` for
-	     * `192.168.1.5/24`. For an address with no explicit subnet the prefix is
-	     * `/32`, e.g. `networkForm()` on `192.168.1.5` returns `192.168.1.5/32`.
-	     * @returns {string}
-	     */
-	    networkForm() {
-	        return `${this.startAddress().correctForm()}/${this.subnetMask}`;
-	    }
-	    /**
-	     * Converts a BigInt to a v4 address object. The value must be in the
-	     * range `[0, 2**32 - 1]`; otherwise `AddressError` is thrown.
+	     * Converts a BigInt to a v4 address object
+	     * @memberof Address4
+	     * @static
 	     * @param {bigint} bigInt - a BigInt to convert
 	     * @returns {Address4}
 	     */
 	    static fromBigInt(bigInt) {
-	        if (bigInt < 0n || bigInt > 0xffffffffn) {
-	            throw new address_error_1.AddressError('IPv4 BigInt must be in the range 0 to 2**32 - 1');
-	        }
-	        return Address4.fromHex(bigInt.toString(16).padStart(8, '0'));
+	        return Address4.fromHex(bigInt.toString(16));
 	    }
 	    /**
-	     * Convert a byte array to an Address4 object.
-	     *
-	     * To convert from a Node.js `Buffer`, spread it: `Address4.fromByteArray([...buf])`.
+	     * Convert a byte array to an Address4 object
+	     * @memberof Address4
+	     * @static
 	     * @param {Array<number>} bytes - an array of 4 bytes (0-255)
 	     * @returns {Address4}
 	     */
@@ -3826,6 +3729,8 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Convert an unsigned byte array to an Address4 object
+	     * @memberof Address4
+	     * @static
 	     * @param {Array<number>} bytes - an array of 4 unsigned bytes (0-255)
 	     * @returns {Address4}
 	     */
@@ -3839,6 +3744,8 @@ function requireIpv4 () {
 	    /**
 	     * Returns the first n bits of the address, defaulting to the
 	     * subnet mask
+	     * @memberof Address4
+	     * @instance
 	     * @returns {String}
 	     */
 	    mask(mask) {
@@ -3849,6 +3756,8 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Returns the bits in the given range as a base-2 string
+	     * @memberof Address4
+	     * @instance
 	     * @returns {string}
 	     */
 	    getBitsBase2(start, end) {
@@ -3856,8 +3765,10 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Return the reversed ip6.arpa form of the address
+	     * @memberof Address4
 	     * @param {Object} options
 	     * @param {boolean} options.omitSuffix - omit the "in-addr.arpa" suffix
+	     * @instance
 	     * @returns {String}
 	     */
 	    reverseForm(options) {
@@ -3872,62 +3783,21 @@ function requireIpv4 () {
 	    }
 	    /**
 	     * Returns true if the given address is a multicast address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    isMulticast() {
-	        return this.isInSubnet(MULTICAST_V4);
-	    }
-	    /**
-	     * Returns true if the address is in one of the [RFC 1918](https://datatracker.ietf.org/doc/html/rfc1918) private address ranges (`10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`).
-	     * @returns {boolean}
-	     */
-	    isPrivate() {
-	        return PRIVATE_V4.some((subnet) => this.isInSubnet(subnet));
-	    }
-	    /**
-	     * Returns true if the address is in the loopback range `127.0.0.0/8` ([RFC 1122](https://datatracker.ietf.org/doc/html/rfc1122)).
-	     * @returns {boolean}
-	     */
-	    isLoopback() {
-	        return this.isInSubnet(LOOPBACK_V4);
-	    }
-	    /**
-	     * Returns true if the address is in the link-local range `169.254.0.0/16` ([RFC 3927](https://datatracker.ietf.org/doc/html/rfc3927)).
-	     * @returns {boolean}
-	     */
-	    isLinkLocal() {
-	        return this.isInSubnet(LINK_LOCAL_V4);
-	    }
-	    /**
-	     * Returns true if the address is the unspecified address `0.0.0.0`.
-	     * @returns {boolean}
-	     */
-	    isUnspecified() {
-	        return this.isInSubnet(UNSPECIFIED_V4);
-	    }
-	    /**
-	     * Returns true if the address is the limited broadcast address `255.255.255.255` ([RFC 919](https://datatracker.ietf.org/doc/html/rfc919)).
-	     * @returns {boolean}
-	     */
-	    isBroadcast() {
-	        return this.isInSubnet(BROADCAST_V4);
-	    }
-	    /**
-	     * Returns true if the address is in the carrier-grade NAT range `100.64.0.0/10` ([RFC 6598](https://datatracker.ietf.org/doc/html/rfc6598)).
-	     * @returns {boolean}
-	     */
-	    isCGNAT() {
-	        return this.isInSubnet(CGNAT_V4);
+	        return this.isInSubnet(new Address4('224.0.0.0/4'));
 	    }
 	    /**
 	     * Returns a zero-padded base-2 string representation of the address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {string}
 	     */
 	    binaryZeroPad() {
-	        if (this._binaryZeroPad === undefined) {
-	            this._binaryZeroPad = this.bigInt().toString(2).padStart(constants.BITS, '0');
-	        }
-	        return this._binaryZeroPad;
+	        return this.bigInt().toString(2).padStart(constants.BITS, '0');
 	    }
 	    /**
 	     * Groups an IPv4 address for inclusion at the end of an IPv6 address
@@ -3943,17 +3813,6 @@ function requireIpv4 () {
 	    }
 	}
 	ipv4.Address4 = Address4;
-	const MULTICAST_V4 = new Address4('224.0.0.0/4');
-	const PRIVATE_V4 = [
-	    new Address4('10.0.0.0/8'),
-	    new Address4('172.16.0.0/12'),
-	    new Address4('192.168.0.0/16'),
-	];
-	const LOOPBACK_V4 = new Address4('127.0.0.0/8');
-	const LINK_LOCAL_V4 = new Address4('169.254.0.0/16');
-	const UNSPECIFIED_V4 = new Address4('0.0.0.0/32');
-	const BROADCAST_V4 = new Address4('255.255.255.255/32');
-	const CGNAT_V4 = new Address4('100.64.0.0/10');
 	
 	return ipv4;
 }
@@ -4014,11 +3873,6 @@ function requireConstants () {
 	    '::1/128': 'Loopback',
 	    'ff00::/8': 'Multicast',
 	    'fe80::/10': 'Link-local unicast',
-	    'fc00::/7': 'Unique local',
-	    '2002::/16': '6to4',
-	    '2001:db8::/32': 'Documentation',
-	    '64:ff9b::/96': 'NAT64 (well-known)',
-	    '64:ff9b:1::/48': 'NAT64 (local-use)',
 	};
 	/**
 	 * A regular expression that matches bad characters in an IPv6 address
@@ -4058,24 +3912,15 @@ function requireHelpers$1 () {
 	if (hasRequiredHelpers$1) return helpers;
 	hasRequiredHelpers$1 = 1;
 	Object.defineProperty(helpers, "__esModule", { value: true });
-	helpers.escapeHtml = escapeHtml;
 	helpers.spanAllZeroes = spanAllZeroes;
 	helpers.spanAll = spanAll;
 	helpers.spanLeadingZeroes = spanLeadingZeroes;
 	helpers.simpleGroup = simpleGroup;
-	function escapeHtml(s) {
-	    return s
-	        .replace(/&/g, '&amp;')
-	        .replace(/</g, '&lt;')
-	        .replace(/>/g, '&gt;')
-	        .replace(/"/g, '&quot;')
-	        .replace(/'/g, '&#39;');
-	}
 	/**
 	 * @returns {String} the string with all zeroes contained in a <span>
 	 */
 	function spanAllZeroes(s) {
-	    return escapeHtml(s).replace(/(0+)/g, '<span class="zero">$1</span>');
+	    return s.replace(/(0+)/g, '<span class="zero">$1</span>');
 	}
 	/**
 	 * @returns {String} the string with each character contained in a <span>
@@ -4083,11 +3928,11 @@ function requireHelpers$1 () {
 	function spanAll(s, offset = 0) {
 	    const letters = s.split('');
 	    return letters
-	        .map((n, i) => `<span class="digit value-${escapeHtml(n)} position-${i + offset}">${spanAllZeroes(n)}</span>`)
+	        .map((n, i) => `<span class="digit value-${n} position-${i + offset}">${spanAllZeroes(n)}</span>`)
 	        .join('');
 	}
 	function spanLeadingZeroesSimple(group) {
-	    return escapeHtml(group).replace(/^(0+)/, '<span class="zero">$1</span>');
+	    return group.replace(/^(0+)/, '<span class="zero">$1</span>');
 	}
 	/**
 	 * @returns {String} the string with leading zeroes contained in a <span>
@@ -4149,7 +3994,7 @@ function requireRegularExpressions () {
 	regularExpressions.padGroup = padGroup;
 	regularExpressions.simpleRegularExpression = simpleRegularExpression;
 	regularExpressions.possibleElisions = possibleElisions;
-	const v6 = __importStar(/*@__PURE__*/ requireConstants());
+	const v6 = __importStar(requireConstants());
 	function groupPossibilities(possibilities) {
 	    return `(${possibilities.join('|')})`;
 	}
@@ -4249,15 +4094,14 @@ function requireIpv6 () {
 	};
 	Object.defineProperty(ipv6, "__esModule", { value: true });
 	ipv6.Address6 = void 0;
-	const common = __importStar(/*@__PURE__*/ requireCommon());
-	const constants4 = __importStar(/*@__PURE__*/ requireConstants$1());
-	const constants6 = __importStar(/*@__PURE__*/ requireConstants());
-	const helpers = __importStar(/*@__PURE__*/ requireHelpers$1());
-	const ipv4_1 = /*@__PURE__*/ requireIpv4();
-	const regular_expressions_1 = /*@__PURE__*/ requireRegularExpressions();
-	const address_error_1 = /*@__PURE__*/ requireAddressError();
-	const common_1 = /*@__PURE__*/ requireCommon();
-	const isCorrect6 = common.isCorrect(constants6.BITS);
+	const common = __importStar(requireCommon());
+	const constants4 = __importStar(requireConstants$1());
+	const constants6 = __importStar(requireConstants());
+	const helpers = __importStar(requireHelpers$1());
+	const ipv4_1 = requireIpv4();
+	const regular_expressions_1 = requireRegularExpressions();
+	const address_error_1 = requireAddressError();
+	const common_1 = requireCommon();
 	function assert(condition) {
 	    if (!condition) {
 	        throw new Error('Assertion failed.');
@@ -4301,6 +4145,7 @@ function requireIpv6 () {
 	}
 	/**
 	 * Represents an IPv6 address
+	 * @class Address6
 	 * @param {string} address - An IPv6 address string
 	 * @param {number} [groups=8] - How many octets to parse
 	 * @example
@@ -4317,14 +4162,18 @@ function requireIpv6 () {
 	        // #region Attributes
 	        /**
 	         * Returns true if the given address is in the subnet of the current address
+	         * @memberof Address6
+	         * @instance
 	         * @returns {boolean}
 	         */
 	        this.isInSubnet = common.isInSubnet;
 	        /**
 	         * Returns true if the address is correct, false otherwise
+	         * @memberof Address6
+	         * @instance
 	         * @returns {boolean}
 	         */
-	        this.isCorrect = isCorrect6;
+	        this.isCorrect = common.isCorrect(constants6.BITS);
 	        if (optionalGroups === undefined) {
 	            this.groups = constants6.GROUPS;
 	        }
@@ -4355,13 +4204,6 @@ function requireIpv6 () {
 	        this.addressMinusSuffix = address;
 	        this.parsedAddress = this.parse(this.addressMinusSuffix);
 	    }
-	    /**
-	     * Returns true if the given string is a valid IPv6 address (with optional
-	     * CIDR subnet and zone identifier), false otherwise. Host bits in the
-	     * subnet portion are allowed (e.g. `2001:db8::1/32` is valid); for strict
-	     * network-address validation compare `correctForm()` to
-	     * `startAddress().correctForm()`, or use `networkForm()`.
-	     */
 	    static isValid(address) {
 	        try {
 	            // eslint-disable-next-line no-new
@@ -4373,8 +4215,9 @@ function requireIpv6 () {
 	        }
 	    }
 	    /**
-	     * Convert a BigInt to a v6 address object. The value must be in the
-	     * range `[0, 2**128 - 1]`; otherwise `AddressError` is thrown.
+	     * Convert a BigInt to a v6 address object
+	     * @memberof Address6
+	     * @static
 	     * @param {bigint} bigInt - a BigInt to convert
 	     * @returns {Address6}
 	     * @example
@@ -4383,21 +4226,19 @@ function requireIpv6 () {
 	     * address.correctForm(); // '::e8:d4a5:1000'
 	     */
 	    static fromBigInt(bigInt) {
-	        if (bigInt < 0n || bigInt > (1n << BigInt(constants6.BITS)) - 1n) {
-	            throw new address_error_1.AddressError('IPv6 BigInt must be in the range 0 to 2**128 - 1');
-	        }
 	        const hex = bigInt.toString(16).padStart(32, '0');
 	        const groups = [];
-	        for (let i = 0; i < constants6.GROUPS; i++) {
+	        let i;
+	        for (i = 0; i < constants6.GROUPS; i++) {
 	            groups.push(hex.slice(i * 4, (i + 1) * 4));
 	        }
 	        return new Address6(groups.join(':'));
 	    }
 	    /**
-	     * Parse a URL (with optional bracketed host and port) into an address and
-	     * port. Returns either `{ address, port }` on success or
-	     * `{ error, address: null, port: null }` if the URL could not be parsed.
-	     * Ports are returned as numbers (or `null` if absent or out of range).
+	     * Convert a URL (with optional port number) to an address object
+	     * @memberof Address6
+	     * @static
+	     * @param {string} url - a URL with optional port number
 	     * @example
 	     * var addressAndPort = Address6.fromURL('http://[ffff::]:8080/foo/');
 	     * addressAndPort.address.correctForm(); // 'ffff::'
@@ -4456,92 +4297,10 @@ function requireIpv6 () {
 	            port,
 	        };
 	    }
-	    /**
-	     * Construct an `Address6` from an address and a hex subnet mask given as
-	     * separate strings (e.g. as returned by Node's `os.networkInterfaces()`).
-	     * Throws `AddressError` if the mask is non-contiguous (e.g.
-	     * `ffff::ffff`).
-	     * @example
-	     * var address = Address6.fromAddressAndMask('fe80::1', 'ffff:ffff:ffff:ffff::');
-	     * address.subnetMask; // 64
-	     */
-	    static fromAddressAndMask(address, mask) {
-	        const bits = common.prefixLengthFromMask(new Address6(mask).bigInt(), constants6.BITS);
-	        return new Address6(`${address}/${bits}`);
-	    }
-	    /**
-	     * Construct an `Address6` from an address and a Cisco-style wildcard mask
-	     * given as separate strings (e.g. `::ffff:ffff:ffff:ffff` for a `/64`).
-	     * The wildcard mask is the bitwise inverse of the subnet mask. Throws
-	     * `AddressError` if the mask is non-contiguous.
-	     * @example
-	     * var address = Address6.fromAddressAndWildcardMask('fe80::1', '::ffff:ffff:ffff:ffff');
-	     * address.subnetMask; // 64
-	     */
-	    static fromAddressAndWildcardMask(address, wildcardMask) {
-	        const wildcard = new Address6(wildcardMask).bigInt();
-	        const allOnes = (BigInt(1) << BigInt(constants6.BITS)) - BigInt(1);
-	        // eslint-disable-next-line no-bitwise
-	        const mask = wildcard ^ allOnes;
-	        const bits = common.prefixLengthFromMask(mask, constants6.BITS);
-	        return new Address6(`${address}/${bits}`);
-	    }
-	    /**
-	     * Construct an `Address6` from a wildcard pattern with trailing `*`
-	     * groups. The number of trailing wildcards determines the prefix
-	     * length: each `*` represents 16 bits. `::` is expanded to zero groups
-	     * (not wildcards) before evaluating trailing wildcards.
-	     *
-	     * Only trailing whole-group wildcards are supported. Partial-group
-	     * wildcards (e.g. `2001:db8::0*`) and interior wildcards (e.g.
-	     * `*::1`) throw `AddressError`.
-	     * @example
-	     * Address6.fromWildcard('2001:db8:*:*:*:*:*:*').subnet;  // '/32'
-	     * Address6.fromWildcard('2001:db8::*').subnet;           // '/112'
-	     * Address6.fromWildcard('*:*:*:*:*:*:*:*').subnet;       // '/0'
-	     */
-	    static fromWildcard(input) {
-	        if (input.includes('%') || input.includes('/')) {
-	            throw new address_error_1.AddressError('Wildcard pattern must not include a zone or CIDR suffix');
-	        }
-	        const halves = input.split('::');
-	        if (halves.length > 2) {
-	            throw new address_error_1.AddressError("Wildcard pattern cannot contain more than one '::'");
-	        }
-	        let groups;
-	        if (halves.length === 2) {
-	            const left = halves[0] === '' ? [] : halves[0].split(':');
-	            const right = halves[1] === '' ? [] : halves[1].split(':');
-	            const remaining = constants6.GROUPS - left.length - right.length;
-	            if (remaining < 1) {
-	                throw new address_error_1.AddressError("Wildcard pattern with '::' has too many groups");
-	            }
-	            groups = [...left, ...new Array(remaining).fill('0'), ...right];
-	        }
-	        else {
-	            groups = input.split(':');
-	        }
-	        if (groups.length !== constants6.GROUPS) {
-	            throw new address_error_1.AddressError('Wildcard pattern must have 8 groups');
-	        }
-	        let firstWildcard = -1;
-	        for (let i = 0; i < groups.length; i++) {
-	            if (groups[i] === '*') {
-	                if (firstWildcard === -1) {
-	                    firstWildcard = i;
-	                }
-	            }
-	            else if (firstWildcard !== -1) {
-	                throw new address_error_1.AddressError('Wildcard `*` must only appear in trailing groups (e.g. `2001:db8:*:*:*:*:*:*`)');
-	            }
-	        }
-	        const trailing = firstWildcard === -1 ? 0 : groups.length - firstWildcard;
-	        const replaced = groups.map((g) => (g === '*' ? '0' : g));
-	        const subnetBits = constants6.BITS - trailing * 16;
-	        return new Address6(`${replaced.join(':')}/${subnetBits}`);
-	    }
 	    /**
 	     * Create an IPv6-mapped address given an IPv4 address
+	     * @memberof Address6
+	     * @static
 	     * @param {string} address - An IPv4 address string
 	     * @returns {Address6}
 	     * @example
@@ -4556,6 +4315,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return an address from ip6.arpa form
+	     * @memberof Address6
+	     * @static
 	     * @param {string} arpaFormAddress - an 'ip6.arpa' form address
 	     * @returns {Adress6}
 	     * @example
@@ -4580,6 +4341,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the Microsoft UNC transcription of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String} the Microsoft UNC transcription of the address
 	     */
 	    microsoftTranscription() {
@@ -4587,6 +4350,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the first n bits of the address, defaulting to the subnet mask
+	     * @memberof Address6
+	     * @instance
 	     * @param {number} [mask=subnet] - the number of bits to mask
 	     * @returns {String} the first n bits of the address as a string
 	     */
@@ -4595,6 +4360,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the number of possible subnets of a given size in the address
+	     * @memberof Address6
+	     * @instance
 	     * @param {number} [subnetSize=128] - the subnet size
 	     * @returns {String}
 	     */
@@ -4610,6 +4377,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Helper function getting start address.
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */
 	    _startAddress() {
@@ -4618,6 +4387,8 @@ function requireIpv6 () {
 	    /**
 	     * The first address in the range given by this address' subnet
 	     * Often referred to as the Network Address.
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */
 	    startAddress() {
@@ -4626,6 +4397,8 @@ function requireIpv6 () {
 	    /**
 	     * The first host address in the range given by this address's subnet ie
 	     * the first address after the Network Address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */
 	    startAddressExclusive() {
@@ -4634,6 +4407,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Helper function getting end address.
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */
 	    _endAddress() {
@@ -4642,6 +4417,8 @@ function requireIpv6 () {
 	    /**
 	     * The last address in the range given by this address' subnet
 	     * Often referred to as the Broadcast
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */
 	    endAddress() {
@@ -4650,6 +4427,8 @@ function requireIpv6 () {
 	    /**
 	     * The last host address in the range given by this address's subnet ie
 	     * the last address prior to the Broadcast Address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */
 	    endAddressExclusive() {
@@ -4657,73 +4436,36 @@ function requireIpv6 () {
 	        return Address6.fromBigInt(this._endAddress() - adjust);
 	    }
 	    /**
-	     * The hex form of the subnet mask, e.g. `ffff:ffff:ffff:ffff::` for a
-	     * `/64`. Returns an `Address6`; call `.correctForm()` for the string.
-	     * @returns {Address6}
-	     */
-	    subnetMaskAddress() {
-	        return Address6.fromBigInt(BigInt(`0b${'1'.repeat(this.subnetMask)}${'0'.repeat(constants6.BITS - this.subnetMask)}`));
-	    }
-	    /**
-	     * The Cisco-style wildcard mask, e.g. `::ffff:ffff:ffff:ffff` for a
-	     * `/64`. This is the bitwise inverse of `subnetMaskAddress()`. Returns
-	     * an `Address6`; call `.correctForm()` for the string.
-	     * @returns {Address6}
-	     */
-	    wildcardMask() {
-	        return Address6.fromBigInt(BigInt(`0b${'0'.repeat(this.subnetMask)}${'1'.repeat(constants6.BITS - this.subnetMask)}`));
-	    }
-	    /**
-	     * The network address in CIDR string form, e.g. `2001:db8::/32` for
-	     * `2001:db8::1/32`. For an address with no explicit subnet the prefix
-	     * is `/128`, e.g. `networkForm()` on `2001:db8::1` returns
-	     * `2001:db8::1/128`.
-	     * @returns {string}
-	     */
-	    networkForm() {
-	        return `${this.startAddress().correctForm()}/${this.subnetMask}`;
-	    }
-	    /**
-	     * Return the scope of the address. The 4-bit scope field
-	     * ([RFC 4291 §2.7](https://datatracker.ietf.org/doc/html/rfc4291#section-2.7))
-	     * is only defined for multicast addresses; for unicast addresses the scope
-	     * is derived from the address type per
-	     * [RFC 4007 §6](https://datatracker.ietf.org/doc/html/rfc4007#section-6).
+	     * Return the scope of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */
 	    getScope() {
-	        const type = this.getType();
-	        if (type === 'Multicast' || type.startsWith('Multicast ')) {
-	            const scope = constants6.SCOPES[parseInt(this.getBits(12, 16).toString(10), 10)];
-	            return scope || 'Unknown';
-	        }
-	        // RFC 4291 §2.5.3: the loopback address is treated as having Link-Local
-	        // scope. (Multicast scope 1, "Interface-Local", is a different concept
-	        // used only for loopback transmission of multicast.)
-	        if (type === 'Link-local unicast' || type === 'Loopback') {
-	            return 'Link local';
+	        let scope = constants6.SCOPES[parseInt(this.getBits(12, 16).toString(10), 10)];
+	        if (this.getType() === 'Global unicast' && scope !== 'Link local') {
+	            scope = 'Global';
 	        }
-	        // RFC 4007 §6: the unspecified address has no scope.
-	        if (type === 'Unspecified') {
-	            return 'Unknown';
-	        }
-	        return 'Global';
+	        return scope || 'Unknown';
 	    }
 	    /**
 	     * Return the type of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */
 	    getType() {
-	        for (let i = 0; i < TYPE_SUBNETS.length; i++) {
-	            const entry = TYPE_SUBNETS[i];
-	            if (this.isInSubnet(entry[0])) {
-	                return entry[1];
+	        for (const subnet of Object.keys(constants6.TYPES)) {
+	            if (this.isInSubnet(new Address6(subnet))) {
+	                return constants6.TYPES[subnet];
 	            }
 	        }
 	        return 'Global unicast';
 	    }
 	    /**
 	     * Return the bits in the given range as a BigInt
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */
 	    getBits(start, end) {
@@ -4731,6 +4473,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the bits in the given range as a base-2 string
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */
 	    getBitsBase2(start, end) {
@@ -4738,6 +4482,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the bits in the given range as a base-16 string
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */
 	    getBitsBase16(start, end) {
@@ -4751,6 +4497,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the bits that are set past the subnet mask length
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */
 	    getBitsPastSubnet() {
@@ -4758,8 +4506,10 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the reversed ip6.arpa form of the address
+	     * @memberof Address6
 	     * @param {Object} options
 	     * @param {boolean} options.omitSuffix - omit the "ip6.arpa" suffix
+	     * @instance
 	     * @returns {String}
 	     */
 	    reverseForm(options) {
@@ -4785,10 +4535,10 @@ function requireIpv6 () {
 	        return 'ip6.arpa.';
 	    }
 	    /**
-	     * Returns the address in correct form, per
-	     * [RFC 5952](https://datatracker.ietf.org/doc/html/rfc5952): leading zeros
-	     * stripped, the longest run of zero groups collapsed to `::`, and hex digits
-	     * lowercased (e.g. `2001:db8::1`). This is the recommended form for display.
+	     * Return the correct form of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {String}
 	     */
 	    correctForm() {
 	        let i;
@@ -4832,6 +4582,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return a zero-padded base-2 string representation of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     * @example
 	     * var address = new Address6('2001:4860:4001:803::1011');
@@ -4840,22 +4592,10 @@ function requireIpv6 () {
 	     * //  0000000000000000000000000000000000000000000000000001000000010001'
 	     */
 	    binaryZeroPad() {
-	        if (this._binaryZeroPad === undefined) {
-	            this._binaryZeroPad = this.bigInt().toString(2).padStart(constants6.BITS, '0');
-	        }
-	        return this._binaryZeroPad;
+	        return this.bigInt().toString(2).padStart(constants6.BITS, '0');
 	    }
-	    /**
-	     * Parses a v4-in-v6 string (e.g. `::ffff:192.168.0.1`) by extracting the
-	     * trailing IPv4 address into `this.address4` / `this.parsedAddress4` and
-	     * returning the address with the v4 portion converted to two v6 groups.
-	     * Used internally by `parse()`.
-	     */
 	    // TODO: Improve the semantics of this helper function
 	    parse4in6(address) {
-	        if (address.indexOf('.') === -1) {
-	            return address;
-	        }
 	        const groups = address.split(':');
 	        const lastGroup = groups.slice(-1)[0];
 	        const address4 = lastGroup.match(constants4.RE_ADDRESS);
@@ -4864,12 +4604,7 @@ function requireIpv6 () {
 	            this.address4 = new ipv4_1.Address4(this.parsedAddress4);
 	            for (let i = 0; i < this.address4.groups; i++) {
 	                if (/^0[0-9]+/.test(this.address4.parsedAddress[i])) {
-	                    // The prefix groups haven't been through the bad-character check
-	                    // yet, so escape them before including in the error HTML.
-	                    const highlighted = this.address4.parsedAddress.map(spanLeadingZeroes4).join('.');
-	                    const prefix = groups.slice(0, -1).map(helpers.escapeHtml).join(':');
-	                    const separator = groups.length > 1 ? ':' : '';
-	                    throw new address_error_1.AddressError("IPv4 addresses can't have leading zeroes.", `${prefix}${separator}${highlighted}`);
+	                    throw new address_error_1.AddressError("IPv4 addresses can't have leading zeroes.", address.replace(constants4.RE_ADDRESS, this.address4.parsedAddress.map(spanLeadingZeroes4).join('.')));
 	                }
 	            }
 	            this.v4 = true;
@@ -4878,13 +4613,6 @@ function requireIpv6 () {
 	        }
 	        return address;
 	    }
-	    /**
-	     * Parses an IPv6 address string into its 8 hexadecimal groups (expanding
-	     * any `::` elision and any trailing v4-in-v6 portion) and stores the result
-	     * on `this.parsedAddress`. Called automatically by the constructor; you
-	     * typically don't need to call it directly. Throws `AddressError` if the
-	     * input is malformed.
-	     */
 	    // TODO: Make private?
 	    parse(address) {
 	        address = this.parse4in6(address);
@@ -4934,16 +4662,18 @@ function requireIpv6 () {
 	        return groups;
 	    }
 	    /**
-	     * Returns the canonical (fully expanded) form of the address: all 8 groups,
-	     * each padded to 4 hex digits, with no `::` collapsing
-	     * (e.g. `2001:0db8:0000:0000:0000:0000:0000:0001`). Useful for sorting and
-	     * byte-exact comparison.
+	     * Return the canonical form of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {String}
 	     */
 	    canonicalForm() {
 	        return this.parsedAddress.map(paddedHex).join(':');
 	    }
 	    /**
 	     * Return the decimal form of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */
 	    decimal() {
@@ -4951,6 +4681,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the address as a BigInt
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */
 	    bigInt() {
@@ -4958,6 +4690,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return the last two groups of this address as an IPv4 address string
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address4}
 	     * @example
 	     * var address = new Address6('2001:4860:4001::1825:bf11');
@@ -4965,10 +4699,12 @@ function requireIpv6 () {
 	     */
 	    to4() {
 	        const binary = this.binaryZeroPad().split('');
-	        return ipv4_1.Address4.fromHex(BigInt(`0b${binary.slice(96, 128).join('')}`).toString(16).padStart(8, '0'));
+	        return ipv4_1.Address4.fromHex(BigInt(`0b${binary.slice(96, 128).join('')}`).toString(16));
 	    }
 	    /**
 	     * Return the v4-in-v6 form of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */
 	    to4in6() {
@@ -4982,10 +4718,10 @@ function requireIpv6 () {
 	        return correct + infix + address4.address;
 	    }
 	    /**
-	     * Decodes the Teredo tunneling fields embedded in this address. Returns the
-	     * Teredo prefix, server IPv4, client IPv4, raw flag bits, cone-NAT flag,
-	     * UDP port, and Microsoft-format flag breakdown (reserved, universal/local,
-	     * group/individual, nonce). Only meaningful for addresses in `2001::/32`.
+	     * Return an object containing the Teredo properties of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {Object}
 	     */
 	    inspectTeredo() {
 	        /*
@@ -5016,7 +4752,7 @@ function requireIpv6 () {
 	        const server4 = ipv4_1.Address4.fromHex(this.getBitsBase16(32, 64));
 	        const bitsForClient4 = this.getBits(96, 128);
 	        // eslint-disable-next-line no-bitwise
-	        const client4 = ipv4_1.Address4.fromHex((bitsForClient4 ^ BigInt('0xffffffff')).toString(16).padStart(8, '0'));
+	        const client4 = ipv4_1.Address4.fromHex((bitsForClient4 ^ BigInt('0xffffffff')).toString(16));
 	        const flagsBase2 = this.getBitsBase2(64, 80);
 	        const coneNat = (0, common_1.testBit)(flagsBase2, 15);
 	        const reserved = (0, common_1.testBit)(flagsBase2, 14);
@@ -5039,9 +4775,10 @@ function requireIpv6 () {
 	        };
 	    }
 	    /**
-	     * Decodes the 6to4 tunneling fields embedded in this address. Returns the
-	     * 6to4 prefix and the embedded IPv4 gateway address. Only meaningful for
-	     * addresses in `2002::/16`.
+	     * Return an object containing the 6to4 properties of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {Object}
 	     */
 	    inspect6to4() {
 	        /*
@@ -5057,6 +4794,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Return a v6 6to4 address from a v6 v4inv6 address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */
 	    to6to4() {
@@ -5073,80 +4812,9 @@ function requireIpv6 () {
 	        return new Address6(addr6to4);
 	    }
 	    /**
-	     * Embed an IPv4 address into a NAT64 IPv6 address using the encoding
-	     * defined by [RFC 6052](https://datatracker.ietf.org/doc/html/rfc6052).
-	     * The default prefix is the well-known prefix `64:ff9b::/96`. The prefix
-	     * length must be one of 32, 40, 48, 56, 64, or 96; for prefixes shorter
-	     * than /64 the IPv4 octets are split around the reserved bits 64–71.
-	     * @example
-	     * Address6.fromAddress4Nat64('192.0.2.33').correctForm(); // '64:ff9b::c000:221'
-	     * Address6.fromAddress4Nat64('192.0.2.33', '2001:db8::/32').correctForm(); // '2001:db8:c000:221::'
-	     */
-	    static fromAddress4Nat64(address, prefix = '64:ff9b::/96') {
-	        const v4 = new ipv4_1.Address4(address);
-	        const prefix6 = new Address6(prefix);
-	        const pl = prefix6.subnetMask;
-	        if (pl !== 32 && pl !== 40 && pl !== 48 && pl !== 56 && pl !== 64 && pl !== 96) {
-	            throw new address_error_1.AddressError('NAT64 prefix length must be 32, 40, 48, 56, 64, or 96');
-	        }
-	        const prefixBits = prefix6.binaryZeroPad();
-	        const v4Bits = v4.binaryZeroPad();
-	        let bits;
-	        if (pl === 96) {
-	            bits = prefixBits.slice(0, 96) + v4Bits;
-	        }
-	        else {
-	            const beforeU = 64 - pl;
-	            bits =
-	                prefixBits.slice(0, pl) +
-	                    v4Bits.slice(0, beforeU) +
-	                    '00000000' +
-	                    v4Bits.slice(beforeU) +
-	                    '0'.repeat(128 - 72 - (32 - beforeU));
-	        }
-	        const hex = BigInt(`0b${bits}`).toString(16).padStart(32, '0');
-	        const groups = [];
-	        for (let i = 0; i < 8; i++) {
-	            groups.push(hex.slice(i * 4, (i + 1) * 4));
-	        }
-	        return new Address6(groups.join(':'));
-	    }
-	    /**
-	     * Extract the embedded IPv4 address from a NAT64 IPv6 address using the
-	     * encoding defined by [RFC 6052](https://datatracker.ietf.org/doc/html/rfc6052).
-	     * The default prefix is the well-known prefix `64:ff9b::/96`. Returns
-	     * `null` if this address is not contained within the given prefix.
-	     * @example
-	     * new Address6('64:ff9b::c000:221').toAddress4Nat64()!.correctForm(); // '192.0.2.33'
-	     */
-	    toAddress4Nat64(prefix = '64:ff9b::/96') {
-	        const prefix6 = new Address6(prefix);
-	        const pl = prefix6.subnetMask;
-	        if (pl !== 32 && pl !== 40 && pl !== 48 && pl !== 56 && pl !== 64 && pl !== 96) {
-	            throw new address_error_1.AddressError('NAT64 prefix length must be 32, 40, 48, 56, 64, or 96');
-	        }
-	        if (!this.isInSubnet(prefix6)) {
-	            return null;
-	        }
-	        const bits = this.binaryZeroPad();
-	        let v4Bits;
-	        if (pl === 96) {
-	            v4Bits = bits.slice(96, 128);
-	        }
-	        else {
-	            const beforeU = 64 - pl;
-	            v4Bits = bits.slice(pl, pl + beforeU) + bits.slice(72, 72 + (32 - beforeU));
-	        }
-	        const octets = [];
-	        for (let i = 0; i < 4; i++) {
-	            octets.push(parseInt(v4Bits.slice(i * 8, (i + 1) * 8), 2).toString());
-	        }
-	        return new ipv4_1.Address4(octets.join('.'));
-	    }
-	    /**
-	     * Return a byte array.
-	     *
-	     * To get a Node.js `Buffer`, wrap the result: `Buffer.from(address.toByteArray())`.
+	     * Return a byte array
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Array}
 	     */
 	    toByteArray() {
@@ -5160,27 +4828,27 @@ function requireIpv6 () {
 	        return bytes;
 	    }
 	    /**
-	     * Return an unsigned byte array.
-	     *
-	     * To get a Node.js `Buffer`, wrap the result: `Buffer.from(address.toUnsignedByteArray())`.
+	     * Return an unsigned byte array
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Array}
 	     */
 	    toUnsignedByteArray() {
 	        return this.toByteArray().map(unsignByte);
 	    }
 	    /**
-	     * Convert a byte array to an Address6 object.
-	     *
-	     * To convert from a Node.js `Buffer`, spread it: `Address6.fromByteArray([...buf])`.
+	     * Convert a byte array to an Address6 object
+	     * @memberof Address6
+	     * @static
 	     * @returns {Address6}
 	     */
 	    static fromByteArray(bytes) {
 	        return this.fromUnsignedByteArray(bytes.map(unsignByte));
 	    }
 	    /**
-	     * Convert an unsigned byte array to an Address6 object.
-	     *
-	     * To convert from a Node.js `Buffer`, spread it: `Address6.fromUnsignedByteArray([...buf])`.
+	     * Convert an unsigned byte array to an Address6 object
+	     * @memberof Address6
+	     * @static
 	     * @returns {Address6}
 	     */
 	    static fromUnsignedByteArray(bytes) {
@@ -5195,6 +4863,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Returns true if the address is in the canonical form, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    isCanonical() {
@@ -5202,6 +4872,8 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Returns true if the address is a link local address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    isLinkLocal() {
@@ -5214,81 +4886,53 @@ function requireIpv6 () {
 	    }
 	    /**
 	     * Returns true if the address is a multicast address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    isMulticast() {
-	        const type = this.getType();
-	        return type === 'Multicast' || type.startsWith('Multicast ');
+	        return this.getType() === 'Multicast';
 	    }
 	    /**
-	     * Returns true if the address was written in v4-in-v6 dotted-quad notation
-	     * (e.g. `::ffff:127.0.0.1`), false otherwise. This is a notation-level flag
-	     * and does not reflect whether the address bits lie in the IPv4-mapped
-	     * (`::ffff:0:0/96`) subnet — for that, see {@link isMapped4}.
+	     * Returns true if the address is a v4-in-v6 address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    is4() {
 	        return this.v4;
 	    }
-	    /**
-	     * Returns true if the address is an IPv4-mapped IPv6 address in
-	     * `::ffff:0:0/96` ([RFC 4291 §2.5.5.2](https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.5.2)),
-	     * false otherwise. Unlike {@link is4}, this checks the underlying address
-	     * bits rather than the textual notation, so `::ffff:127.0.0.1` and
-	     * `::ffff:7f00:1` both return true.
-	     * @returns {boolean}
-	     */
-	    isMapped4() {
-	        return this.isInSubnet(IPV4_MAPPED_SUBNET);
-	    }
 	    /**
 	     * Returns true if the address is a Teredo address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    isTeredo() {
-	        return this.isInSubnet(TEREDO_SUBNET);
+	        return this.isInSubnet(new Address6('2001::/32'));
 	    }
 	    /**
 	     * Returns true if the address is a 6to4 address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    is6to4() {
-	        return this.isInSubnet(SIX_TO_FOUR_SUBNET);
+	        return this.isInSubnet(new Address6('2002::/16'));
 	    }
 	    /**
 	     * Returns true if the address is a loopback address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */
 	    isLoopback() {
 	        return this.getType() === 'Loopback';
 	    }
-	    /**
-	     * Returns true if the address is a Unique Local Address in `fc00::/7` ([RFC 4193](https://datatracker.ietf.org/doc/html/rfc4193)). ULAs are the IPv6 equivalent of IPv4 [RFC 1918](https://datatracker.ietf.org/doc/html/rfc1918) private addresses.
-	     * @returns {boolean}
-	     */
-	    isULA() {
-	        return this.isInSubnet(ULA_SUBNET);
-	    }
-	    /**
-	     * Returns true if the address is the unspecified address `::`.
-	     * @returns {boolean}
-	     */
-	    isUnspecified() {
-	        return this.getType() === 'Unspecified';
-	    }
-	    /**
-	     * Returns true if the address is in the documentation prefix `2001:db8::/32` ([RFC 3849](https://datatracker.ietf.org/doc/html/rfc3849)).
-	     * @returns {boolean}
-	     */
-	    isDocumentation() {
-	        return this.isInSubnet(DOCUMENTATION_SUBNET);
-	    }
 	    // #endregion
 	    // #region HTML
 	    /**
-	     * Returns the address as an HTTP URL with the host bracketed, e.g.
-	     * `http://[2001:db8::1]/`. If `optionalPort` is provided it is appended,
-	     * e.g. `http://[2001:db8::1]:8080/`.
+	     * @returns {String} the address in link form with a default port of 80
 	     */
 	    href(optionalPort) {
 	        if (optionalPort === undefined) {
@@ -5300,12 +4944,7 @@ function requireIpv6 () {
 	        return `http://[${this.correctForm()}]${optionalPort}/`;
 	    }
 	    /**
-	     * Returns an HTML `<a>` element whose `href` encodes the address in a URL
-	     * hash fragment (default prefix `/#address=`). Useful for linking between
-	     * pages of an address-inspector UI.
-	     * @param options.className - CSS class for the rendered `<a>` element
-	     * @param options.prefix - hash prefix prepended to the address (default `/#address=`)
-	     * @param options.v4 - when true, render the address in v4-in-v6 form
+	     * @returns {String} a link suitable for conveying the address via a URL hash
 	     */
 	    link(options) {
 	        if (!options) {
@@ -5325,13 +4964,10 @@ function requireIpv6 () {
 	            formFunction = this.to4in6;
 	        }
 	        const form = formFunction.call(this);
-	        const safeHref = helpers.escapeHtml(`${options.prefix}${form}`);
-	        const safeForm = helpers.escapeHtml(form);
 	        if (options.className) {
-	            const safeClass = helpers.escapeHtml(options.className);
-	            return `<a href="${safeHref}" class="${safeClass}">${safeForm}</a>`;
+	            return `<a href="${options.prefix}${form}" class="${options.className}">${form}</a>`;
 	        }
-	        return `<a href="${safeHref}">${safeForm}</a>`;
+	        return `<a href="${options.prefix}${form}">${form}</a>`;
 	    }
 	    /**
 	     * Groups an address
@@ -5340,13 +4976,13 @@ function requireIpv6 () {
 	    group() {
 	        if (this.elidedGroups === 0) {
 	            // The simple case
-	            return helpers.simpleGroup(this.addressMinusSuffix).join(':');
+	            return helpers.simpleGroup(this.address).join(':');
 	        }
 	        assert(typeof this.elidedGroups === 'number');
 	        assert(typeof this.elisionBegin === 'number');
 	        // The elided case
 	        const output = [];
-	        const [left, right] = this.addressMinusSuffix.split('::');
+	        const [left, right] = this.address.split('::');
 	        if (left.length) {
 	            output.push(...helpers.simpleGroup(left));
 	        }
@@ -5376,6 +5012,8 @@ function requireIpv6 () {
 	    /**
 	     * Generate a regular expression string that can be used to find or validate
 	     * all variations of this address
+	     * @memberof Address6
+	     * @instance
 	     * @param {boolean} substringSearch
 	     * @returns {string}
 	     */
@@ -5420,6 +5058,8 @@ function requireIpv6 () {
 	    /**
 	     * Generate a regular expression that can be used to find or validate all
 	     * variations of this address.
+	     * @memberof Address6
+	     * @instance
 	     * @param {boolean} substringSearch
 	     * @returns {RegExp}
 	     */
@@ -5428,15 +5068,6 @@ function requireIpv6 () {
 	    }
 	}
 	ipv6.Address6 = Address6;
-	const TYPE_SUBNETS = Object.keys(constants6.TYPES).map((subnet) => [
-	    new Address6(subnet),
-	    constants6.TYPES[subnet],
-	]);
-	const TEREDO_SUBNET = new Address6('2001::/32');
-	const SIX_TO_FOUR_SUBNET = new Address6('2002::/16');
-	const ULA_SUBNET = new Address6('fc00::/7');
-	const DOCUMENTATION_SUBNET = new Address6('2001:db8::/32');
-	const IPV4_MAPPED_SUBNET = new Address6('::ffff:0:0/96');
 	
 	return ipv6;
 }
@@ -5446,7 +5077,7 @@ var hasRequiredIpAddress;
 function requireIpAddress () {
 	if (hasRequiredIpAddress) return ipAddress;
 	hasRequiredIpAddress = 1;
-	(function (exports) {
+	(function (exports$1) {
 		var __createBinding = (ipAddress && ipAddress.__createBinding) || (Object.create ? (function(o, m, k, k2) {
 		    if (k2 === undefined) k2 = k;
 		    var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -5470,16 +5101,16 @@ function requireIpAddress () {
 		    __setModuleDefault(result, mod);
 		    return result;
 		};
-		Object.defineProperty(exports, "__esModule", { value: true });
-		exports.v6 = exports.AddressError = exports.Address6 = exports.Address4 = void 0;
-		var ipv4_1 = /*@__PURE__*/ requireIpv4();
-		Object.defineProperty(exports, "Address4", { enumerable: true, get: function () { return ipv4_1.Address4; } });
-		var ipv6_1 = /*@__PURE__*/ requireIpv6();
-		Object.defineProperty(exports, "Address6", { enumerable: true, get: function () { return ipv6_1.Address6; } });
-		var address_error_1 = /*@__PURE__*/ requireAddressError();
-		Object.defineProperty(exports, "AddressError", { enumerable: true, get: function () { return address_error_1.AddressError; } });
-		const helpers = __importStar(/*@__PURE__*/ requireHelpers$1());
-		exports.v6 = { helpers };
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		exports$1.v6 = exports$1.AddressError = exports$1.Address6 = exports$1.Address4 = void 0;
+		var ipv4_1 = requireIpv4();
+		Object.defineProperty(exports$1, "Address4", { enumerable: true, get: function () { return ipv4_1.Address4; } });
+		var ipv6_1 = requireIpv6();
+		Object.defineProperty(exports$1, "Address6", { enumerable: true, get: function () { return ipv6_1.Address6; } });
+		var address_error_1 = requireAddressError();
+		Object.defineProperty(exports$1, "AddressError", { enumerable: true, get: function () { return address_error_1.AddressError; } });
+		const helpers = __importStar(requireHelpers$1());
+		exports$1.v6 = { helpers };
 		
 	} (ipAddress));
 	return ipAddress;
@@ -5495,7 +5126,7 @@ function requireHelpers () {
 	const util_1 = requireUtil();
 	const constants_1 = requireConstants$2();
 	const stream = require$$2$1;
-	const ip_address_1 = /*@__PURE__*/ requireIpAddress();
+	const ip_address_1 = requireIpAddress();
 	const net$1 = net;
 	/**
 	 * Validates the provided SocksClientOptions
@@ -5716,7 +5347,7 @@ var hasRequiredSocksclient;
 function requireSocksclient () {
 	if (hasRequiredSocksclient) return socksclient;
 	hasRequiredSocksclient = 1;
-	(function (exports) {
+	(function (exports$1) {
 		var __awaiter = (socksclient && socksclient.__awaiter) || function (thisArg, _arguments, P, generator) {
 		    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 		    return new (P || (P = Promise))(function (resolve, reject) {
@@ -5726,8 +5357,8 @@ function requireSocksclient () {
 		        step((generator = generator.apply(thisArg, _arguments || [])).next());
 		    });
 		};
-		Object.defineProperty(exports, "__esModule", { value: true });
-		exports.SocksClientError = exports.SocksClient = void 0;
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		exports$1.SocksClientError = exports$1.SocksClient = void 0;
 		const events_1 = require$$0;
 		const net$1 = net;
 		const smart_buffer_1 = requireSmartbuffer();
@@ -5735,8 +5366,8 @@ function requireSocksclient () {
 		const helpers_1 = requireHelpers();
 		const receivebuffer_1 = requireReceivebuffer();
 		const util_1 = requireUtil();
-		Object.defineProperty(exports, "SocksClientError", { enumerable: true, get: function () { return util_1.SocksClientError; } });
-		const ip_address_1 = /*@__PURE__*/ requireIpAddress();
+		Object.defineProperty(exports$1, "SocksClientError", { enumerable: true, get: function () { return util_1.SocksClientError; } });
+		const ip_address_1 = requireIpAddress();
 		class SocksClient extends events_1.EventEmitter {
 		    constructor(options) {
 		        super();
@@ -6507,7 +6138,7 @@ function requireSocksclient () {
 		        return Object.assign({}, this.options);
 		    }
 		}
-		exports.SocksClient = SocksClient;
+		exports$1.SocksClient = SocksClient;
 		
 	} (socksclient));
 	return socksclient;
@@ -6518,7 +6149,7 @@ var hasRequiredBuild;
 function requireBuild () {
 	if (hasRequiredBuild) return build$1;
 	hasRequiredBuild = 1;
-	(function (exports) {
+	(function (exports$1) {
 		var __createBinding = (build$1 && build$1.__createBinding) || (Object.create ? (function(o, m, k, k2) {
 		    if (k2 === undefined) k2 = k;
 		    var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -6530,11 +6161,11 @@ function requireBuild () {
 		    if (k2 === undefined) k2 = k;
 		    o[k2] = m[k];
 		}));
-		var __exportStar = (build$1 && build$1.__exportStar) || function(m, exports) {
-		    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+		var __exportStar = (build$1 && build$1.__exportStar) || function(m, exports$1) {
+		    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$1, p)) __createBinding(exports$1, m, p);
 		};
-		Object.defineProperty(exports, "__esModule", { value: true });
-		__exportStar(requireSocksclient(), exports);
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		__exportStar(requireSocksclient(), exports$1);
 		
 	} (build$1));
 	return build$1;
@@ -6960,7 +6591,20 @@ function buildCookieHeaderFromSetCookies(setCookies) {
 function isVerboseEnabled() {
     return process.argv.includes('--verbose');
 }
-// ppe_dev_tool
+/**
+ * PPE / 测试环境开关。
+ *
+ * 所有 CLI 接口（`stark_wasm/v4/*`, `wasm-collect/v1/*`, portal 鉴权等）
+ * 都共用本文件的 `request()`，所以在这里统一注入 PPE header 就能覆盖全量。
+ * 不在 `DEV_HEADERS` 里改是因为那份常量只被 `remotePipeline.ts` 里的老
+ * 远程分包接口 spread 用；新加的 `startSession.ts` / `finishSession.ts` /
+ * `getCollectedFuncIds.ts` 都没 spread，漏一处就会绕开 PPE。
+ *
+ * 要切回线上环境，直接把 `CLI_PPE_ENV` 设成空串即可（下方条件 spread 会
+ * 自动不带这两个 header）。
+ */
+// const CLI_PPE_ENV: string = 'ppe_wasm_test'; // 走 PPE 测试环境
+const CLI_PPE_ENV = ''; // 走线上服务（空串 => 下方条件 spread 不注入 PPE header）
 function getAxiosProxyConfig() {
     const config = getTTMGRC();
     // 优先级: http-proxy > socks-proxy > proxy (老字段兼容)
@@ -7124,8 +6768,11 @@ async function request({ url, method, data, headers, params, }) {
             params,
             headers: {
                 Cookie: cookie,
-                // 'x-use-ppe': '1',
-                // 'x-tt-env': 'ppe_upgrade_script',
+                // 注入 PPE header — 放在 caller headers 之前，允许单个调用点通过
+                // 显式传 `x-tt-env` 来覆盖本次请求（例如某个接口还没在 PPE 上发布）。
+                ...(CLI_PPE_ENV
+                    ? { 'x-use-ppe': '1', 'x-tt-env': CLI_PPE_ENV }
+                    : {}),
                 ...(headers || {}),
             },
             ...proxyConfig,
@@ -7167,7 +6814,6 @@ async function request({ url, method, data, headers, params, }) {
     }
 }
 async function download(url, filePath) {
-    // 清理旧文件
     if (fs.existsSync(filePath)) {
         try {
             fs.unlinkSync(filePath);
@@ -7175,16 +6821,31 @@ async function download(url, filePath) {
         catch { }
     }
     const proxyConfig = getAxiosProxyConfig();
+    console.log('[download] start', { url: url.slice(0, 120), filePath, hasProxy: !!proxyConfig.httpsAgent });
     try {
         const res = await axios.get(url, {
             responseType: 'stream',
-            // 让非 2xx 进入 catch
             validateStatus: s => s >= 200 && s < 300,
+            // Bail out if the server doesn't start responding within 30s instead of
+            // hanging forever (e.g. proxy misrouting a CDN signed URL).
+            timeout: 30000,
             ...proxyConfig,
         });
-        // 关键：把“流事件”封装为 Promise，并 await 它
+        const total = Number(res.headers['content-length'] || 0);
+        let received = 0;
+        let lastLoggedPct = -1;
+        const startedAt = Date.now();
         await new Promise((resolve, reject) => {
             const writer = fs.createWriteStream(filePath);
+            // Inactivity watchdog: if no bytes arrive for 60s mid-stream, abort.
+            let inactivityTimer = null;
+            const resetInactivity = () => {
+                if (inactivityTimer)
+                    clearTimeout(inactivityTimer);
+                inactivityTimer = setTimeout(() => {
+                    onError(new Error('download stalled: no data for 60s'));
+                }, 60000);
+            };
             const onError = (e) => {
                 cleanup();
                 try {
@@ -7196,28 +6857,42 @@ async function download(url, filePath) {
             };
             const onClose = () => {
                 cleanup();
+                console.log(`[download] done: ${received} bytes in ${Date.now() - startedAt}ms`);
                 resolve();
             };
             const cleanup = () => {
+                if (inactivityTimer)
+                    clearTimeout(inactivityTimer);
                 writer.off('error', onError);
                 writer.off('close', onClose);
                 res.data.off('error', onError);
+                res.data.off('data', onData);
+            };
+            const onData = (chunk) => {
+                received += chunk.length;
+                resetInactivity();
+                if (total > 0) {
+                    const pct = Math.floor((received / total) * 10) * 10;
+                    if (pct !== lastLoggedPct) {
+                        lastLoggedPct = pct;
+                        console.log(`[download] ${pct}% (${received}/${total})`);
+                    }
+                }
             };
             res.data.on('error', onError);
+            res.data.on('data', onData);
             writer.on('error', onError);
             writer.on('close', onClose);
+            resetInactivity();
             res.data.pipe(writer);
         });
-        // 成功
         return { ok: true };
     }
     catch (err) {
-        // 403 等受控处理
+        console.log('[download] failed:', err?.message);
         if (isAxiosError(err) && err.response?.status === 403) {
-            // 不抛出，让上层自行决定
             throw new Error('下载链接已过期，请重新进行分包后重试');
         }
-        // 其他错误抛出或返回
         throw err;
     }
 }
@@ -9212,11 +8887,19 @@ const zipCwdToBuffer = (customIgnores = [], targetDir = process.cwd()) => {
         });
         archive.pipe(output);
         // 1. 基础忽略列表 (建议保留这些基础规则，防止包过大)
+        //
+        // 注意 `${TTMG_TEMP_DIR}/**` 必须显式写出：archiver 用的 picomatch 在
+        // 没有 `/**` 后缀时只匹配根目录下的同名条目，不会递归匹配目录内容。
+        // 历史 bug：只写 `__TTMG_TEMP__` 时，`__TTMG_TEMP__/wasmcode/<basename>.br`
+        //（prepare 阶段缓存的「原始未插桩 wasm 备份」）等内部文件全部被打进 zip
+        // 推到设备，体积虚胖外，host 在 fallback 路径下还可能错误命中未插桩 wasm。
+        // 同时保留裸名 `TTMG_TEMP_DIR` 以兜底空目录场景。
         const defaultIgnores = [
             'node_modules/**',
             '.git/**',
             '.DS_Store',
             ttmgPack.TTMG_TEMP_DIR,
+            `${ttmgPack.TTMG_TEMP_DIR}/**`,
             '*.zip', // 忽略自身生成的 zip
         ];
         // 2. 合并自定义规则
@@ -10482,7 +10165,12 @@ const gameUploadRoute = {
     },
 };
 
+// 历史遗留：`remotePipeline.ts` 里的老远程分包接口 spread 了 `DEV_HEADERS`。
+// 目前全局 PPE 走的是 `libs/api/request.ts` 里的 `CLI_PPE_ENV`，这里保持
+// 相同的值是为了：一旦以后需要按接口粒度覆盖 PPE（例如远程走 PPE、本地
+// 走线上），只需在这里填回 header、两处值天然一致。
 const BASE_URL = 'https://developers.tiktok.com';
+const WASM_COLLECT_BASE_URL = `${BASE_URL}/api/wasm-collect/v1`;
 const DEV_HEADERS = {
 // 'x-use-ppe': '1',
 // 'x-tt-env': UNITY_PPE_ENV,
@@ -10505,6 +10193,8 @@ const UNITY_WASM_SPLIT_CONFIG_FIELD_SCHEME = {
     WASMSPLITVERSION: `"$WASMSPLITVERSION"`,
     ENABLEWASMSPLIT: `"$ENABLEWASMSPLIT"`,
     IOS_SUB_JS_FILE_CONFIG: `"$IOS_SUB_JS_FILE_CONFIG"`,
+    ENABLEARCHIVEMODE: `"$ENABLEARCHIVEMODE"`,
+    ARCHIVE_CODE_FILE_MD5: `$ARCHIVE_CODE_FILE_MD5`,
 };
 
 const DIR_SPLIT = 'split';
@@ -10532,7 +10222,34 @@ const WASM_SPLIT_SUBPACKAGE_CONFIG = {
         name: 'wasmcode1-ios',
         root: 'wasmcode1-ios/',
     },
+    // archive 模式 split 产物：wasmcode/（主包，包含原文件名以外的 main wasm）+
+    // 下面这两个独立子包目录。回滚 / 取消时必须把它们一起清掉，否则下次构建仍会
+    // 把旧的 sub/archive 文件打进 zip 推到设备。
+    archiveSub: {
+        name: 'wasmcode1',
+        root: 'wasmcode1/',
+    },
+    archiveCode: {
+        name: 'wasmcode-archive',
+        root: 'wasmcode-archive/',
+    },
 };
+/**
+ * 所有由 split 流程生成、应在 cancel / reset 时被整目录删除的产物目录。
+ * 注意不包含 `origin`（wasmcode/）—— 那是 Unity 原生输出目录，回滚时只能
+ * 把里面的 split 产物 .br 清掉、再把原始 wasm 拷回去，整个删掉会破坏工程。
+ *
+ * 单一事实来源：`restoreFromCache` / `resetWasmSplit` / `cancelSplit` 都从
+ * 这里读取，避免新增模式时漏改某一处导致旧产物泄漏到 zip。
+ */
+const SPLIT_OUTPUT_DIRS = [
+    WASM_SPLIT_SUBPACKAGE_CONFIG.androidMain.root,
+    WASM_SPLIT_SUBPACKAGE_CONFIG.androidSub.root,
+    WASM_SPLIT_SUBPACKAGE_CONFIG.ios.root,
+    WASM_SPLIT_SUBPACKAGE_CONFIG.iosSub.root,
+    WASM_SPLIT_SUBPACKAGE_CONFIG.archiveSub.root,
+    WASM_SPLIT_SUBPACKAGE_CONFIG.archiveCode.root,
+];
 const WASM_FILENAME_SUFFIX = '.webgl.wasm.code.unityweb.wasm';
 const BR_SUFFIX = '.br';
 // 输出 JSON 格式
@@ -10543,97 +10260,42 @@ const CONCURRENCY_LIMIT = 2;
 const DOWNLOAD_RETRY = 3;
 const WASM_SPLIT_CONFIG_FILE_NAME = 'webgl-wasm-split.js';
 
-// prepare.ts
-// 若你的 request 是 axios：你可以添加 maxBodyLength/ maxContentLength 等参数
-// 若是 got：可直接传 form 实例
-async function startPrepare(params) {
-    const form = new FormData$1();
-    form.append('desc', params.desc);
-    form.append('wasm_md5', params.wasm_md5);
-    form.append('with_ios', 'true');
-    // 二进制字段：用 ReadStream（推荐）或 Buffer
-    form.append('wasm_file', fs$1.createReadStream(path$1.join(process.cwd(), params.wasm_file_path)), {
-        filename: path$1.basename(params.wasm_file_path),
-        // 部分后端会依赖 content-type；如果不确定就用 application/octet-stream
-        contentType: 'application/wasm',
-    });
-    /**
-     * 兼容 WASM_SYMBOL_FILE_NAME
-     * case 1：项目根目录有 webgl.symbols.json 文件
-     * case 2：项目根目录没有 webgl.symbols.json 文件，但 TTMG_TEMP_DIR 有
-     * 优先读 2
-     */
-    let symbolFilePath = path$1.join(process.cwd(), TTMG_TEMP_DIR, WASM_SYMBOL_FILE_NAME);
-    if (!fs$1.existsSync(symbolFilePath)) {
-        symbolFilePath = path$1.join(process.cwd(), WASM_SYMBOL_FILE_NAME);
-    }
-    /**
-     * 判断是否有 symbol 文件，有则上传，没有直接接口报错
-     */
-    if (!fs$1.existsSync(symbolFilePath)) {
-        return {
-            error: {
-                code: 400,
-                message: `${WASM_SYMBOL_FILE_NAME} not found at ${path$1.join(process.cwd())}，use unity plugin to rebuild`,
-                client_key: params.client_key,
-            },
-            data: null,
-            ctx: {
-                logid: '',
-                httpStatusCode: 400,
-            },
-        };
-    }
-    form.append('wasm_symbol_file', fs$1.createReadStream(symbolFilePath), {
-        filename: WASM_SYMBOL_FILE_NAME,
-        contentType: 'application/octet-stream',
-    });
-    // 关键：用 form.getHeaders() 获取带 boundary 的 Content-Type
-    const formHeaders = form.getHeaders();
-    return request({
-        url: `${BASE_URL}/api/stark_wasm/v4/post/prepare`,
-        method: 'POST',
-        headers: {
-            ...DEV_HEADERS,
-            ...formHeaders, // 包含正确的 multipart/form-data; boundary=...
-        },
-        params: {
-            client_key: params.client_key,
-            with_ios: true,
-        },
-        data: form,
-        // 若 request 基于 axios，建议加上以下两项以支持大文件：
-    });
-}
-
-async function withRetry(fn, retries = 3) {
-    let lastErr;
-    for (let i = 0; i < retries; i++) {
-        try {
-            return await fn();
-        }
-        catch (e) {
-            lastErr = e;
-            const delay = 2 ** i * 300;
-            await new Promise(r => setTimeout(r, delay));
-        }
+async function withRetry(fn, retries = 3) {
+    let lastErr;
+    for (let i = 0; i < retries; i++) {
+        try {
+            return await fn();
+        }
+        catch (e) {
+            lastErr = e;
+            const delay = 2 ** i * 300;
+            await new Promise(r => setTimeout(r, delay));
+        }
     }
     throw lastErr;
 }
 
 function updateWasmSplitConfig(fields) {
+    const configFilePath = path.join(process.cwd(), WASM_SPLIT_CONFIG_FILE_NAME);
+    let config = fs.readFileSync(configFilePath, 'utf-8');
     for (const field in fields) {
         const value = fields[field];
-        const isString = typeof value === 'string';
-        const valueStr = isString ? value : String(value);
-        const configFilePath = path.join(process.cwd(), WASM_SPLIT_CONFIG_FILE_NAME);
         const placeholder = UNITY_WASM_SPLIT_CONFIG_FIELD_SCHEME[field];
-        const config = fs.readFileSync(configFilePath, 'utf-8');
-        // 将占位符替换为 true/false 字面量
-        // 用正则？因为 placeholder 是一个字符串，可能包含特殊字符
-        const updated = config.replace(placeholder, valueStr);
-        fs.writeFileSync(configFilePath, updated, 'utf-8');
+        if (!placeholder)
+            continue;
+        let replacement;
+        if (typeof value === 'boolean' || typeof value === 'number') {
+            replacement = String(value);
+        }
+        else if (typeof value === 'string') {
+            replacement = value;
+        }
+        else {
+            replacement = String(value);
+        }
+        config = config.replace(placeholder, replacement);
     }
+    fs.writeFileSync(configFilePath, config, 'utf-8');
 }
 
 async function compressWasmFile(wasmFilePath, compressedFilePath) {
@@ -10645,7 +10307,11 @@ async function compressWasmFile(wasmFilePath, compressedFilePath) {
 }
 function compressArrayBuffer(arrayBuffer) {
     return new Promise((resolve, reject) => {
-        const compressStream = zlib.createBrotliCompress();
+        const compressStream = zlib.createBrotliCompress({
+            params: {
+                [zlib.constants.BROTLI_PARAM_QUALITY]: 9,
+            },
+        });
         compressStream.write(Buffer.from(arrayBuffer));
         compressStream.end();
         const compressedChunks = [];
@@ -10676,164 +10342,953 @@ function keepCacheSync({ entryDir, originalWasmPath, originalSplitConfigPath, })
     if (!fs__namespace.existsSync(gameJsonCachePath)) {
         fs__namespace.copyFileSync(gameJsonPath, gameJsonCachePath);
     }
+    /**
+     * 保存 wasmcode/game.js（如果存在）
+     *
+     * 抖音 / 微信 mini-game 平台对 game.json.subpackages 里声明的每个子包
+     * 都要求根目录有 `game.js`（哪怕是空文件）作为 `tt.loadSubpackage` 的
+     * 入口锚点，否则子包加载直接失败。很多 Unity 项目把 wasmcode 当成
+     * 一个内置子包（参考真实工程的 game.json），原始 wasmcode/ 里就有
+     * 一个空 game.js。split 阶段虽然也会重写它，但回退时如果不把这个
+     * 占位文件还原回来，mini-game 启动会因为找不到 wasmcode/game.js
+     * 而崩。
+     *
+     * 这里只在源文件存在时才备份，避免给"原始就没有 game.js"的工程
+     * 偷偷塞一个空文件污染回退状态。
+     */
+    const originGameJsPath = path__namespace.join(entryDir, WASM_SPLIT_SUBPACKAGE_CONFIG.origin.root, 'game.js');
+    const originGameJsCachePath = path__namespace.join(cacheDir, 'wasmcode-game.js');
+    if (fs__namespace.existsSync(originGameJsPath) &&
+        !fs__namespace.existsSync(originGameJsCachePath)) {
+        fs__namespace.copyFileSync(originGameJsPath, originGameJsCachePath);
+    }
     return {
         cacheDir,
     };
 }
 
-async function downloadPrepared(data) {
-    wsServer.sendUnitySplitStatus({
-        status: 'star_fetch_prepared_wasm_url',
-    });
-    const res = await request({
-        url: `${BASE_URL}/api/stark_wasm/v4/post/download_prepared`,
-        method: 'POST',
-        headers: DEV_HEADERS,
-        data,
-    });
-    wsServer.sendUnitySplitStatus({
-        status: 'fetch_prepared_wasm_url_done',
+/**
+ * Restore webgl-wasm-split.js from the cached original (with placeholders).
+ * Called at the start of each prepare so that pipeline-specific values can be
+ * applied deterministically, regardless of previous runs.
+ * No-op if the cache does not yet exist (first run).
+ */
+function restoreSplitConfigFromCache(entryDir = process.cwd()) {
+    const cachedConfigPath = path.join(entryDir, WASM_SPLIT_CACHE_DIR, path.basename(WASM_SPLIT_CONFIG_FILE_NAME));
+    const targetConfigPath = path.join(entryDir, WASM_SPLIT_CONFIG_FILE_NAME);
+    if (fs.existsSync(cachedConfigPath)) {
+        fs.copyFileSync(cachedConfigPath, targetConfigPath);
+    }
+}
+
+/**
+ * Restore the project from the backup cache:
+ * - original (unmodified) wasm file back into its `wasmcode/<file>.br` location
+ * - webgl-wasm-split.js back to its template (with placeholders)
+ * - game.json back to its pre-split version
+ * - wasmcode/game.js — restore from cache if backed up, otherwise write empty
+ *   (mini-game runtime requires every subpackage root to contain `game.js` as
+ *   a `tt.loadSubpackage` entry anchor; many Unity projects ship with
+ *   wasmcode declared as a subpackage in game.json, so a missing wasmcode/game.js
+ *   after rollback breaks subpackage loading at boot)
+ * - remove ALL generated sub-package directories (see SPLIT_OUTPUT_DIRS) —
+ *   includes both legacy (wasmcode-android / wasmcode1-android / wasmcode-ios /
+ *   wasmcode1-ios) and archive-mode (wasmcode1 / wasmcode-archive) outputs
+ * - clean stale split-produced .br files inside wasmcode/ (split phase writes
+ *   `${main_wasm_md5}.webgl...br` next to the original `${orig_md5}.webgl...br`;
+ *   we wipe everything in there and re-copy the cached original so the dir
+ *   ends up byte-identical to the pre-prepare state)
+ *
+ * Shared by both local and remote reset/rollback flows. Single source of
+ * truth for "what does cancel actually undo" — adding a new split-output
+ * dir means appending it to SPLIT_OUTPUT_DIRS, no other call site needs
+ * to change.
+ */
+function restoreFromCache(entryDir = process.cwd()) {
+    const cacheDir = path.join(entryDir, WASM_SPLIT_CACHE_DIR);
+    // 1) Wipe stale split residue inside wasmcode/ first, THEN restore the
+    //    original. Order matters: if we restore first then wipe, we'd delete
+    //    the very file we just brought back.
+    const originDir = path.join(entryDir, WASM_SPLIT_SUBPACKAGE_CONFIG.origin.root);
+    if (fs.existsSync(originDir)) {
+        for (const entry of fs.readdirSync(originDir)) {
+            // Only clean files split is known to write — `.br` (main wasm) and
+            // the empty `game.js` placeholder. Touching anything else risks
+            // nuking developer-authored content that happens to live in
+            // wasmcode/ for unrelated reasons.
+            if (entry.endsWith('.br') || entry === 'game.js') {
+                fs.rmSync(path.join(originDir, entry), { force: true });
+            }
+        }
+    }
+    if (fs.existsSync(cacheDir)) {
+        const targetWasmBrPath = fs
+            .readdirSync(cacheDir)
+            .find(item => item.endsWith('.br'));
+        if (targetWasmBrPath) {
+            const destWasmBrPath = path.join(entryDir, WASM_SPLIT_SUBPACKAGE_CONFIG.origin.root, path.basename(targetWasmBrPath));
+            ensureDirSync(path.dirname(destWasmBrPath));
+            fs.copyFileSync(path.join(cacheDir, targetWasmBrPath), destWasmBrPath);
+        }
+    }
+    const splitConfigCachePath = path.join(cacheDir, WASM_SPLIT_CONFIG_FILE_NAME);
+    if (fs.existsSync(splitConfigCachePath)) {
+        fs.copyFileSync(splitConfigCachePath, path.join(entryDir, WASM_SPLIT_CONFIG_FILE_NAME));
+    }
+    const gameJsonCachePath = path.join(cacheDir, 'game.json');
+    if (fs.existsSync(gameJsonCachePath)) {
+        fs.copyFileSync(gameJsonCachePath, path.join(entryDir, 'game.json'));
+    }
+    // Restore wasmcode/game.js. We just deleted whatever was there in step 1,
+    // so we always need to put something back when wasmcode is a subpackage.
+    // Strategy:
+    //   - Prefer the cache (keepCacheSync stashes pre-split contents to
+    //     `__unity_cache__/wasmcode-game.js` when the original existed)
+    //   - Fall back to writing an empty file. Rationale: if we got here the
+    //     dir exists, the .br is in place, and the project's game.json — now
+    //     restored above — likely still lists wasmcode as a subpackage (true
+    //     for every Unity template we ship). An empty game.js is exactly what
+    //     downloadSplited.ts also writes; it satisfies the platform requirement
+    //     without changing semantics for projects that don't use wasmcode as
+    //     a subpackage (the file is harmless empty).
+    const originGameJsCachePath = path.join(cacheDir, 'wasmcode-game.js');
+    const originGameJsDestPath = path.join(originDir, 'game.js');
+    if (fs.existsSync(originDir)) {
+        if (fs.existsSync(originGameJsCachePath)) {
+            fs.copyFileSync(originGameJsCachePath, originGameJsDestPath);
+        }
+        else {
+            fs.writeFileSync(originGameJsDestPath, '', 'utf-8');
+        }
+    }
+    for (const subDir of SPLIT_OUTPUT_DIRS) {
+        const full = path.join(entryDir, subDir);
+        if (fs.existsSync(full)) {
+            fs.rmSync(full, { recursive: true, force: true });
+        }
+    }
+}
+
+async function decompressWasmFile(inputPath, outputPath) {
+    const compressed = await fs.promises.readFile(inputPath);
+    const decompressed = await new Promise((resolve, reject) => {
+        zlib.brotliDecompress(compressed, (err, result) => {
+            if (err)
+                reject(err);
+            else
+                resolve(result);
+        });
     });
+    await fs.promises.writeFile(outputPath, decompressed);
+}
+
+function computeFileMd5Sync(filePath) {
+    const content = fs.readFileSync(filePath);
+    return crypto.createHash('md5').update(content).digest('hex');
+}
+
+let cached = null;
+function getGameJson() {
+    if (cached)
+        return cached;
+    const filePath = path$1.join(process.cwd(), 'game.json');
+    if (fs$1.existsSync(filePath)) {
+        try {
+            cached = JSON.parse(fs$1.readFileSync(filePath, 'utf-8'));
+        }
+        catch {
+            cached = {};
+        }
+    }
+    else {
+        cached = {};
+    }
+    return cached;
+}
+
+function metaFilePath(entryDir = process.cwd()) {
+    return path__namespace$1.join(entryDir, TTMG_TEMP_DIR, 'prepared-meta.json');
+}
+function writePreparedMeta(meta, entryDir = process.cwd()) {
+    const target = metaFilePath(entryDir);
+    fs__namespace$1.mkdirSync(path__namespace$1.dirname(target), { recursive: true });
+    const payload = {
+        ...meta,
+        preparedAt: new Date().toISOString(),
+    };
+    fs__namespace$1.writeFileSync(target, JSON.stringify(payload, null, 2), 'utf-8');
+}
+function readPreparedMeta(entryDir = process.cwd()) {
+    const target = metaFilePath(entryDir);
+    if (!fs__namespace$1.existsSync(target))
+        return null;
     try {
-        const downloadUrl = res?.data?.result?.download_url;
-        const willReplaceWasmPath = path.join(process.cwd(), data.wasm_path);
-        if (downloadUrl) {
-            const { cacheDir } = keepCacheSync({
-                entryDir: process.cwd(),
-                originalWasmPath: data.wasm_path,
-                originalSplitConfigPath: WASM_SPLIT_CONFIG_FILE_NAME,
-            });
-            if (downloadUrl.includes('.br')) {
-                const tempWasmPath = path.join(cacheDir, '__temp__.wasm.br');
-                wsServer.sendUnitySplitStatus({
-                    status: 'start_download_prepared_wasm',
-                    url: downloadUrl,
-                });
-                await download(downloadUrl, tempWasmPath);
-                /**
-                 * 下载完成后需要进行 br 并替换 codePath 对应的文件后再返回成功
-                 */
-                fs$1.copyFileSync(tempWasmPath, willReplaceWasmPath);
-                wsServer.sendUnitySplitStatus({
-                    status: 'download_prepared_wasm_done',
-                    url: downloadUrl,
-                });
-            }
-            else {
-                const tempWasmPath = path.join(cacheDir, '__temp__.wasm');
-                wsServer.sendUnitySplitStatus({
-                    status: 'start_download_prepared_wasm',
-                    url: downloadUrl,
-                });
-                await download(downloadUrl, tempWasmPath);
-                wsServer.sendUnitySplitStatus({
-                    status: 'download_prepared_wasm_done',
-                    url: downloadUrl,
-                });
-                /**
-                 * 下载完成后需要进行 br 并替换 codePath 对应的文件后再返回成功
-                 */
-                wsServer.sendUnitySplitStatus({
-                    status: 'start_compress_prepared_wasm',
-                });
-                await compressWasmFile(tempWasmPath, willReplaceWasmPath);
-                wsServer.sendUnitySplitStatus({
-                    status: 'compress_prepared_wasm_done',
-                    url: downloadUrl,
-                });
-                wsServer.sendUnitySplitStatus({
-                    status: 'write_compress_prepared_wasm_done',
-                });
-            }
-            wsServer.sendUnitySplitStatus({
-                status: 'start_update_wasm_split_config',
-            });
-            /**
-             * 读取 webgl-wasm-split.js内容，将 enableWasmCollect 设为 true
-             */
-            updateWasmSplitConfig({
-                ENABLEWASMCOLLECT: true,
-            });
-            wsServer.sendUnitySplitStatus({
-                status: 'update_wasm_split_config_done',
-            });
-            return {
-                isSuccess: true,
-                ctx: res?.ctx,
-            };
+        const raw = fs__namespace$1.readFileSync(target, 'utf-8');
+        const parsed = JSON.parse(raw);
+        if (typeof parsed?.preparedWasmMd5 === 'string' &&
+            typeof parsed?.codePath === 'string' &&
+            parsed.preparedWasmMd5.length === 32) {
+            return parsed;
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Return the current md5 of the wasm file referenced by `prepared-meta.json`
+ * or null if the file is missing / meta isn't present. Caller compares the
+ * result to `meta.preparedWasmMd5` — mismatch means the project's wasm
+ * has drifted from the prepared output (Unity re-build etc.) and the
+ * project should be walked back through the prepare step before collect
+ * can produce useful data.
+ */
+function computeCurrentProjectWasmMd5(entryDir = process.cwd()) {
+    const meta = readPreparedMeta(entryDir);
+    if (!meta)
+        return null;
+    const absolutePath = path__namespace$1.join(entryDir, meta.codePath);
+    if (!fs__namespace$1.existsSync(absolutePath))
+        return null;
+    const currentMd5 = crypto$1
+        .createHash('md5')
+        .update(fs__namespace$1.readFileSync(absolutePath))
+        .digest('hex');
+    return { meta, currentMd5 };
+}
+
+const state = {
+    pipelineMode: 'local',
+    originalWasmPath: '',
+    preparedWasmPath: '',
+    codePath: '',
+    splitOutputDir: '',
+    splitMeta: null,
+    totalWasmFuncCount: 0,
+    wasmSize: 0,
+    isArchiveMode: true,
+};
+function getLocalState() {
+    return state;
+}
+function setLocalState(partial) {
+    Object.assign(state, partial);
+}
+
+async function startPrepare$1(params) {
+    const tempDir = path$1.join(process.cwd(), TTMG_TEMP_DIR);
+    ensureDirSync(tempDir);
+    const inputPath = path$1.join(process.cwd(), params.wasm_file_path);
+    let rawWasmPath = path$1.join(tempDir, 'original.wasm');
+    if (inputPath.endsWith('.br')) {
+        await decompressWasmFile(inputPath, rawWasmPath);
+    }
+    else {
+        fs$1.copyFileSync(inputPath, rawWasmPath);
+    }
+    const preparedWasmPath = path$1.join(tempDir, 'prepared.wasm');
+    try {
+        const result = ttmgWasmtool.prepare(rawWasmPath, preparedWasmPath);
+        console.log(`[wasmtool] prepare done: ${result.outputSize} bytes, ${result.timeCost}s`);
+        const gameJson = getGameJson();
+        const totalWasmFuncCount = gameJson.wasmFuncCount ?? 0;
+        const wasmSize = fs$1.existsSync(inputPath)
+            ? fs$1.statSync(inputPath).size
+            : 0;
+        setLocalState({
+            originalWasmPath: rawWasmPath,
+            preparedWasmPath,
+            codePath: params.wasm_file_path,
+            totalWasmFuncCount,
+            wasmSize,
+        });
+        keepCacheSync({
+            entryDir: process.cwd(),
+            originalWasmPath: params.wasm_file_path,
+            originalSplitConfigPath: WASM_SPLIT_CONFIG_FILE_NAME,
+        });
+        // Start from cached (placeholder) config so pipeline switching is deterministic
+        restoreSplitConfigFromCache();
+        const willReplaceWasmPath = path$1.join(process.cwd(), params.wasm_file_path);
+        // Diagnostic: prove prepare actually produced a different binary
+        // (size should grow noticeably because every function body is prefixed
+        // with a scwebgl.logCall(funcIndex) call).
+        const rawSize = fs$1.existsSync(rawWasmPath) ? fs$1.statSync(rawWasmPath).size : 0;
+        const preparedSize = fs$1.existsSync(preparedWasmPath)
+            ? fs$1.statSync(preparedWasmPath).size
+            : 0;
+        const rawMd5 = fs$1.existsSync(rawWasmPath)
+            ? crypto$1.createHash('md5').update(fs$1.readFileSync(rawWasmPath)).digest('hex')
+            : '<missing>';
+        const preparedMd5 = fs$1.existsSync(preparedWasmPath)
+            ? crypto$1.createHash('md5').update(fs$1.readFileSync(preparedWasmPath)).digest('hex')
+            : '<missing>';
+        console.log(`[wasmtool] prepare sanity: raw(size=${rawSize} md5=${rawMd5}) -> prepared(size=${preparedSize} md5=${preparedMd5}) delta=${preparedSize - rawSize}`);
+        if (preparedSize <= rawSize || preparedMd5 === rawMd5) {
+            console.warn('[wasmtool] WARNING: prepared wasm is not larger / md5 is unchanged vs raw wasm. Instrumentation likely did not happen.');
+        }
+        console.log('[wasmtool] compressing prepared wasm (quality=9)...');
+        await compressWasmFile(preparedWasmPath, willReplaceWasmPath);
+        console.log('[wasmtool] compressed and written to project');
+        // Diagnostic: confirm the file the client actually fetches was overwritten,
+        // and compare to the cached original brotli so we can prove on-disk replacement.
+        const replacedSize = fs$1.existsSync(willReplaceWasmPath)
+            ? fs$1.statSync(willReplaceWasmPath).size
+            : 0;
+        const replacedMd5 = fs$1.existsSync(willReplaceWasmPath)
+            ? crypto$1.createHash('md5').update(fs$1.readFileSync(willReplaceWasmPath)).digest('hex')
+            : '<missing>';
+        const cachedOriginalBr = path$1.join(process.cwd(), TTMG_TEMP_DIR, 'wasmcode', path$1.basename(params.wasm_file_path));
+        const cachedOriginalSize = fs$1.existsSync(cachedOriginalBr)
+            ? fs$1.statSync(cachedOriginalBr).size
+            : 0;
+        const cachedOriginalMd5 = fs$1.existsSync(cachedOriginalBr)
+            ? crypto$1
+                .createHash('md5')
+                .update(fs$1.readFileSync(cachedOriginalBr))
+                .digest('hex')
+            : '<missing>';
+        console.log(`[wasmtool] on-disk replace check: project=${params.wasm_file_path} size=${replacedSize} md5=${replacedMd5} | cached-original size=${cachedOriginalSize} md5=${cachedOriginalMd5}`);
+        if (replacedMd5 === cachedOriginalMd5) {
+            console.warn('[wasmtool] WARNING: project wasm md5 matches cached-original md5. The file was not actually replaced with the instrumented build.');
         }
         else {
-            return {
-                isSuccess: false,
-                error: {
-                    code: res.data?.code,
-                    message: res.data?.message,
-                },
-                ctx: res?.ctx,
-            };
+            console.log('[wasmtool] OK: project wasm differs from cached-original — instrumented wasm is on disk.');
         }
+        // Local pipeline uses the new wasm-collect/v1/report API + archive sub-wasm.
+        // ORIGINALWASMMD5 must be set now (not only at split time) so the plugin
+        // reports the correct wasm_md5 during the collect phase.
+        updateWasmSplitConfig({
+            ENABLEWASMCOLLECT: true,
+            ENABLEARCHIVEMODE: true,
+            ORIGINALWASMMD5: params.wasm_md5,
+        });
+        console.log('[wasmtool] wasm split config updated (local pipeline: archive=true)');
+        // Disk-persisted anchor for "wasm drift" detection in
+        // `game-wasm-split-config` route. Stores the md5 that prepare just
+        // wrote into the project alongside the project-relative path. The
+        // route reads this back on every Modal open, recomputes the md5 of
+        // the file on disk, and if they differ (Unity re-build, git
+        // checkout, etc.) suppresses `enableWasmCollect=true` in the
+        // response so the IDE goes back through prepare instead of dropping
+        // the user straight into Collect with an un-instrumented wasm on
+        // the device. See `preparedMeta.ts` for full rationale.
+        writePreparedMeta({
+            preparedWasmMd5: replacedMd5,
+            codePath: params.wasm_file_path,
+        });
+        console.log(`[wasmtool] prepared-meta written: md5=${replacedMd5} codePath=${params.wasm_file_path}`);
+        return {
+            data: {
+                code: 0,
+                message: 'success',
+                result: { md5: params.wasm_md5 },
+            },
+            error: null,
+            ctx: { logid: 'local', httpStatusCode: 200 },
+        };
     }
-    catch (error) {
+    catch (err) {
         return {
-            isSuccess: false,
+            data: null,
             error: {
-                code: res.data?.code,
-                message: error.message,
+                code: 500,
+                message: err instanceof Error ? err.message : String(err),
             },
-            ctx: res?.ctx,
+            ctx: { logid: 'local', httpStatusCode: 500 },
         };
     }
 }
 
-async function getCollectedFuncIds({ client_key, wasm_md5, }) {
-    return request({
-        url: `${BASE_URL}/api/stark_wasm/v4/get/collectedfuncids`,
+/**
+ * Local pipeline: startPrepareLocal already compressed/replaced the wasm and
+ * updated webgl-wasm-split.js, so this step is a no-op that just emits UI
+ * status events for parity with the remote flow.
+ */
+async function downloadPrepared$1(_data) {
+    const { preparedWasmPath } = getLocalState();
+    if (!preparedWasmPath) {
+        return {
+            isSuccess: false,
+            error: { code: 404, message: 'Prepared wasm not found. Run prepare first.' },
+        };
+    }
+    wsServer.sendUnitySplitStatus({ status: 'update_wasm_split_config_done' });
+    return { isSuccess: true, ctx: { logid: 'local' } };
+}
+
+async function getCollectedFuncIds$1({ client_key, wasm_md5, }) {
+    const res = await request({
+        url: `${WASM_COLLECT_BASE_URL}/progress`,
         method: 'GET',
-        headers: DEV_HEADERS,
         params: {
-            client_key,
+            app_id: client_key,
             wasm_md5,
         },
     });
+    const funcCount = res?.data?.func_count ?? 0;
+    return {
+        data: {
+            code: res?.data?.code ?? 0,
+            message: 'success',
+            result: {
+                collected_func_count: funcCount,
+                data_size: funcCount,
+                real_data_size: funcCount,
+                collect_state: res?.data?.collect_state,
+            },
+        },
+        error: res.error,
+        ctx: res.ctx,
+    };
 }
 
-async function setCollect({ client_key, wasm_md5, }) {
-    return request({
-        url: `${BASE_URL}/api/stark_wasm/v4/post/set_collecting`,
+/**
+ * POST /start — opens a collect session (Portal-authenticated).
+ *
+ * Idempotent on the server: re-opening an already-open session just refreshes
+ * `started_at`; only `reset: true` wipes history.
+ *
+ * Default `reset` is `false` to mirror the server-side default documented in
+ * `wasm_api.md` §5.1 — "页面刷新 / 恢复" must NOT silently destroy data. The
+ * "fresh run" semantic (e.g. user clicks "重新开始分包") is the responsibility
+ * of the caller, which must explicitly pass `reset: true`. See `setCollect`
+ * for the CLI-level wiring of those two paths.
+ *
+ * NOTE on naming: the server route is flat (`/start`, not `/session/start`).
+ * Our local symbol stays `startWasmSession` because it's the "start collect
+ * session" lifecycle primitive from the IDE's perspective.
+ */
+async function startWasmSession({ client_key, wasm_md5, reset, }) {
+    const res = await request({
+        url: `${WASM_COLLECT_BASE_URL}/start`,
         method: 'POST',
         data: {
-            client_key,
+            app_id: client_key,
             wasm_md5,
+            reset: reset ?? false,
         },
-        headers: DEV_HEADERS,
     });
+    return {
+        data: res.data
+            ? {
+                code: res.data.code ?? 0,
+                message: res.data.message || 'success',
+                result: {
+                    collect_state: res.data.collect_state,
+                    started_at: res.data.started_at,
+                },
+            }
+            : null,
+        error: res.error,
+        ctx: res.ctx,
+    };
 }
 
-async function getCollecttingInfo({ client_key, wasm_md5, }) {
-    return request({
-        url: `${BASE_URL}/api/stark_wasm/v4/get/funccollect`,
+/**
+ * "开始收集" 的本地 pipeline 实现。语义上等价于老远程流程的
+ * `stark_wasm/v4/post/set_collecting`：**打开 server 端的 collect 窗口**，
+ * 让 plugin 之后的 `/report` 请求能落库。
+ *
+ * 做三件事（顺序敏感）：
+ *   1. `POST /start` 打开 session —— 失败必须立即返回给 IDE，
+ *      否则 UI 会让用户进"正在收集"但实际 plugin 所有上报都会被 fail-close
+ *      丢弃，场面非常悲伤。
+ *   2. 成功后上传符号表（`/symbols`）。这一步故意不 await、错误仅 warn —
+ *      符号表只是给 server 端后续调试用的 debug 信息，丢了也不影响分包主链路。
+ *   3. 返回 `{code: 0}`。
+ *
+ * 两种调用语义（与 `wasm_api.md` §5.1 对齐）：
+ *   - 默认（`resume` 缺省 / false）—— 用户点"开始收集 / 重新开始分包"，
+ *     发 `reset: true`，服务端清空历史。这是历史行为，对应 IDE 上的
+ *     "willCollect → startCollect" 主入口。
+ *   - `resume: true` —— 页面刷新 / 恢复继续，发 `reset: false`，幂等
+ *     打开 session、保留已有 func_ids。需要这条路径的 caller（如 IDE
+ *     重新挂载组件检测到 server `collect_state: "open"` 想接续）必须
+ *     显式传，避免误清。
+ *
+ * Session 生命周期对前端透明——IDE 只知道"开始收集 / 完成收集"两个动作，
+ * `/start` 和 `/finish` 都被封在本地 dispatcher 内。这样远程 pipeline（没有
+ * session 概念）和本地 pipeline（有 session）在 IDE 层看起来是对称的。
+ */
+async function setCollect$1({ client_key, wasm_md5, resume, }) {
+    const startRes = await startWasmSession({
+        client_key,
+        wasm_md5,
+        reset: !resume,
+    });
+    if (startRes.error || !startRes.data || startRes.data.code !== 0) {
+        // /start is invoked internally by setCollect now; IDE only sees this
+        // bubbled up as a generic "开始收集失败" toast, so dump a structured
+        // one-liner here with logid — the single most useful field when
+        // asking backend to look up what happened on their side.
+        const code = startRes.error?.code ?? startRes.data?.code ?? -1;
+        const message = startRes.error?.message ||
+            startRes.data?.message ||
+            'Open collect session failed';
+        const logid = startRes.ctx?.logid || 'n/a';
+        console.error(`[wasm-collect] /start failed: code=${code} message=${message} logid=${logid}`);
+        return {
+            data: startRes.data ?? null,
+            error: startRes.error ?? { code, message },
+            ctx: startRes.ctx,
+        };
+    }
+    let symbolPath = path$1.join(process.cwd(), WASM_SYMBOL_FILE_NAME);
+    if (!fs$1.existsSync(symbolPath)) {
+        symbolPath = path$1.join(process.cwd(), TTMG_TEMP_DIR, WASM_SYMBOL_FILE_NAME);
+    }
+    if (fs$1.existsSync(symbolPath)) {
+        const symbols = fs$1.readFileSync(symbolPath, 'utf-8');
+        request({
+            url: `${WASM_COLLECT_BASE_URL}/symbols`,
+            method: 'POST',
+            data: {
+                app_id: client_key,
+                wasm_md5,
+                symbols,
+            },
+        }).catch(err => {
+            console.warn('[wasmtool] Failed to upload symbols:', err);
+        });
+    }
+    return {
+        data: { code: 0, message: 'success', result: {} },
+        error: null,
+        ctx: { logid: 'local', httpStatusCode: 200 },
+    };
+}
+
+async function getCollecttingInfo$1({ client_key, wasm_md5, }) {
+    const res = await request({
+        url: `${WASM_COLLECT_BASE_URL}/progress`,
         method: 'GET',
-        headers: DEV_HEADERS,
         params: {
-            client_key,
+            app_id: client_key,
             wasm_md5,
         },
     });
+    const { totalWasmFuncCount } = getLocalState();
+    // Fall back to game.json.wasmFuncCount so the total survives CLI restarts.
+    const gameJsonFuncCount = Number(getGameJson()?.wasmFuncCount) || 0;
+    return {
+        data: {
+            code: res?.data?.code ?? 0,
+            message: 'success',
+            result: {
+                app_id: client_key,
+                wasm_md5,
+                collected_func_count: res?.data?.func_count ?? 0,
+                total_wasm_func_count: gameJsonFuncCount || totalWasmFuncCount || 0,
+                collect_state: res?.data?.collect_state,
+            },
+        },
+        error: res.error,
+        ctx: res.ctx,
+    };
 }
 
-// /api/stark_wasm/v4/post/split
-async function startSplit({ client_key, wasm_md5, }) {
-    return request({
-        url: `${BASE_URL}/api/stark_wasm/v4/post/split`,
+/**
+ * POST /finish — closes a collect session and returns the final `func_count`
+ * so the IDE can surface "本次共收集 N 个函数" in the success dialog.
+ * Idempotent on the server.
+ *
+ * NOTE on naming: the server route is flat (`/finish`, not `/session/finish`).
+ * The local symbol keeps `finishWasmSession` for symmetry with `startWasmSession`.
+ */
+async function finishWasmSession({ client_key, wasm_md5, }) {
+    const res = await request({
+        url: `${WASM_COLLECT_BASE_URL}/finish`,
         method: 'POST',
-        headers: {
-            ...DEV_HEADERS,
-        },
         data: {
-            client_key,
+            app_id: client_key,
+            wasm_md5,
+        },
+    });
+    return {
+        data: res.data
+            ? {
+                code: res.data.code ?? 0,
+                message: res.data.message || 'success',
+                result: {
+                    collect_state: res.data.collect_state,
+                    func_count: res.data.func_count ?? 0,
+                    finished_at: res.data.finished_at,
+                },
+            }
+            : null,
+        error: res.error,
+        ctx: res.ctx,
+    };
+}
+
+async function startSplit$1({ client_key, wasm_md5, }) {
+    const tempDir = path$1.join(process.cwd(), TTMG_TEMP_DIR);
+    const splitOutputDir = path$1.join(tempDir, 'split-output');
+    if (fs$1.existsSync(splitOutputDir)) {
+        fs$1.rmSync(splitOutputDir, { recursive: true, force: true });
+    }
+    ensureDirSync(splitOutputDir);
+    const { originalWasmPath, isArchiveMode: archive } = getLocalState();
+    const rawWasmPath = originalWasmPath || path$1.join(tempDir, 'original.wasm');
+    if (!fs$1.existsSync(rawWasmPath)) {
+        return {
+            data: null,
+            error: {
+                code: 404,
+                message: 'Original wasm not found. Run prepare first.',
+            },
+            ctx: { logid: 'local', httpStatusCode: 404 },
+        };
+    }
+    const exportRes = await request({
+        url: `${WASM_COLLECT_BASE_URL}/export`,
+        method: 'GET',
+        params: {
+            app_id: client_key,
             wasm_md5,
+            strategy: 'union',
         },
     });
+    const funcIds = exportRes?.data?.func_ids;
+    const bootFuncIds = exportRes?.data?.boot_func_ids ?? [];
+    if (!funcIds?.length) {
+        return {
+            data: null,
+            error: {
+                code: 400,
+                message: 'No collected func IDs found.',
+            },
+            ctx: { logid: 'local', httpStatusCode: 400 },
+        };
+    }
+    console.log(`[wasmtool] splitting with ${funcIds.length} func IDs` +
+        (bootFuncIds.length > 0
+            ? `, ${bootFuncIds.length} boot-phase func IDs (→ alwaysInclude)`
+            : ', no boot-phase info (legacy server, falling back to callClosure only)') +
+        `, archive=${archive}`);
+    try {
+        const result = ttmgWasmtool.split({
+            input: rawWasmPath,
+            funcIds,
+            // Boot-phase func ids → `alwaysInclude`. They are a subset of
+            // `funcIds` so this doesn't grow `collect_count`, but it DOES seed
+            // the direct-call closure BFS with the exact set needed for first
+            // frame, and the split tool's `alwaysIncludeAdded` counter is the
+            // observability signal when zero (= server didn't return boot info).
+            alwaysInclude: bootFuncIds.length > 0 ? bootFuncIds : undefined,
+            // Always-on direct-call closure over (collect ∪ alwaysInclude ∪
+            // start_func). Folds in func ids that collect missed (untaken
+            // branches, race conditions during collect) so first-screen code
+            // paths don't trap on archive trampolines. See the split tool's
+            // `closure_added` counter for the per-build size impact.
+            callClosure: true,
+            // Always-on indirect-call type-closure scoped to the boot subset.
+            // Catches IL2CPP virtual / interface / delegate dispatch which is
+            // the dominant source of remaining `firstFrame=BEFORE` archive
+            // trampoline hits after the runtime collect + direct closure
+            // passes (see `indirectClosureAdded` for the per-build size
+            // impact). Defaults to `true` in the wasmtool but we set it
+            // explicitly so a future tool default change can't silently turn
+            // it off in our pipeline.
+            callIndirectClosure: true,
+            outputDir: splitOutputDir,
+            archive,
+            compress: true,
+            quality: 9,
+        });
+        if (result.code !== 0) {
+            return {
+                data: null,
+                error: { code: result.code, message: result.errMsg },
+                ctx: { logid: 'local', httpStatusCode: 500 },
+            };
+        }
+        const mainBrPath = result.mainWasmPath + '.br';
+        const actualMainPath = fs$1.existsSync(mainBrPath)
+            ? mainBrPath
+            : result.mainWasmPath;
+        const mainWasmMd5 = computeFileMd5Sync(actualMainPath);
+        const subBrPath = result.subWasmPath ? result.subWasmPath + '.br' : '';
+        const actualSubPath = subBrPath && fs$1.existsSync(subBrPath)
+            ? subBrPath
+            : result.subWasmPath;
+        const subWasmMd5 = actualSubPath
+            ? computeFileMd5Sync(actualSubPath)
+            : '';
+        let archiveMd5 = '';
+        if (archive && result.archivePath) {
+            const archiveBrPath = result.archivePath + '.br';
+            const actualArchivePath = fs$1.existsSync(archiveBrPath)
+                ? archiveBrPath
+                : result.archivePath;
+            console.log(`[wasmtool] archivePath=${result.archivePath}, brExists=${fs$1.existsSync(archiveBrPath)}, actualExists=${fs$1.existsSync(actualArchivePath)}`);
+            if (fs$1.existsSync(actualArchivePath)) {
+                archiveMd5 = computeFileMd5Sync(actualArchivePath);
+                console.log(`[wasmtool] archive_md5=${archiveMd5}`);
+            }
+        }
+        else {
+            console.log(`[wasmtool] skip archive md5: archive=${archive}, archivePath=${result.archivePath}`);
+        }
+        const globalVarList = result.globalVarList
+            .split(';')
+            .filter(Boolean)
+            .map((entry) => {
+            const [name, type, mutable] = entry.trim().split(',');
+            return { name, type, mutable: mutable === '1' };
+        });
+        const splitMeta = {
+            original_wasm_md5: wasm_md5,
+            main_wasm_md5: mainWasmMd5,
+            main_wasm_h5_md5: mainWasmMd5,
+            sub_wasm_md5: subWasmMd5,
+            archive_md5: archiveMd5,
+            table_size: result.tableSize,
+            global_var_list: globalVarList,
+            version: Date.now(),
+            total_wasm_count: result.totalWasmCount,
+            main_wasm_count: result.mainWasmCount,
+            time_cost: result.timeCost,
+            archive,
+            local_main_wasm_path: result.mainWasmPath,
+            local_sub_wasm_path: result.subWasmPath,
+            local_func_meta_path: result.funcMetaPath,
+            local_archive_path: result.archivePath,
+            // Composition breakdown of main_funcs — the single most useful
+            // piece of information when triaging "why is my main package X MB"
+            // (or, conversely, "why are first-screen sub-package batches still
+            // loading"). collect = runtime-observed, always_include =
+            // boot_func_ids, closure = BFS direct callees, indirect_closure =
+            // type-matching pass scoped to boot funcs (covers IL2CPP virtual
+            // dispatch), export = wasm exports. These sum with imports to
+            // main_wasm_count.
+            collect_func_count: result.collectFuncCount,
+            always_include_added: result.alwaysIncludeAdded,
+            closure_added: result.closureAdded,
+            indirect_closure_added: result.indirectClosureAdded,
+            indirect_closure_types: result.indirectClosureTypes,
+            export_added: result.exportAdded,
+        };
+        setLocalState({ splitOutputDir, splitMeta });
+        console.log(`[wasmtool] split done: total=${result.totalWasmCount}, main=${result.mainWasmCount} ` +
+            `(collect=${result.collectFuncCount}, +alwaysInclude=${result.alwaysIncludeAdded}, ` +
+            `+closure=${result.closureAdded}, +indirectClosure=${result.indirectClosureAdded}` +
+            `[types=${result.indirectClosureTypes}], +exports=${result.exportAdded}), ` +
+            `time=${result.timeCost}s`);
+        // Split landed — close the collect session so the plugin stops reporting.
+        // Awaited (not fire-and-forget) so IDE can rely on "wasm-split returned
+        // success" meaning "session definitively closed". If /finish itself
+        // fails (e.g. portal cookie expired mid-run) we still return split
+        // success to the IDE — the plugin already has the MD5-bound session
+        // state from the earlier /report responses and will time out on TTL
+        // anyway; failing split for a finalizer hiccup would be worse UX.
+        let funcCount;
+        try {
+            const finishRes = await finishWasmSession({ client_key, wasm_md5 });
+            if (finishRes.error || !finishRes.data || finishRes.data.code !== 0) {
+                // Soft failure: split already succeeded from the user's POV, but
+                // this is the main diagnostic breadcrumb if someone later reports
+                // "plugin kept uploading after 分包完成". Always include logid so
+                // backend can cross-reference without having to know our build.
+                const code = finishRes.error?.code ?? finishRes.data?.code ?? -1;
+                const message = finishRes.error?.message ||
+                    finishRes.data?.message ||
+                    'finish session non-success';
+                const logid = finishRes.ctx?.logid || 'n/a';
+                console.error(`[wasm-split] /finish failed (split still succeeded): code=${code} message=${message} logid=${logid}`);
+            }
+            else {
+                funcCount = finishRes.data.result?.func_count;
+            }
+        }
+        catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            console.error(`[wasm-split] /finish threw (split still succeeded): ${msg}`);
+        }
+        return {
+            data: { code: 0, message: 'success', func_count: funcCount },
+            error: null,
+            ctx: { logid: 'local', httpStatusCode: 200 },
+        };
+    }
+    catch (err) {
+        return {
+            data: null,
+            error: {
+                code: 500,
+                message: err instanceof Error ? err.message : String(err),
+            },
+            ctx: { logid: 'local', httpStatusCode: 500 },
+        };
+    }
+}
+
+const ARCHIVE_SUBPACKAGE_CONFIG = [
+    WASM_SPLIT_SUBPACKAGE_CONFIG.origin,
+    WASM_SPLIT_SUBPACKAGE_CONFIG.archiveSub,
+    WASM_SPLIT_SUBPACKAGE_CONFIG.archiveCode,
+];
+function updateSubpackageConfigSync(archive = false) {
+    const gameJsonPath = path__namespace.join(process.cwd(), SUBPACKAGE_CONFIG_FILE_NAME);
+    const raw = fs__namespace.readFileSync(gameJsonPath, 'utf-8');
+    const gameJson = JSON.parse(raw);
+    delete gameJson.wasmFuncCount;
+    const fieldName = SUBPACKAGE_FIELD_NAMES.find(k => k in gameJson) ??
+        SUBPACKAGE_FIELD_NAMES[0];
+    if (!gameJson[fieldName])
+        gameJson[fieldName] = [];
+    const subpackages = gameJson[fieldName];
+    const filtered = subpackages.filter(s => s.name !== WASM_SPLIT_SUBPACKAGE_CONFIG.origin.name);
+    if (archive) {
+        ARCHIVE_SUBPACKAGE_CONFIG.forEach(pkg => filtered.push(pkg));
+    }
+    else {
+        filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.androidMain);
+        filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.androidSub);
+        filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.iosMain);
+        filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.iosSub);
+    }
+    const map = new Map(filtered.map(s => [s.name, s]));
+    gameJson[fieldName] = Array.from(map.values());
+    fs__namespace.writeFileSync(gameJsonPath, JSON.stringify(gameJson, null, JSON_INDENT) + JSON_EOL);
+}
+
+async function downloadSplited$1(_context) {
+    const cwd = process.cwd();
+    const { splitMeta } = getLocalState();
+    if (!splitMeta) {
+        return {
+            data: { isSuccess: false },
+            error: { message: 'No local split result found. Run split first.' },
+            ctx: _context,
+        };
+    }
+    const splitTempDir = path.join(cwd, WASM_SPLIT_CACHE_DIR, DIR_SPLIT);
+    ensureDirSync(splitTempDir);
+    const isArchive = splitMeta.archive;
+    const mainAndroidDir = path.join(splitTempDir, isArchive ? 'wasmcode' : WASM_SPLIT_SUBPACKAGE_CONFIG.androidMain.root);
+    const subAndroidDir = path.join(splitTempDir, isArchive ? 'wasmcode1' : WASM_SPLIT_SUBPACKAGE_CONFIG.androidSub.root);
+    const mainIosDir = isArchive
+        ? mainAndroidDir
+        : path.join(splitTempDir, WASM_SPLIT_SUBPACKAGE_CONFIG.iosMain.root);
+    const subIosDir = path.join(splitTempDir, isArchive ? 'wasmcode-archive' : WASM_SPLIT_SUBPACKAGE_CONFIG.iosSub.root);
+    const dirs = [...new Set([mainAndroidDir, subAndroidDir, mainIosDir, subIosDir])];
+    dirs.forEach(ensureDirSync);
+    try {
+        console.log('[wasmtool] organizing split output...');
+        const mainWasmMd5 = splitMeta.main_wasm_md5;
+        const subWasmMd5 = splitMeta.sub_wasm_md5;
+        const mainWasmH5Md5 = splitMeta.main_wasm_h5_md5;
+        const localMainPath = splitMeta.local_main_wasm_path;
+        const mainBrPath = localMainPath + BR_SUFFIX;
+        const actualMainPath = fs.existsSync(mainBrPath) ? mainBrPath : localMainPath;
+        if (actualMainPath && fs.existsSync(actualMainPath)) {
+            const isBr = actualMainPath.endsWith(BR_SUFFIX);
+            const ext = isBr
+                ? `${WASM_FILENAME_SUFFIX}${BR_SUFFIX}`
+                : WASM_FILENAME_SUFFIX;
+            const mainAndroidDest = path.join(mainAndroidDir, `${mainWasmMd5}${ext}`);
+            fs.copyFileSync(actualMainPath, mainAndroidDest);
+            wsServer.sendUnitySplitStatus({
+                status: 'download_android_main_wasm_done',
+            });
+            if (mainIosDir !== mainAndroidDir) {
+                const mainIosDest = path.join(mainIosDir, `${mainWasmH5Md5}${ext}`);
+                fs.copyFileSync(actualMainPath, mainIosDest);
+            }
+            wsServer.sendUnitySplitStatus({
+                status: 'download_ios_main_wasm_done',
+            });
+        }
+        const localSubPath = splitMeta.local_sub_wasm_path;
+        const subBrPath = localSubPath + BR_SUFFIX;
+        const actualSubPath = fs.existsSync(subBrPath) ? subBrPath : localSubPath;
+        if (actualSubPath && fs.existsSync(actualSubPath)) {
+            const isBr = actualSubPath.endsWith(BR_SUFFIX);
+            const ext = isBr
+                ? `${WASM_FILENAME_SUFFIX}${BR_SUFFIX}`
+                : WASM_FILENAME_SUFFIX;
+            const subAndroidDest = path.join(subAndroidDir, `${subWasmMd5}${ext}`);
+            fs.copyFileSync(actualSubPath, subAndroidDest);
+            wsServer.sendUnitySplitStatus({
+                status: 'download_android_sub_wasm_code_done',
+            });
+        }
+        const localArchivePath = splitMeta.local_archive_path;
+        if (isArchive && localArchivePath) {
+            const archiveBrPath = localArchivePath + BR_SUFFIX;
+            const actualArchivePath = fs.existsSync(archiveBrPath) ? archiveBrPath : localArchivePath;
+            console.log(`[wasmtool] archive copy: archive_md5=${splitMeta.archive_md5}, localPath=${localArchivePath}, brExists=${fs.existsSync(archiveBrPath)}, actual=${actualArchivePath}`);
+            if (fs.existsSync(actualArchivePath)) {
+                const archiveMd5 = splitMeta.archive_md5 || '';
+                const archiveBaseName = path.basename(actualArchivePath);
+                const destName = archiveMd5 ? `${archiveMd5}.${archiveBaseName}` : archiveBaseName;
+                const archiveDest = path.join(subIosDir, destName);
+                console.log(`[wasmtool] archive dest: ${archiveDest}`);
+                fs.copyFileSync(actualArchivePath, archiveDest);
+            }
+        }
+        dirs.forEach((dir) => {
+            fs.writeFileSync(path.join(dir, 'game.js'), '', { encoding: 'utf-8' });
+        });
+        console.log('[wasmtool] copy split output to root...');
+        wsServer.sendUnitySplitStatus({ status: 'start_write_splited_wasm_br' });
+        for (const file of fs.readdirSync(splitTempDir)) {
+            const srcPath = path.join(splitTempDir, file);
+            const destPath = path.join(cwd, file);
+            if (fs.existsSync(destPath)) {
+                await promises.rm(destPath, { recursive: true, force: true });
+            }
+            await promises.cp(srcPath, destPath, { recursive: true, force: true });
+        }
+        wsServer.sendUnitySplitStatus({ status: 'write_splited_wasm_done' });
+        console.log('[wasmtool] updating subpackage config...');
+        updateSubpackageConfigSync(isArchive);
+        console.log('[wasmtool] updating wasm split config...');
+        wsServer.sendUnitySplitStatus({ status: 'start_update_wasm_split_config' });
+        updateWasmSplitConfig({
+            ENABLEWASMCOLLECT: true,
+            ORIGINALWASMMD5: `${splitMeta.original_wasm_md5}`,
+            WASMTABLESIZE: splitMeta.table_size,
+            GLOBALVARLIST: JSON.stringify(splitMeta.global_var_list ?? []),
+            SUBJSURL: '',
+            IOS_CODE_FILE_MD5: `${splitMeta.main_wasm_h5_md5}`,
+            ANDROID_CODE_FILE_MD5: `${splitMeta.main_wasm_md5}`,
+            ANDROID_SUB_CODE_FILE_MD5: `${splitMeta.sub_wasm_md5}`,
+            ARCHIVE_CODE_FILE_MD5: `${splitMeta.archive_md5 || ''}`,
+            WASMSPLITVERSION: `${splitMeta.version}`,
+            USINGWASMH5: Boolean(splitMeta.main_wasm_h5_md5),
+            ENABLEWASMSPLIT: true,
+            ENABLEARCHIVEMODE: isArchive,
+        });
+        wsServer.sendUnitySplitStatus({ status: 'update_wasm_split_config_done' });
+        return {
+            data: { isSuccess: true },
+            ctx: splitMeta,
+        };
+    }
+    catch (err) {
+        wsServer.sendUnitySplitStatus({
+            status: 'wasm_split_failed',
+            errorMsg: err instanceof Error ? err.message : String(err),
+        });
+        return {
+            data: { isSuccess: false },
+            error: { message: err instanceof Error ? err.message : String(err) },
+            ctx: splitMeta,
+        };
+    }
+    finally {
+        await promises.rm(splitTempDir, { recursive: true, force: true });
+        if (!isArchive) {
+            await promises.rm(path.join(cwd, WASM_SPLIT_SUBPACKAGE_CONFIG.origin.root), {
+                recursive: true,
+                force: true,
+            });
+        }
+    }
 }
 
 /*
@@ -11002,75 +11457,28 @@ function pLimit(concurrency) {
 	return generator;
 }
 
-function updateSubpackageConfigSync() {
-    const gameJsonPath = path__namespace.join(process.cwd(), SUBPACKAGE_CONFIG_FILE_NAME);
-    const raw = fs__namespace.readFileSync(gameJsonPath, 'utf-8');
-    const gameJson = JSON.parse(raw);
-    /**
-     * wasm 分包完整流程完成后，删除一次性校验字段，
-     * 避免后续调试阶段继续触发 wasmFuncCount 的提示。
-     */
-    delete gameJson.wasmFuncCount;
-    const fieldName = SUBPACKAGE_FIELD_NAMES.find(k => k in gameJson) ??
-        SUBPACKAGE_FIELD_NAMES[0];
-    if (!gameJson[fieldName])
-        gameJson[fieldName] = [];
-    const subpackages = gameJson[fieldName];
-    // 删除老的 'wasmcode'
-    const filtered = subpackages.filter(s => s.name !== WASM_SPLIT_SUBPACKAGE_CONFIG.origin.name);
-    /**
-     * 基于 SUBPACKAGE_CONFIG_FILE_NAME 更新 subpackages
-     */
-    filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.androidMain);
-    filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.androidSub);
-    filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.iosMain);
-    filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.iosSub);
-    // 合并去重：存在则更新 root，不存在则新增
-    const map = new Map(filtered.map(s => [s.name, s]));
-    gameJson[fieldName] = Array.from(map.values());
-    fs__namespace.writeFileSync(gameJsonPath, JSON.stringify(gameJson, null, JSON_INDENT) + JSON_EOL);
-}
-
-async function downloadAndCompress(opts) {
-    const { startDownloadStatus, downloadDoneStatus, startCompressStatus, compressDoneStatus, url, out, enableCompress = false, } = opts;
+async function downloadOne(opts) {
+    const { startStatus, doneStatus, url, out } = opts;
     if (!url)
         return;
     const willDownloadedFileIsBr = url.includes(BR_SUFFIX);
-    const wasmBrOutName = willDownloadedFileIsBr ? out + BR_SUFFIX : out;
-    // 下载
-    wsServer.sendUnitySplitStatus({ status: startDownloadStatus });
-    console.log(`download url: ${url}`);
+    const finalOut = willDownloadedFileIsBr && !out.endsWith(BR_SUFFIX) ? out + BR_SUFFIX : out;
+    wsServer.sendUnitySplitStatus({ status: startStatus });
+    console.log(`[remote-split-download] fetching -> ${finalOut}`);
     const t0 = Date.now();
-    await withRetry(() => download(url, wasmBrOutName), DOWNLOAD_RETRY);
-    try {
-        const st = await promises.stat(wasmBrOutName);
-        if (!st.size)
-            throw new Error(`Empty download: ${wasmBrOutName}`);
-        wsServer.sendUnitySplitStatus({ status: downloadDoneStatus, url });
-        console.log(`download done: ${path.basename(wasmBrOutName)} size=${st.size}B time=${Date.now() - t0}ms`);
-    }
-    catch (e) {
-        await promises.rm(wasmBrOutName);
-        throw e;
-    }
-    if (enableCompress) {
-        console.log(`compress start: ${path.basename(out)}${BR_SUFFIX}`);
-        // 压缩
-        wsServer.sendUnitySplitStatus({ status: startCompressStatus });
-        const t1 = Date.now();
-        await compressWasmFile(out, wasmBrOutName);
-        wsServer.sendUnitySplitStatus({ status: compressDoneStatus });
-        console.log(`compress done: ${path.basename(wasmBrOutName)} time=${Date.now() - t1}ms`);
-    }
-    /**
-     * 在当前文件所在目录下写入一个空的 game.js
-     */
-    fs__namespace.writeFileSync(path.join(path.dirname(out), 'game.js'), '', {
-        encoding: 'utf-8',
-    });
-}
-
-async function downloadSplited(context) {
+    await withRetry(() => download(url, finalOut), DOWNLOAD_RETRY);
+    const st = await promises.stat(finalOut);
+    if (!st.size) {
+        await promises.rm(finalOut, { force: true });
+        throw new Error(`Empty download: ${finalOut}`);
+    }
+    console.log(`[remote-split-download] done: ${path.basename(finalOut)} size=${st.size}B time=${Date.now() - t0}ms`);
+    wsServer.sendUnitySplitStatus({ status: doneStatus, url });
+    // Legacy behaviour: write an empty game.js next to each downloaded artifact
+    // so the subpackage loader doesn't complain about missing js entries.
+    fs.writeFileSync(path.join(path.dirname(out), 'game.js'), '', 'utf-8');
+}
+async function downloadSplitedRemote(context) {
     const cwd = process.cwd();
     const splitTempDir = path.join(cwd, WASM_SPLIT_CACHE_DIR, DIR_SPLIT);
     ensureDirSync(splitTempDir);
@@ -11079,248 +11487,172 @@ async function downloadSplited(context) {
     const mainIosDir = path.join(splitTempDir, WASM_SPLIT_SUBPACKAGE_CONFIG.iosMain.root);
     const subIosDir = path.join(splitTempDir, WASM_SPLIT_SUBPACKAGE_CONFIG.iosSub.root);
     [mainAndroidDir, subAndroidDir, mainIosDir, subIosDir].forEach(ensureDirSync);
-    const mainAndroidWasmCodeTempPath = path.join(mainAndroidDir, `${context.main_wasm_md5}${WASM_FILENAME_SUFFIX}`);
-    const subAndroidWasmCodeTempPath = path.join(subAndroidDir, `${context.sub_wasm_md5}${WASM_FILENAME_SUFFIX}`);
-    const mainIosWasmCodeTempPath = path.join(mainIosDir, `${context.main_wasm_h5_md5}${WASM_FILENAME_SUFFIX}`);
+    const mainAndroidOut = path.join(mainAndroidDir, `${context.main_wasm_md5}${WASM_FILENAME_SUFFIX}`);
+    const subAndroidOut = path.join(subAndroidDir, `${context.sub_wasm_md5}${WASM_FILENAME_SUFFIX}`);
+    const mainIosOut = path.join(mainIosDir, `${context.main_wasm_h5_md5}${WASM_FILENAME_SUFFIX}`);
     const limit = pLimit(CONCURRENCY_LIMIT);
     try {
-        console.log('downloadWasmSplit', context);
-        // 原有状态文案，按你之前的写法
-        wsServer.sendUnitySplitStatus({
-            status: 'start_download_android_main_wasm',
+        console.log('[remote-split-download] start', {
+            original_wasm_md5: context.original_wasm_md5,
+            main_wasm_md5: context.main_wasm_md5,
+            sub_wasm_md5: context.sub_wasm_md5,
+            main_wasm_h5_md5: context.main_wasm_h5_md5,
         });
-        wsServer.sendUnitySplitStatus({
-            status: 'start_download_android_sub_wasm_code',
-        });
-        wsServer.sendUnitySplitStatus({ status: 'start_download_ios_main_wasm' });
-        /**
-         * 需要做个保护，只有 有 URL 时才下载
-         */
-        // 并发下载 + 压缩（带重试）
         await Promise.all([
-            limit(() => downloadAndCompress({
-                startDownloadStatus: 'start_download_android_main_wasm',
-                downloadDoneStatus: 'download_android_main_wasm_done',
-                startCompressStatus: 'start_compress_android_main_wasm',
-                compressDoneStatus: 'compress_android_main_wasm_done',
+            limit(() => downloadOne({
+                startStatus: 'start_download_android_main_wasm',
+                doneStatus: 'download_android_main_wasm_done',
                 url: context.main_wasm_download_url,
-                out: mainAndroidWasmCodeTempPath,
+                out: mainAndroidOut,
             })),
-            limit(() => downloadAndCompress({
-                startDownloadStatus: 'start_download_android_sub_wasm_code',
-                downloadDoneStatus: 'download_android_sub_wasm_code_done',
-                startCompressStatus: 'start_compress_android_sub_wasm_code',
-                compressDoneStatus: 'compress_android_sub_wasm_code_done',
+            limit(() => downloadOne({
+                startStatus: 'start_download_android_sub_wasm_code',
+                doneStatus: 'download_android_sub_wasm_code_done',
                 url: context.sub_wasm_download_url,
-                out: subAndroidWasmCodeTempPath,
+                out: subAndroidOut,
             })),
-            limit(() => downloadAndCompress({
-                startDownloadStatus: 'start_download_ios_main_wasm',
-                downloadDoneStatus: 'download_ios_main_wasm_done',
-                startCompressStatus: 'start_compress_ios_main_wasm',
-                compressDoneStatus: 'compress_ios_main_wasm_done',
+            limit(() => downloadOne({
+                startStatus: 'start_download_ios_main_wasm',
+                doneStatus: 'download_ios_main_wasm_done',
                 url: context.main_wasm_h5_download_url,
-                out: mainIosWasmCodeTempPath,
+                out: mainIosOut,
             })),
-            // 下载 ios sub js range  json
-            limit(() => downloadAndCompress({
-                startDownloadStatus: 'start_download_ios_range_json',
-                downloadDoneStatus: 'download_ios_range_json_done',
+            limit(() => downloadOne({
+                startStatus: 'start_download_ios_range_json',
+                doneStatus: 'download_ios_range_json_done',
                 url: context.sub_js_range_download_url,
                 out: path.join(subIosDir, 'func_bytes_range.json'),
             })),
-            // 下载 ios sub js data br
-            limit(() => downloadAndCompress({
-                startDownloadStatus: 'start_download_ios_js_data_br',
-                downloadDoneStatus: 'download_ios_js_data_br_done',
+            limit(() => downloadOne({
+                startStatus: 'start_download_ios_js_data_br',
+                doneStatus: 'download_ios_js_data_br_done',
                 url: context.sub_js_data_download_url,
                 out: path.join(subIosDir, 'subjs.data'),
             })),
         ]);
-        // 复制 split/* 到项目根目录（递归、覆盖）——避免 EISDIR
-        console.log('copy splitTempDir to root start');
+        console.log('[remote-split-download] copying split output to project root...');
         wsServer.sendUnitySplitStatus({ status: 'start_write_splited_wasm_br' });
         for (const file of fs.readdirSync(splitTempDir)) {
             const srcPath = path.join(splitTempDir, file);
             const destPath = path.join(cwd, file);
-            // 如果目标路径有文件或目录，先删除
             if (fs.existsSync(destPath)) {
                 await promises.rm(destPath, { recursive: true, force: true });
             }
             await promises.cp(srcPath, destPath, { recursive: true, force: true });
         }
         wsServer.sendUnitySplitStatus({ status: 'write_splited_wasm_done' });
-        console.log('copy splitTempDir to root end');
-        // 更新分包配置（幂等）
-        console.log('updateSubpackageConfigSync start');
-        updateSubpackageConfigSync();
-        console.log('updateSubpackageConfigSync end');
-        // 更新 wasm split 配置（保持原始状态文案）
-        console.log('updateWasmSplitConfig start');
+        console.log('[remote-split-download] updating subpackage config...');
+        updateSubpackageConfigSync(false);
+        console.log('[remote-split-download] updating webgl-wasm-split.js...');
         wsServer.sendUnitySplitStatus({ status: 'start_update_wasm_split_config' });
         updateWasmSplitConfig({
             ENABLEWASMCOLLECT: true,
-            ORIGINALWASMMD5: `${context.original_wasm_md5}`,
+            ENABLEWASMSPLIT: true,
+            ENABLEARCHIVEMODE: false,
+            ORIGINALWASMMD5: `${context.original_wasm_md5 ?? ''}`,
             WASMTABLESIZE: context.table_size,
             GLOBALVARLIST: JSON.stringify(context.global_var_list ?? []),
-            SUBJSURL: `${context.sub_js_download_url}`,
-            IOS_CODE_FILE_MD5: `${context.main_wasm_h5_md5}`,
-            ANDROID_CODE_FILE_MD5: `${context.main_wasm_md5}`,
-            ANDROID_SUB_CODE_FILE_MD5: `${context.sub_wasm_md5}`,
-            WASMSPLITVERSION: `${context.version}`,
+            SUBJSURL: `${context.sub_js_download_url ?? ''}`,
+            IOS_CODE_FILE_MD5: `${context.main_wasm_h5_md5 ?? ''}`,
+            ANDROID_CODE_FILE_MD5: `${context.main_wasm_md5 ?? ''}`,
+            ANDROID_SUB_CODE_FILE_MD5: `${context.sub_wasm_md5 ?? ''}`,
+            WASMSPLITVERSION: `${context.version ?? ''}`,
             USINGWASMH5: Boolean(context.main_wasm_h5_md5),
-            ENABLEWASMSPLIT: true,
-            // IOS_SUB_JS_FILE_CONFIG: JSON.stringify(context.merged_js ?? {}),
         });
         wsServer.sendUnitySplitStatus({ status: 'update_wasm_split_config_done' });
-        console.log('updateWasmSplitConfig end');
-        return {
-            data: {
-                isSuccess: true,
-            },
-            ctx: context,
-        };
+        console.log('[remote-split-download] all done');
+        return { data: { isSuccess: true }, ctx: context };
     }
     catch (err) {
-        wsServer.sendUnitySplitStatus({
-            status: 'wasm_split_failed',
-            errorMsg: err instanceof Error ? err.message : String(err),
-        });
+        const message = err instanceof Error ? err.message : String(err);
+        console.log('[remote-split-download] failed:', message);
+        wsServer.sendUnitySplitStatus({ status: 'wasm_split_failed', errorMsg: message });
         return {
-            data: {
-                isSuccess: false,
-            },
-            error: {
-                message: err instanceof Error ? err.message : String(err),
-            },
+            data: { isSuccess: false },
+            error: { message },
             ctx: context,
         };
     }
     finally {
-        // 清理临时目录与旧 wasmcode 目录
-        console.log('delete splitTempDir start');
         await promises.rm(splitTempDir, { recursive: true, force: true });
-        console.log('delete splitTempDir end');
-        console.log('delete wasmcode start');
+        // Legacy flow: the server-produced `wasmcode/` placeholder at the project
+        // root is no longer needed once we've laid down the 4 platform dirs.
         await promises.rm(path.join(cwd, WASM_SPLIT_SUBPACKAGE_CONFIG.origin.root), {
             recursive: true,
             force: true,
         });
-        console.log('delete wasmcode end');
     }
 }
 
-async function getSplitResult({ client_key, wasm_md5, wasm_path, }) {
-    return request({
-        url: `${BASE_URL}/api/stark_wasm/v4/post/download`,
-        method: 'POST',
-        headers: { ...DEV_HEADERS },
-        data: { client_key, wasm_md5, wasm_path },
-    });
-}
-
-function cancelSplit(params) {
-    /**
-     * 把— __TTMG_TEMP__/wasmcode/ 目录下的所有文件恢复到原本的位置，进行重置
-     */
-    const { wasmCodePath } = params;
-    const cacheDir = path__namespace.join(process.cwd(), WASM_SPLIT_CACHE_DIR);
-    /**
-     * 恢复 br 文件
-     */
-    if (fs__namespace.existsSync(cacheDir)) {
-        /**
-         * 判断是否有缓存的 br 文件
-         */
-        const targetWasmBrPath = path__namespace.join(cacheDir, path__namespace.basename(wasmCodePath));
-        if (fs__namespace.existsSync(targetWasmBrPath)) {
-            const destWasmBrPath = path__namespace.join(process.cwd(), wasmCodePath);
-            // 规避没有文件夹的情况
-            ensureDirSync(path__namespace.dirname(destWasmBrPath));
-            fs__namespace.copyFileSync(targetWasmBrPath, destWasmBrPath);
-        }
-    }
-    /**
-     * 恢复 webgl-wasm-split.js 文件
-     */
-    const splitConfigCachePath = path__namespace.join(cacheDir, WASM_SPLIT_CONFIG_FILE_NAME);
-    if (fs__namespace.existsSync(splitConfigCachePath)) {
-        fs__namespace.copyFileSync(splitConfigCachePath, path__namespace.join(process.cwd(), WASM_SPLIT_CONFIG_FILE_NAME));
-    }
-    /**
-     * 恢复 game.json 文件
-     */
-    const gameJsonCachePath = path__namespace.join(cacheDir, 'game.json');
-    if (fs__namespace.existsSync(gameJsonCachePath)) {
-        fs__namespace.copyFileSync(gameJsonCachePath, path__namespace.join(process.cwd(), 'game.json'));
+async function getSplitResult$1(_params) {
+    const { splitMeta } = getLocalState();
+    if (!splitMeta) {
+        return {
+            data: null,
+            error: {
+                code: 404,
+                message: 'No local split result found. Run split first.',
+            },
+            ctx: { logid: 'local', httpStatusCode: 404 },
+        };
     }
-}
-
-async function resetWasmSplit(data) {
-    const res = await request({
-        url: `${BASE_URL}/api/stark_wasm/v4/post/reset`,
-        method: 'POST',
-        headers: {
-            ...DEV_HEADERS,
-        },
+    return {
         data: {
-            client_key: data.clientkey,
-            wasm_md5: data.wasmMd5,
+            code: 0,
+            message: 'success',
+            result: splitMeta,
         },
-    });
-    /**
-     * 把— __TTMG_TEMP__/wasmcode/ 目录下的所有文件恢复到原本的位置，进行重置
-     */
-    const cacheDir = path.join(process.cwd(), WASM_SPLIT_CACHE_DIR);
-    /**
-     * 恢复 br 文件
-     */
-    if (fs.existsSync(cacheDir)) {
-        /**
-         * 判断是否有缓存的 br 文件
-         */
-        /**
-         * 判断 cache 文件夹下有没有 .br 文件
-         *
-         */
-        const targetWasmBrPath = fs
-            .readdirSync(cacheDir)
-            .find(item => item.endsWith('.br'));
-        if (targetWasmBrPath) {
-            const destWasmBrPath = path.join(process.cwd(), WASM_SPLIT_SUBPACKAGE_CONFIG.origin.root, path.basename(targetWasmBrPath));
-            // 规避没有文件夹的情况
-            ensureDirSync(path.dirname(destWasmBrPath));
-            fs.copyFileSync(path.join(cacheDir, targetWasmBrPath), destWasmBrPath);
-        }
-    }
-    /**
-     * 恢复 webgl-wasm-split.js 文件
-     */
-    const splitConfigCachePath = path.join(cacheDir, WASM_SPLIT_CONFIG_FILE_NAME);
-    if (fs.existsSync(splitConfigCachePath)) {
-        fs.copyFileSync(splitConfigCachePath, path.join(process.cwd(), WASM_SPLIT_CONFIG_FILE_NAME));
-    }
-    /**
-     * 恢复 game.json 文件
-     */
-    const gameJsonCachePath = path.join(cacheDir, 'game.json');
-    if (fs.existsSync(gameJsonCachePath)) {
-        fs.copyFileSync(gameJsonCachePath, path.join(process.cwd(), 'game.json'));
-    }
-    /**
-     * 删除历史分包产物
-     */
-    const androidSubpackageDir = path.join(process.cwd(), WASM_SPLIT_SUBPACKAGE_CONFIG.androidMain.root);
-    if (fs.existsSync(androidSubpackageDir)) {
-        fs.rmSync(androidSubpackageDir, { recursive: true });
-    }
-    const androidSubpackageSubDir = path.join(process.cwd(), WASM_SPLIT_SUBPACKAGE_CONFIG.androidSub.root);
-    if (fs.existsSync(androidSubpackageSubDir)) {
-        fs.rmSync(androidSubpackageSubDir, { recursive: true });
+        error: null,
+        ctx: { logid: 'local', httpStatusCode: 200 },
+    };
+}
+
+/**
+ * Local-only undo of a prepare run. Routes through the shared
+ * `restoreFromCache` helper so this stays in sync with `resetWasmSplit`
+ * and never falls behind when new split-output dirs are added.
+ *
+ * `wasmCodePath` is kept on the signature for backward-compat with the
+ * existing /game/wasm-cancel route shape, but it's no longer needed —
+ * `restoreFromCache` already resolves the wasm path from the cache
+ * directory contents (whatever `keepCacheSync` recorded as the original).
+ */
+function cancelSplit(_params) {
+    restoreFromCache();
+    // Drop the prepared-meta anchor for the same reason resetWasmSplit
+    // does: cancel rolled the wasm back to its un-instrumented state, so
+    // the recorded "preparedWasmMd5" is no longer accurate. Leaving it
+    // would trip the split-config drift guard on the very next Modal open.
+    const preparedMetaPath = path__namespace.join(process.cwd(), TTMG_TEMP_DIR, 'prepared-meta.json');
+    if (fs__namespace.existsSync(preparedMetaPath)) {
+        fs__namespace.rmSync(preparedMetaPath, { force: true });
     }
-    const iosSubpackageDir = path.join(process.cwd(), WASM_SPLIT_SUBPACKAGE_CONFIG.ios.root);
-    if (fs.existsSync(iosSubpackageDir)) {
-        fs.rmSync(iosSubpackageDir, { recursive: true });
+}
+
+async function resetWasmSplit$1(data) {
+    const res = await request({
+        url: `${WASM_COLLECT_BASE_URL}/reset`,
+        method: 'POST',
+        data: {
+            app_id: data.clientkey,
+            wasm_md5: data.wasmMd5,
+        },
+    });
+    // Reuse the shared restore helper so local + remote rollback cleans
+    // exactly the same set of files. Previously this function had its own
+    // inline copy that only removed wasmcode-android / wasmcode1-android /
+    // wasmcode-ios — missing wasmcode1 / wasmcode-archive (archive mode)
+    // and wasmcode1-ios (legacy iOS sub), which left stale split outputs
+    // on disk and caused them to be re-uploaded on the next build.
+    restoreFromCache();
+    // Drop the prepared-meta anchor as well — rollback restores the
+    // original wasm into the project, so any md5 we previously recorded
+    // for the prepared build is no longer valid. Leaving it behind would
+    // make the split-config drift guard fire on the very next Modal open
+    // and force the user through a redundant prepare cycle.
+    const preparedMetaPath = path.join(process.cwd(), TTMG_TEMP_DIR, 'prepared-meta.json');
+    if (fs.existsSync(preparedMetaPath)) {
+        fs.rmSync(preparedMetaPath, { force: true });
     }
     return res;
 }
@@ -11357,23 +11689,291 @@ function getSplitConfig() {
     }
 }
 
-const getTaskStatus = (params) => {
-    return request({
-        url: `${BASE_URL}/api/stark_wasm/v4/get/status`,
+var WasmStatus;
+(function (WasmStatus) {
+    WasmStatus[WasmStatus["IdleStatus"] = 0] = "IdleStatus";
+    WasmStatus[WasmStatus["WasmPreparingStatus"] = 1] = "WasmPreparingStatus";
+    WasmStatus[WasmStatus["WasmPreparedStatus"] = 2] = "WasmPreparedStatus";
+    WasmStatus[WasmStatus["WasmSplitStatus"] = 3] = "WasmSplitStatus";
+    WasmStatus[WasmStatus["WasmSplittingStatus"] = 4] = "WasmSplittingStatus";
+    WasmStatus[WasmStatus["WasmSplitDoneStatus"] = 5] = "WasmSplitDoneStatus";
+    WasmStatus[WasmStatus["WasmSplitReadyToPrepareStatus"] = 6] = "WasmSplitReadyToPrepareStatus";
+    WasmStatus[WasmStatus["WasmSplitPreparingStatus"] = 7] = "WasmSplitPreparingStatus";
+    WasmStatus[WasmStatus["WasmSplitPreparedStatus"] = 8] = "WasmSplitPreparedStatus";
+    WasmStatus[WasmStatus["WasmCollectingStatus"] = 9] = "WasmCollectingStatus";
+    WasmStatus[WasmStatus["WasmUploadFailStatus"] = -1] = "WasmUploadFailStatus";
+    WasmStatus[WasmStatus["WasmDownloadFailStatus"] = -2] = "WasmDownloadFailStatus";
+    WasmStatus[WasmStatus["WasmFileNotExistStatus"] = -3] = "WasmFileNotExistStatus";
+    WasmStatus[WasmStatus["WasmSplitFailStatus"] = -4] = "WasmSplitFailStatus";
+    WasmStatus[WasmStatus["WasmSplitUpdateDBFailedStatus"] = -5] = "WasmSplitUpdateDBFailedStatus";
+    WasmStatus[WasmStatus["WasmSplitPrepareFailedStatus"] = -6] = "WasmSplitPrepareFailedStatus";
+})(WasmStatus || (WasmStatus = {}));
+
+const getTaskStatus$1 = async (params) => {
+    const { preparedWasmPath, splitMeta } = getLocalState();
+    let status = WasmStatus.IdleStatus;
+    if (splitMeta) {
+        status = WasmStatus.WasmSplitDoneStatus;
+    }
+    else if (preparedWasmPath) {
+        status = WasmStatus.WasmSplitPreparedStatus;
+    }
+    return {
+        data: {
+            code: 0,
+            message: 'success',
+            result: {
+                status,
+                wasm_md5: params.wasm_md5,
+            },
+        },
+        error: null,
+        ctx: { logid: 'local', httpStatusCode: 200 },
+    };
+};
+
+const getTaskInfo$1 = async (params) => {
+    const res = await request({
+        url: `${WASM_COLLECT_BASE_URL}/progress`,
         method: 'GET',
-        headers: DEV_HEADERS,
-        params,
+        params: {
+            app_id: params.client_key,
+            wasm_md5: params.wasm_md5,
+        },
     });
+    const { totalWasmFuncCount, preparedWasmPath, wasmSize } = getLocalState();
+    // Prefer game.json as the source of truth so wasm_size / total_wasm_func_count
+    // survive CLI restarts. localState values are only populated during the
+    // prepare step of the current session; after a restart they default to 0.
+    // game.json carries wasmCodeSize/wasmFuncCount emitted at build time, so
+    // re-entering the collect step still shows the correct totals.
+    const gameJson = getGameJson();
+    const gameJsonWasmSize = Number(gameJson?.wasmCodeSize) || 0;
+    const gameJsonFuncCount = Number(gameJson?.wasmFuncCount) || 0;
+    return {
+        data: {
+            code: res?.data?.code ?? 0,
+            message: 'success',
+            result: {
+                app_id: params.client_key,
+                wasm_md5: params.wasm_md5,
+                is_prepared: Boolean(preparedWasmPath),
+                collected_func_count: res?.data?.func_count ?? 0,
+                total_wasm_func_count: gameJsonFuncCount || totalWasmFuncCount || 0,
+                wasm_size: gameJsonWasmSize || wasmSize || 0,
+            },
+        },
+        error: res.error,
+        ctx: res.ctx,
+    };
 };
 
-const getTaskInfo = async (params) => {
+async function startPrepareRemote(params) {
+    // Back up the original wasm + split config on the first run so cancel/rollback
+    // works even if the user aborts before the server-side prepare finishes.
+    keepCacheSync({
+        entryDir: process.cwd(),
+        originalWasmPath: params.wasm_file_path,
+        originalSplitConfigPath: WASM_SPLIT_CONFIG_FILE_NAME,
+    });
+    const form = new FormData$1();
+    form.append('desc', params.desc);
+    form.append('wasm_md5', params.wasm_md5);
+    form.append('with_ios', 'true');
+    form.append('wasm_file', fs$1.createReadStream(path$1.join(process.cwd(), params.wasm_file_path)), { filename: path$1.basename(params.wasm_file_path), contentType: 'application/wasm' });
+    let symbolFilePath = path$1.join(process.cwd(), TTMG_TEMP_DIR, WASM_SYMBOL_FILE_NAME);
+    if (!fs$1.existsSync(symbolFilePath)) {
+        symbolFilePath = path$1.join(process.cwd(), WASM_SYMBOL_FILE_NAME);
+    }
+    if (!fs$1.existsSync(symbolFilePath)) {
+        return {
+            error: { code: 400, message: `${WASM_SYMBOL_FILE_NAME} not found`, client_key: params.client_key },
+            data: null,
+            ctx: { logid: '', httpStatusCode: 400 },
+        };
+    }
+    form.append('wasm_symbol_file', fs$1.createReadStream(symbolFilePath), {
+        filename: WASM_SYMBOL_FILE_NAME,
+        contentType: 'application/octet-stream',
+    });
+    const formHeaders = form.getHeaders();
+    return request({
+        url: `${BASE_URL}/api/stark_wasm/v4/post/prepare`,
+        method: 'POST',
+        headers: { ...DEV_HEADERS, ...formHeaders },
+        params: { client_key: params.client_key, with_ios: true },
+        data: form,
+    });
+}
+async function setCollectRemote({ client_key, wasm_md5 }) {
+    return request({
+        url: `${BASE_URL}/api/stark_wasm/v4/post/set_collecting`,
+        method: 'POST',
+        data: { client_key, wasm_md5 },
+        headers: DEV_HEADERS,
+    });
+}
+async function getCollectedFuncIdsRemote({ client_key, wasm_md5 }) {
+    return request({
+        url: `${BASE_URL}/api/stark_wasm/v4/get/collectedfuncids`,
+        method: 'GET',
+        headers: DEV_HEADERS,
+        params: { client_key, wasm_md5 },
+    });
+}
+async function getCollecttingInfoRemote({ client_key, wasm_md5 }) {
+    return request({
+        url: `${BASE_URL}/api/stark_wasm/v4/get/funccollect`,
+        method: 'GET',
+        headers: DEV_HEADERS,
+        params: { client_key, wasm_md5 },
+    });
+}
+async function startSplitRemote({ client_key, wasm_md5 }) {
+    return request({
+        url: `${BASE_URL}/api/stark_wasm/v4/post/split`,
+        method: 'POST',
+        headers: { ...DEV_HEADERS },
+        data: { client_key, wasm_md5 },
+    });
+}
+async function getTaskInfoRemote(params) {
     return request({
         url: `${BASE_URL}/api/stark_wasm/v4/get/taskinfo`,
         method: 'GET',
         headers: DEV_HEADERS,
         params,
     });
-};
+}
+async function getTaskStatusRemote(params) {
+    return request({
+        url: `${BASE_URL}/api/stark_wasm/v4/get/status`,
+        method: 'GET',
+        headers: DEV_HEADERS,
+        params,
+    });
+}
+async function resetWasmSplitRemote(data) {
+    const res = await request({
+        url: `${BASE_URL}/api/stark_wasm/v4/post/reset`,
+        method: 'POST',
+        headers: { ...DEV_HEADERS },
+        data: { client_key: data.clientkey, wasm_md5: data.wasmMd5 },
+    });
+    // Restore project files (wasm / webgl-wasm-split.js / game.json) so the
+    // next prepare starts from the original placeholders.
+    restoreFromCache();
+    return res;
+}
+async function getSplitResultRemote({ client_key, wasm_md5, wasm_path }) {
+    return request({
+        url: `${BASE_URL}/api/stark_wasm/v4/post/download`,
+        method: 'POST',
+        headers: { ...DEV_HEADERS },
+        data: { client_key, wasm_md5, wasm_path },
+    });
+}
+/**
+ * Remote pipeline: after the server finishes preparing (instrumenting) the wasm,
+ * fetch the download URL, download the prepared wasm, replace the project file,
+ * and update webgl-wasm-split.js for the LEGACY reporting flow.
+ */
+async function downloadPreparedRemote(data) {
+    wsServer.sendUnitySplitStatus({ status: 'star_fetch_prepared_wasm_url' });
+    const res = await request({
+        url: `${BASE_URL}/api/stark_wasm/v4/post/download_prepared`,
+        method: 'POST',
+        headers: DEV_HEADERS,
+        data,
+    });
+    wsServer.sendUnitySplitStatus({ status: 'fetch_prepared_wasm_url_done' });
+    try {
+        const downloadUrl = res?.data?.result?.download_url;
+        if (!downloadUrl) {
+            console.log('[remote-download-prepared] no download_url in response');
+            return {
+                isSuccess: false,
+                error: { code: res.data?.code, message: res.data?.message || 'No download_url returned' },
+                ctx: res?.ctx,
+            };
+        }
+        const willReplaceWasmPath = path$1.join(process.cwd(), data.wasm_path);
+        const { cacheDir } = keepCacheSync({
+            entryDir: process.cwd(),
+            originalWasmPath: data.wasm_path,
+            originalSplitConfigPath: WASM_SPLIT_CONFIG_FILE_NAME,
+        });
+        console.log(`[remote-download-prepared] target=${willReplaceWasmPath}`);
+        if (downloadUrl.includes('.br')) {
+            const tempWasmPath = path$1.join(cacheDir, '__temp__.wasm.br');
+            console.log('[remote-download-prepared] downloading (br) ->', tempWasmPath);
+            wsServer.sendUnitySplitStatus({ status: 'start_download_prepared_wasm', url: downloadUrl });
+            const startedAt = Date.now();
+            await download(downloadUrl, tempWasmPath);
+            console.log(`[remote-download-prepared] download done in ${Date.now() - startedAt}ms, size=${fs$1.statSync(tempWasmPath).size}`);
+            fs$1.copyFileSync(tempWasmPath, willReplaceWasmPath);
+            wsServer.sendUnitySplitStatus({ status: 'download_prepared_wasm_done', url: downloadUrl });
+        }
+        else {
+            const tempWasmPath = path$1.join(cacheDir, '__temp__.wasm');
+            console.log('[remote-download-prepared] downloading (raw) ->', tempWasmPath);
+            wsServer.sendUnitySplitStatus({ status: 'start_download_prepared_wasm', url: downloadUrl });
+            const startedAt = Date.now();
+            await download(downloadUrl, tempWasmPath);
+            console.log(`[remote-download-prepared] download done in ${Date.now() - startedAt}ms, size=${fs$1.statSync(tempWasmPath).size}`);
+            wsServer.sendUnitySplitStatus({ status: 'download_prepared_wasm_done', url: downloadUrl });
+            wsServer.sendUnitySplitStatus({ status: 'start_compress_prepared_wasm' });
+            await compressWasmFile(tempWasmPath, willReplaceWasmPath);
+            console.log('[remote-download-prepared] compressed and written to project');
+            wsServer.sendUnitySplitStatus({ status: 'compress_prepared_wasm_done', url: downloadUrl });
+            wsServer.sendUnitySplitStatus({ status: 'write_compress_prepared_wasm_done' });
+        }
+        wsServer.sendUnitySplitStatus({ status: 'start_update_wasm_split_config' });
+        // Remote (legacy) pipeline: enable collect but disable archive mode so the
+        // plugin reports to the legacy stark_wasm/v4 collect API.
+        // ORIGINALWASMMD5 must be set now (not only at split time) so the plugin
+        // sends the correct wasm_md5 in every collect report.
+        restoreSplitConfigFromCache();
+        updateWasmSplitConfig({
+            ENABLEWASMCOLLECT: true,
+            ENABLEARCHIVEMODE: false,
+            ORIGINALWASMMD5: res?.data?.result?.original_wasm_md5 ||
+                res?.data?.result?.md5 ||
+                data.wasm_md5,
+        });
+        wsServer.sendUnitySplitStatus({ status: 'update_wasm_split_config_done' });
+        console.log('[remote-download-prepared] split config updated, returning success');
+        return { isSuccess: true, ctx: res?.ctx };
+    }
+    catch (error) {
+        console.log('[remote-download-prepared] error:', error);
+        return {
+            isSuccess: false,
+            error: { code: res.data?.code, message: error instanceof Error ? error.message : String(error) },
+            ctx: res?.ctx,
+        };
+    }
+}
+
+function isLocal() {
+    return getLocalState().pipelineMode === 'local';
+}
+const startPrepare = (params) => isLocal() ? startPrepare$1(params) : startPrepareRemote(params);
+const downloadPrepared = (params) => isLocal() ? downloadPrepared$1() : downloadPreparedRemote(params);
+const setCollect = (params) => isLocal() ? setCollect$1(params) : setCollectRemote(params);
+const getCollectedFuncIds = (params) => isLocal() ? getCollectedFuncIds$1(params) : getCollectedFuncIdsRemote(params);
+const getCollecttingInfo = (params) => isLocal() ? getCollecttingInfo$1(params) : getCollecttingInfoRemote(params);
+const startSplit = (params) => isLocal() ? startSplit$1(params) : startSplitRemote(params);
+const downloadSplited = (context) => isLocal() ? downloadSplited$1(context) : downloadSplitedRemote(context);
+const getSplitResult = (params) => isLocal() ? getSplitResult$1() : getSplitResultRemote(params);
+const getTaskInfo = (params) => isLocal() ? getTaskInfo$1(params) : getTaskInfoRemote(params);
+const getTaskStatus = (params) => isLocal() ? getTaskStatus$1(params) : getTaskStatusRemote(params);
+const resetWasmSplit = (data) => isLocal() ? resetWasmSplit$1(data) : resetWasmSplitRemote(data);
+// Collect session (`/start` / `/finish`) is an implementation detail of the
+// local `wasm-collect/v1` pipeline — it's invoked inside `setCollectLocal`
+// and `startSplitLocal` respectively. The remote `stark_wasm/v4` pipeline
+// has no session concept. IDE never calls these directly, so there is no
+// dispatcher exposed here.
 
 const gameWasmCancelRoute = {
     method: 'post',
@@ -11381,9 +11981,7 @@ const gameWasmCancelRoute = {
     handler: async (req, res) => {
         const { codePath } = req.body;
         console.log('wasm-cancel', req.body);
-        await cancelSplit({
-            wasmCodePath: codePath,
-        });
+        await cancelSplit();
         res.send({
             code: successCode,
             msg: 'cancel success',
@@ -11477,26 +12075,35 @@ const gameWasmPrepareResultRoute = {
     method: 'post',
     path: '/game/wasm-prepare-result',
     handler: async (req, res) => {
-        console.log('wasm-prepare-result-request', req.body);
-        const { clientKey, codeMd5 } = req.body;
-        const response = await getTaskStatus({
-            client_key: clientKey,
-            wasm_md5: codeMd5,
-        });
-        if (response.error) {
-            res.send({
-                code: errorCode,
-                error: response.error,
-                ctx: response.ctx,
-            });
-        }
-        else {
+        const { pipelineMode } = getLocalState();
+        if (pipelineMode === 'local') {
             res.send({
                 code: successCode,
-                data: response.data?.result || {},
-                ctx: response.ctx,
+                data: { status: WasmStatus.WasmSplitPreparedStatus },
+                ctx: { logid: 'local' },
             });
+            return;
+        }
+        const { codeMd5, clientKey } = req.body;
+        const result = await getTaskStatus({
+            client_key: clientKey,
+            wasm_md5: codeMd5,
+        });
+        // For the remote pipeline, forward the full `result` payload so the IDE
+        // gets both `status` and the accompanying `package` info, matching the
+        // legacy behaviour that the UI was written against.
+        if (result?.error) {
+            console.log('[wasm-prepare-result] remote error', result.error);
+            res.send({ code: errorCode, error: result.error, ctx: result?.ctx });
+            return;
         }
+        const data = result?.data?.result ?? { status: WasmStatus.IdleStatus };
+        console.log(`[wasm-prepare-result] remote status=${data?.status}`);
+        res.send({
+            code: successCode,
+            data,
+            ctx: result?.ctx ?? { logid: 'remote' },
+        });
     },
 };
 
@@ -11505,7 +12112,8 @@ const gameWasmPrepareRoute = {
     path: '/game/wasm-prepare',
     handler: async (req, res) => {
         const { codePath, desc, codeMd5, clientKey } = req.body;
-        console.log('wasm-prepare-start', req.body);
+        const { pipelineMode } = getLocalState();
+        console.log(`wasm-prepare-start [mode=${pipelineMode}]`, req.body);
         const result = await startPrepare({
             client_key: clientKey,
             desc,
@@ -11544,11 +12152,19 @@ const gameWasmSetCollectRoute = {
     method: 'post',
     path: '/game/wasm-set-collect',
     handler: async (req, res) => {
-        const { clientKey, codeMd5 } = req.body;
+        // `resume` is optional and only meaningful for the local pipeline:
+        // when the IDE detects an existing open session (e.g. user refreshed
+        // the page mid-collect) and wants to "继续收集" without nuking the
+        // already-uploaded func_ids, it POSTs `{ resume: true }`. Default
+        // (omitted / false) keeps the historical "fresh run" behaviour on
+        // /start (server gets `reset: true`). See `setCollect` jsdoc for the
+        // two-path contract; remote pipeline ignores the field outright.
+        const { clientKey, codeMd5, resume } = req.body;
         console.log('wasm-set-collect', req.body);
         const response = await setCollect({
             client_key: clientKey,
             wasm_md5: codeMd5,
+            resume,
         });
         if (response.error) {
             res.send({
@@ -11571,50 +12187,42 @@ const gameWasmSplitDownloadResultRoute = {
     method: 'post',
     path: '/game/wasm-split-download-result',
     handler: async (req, res) => {
+        const { pipelineMode, splitMeta } = getLocalState();
+        if (pipelineMode === 'local') {
+            if (!splitMeta) {
+                res.send({
+                    code: errorCode,
+                    error: { message: 'No local split result found. Run split first.' },
+                });
+                return;
+            }
+            res.send({
+                code: successCode,
+                data: { result: splitMeta },
+                msg: 'download success',
+                ctx: { logid: 'local' },
+            });
+            return;
+        }
         const { clientKey, codeMd5, codePath } = req.body;
-        console.log('game/wasm-split-download-result-start', req.body);
-        const response = await getSplitResult({
+        const result = await getSplitResult({
             client_key: clientKey,
             wasm_md5: codeMd5,
             wasm_path: codePath,
         });
-        if (response.error) {
+        if (result.error) {
             res.send({
                 code: errorCode,
-                error: response.error,
-                ctx: response.ctx,
+                error: result.error,
+                ctx: result.ctx,
             });
         }
         else {
-            const splitResult = (response.data?.result || {});
-            const requiredDownloadFields = [
-                'main_wasm_download_url',
-                'main_wasm_h5_download_url',
-                // 'sub_wasm_download_url',
-                // 'sub_js_download_url',
-                // 'sub_js_data_download_url',
-                // 'sub_js_range_download_url',
-            ];
-            const missingFields = requiredDownloadFields.filter(field => {
-                const value = splitResult[field];
-                return typeof value !== 'string' || value.trim() === '';
-            });
-            if (missingFields.length > 0) {
-                res.send({
-                    code: errorCode,
-                    error: {
-                        message: `Missing required wasm split fields: ${missingFields.join(', ')}`,
-                    },
-                    data: response.data || {},
-                    ctx: response.ctx,
-                });
-                return;
-            }
             res.send({
                 code: successCode,
-                data: response.data || {},
+                data: result.data || {},
                 msg: 'download success',
-                ctx: response.ctx,
+                ctx: result.ctx,
             });
         }
     },
@@ -11703,26 +12311,32 @@ const gameWasmSplitResultRoute = {
     method: 'post',
     path: '/game/wasm-split-result',
     handler: async (req, res) => {
-        const { codeMd5, clientKey } = req.body;
-        console.log('wasm-split-result', req.body);
-        const response = await getTaskStatus({
-            client_key: clientKey,
-            wasm_md5: codeMd5,
-        });
-        if (response.error) {
-            res.send({
-                code: errorCode,
-                error: response.error,
-                ctx: response.ctx,
-            });
-        }
-        else {
+        const { pipelineMode } = getLocalState();
+        if (pipelineMode === 'local') {
             res.send({
                 code: successCode,
-                data: response.data?.result || {},
-                ctx: response.ctx,
+                data: { status: WasmStatus.WasmSplitDoneStatus },
+                ctx: { logid: 'local' },
             });
+            return;
         }
+        const { clientKey, codeMd5 } = req.body;
+        const result = await getTaskStatus({
+            client_key: clientKey,
+            wasm_md5: codeMd5,
+        });
+        if (result?.error) {
+            console.log('[wasm-split-result] remote error', result.error);
+            res.send({ code: errorCode, error: result.error, ctx: result?.ctx });
+            return;
+        }
+        const data = result?.data?.result ?? { status: WasmStatus.IdleStatus };
+        console.log(`[wasm-split-result] remote status=${data?.status}`);
+        res.send({
+            code: successCode,
+            data,
+            ctx: result?.ctx ?? { logid: 'remote' },
+        });
     },
 };
 
@@ -11733,10 +12347,52 @@ const gameWasmSplitConfigRoute = {
         const config = getSplitConfig();
         if (!config) {
             res.send({ code: errorCode, data: 'Failed to parse split config' });
+            return;
         }
-        else {
-            res.send({ code: successCode, data: config });
+        // When the CLI is restarted mid-session, localState.pipelineMode resets to
+        // 'local' even though the project on disk may have been prepared in remote
+        // mode. Re-infer it from the persisted split config so subsequent
+        // dispatches (taskinfo / collect / split download) pick the right backend.
+        // Heuristic: the local pipeline always writes enableArchiveMode=true, the
+        // legacy remote pipeline always writes enableArchiveMode=false.
+        if (config.enableWasmCollect) {
+            const inferredMode = config.enableArchiveMode === true ? 'local' : 'remote';
+            const current = getLocalState().pipelineMode;
+            if (current !== inferredMode) {
+                setLocalState({ pipelineMode: inferredMode });
+                console.log(`[pipeline] inferred mode=${inferredMode} from webgl-wasm-split.js (was ${current})`);
+            }
+        }
+        // ── wasm drift guard ─────────────────────────────────────────────
+        //
+        // `webgl-wasm-split.js` is persisted state about "which stage was
+        // last completed", but it can desync from reality: the user's Unity
+        // build re-emits `wasmcode/<file>.br` with a fresh, un-instrumented
+        // binary while the config still claims `enableWasmCollect=true`. The
+        // IDE's `canCollect()` then returns true, the prepare step gets
+        // skipped, and the device loads a wasm that has no `scwebgl.logCall`
+        // import — the `[wasmcollect] FATAL: no scwebgl.logCall import`
+        // failure.
+        //
+        // To guard: compare the wasm file currently on disk to the md5 that
+        // startPrepare wrote into `.ttmg-temp/prepared-meta.json`. If they
+        // differ, demote `enableWasmCollect` back to its placeholder string
+        // in the response so `canCollect()` → false and the IDE walks the
+        // user through prepare again. We never touch the real config file
+        // on disk — this is a transient correction at the read boundary, so
+        // the next successful prepare seamlessly re-aligns everything.
+        if (config.enableWasmCollect === true) {
+            const wasmMeta = computeCurrentProjectWasmMd5();
+            if (wasmMeta && wasmMeta.currentMd5 !== wasmMeta.meta.preparedWasmMd5) {
+                console.warn(`[wasmtool] wasm drift detected: project wasm md5=${wasmMeta.currentMd5} but prepared meta expected ${wasmMeta.meta.preparedWasmMd5} (path=${wasmMeta.meta.codePath}). Forcing IDE back to prepare.`);
+                // Mirror the string-placeholder shape the template uses before
+                // prepare writes a real boolean — matches what `canCollect`
+                // expects and is indistinguishable from "never prepared" from
+                // the IDE's perspective.
+                config.enableWasmCollect = '$ENABLEWASMCOLLECT';
+            }
         }
+        res.send({ code: successCode, data: config });
     },
 };
 
@@ -11804,6 +12460,59 @@ function getGameFallbackRoute(publicPath) {
     };
 }
 
+/**
+ * Explicit "user clicked a lang toggle in the IDE" endpoint. Unlike
+ * `/game/config-fillback` — which intentionally no-ops when the CLI
+ * already has a lang configured — this route always writes the incoming
+ * lang to TTMGRC so the next IDE bootstrap's `setCurrentLang(cliLang)`
+ * call won't stomp the user's fresh choice.
+ */
+const gameLanguageRoute = {
+    method: 'post',
+    path: '/game/language',
+    handler: async (req, res) => {
+        const incomingLang = req.body?.lang;
+        const nextLang = resolveSupportedLanguage(incomingLang);
+        if (!nextLang) {
+            res.send({
+                code: successCode,
+                data: {
+                    lang: null,
+                    updated: false,
+                },
+            });
+            return;
+        }
+        setTTMGRC({ lang: nextLang });
+        res.send({
+            code: successCode,
+            data: {
+                lang: nextLang,
+                updated: true,
+            },
+        });
+    },
+};
+
+const gamePipelineModeRoute = {
+    method: 'post',
+    path: '/game/pipeline-mode',
+    handler: (req, res) => {
+        const { mode } = req.body;
+        setLocalState({ pipelineMode: mode });
+        console.log(`[pipeline] mode set to: ${mode}`);
+        res.send({ code: successCode, data: { mode } });
+    },
+};
+const gamePipelineModeGetRoute = {
+    method: 'get',
+    path: '/game/pipeline-mode',
+    handler: (_req, res) => {
+        const { pipelineMode } = getLocalState();
+        res.send({ code: successCode, data: { mode: pipelineMode } });
+    },
+};
+
 const routes = [
     gameAssetPreviewUrlRoute,
     gameAssetsRoute,
@@ -11832,6 +12541,9 @@ const routes = [
     gameWasmSplitDownloadRoute,
     gameWasmCancelRoute,
     gameWasmSplitResetRoute,
+    gamePipelineModeRoute,
+    gamePipelineModeGetRoute,
+    gameLanguageRoute,
 ];
 function registerRoutes(app, options) {
     const allRoutes = [...routes, getGameFallbackRoute(options.publicPath)];
@@ -11855,6 +12567,14 @@ async function start() {
     const { url, version } = await listen(app, { maxRetries: 20 });
     console.log(chalk.green.bold(`TTMG`), chalk.green(`v${version}`), chalk.gray(t('native.server.readyIn')), chalk.bold(`${Date.now() - startTime}ms`));
     showTips({ server: url });
+    // 联调场景下（root `dev:debug` 脚本）我们用 vite dev server 提供 IDE，
+    // 不需要 CLI 自己再开浏览器到 dist/public 里那份打包后的旧 IDE。设置
+    // `TTMG_DEV_NO_OPEN=1` 抑制 openUrl，由调度脚本统一负责开 5173。
+    // 普通用户场景（npm 安装 ttmg）不会设置这个 env var，行为不变。
+    if (process.env.TTMG_DEV_NO_OPEN === '1') {
+        console.log(chalk.gray(`[dev-debug] TTMG_DEV_NO_OPEN=1 detected, skipping browser auto-open. Use vite dev server (likely http://localhost:5173) instead.`));
+        return;
+    }
     openUrl(url);
 }
 
@@ -12277,7 +12997,7 @@ async function upload({ clientKey, note = '--', dir, }) {
     }
 }
 
-var version = "0.3.8";
+var version = "0.3.9-beta.wasm.1";
 var pkg = {
 	version: version};