@mindbase/deploy 1.1.3 → 1.2.0

package/bin/shared.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
 import * as clack from '@clack/prompts';
-import { runApp, runProject, showConfig } from '../src/app.js';
+import { runApp } from '../src/app.js';
 import { runInit } from '../src/init/app.js';
 import { createServerCommand } from '../src/server/app.js';
 
@@ -14,14 +14,12 @@ export function createDeployProgram(): Command {
     .description('部署工具')
     .version('1.0.0')
     .action(async () => {
-      clack.intro('deploy');
       try {
         await runApp();
       } catch (err) {
         clack.log.error(`执行失败: ${err}`);
         process.exit(1);
       }
-      clack.outro('再见');
     });
 
   program
@@ -37,27 +35,6 @@ export function createDeployProgram(): Command {
       }
     });
 
-  program
-    .command('run [path]')
-    .description('部署单个项目（path 缺省为 cwd，可传目录或 deploy.config.json）')
-    .option('-s, --server <server>', '覆盖项目配置中的 server')
-    .action(async (path: string | undefined, options: { server?: string }) => {
-      clack.intro('deploy run');
-      try {
-        await runProject(path, options.server);
-      } catch (err) {
-        clack.log.error(`执行失败: ${err}`);
-        process.exit(1);
-      }
-    });
-
-  program
-    .command('config')
-    .description('查看全局 servers 配置')
-    .action(() => {
-      showConfig();
-    });
-
   // 服务器管理子命令
   program.addCommand(createServerCommand());
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindbase/deploy",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "MindBase 部署工具",
   "type": "module",
   "bin": {

package/src/app.ts

@@ -2,7 +2,7 @@ import * as clack from '@clack/prompts';
 import pc from 'picocolors';
 import { relative } from 'path';
 import { noteBox } from '@mindbase/cli-ui';
-import { getConfig, getConfigPath, discoverProjectConfigs, loadProjectConfig } from './config/manager.js';
+import { getConfig, discoverProjectConfigs } from './config/manager.js';
 import type { ProjectConfig } from './config/schema.js';
 import { connectSftp } from './ssh/client.js';
 import { runSteps } from './script/runner.js';
@@ -17,86 +17,18 @@ function handleCancel<T>(result: T | symbol): T {
 }
 
 /**
- * 查看配置
- */
-export function showConfig(): void {
-  clack.intro('配置信息');
-  const config = getConfig();
-  const path = getConfigPath();
-  noteBox(`配置文件: ${path}\n\n${JSON.stringify(config, null, 2)}`, '当前配置');
-  clack.outro('完成');
-}
-
-/**
- * 显示项目配置摘要并让用户确认部署
- */
-async function confirmProjectDeploy(project: ProjectConfig, serverId: string): Promise<boolean> {
-  const summary = [
-    `名称: ${project.name}`,
-    `服务器: ${serverId}`,
-    `本地目录: ${project.localDir}`,
-    `远端目录: ${project.remoteDir}`,
-    `步骤数: ${project.steps.length}`,
-  ].join('\n');
-  noteBox(summary, '即将部署');
-  return handleCancel<boolean>(
-    await clack.confirm({ message: '确认部署？', initialValue: true })
-  );
-}
-
-/**
- * 直接运行指定项目（单项目模式）
- */
-export async function runProject(targetPath?: string, serverOverride?: string): Promise<void> {
-  const project = loadProjectConfig(targetPath);
-  const globalConfig = getConfig();
-
-  const serverId = serverOverride || project.server;
-  const serverConfig = globalConfig.servers[serverId];
-  if (!serverConfig) {
-    clack.log.error(`服务器 "${serverId}" 不存在，请先运行 deploy server add`);
-    process.exit(1);
-  }
-
-  clack.intro(`部署 ${pc.cyan(project.name)} → ${pc.cyan(serverId)}`);
-
-  if (!(await confirmProjectDeploy(project, serverId))) {
-    clack.log.info('已取消');
-    clack.outro('完成');
-    return;
-  }
-
-  const spinner = clack.spinner();
-  spinner.start('连接服务器...');
-  const sftp = await connectSftp(project.name, serverConfig);
-  spinner.stop('已连接');
-
-  try {
-    await runSteps(project.steps, project, sftp);
-    clack.log.success(`${project.name} 部署完成`);
-  } catch (err) {
-    clack.log.error(`部署失败: ${err}`);
-  } finally {
-    await sftp.end();
-  }
-
-  clack.outro('完成');
-}
-
-/**
- * 交互式主流程：扫描 cwd 下所有 deploy.config.json → 多选 → 按 server 分组部署
+ * 交互式主流程：选 server → 选项目 → 按笛卡尔分组部署
  */
 export async function runApp(): Promise<void> {
   const cwd = process.cwd();
   const discovered = discoverProjectConfigs(cwd);
   const globalConfig = getConfig();
 
+  // 边界校验（intro 之前）
   if (discovered.length === 0) {
     clack.log.error(`未在 ${cwd} 下找到任何 deploy.config.json，请先运行 deploy init`);
     return;
   }
-
-  // 0 个服务器直接报错
   if (Object.keys(globalConfig.servers).length === 0) {
     clack.log.error('没有已配置的服务器，请先运行 deploy server add');
     return;
@@ -104,8 +36,21 @@ export async function runApp(): Promise<void> {
 
   clack.intro('deploy');
 
-  // 选择项目
-  let selected: { path: string; config: ProjectConfig }[];
+  // 多选 server
+  const serverIds = Object.keys(globalConfig.servers);
+  const selectedServers = handleCancel<string[]>(
+    await clack.multiselect({
+      message: '选择要部署到的服务器（空格切换，a 全选）',
+      options: serverIds.map((id) => ({
+        value: id,
+        label: `${id} (${globalConfig.servers[id].host})`,
+      })),
+      required: true,
+    })
+  );
+
+  // 多选项目
+  let selectedProjects: typeof discovered;
 
   if (discovered.length === 1) {
     const only = discovered[0];
@@ -117,57 +62,69 @@ export async function runApp(): Promise<void> {
       clack.outro('已取消');
       return;
     }
-    selected = [only];
+    selectedProjects = [only];
   } else {
-    selected = handleCancel<typeof discovered>(
+    selectedProjects = handleCancel<typeof discovered>(
       await clack.multiselect({
         message: '选择要部署的项目（空格切换，a 全选）',
         options: discovered.map((item) => ({
           value: item,
-          label: `${item.config.name} (${relative(cwd, item.path) || item.path}) → ${pc.dim(item.config.server)}`,
+          label: `${item.config.name} (${relative(cwd, item.path) || item.path})`,
         })),
         required: true,
       })
     );
   }
 
-  // 校验所有选中项目的 server 都存在
-  const missingServers = new Set<string>();
-  for (const item of selected) {
-    if (!globalConfig.servers[item.config.server]) {
-      missingServers.add(item.config.server);
-    }
-  }
-  if (missingServers.size > 0) {
-    clack.log.error(`以下服务器未配置: ${[...missingServers].join(', ')}`);
-    clack.outro('已中止');
-    return;
-  }
+  // 确认摘要
+  const summaryLines = [
+    `服务器: ${selectedServers.map((s) => `${s} (${globalConfig.servers[s].host})`).join(', ')}`,
+    `项目:   ${selectedProjects.map((p) => p.config.name).join(', ')}`,
+    `组合:   ${selectedServers.length} × ${selectedProjects.length} = ${selectedServers.length * selectedProjects.length} 次部署`,
+  ].join('\n');
+  noteBox(summaryLines, '即将部署');
 
-  // 按 server 分组
-  const groups = new Map<string, { path: string; config: ProjectConfig }[]>();
-  for (const item of selected) {
-    const arr = groups.get(item.config.server) ?? [];
-    arr.push(item);
-    groups.set(item.config.server, arr);
+  const confirmed = handleCancel<boolean>(
+    await clack.confirm({ message: '确认开始部署？', initialValue: true })
+  );
+  if (!confirmed) {
+    clack.outro('已取消');
+    return;
   }
 
-  // 依次连接每个 server，组内项目依次部署
-  for (const [serverId, items] of groups) {
+  // 按 server 分组遍历（笛卡尔：每个 server 部署全部选中项目）
+  let anyFailure = false;
+  for (const serverId of selectedServers) {
     const serverConfig = globalConfig.servers[serverId];
     const spinner = clack.spinner();
-    spinner.start(`连接 ${serverId}...`);
-    const sftp = await connectSftp('deploy', serverConfig);
-    spinner.stop('已连接');
+    spinner.start(`连接 ${serverId} (${serverConfig.host})...`);
+    let sftp;
+    try {
+      sftp = await connectSftp('deploy', serverConfig);
+    } catch (err) {
+      spinner.stop(`连接失败: ${serverId}`);
+      clack.log.error(`${serverId} 连接失败: ${err}`);
+      anyFailure = true;
+      const cont = handleCancel<boolean>(
+        await clack.confirm({ message: `${serverId} 不可用，是否跳过并继续下一个服务器？` })
+      );
+      if (!cont) {
+        clack.outro('已中止');
+        return;
+      }
+      continue;
+    }
+    spinner.stop(`已连接 ${serverId}`);
 
     try {
-      for (const { config } of items) {
+      for (const { config } of selectedProjects) {
         clack.log.step(`开始部署 ${pc.cyan(config.name)} → ${pc.cyan(serverId)}`);
         try {
           await runSteps(config.steps, config, sftp);
-          clack.log.success(`${config.name} 部署完成`);
+          clack.log.success(`${config.name} → ${serverId} 完成`);
         } catch (err) {
-          clack.log.error(`${config.name} 部署失败: ${err}`);
+          anyFailure = true;
+          clack.log.error(`${config.name} → ${serverId} 失败: ${err}`);
           const cont = handleCancel<boolean>(
             await clack.confirm({ message: '是否继续部署下一个项目？' })
           );
@@ -179,5 +136,5 @@ export async function runApp(): Promise<void> {
     }
   }
 
-  clack.outro('全部完成');
+  clack.outro(anyFailure ? '完成（存在失败项）' : '全部完成');
 }

package/src/config/schema.ts

@@ -85,8 +85,6 @@ export interface ProjectConfig {
   name: string;
   /** 本地目录（绝对路径或相对配置文件的路径，加载时解析为绝对路径） */
   localDir: string;
-  /** 目标服务器 ID（引用全局 servers） */
-  server: string;
   /** 远端目录 */
   remoteDir: string;
   /** 部署步骤 */

package/src/init/app.ts

@@ -384,7 +384,6 @@ export async function runInit(targetPath?: string): Promise<void> {
   const projectConfig: ProjectConfig = {
     name,
     localDir,
-    server: serverId,
     remoteDir,
     steps,
   };

package/src/log.ts

@@ -0,0 +1,31 @@
+import * as clack from '@clack/prompts';
+
+/**
+ * 创建按行缓冲、用 clack 日志输出的 sink。
+ * - stdout 行用 clack.log.message（中性竖线）
+ * - stderr 行用 clack.log.warn（警告符号，与 stdout 区分）
+ *
+ * 不完整行（未遇换行）暂存在 buffer，flush 时统一输出。
+ */
+export function createLineSink(channel: 'stdout' | 'stderr') {
+  let buffer = '';
+  const emit = (line: string) => {
+    if (!line) return; // 跳过空行，避免每行前缀带来的噪音
+    if (channel === 'stderr') clack.log.warn(line);
+    else clack.log.message(line);
+  };
+  return {
+    push(chunk: string) {
+      buffer += chunk;
+      const lines = buffer.split(/\r?\n/);
+      buffer = lines.pop() ?? ''; // 末尾可能是不完整行
+      for (const line of lines) emit(line);
+    },
+    flush() {
+      if (buffer) {
+        emit(buffer);
+        buffer = '';
+      }
+    },
+  };
+}

package/src/script/runner.ts

@@ -1,8 +1,10 @@
 import type SftpClient from 'ssh2-sftp-client';
 import spawn from 'cross-spawn';
+import * as clack from '@clack/prompts';
 import type { Step, ProjectConfig } from '../config/schema.js';
 import { resolveVariables } from './parser.js';
 import { execRemote } from '../ssh/executor.js';
+import { createLineSink } from '../log.js';
 
 /**
  * 在本地执行命令
@@ -14,9 +16,13 @@ function runLocal(cmd: string, cwd?: string): Promise<void> {
       detached: false,
       shell: true,
     });
-    if (cp.stdout) cp.stdout.pipe(process.stdout);
-    if (cp.stderr) cp.stderr.pipe(process.stderr);
+    const outSink = createLineSink('stdout');
+    const errSink = createLineSink('stderr');
+    if (cp.stdout) cp.stdout.on('data', (data: Buffer) => outSink.push(data.toString()));
+    if (cp.stderr) cp.stderr.on('data', (data: Buffer) => errSink.push(data.toString()));
     cp.on('close', (code) => {
+      outSink.flush();
+      errSink.flush();
       if (code === 0) {
         resolve();
       } else {
@@ -36,7 +42,7 @@ async function runStep(step: Step, project: ProjectConfig, sftp: SftpClient): Pr
   switch (step.type) {
     case 'log': {
       const msg = resolveVariables(step.message, project);
-      console.log(msg);
+      clack.log.message(msg);
       break;
     }
     case 'local': {
@@ -53,26 +59,34 @@ async function runStep(step: Step, project: ProjectConfig, sftp: SftpClient): Pr
     case 'uploadDir': {
       const local = resolveVariables(step.local, project);
       const remote = resolveVariables(step.remote, project);
+      clack.log.step(`上传目录: ${local} → ${remote}`);
       await sftp.mkdir(remote, true);
       await sftp.uploadDir(local, remote, { useFastput: true });
+      clack.log.success('上传目录完成');
       break;
     }
     case 'uploadFile': {
       const local = resolveVariables(step.local, project);
       const remote = resolveVariables(step.remote, project);
+      clack.log.step(`上传文件: ${local} → ${remote}`);
       await sftp.fastPut(local, remote);
+      clack.log.success('上传文件完成');
       break;
     }
     case 'downloadDir': {
       const remote = resolveVariables(step.remote, project);
       const local = resolveVariables(step.local, project);
+      clack.log.step(`下载目录: ${remote} → ${local}`);
       await sftp.downloadDir(remote, local);
+      clack.log.success('下载目录完成');
       break;
     }
     case 'downloadFile': {
       const remote = resolveVariables(step.remote, project);
       const local = resolveVariables(step.local, project);
+      clack.log.step(`下载文件: ${remote} → ${local}`);
       await sftp.fastGet(remote, local);
+      clack.log.success('下载文件完成');
       break;
     }
   }

package/src/ssh/executor.ts

@@ -1,4 +1,5 @@
 import type SftpClient from 'ssh2-sftp-client';
+import { createLineSink } from '../log.js';
 
 /**
  * 在远程服务器执行命令
@@ -10,7 +11,9 @@ export async function execRemote(sftp: SftpClient, command: string): Promise<str
     '[ -f ~/.bash_profile ] && source ~/.bash_profile',
     '[ -f ~/.bash_login ] && source ~/.bash_login',
     '[ -f ~/.profile ] && source ~/.profile',
-    '[ -f ~/.bashrc ] && source ~/.bashrc',
+    // bashrc 顶部常见 `[ -z "$PS1" ] && return` 防御代码会让非交互 shell 直接退出，
+    // 注入占位 PS1 让判断失效，bashrc 内部随后会覆盖它
+    '[ -f ~/.bashrc ] && { PS1="${PS1:-deploy}"; source ~/.bashrc; }',
     '[ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"',
     '[ -s "$HOME/.nvm/nvm.sh" ] && source "$HOME/.nvm/nvm.sh"',
     '[ -s "$HOME/.fnm/env.sh" ] && source "$HOME/.fnm/env.sh"',
@@ -32,8 +35,12 @@ export async function execRemote(sftp: SftpClient, command: string): Promise<str
       }
       let outStr = '';
       let errStr = '';
+      const outSink = createLineSink('stdout');
+      const errSink = createLineSink('stderr');
       stream
         .on('close', (code: number, signal: string) => {
+          outSink.flush();
+          errSink.flush();
           if (code !== 0) {
             reject(new Error(`远程命令执行失败 (code=${code}): ${errStr || signal}`));
             return;
@@ -43,12 +50,12 @@ export async function execRemote(sftp: SftpClient, command: string): Promise<str
         .on('data', (data: Buffer) => {
           const str = data.toString();
           outStr += str;
-          process.stdout.write(str);
+          outSink.push(str);
         })
         .stderr.on('data', (data: Buffer) => {
           const str = data.toString();
           errStr += str;
-          process.stderr.write(str);
+          errSink.push(str);
         });
     });
   });