修复help命令

BuildTime.txt

@@ -1 +1 @@
-2026-02-26 20:25:24
+2026-02-27 22:39:48

GitCommit.txt

@@ -1 +1 @@
-c1e0651
+b67e0e7

docs/cmleonos/docs/commands.md

@@ -498,6 +498,41 @@ lua <file>
 lua script.lua
 ```
 
+### lua2cla
+将 Lua 文件转换为 CMLeonOS Lua 应用格式（.cla）。
+
+**用法：**
+```bash
+lua2cla <lua_file>
+```
+
+**示例：**
+```bash
+lua2cla app.lua
+```
+
+**说明：**
+- 文件头为 `CMLeonOS_CLA`
+- 转换后的文件可以通过 `cla` 命令运行
+
+### cla
+运行 CMLeonOS Lua 应用格式（.cla）文件。
+
+**用法：**
+```bash
+cla <cla_file>
+```
+
+**示例：**
+```bash
+cla app.cla
+```
+
+**说明：**
+- 运行 .cla 格式的加密 Lua 应用
+- 自动解密并执行 Lua 代码
+- 文件头必须为 `CMLeonOS_CLA`
+
 ### com
 执行命令脚本文件。
 
@@ -636,7 +671,7 @@ app list              # 列出所有可用应用
 app install <name>    # 安装应用
 app uninstall <name>  # 卸载应用
 app installed         # 列出已安装应用
-app help             # 显示帮助信息
+app help              # 显示帮助信息
 ```
 
 **示例：**

shell/CommandList.cs

@@ -190,6 +190,12 @@ namespace CMLeonOS.shell
                 case "lua":
                     shell.ExecuteLuaScript(args);
                     break;
+                case "lua2cla":
+                    shell.ConvertLuaToCla(args);
+                    break;
+                case "cla":
+                    shell.RunClaFile(args);
+                    break;
                 case "testgui":
                     shell.ProcessTestGui();
                     break;

shell/Commands/Help/Help.cs

@@ -369,6 +369,18 @@ namespace CMLeonOS.Commands
                 Description = "Execute Lua script"
             },
             new CommandInfo
+            {
+                Command = "lua2cla",
+                Parameters = "<lua_file>",
+                Description = "Convert Lua to CLA format"
+            },
+            new CommandInfo
+            {
+                Command = "cla",
+                Parameters = "<cla_file>",
+                Description = "Run CLA application"
+            },
+            new CommandInfo
             {
                 Command = "version",
                 Parameters = "",
@@ -391,7 +403,7 @@ namespace CMLeonOS.Commands
             {
                 Command = "help",
                 Parameters = "<page>",
-                Description = "Show help page (1-3)",
+                Description = "Show help page (1-4)",
                 SubCommands = new[] { new SubCommandInfo { Command = "help all", Description = "Show all help pages" } }
             }
         };
@@ -471,24 +483,32 @@ namespace CMLeonOS.Commands
                 pageNumber = 1;
             }
             
-            int startIndex = (pageNumber - 1) * CommandsPerPage;
-            int endIndex = Math.Min(startIndex + CommandsPerPage, allCommands.Count);
-            
             Console.WriteLine("====================================");
             Console.WriteLine($"        Help - Page {pageNumber}/{totalPages}");
             Console.WriteLine("====================================");
             Console.WriteLine();
             
             int linesOnPage = 0;
-            for (int i = startIndex; i < endIndex; i++)
+            int currentLine = 0;
+            
+            for (int i = 0; i < allCommands.Count; i++)
             {
                 int cmdLines = GetCommandLinesCount(allCommands[i]);
-                if (linesOnPage + cmdLines > CommandsPerPage)
+                
+                if (currentLine + cmdLines <= (pageNumber - 1) * CommandsPerPage)
+                {
+                    currentLine += cmdLines;
+                    continue;
+                }
+                
+                if (linesOnPage >= CommandsPerPage)
                 {
                     break;
                 }
+                
                 DisplayCommand(allCommands[i]);
                 linesOnPage += cmdLines;
+                currentLine += cmdLines;
             }
             
             if (pageNumber < totalPages)

shell/Commands/Script/ClaCommand.cs

@@ -0,0 +1,82 @@
+using System;
+using System.IO;
+using System.Text;
+using UniLua;
+
+namespace CMLeonOS.Commands.Script
+{
+    public static class ClaCommand
+    {
+        private const string FILE_HEADER = "CMLeonOS_CLA";
+        private static readonly byte[] ENCRYPTION_KEY = { 0x55, 0xAA, 0x33, 0xCC, 0x77, 0x88, 0x11, 0x22, 0x44, 0x66, 0x99, 0xBB };
+
+        public static void RunClaFile(string args, CMLeonOS.FileSystem fileSystem, Shell shell, Action<string> showError, Action<string> showWarning)
+        {
+            if (string.IsNullOrEmpty(args))
+            {
+                showError(UsageGenerator.GenerateSimpleUsage("cla", "<cla_file>"));
+                showError("Example: cla app.cla");
+                return;
+            }
+
+            string claFilePath = fileSystem.GetFullPath(args);
+            
+            if (!File.Exists(claFilePath))
+            {
+                showError($"Error: CLA file not found: {args}");
+                return;
+            }
+
+            if (!claFilePath.EndsWith(".cla", StringComparison.OrdinalIgnoreCase))
+            {
+                showError("Error: Input file must have .cla extension");
+                return;
+            }
+
+            try
+            {
+                string luaContent = DecryptClaFile(claFilePath);
+                
+                if (string.IsNullOrEmpty(luaContent))
+                {
+                    showError("Error: Failed to decrypt CLA file or file is corrupted");
+                    return;
+                }
+
+                LuaCommand.ExecuteLuaCode(luaContent, fileSystem, shell, showError, showWarning);
+            }
+            catch (Exception ex)
+            {
+                showError($"Error running CLA file: {ex.Message}");
+            }
+        }
+
+        private static string DecryptClaFile(string claFilePath)
+        {
+            using (BinaryReader reader = new BinaryReader(File.OpenRead(claFilePath)))
+            {
+                byte[] headerBytes = reader.ReadBytes(FILE_HEADER.Length);
+                string header = Encoding.ASCII.GetString(headerBytes);
+                
+                if (header != FILE_HEADER)
+                {
+                    throw new Exception("Invalid CLA file format: Missing or incorrect header");
+                }
+
+                byte[] encryptedData = reader.ReadBytes((int)(reader.BaseStream.Length - reader.BaseStream.Position));
+                return DecryptData(encryptedData);
+            }
+        }
+
+        private static string DecryptData(byte[] data)
+        {
+            for (int i = 0; i < data.Length; i++)
+            {
+                int keyIndex = i % ENCRYPTION_KEY.Length;
+                data[i] = (byte)(data[i] ^ ENCRYPTION_KEY[keyIndex]);
+            }
+            
+            return Encoding.UTF8.GetString(data);
+        }
+    }
+}

shell/Commands/Script/Lua2ClaCommand.cs

@@ -0,0 +1,70 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace CMLeonOS.Commands.Script
+{
+    public static class Lua2ClaCommand
+    {
+        private const string FILE_HEADER = "CMLeonOS_CLA";
+        private static readonly byte[] ENCRYPTION_KEY = { 0x55, 0xAA, 0x33, 0xCC, 0x77, 0x88, 0x11, 0x22, 0x44, 0x66, 0x99, 0xBB };
+
+        public static void ConvertLuaToCla(string args, CMLeonOS.FileSystem fileSystem, Action<string> showError, Action<string> showSuccess)
+        {
+            if (string.IsNullOrEmpty(args))
+            {
+                showError(UsageGenerator.GenerateSimpleUsage("lua2cla", "<lua_file>"));
+                showError("Example: lua2cla app.lua");
+                return;
+            }
+
+            string luaFilePath = fileSystem.GetFullPath(args);
+            
+            if (!File.Exists(luaFilePath))
+            {
+                showError($"Error: Lua file not found: {args}");
+                return;
+            }
+
+            if (!luaFilePath.EndsWith(".lua", StringComparison.OrdinalIgnoreCase))
+            {
+                showError("Error: Input file must have .lua extension");
+                return;
+            }
+
+            try
+            {
+                string luaContent = File.ReadAllText(luaFilePath);
+                byte[] encryptedData = EncryptData(luaContent);
+                
+                string claFilePath = luaFilePath.Substring(0, luaFilePath.Length - 4) + ".cla";
+                
+                using (BinaryWriter writer = new BinaryWriter(File.Create(claFilePath)))
+                {
+                    writer.Write(Encoding.ASCII.GetBytes(FILE_HEADER));
+                    writer.Write(encryptedData);
+                }
+
+                showSuccess($"Successfully converted: {args} -> {Path.GetFileName(claFilePath)}");
+                Console.WriteLine($"Output file: {claFilePath}");
+            }
+            catch (Exception ex)
+            {
+                showError($"Error converting file: {ex.Message}");
+            }
+        }
+
+        private static byte[] EncryptData(string content)
+        {
+            byte[] data = Encoding.UTF8.GetBytes(content);
+            
+            for (int i = 0; i < data.Length; i++)
+            {
+                int keyIndex = i % ENCRYPTION_KEY.Length;
+                data[i] = (byte)(data[i] ^ ENCRYPTION_KEY[keyIndex]);
+            }
+            
+            return data;
+        }
+    }
+}

shell/Commands/Script/LuaCommand.cs

@@ -116,6 +116,60 @@ namespace CMLeonOS.Commands.Script
             }
         }
 
+        public static void ExecuteLuaCode(string code, CMLeonOS.FileSystem fileSystem, Shell shell, Action<string> showError, Action<string> showWarning)
+        {
+            if (string.IsNullOrWhiteSpace(code))
+            {
+                showWarning("Lua code is empty");
+                return;
+            }
+            
+            try
+            {
+                ILuaState lua = LuaAPI.NewState();
+                lua.L_OpenLibs();
+                
+                UniLua.ThreadStatus loadResult = lua.L_LoadString(code);
+                
+                if (loadResult == UniLua.ThreadStatus.LUA_OK)
+                {
+                    UniLua.ThreadStatus callResult = lua.PCall(0, 0, 0);
+                    
+                    if (callResult == UniLua.ThreadStatus.LUA_OK)
+                    {
+                    }
+                    else
+                    {
+                        string errorMsg = lua.ToString(-1);
+                        if (string.IsNullOrWhiteSpace(errorMsg))
+                        {
+                            showError($"Script execution error: Unknown error");
+                        }
+                        else
+                        {
+                            showError($"Script execution error: {errorMsg}");
+                        }
+                    }
+                }
+                else
+                {
+                    string errorMsg = lua.ToString(-1);
+                    if (string.IsNullOrWhiteSpace(errorMsg))
+                    {
+                        showError($"Script load error: Unknown error");
+                    }
+                    else
+                    {
+                        showError($"Script load error: {errorMsg}");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                showError($"Lua execution error: {ex.Message}");
+            }
+        }
+
         private static void EnterLuaShell(Action<string> showError)
         {
             Console.WriteLine("====================================");

shell/Shell.cs

@@ -407,8 +407,8 @@ namespace CMLeonOS
                 "rmdir", "cat", "version", "about", "head", "tail", "wc", "cp",
                 "mv", "rename", "touch", "find", "tree", "grep", "getdisk", "user",
                 "cpass", "hostname", "ipconfig", "setdns", "setgateway", "nslookup",
-                "ping", "wget", "ftp", "tcpserver", "tcpclient", "lua", "branswe",
-                "beep", "env", "whoami", "uptime", "alias",
+                "ping", "wget", "ftp", "tcpserver", "tcpclient", "lua", "lua2cla", "cla",
+                "branswe", "beep", "env", "whoami", "uptime", "alias",
                 "unalias", "base64", "testgui"
             };
         }
@@ -1502,6 +1502,16 @@ namespace CMLeonOS
             Commands.Script.LuaCommand.ExecuteLuaScript(args, fileSystem, this, ShowError, ShowWarning);
         }
 
+        public void ConvertLuaToCla(string args)
+        {
+            Commands.Script.Lua2ClaCommand.ConvertLuaToCla(args, fileSystem, ShowError, ShowSuccess);
+        }
+
+        public void RunClaFile(string args)
+        {
+            Commands.Script.ClaCommand.RunClaFile(args, fileSystem, this, ShowError, ShowWarning);
+        }
+
         public void ProcessTestGui()
         {
             Commands.TestGuiCommand.RunTestGui();