@kitecd/cli 1.0.0 → 1.2.0

package/dist/index.js

@@ -10,6 +10,12 @@ import { uploadZip } from './upload.js';
 import { getConfigPath, getKiteHome, randomToken, readGlobalConfig, readLocalEnv, setGlobalConfig, writeGlobalConfig, writeLocalEnvValue, listProjectEnvs, resolveProjectConfig, envTokenKey } from './home.js';
 import { LocalStore } from './local-store.js';
 import { startServe } from './serve.js';
+import { parseIgnoreOption } from './ignore.js';
+import { runExport } from './export.js';
+import { runImport } from './import.js';
+import { runVerify } from './verify.js';
+import { runDoctor } from './doctor.js';
+import { runList, runStatus, runLogs, runRollback } from './ops.js';
 // @ts-ignore
 const cli = cac('kite');
 // ==========================
@@ -48,6 +54,32 @@ cli.command('config:set <key> <value>', 'Set global configuration')
         }
         console.log(chalk.yellow('No kite.config*.json found, setting as global token.'));
     }
+    // serverUrl: 优先写入项目配置
+    if (key === 'serverUrl' && !options.global) {
+        const allEnvs = listProjectEnvs();
+        let resolved = null;
+        if (options.env) {
+            resolved = resolveProjectConfig(options.env);
+        }
+        else if (allEnvs.length === 1) {
+            resolved = allEnvs[0];
+        }
+        else if (allEnvs.length > 1) {
+            if (!process.stdin.isTTY) {
+                console.error(chalk.red('Multiple kite.config*.json found. Pass --env to specify environment.'));
+                process.exit(1);
+            }
+            console.error(chalk.red('Multiple kite.config*.json found. Pass --env to specify environment.'));
+            process.exit(1);
+        }
+        if (resolved) {
+            resolved.config.serverUrl = value;
+            fs.writeFileSync(resolved.configPath, `${JSON.stringify(resolved.config, null, 2)}\n`);
+            console.log(chalk.green(`Set serverUrl in ${resolved.configPath}`));
+            return;
+        }
+        console.log(chalk.yellow('No kite.config*.json found, setting as global serverUrl.'));
+    }
     setGlobalConfig(key, value);
     console.log(chalk.green(`Set ${key} = ${value}`));
 });
@@ -114,7 +146,7 @@ cli.command('config', 'Show current effective configuration (merged from all sou
     const projectId = localEnv.KITE_PROJECT_ID || projectConfig.projectId;
     const tokenKey = projectId ? envTokenKey(projectId, envName) : '';
     const token = localEnv.KITE_DEPLOY_TOKEN || localEnv.KITE_TOKEN || globalConfig.projectToken?.[tokenKey] || (envName && projectId ? globalConfig.projectToken?.[projectId] : undefined) || globalConfig.token;
-    const serverUrl = localEnv.KITE_SERVER_URL || globalConfig.serverUrl;
+    const serverUrl = localEnv.KITE_SERVER_URL || projectConfig.serverUrl || globalConfig.serverUrl;
     const outputDir = localEnv.KITE_OUTPUT_DIR || projectConfig.outputDir || './';
     const preDeploy = localEnv.KITE_PRE_DEPLOY || projectConfig.preDeploy;
     const postDeploy = localEnv.KITE_DEPLOY_COMMAND || localEnv.KITE_POST_DEPLOY || projectConfig.command || projectConfig.postDeploy;
@@ -131,6 +163,10 @@ cli.command('config', 'Show current effective configuration (merged from all sou
     if (projectConfig.files?.length) {
         console.log(`  files:       ${projectConfig.files.join(', ')}`);
     }
+    if (projectConfig.env && Object.keys(projectConfig.env).length > 0) {
+        const entries = Object.entries(projectConfig.env).map(([k, v]) => `${k}=${v}`).join(', ');
+        console.log(`  env:         ${entries}`);
+    }
     if (allEnvs.length > 1) {
         console.log(chalk.gray('\nAvailable environments:'));
         for (const e of allEnvs) {
@@ -350,6 +386,7 @@ cli.command('init', 'Create kite.config.json without writing token into source c
     .option('--pre <script>', 'Pre-deploy script')
     .option('--post <script>', 'Post-deploy script')
     .option('--command <script>', 'Deploy command alias, same as --post')
+    .option('--set-env <vars>', 'Environment variables as JSON or KEY=VALUE')
     .action(async (options) => {
     const projectId = options.project;
     if (!projectId) {
@@ -364,17 +401,31 @@ cli.command('init', 'Create kite.config.json without writing token into source c
         outputDir: options.out || './dist',
         files: String(options.files || '**/*').split(',').map(item => item.trim()).filter(Boolean)
     };
+    if (options.server)
+        projectConfig.serverUrl = options.server;
     if (options.pre)
         projectConfig.preDeploy = options.pre;
     if (options.command || options.post)
         projectConfig.postDeploy = options.command || options.post;
+    if (options.setEnv) {
+        const envVars = {};
+        const raw = options.setEnv;
+        if (raw.trimStart().startsWith('{')) {
+            Object.assign(envVars, JSON.parse(raw));
+        }
+        else {
+            for (const pair of raw.split(',')) {
+                const eq = pair.indexOf('=');
+                if (eq > 0)
+                    envVars[pair.slice(0, eq).trim()] = pair.slice(eq + 1).trim();
+            }
+        }
+        if (Object.keys(envVars).length > 0)
+            projectConfig.env = envVars;
+    }
     fs.writeFileSync(configPath, `${JSON.stringify(projectConfig, null, 2)}\n`);
     console.log(chalk.green(`Created ${configPath}`));
     console.log(chalk.gray('Deploy token is intentionally not written to kite config file.'));
-    if (options.server) {
-        setGlobalConfig('serverUrl', options.server);
-        console.log(chalk.green(`Saved serverUrl to ${getKiteHome()}/config.json`));
-    }
     if (options.token) {
         const tokenStore = options.tokenStore || await askTokenStore();
         const tokenKey = envTokenKey(projectId, env);
@@ -437,6 +488,8 @@ const displayPackResult = (result) => {
 cli.command('build', 'Pack project files and verify packaging (no upload)')
     .option('--env <name>', 'Environment name (selects kite.config.<name>.json)')
     .option('--out <dir>', 'Output directory to pack')
+    .option('--ignore <patterns>', 'Extra ignore patterns (comma separated, may repeat)')
+    .option('--no-ignore-builtin', 'Disable built-in ignore patterns (node_modules, .git, .env*, etc.)')
     .action(async (options) => {
     try {
         const allEnvs = listProjectEnvs();
@@ -468,9 +521,21 @@ cli.command('build', 'Pack project files and verify packaging (no upload)')
             console.error(chalk.red(`Error: Output directory not found: ${sourceDir}`));
             process.exit(1);
         }
+        const cliIgnore = parseIgnoreOption(options.ignore);
+        const ignore = cliIgnore.length > 0
+            ? cliIgnore
+            : (Array.isArray(projectConfig.ignore) ? projectConfig.ignore : []);
+        // cac: --no-ignore-builtin 时 options.ignoreBuiltin === false；未传时 true
+        const ignoreBuiltin = options.ignoreBuiltin === false
+            ? true
+            : (projectConfig.ignoreBuiltin === true);
         const spinner = ora('Packing files...').start();
         const zipFilePath = path.resolve(process.cwd(), '.deploy-archive.zip');
-        const result = await packProject(sourceDir, zipFilePath, files.length > 0 ? files : undefined);
+        const result = await packProject(sourceDir, zipFilePath, {
+            files: files.length > 0 ? files : undefined,
+            ignore,
+            ignoreBuiltin,
+        });
         spinner.succeed(chalk.green('Pack successful!'));
         displayPackResult(result);
         console.log(chalk.gray(`  Archive: ${zipFilePath}`));
@@ -492,7 +557,11 @@ cli.command('push', 'Push and deploy project')
     .option('--pre <script>', 'Pre-deploy script (Server side)')
     .option('--post <script>', 'Post-deploy script (Server side)')
     .option('--command <script>', 'Deploy command alias, same as --post')
+    .option('--set-env <vars>', 'Environment variables as JSON or KEY=VALUE (overrides config)')
+    .option('--ignore <patterns>', 'Extra ignore patterns (comma separated, may repeat)')
+    .option('--no-ignore-builtin', 'Disable built-in ignore patterns (node_modules, .git, .env*, etc.)')
     .action(async (options) => {
+    const pushStartedAt = new Date().toISOString();
     try {
         // 1. 解析环境配置
         const allEnvs = listProjectEnvs();
@@ -538,7 +607,7 @@ cli.command('push', 'Push and deploy project')
             || globalConfig?.projectToken?.[tokenKey]
             || (envName ? globalConfig?.projectToken?.[projectId] : undefined)
             || globalConfig?.token;
-        const serverUrl = options.server || localEnv.KITE_SERVER_URL || globalConfig?.serverUrl;
+        const serverUrl = options.server || localEnv.KITE_SERVER_URL || projectConfig.serverUrl || globalConfig?.serverUrl;
         if (!token && !serverUrl) {
             console.error(chalk.red('Missing token and serverUrl. Run `kite config:set serverUrl <url>` and `kite config:set token <token>`.'));
             process.exit(1);
@@ -555,15 +624,44 @@ cli.command('push', 'Push and deploy project')
         const files = projectConfig.files || [];
         const preDeploy = options.pre || localEnv.KITE_PRE_DEPLOY || projectConfig.preDeploy;
         const postDeploy = options.command || options.post || localEnv.KITE_DEPLOY_COMMAND || localEnv.KITE_POST_DEPLOY || projectConfig.command || projectConfig.postDeploy;
+        // 解析 env: 项目配置 + CLI --set-env 覆盖
+        let deployEnv = projectConfig.env || undefined;
+        if (options.setEnv) {
+            const cliEnv = {};
+            const raw = options.setEnv;
+            if (raw.trimStart().startsWith('{')) {
+                Object.assign(cliEnv, JSON.parse(raw));
+            }
+            else {
+                for (const pair of raw.split(',')) {
+                    const eq = pair.indexOf('=');
+                    if (eq > 0)
+                        cliEnv[pair.slice(0, eq).trim()] = pair.slice(eq + 1).trim();
+                }
+            }
+            deployEnv = { ...deployEnv, ...cliEnv };
+        }
         const sourceDir = path.resolve(process.cwd(), outputDir);
         if (!fs.existsSync(sourceDir)) {
             console.error(chalk.red(`Error: Output directory not found: ${sourceDir}`));
             process.exit(1);
         }
         // 5. 打包文件
+        const cliIgnore = parseIgnoreOption(options.ignore);
+        const ignore = cliIgnore.length > 0
+            ? cliIgnore
+            : (Array.isArray(projectConfig.ignore) ? projectConfig.ignore : []);
+        // cac: --no-ignore-builtin 时 options.ignoreBuiltin === false；未传时 true
+        const ignoreBuiltin = options.ignoreBuiltin === false
+            ? true
+            : (projectConfig.ignoreBuiltin === true);
         const spinner = ora('Packing files...').start();
         const zipFilePath = path.resolve(process.cwd(), '.deploy-archive.zip');
-        const packResult = await packProject(sourceDir, zipFilePath, files.length > 0 ? files : undefined);
+        const packResult = await packProject(sourceDir, zipFilePath, {
+            files: files.length > 0 ? files : undefined,
+            ignore,
+            ignoreBuiltin,
+        });
         spinner.succeed(chalk.green('Packed successfully'));
         displayPackResult(packResult);
         // 6. 上传与部署
@@ -575,13 +673,21 @@ cli.command('push', 'Push and deploy project')
             zipFilePath,
             projectId,
             preDeploy,
-            postDeploy
+            postDeploy,
+            env: deployEnv,
+            startedAt: pushStartedAt
         });
         if (result.success) {
             console.log(chalk.green(`\nDeployed successfully! (${result.duration})`));
+            if (result.traceId) {
+                console.log(chalk.gray(`  trace: ${result.traceId}`));
+            }
         }
         else {
             console.error(chalk.red('\nDeployment failed'));
+            if (result.traceId) {
+                console.error(chalk.gray(`  trace: ${result.traceId}`));
+            }
             process.exit(1);
         }
     }
@@ -597,6 +703,162 @@ cli.command('push', 'Push and deploy project')
         }
     }
 });
+// ==========================
+// Migration commands: export / import
+// ==========================
+cli.command('export', 'Export Kite database (and optional artifacts) to a portable archive')
+    .option('--out <file>', 'Output file path (default: kite-export-<timestamp>.zip)')
+    .option('--no-include-artifacts', 'Skip packing each project deployPath contents (default: include)')
+    .option('--no-include-logs', 'Skip deployment history (default: include)')
+    .option('--projects <ids>', 'Comma separated project ids to include (default: all)')
+    .option('--ignore <patterns>', 'Extra ignore patterns for artifacts (comma separated, may repeat)')
+    .option('--no-ignore-builtin', 'Disable built-in ignore patterns when packing artifacts')
+    .action(async (options) => {
+    try {
+        const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
+        const ignoreBuiltin = options.ignoreBuiltin === false;
+        await runExport({
+            out: options.out,
+            includeArtifacts: options.includeArtifacts !== false,
+            includeLogs: options.includeLogs !== false,
+            projects: options.projects,
+            ignore: options.ignore,
+            ignoreBuiltin,
+        }, pkg.version || '0.0.0');
+    }
+    catch (error) {
+        console.error(chalk.red(`\nExport failed: ${error.message}`));
+        process.exit(1);
+    }
+});
+cli.command('import <file>', 'Import Kite database from an export archive')
+    .option('--strategy <mode>', 'Conflict strategy: merge | overwrite | skip-existing', { default: 'skip-existing' })
+    .option('--no-restore-artifacts', 'Skip restoring each project deployPath from the archive (default: restore when archive contains artifacts)')
+    .option('--dry-run', 'Show summary without writing')
+    .option('--yes', 'Confirm destructive --strategy overwrite')
+    .action(async (file, options) => {
+    try {
+        await runImport(file, {
+            strategy: options.strategy,
+            restoreArtifacts: options.restoreArtifacts !== false,
+            dryRun: !!options.dryRun,
+            yes: !!options.yes,
+        });
+    }
+    catch (error) {
+        console.error(chalk.red(`\nImport failed: ${error.message}`));
+        process.exit(1);
+    }
+});
+cli.command('verify', 'Verify ~/.kite migration integrity (db, deploy paths, tokens, optional server health)')
+    .option('--check-server', 'Also probe configured serverUrl with HTTP GET')
+    .option('--timeout <ms>', 'Server probe timeout in ms', { default: 5000 })
+    .action(async (options) => {
+    try {
+        await runVerify({
+            checkServer: !!options.checkServer,
+            timeout: Number(options.timeout) || 5000,
+        });
+    }
+    catch (error) {
+        console.error(chalk.red(`\nVerify failed: ${error.message}`));
+        process.exit(1);
+    }
+});
+cli.command('doctor', 'Run local + remote health diagnostics')
+    .option('--server <url>', 'Override server URL (defaults to global config / KITE_SERVER_URL)')
+    .option('--token <token>', 'Override admin token (defaults to global config / KITE_TOKEN)')
+    .action(async (options) => {
+    try {
+        const code = await runDoctor({ server: options.server, token: options.token });
+        process.exit(code);
+    }
+    catch (error) {
+        console.error(chalk.red(`\nDoctor failed: ${error.message}`));
+        process.exit(1);
+    }
+});
+cli.command('list', 'List projects on Kite server')
+    .option('--server <url>', 'Override server URL')
+    .option('--token <token>', 'Override admin token')
+    .option('--env <name>', 'Filter by project env')
+    .option('--json', 'Output JSON (no colors)')
+    .action(async (options) => {
+    try {
+        const code = await runList({ server: options.server, token: options.token, env: options.env, json: options.json });
+        process.exit(code);
+    }
+    catch (error) {
+        console.error(chalk.red(`\nList failed: ${error.message}`));
+        process.exit(1);
+    }
+});
+cli.command('status [projectId]', 'Show recent deployments of a project')
+    .option('--server <url>', 'Override server URL')
+    .option('--token <token>', 'Override admin token')
+    .option('--env <name>', 'Pick kite.config.<env>.json when no projectId given')
+    .option('--limit <n>', 'Number of deployments to show (default 5, max 50)')
+    .option('--json', 'Output JSON')
+    .action(async (projectId, options) => {
+    try {
+        const code = await runStatus(projectId, {
+            server: options.server,
+            token: options.token,
+            env: options.env,
+            limit: options.limit ? Number(options.limit) : undefined,
+            json: options.json,
+        });
+        process.exit(code);
+    }
+    catch (error) {
+        console.error(chalk.red(`\nStatus failed: ${error.message}`));
+        process.exit(1);
+    }
+});
+cli.command('logs <deployId>', 'Print deployment logs (or follow live with -f)')
+    .option('--server <url>', 'Override server URL')
+    .option('--token <token>', 'Override admin token')
+    .option('-f, --follow', 'Stream live logs via SSE until the deployment finishes')
+    .option('--json', 'Output JSON (only without --follow)')
+    .action(async (deployId, options) => {
+    try {
+        const code = await runLogs(deployId, {
+            server: options.server,
+            token: options.token,
+            follow: options.follow,
+            json: options.json,
+        });
+        process.exit(code);
+    }
+    catch (error) {
+        console.error(chalk.red(`\nLogs failed: ${error.message}`));
+        process.exit(1);
+    }
+});
+cli.command('rollback [projectId]', 'Rollback a project to a previous successful deployment')
+    .option('--server <url>', 'Override server URL')
+    .option('--token <token>', 'Override admin token (admin required)')
+    .option('--env <name>', 'Pick kite.config.<env>.json when no projectId given')
+    .option('--to <deployId>', 'Target deployment to roll back to (default: previous success)')
+    .option('--yes', 'Skip interactive confirmation (required in non-TTY)')
+    .option('--json', 'Output JSON on success')
+    .action(async (projectId, options) => {
+    try {
+        const code = await runRollback(projectId, {
+            server: options.server,
+            token: options.token,
+            env: options.env,
+            to: options.to,
+            yes: options.yes,
+            json: options.json,
+        });
+        process.exit(code);
+    }
+    catch (error) {
+        console.error(chalk.red(`\nRollback failed: ${error.message}`));
+        process.exit(1);
+    }
+});
 cli.help();
 const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
 cli.version(pkg.version);