pake-cli 3.6.1 → 3.6.3

package/dist/cli.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import chalk from 'chalk';
-import { InvalidArgumentError, program, Option } from 'commander';
 import log from 'loglevel';
+import updateNotifier from 'update-notifier';
 import path from 'path';
 import fsExtra from 'fs-extra';
 import { fileURLToPath } from 'url';
+import chalk from 'chalk';
 import prompts from 'prompts';
 import os from 'os';
 import { execa, execaSync } from 'execa';
@@ -14,16 +14,15 @@ import dns from 'dns';
 import http from 'http';
 import { promisify } from 'util';
 import fs from 'fs';
-import updateNotifier from 'update-notifier';
-import axios from 'axios';
 import { dir } from 'tmp-promise';
 import { fileTypeFromBuffer } from 'file-type';
 import icongen from 'icon-gen';
 import sharp from 'sharp';
 import * as psl from 'psl';
+import { InvalidArgumentError, program as program$1, Option } from 'commander';
 
 var name = "pake-cli";
-var version = "3.6.1";
+var version = "3.6.3";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -58,7 +57,6 @@ var scripts = {
 	build: "tauri build",
 	"build:debug": "tauri build --debug",
 	"build:mac": "tauri build --target universal-apple-darwin",
-	"build:config": "chmod +x scripts/configure-tauri.mjs && node scripts/configure-tauri.mjs",
 	analyze: "cd src-tauri && cargo bloat --release --crates",
 	tauri: "tauri",
 	cli: "cross-env NODE_ENV=development rollup -c -w",
@@ -75,7 +73,6 @@ var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^2.9.0",
 	"@tauri-apps/cli": "^2.9.0",
-	axios: "^1.12.2",
 	chalk: "^5.6.2",
 	commander: "^12.1.0",
 	execa: "^9.6.0",
@@ -108,7 +105,8 @@ var devDependencies = {
 	rollup: "^4.52.5",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
-	typescript: "^5.9.3"
+	typescript: "^5.9.3",
+	vitest: "^4.0.15"
 };
 var packageJson = {
 	name: name,
@@ -379,7 +377,12 @@ async function installRust() {
     }
     catch (error) {
         spinner.fail(chalk.red('✕ Rust installation failed!'));
-        console.error(error.message);
+        if (error instanceof Error) {
+            console.error(error.message);
+        }
+        else {
+            console.error(error);
+        }
         process.exit(1);
     }
 }
@@ -421,6 +424,9 @@ function generateSafeFilename(name) {
         .replace(/\.+$/g, '')
         .slice(0, 255);
 }
+function getSafeAppName(name) {
+    return generateSafeFilename(name).toLowerCase();
+}
 function generateLinuxPackageName(name) {
     return name
         .toLowerCase()
@@ -448,12 +454,6 @@ function generateIdentifierSafeName(name) {
     return cleaned;
 }
 
-/**
- * Helper function to generate safe lowercase app name for file paths
- */
-function getSafeAppName(name) {
-    return generateSafeFilename(name).toLowerCase();
-}
 async function mergeConfig(url, options, tauriConf) {
     // Ensure .pake directory exists and copy source templates if needed
     const srcTauriDir = path.join(npmDirectory, 'src-tauri');
@@ -474,7 +474,7 @@ async function mergeConfig(url, options, tauriConf) {
             await fsExtra.copy(sourcePath, destPath);
         }
     }));
-    const { width, height, fullscreen, maximize, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, multiInstance, startToTray, forceInternalNavigation, zoom, minWidth, minHeight, ignoreCertificateErrors, } = options;
+    const { width, height, fullscreen, maximize, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name = 'pake-app', resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, multiInstance, startToTray, forceInternalNavigation, zoom, minWidth, minHeight, ignoreCertificateErrors, } = options;
     const { platform } = process;
     const platformHideOnClose = hideOnClose ?? platform === 'darwin';
     const tauriConfWindowOptions = {
@@ -490,7 +490,7 @@ async function mergeConfig(url, options, tauriConf) {
         disabled_web_shortcuts: disabledWebShortcuts,
         hide_on_close: platformHideOnClose,
         incognito: incognito,
-        title: title || null,
+        title: title,
         enable_wasm: wasm,
         enable_drag_drop: enableDragDrop,
         start_to_tray: startToTray && showSystemTray,
@@ -555,10 +555,13 @@ async function mergeConfig(url, options, tauriConf) {
         const identifier = `com.pake.${appNameSafe}`;
         const desktopFileName = `${identifier}.desktop`;
         // Create desktop file content
+        // Determine if title contains Chinese characters for Name[zh_CN]
+        const chineseName = title && /[\u4e00-\u9fa5]/.test(title) ? title : null;
         const desktopContent = `[Desktop Entry]
 Version=1.0
 Type=Application
 Name=${name}
+${chineseName ? `Name[zh_CN]=${chineseName}` : ''}
 Comment=${name}
 Exec=pake-${appNameSafe}
 Icon=${appNameSafe}_512
@@ -822,7 +825,9 @@ class BaseBuilder {
         }
         catch (error) {
             // If installation times out and we haven't tried the mirror yet, retry with mirror
-            if (error.message?.includes('timed out') && !usedMirror) {
+            if (error instanceof Error &&
+                error.message.includes('timed out') &&
+                !usedMirror) {
                 spinner.fail(chalk.yellow('Installation timed out, retrying with CN mirror...'));
                 logger.info('✺ Retrying installation with CN mirror for better speed...');
                 const retrySpinner = getSpinner('Retrying installation...');
@@ -851,10 +856,18 @@ class BaseBuilder {
         await this.buildAndCopy(url, this.options.targets);
     }
     async start(url) {
+        logger.info('Pake dev server starting...');
         await mergeConfig(url, this.options, tauriConfig);
+        const packageManager = await this.detectPackageManager();
+        const configPath = path.join(npmDirectory, 'src-tauri', '.pake', 'tauri.conf.json');
+        const features = this.getBuildFeatures();
+        const featureArgs = features.length > 0 ? `--features ${features.join(',')}` : '';
+        const argSeparator = packageManager === 'npm' ? ' --' : '';
+        const command = `cd "${npmDirectory}" && ${packageManager} run tauri${argSeparator} dev --config "${configPath}" ${featureArgs}`;
+        await shellExec(command);
     }
     async buildAndCopy(url, target) {
-        const { name } = this.options;
+        const { name = 'pake-app' } = this.options;
         await mergeConfig(url, this.options, tauriConfig);
         // Detect available package manager
         const packageManager = await this.detectPackageManager();
@@ -1121,7 +1134,7 @@ class MacBuilder extends BaseBuilder {
         this.buildArch = validArchs.includes(options.targets || '')
             ? options.targets
             : 'auto';
-        if (process.env.PAKE_CREATE_APP === '1') {
+        if (options.iterativeBuild || process.env.PAKE_CREATE_APP === '1') {
             this.buildFormat = 'app';
         }
         else {
@@ -1130,7 +1143,7 @@ class MacBuilder extends BaseBuilder {
         this.options.targets = this.buildFormat;
     }
     getFileName() {
-        const { name } = this.options;
+        const { name = 'pake-app' } = this.options;
         if (this.buildFormat === 'app') {
             return name;
         }
@@ -1249,7 +1262,7 @@ class LinuxBuilder extends BaseBuilder {
         this.options.targets = this.buildFormat;
     }
     getFileName() {
-        const { name, targets } = this.options;
+        const { name = 'pake-app', targets } = this.options;
         const version = tauriConfig.version;
         let arch;
         if (this.buildArch === 'arm64') {
@@ -1283,7 +1296,7 @@ class LinuxBuilder extends BaseBuilder {
     getBuildCommand(packageManager = 'pnpm') {
         const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
         const buildTarget = this.buildArch === 'arm64'
-            ? this.getTauriTarget(this.buildArch, 'linux')
+            ? (this.getTauriTarget(this.buildArch, 'linux') ?? undefined)
             : undefined;
         let fullCommand = this.buildBaseCommand(packageManager, configPath, buildTarget);
         const features = this.getBuildFeatures();
@@ -1341,48 +1354,6 @@ class BuilderProvider {
     }
 }
 
-const DEFAULT_PAKE_OPTIONS = {
-    icon: '',
-    height: 780,
-    width: 1200,
-    fullscreen: false,
-    maximize: false,
-    hideTitleBar: false,
-    alwaysOnTop: false,
-    appVersion: '1.0.0',
-    darkMode: false,
-    disabledWebShortcuts: false,
-    activationShortcut: '',
-    userAgent: '',
-    showSystemTray: false,
-    multiArch: false,
-    targets: 'deb',
-    useLocalFile: false,
-    systemTrayIcon: '',
-    proxyUrl: '',
-    debug: false,
-    inject: [],
-    installerLanguage: 'en-US',
-    hideOnClose: undefined, // Platform-specific: true for macOS, false for others
-    incognito: false,
-    wasm: false,
-    enableDragDrop: false,
-    keepBinary: false,
-    multiInstance: false,
-    startToTray: false,
-    forceInternalNavigation: false,
-    zoom: 100,
-    minWidth: 0,
-    minHeight: 0,
-    ignoreCertificateErrors: false,
-};
-
-async function checkUpdateTips() {
-    updateNotifier({ pkg: packageJson, updateCheckInterval: 1000 * 60 }).notify({
-        isGlobal: true,
-    });
-}
-
 const ICON_CONFIG = {
     minFileSize: 100,
     supportedFormats: ['png', 'ico', 'jpeg', 'jpg', 'webp', 'icns'],
@@ -1454,7 +1425,57 @@ async function preprocessIcon(inputPath) {
         return outputPath;
     }
     catch (error) {
-        logger.warn(`Failed to add background to icon: ${error.message}`);
+        if (error instanceof Error) {
+            logger.warn(`Failed to add background to icon: ${error.message}`);
+        }
+        return inputPath;
+    }
+}
+/**
+ * Applies macOS squircle mask to icon
+ */
+async function applyMacOSMask(inputPath) {
+    try {
+        const { path: tempDir } = await dir();
+        const outputPath = path.join(tempDir, 'icon-macos-rounded.png');
+        // 1. Create a 1024x1024 rounded rect mask
+        // rx="224" is closer to the smooth Apple squircle look for 1024px
+        const mask = Buffer.from('<svg width="1024" height="1024"><rect x="0" y="0" width="1024" height="1024" rx="224" ry="224" fill="white"/></svg>');
+        // 2. Load input, resize to 1024, apply mask
+        const maskedBuffer = await sharp(inputPath)
+            .resize(1024, 1024, {
+            fit: 'contain',
+            background: { r: 0, g: 0, b: 0, alpha: 0 },
+        })
+            .composite([
+            {
+                input: mask,
+                blend: 'dest-in',
+            },
+        ])
+            .png()
+            .toBuffer();
+        // 3. Resize to 840x840 (~18% padding) to solve "too big" visual issue
+        // Native MacOS icons often leave some breathing room
+        await sharp(maskedBuffer)
+            .resize(840, 840, {
+            fit: 'contain',
+            background: { r: 0, g: 0, b: 0, alpha: 0 },
+        })
+            .extend({
+            top: 92,
+            bottom: 92,
+            left: 92,
+            right: 92,
+            background: { r: 0, g: 0, b: 0, alpha: 0 },
+        })
+            .toFile(outputPath);
+        return outputPath;
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            logger.warn(`Failed to apply macOS mask: ${error.message}`);
+        }
         return inputPath;
     }
 }
@@ -1496,7 +1517,8 @@ async function convertIconFormat(inputPath, appName) {
             return outputPath;
         }
         // macOS
-        await icongen(processedInputPath, platformOutputDir, {
+        const macIconPath = await applyMacOSMask(processedInputPath);
+        await icongen(macIconPath, platformOutputDir, {
             report: false,
             icns: { name: iconName, sizes: PLATFORM_CONFIG.macos.sizes },
         });
@@ -1504,7 +1526,9 @@ async function convertIconFormat(inputPath, appName) {
         return (await fsExtra.pathExists(outputPath)) ? outputPath : null;
     }
     catch (error) {
-        logger.warn(`Icon format conversion failed: ${error.message}`);
+        if (error instanceof Error) {
+            logger.warn(`Icon format conversion failed: ${error.message}`);
+        }
         return null;
     }
 }
@@ -1642,14 +1666,18 @@ async function tryGetFavicon(url, appName) {
                 }
             }
             catch (error) {
-                logger.debug(`Icon service ${serviceUrl} failed: ${error.message}`);
-                // Platform-specific error handling
+                if (error instanceof Error) {
+                    logger.debug(`Icon service ${serviceUrl} failed: ${error.message}`);
+                }
+                // Network error handling
                 if ((IS_LINUX || IS_WIN) && error.code === 'ENOTFOUND') {
-                    logger.debug(`DNS resolution failed for ${serviceUrl}, trying next service...`);
+                    return null;
                 }
-                // Windows-specific icon conversion errors
-                if (IS_WIN && error.message.includes('icongen')) {
-                    logger.debug(`Windows icon conversion failed for ${serviceUrl}, trying next service...`);
+                // Icon generation error on Windows
+                if (IS_WIN &&
+                    error instanceof Error &&
+                    error.message.includes('icongen')) {
+                    return null;
                 }
                 continue;
             }
@@ -1658,7 +1686,9 @@ async function tryGetFavicon(url, appName) {
         return null;
     }
     catch (error) {
-        logger.warn(`Failed to fetch favicon: ${error.message}`);
+        if (error instanceof Error) {
+            logger.warn(`Failed to fetch favicon: ${error.message}`);
+        }
         return null;
     }
 }
@@ -1666,24 +1696,40 @@ async function tryGetFavicon(url, appName) {
  * Downloads icon from URL
  */
 async function downloadIcon(iconUrl, showSpinner = true, customTimeout) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => {
+        controller.abort();
+    }, customTimeout || 10000);
     try {
-        const response = await axios.get(iconUrl, {
-            responseType: 'arraybuffer',
-            timeout: customTimeout || 10000,
+        const response = await fetch(iconUrl, {
+            signal: controller.signal,
         });
-        const iconData = response.data;
-        if (!iconData || iconData.byteLength < ICON_CONFIG.minFileSize)
+        clearTimeout(timeoutId);
+        if (!response.ok) {
+            if (response.status === 404 && !showSpinner) {
+                return null;
+            }
+            throw new Error(`HTTP ${response.status} ${response.statusText}`);
+        }
+        const arrayBuffer = await response.arrayBuffer();
+        if (!arrayBuffer || arrayBuffer.byteLength < ICON_CONFIG.minFileSize)
             return null;
-        const fileDetails = await fileTypeFromBuffer(iconData);
+        const fileDetails = await fileTypeFromBuffer(arrayBuffer);
         if (!fileDetails ||
             !ICON_CONFIG.supportedFormats.includes(fileDetails.ext)) {
             return null;
         }
-        return await saveIconFile(iconData, fileDetails.ext);
+        return await saveIconFile(arrayBuffer, fileDetails.ext);
     }
     catch (error) {
-        if (showSpinner && !(error.response?.status === 404)) {
-            throw error;
+        clearTimeout(timeoutId);
+        if (showSpinner) {
+            if (error instanceof Error && error.name === 'AbortError') {
+                logger.error('Icon download timed out!');
+            }
+            else {
+                logger.error('Icon download failed!', error instanceof Error ? error.message : String(error));
+            }
         }
         return null;
     }
@@ -1766,7 +1812,7 @@ async function handleOptions(options, url) {
     if (name && platform === 'linux') {
         name = generateLinuxPackageName(name);
     }
-    if (!isValidName(name, platform)) {
+    if (name && !isValidName(name, platform)) {
         const LINUX_NAME_ERROR = `✕ Name should only include lowercase letters, numbers, and dashes (not leading dashes). Examples: com-123-xxx, 123pan, pan123, weread, we-read, 123.`;
         const DEFAULT_NAME_ERROR = `✕ Name should only include letters, numbers, dashes, and spaces (not leading dashes and spaces). Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead, we-read, We Read, 123.`;
         const errorMsg = platform === 'linux' ? LINUX_NAME_ERROR : DEFAULT_NAME_ERROR;
@@ -1785,10 +1831,58 @@ async function handleOptions(options, url) {
         identifier: getIdentifier(url),
     };
     const iconPath = await handleIcon(appOptions, url);
-    appOptions.icon = iconPath || undefined;
+    appOptions.icon = iconPath || '';
     return appOptions;
 }
 
+const DEFAULT_PAKE_OPTIONS = {
+    icon: '',
+    height: 780,
+    width: 1200,
+    fullscreen: false,
+    maximize: false,
+    hideTitleBar: false,
+    alwaysOnTop: false,
+    appVersion: '1.0.0',
+    darkMode: false,
+    disabledWebShortcuts: false,
+    activationShortcut: '',
+    userAgent: '',
+    showSystemTray: false,
+    multiArch: false,
+    targets: (() => {
+        switch (process.platform) {
+            case 'linux':
+                return 'deb';
+            case 'darwin':
+                return 'dmg';
+            case 'win32':
+                return 'msi';
+            default:
+                return 'deb';
+        }
+    })(),
+    useLocalFile: false,
+    systemTrayIcon: '',
+    proxyUrl: '',
+    debug: false,
+    inject: [],
+    installerLanguage: 'en-US',
+    hideOnClose: undefined, // Platform-specific: true for macOS, false for others
+    incognito: false,
+    wasm: false,
+    enableDragDrop: false,
+    keepBinary: false,
+    multiInstance: false,
+    startToTray: false,
+    forceInternalNavigation: false,
+    iterativeBuild: false,
+    zoom: 100,
+    minWidth: 0,
+    minHeight: 0,
+    ignoreCertificateErrors: false,
+};
+
 function validateNumberInput(value) {
     const parsedValue = Number(value);
     if (isNaN(parsedValue)) {
@@ -1803,152 +1897,163 @@ function validateUrlInput(url) {
             return normalizeUrl(url);
         }
         catch (error) {
-            throw new InvalidArgumentError(error.message);
+            if (error instanceof Error) {
+                throw new InvalidArgumentError(error.message);
+            }
+            throw error;
         }
     }
     return url;
 }
 
-const { green, yellow } = chalk;
-const logo = `${chalk.green(' ____       _')}
+function getCliProgram() {
+    const { green, yellow } = chalk;
+    const logo = `${chalk.green(' ____       _')}
 ${green('|  _ \\ __ _| | _____')}
 ${green('| |_) / _` | |/ / _ \\')}
 ${green('|  __/ (_| |   <  __/')}  ${yellow('https://github.com/tw93/pake')}
 ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with Rust.')}
 `;
-program
-    .addHelpText('beforeAll', logo)
-    .usage(`[url] [options]`)
-    .showHelpAfterError();
-program
-    .argument('[url]', 'The web URL you want to package', validateUrlInput)
-    // Refer to https://github.com/tj/commander.js#custom-option-processing, turn string array into a string connected with custom connectors.
-    // If the platform is Linux, use `-` as the connector, and convert all characters to lowercase.
-    // For example, Google Translate will become google-translate.
-    .option('--name <string>', 'Application name')
-    .option('--icon <string>', 'Application icon', DEFAULT_PAKE_OPTIONS.icon)
-    .option('--width <number>', 'Window width', validateNumberInput, DEFAULT_PAKE_OPTIONS.width)
-    .option('--height <number>', 'Window height', validateNumberInput, DEFAULT_PAKE_OPTIONS.height)
-    .option('--use-local-file', 'Use local file packaging', DEFAULT_PAKE_OPTIONS.useLocalFile)
-    .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
-    .option('--hide-title-bar', 'For Mac, hide title bar', DEFAULT_PAKE_OPTIONS.hideTitleBar)
-    .option('--multi-arch', 'For Mac, both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
-    .option('--inject <files>', 'Inject local CSS/JS files into the page', (val, previous) => {
-    if (!val)
-        return DEFAULT_PAKE_OPTIONS.inject;
-    // Split by comma and trim whitespace, filter out empty strings
-    const files = val
-        .split(',')
-        .map((item) => item.trim())
-        .filter((item) => item.length > 0);
-    // If previous values exist (from multiple --inject options), merge them
-    return previous ? [...previous, ...files] : files;
-}, DEFAULT_PAKE_OPTIONS.inject)
-    .option('--debug', 'Debug build and more output', DEFAULT_PAKE_OPTIONS.debug)
-    .addOption(new Option('--proxy-url <url>', 'Proxy URL for all network requests (http://, https://, socks5://)')
-    .default(DEFAULT_PAKE_OPTIONS.proxyUrl)
-    .hideHelp())
-    .addOption(new Option('--user-agent <string>', 'Custom user agent')
-    .default(DEFAULT_PAKE_OPTIONS.userAgent)
-    .hideHelp())
-    .addOption(new Option('--targets <string>', 'Build target format for your system').default(DEFAULT_PAKE_OPTIONS.targets))
-    .addOption(new Option('--app-version <string>', 'App version, the same as package.json version')
-    .default(DEFAULT_PAKE_OPTIONS.appVersion)
-    .hideHelp())
-    .addOption(new Option('--always-on-top', 'Always on the top level')
-    .default(DEFAULT_PAKE_OPTIONS.alwaysOnTop)
-    .hideHelp())
-    .addOption(new Option('--maximize', 'Start window maximized')
-    .default(DEFAULT_PAKE_OPTIONS.maximize)
-    .hideHelp())
-    .addOption(new Option('--dark-mode', 'Force Mac app to use dark mode')
-    .default(DEFAULT_PAKE_OPTIONS.darkMode)
-    .hideHelp())
-    .addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts')
-    .default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts)
-    .hideHelp())
-    .addOption(new Option('--activation-shortcut <string>', 'Shortcut key to active App')
-    .default(DEFAULT_PAKE_OPTIONS.activationShortcut)
-    .hideHelp())
-    .addOption(new Option('--show-system-tray', 'Show system tray in app')
-    .default(DEFAULT_PAKE_OPTIONS.showSystemTray)
-    .hideHelp())
-    .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon')
-    .default(DEFAULT_PAKE_OPTIONS.systemTrayIcon)
-    .hideHelp())
-    .addOption(new Option('--hide-on-close [boolean]', 'Hide window on close instead of exiting (default: true for macOS, false for others)')
-    .default(DEFAULT_PAKE_OPTIONS.hideOnClose)
-    .argParser((value) => {
-    if (value === undefined)
-        return true; // --hide-on-close without value
-    if (value === 'true')
-        return true;
-    if (value === 'false')
-        return false;
-    throw new Error('--hide-on-close must be true or false');
-})
-    .hideHelp())
-    .addOption(new Option('--title <string>', 'Window title').hideHelp())
-    .addOption(new Option('--incognito', 'Launch app in incognito/private mode')
-    .default(DEFAULT_PAKE_OPTIONS.incognito)
-    .hideHelp())
-    .addOption(new Option('--wasm', 'Enable WebAssembly support (Flutter Web, etc.)')
-    .default(DEFAULT_PAKE_OPTIONS.wasm)
-    .hideHelp())
-    .addOption(new Option('--enable-drag-drop', 'Enable drag and drop functionality')
-    .default(DEFAULT_PAKE_OPTIONS.enableDragDrop)
-    .hideHelp())
-    .addOption(new Option('--keep-binary', 'Keep raw binary file alongside installer')
-    .default(DEFAULT_PAKE_OPTIONS.keepBinary)
-    .hideHelp())
-    .addOption(new Option('--multi-instance', 'Allow multiple app instances')
-    .default(DEFAULT_PAKE_OPTIONS.multiInstance)
-    .hideHelp())
-    .addOption(new Option('--start-to-tray', 'Start app minimized to tray')
-    .default(DEFAULT_PAKE_OPTIONS.startToTray)
-    .hideHelp())
-    .addOption(new Option('--force-internal-navigation', 'Keep every link inside the Pake window instead of opening external handlers')
-    .default(DEFAULT_PAKE_OPTIONS.forceInternalNavigation)
-    .hideHelp())
-    .addOption(new Option('--installer-language <string>', 'Installer language')
-    .default(DEFAULT_PAKE_OPTIONS.installerLanguage)
-    .hideHelp())
-    .addOption(new Option('--zoom <number>', 'Initial page zoom level (50-200)')
-    .default(DEFAULT_PAKE_OPTIONS.zoom)
-    .argParser((value) => {
-    const zoom = parseInt(value);
-    if (isNaN(zoom) || zoom < 50 || zoom > 200) {
-        throw new Error('--zoom must be a number between 50 and 200');
-    }
-    return zoom;
-})
-    .hideHelp())
-    .addOption(new Option('--min-width <number>', 'Minimum window width')
-    .default(DEFAULT_PAKE_OPTIONS.minWidth)
-    .argParser(validateNumberInput)
-    .hideHelp())
-    .addOption(new Option('--min-height <number>', 'Minimum window height')
-    .default(DEFAULT_PAKE_OPTIONS.minHeight)
-    .argParser(validateNumberInput)
-    .hideHelp())
-    .addOption(new Option('--ignore-certificate-errors', 'Ignore certificate errors (for self-signed certificates)')
-    .default(DEFAULT_PAKE_OPTIONS.ignoreCertificateErrors)
-    .hideHelp())
-    .version(packageJson.version, '-v, --version')
-    .configureHelp({
-    sortSubcommands: true,
-    optionTerm: (option) => {
-        if (option.flags === '-v, --version' || option.flags === '-h, --help')
-            return '';
-        return option.flags;
-    },
-    optionDescription: (option) => {
-        if (option.flags === '-v, --version' || option.flags === '-h, --help')
-            return '';
-        return option.description;
-    },
-})
-    .action(async (url, options) => {
+    return program$1
+        .addHelpText('beforeAll', logo)
+        .usage(`[url] [options]`)
+        .showHelpAfterError()
+        .argument('[url]', 'The web URL you want to package', validateUrlInput)
+        .option('--name <string>', 'Application name')
+        .option('--icon <string>', 'Application icon', DEFAULT_PAKE_OPTIONS.icon)
+        .option('--width <number>', 'Window width', validateNumberInput, DEFAULT_PAKE_OPTIONS.width)
+        .option('--height <number>', 'Window height', validateNumberInput, DEFAULT_PAKE_OPTIONS.height)
+        .option('--use-local-file', 'Use local file packaging', DEFAULT_PAKE_OPTIONS.useLocalFile)
+        .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
+        .option('--hide-title-bar', 'For Mac, hide title bar', DEFAULT_PAKE_OPTIONS.hideTitleBar)
+        .option('--multi-arch', 'For Mac, both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
+        .option('--inject <files>', 'Inject local CSS/JS files into the page', (val, previous) => {
+        if (!val)
+            return DEFAULT_PAKE_OPTIONS.inject;
+        // Split by comma and trim whitespace, filter out empty strings
+        const files = val
+            .split(',')
+            .map((item) => item.trim())
+            .filter((item) => item.length > 0);
+        // If previous values exist (from multiple --inject options), merge them
+        return previous ? [...previous, ...files] : files;
+    }, DEFAULT_PAKE_OPTIONS.inject)
+        .option('--debug', 'Debug build and more output', DEFAULT_PAKE_OPTIONS.debug)
+        .addOption(new Option('--proxy-url <url>', 'Proxy URL for all network requests (http://, https://, socks5://)')
+        .default(DEFAULT_PAKE_OPTIONS.proxyUrl)
+        .hideHelp())
+        .addOption(new Option('--user-agent <string>', 'Custom user agent')
+        .default(DEFAULT_PAKE_OPTIONS.userAgent)
+        .hideHelp())
+        .addOption(new Option('--targets <string>', 'Build target format for your system').default(DEFAULT_PAKE_OPTIONS.targets))
+        .addOption(new Option('--app-version <string>', 'App version, the same as package.json version')
+        .default(DEFAULT_PAKE_OPTIONS.appVersion)
+        .hideHelp())
+        .addOption(new Option('--always-on-top', 'Always on the top level')
+        .default(DEFAULT_PAKE_OPTIONS.alwaysOnTop)
+        .hideHelp())
+        .addOption(new Option('--maximize', 'Start window maximized')
+        .default(DEFAULT_PAKE_OPTIONS.maximize)
+        .hideHelp())
+        .addOption(new Option('--dark-mode', 'Force Mac app to use dark mode')
+        .default(DEFAULT_PAKE_OPTIONS.darkMode)
+        .hideHelp())
+        .addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts')
+        .default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts)
+        .hideHelp())
+        .addOption(new Option('--activation-shortcut <string>', 'Shortcut key to active App')
+        .default(DEFAULT_PAKE_OPTIONS.activationShortcut)
+        .hideHelp())
+        .addOption(new Option('--show-system-tray', 'Show system tray in app')
+        .default(DEFAULT_PAKE_OPTIONS.showSystemTray)
+        .hideHelp())
+        .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon')
+        .default(DEFAULT_PAKE_OPTIONS.systemTrayIcon)
+        .hideHelp())
+        .addOption(new Option('--hide-on-close [boolean]', 'Hide window on close instead of exiting (default: true for macOS, false for others)')
+        .default(DEFAULT_PAKE_OPTIONS.hideOnClose)
+        .argParser((value) => {
+        if (value === undefined)
+            return true; // --hide-on-close without value
+        if (value === 'true')
+            return true;
+        if (value === 'false')
+            return false;
+        throw new Error('--hide-on-close must be true or false');
+    })
+        .hideHelp())
+        .addOption(new Option('--title <string>', 'Window title').hideHelp())
+        .addOption(new Option('--incognito', 'Launch app in incognito/private mode')
+        .default(DEFAULT_PAKE_OPTIONS.incognito)
+        .hideHelp())
+        .addOption(new Option('--wasm', 'Enable WebAssembly support (Flutter Web, etc.)')
+        .default(DEFAULT_PAKE_OPTIONS.wasm)
+        .hideHelp())
+        .addOption(new Option('--enable-drag-drop', 'Enable drag and drop functionality')
+        .default(DEFAULT_PAKE_OPTIONS.enableDragDrop)
+        .hideHelp())
+        .addOption(new Option('--keep-binary', 'Keep raw binary file alongside installer')
+        .default(DEFAULT_PAKE_OPTIONS.keepBinary)
+        .hideHelp())
+        .addOption(new Option('--multi-instance', 'Allow multiple app instances')
+        .default(DEFAULT_PAKE_OPTIONS.multiInstance)
+        .hideHelp())
+        .addOption(new Option('--start-to-tray', 'Start app minimized to tray')
+        .default(DEFAULT_PAKE_OPTIONS.startToTray)
+        .hideHelp())
+        .addOption(new Option('--force-internal-navigation', 'Keep every link inside the Pake window instead of opening external handlers')
+        .default(DEFAULT_PAKE_OPTIONS.forceInternalNavigation)
+        .hideHelp())
+        .addOption(new Option('--installer-language <string>', 'Installer language')
+        .default(DEFAULT_PAKE_OPTIONS.installerLanguage)
+        .hideHelp())
+        .addOption(new Option('--zoom <number>', 'Initial page zoom level (50-200)')
+        .default(DEFAULT_PAKE_OPTIONS.zoom)
+        .argParser((value) => {
+        const zoom = parseInt(value);
+        if (isNaN(zoom) || zoom < 50 || zoom > 200) {
+            throw new Error('--zoom must be a number between 50 and 200');
+        }
+        return zoom;
+    })
+        .hideHelp())
+        .addOption(new Option('--min-width <number>', 'Minimum window width')
+        .default(DEFAULT_PAKE_OPTIONS.minWidth)
+        .argParser(validateNumberInput)
+        .hideHelp())
+        .addOption(new Option('--min-height <number>', 'Minimum window height')
+        .default(DEFAULT_PAKE_OPTIONS.minHeight)
+        .argParser(validateNumberInput)
+        .hideHelp())
+        .addOption(new Option('--ignore-certificate-errors', 'Ignore certificate errors (for self-signed certificates)')
+        .default(DEFAULT_PAKE_OPTIONS.ignoreCertificateErrors)
+        .hideHelp())
+        .addOption(new Option('--iterative-build', 'Turn on rapid build mode (app only, no dmg/deb/msi), good for debugging')
+        .default(DEFAULT_PAKE_OPTIONS.iterativeBuild)
+        .hideHelp())
+        .version(packageJson.version, '-v, --version')
+        .configureHelp({
+        sortSubcommands: true,
+        optionTerm: (option) => {
+            if (option.flags === '-v, --version' || option.flags === '-h, --help')
+                return '';
+            return option.flags;
+        },
+        optionDescription: (option) => {
+            if (option.flags === '-v, --version' || option.flags === '-h, --help')
+                return '';
+            return option.description;
+        },
+    });
+}
+
+const program = getCliProgram();
+async function checkUpdateTips() {
+    updateNotifier({ pkg: packageJson, updateCheckInterval: 1000 * 60 }).notify({
+        isGlobal: true,
+    });
+}
+program.action(async (url, options) => {
     await checkUpdateTips();
     if (!url) {
         program.help({