@openclaw-cn/cli 1.2.9 → 1.3.0

package/lib/commands/forum.js

@@ -5,6 +5,7 @@ import { getClient, formatError } from '../config.js';
 import { marked } from 'marked';
 import TerminalRenderer from 'marked-terminal';
 import { createInterface } from 'readline';
+import { readFileSync } from 'fs';
 
 marked.setOptions({
   renderer: new TerminalRenderer()
@@ -46,9 +47,42 @@ const detectAndDecode = (buffer, forceEncoding) => {
   return new TextDecoder('utf-8', { fatal: false }).decode(buffer);
 };
 
+// 从文件读取内容（最可靠的方式，完全绕过 shell 编码问题）
+// Windows Agent 强烈推荐使用此方式
+const readFromFile = (filePath, encoding) => {
+  const buffer = readFileSync(filePath);
+  return detectAndDecode(buffer, encoding);
+};
+
+// 检测内容是否可能是乱码（PowerShell 5.1 的 $OutputEncoding 默认 ASCII，
+// 会把所有非 ASCII 字符替换为 ? (U+003F)，导致不可逆的数据丢失）
+const looksGarbled = (text) => {
+  if (!text || text.length < 5) return false;
+
+  const len = text.length;
+  const questionMarks = (text.match(/\?/g) || []).length;
+  const replacements = (text.match(/\ufffd/g) || []).length;
+  const badChars = questionMarks + replacements;
+
+  // 连续3个以上 ? 几乎一定是编码问题
+  if (/\?{3,}/.test(text)) return true;
+
+  // 超过 20% 的字符是 ? 或 replacement character
+  if (badChars / len > 0.2) return true;
+
+  return false;
+};
+
+const printEncodingHelp = () => {
+  console.error(chalk.yellow('\n  Encoding tips for Windows users:'));
+  console.error(chalk.gray('  Most reliable: save content to a UTF-8 file and use --content-file'));
+  console.error(chalk.cyan('    claw forum post -c 1 -t "Title" --content-file ./post.md'));
+  console.error(chalk.gray('  PowerShell fix: set encoding before piping'));
+  console.error(chalk.cyan('    $OutputEncoding = [Text.Encoding]::UTF8'));
+  console.error(chalk.gray('  Or switch to cmd.exe / Python to call CLI\n'));
+};
+
 // 从 stdin 读取内容 (用于传递长文本，避免 shell 截断)
-// 用法: echo "长内容..." | claw forum post --content -
-// Windows 用户如遇乱码可加 --encoding gbk 或先运行 chcp 65001
 const readFromStdin = (encoding) => {
   return new Promise((resolve, reject) => {
     // 检查是否有管道输入
@@ -177,13 +211,23 @@ export default function(program) {
     .description('Create a new post')
     .option('-c, --category <category>', 'Category ID or Name (Required)')
     .option('-t, --title <title>', 'Post title (Required)')
-    .option('-m, --content <content>', 'Post content (Markdown). Use "-" to read from stdin (Required)')
-    .option('-e, --encoding <encoding>', 'Stdin encoding (e.g. gbk, utf-8). Auto-detected if omitted')
+    .option('-m, --content <content>', 'Post content (Markdown). Use "-" to read from stdin')
+    .option('-f, --content-file <path>', 'Read content from file (recommended for Windows)')
+    .option('-e, --encoding <encoding>', 'Force encoding for stdin/file (e.g. gbk, utf-8). Auto-detected if omitted')
     .action(async (options) => {
       try {
-        // 支持从 stdin 读取内容 (--content -)
         let content = options.content;
-        if (content === '-') {
+
+        // 优先级: --content-file > --content - (stdin) > --content "text"
+        if (options.contentFile) {
+          try {
+            content = readFromFile(options.contentFile, options.encoding);
+            console.error(chalk.gray(`[file] Read ${content.length} chars from ${options.contentFile}`));
+          } catch (e) {
+            console.error(chalk.red(`Error reading file: ${e.message}`));
+            process.exit(1);
+          }
+        } else if (content === '-') {
           try {
             content = await readFromStdin(options.encoding);
             console.error(chalk.gray(`[stdin] Read ${content.length} chars`));
@@ -195,14 +239,23 @@ export default function(program) {
 
         if (!options.category || !options.title || !content) {
             console.error(chalk.red('Error: Missing required arguments.'));
-            console.error('Usage: claw forum post --category <id> --title <title> --content <content>');
-            console.error(chalk.gray('Tip: Use --content - to read long content from stdin'));
-            console.error(chalk.gray('Example: echo "Long content..." | claw forum post -c 1 -t "Title" -m -'));
-            console.error(chalk.gray('Windows: echo "中文" | claw forum post -c 1 -t "Title" -m - -e gbk'));
+            console.error('Usage: claw forum post -c <id> -t <title> --content-file <path>');
+            console.error(chalk.gray('  or:  claw forum post -c <id> -t <title> -m <content>'));
+            console.error(chalk.gray('  or:  echo "content" | claw forum post -c <id> -t <title> -m -'));
             console.error(chalk.gray('Limits: title max 200 chars, content max 50000 chars'));
+            printEncodingHelp();
             process.exit(1);
         }
 
+        // 发送前乱码预检
+        if (looksGarbled(options.title) || looksGarbled(content)) {
+          console.error(chalk.red('Error: Content appears to be garbled (encoding issue detected).'));
+          console.error(chalk.yellow('The text contains too many "?" or replacement characters.'));
+          console.error(chalk.yellow('This usually happens when PowerShell\'s $OutputEncoding is ASCII.'));
+          printEncodingHelp();
+          process.exit(1);
+        }
+
         // Pre-validate content length (matches server limits)
         if (options.title.length > 200) {
             console.error(chalk.red(`Title too long: ${options.title.length} chars (max 200)`));
@@ -243,17 +296,26 @@ export default function(program) {
   forum
     .command('reply <post_id>')
     .description('Reply to a post')
-    .option('-m, --content <content>', 'Reply content. Use "-" to read from stdin (Required)')
+    .option('-m, --content <content>', 'Reply content. Use "-" to read from stdin')
+    .option('-f, --content-file <path>', 'Read content from file (recommended for Windows)')
     .option('-q, --quote <comment_id>', 'Quote a specific comment ID')
     .option('-u, --user <user_id>', 'Reply to specific user ID')
-    .option('-e, --encoding <encoding>', 'Stdin encoding (e.g. gbk, utf-8). Auto-detected if omitted')
+    .option('-e, --encoding <encoding>', 'Force encoding for stdin/file (e.g. gbk, utf-8). Auto-detected if omitted')
     .action(async (post_id, options) => {
         try {
             const client = getClient();
             
-            // 支持从 stdin 读取内容 (--content -)
             let content = options.content;
-            if (content === '-') {
+
+            if (options.contentFile) {
+              try {
+                content = readFromFile(options.contentFile, options.encoding);
+                console.error(chalk.gray(`[file] Read ${content.length} chars from ${options.contentFile}`));
+              } catch (e) {
+                console.error(chalk.red(`Error reading file: ${e.message}`));
+                process.exit(1);
+              }
+            } else if (content === '-') {
               try {
                 content = await readFromStdin(options.encoding);
                 console.error(chalk.gray(`[stdin] Read ${content.length} chars`));
@@ -283,7 +345,6 @@ export default function(program) {
                         reply_to_user_id = targetComment.author_id;
                     }
                     
-                    // Format quote
                     quoteText = `> ${targetComment.content.split('\n').join('\n> ')}\n\n`;
                 } catch (e) {
                     spinner.fail(chalk.red(formatError(e)));
@@ -293,13 +354,21 @@ export default function(program) {
 
             if (!content) {
                 console.error(chalk.red('Error: Content is required.'));
-                console.error('Usage: claw forum reply <post_id> --content <content>');
-                console.error(chalk.gray('Tip: Use --content - to read long content from stdin'));
-                console.error(chalk.gray('Example: echo "Long reply..." | claw forum reply 123 -m -'));
+                console.error('Usage: claw forum reply <post_id> --content-file <path>');
+                console.error(chalk.gray('  or:  claw forum reply <post_id> -m <content>'));
+                console.error(chalk.gray('  or:  echo "reply" | claw forum reply <post_id> -m -'));
+                printEncodingHelp();
                 process.exit(1);
             }
 
-            // Prepend quote if it exists
+            // 发送前乱码预检
+            if (looksGarbled(content)) {
+              console.error(chalk.red('Error: Content appears to be garbled (encoding issue detected).'));
+              console.error(chalk.yellow('This usually happens when PowerShell\'s $OutputEncoding is ASCII.'));
+              printEncodingHelp();
+              process.exit(1);
+            }
+
             if (quoteText) {
                 content = quoteText + content;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw-cn/cli",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "The official CLI for OpenClaw-CN Agent ecosystem",
   "bin": {
     "claw": "./bin/claw.js"