change logic to use pushy command uniformly

Author: bozaigao

README.md

@@ -1,16 +1,17 @@
-# React Native Update CLI - Modular Version
+# React Native Update CLI
 
 [中文文档](./README.zh-CN.md) | [Chinese Documentation](./README.zh-CN.md)
 
-This is a refactored React Native Update CLI that supports modular architecture and custom publishing workflows.
+A unified React Native Update CLI that supports both traditional commands and modular architecture with custom publishing workflows.
 
-## 🚀 New Features
+## 🚀 Features
 
+- **Unified CLI**: Single `pushy` command for all functionality
+- **Backward Compatibility**: All existing commands work as before
 - **Modular Architecture**: Split CLI functionality into independent modules
 - **Custom Workflows**: Support for creating custom publishing workflows
 - **Extensibility**: Users can import and register custom modules
 - **Type Safety**: Complete TypeScript type support
-- **Backward Compatibility**: Maintains compatibility with existing CLI
 
 ## 📦 Installation
 
@@ -23,17 +24,17 @@ npm install react-native-update-cli
 ### Basic Usage
 
 ```bash
-# Use modular CLI
-npx pushy-modular help
+# Use unified CLI
+npx pushy help
 
 # List all available commands and workflows
-npx pushy-modular list
+npx pushy list
 
 # Execute built-in workflow
-npx pushy-modular workflow setup-app
+npx pushy workflow setup-app
 
 # Execute custom workflow
-npx pushy-modular workflow custom-publish
+npx pushy workflow custom-publish
 ```
 
 ### Programmatic Usage

README.zh-CN.md

@@ -1,14 +1,15 @@
-# React Native Update CLI - 模块化版本
+# React Native Update CLI
 
-这是一个重构后的React Native Update CLI，支持模块化架构和自定义发布流程。
+这是一个统一的React Native Update CLI，同时支持传统命令和模块化架构以及自定义发布流程。
 
-## 🚀 新特性
+## 🚀 特性
 
+- **统一CLI**: 使用单个`pushy`命令提供所有功能
+- **向后兼容**: 所有现有命令都能正常工作
 - **模块化架构**: 将CLI功能拆分为独立的模块
 - **自定义工作流**: 支持创建自定义的发布流程
 - **可扩展性**: 用户可以导入和注册自定义模块
 - **类型安全**: 完整的TypeScript类型支持
-- **向后兼容**: 保持与现有CLI的兼容性
 
 ## 📦 安装
 
@@ -21,17 +22,17 @@ npm install react-native-update-cli
 ### 基本使用
 
 ```bash
-# 使用模块化CLI
-npx pushy-modular help
+# 使用统一CLI
+npx pushy help
 
 # 列出所有可用命令和工作流
-npx pushy-modular list
+npx pushy list
 
 # 执行内置的工作流
-npx pushy-modular workflow setup-app
+npx pushy workflow setup-app
 
 # 执行自定义工作流
-npx pushy-modular workflow custom-publish
+npx pushy workflow custom-publish
 ```
 
 ### 编程方式使用

package.json

@@ -5,8 +5,7 @@
   "main": "index.js",
   "bin": {
     "pushy": "lib/index.js",
-    "cresc": "lib/index.js",
-    "pushy-modular": "lib/modular-index.js"
+    "cresc": "lib/index.js"
   },
   "files": ["lib", "src", "cli.json"],
   "scripts": {

src/index.ts

@@ -3,20 +3,74 @@
 import { loadSession } from './api';
 import { appCommands } from './app';
 import { bundleCommands } from './bundle';
+import { moduleManager } from './module-manager';
+import { builtinModules } from './modules';
 import { packageCommands } from './package';
+import type { CommandContext } from './types';
 import { userCommands } from './user';
 import { printVersionCommand } from './utils';
 import { t } from './utils/i18n';
 import { versionCommands } from './versions';
 
+function registerBuiltinModules() {
+  for (const module of builtinModules) {
+    try {
+      moduleManager.registerModule(module);
+    } catch (error) {
+      console.error(`Failed to register module ${module.name}:`, error);
+    }
+  }
+}
+
 function printUsage() {
+  console.log('React Native Update CLI');
+  console.log('');
+  console.log('Traditional commands:');
+  
+  const legacyCommands = {
+    ...userCommands,
+    ...bundleCommands,
+    ...appCommands,
+    ...packageCommands,
+    ...versionCommands,
+  };
+  
+  for (const [name, handler] of Object.entries(legacyCommands)) {
+    console.log(`  ${name}: Legacy command`);
+  }
+
+  console.log('');
+  console.log('Modular commands:');
+  const commands = moduleManager.getRegisteredCommands();
+  for (const command of commands) {
+    console.log(
+      `  ${command.name}: ${command.description || 'No description'}`,
+    );
+  }
+
+  console.log('');
+  console.log('Available workflows:');
+  const workflows = moduleManager.getRegisteredWorkflows();
+  for (const workflow of workflows) {
+    console.log(
+      `  ${workflow.name}: ${workflow.description || 'No description'}`,
+    );
+  }
+
+  console.log('');
+  console.log('Special commands:');
+  console.log('  list: List all available commands and workflows');
+  console.log('  workflow <name>: Execute a specific workflow');
+  console.log('  help: Show this help message');
+  
+  console.log('');
   console.log(
     'Visit `https://github.com/reactnativecn/react-native-update` for document.',
   );
   process.exit(1);
 }
 
-const commands = {
+const legacyCommands = {
   ...userCommands,
   ...bundleCommands,
   ...appCommands,
@@ -31,20 +85,71 @@ async function run() {
     process.exit();
   }
 
+  // Register builtin modules for modular functionality
+  registerBuiltinModules();
+
   const argv = require('cli-arguments').parse(require('../cli.json'));
   global.NO_INTERACTIVE = argv.options['no-interactive'];
   global.USE_ACC_OSS = argv.options.acc;
 
-  loadSession()
-    .then(() => commands[argv.command](argv))
-    .catch((err) => {
-      if (err.status === 401) {
-        console.log(t('loginFirst'));
-        return;
+  const context: CommandContext = {
+    args: argv.args || [],
+    options: argv.options || {},
+  };
+
+  try {
+    await loadSession();
+    context.session = require('./api').getSession();
+
+    // Handle special modular commands first
+    if (argv.command === 'help') {
+      printUsage();
+    } else if (argv.command === 'list') {
+      moduleManager.listAll();
+    } else if (argv.command === 'workflow') {
+      const workflowName = argv.args[0];
+      if (!workflowName) {
+        console.error('Workflow name is required');
+        process.exit(1);
       }
-      console.error(err.stack);
-      process.exit(-1);
-    });
+      const result = await moduleManager.executeWorkflow(workflowName, context);
+      if (!result.success) {
+        console.error('Workflow execution failed:', result.error);
+        process.exit(1);
+      }
+      console.log('Workflow completed successfully:', result.data);
+    } 
+    // Try legacy commands first for backward compatibility
+    else if (legacyCommands[argv.command]) {
+      await legacyCommands[argv.command](argv);
+    }
+    // Fall back to modular commands
+    else {
+      const result = await moduleManager.executeCommand(argv.command, context);
+      if (!result.success) {
+        console.error('Command execution failed:', result.error);
+        process.exit(1);
+      }
+      console.log('Command completed successfully:', result.data);
+    }
+  } catch (err: any) {
+    if (err.status === 401) {
+      console.log(t('loginFirst'));
+      return;
+    }
+    console.error(err.stack);
+    process.exit(-1);
+  }
 }
 
+export { moduleManager };
+export { CLIProviderImpl } from './provider';
+export type {
+  CLIProvider,
+  CLIModule,
+  CommandDefinition,
+  CustomWorkflow,
+  WorkflowStep,
+} from './types';
+
 run();