neozip-cli 0.70.0-alpha → 0.75.1-beta

package/dist/src/neozip/createZip.js

@@ -44,12 +44,9 @@ exports.testArchiveIntegrity = testArchiveIntegrity;
 exports.upgradeZipForTokenization = upgradeZipForTokenization;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const src_1 = require('../../neozipkit-wrappers');
-const ZipCrypto_1 = require('../../neozipkit-wrappers/core/encryption/ZipCrypto');
-const server_1 = require('../../neozipkit-wrappers/server');
-const blockchain_1 = require('../../neozipkit-wrappers/blockchain');
-const contracts_1 = require('../../neozipkit-wrappers/blockchain/core/contracts');
-const HashCalculator_1 = __importDefault(require('../../neozipkit-wrappers/core/components/HashCalculator'));
+const neozipkit_1 = require("neozipkit");
+const node_1 = __importDefault(require("neozipkit/node"));
+const blockchain_1 = require("neozipkit/blockchain");
 const CommentManager_1 = require("./CommentManager");
 const utils_1 = require("./utils");
 const file_operations_1 = require("./file-operations");
@@ -255,15 +252,15 @@ class ZipCreator {
         this.fdCache = new Map();
         this.compressionOffset = 0;
         this.centralDirOffset = 0;
-        this.zip = new server_1.ZipkitServer(); // Use ZipkitServer for ZIP operations
+        this.zip = new node_1.default(); // Use ZipkitNode for ZIP operations
         // Initialize HashAccumulator if blockchain features are enabled
         if (this.options.blockchain || this.options.blockchainOts) {
-            this.hashAccumulator = new HashCalculator_1.default({ enableAccumulation: true });
+            this.hashAccumulator = new neozipkit_1.HashCalculator({ enableAccumulation: true });
         }
     }
     /**
      * Initialize the output file stream for direct writing
-     * Uses ZipkitServer's initializeZipFile() method
+     * Uses ZipkitNode's initializeZipFile() method
      * Always writes to temporary file first for atomic operations
      */
     async initializeOutput() {
@@ -322,7 +319,7 @@ class ZipCreator {
     }
     /**
      * Close the output stream and file descriptor
-     * Uses ZipkitServer's finalizeZipFile() method
+     * Uses ZipkitNode's finalizeZipFile() method
      */
     async closeOutput() {
         if (this.zipWriter) {
@@ -565,7 +562,8 @@ class ZipCreator {
                     const existingData = await (async () => {
                         try {
                             const buf = fs.readFileSync(this.archiveName);
-                            const kit = new (require('../../neozipkit-wrappers').default)();
+                            const { default: Zipkit } = require('neozipkit');
+                            const kit = new Zipkit();
                             kit.loadZip(buf);
                             return await kit.extract(existingEntry);
                         }
@@ -828,8 +826,8 @@ class ZipCreator {
             // In-memory mode: use compressFileBuffer with BufferOutputWriter
             (0, utils_1.log)(`🔧 Using in-memory compression (browser compatible)`, this.options);
             (0, utils_1.log)(`🔄 Compressing ${zipEntries.length} files in memory...`, this.options);
-            // Create ZipkitServer instance for buffer-based compression
-            const zipkit = new server_1.ZipkitServer();
+            // Create ZipkitNode instance for buffer-based compression
+            const zipkit = new node_1.default();
             // Determine if we need to write to file (for blockchain mode)
             const writeToFile = this.options.blockchain || this.options.blockchainOts;
             // Create appropriate output writer
@@ -913,9 +911,9 @@ class ZipCreator {
                     if (this.hashAccumulator && entry.sha256) {
                         const filename = entry.filename || '';
                         // Skip blockchain metadata files
-                        if (filename !== src_1.TOKENIZED_METADATA &&
-                            filename !== src_1.TIMESTAMP_METADATA &&
-                            filename !== src_1.TIMESTAMP_SUBMITTED) {
+                        if (filename !== neozipkit_1.TOKENIZED_METADATA &&
+                            filename !== neozipkit_1.TIMESTAMP_METADATA &&
+                            filename !== neozipkit_1.TIMESTAMP_SUBMITTED) {
                             const hashBuffer = Buffer.from(entry.sha256, 'hex');
                             this.hashAccumulator.addHash(hashBuffer);
                             if (this.options.verbose) {
@@ -957,7 +955,7 @@ class ZipCreator {
             return writer.getPosition();
         }
         else {
-            // File-based mode: use ZipkitServer's writeZipEntry() method
+            // File-based mode: use ZipkitNode's writeZipEntry() method
             // Get entries to compress from zip.getDirectory() (populated by processFiles())
             const zipEntries = this.zip.getDirectory().length > 0 ? this.zip.getDirectory() : await this.zip.getDirectory() || [];
             if (zipEntries.length === 0) {
@@ -980,9 +978,9 @@ class ZipCreator {
                 for (let index = 0; index < entryCnt; index++) {
                     const entry = zipEntries[index];
                     // Filter out metadata entries (handled separately in handleTokenization)
-                    if (entry.filename === src_1.TOKENIZED_METADATA ||
-                        entry.filename === src_1.TIMESTAMP_METADATA ||
-                        entry.filename === src_1.TIMESTAMP_SUBMITTED) {
+                    if (entry.filename === neozipkit_1.TOKENIZED_METADATA ||
+                        entry.filename === neozipkit_1.TIMESTAMP_METADATA ||
+                        entry.filename === neozipkit_1.TIMESTAMP_SUBMITTED) {
                         zipEntries.splice(index, 1);
                         entryCnt--;
                         index--;
@@ -1027,7 +1025,7 @@ class ZipCreator {
                     if (fileBuffer) {
                         // For pre-loaded buffers, compress in memory and write manually
                         // This handles symlinks, hardlinks, and line-ending conversion
-                        const zipkit = new server_1.ZipkitServer();
+                        const zipkit = new node_1.default();
                         const cmpData = await zipkit.compressData(entry, fileBuffer, cmpOptions);
                         // Write header manually
                         entry.compressedSize = 0; // Placeholder
@@ -1061,9 +1059,9 @@ class ZipCreator {
                                 if (this.hashAccumulator) {
                                     const filename = entry.filename || '';
                                     // Skip blockchain metadata files
-                                    if (filename !== src_1.TOKENIZED_METADATA &&
-                                        filename !== src_1.TIMESTAMP_METADATA &&
-                                        filename !== src_1.TIMESTAMP_SUBMITTED) {
+                                    if (filename !== neozipkit_1.TOKENIZED_METADATA &&
+                                        filename !== neozipkit_1.TIMESTAMP_METADATA &&
+                                        filename !== neozipkit_1.TIMESTAMP_SUBMITTED) {
                                         this.hashAccumulator.addHash(hash);
                                         if (this.options.verbose) {
                                             (0, utils_1.logDebug)(`Added SHA-256 hash to accumulator for ${filename}`, this.options);
@@ -1112,7 +1110,7 @@ class ZipCreator {
         tokenEntry.compressedSize = tokenBuffer.length;
         tokenEntry.uncompressedSize = tokenBuffer.length;
         tokenEntry.cmpMethod = 0; // STORED (no compression for small metadata file)
-        tokenEntry.crc = (0, src_1.crc32)(tokenBuffer);
+        tokenEntry.crc = (0, neozipkit_1.crc32)(tokenBuffer);
         // Use current file position for local header offset (not compressionOffset)
         tokenEntry.localHdrOffset = this.currentPosition;
         // Track entry position for central directory
@@ -1137,13 +1135,13 @@ class ZipCreator {
         if (!entries || entries.length === 0) {
             return null;
         }
-        const hashAccumulator = new HashCalculator_1.default({ enableAccumulation: true });
+        const hashAccumulator = new neozipkit_1.HashCalculator({ enableAccumulation: true });
         // Filter out blockchain metadata files to ensure consistent Merkle Root calculation
         const contentEntries = entries.filter(entry => {
             const filename = entry.filename || '';
-            return filename !== src_1.TOKENIZED_METADATA &&
-                filename !== src_1.TIMESTAMP_METADATA &&
-                filename !== src_1.TIMESTAMP_SUBMITTED;
+            return filename !== neozipkit_1.TOKENIZED_METADATA &&
+                filename !== neozipkit_1.TIMESTAMP_METADATA &&
+                filename !== neozipkit_1.TIMESTAMP_SUBMITTED;
         });
         // Add SHA-256 hashes to accumulator
         for (const entry of contentEntries) {
@@ -1232,7 +1230,7 @@ class ZipCreator {
                     try {
                         if (fs.existsSync(this.archiveName)) {
                             // Load the ZIP file to get entries with SHA-256 hashes
-                            const zipkit = new server_1.ZipkitServer();
+                            const zipkit = new node_1.default();
                             if (this.options.inMemory) {
                                 // For in-memory mode, load as buffer
                                 const zipBuffer = fs.readFileSync(this.archiveName);
@@ -1277,8 +1275,33 @@ class ZipCreator {
                 const network = this.options.network || 'base-sepolia';
                 // Always display network when tokenization is enabled
                 console.log(`🌐 Network: ${network}`);
+                // Get network config for contract address and version info
+                const networkConfig = (0, blockchain_1.getNetworkByName)(network);
+                let contractAddress;
+                let networkChainId;
+                let contractVersion;
+                if (networkConfig) {
+                    contractAddress = networkConfig.address;
+                    networkChainId = networkConfig.chainId;
+                    // Determine contract version: v2.11+ has version in config, prior versions are "unknown"
+                    const versionStr = networkConfig.version || '0';
+                    const versionNum = parseFloat(versionStr);
+                    contractVersion = versionNum >= 2.11 ? versionStr : 'unknown';
+                }
+                else {
+                    // Fallback to default (Base Sepolia)
+                    const defaultConfig = (0, blockchain_1.getContractConfig)(84532);
+                    contractAddress = defaultConfig.address;
+                    networkChainId = defaultConfig.chainId;
+                    const versionStr = defaultConfig.version || '0';
+                    const versionNum = parseFloat(versionStr);
+                    contractVersion = versionNum >= 2.11 ? versionStr : 'unknown';
+                }
+                // Display contract address and version right after network
+                console.log(`📄 Contract: ${contractAddress}`);
+                console.log(`🔢 Version: ${contractVersion}`);
                 if (!(0, blockchain_2.isSupportedNetwork)(network)) {
-                    const supportedNetworks = (0, contracts_1.getSupportedNetworkNames)();
+                    const supportedNetworks = (0, blockchain_1.getSupportedNetworkNames)();
                     console.error(`❌ Error: Unsupported network: ${network}`);
                     console.error(`   Currently supported networks: ${supportedNetworks.join(', ')}`);
                     (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.BLOCKCHAIN_CONFIG_ERROR);
@@ -1286,7 +1309,7 @@ class ZipCreator {
                 let minter = null;
                 try {
                     // Initialize blockchain minter
-                    minter = new src_1.ZipkitMinter(merkleRoot, {
+                    minter = new neozipkit_1.ZipkitMinter(merkleRoot, {
                         network: network,
                         walletPrivateKey: this.options.walletPasskey,
                         verbose: this.options.verbose,
@@ -1300,6 +1323,7 @@ class ZipCreator {
                     ]);
                     console.log(`💳 Wallet: ${processResult.walletInfo.address}`);
                     console.log(`💰 Balance: ${processResult.walletInfo.balance} ETH`);
+                    // Network config already retrieved above (contractAddress and networkChainId are available)
                     // Check if tokens already exist for this merkle root
                     if (processResult.duplicateCheck.hasExistingTokens) {
                         let userChoice;
@@ -1324,34 +1348,25 @@ class ZipCreator {
                         }
                         else {
                             // Present user with choices (interactive mode)
-                            userChoice = await (0, user_interaction_1.getUserTokenChoice)(processResult.duplicateCheck);
+                            userChoice = await (0, user_interaction_1.getUserTokenChoice)(processResult.duplicateCheck, {
+                                contractAddress,
+                                version: contractVersion
+                            });
                         }
                         if (userChoice.action === 'use-existing' && userChoice.selectedToken) {
                             console.log(`\n✅ Using existing token ID ${userChoice.selectedToken.tokenId}`);
                             // Create TokenMetadata from selected existing token  
                             // Use a fixed timestamp for existing tokens to ensure consistency
-                            // Get network config using nameAliases from CONTRACT_CONFIGS
-                            const networkConfig = (0, contracts_1.getNetworkByName)(network);
-                            let contractAddress;
-                            let networkChainId;
-                            if (networkConfig) {
-                                contractAddress = networkConfig.address;
-                                networkChainId = networkConfig.chainId;
-                            }
-                            else {
-                                // Fallback to default (Base Sepolia)
-                                const defaultConfig = (0, contracts_1.getContractConfig)(84532);
-                                contractAddress = defaultConfig.address;
-                                networkChainId = defaultConfig.chainId;
-                            }
+                            // Network config already retrieved above
                             tokenMeta = {
-                                version: '1.0',
+                                contractVersion: contractVersion,
                                 tokenId: userChoice.selectedToken.tokenId,
                                 contractAddress: contractAddress,
                                 network: processResult.walletInfo.networkName,
                                 networkChainId: networkChainId,
                                 transactionHash: userChoice.selectedToken.tokenData?.transactionHash || '',
                                 merkleRoot: merkleRoot,
+                                encryptedHash: undefined, // Currently unused
                                 mintedAt: '2025-01-01T00:00:00.000Z' // Fixed timestamp for existing tokens
                             };
                             // Add token metadata to ZIP (after compression, at the end)
@@ -1480,7 +1495,7 @@ class ZipCreator {
                     try {
                         if (fs.existsSync(this.archiveName)) {
                             // Load the ZIP file to get entries with SHA-256 hashes
-                            const zipkit = new server_1.ZipkitServer();
+                            const zipkit = new node_1.default();
                             if (this.options.inMemory) {
                                 // For in-memory mode, load as buffer
                                 const zipBuffer = fs.readFileSync(this.archiveName);
@@ -1522,7 +1537,7 @@ class ZipCreator {
                 console.log(`📋 Merkle Root: ${merkleRoot}`);
                 // Create actual OpenTimestamp proof
                 try {
-                    const otsProof = await (0, src_1.createTimestamp)(merkleRoot, { debug: this.options.verbose });
+                    const otsProof = await (0, neozipkit_1.createTimestamp)(merkleRoot, { debug: this.options.verbose });
                     if (!otsProof) {
                         throw new Error('Failed to create OpenTimestamp proof');
                     }
@@ -1531,7 +1546,7 @@ class ZipCreator {
                     const metaEntry = (0, blockchain_1.createOtsMetadataEntry)(this.zip, otsProof);
                     if (metaEntry) {
                         // Ensure the filename is set correctly
-                        metaEntry.filename = src_1.TIMESTAMP_SUBMITTED;
+                        metaEntry.filename = neozipkit_1.TIMESTAMP_SUBMITTED;
                         // Ensure OTS entry uses STORED compression (no compression for small metadata file)
                         metaEntry.cmpMethod = 0; // STORED
                         metaEntry.compressedSize = metaEntry.fileBuffer?.length || metaEntry.uncompressedSize || 0;
@@ -1634,7 +1649,7 @@ class ZipCreator {
             }
         }
         // For file-based mode or in-memory blockchain mode, write central directory to file
-        // Use ZipkitServer's writeCentralDirectory() and writeEndOfCentralDirectory() methods
+        // Use ZipkitNode's writeCentralDirectory() and writeEndOfCentralDirectory() methods
         if (!this.zipWriter) {
             throw new Error('ZIP writer not initialized for finalization');
         }
@@ -1653,7 +1668,7 @@ class ZipCreator {
             // Update mode - get entries from loaded ZIP
             zipEntries = await this.zip.getDirectory() || [];
         }
-        // Write central directory using ZipkitServer method
+        // Write central directory using ZipkitNode method
         const centralDirOffset = this.zipWriter.currentPosition;
         if (this.options.verbose) {
             (0, utils_1.log)(`📊 Central directory starts at offset: ${centralDirOffset}`, this.options);
@@ -1670,7 +1685,7 @@ class ZipCreator {
         });
         // Update currentPosition from zipWriter
         this.currentPosition = this.zipWriter.currentPosition;
-        // Write end of central directory using ZipkitServer method
+        // Write end of central directory using ZipkitNode method
         if (this.options.verbose) {
             (0, utils_1.log)(`📝 Writing end of central directory`, this.options);
             (0, utils_1.log)(`📊 Central directory size: ${centralDirSize} bytes`, this.options);
@@ -1887,7 +1902,7 @@ async function upgradeZipForTokenization(inputZipPath, options) {
     }
     const tempOutputPath = path.join(tempDir, `${path.basename(outputZipPath)}.tmp.${Date.now()}`);
     // Load existing ZIP
-    const sourceZip = new server_1.ZipkitServer();
+    const sourceZip = new node_1.default();
     await sourceZip.loadZipFile(inputZipPath);
     const entries = await sourceZip.getDirectory();
     if (!entries || entries.length === 0) {
@@ -1895,21 +1910,21 @@ async function upgradeZipForTokenization(inputZipPath, options) {
     }
     (0, utils_1.log)(`   Found ${entries.length} entries in ZIP`, options);
     // Check for existing token metadata (ignore per requirement 3a)
-    const hasTokenMetadata = entries.some((e) => e.filename === src_1.TOKENIZED_METADATA);
+    const hasTokenMetadata = entries.some((e) => e.filename === neozipkit_1.TOKENIZED_METADATA);
     if (hasTokenMetadata && options.verbose) {
         (0, utils_1.log)(`   Note: ZIP already contains token metadata (will create new token)`, options);
     }
     // Process entries: extract if missing SHA-256, calculate hash, preserve compression
     const processedEntries = [];
-    const hashAccumulator = new HashCalculator_1.default({ enableAccumulation: true });
+    const hashAccumulator = new neozipkit_1.HashCalculator({ enableAccumulation: true });
     let tempFiles = [];
     try {
         for (const entry of entries) {
             const filename = entry.filename || '';
             // Skip metadata entries and directories
-            if (filename === src_1.TOKENIZED_METADATA ||
-                filename === src_1.TIMESTAMP_METADATA ||
-                filename === src_1.TIMESTAMP_SUBMITTED ||
+            if (filename === neozipkit_1.TOKENIZED_METADATA ||
+                filename === neozipkit_1.TIMESTAMP_METADATA ||
+                filename === neozipkit_1.TIMESTAMP_SUBMITTED ||
                 entry.isDirectory) {
                 continue;
             }
@@ -1951,7 +1966,7 @@ async function upgradeZipForTokenization(inputZipPath, options) {
                     (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.READ_ERROR, `Error: Failed to extract entry "${filename}": ${errorMsg}`);
                 }
                 // Calculate SHA-256 hash
-                const hashHex = (0, ZipCrypto_1.sha256)(uncompressedData);
+                const hashHex = (0, neozipkit_1.sha256)(uncompressedData);
                 entry.sha256 = hashHex;
                 if (options.verbose) {
                     (0, utils_1.log)(`     SHA-256: ${hashHex.substring(0, 16)}...`, options);
@@ -2006,14 +2021,14 @@ async function upgradeZipForTokenization(inputZipPath, options) {
         (0, utils_1.log)(`   Calculated merkle root: ${merkleRoot.substring(0, 16)}...`, options);
         // Rebuild ZIP with updated entries (write to temp file first for atomic operation)
         (0, utils_1.log)(`   Rebuilding ZIP with updated entries...`, options);
-        const outputZip = new server_1.ZipkitServer();
+        const outputZip = new node_1.default();
         const writer = await outputZip.initializeZipFile(tempOutputPath);
         try {
             let currentOffset = 0;
             // Write all entries with updated SHA-256 hashes
             for (const { entry, compressedData } of processedEntries) {
                 // Create new entry with same properties but updated SHA-256
-                const newEntry = new src_1.ZipEntry(entry.filename || '', null, false);
+                const newEntry = new neozipkit_1.ZipEntry(entry.filename || '', null, false);
                 Object.assign(newEntry, {
                     filename: entry.filename,
                     cmpMethod: entry.cmpMethod,
@@ -2106,27 +2121,27 @@ async function upgradeZipForTokenization(inputZipPath, options) {
                 if (!(0, blockchain_2.isSupportedNetwork)(network)) {
                     (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.BLOCKCHAIN_CONFIG_ERROR, `Error: Unsupported network: ${network}`);
                 }
-                const minter = new src_1.ZipkitMinter(merkleRoot, {
+                const minter = new neozipkit_1.ZipkitMinter(merkleRoot, {
                     network,
                     walletPrivateKey: walletPasskey,
                     verbose: options.verbose,
                     debug: options.debug,
                     rpcUrlIndex: 0
                 });
-                // Create a temporary ZipkitServer instance for handleTokenMinting
+                // Create a temporary ZipkitNode instance for handleTokenMinting
                 // (it needs a zip instance, but we'll add metadata manually)
-                const tempZip = new server_1.ZipkitServer();
+                const tempZip = new node_1.default();
                 const mintResult = await (0, blockchain_2.handleTokenMinting)(minter, tempZip, options.nonInteractive || false, 0);
                 if (mintResult.success && mintResult.tokenInfo) {
                     // Add token metadata entry before central directory
                     const tokenContent = JSON.stringify(mintResult.tokenInfo, null, 2);
                     const tokenBuffer = Buffer.from(tokenContent, 'utf8');
-                    const tokenEntry = new src_1.ZipEntry(src_1.TOKENIZED_METADATA, null, false);
+                    const tokenEntry = new neozipkit_1.ZipEntry(neozipkit_1.TOKENIZED_METADATA, null, false);
                     tokenEntry.timeDateDOS = tokenEntry.setDateTime(new Date());
                     tokenEntry.compressedSize = tokenBuffer.length;
                     tokenEntry.uncompressedSize = tokenBuffer.length;
                     tokenEntry.cmpMethod = 0; // STORED
-                    tokenEntry.crc = (0, src_1.crc32)(tokenBuffer);
+                    tokenEntry.crc = (0, neozipkit_1.crc32)(tokenBuffer);
                     tokenEntry.localHdrOffset = currentOffset;
                     // Write token metadata entry
                     const tokenLocalHeader = tokenEntry.createLocalHdr();
@@ -2175,7 +2190,7 @@ async function upgradeZipForTokenization(inputZipPath, options) {
             const finalCentralDirOffset = currentOffset;
             let finalCentralDirSize = 0;
             for (const { entry } of processedEntries) {
-                const newEntry = new src_1.ZipEntry(entry.filename || '', null, false);
+                const newEntry = new neozipkit_1.ZipEntry(entry.filename || '', null, false);
                 Object.assign(newEntry, {
                     filename: entry.filename,
                     cmpMethod: entry.cmpMethod,

package/dist/src/neozip/file-operations.js

@@ -35,6 +35,9 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shouldUpdateFile = shouldUpdateFile;
 exports.loadExistingArchive = loadExistingArchive;
@@ -47,8 +50,9 @@ exports.loadExistingArchiveLarge = loadExistingArchiveLarge;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const minimatch_1 = require("minimatch");
-const src_1 = __importStar(require('../../neozipkit-wrappers'));
-const server_1 = require('../../neozipkit-wrappers/server');
+const neozipkit_1 = __importDefault(require("neozipkit"));
+const neozipkit_2 = require("neozipkit");
+const node_1 = __importDefault(require("neozipkit/node"));
 const utils_1 = require("./utils");
 const exit_codes_1 = require("../exit-codes");
 /**
@@ -140,7 +144,7 @@ function loadExistingArchive(archiveName, options) {
         }
         // Standard loader (existing code)
         const data = fs.readFileSync(archiveName);
-        const zip = new src_1.default();
+        const zip = new neozipkit_1.default();
         zip.loadZip(data);
         return zip;
     }
@@ -456,7 +460,7 @@ async function deleteFromArchive(archiveName, filesToDelete, options) {
     try {
         // Read the existing archive
         const zipData = fs.readFileSync(archiveName);
-        const zip = new src_1.default();
+        const zip = new neozipkit_1.default();
         zip.loadZip(zipData);
         const entries = zip.getDirectory() || [];
         const originalCount = entries.length;
@@ -497,20 +501,20 @@ async function deleteFromArchive(archiveName, filesToDelete, options) {
             return;
         }
         // Create new archive without the deleted files
-        const newZip = new server_1.ZipkitServer();
+        const newZip = new node_1.default();
         const outParts = [];
         // Build entries list for new archive
         const newEntries = [];
         for (const entry of entries) {
             if (!entriesToDelete.includes(entry.filename)) {
                 // Copy entry to new archive
-                const newEntry = new src_1.ZipEntry(entry.filename);
+                const newEntry = new neozipkit_2.ZipEntry(entry.filename);
                 Object.assign(newEntry, entry);
                 // Copy the file data from the existing archive
                 try {
                     const existingData = await (async () => {
                         try {
-                            const kit = new server_1.ZipkitServer();
+                            const kit = new node_1.default();
                             kit.loadZip(zipData);
                             return await kit.extract(entry);
                         }
@@ -711,7 +715,7 @@ function parseCentralDirectoryEntry(data, offset) {
         // Convert DOS date/time to JavaScript timestamp
         const modifiedTime = dosDateTimeToTimestamp(lastModDate, lastModTime);
         // Create ZipEntry object
-        const entry = new src_1.ZipEntry(filename);
+        const entry = new neozipkit_2.ZipEntry(filename);
         entry.filename = filename;
         entry.uncompressedSize = uncompressedSize;
         entry.compressedSize = compressedSize;
@@ -898,7 +902,7 @@ function loadExistingArchiveLarge(archiveName) {
         fs.readSync(fd, eocdAndCommentBuffer, 0, eocdAndCommentSize, eocdLocation.offset);
         // Create complete ZIP buffer: CD + EOCD + comment
         const completeZipBuffer = Buffer.concat([cdBuffer, eocdAndCommentBuffer]);
-        const zip = new src_1.default();
+        const zip = new neozipkit_1.default();
         zip.loadZip(completeZipBuffer);
         return zip;
     }

package/dist/src/neozip/user-interaction.js

@@ -137,12 +137,17 @@ async function promptPassword(question) {
 /**
  * Get user's token choice from available options
  */
-async function getUserTokenChoice(duplicateCheck) {
+async function getUserTokenChoice(duplicateCheck, contractInfo) {
     // Display owned tokens
     if (duplicateCheck.userOwnedTokens.length > 0) {
         console.log('\nYour tokens:');
         duplicateCheck.userOwnedTokens.forEach((token, index) => {
-            console.log(`  ${index + 1}. Token ID ${token.tokenId}`);
+            let tokenInfo = `  ${index + 1}. Token ID ${token.tokenId}`;
+            if (contractInfo) {
+                const shortAddress = `${contractInfo.contractAddress.substring(0, 6)}...${contractInfo.contractAddress.substring(38)}`;
+                tokenInfo += ` (Contract: ${shortAddress}, Version: ${contractInfo.version})`;
+            }
+            console.log(tokenInfo);
         });
     }
     // Display tokens owned by others
@@ -183,7 +188,12 @@ async function getUserTokenChoice(duplicateCheck) {
         options[optionNumber.toString()] = async () => {
             console.log('\nYour tokens:');
             duplicateCheck.userOwnedTokens.forEach((token, index) => {
-                console.log(`  ${index + 1}. Token ID ${token.tokenId}`);
+                let tokenInfo = `  ${index + 1}. Token ID ${token.tokenId}`;
+                if (contractInfo) {
+                    const shortAddress = `${contractInfo.contractAddress.substring(0, 6)}...${contractInfo.contractAddress.substring(38)}`;
+                    tokenInfo += ` (Contract: ${shortAddress}, Version: ${contractInfo.version})`;
+                }
+                console.log(tokenInfo);
             });
             const tokenChoice = await promptUser('Enter token number: ');
             const tokenIndex = parseInt(tokenChoice) - 1;

package/dist/src/neozip.js

@@ -67,7 +67,7 @@ const user_interaction_1 = require("./neozip/user-interaction");
 const createZip_1 = require("./neozip/createZip");
 const file_operations_1 = require("./neozip/file-operations");
 // ConfigSetup is lazy-loaded only when needed (init/config commands)
-const contracts_1 = require('../neozipkit-wrappers/blockchain/core/contracts');
+const blockchain_1 = require("neozipkit/blockchain");
 const ConfigStore_1 = require("./config/ConfigStore");
 const exit_codes_1 = require("./exit-codes");
 const version_1 = require("./version");
@@ -185,8 +185,8 @@ function parseArgs(args) {
             case '-n':
             case '--network':
                 const network = args[++i];
-                if ((0, contracts_1.getChainIdByName)(network) === null) {
-                    const supportedNetworks = (0, contracts_1.getSupportedNetworkNames)();
+                if ((0, blockchain_1.getChainIdByName)(network) === null) {
+                    const supportedNetworks = (0, blockchain_1.getSupportedNetworkNames)();
                     console.error(`Error: Unsupported network: "${network}"`);
                     console.error(`Supported networks: ${supportedNetworks.join(', ')}`);
                     (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.PARAMETER_ERROR);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neozip-cli",
-  "version": "0.70.0-alpha",
+  "version": "0.75.1-beta",
   "description": "A full-featured command-line ZIP application with NeoZipKit integration",
   "main": "dist/src/index.js",
   "bin": {
@@ -110,10 +110,8 @@
     "test:upgrade-zip": "echo '=== Testing ZIP Upgrade ===' && mkdir -p output && echo '' && echo '--- Creating initial ZIP with Calgary corpus files (deflate compression) ---' && npx ts-node src/neozip.ts --deflate output/test-upgrade.nzip test-suite/calgary/bib test-suite/calgary/book1 test-suite/calgary/book2 && echo '' && echo '--- Upgrading ZIP for tokenization ---' && npx ts-node src/neozip.ts --upgrade output/test-upgrade.nzip && echo '' && echo '--- Listing upgraded ZIP contents ---' && npx ts-node src/neolist.ts output/test-upgrade-tokenized.nzip && echo '' && echo '--- Verifying upgraded ZIP with neounzip -t ---' && npx ts-node src/neounzip.ts -t output/test-upgrade-tokenized.nzip && echo '' && echo '✅ ZIP upgrade test completed successfully!'",
     "test:pre-verify": "echo '=== Testing Pre-Verify Option (-T) ===' && echo '' && echo '--- Testing pre-verify on tokenized ZIP ---' && npx ts-node src/neounzip.ts -T output/test-upgrade-tokenized.nzip test-output/preverify/ && echo '' && echo '--- Testing pre-verify on non-tokenized ZIP ---' && npx ts-node src/neozip.ts --deflate output/test-preverify-nontoken.nzip test-suite/calgary/bib test-suite/calgary/book1 test-suite/calgary/book2 && npx ts-node src/neounzip.ts -T output/test-preverify-nontoken.nzip test-output/preverify-nontoken/ && rm -rf test-output/preverify* output/test-preverify-nontoken.nzip 2>/dev/null && echo '' && echo '✅ Pre-verify test completed successfully!'",
     "test:package": "node scripts/test-package.js",
-    "sync:neozipkit": "echo '📦 Syncing local neozipkit to external ../neozipkit...' && rsync -av --delete neozipkit/src/ ../neozipkit/src/ && rsync -av neozipkit/package.json ../neozipkit/package.json && rsync -av neozipkit/tsconfig.json ../neozipkit/tsconfig.json && echo '✅ Successfully synced neozipkit to ../neozipkit'",
-    "update:neozipkit": "echo '📥 Updating local neozipkit from external ../neozipkit...' && rsync -av --delete ../neozipkit/src/ neozipkit/src/ && rsync -av ../neozipkit/package.json neozipkit/package.json && rsync -av ../neozipkit/tsconfig.json neozipkit/tsconfig.json && echo '✅ Successfully updated neozipkit from ../neozipkit'",
+    "switch:neozipkit:npm": "node scripts/switch-neozipkit.js npm",
     "switch:neozipkit:local": "node scripts/switch-neozipkit.js local",
-    "switch:neozipkit:external": "node scripts/switch-neozipkit.js external",
     "switch:neozipkit:status": "node scripts/switch-neozipkit.js status"
   },
   "keywords": [
@@ -140,7 +138,6 @@
     "dotenv": "^17.2.1",
     "ethers": "^6.0.0",
     "inquirer": "^8.2.6",
-    "neozipkit": "file:./neozipkit",
     "minimatch": "^10.0.3",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
@@ -150,7 +147,8 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.0",
     "uuid": "^9.0.0",
-    "web3": "^4.0.0"
+    "web3": "^4.0.0",
+    "neozipkit": "^0.3.1"
   },
   "devDependencies": {
     "@types/chalk": "^2.2.4",
@@ -158,7 +156,8 @@
     "@types/minimatch": "^5.1.2",
     "@types/node": "^24.5.1",
     "@types/ora": "^3.2.0",
-    "@types/uuid": "^10.0.0"
+    "@types/uuid": "^10.0.0",
+    "esbuild": "^0.27.0"
   },
   "engines": {
     "node": ">=16.0.0"
@@ -171,5 +170,5 @@
     "url": "https://github.com/NeoWareInc/neozip-support/issues"
   },
   "homepage": "https://github.com/NeoWareInc/neozip-cli#readme",
-  "packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c"
+  "packageManager": "yarn@1.22.19"
 }

package/dist/neozipkit-wrappers/server/index.js

@@ -1,2 +0,0 @@
-// Server neozipkit wrapper - re-exports from server bundle
-module.exports = require('../../neozipkit-bundles/server.js');