neozip-cli 0.75.2-beta → 0.80.0

package/dist/src/neozip.js

@@ -67,10 +67,19 @@ 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 blockchain_1 = require("neozipkit/blockchain");
+const neozip_blockchain_1 = require("neozip-blockchain");
 const ConfigStore_1 = require("./config/ConfigStore");
 const exit_codes_1 = require("./exit-codes");
 const version_1 = require("./version");
+/**
+ * Resolve dynamic import path so ts-node loads .ts and compiled dist loads .js
+ */
+function resolveScriptPath(jsPath) {
+    if (typeof __filename !== 'undefined' && __filename.endsWith('.ts')) {
+        return jsPath.replace(/\.js$/, '.ts');
+    }
+    return jsPath;
+}
 /**
  * Parse command line arguments
  */
@@ -85,6 +94,7 @@ function parseArgs(args) {
         blockchainMint: false, // Force mint new token disabled by default
         network: 'base-sepolia',
         walletPasskey: process.env.NEOZIP_WALLET_PASSKEY,
+        timestampEmail: process.env.NEOZIP_TIMESTAMP_EMAIL,
         compression: 'zstd',
         blockSize: 128 * 1024, // 128KB default
         enableProgress: true,
@@ -168,6 +178,17 @@ function parseArgs(args) {
             case '--opentimestamp':
                 options.blockchainOts = true;
                 break;
+            case '-ts':
+            case '--timestamp':
+                options.blockchainZipstamp = true;
+                break;
+            case '--timestamp-email':
+                options.timestampEmail = args[++i];
+                if (!options.timestampEmail) {
+                    console.error('Error: --timestamp-email requires an email address');
+                    (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.PARAMETER_ERROR);
+                }
+                break;
             case '-bt':
             case '--blockchain-token':
                 options.blockchain = true;
@@ -185,8 +206,8 @@ function parseArgs(args) {
             case '-n':
             case '--network':
                 const network = args[++i];
-                if ((0, blockchain_1.getChainIdByName)(network) === null) {
-                    const supportedNetworks = (0, blockchain_1.getSupportedNetworkNames)();
+                if ((0, neozip_blockchain_1.getChainIdByName)(network) === null) {
+                    const supportedNetworks = (0, neozip_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);
@@ -411,6 +432,12 @@ function parseArgs(args) {
                 break;
         }
     }
+    // -ots and -ts are mutually exclusive (choose Bitcoin OTS or Zipstamp)
+    if (options.blockchainOts && options.blockchainZipstamp) {
+        console.error('Error: Cannot use both -ots (OpenTimestamps) and -ts (Zipstamp) in the same run');
+        console.error('   Use -ots for Bitcoin timestamping or -ts for Zipstamp timestamping');
+        (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.PARAMETER_ERROR);
+    }
     if (!archive) {
         console.error('Error: Archive name is required');
         showHelp();
@@ -450,6 +477,9 @@ Usage: neozip [options] <archive> <files...>
 Configuration Commands:
   neozip init                 Interactive wallet setup wizard
   neozip config               Show current configuration and manage settings (interactive menu)
+  neozip upgrade <archive> [output] [--wait]  Upgrade pending Zipstamp timestamp to confirmed
+  neozip mint <archive> [output]  Mint TimestampProofNFT from confirmed timestamped ZIP
+  neozip verify-email [--email <email>] [--set-default]  Configure email for Zipstamp timestamping
 
 Options:
   -h, --help              Show this help message
@@ -478,6 +508,8 @@ Options:
   -bd, --blockchain-default Auto-select default token option (use existing or mint new)
   -bm, --blockchain-mint  Force mint new token (skip existing token selection)
   -ots, --opentimestamp   Enable OpenTimestamp proof on Bitcoin blockchain
+  -ts, --timestamp       Enable Zipstamp timestamp (blockchain)
+      --timestamp-email <email>  Email for Zipstamp server (some servers require verified email)
   -n, --network <network> Blockchain network (base-sepolia, base-mainnet, default: base-sepolia)
   -w, --wallet-key <key>  Wallet private key (overrides NEOZIP_WALLET_PASSKEY)
   -c                      Add one-line comments for files
@@ -509,9 +541,9 @@ Arguments:
   <files...>              Files and directories to compress
 
 Examples:
-  neozip output/test.nzip file1.txt file2.txt
-  neozip output/simple.nzip ./data/
-  neozip -r output/recursive.nzip ./project/
+  neozip tests/output/test.nzip file1.txt file2.txt
+  neozip tests/output/simple.nzip ./data/
+  neozip -r tests/output/recursive.nzip ./project/
 `);
 }
 /**
@@ -671,7 +703,7 @@ async function main() {
             // Handle `neozip init` - interactive setup wizard
             if (command === 'init') {
                 // Lazy-load ConfigSetup only when needed
-                const { ConfigSetup } = await import('./config/ConfigSetup.js');
+                const { ConfigSetup } = await import(resolveScriptPath('./config/ConfigSetup.js'));
                 const wizard = new ConfigSetup();
                 const success = await wizard.run();
                 process.exit(success ? exit_codes_1.ZIP_EXIT_CODES.SUCCESS : exit_codes_1.ZIP_EXIT_CODES.BAD_ARCHIVE_FORMAT);
@@ -679,10 +711,113 @@ async function main() {
             // Handle `neozip config` - show interactive menu
             if (command === 'config') {
                 // Lazy-load ConfigSetup only when needed
-                const { ConfigSetup } = await import('./config/ConfigSetup.js');
+                const { ConfigSetup } = await import(resolveScriptPath('./config/ConfigSetup.js'));
                 await ConfigSetup.showAndManage();
                 // showAndManage handles its own exit
             }
+            // Handle `neozip verify-email` - configure email for Zipstamp timestamping
+            if (command === 'verify-email') {
+                const verifyArgs = args.slice(1);
+                let email;
+                let setDefaultOnly = false;
+                let debug = false;
+                for (let i = 0; i < verifyArgs.length; i++) {
+                    const arg = verifyArgs[i];
+                    if (arg === '--email' && verifyArgs[i + 1]) {
+                        email = verifyArgs[++i];
+                    }
+                    else if (arg === '--set-default') {
+                        setDefaultOnly = true;
+                    }
+                    else if (arg === '--debug') {
+                        debug = true;
+                    }
+                }
+                const { runVerifyEmail } = await import(resolveScriptPath('./commands/verifyEmail.js'));
+                const success = await runVerifyEmail({ email, setDefaultOnly, debug });
+                process.exit(success ? exit_codes_1.ZIP_EXIT_CODES.SUCCESS : exit_codes_1.ZIP_EXIT_CODES.BAD_ARCHIVE_FORMAT);
+            }
+            // Handle `neozip upgrade` - upgrade pending Zipstamp timestamp to confirmed
+            if (command === 'upgrade') {
+                const upgradeArgs = args.slice(1);
+                let inputPath = '';
+                let outputPath;
+                let wait = false;
+                let verbose = false;
+                let debug = false;
+                for (let i = 0; i < upgradeArgs.length; i++) {
+                    const arg = upgradeArgs[i];
+                    if (arg === '--wait') {
+                        wait = true;
+                    }
+                    else if (arg === '-v' || arg === '--verbose') {
+                        verbose = true;
+                    }
+                    else if (arg === '--debug') {
+                        debug = true;
+                    }
+                    else if (!arg.startsWith('-')) {
+                        if (!inputPath) {
+                            inputPath = arg;
+                        }
+                        else if (!outputPath) {
+                            outputPath = arg;
+                        }
+                    }
+                }
+                if (!inputPath) {
+                    console.error('Error: neozip upgrade requires an input archive path');
+                    console.error('   Usage: neozip upgrade <archive> [output] [--wait]');
+                    (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.PARAMETER_ERROR);
+                }
+                const { upgradeZipForTimestamp } = await import(resolveScriptPath('./neozip/upgradeZip.js'));
+                await upgradeZipForTimestamp(inputPath, outputPath, { wait, verbose, debug });
+                (0, utils_1.log)('✓ Upgrade completed successfully', { verbose, quiet: false });
+                process.exit(exit_codes_1.ZIP_EXIT_CODES.SUCCESS);
+            }
+            // Handle `neozip mint` - mint TimestampProofNFT from confirmed timestamped ZIP
+            if (command === 'mint') {
+                const mintArgs = args.slice(1);
+                let inputPath = '';
+                let outputPath;
+                let walletKey;
+                let network;
+                let debug = false;
+                for (let i = 0; i < mintArgs.length; i++) {
+                    const arg = mintArgs[i];
+                    if (arg === '-w' || arg === '--wallet-key') {
+                        walletKey = mintArgs[++i];
+                    }
+                    else if (arg === '-n' || arg === '--network') {
+                        network = mintArgs[++i];
+                    }
+                    else if (arg === '--debug') {
+                        debug = true;
+                    }
+                    else if (!arg.startsWith('-')) {
+                        if (!inputPath) {
+                            inputPath = arg;
+                        }
+                        else if (outputPath === undefined) {
+                            outputPath = arg;
+                        }
+                    }
+                }
+                if (!inputPath) {
+                    console.error('Error: neozip mint requires an input archive path');
+                    console.error('   Usage: neozip mint <archive> [output] [-w <wallet-key>] [-n <network>]');
+                    (0, exit_codes_1.exitZip)(exit_codes_1.ZIP_EXIT_CODES.PARAMETER_ERROR);
+                }
+                const { runMintTimestampProof } = await import(resolveScriptPath('./commands/mintTimestampProof.js'));
+                const success = await runMintTimestampProof({
+                    inputPath,
+                    outputPath,
+                    walletKey,
+                    network,
+                    debug
+                });
+                process.exit(success ? exit_codes_1.ZIP_EXIT_CODES.SUCCESS : exit_codes_1.ZIP_EXIT_CODES.BAD_ARCHIVE_FORMAT);
+            }
         }
         let { archive, files, options } = parseArgs(args);
         // If network not explicitly provided via CLI, use from ConfigStore (which reads from ENV or wallet.json)

package/env.example

@@ -55,6 +55,16 @@ NEOZIP_WALLET_PASSKEY=0x1234567890abcdef1234567890abcdef1234567890abcdef12345678
 #   - Arbitrum One: https://arb1.arbitrum.io/rpc
 #   - Ethereum Sepolia: https://rpc.sepolia.ethpandaops.io
 
+# =============================================================================
+# OPTIONAL: Zipstamp Timestamp Configuration
+# =============================================================================
+
+# Zipstamp server URL for Ethereum timestamping (default: https://zipstamp-dev.neozip.io)
+# ZIPSTAMP_SERVER_URL=https://zipstamp-dev.neozip.io
+
+# Email for Zipstamp server (some servers require verified email for stamping)
+# NEOZIP_TIMESTAMP_EMAIL=your@email.com
+
 # =============================================================================
 # OPTIONAL: Debug Configuration
 # =============================================================================

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "neozip-cli",
-  "version": "0.75.2-beta",
+  "version": "0.80.0",
+  "release_date": "2026-03-04",
   "description": "A full-featured command-line ZIP application with NeoZipKit integration",
   "main": "dist/src/index.js",
   "bin": {
@@ -10,8 +11,6 @@
   },
   "files": [
     "dist/src/**/*.js",
-    "dist/neozipkit-bundles/*.js",
-    "dist/neozipkit-wrappers/**/*.js",
     "bin/",
     "env.example",
     "README.md",
@@ -25,94 +24,100 @@
     "access": "public"
   },
   "scripts": {
-    "start": "npx ts-node src/neozip.ts output/calgary.nzip test-suite/calgary/*",
-    "dev": "npx ts-node --inspect src/neozip.ts output/calgary.nzip test-suite/calgary/*",
-    "build": "echo '🔨 Building TypeScript...' && tsc --pretty && echo '🧹 Removing neozipkit from dist (bundled separately)...' && rm -rf dist/neozipkit && echo '📦 Bundling neozipkit (if needed)...' && node scripts/bundle-neozipkit.js && echo '📦 Copying neozipkit bundles...' && node scripts/copy-neozipkit-bundles.js && echo '📦 Creating wrapper modules...' && node scripts/create-neozipkit-wrappers.js && echo '🔄 Rewriting imports...' && node scripts/rewrite-neozipkit-imports.js && echo '✅ Build completed successfully!'",
+    "start": "npx ts-node src/neozip.ts tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "dev": "npx ts-node --inspect src/neozip.ts tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "build": "echo '🔨 Building TypeScript...' && tsc --pretty && echo '🧹 Removing neozipkit from dist (if present)...' && rm -rf dist/neozipkit && echo '✅ Build completed successfully!'",
     "build:clean": "echo '🧹 Cleaning dist directory...' && rm -rf dist && echo '🔨 Building TypeScript...' && tsc --pretty && echo '✅ Clean build completed successfully!'",
-    "build:neozipkit": "echo '🔨 Building neozipkit...' && cd neozipkit && npm run build && cd .. && echo '✅ neozipkit build completed successfully!'",
-    "bundle:neozipkit": "echo '📦 Bundling neozipkit...' && node scripts/bundle-neozipkit.js",
-    "rebuild:neozipkit": "npm run build:neozipkit && npm run bundle:neozipkit && echo '✅ neozipkit rebuild and bundle completed successfully!'",
-    "build:all": "npm run rebuild:neozipkit && npm run build",
-    "dev:neozipkit": "echo '👀 Watching neozipkit for changes...' && cd ../neozipkit && npm run watch",
     "type-check": "tsc --noEmit",
-    "clean": "rm -rf output/* dist/* test-output/*",
+    "clean": "rm -rf dist/* tests/output/*",
     "pack": "npm run build && echo '📦 Creating package tarball...' && npm pack && echo '✅ Package created successfully!'",
     "pack:dry-run": "npm run build && echo '📦 Previewing package contents...' && npm pack --dry-run",
     "pack:clean": "rm -f neozip-cli-*.tgz && echo '🧹 Cleaned up package tarballs'",
     "package": "npm run build && npm run pack",
     "prepublishOnly": "npm run build",
-    "neozip": "npx ts-node src/neozip.ts -b -T output/calgary.nzip test-suite/calgary/*",
-    "neozip-sepolia": "npx ts-node src/neozip.ts -b -T --network sepolia-testnet output/calgary.nzip test-suite/calgary/*",
-    "neozip-base-sepolia": "npx ts-node src/neozip.ts -b -T --network base-sepolia output/calgary.nzip test-suite/calgary/*",
-    "neozip-base": "npx ts-node src/neozip.ts -b -T --network base-mainnet output/calgary.nzip test-suite/calgary/*",
-    "neozip-arbitrum-sepolia": "npx ts-node src/neozip.ts -b -T --network arbitrum-sepolia output/calgary.nzip test-suite/calgary/*",
-    "neozip-arbitrum": "npx ts-node src/neozip.ts -b -T --network arbitrum-one output/calgary.nzip test-suite/calgary/*",
-    "neozip-deflate": "npx ts-node src/neozip.ts --deflate -T output/calgary.nzip test-suite/calgary/*",
-    "neozip-inmem": "npx ts-node src/neozip.ts -b --in-memory -T output/calgary.nzip test-suite/calgary/*",
-    "neozip-store": "npx ts-node src/neozip.ts --level 0 -T output/calgary-stored.nzip test-suite/calgary/*",
-    "neozip-ots": "npx ts-node src/neozip.ts -ots -T output/calgary-ots.nzip test-suite/calgary/*",
-    "neozip-encrypt": "npx ts-node src/neozip.ts --encrypt -P 'pass123' -T output/calgary-encrypted.nzip test-suite/calgary/*",
-    "neozip-encrypt-sm": "npx ts-node src/neozip.ts --encrypt -P 'pass123' -T output/encrypted-sm.nzip test-suite/test-sm/*",
-    "neozip-update": "node test-scripts/test-update-option.js",
-    "neozip-sm": "npx ts-node src/neozip.ts -T output/test-sm.nzip test-suite/test-sm/*",
+    "neozip": "npx ts-node src/neozip.ts -b -T tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-sepolia": "npx ts-node src/neozip.ts -b -T --network sepolia-testnet tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-base-sepolia": "npx ts-node src/neozip.ts -b -T --network base-sepolia tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-base": "npx ts-node src/neozip.ts -b -T --network base-mainnet tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-arbitrum-sepolia": "npx ts-node src/neozip.ts -b -T --network arbitrum-sepolia tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-arbitrum": "npx ts-node src/neozip.ts -b -T --network arbitrum-one tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-deflate": "npx ts-node src/neozip.ts --deflate -T tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-inmem": "npx ts-node src/neozip.ts -b --in-memory -T tests/output/calgary.nzip tests/fixtures/calgary/*",
+    "neozip-store": "npx ts-node src/neozip.ts --level 0 -T tests/output/calgary-stored.nzip tests/fixtures/calgary/*",
+    "neozip-ots": "npx ts-node src/neozip.ts -ots -T tests/output/calgary-ots.nzip tests/fixtures/calgary/*",
+    "neozip-stamp": "npx ts-node src/neozip.ts -ts -T tests/output/calgary-stamp.nzip tests/fixtures/calgary/*",
+    "neozip-mint": "node dist/src/neozip.js mint -o tests/output/calgary-stamp-upgrade.nzip tests/output/calgary-stamp-nft.nzip",
+    "neozip-encrypt": "npx ts-node src/neozip.ts --encrypt -P 'pass123' -T tests/output/calgary-encrypted.nzip tests/fixtures/calgary/*",
+    "neozip-encrypt-sm": "npx ts-node src/neozip.ts --encrypt -P 'pass123' -T tests/output/encrypted-sm.nzip tests/fixtures/test-sm/*",
+    "neozip-update": "node tests/scripts/test-update-option.js",
+    "neozip-sm": "npx ts-node src/neozip.ts -T tests/output/test-sm.nzip tests/fixtures/test-sm/*",
     "neozip-init": "npx ts-node src/neozip.ts init",
     "neozip-config": "npx ts-node src/neozip.ts config",
+    "verify-email": "node dist/src/neozip.js verify-email",
     "neozip-help": "npx ts-node src/neozip.ts --help",
-    "neounzip": "npx ts-node src/neounzip.ts output/calgary.nzip -t",
-    "neounzip-inmem": "npx ts-node src/neounzip.ts --in-memory -l output/calgary.nzip -t",
-    "neounzip-bad": "npx ts-node src/neounzip.ts output/calgary-bad.nzip -t",
-    "neounzip-bad-inmem": "npx ts-node src/neounzip.ts --in-memory output/calgary-bad.nzip -t",
-    "neounzip-sm": "npx ts-node src/neounzip.ts -o output/test-sm.nzip",
-    "neounzip-skip-blockchain": "npx ts-node src/neounzip.ts --skip-blockchain output/calgary.nzip -t",
-    "neounzip-lg": "npx ts-node src/neounzip.ts output/large.nzip -t",
-    "neounzip-ots": "npx ts-node src/neounzip.ts output/calgary-ots.nzip -t",
-    "neounzip-ots-skip-blockchain": "npx ts-node src/neounzip.ts --skip-blockchain output/calgary-ots.nzip -t",
-    "neounzip-streaming": "npx ts-node src/neounzip.ts --buffer-size 16384 --verbose output/merged-test.nzip -t",
-    "neounzip-decrypt": "npx ts-node src/neounzip.ts --password 'pass123' output/calgary-encrypted.nzip -t",
-    "neounzip-decrypt-inmem": "npx ts-node src/neounzip.ts --in-memory --password 'pass123' output/calgary-encrypted.nzip -t",
-    "neounzip-decrypt-stored": "npx ts-node src/neounzip.ts --in-memory --password 'pass123' output/calgary-encrypted-stored.nzip -t",
-    "neounzip-decrypt-sm": "npx ts-node src/neounzip.ts --password 'pass123' output/encrypted-sm.nzip -t",
-    "neounzip-decrypt-sm-inmem": "npx ts-node src/neounzip.ts --in-memory --password 'pass123' output/encrypted-sm.nzip -t",
-    "neounzip-decrypt-pkzip": "npx ts-node src/neounzip.ts --pkzip-decrypt --password 'legacy-test-123' output/calgary-pkzip.nzip -t",
+    "neounzip": "npx ts-node src/neounzip.ts tests/output/calgary.nzip -t",
+    "neounzip-inmem": "npx ts-node src/neounzip.ts --in-memory -l tests/output/calgary.nzip -t",
+    "neounzip-bad": "npx ts-node src/neounzip.ts tests/output/calgary-bad.nzip -t",
+    "neounzip-bad-inmem": "npx ts-node src/neounzip.ts --in-memory tests/output/calgary-bad.nzip -t",
+    "neounzip-sm": "npx ts-node src/neounzip.ts -o tests/output/test-sm.nzip",
+    "neounzip-skip-blockchain": "npx ts-node src/neounzip.ts --skip-blockchain tests/output/calgary.nzip -t",
+    "neounzip-lg": "npx ts-node src/neounzip.ts tests/output/large.nzip -t",
+    "neounzip-stamp": "npx ts-node src/neounzip.ts tests/output/calgary-stamp.nzip -t",
+    "neounzip-stamp-upgrade": "npx ts-node src/neounzip.ts tests/output/calgary-stamp-upgrade.nzip -t",
+    "neounzip-ots": "npx ts-node src/neounzip.ts tests/output/calgary-ots.nzip -t",
+    "neounzip-ots-skip-blockchain": "npx ts-node src/neounzip.ts --skip-blockchain tests/output/calgary-ots.nzip -t",
+    "neounzip-streaming": "npx ts-node src/neounzip.ts --buffer-size 16384 --verbose tests/output/merged-test.nzip -t",
+    "neounzip-decrypt": "npx ts-node src/neounzip.ts --password 'pass123' tests/output/calgary-encrypted.nzip -t",
+    "neounzip-decrypt-inmem": "npx ts-node src/neounzip.ts --in-memory --password 'pass123' tests/output/calgary-encrypted.nzip -t",
+    "neounzip-decrypt-stored": "npx ts-node src/neounzip.ts --in-memory --password 'pass123' tests/output/calgary-encrypted-stored.nzip -t",
+    "neounzip-decrypt-sm": "npx ts-node src/neounzip.ts --password 'pass123' tests/output/encrypted-sm.nzip -t",
+    "neounzip-decrypt-sm-inmem": "npx ts-node src/neounzip.ts --in-memory --password 'pass123' tests/output/encrypted-sm.nzip -t",
+    "neounzip-decrypt-pkzip": "npx ts-node src/neounzip.ts --pkzip-decrypt --password 'legacy-test-123' tests/output/calgary-pkzip.nzip -t",
     "neounzip-help": "npx ts-node src/neounzip.ts --help",
-    "neolist": "npx ts-node src/neolist.ts output/calgary.nzip",
-    "neolist-inmem": "npx ts-node src/neolist.ts --in-memory output/calgary.nzip",
-    "neolist-basic": "npx ts-node src/neolist.ts -b output/calgary.nzip",
-    "neolist-verbose": "npx ts-node src/neolist.ts -v output/calgary.nzip",
-    "neolist-demo": "npx ts-node src/neolist.ts output/calgary.nzip",
-    "neolist-short": "npx ts-node src/neolist.ts -s output/calgary.nzip",
-    "neolist-unix": "npx ts-node src/neolist.ts -u output/calgary.nzip",
-    "neolist-json": "npx ts-node src/neolist.ts -j output/calgary.nzip",
-    "neolist-zip64": "npx ts-node src/neolist.ts test-suite/calgary-zip64.zip",
+    "neolist": "npx ts-node src/neolist.ts tests/output/calgary.nzip",
+    "neolist-inmem": "npx ts-node src/neolist.ts --in-memory tests/output/calgary.nzip",
+    "neolist-basic": "npx ts-node src/neolist.ts -b tests/output/calgary.nzip",
+    "neolist-verbose": "npx ts-node src/neolist.ts -v tests/output/calgary.nzip",
+    "neolist-demo": "npx ts-node src/neolist.ts tests/output/calgary.nzip",
+    "neolist-short": "npx ts-node src/neolist.ts -s tests/output/calgary.nzip",
+    "neolist-unix": "npx ts-node src/neolist.ts -u tests/output/calgary.nzip",
+    "neolist-json": "npx ts-node src/neolist.ts -j tests/output/calgary.nzip",
+    "neolist-zip64": "npx ts-node src/neolist.ts tests/fixtures/calgary-zip64.zip",
+    "neolist-stamp": "npx ts-node src/neolist.ts tests/output/calgary-stamp.nzip",
+    "neolist-stamp-upgrade": "npx ts-node src/neolist.ts tests/output/calgary-stamp-upgrade.nzip",
     "neolist-help": "npx ts-node src/neolist.ts --help",
-    "infozip-encrypt-zip": "zip -e -P 'pass123' -r test-infozip/calgary-encrypted.zip test-suite/calgary/*",
-    "infozip-encrypt-sm": "zip -e -P 'pass123' -0 test-infozip/encrypted-sm.zip test-suite/test-sm/*",
-    "infozip-encrypt-stored": "zip -e -P 'pass123' -0 test-infozip/calgary-encrypted-stored.zip test-suite/calgary/bib",
-    "infozip-decrypt-zip": "unzip -P 'pass123' -t test-infozip/calgary-encrypted.zip",
-    "infozip-decrypt-sm": "unzip -P 'pass123' -t test-infozip/encrypted-sm.zip",
-    "test": "node test-scripts/test-runner.js",
-    "test:verbose": "node test-scripts/test-runner.js --verbose",
-    "test:help": "node test-scripts/test-runner.js --help",
-    "test:comprehensive": "node test-scripts/comprehensive/run-all-tests.js",
-    "test:neozip": "node test-scripts/comprehensive/test-neozip-options.js",
-    "test:neounzip": "node test-scripts/comprehensive/test-neounzip-options.js",
-    "test:neolist": "node test-scripts/comprehensive/test-neolist-options.js",
+    "infozip-encrypt-zip": "zip -e -P 'pass123' -r tests/fixtures/infozip/calgary-encrypted.zip tests/fixtures/calgary/*",
+    "infozip-encrypt-sm": "zip -e -P 'pass123' -0 tests/fixtures/infozip/encrypted-sm.zip tests/fixtures/test-sm/*",
+    "infozip-encrypt-stored": "zip -e -P 'pass123' -0 tests/fixtures/infozip/calgary-encrypted-stored.zip tests/fixtures/calgary/bib",
+    "infozip-decrypt-zip": "unzip -P 'pass123' -t tests/fixtures/infozip/calgary-encrypted.zip",
+    "infozip-decrypt-sm": "unzip -P 'pass123' -t tests/fixtures/infozip/encrypted-sm.zip",
+    "test": "node tests/scripts/test-runner.js",
+    "test:verbose": "node tests/scripts/test-runner.js --verbose",
+    "test:help": "node tests/scripts/test-runner.js --help",
+    "test:comprehensive": "node tests/scripts/comprehensive/run-all-tests.js",
+    "test:neozip": "node tests/scripts/comprehensive/test-neozip-options.js",
+    "test:neounzip": "node tests/scripts/comprehensive/test-neounzip-options.js",
+    "test:neolist": "node tests/scripts/comprehensive/test-neolist-options.js",
     "test:encryption": "npm run neozip-encrypt && npm run neounzip-decrypt && echo '✅ All encryption tests completed successfully!'",
-    "test:infozip-decrypt": "npx ts-node test-scripts/test-infozip-decrypt.ts",
-    "test:comments": "node test-scripts/comprehensive/test-comments-options.js",
-    "test:update": "node test-scripts/test-update-option.js",
-    "test:symlinks": "echo '=== Testing Symbolic Links ===' && rm -rf test-symlinks && rm -rf test-output/symlinks* 2>/dev/null; rm -rf output/symlinks*.nzip 2>/dev/null; mkdir -p test-symlinks && echo 'This is the target file content' > test-symlinks/target.txt && ln -sf target.txt test-symlinks/symlink.txt && echo -e '\\n--- Original files ---' && ls -la test-symlinks/ && echo -e '\\n--- Creating ZIP with -y (store symlinks) ---' && npx ts-node src/neozip.ts -y output/symlinks-test.nzip test-symlinks/* && echo -e '\\n--- Extracting with -y (restore symlinks) ---' && mkdir -p test-output/symlinks && npx ts-node src/neounzip.ts -y output/symlinks-test.nzip test-output/symlinks/ && echo -e '\\n--- Extracted files ---' && ls -la test-output/symlinks/test-symlinks/ 2>/dev/null || ls -la test-output/symlinks/ && echo -e '\\n--- Testing symlink functionality ---' && (test -L test-output/symlinks/test-symlinks/symlink.txt 2>/dev/null && cat test-output/symlinks/test-symlinks/symlink.txt > /dev/null 2>&1 && echo '✅ PASS: Symlink test completed successfully') || (test -L test-output/symlinks/symlink.txt 2>/dev/null && cat test-output/symlinks/symlink.txt > /dev/null 2>&1 && echo '✅ PASS: Symlink test completed successfully') || echo '❌ FAIL: Symlink was not created or does not work' && echo -e '\\n--- Creating ZIP without -y (follow symlinks) ---' && npx ts-node src/neozip.ts output/symlinks-follow.nzip test-symlinks/* && echo -e '\\n--- Extracting without -y (regular files) ---' && mkdir -p test-output/symlinks-follow && npx ts-node src/neounzip.ts output/symlinks-follow.nzip test-output/symlinks-follow/ && echo -e '\\n--- Extracted files (no symlinks) ---' && ls -la test-output/symlinks-follow/test-symlinks/ 2>/dev/null || ls -la test-output/symlinks-follow/ && rm -rf test-symlinks && rm -rf test-output/symlinks* 2>/dev/null; rm -rf output/symlinks*.nzip 2>/dev/null",
-    "test:hardlinks": "echo '=== Testing Hard Links ===' && rm -rf test-hardlinks && rm -rf test-output/hardlinks* 2>/dev/null; rm -rf output/hardlinks*.nzip 2>/dev/null; mkdir -p test-hardlinks && echo 'This is the original file content for hard link testing' > test-hardlinks/original.txt && ln test-hardlinks/original.txt test-hardlinks/hardlink1.txt && ln test-hardlinks/original.txt test-hardlinks/hardlink2.txt && echo -e '\\n--- Original files (note same inode numbers) ---' && ls -li test-hardlinks/ && echo -e '\\n--- Creating ZIP with -H (detect hard links) ---' && npx ts-node src/neozip.ts -H output/hardlinks-test.nzip test-hardlinks/* && echo -e '\\n--- Extracting with -H (restore hard links) ---' && mkdir -p test-output/hardlinks && npx ts-node src/neounzip.ts -H output/hardlinks-test.nzip test-output/hardlinks/ && echo -e '\\n--- Extracted files (note same inode numbers) ---' && ls -li test-output/hardlinks/test-hardlinks/ 2>/dev/null || ls -li test-output/hardlinks/ && echo -e '\\n--- Testing hard link functionality ---' && HARD_LINK1=\"test-output/hardlinks/test-hardlinks/hardlink1.txt\"; HARD_LINK2=\"test-output/hardlinks/test-hardlinks/hardlink2.txt\"; ORIGINAL=\"test-output/hardlinks/test-hardlinks/original.txt\"; test -f \"$HARD_LINK1\" || HARD_LINK1=\"test-output/hardlinks/hardlink1.txt\"; test -f \"$HARD_LINK2\" || HARD_LINK2=\"test-output/hardlinks/hardlink2.txt\"; test -f \"$ORIGINAL\" || ORIGINAL=\"test-output/hardlinks/original.txt\"; (test -f \"$HARD_LINK1\" && test -f \"$ORIGINAL\" && echo 'Modified content' >> \"$HARD_LINK1\" 2>/dev/null && cat \"$ORIGINAL\" > /dev/null 2>&1 && echo '✅ PASS: Hard links test (with -H) completed') || echo '⚠️  WARN: Hard links extraction may have issues' && echo -e '\\n--- Creating ZIP without -H (store as copies) ---' && npx ts-node src/neozip.ts output/hardlinks-copies.nzip test-hardlinks/* && echo -e '\\n--- Extracting without -H (separate files) ---' && mkdir -p test-output/hardlinks-copies && npx ts-node src/neounzip.ts output/hardlinks-copies.nzip test-output/hardlinks-copies/ && echo -e '\\n--- Extracted files (different inodes) ---' && ls -li test-output/hardlinks-copies/test-hardlinks/ 2>/dev/null || ls -li test-output/hardlinks-copies/ && echo -e '\\n=== TEST SUMMARY ===' && (test -f test-output/hardlinks-copies/test-hardlinks/original.txt 2>/dev/null || test -f test-output/hardlinks-copies/original.txt 2>/dev/null) && echo '✅ PASS: Hard links test completed successfully' || echo '❌ FAIL: Some hard link tests failed' && rm -rf test-hardlinks && rm -rf test-output/hardlinks* 2>/dev/null; rm -rf output/hardlinks*.nzip 2>/dev/null",
-    "test:stdin": "echo '=== Testing Stdin Filenames ===' && mkdir -p test-stdin && echo 'Test file 1' > test-stdin/file1.txt && echo 'Test file 2' > test-stdin/file2.txt && echo 'Test file 3' > test-stdin/file3.txt && echo '' && echo '--- Testing stdin filenames with -@ ---' && printf 'test-stdin/file1.txt\\ntest-stdin/file2.txt\\ntest-stdin/file3.txt\\n' | npx ts-node src/neozip.ts -@ test-stdin.zip && echo '' && echo '--- Verifying archive contents ---' && npx ts-node src/neolist.ts test-stdin.zip && echo '' && echo '--- Testing with find command ---' && find test-stdin -name '*.txt' | npx ts-node src/neozip.ts -@ test-stdin-find.zip && npx ts-node src/neolist.ts test-stdin-find.zip && echo '' && echo '--- Cleanup ---' && rm -rf test-stdin test-stdin.zip test-stdin-find.zip && echo '✅ Stdin filenames test completed successfully!'",
-    "test:eocd": "npx ts-node test-scripts/test-eocd-loading.ts",
-    "test:copy-entry": "npx ts-node test-scripts/test-copy-entry-streaming.ts",
-    "test:tampered-zip": "npx ts-node test-scripts/test-tampered-verification.ts",
-    "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",
-    "switch:neozipkit:npm": "node scripts/switch-neozipkit.js npm",
-    "switch:neozipkit:local": "node scripts/switch-neozipkit.js local",
-    "switch:neozipkit:status": "node scripts/switch-neozipkit.js status"
+    "test:stamp": "echo '=== Testing Timestamp Support ===' && npm run neozip-ots && npm run neounzip-ots && echo '' && echo '--- Zipstamp (may fail if server unreachable) ---' && (npm run neozip-zipstamp && npm run neounzip-zipstamp && echo '✅ Zipstamp tests completed') || echo '⚠️ Zipstamp skipped (server may be unreachable)' && echo '' && echo '✅ Timestamp tests completed successfully!'",
+    "test:infozip-decrypt": "npx ts-node tests/scripts/test-infozip-decrypt.ts",
+    "test:comments": "node tests/scripts/comprehensive/test-comments-options.js",
+    "test:update": "node tests/scripts/test-update-option.js",
+    "test:symlinks": "echo '=== Testing Symbolic Links ===' && rm -rf tests/output/symlinks-temp && rm -rf tests/output/symlinks* 2>/dev/null; rm -rf tests/output/symlinks*.nzip 2>/dev/null; mkdir -p tests/output/symlinks-temp && echo 'This is the target file content' > tests/output/symlinks-temp/target.txt && ln -sf target.txt tests/output/symlinks-temp/symlink.txt && echo -e '\\n--- Original files ---' && ls -la tests/output/symlinks-temp/ && echo -e '\\n--- Creating ZIP with -y (store symlinks) ---' && npx ts-node src/neozip.ts -y tests/output/symlinks-test.nzip tests/output/symlinks-temp/* && echo -e '\\n--- Extracting with -y (restore symlinks) ---' && mkdir -p tests/output/symlinks && npx ts-node src/neounzip.ts -y tests/output/symlinks-test.nzip tests/output/symlinks/ && echo -e '\\n--- Extracted files ---' && ls -la tests/output/symlinks/tests/output/symlinks-temp/ 2>/dev/null || ls -la tests/output/symlinks/ && echo -e '\\n--- Testing symlink functionality ---' && (test -L tests/output/symlinks/tests/output/symlinks-temp/symlink.txt 2>/dev/null && cat tests/output/symlinks/tests/output/symlinks-temp/symlink.txt > /dev/null 2>&1 && echo '✅ PASS: Symlink test completed successfully') || (test -L tests/output/symlinks/symlink.txt 2>/dev/null && cat tests/output/symlinks/symlink.txt > /dev/null 2>&1 && echo '✅ PASS: Symlink test completed successfully') || echo '❌ FAIL: Symlink was not created or does not work' && echo -e '\\n--- Creating ZIP without -y (follow symlinks) ---' && npx ts-node src/neozip.ts tests/output/symlinks-follow.nzip tests/output/symlinks-temp/* && echo -e '\\n--- Extracting without -y (regular files) ---' && mkdir -p tests/output/symlinks-follow && npx ts-node src/neounzip.ts tests/output/symlinks-follow.nzip tests/output/symlinks-follow/ && echo -e '\\n--- Extracted files (no symlinks) ---' && ls -la tests/output/symlinks-follow/tests/output/symlinks-temp/ 2>/dev/null || ls -la tests/output/symlinks-follow/ && rm -rf tests/output/symlinks-temp && rm -rf tests/output/symlinks* 2>/dev/null; rm -rf tests/output/symlinks*.nzip 2>/dev/null",
+    "test:hardlinks": "echo '=== Testing Hard Links ===' && rm -rf tests/output/hardlinks-temp && rm -rf tests/output/hardlinks* 2>/dev/null; rm -rf tests/output/hardlinks*.nzip 2>/dev/null; mkdir -p tests/output/hardlinks-temp && echo 'This is the original file content for hard link testing' > tests/output/hardlinks-temp/original.txt && ln tests/output/hardlinks-temp/original.txt tests/output/hardlinks-temp/hardlink1.txt && ln tests/output/hardlinks-temp/original.txt tests/output/hardlinks-temp/hardlink2.txt && echo -e '\\n--- Original files (note same inode numbers) ---' && ls -li tests/output/hardlinks-temp/ && echo -e '\\n--- Creating ZIP with -H (detect hard links) ---' && npx ts-node src/neozip.ts -H tests/output/hardlinks-test.nzip tests/output/hardlinks-temp/* && echo -e '\\n--- Extracting with -H (restore hard links) ---' && mkdir -p tests/output/hardlinks && npx ts-node src/neounzip.ts -H tests/output/hardlinks-test.nzip tests/output/hardlinks/ && echo -e '\\n--- Extracted files (note same inode numbers) ---' && ls -li tests/output/hardlinks/tests/output/hardlinks-temp/ 2>/dev/null || ls -li tests/output/hardlinks/ && echo -e '\\n--- Testing hard link functionality ---' && HARD_LINK1=\"tests/output/hardlinks/tests/output/hardlinks-temp/hardlink1.txt\"; HARD_LINK2=\"tests/output/hardlinks/tests/output/hardlinks-temp/hardlink2.txt\"; ORIGINAL=\"tests/output/hardlinks/tests/output/hardlinks-temp/original.txt\"; test -f \"$HARD_LINK1\" || HARD_LINK1=\"tests/output/hardlinks/hardlink1.txt\"; test -f \"$HARD_LINK2\" || HARD_LINK2=\"tests/output/hardlinks/hardlink2.txt\"; test -f \"$ORIGINAL\" || ORIGINAL=\"tests/output/hardlinks/original.txt\"; (test -f \"$HARD_LINK1\" && test -f \"$ORIGINAL\" && echo 'Modified content' >> \"$HARD_LINK1\" 2>/dev/null && cat \"$ORIGINAL\" > /dev/null 2>&1 && echo '✅ PASS: Hard links test (with -H) completed') || echo '⚠️  WARN: Hard links extraction may have issues' && echo -e '\\n--- Creating ZIP without -H (store as copies) ---' && npx ts-node src/neozip.ts tests/output/hardlinks-copies.nzip tests/output/hardlinks-temp/* && echo -e '\\n--- Extracting without -H (separate files) ---' && mkdir -p tests/output/hardlinks-copies && npx ts-node src/neounzip.ts tests/output/hardlinks-copies.nzip tests/output/hardlinks-copies/ && echo -e '\\n--- Extracted files (different inodes) ---' && ls -li tests/output/hardlinks-copies/tests/output/hardlinks-temp/ 2>/dev/null || ls -li tests/output/hardlinks-copies/ && echo -e '\\n=== TEST SUMMARY ===' && (test -f tests/output/hardlinks-copies/tests/output/hardlinks-temp/original.txt 2>/dev/null || test -f tests/output/hardlinks-copies/original.txt 2>/dev/null) && echo '✅ PASS: Hard links test completed successfully' || echo '❌ FAIL: Some hard link tests failed' && rm -rf tests/output/hardlinks-temp && rm -rf tests/output/hardlinks* 2>/dev/null; rm -rf tests/output/hardlinks*.nzip 2>/dev/null",
+    "test:stdin": "echo '=== Testing Stdin Filenames ===' && mkdir -p tests/output/stdin-temp && echo 'Test file 1' > tests/output/stdin-temp/file1.txt && echo 'Test file 2' > tests/output/stdin-temp/file2.txt && echo 'Test file 3' > tests/output/stdin-temp/file3.txt && echo '' && echo '--- Testing stdin filenames with -@ ---' && printf 'tests/output/stdin-temp/file1.txt\\ntests/output/stdin-temp/file2.txt\\ntests/output/stdin-temp/file3.txt\\n' | npx ts-node src/neozip.ts -@ tests/output/test-stdin.zip && echo '' && echo '--- Verifying archive contents ---' && npx ts-node src/neolist.ts tests/output/test-stdin.zip && echo '' && echo '--- Testing with find command ---' && find tests/output/stdin-temp -name '*.txt' | npx ts-node src/neozip.ts -@ tests/output/test-stdin-find.zip && npx ts-node src/neolist.ts tests/output/test-stdin-find.zip && echo '' && echo '--- Cleanup ---' && rm -rf tests/output/stdin-temp tests/output/test-stdin.zip tests/output/test-stdin-find.zip && echo '✅ Stdin filenames test completed successfully!'",
+    "test:eocd": "npx ts-node tests/scripts/test-eocd-loading.ts",
+    "test:copy-entry": "npx ts-node tests/scripts/test-copy-entry-streaming.ts",
+    "test:tampered-zip": "npx ts-node tests/scripts/test-tampered-verification.ts",
+    "test:upgrade-zip": "echo '=== Testing ZIP Upgrade ===' && mkdir -p tests/output && echo '' && echo '--- Creating initial ZIP with Calgary corpus files (deflate compression) ---' && npx ts-node src/neozip.ts --deflate tests/output/test-upgrade.nzip tests/fixtures/calgary/bib tests/fixtures/calgary/book1 tests/fixtures/calgary/book2 && echo '' && echo '--- Upgrading ZIP for tokenization ---' && npx ts-node src/neozip.ts --upgrade tests/output/test-upgrade.nzip && echo '' && echo '--- Listing upgraded ZIP contents ---' && npx ts-node src/neolist.ts tests/output/test-upgrade-tokenized.nzip && echo '' && echo '--- Verifying upgraded ZIP with neounzip -t ---' && npx ts-node src/neounzip.ts -t tests/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 tests/output/test-upgrade-tokenized.nzip tests/output/preverify/ && echo '' && echo '--- Testing pre-verify on non-tokenized ZIP ---' && npx ts-node src/neozip.ts --deflate tests/output/test-preverify-nontoken.nzip tests/fixtures/calgary/bib tests/fixtures/calgary/book1 tests/fixtures/calgary/book2 && npx ts-node src/neounzip.ts -T tests/output/test-preverify-nontoken.nzip tests/output/preverify-nontoken/ && rm -rf tests/output/preverify* tests/output/test-preverify-nontoken.nzip 2>/dev/null && echo '' && echo '✅ Pre-verify test completed successfully!'",
+    "test:package": "node tests/scripts/test-package.js",
+    "switch:neozipkit:dev": "node scripts/switch-neozip-blockchain.js dev neozipkit",
+    "switch:neozipkit:prod": "node scripts/switch-neozip-blockchain.js prod neozipkit",
+    "switch:neozipkit:status": "node scripts/switch-neozip-blockchain.js status neozipkit",
+    "switch:neozip-blockchain:dev": "node scripts/switch-neozip-blockchain.js dev neozip-blockchain",
+    "switch:neozip-blockchain:prod": "node scripts/switch-neozip-blockchain.js prod neozip-blockchain",
+    "switch:neozip-blockchain:status": "node scripts/switch-neozip-blockchain.js status neozip-blockchain"
   },
   "keywords": [
     "zip",
@@ -141,14 +146,15 @@
     "minimatch": "^10.0.3",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
+    "neozip-blockchain": "npm:neozip-blockchain@latest",
+    "neozipkit": "npm:neozipkit@latest",
     "opentimestamps": "^0.4.9",
     "ora": "^5.4.1",
     "pako": "^2.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.0",
     "uuid": "^9.0.0",
-    "web3": "^4.0.0",
-    "neozipkit": "^0.3.1"
+    "web3": "^4.0.0"
   },
   "devDependencies": {
     "@types/chalk": "^2.2.4",
@@ -170,5 +176,5 @@
     "url": "https://github.com/NeoWareInc/neozip-support/issues"
   },
   "homepage": "https://github.com/NeoWareInc/neozip-cli#readme",
-  "packageManager": "yarn@1.22.19"
+  "packageManager": "yarn@4.12.0"
 }