momo-ai 1.0.24 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "momo-ai",
-    "version": "1.0.24",
+    "version": "1.0.25",
     "description": "Rachel Momo ( OpenSpec )",
     "main": "src/momo.js",
     "bin": {

package/src/epic/history/ai.economy.impl.fn.execute.js

@@ -1,4 +1,4 @@
-const program = require('commander');
+const { program } = require('commander');
 const U = require('underscore');
 const co = require('co');
 const Immutable = require('immutable');

package/src/epic/lain.fn.execute.js

@@ -1,4 +1,4 @@
-const program = require('commander');
+const { program } = require('commander');
 const U = require('underscore');
 const co = require('co');
 const Immutable = require('immutable');
@@ -96,6 +96,8 @@ const executeBody = (commanders = [], Executor = {}) => {
                     cmd.option(`--${option.name}`, option.description);
                 })
             });
+            // 允许多余参数，避免 -e false / -d ./path 等被当作非法位置参数报错
+            cmd.allowExcessArguments(true);
             cmd.action(() => co(() => executor(commander.options)));
         });
     }

package/src/executor/executeDomain.js

@@ -1,8 +1,11 @@
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const fsAsync = require('fs').promises;
 const Ec = require('../epic');
 const { parseOptional } = require('../utils/momo-args');
+const { exists, gitClone } = require('../utils/momo-file-utils');
+const { SPEC_REPO_URL, LOCAL_CACHE_DIR, GITIGNORE_ENTRY } = require('../utils/momo-repo-spec');
 
 // 脚本路径（相对于项目根目录）
 const SCRIPT_PATH_DOMAIN = 'src/python/r2mo_proto_domain.py';
@@ -49,6 +52,58 @@ const _parsePomXml = (pomPath) => {
     }
 };
 
+/**
+ * 检查仓库是否是最新的
+ * @param {string} repoPath 仓库路径
+ * @returns {boolean}
+ */
+const _isRepositoryUpToDate = (repoPath) => {
+    try {
+        execSync(`cd "${repoPath}" && git fetch --quiet origin`, { stdio: 'ignore' });
+        const remoteCommit = execSync(`cd "${repoPath}" && git rev-parse origin/HEAD`, { encoding: 'utf8' }).trim();
+        const localCommit = execSync(`cd "${repoPath}" && git rev-parse HEAD`, { encoding: 'utf8' }).trim();
+        return remoteCommit === localCommit;
+    } catch {
+        return false;
+    }
+};
+
+/**
+ * 克隆或更新 .r2mo/repo 仓库（与 mmr0/mmr2 共享）
+ * @param {string} projectDir 项目根目录
+ * @returns {Promise<string>} 仓库路径
+ */
+const _cloneOrUpdateRepository = async (projectDir) => {
+    const repoPath = path.join(projectDir, LOCAL_CACHE_DIR);
+
+    if (exists(repoPath)) {
+        Ec.waiting('正在检查仓库状态...');
+        if (_isRepositoryUpToDate(repoPath)) {
+            Ec.info('✓ 仓库已是最新版本，无需更新');
+            return repoPath;
+        }
+        try {
+            Ec.waiting('正在更新仓库...');
+            execSync(`cd "${repoPath}" && git pull --quiet`, { stdio: 'ignore' });
+            Ec.info('✓ 仓库已更新');
+        } catch (error) {
+            Ec.warn('⚠ 更新失败，尝试重新克隆...');
+            await fsAsync.rm(repoPath, { recursive: true, force: true });
+            Ec.waiting('正在克隆仓库...');
+            await fsAsync.mkdir(path.dirname(repoPath), { recursive: true });
+            gitClone(SPEC_REPO_URL, repoPath, { shallow: true });
+            Ec.info('✓ 仓库已克隆');
+        }
+    } else {
+        Ec.waiting('正在克隆仓库...');
+        await fsAsync.mkdir(path.dirname(repoPath), { recursive: true });
+        gitClone(SPEC_REPO_URL, repoPath, { shallow: true });
+        Ec.info('✓ 仓库已克隆');
+    }
+
+    return repoPath;
+};
+
 /**
  * 验证 Maven 项目结构
  * @param {string} targetDir 目标目录
@@ -225,6 +280,29 @@ module.exports = async (options) => {
             Ec.info(`✓ Maven 项目验证通过`);
             Ec.info(`  项目 ID: ${validation.artifactId.cyan}`);
             Ec.info(`  找到模块: ${validation.artifactId}-domain`.green);
+
+            // 与 mmr0/mmr2 共享 .r2mo/repo：确保仓库存在并可选更新
+            Ec.waiting('正在检查 .r2mo/repo 仓库...');
+            const gitAvailable = await _isCommandAvailable('git');
+            if (!gitAvailable) {
+                Ec.warn('⚠ 未找到 git 命令，将跳过仓库拉取；若本地无 .r2mo/repo，文档注释可能缺失');
+            } else {
+                const gitignorePath = path.join(targetDir, '.gitignore');
+                if (exists(gitignorePath)) {
+                    const content = fs.readFileSync(gitignorePath, 'utf8');
+                    const lines = content.split('\n');
+                    const hasEntry = lines.some(line => line.trim() === GITIGNORE_ENTRY);
+                    if (!hasEntry) {
+                        const newContent = content.endsWith('\n') || content === ''
+                            ? content + GITIGNORE_ENTRY + '\n'
+                            : content + '\n' + GITIGNORE_ENTRY + '\n';
+                        fs.writeFileSync(gitignorePath, newContent);
+                    }
+                } else {
+                    fs.writeFileSync(gitignorePath, GITIGNORE_ENTRY + '\n');
+                }
+                await _cloneOrUpdateRepository(targetDir);
+            }
         } else {
             // Database 模式：检查是否有 flyway 目录
             Ec.waiting('正在检查 Flyway SQL 文件...');

package/src/executor/executeMmr0.js

@@ -5,12 +5,9 @@ const fsAsync = require('fs').promises;
 const { execSync } = require('child_process');
 const { parseFile, exists, gitClone } = require('../utils/momo-file-utils');
 const { selectSingle, selectMultiple } = require('../utils/momo-menu');
+const { SPEC_REPO_URL, LOCAL_CACHE_DIR, GITIGNORE_ENTRY } = require('../utils/momo-repo-spec');
 require('colors');
 
-// 仓库配置
-const SPEC_REPO_URL = 'https://gitee.com/silentbalanceyh/r2mo-spec.git';
-const LOCAL_CACHE_DIR = '.r2mo/repo/r2mo-spec';
-
 /**
  * 检查命令是否可用
  */
@@ -280,21 +277,20 @@ module.exports = async (options) => {
             process.exit(1);
         }
         
-        // 2. 确保 .r2mo/repo 在 .gitignore 中
+        // 2. 确保 .r2mo/repo 在 .gitignore 中（与 domain/mmr2 共享目录一致）
         const gitignorePath = path.join(projectDir, '.gitignore');
-        const ignoreEntry = '.r2mo/repo';
         if (exists(gitignorePath)) {
             const content = fs.readFileSync(gitignorePath, 'utf8');
             const lines = content.split('\n');
-            const hasEntry = lines.some(line => line.trim() === ignoreEntry);
+            const hasEntry = lines.some(line => line.trim() === GITIGNORE_ENTRY);
             if (!hasEntry) {
-                const newContent = content.endsWith('\n') || content === '' 
-                    ? content + ignoreEntry + '\n'
-                    : content + '\n' + ignoreEntry + '\n';
+                const newContent = content.endsWith('\n') || content === ''
+                    ? content + GITIGNORE_ENTRY + '\n'
+                    : content + '\n' + GITIGNORE_ENTRY + '\n';
                 fs.writeFileSync(gitignorePath, newContent);
             }
         } else {
-            fs.writeFileSync(gitignorePath, ignoreEntry + '\n');
+            fs.writeFileSync(gitignorePath, GITIGNORE_ENTRY + '\n');
         }
         
         // 3. 克隆或更新仓库

package/src/executor/executeMmr2.js

@@ -5,12 +5,9 @@ const fsAsync = require('fs').promises;
 const { execSync } = require('child_process');
 const { parseFile, exists, gitClone, scanDir } = require('../utils/momo-file-utils');
 const { selectSingle, selectMultiple } = require('../utils/momo-menu');
+const { SPEC_REPO_URL, LOCAL_CACHE_DIR, GITIGNORE_ENTRY } = require('../utils/momo-repo-spec');
 require('colors');
 
-// 仓库配置
-const SPEC_REPO_URL = 'https://gitee.com/silentbalanceyh/r2mo-spec.git';
-const LOCAL_CACHE_DIR = '.r2mo/repo/r2mo-spec';
-
 // BaseEntity 中已存在的字段（不需要重复生成）
 // 注意：需要同时检查下划线命名（SQL 格式）和驼峰命名（Java 格式）
 const BASE_ENTITY_FIELDS = new Set([
@@ -660,21 +657,20 @@ module.exports = async (options) => {
             process.exit(1);
         }
         
-        // 2. 确保 .r2mo/repo 在 .gitignore 中
+        // 2. 确保 .r2mo/repo 在 .gitignore 中（与 domain/mmr0 共享目录一致）
         const gitignorePath = path.join(projectDir, '.gitignore');
-        const ignoreEntry = '.r2mo/repo';
         if (exists(gitignorePath)) {
             const content = fs.readFileSync(gitignorePath, 'utf8');
             const lines = content.split('\n');
-            const hasEntry = lines.some(line => line.trim() === ignoreEntry);
+            const hasEntry = lines.some(line => line.trim() === GITIGNORE_ENTRY);
             if (!hasEntry) {
-                const newContent = content.endsWith('\n') || content === '' 
-                    ? content + ignoreEntry + '\n'
-                    : content + '\n' + ignoreEntry + '\n';
+                const newContent = content.endsWith('\n') || content === ''
+                    ? content + GITIGNORE_ENTRY + '\n'
+                    : content + '\n' + GITIGNORE_ENTRY + '\n';
                 fs.writeFileSync(gitignorePath, newContent);
             }
         } else {
-            fs.writeFileSync(gitignorePath, ignoreEntry + '\n');
+            fs.writeFileSync(gitignorePath, GITIGNORE_ENTRY + '\n');
         }
         
         // 3. 克隆或更新仓库

package/src/python/r2mo_proto_database.py

@@ -2,20 +2,19 @@
 # -*- coding: utf-8 -*-
 
 """
-R2MO SQL to Protobuf Converter (V2 - Enhanced Java Property & Constraints)
+R2MO SQL to Protobuf Converter (V4 - Shared .r2mo/repo & Note Properties)
 从 Flyway SQL 脚本生成 Protobuf 文件
 更新内容：
-1. 【修复】中文注释提取 BUG：正确解析「javaProperty」- 描述格式
-2. 【强化】Java 属性名保留：从 COMMENT 的「」中提取并附加到注释 [Java:xxx]
-3. 【强化】约束规范化：必填、唯一、主键、默认值、最大长度等统一格式
-4. 【强化】仅扫描 src/main/resources 下的 flyway/MYSQL（排除 target/classes）
-5. 【优化】逐行解析，支持多行注释过滤和行尾 -- 补充描述
+1. 【共享】与 momo mmr0/mmr2/domain 共用 .r2mo/repo 仓库；按 message 名称检索 XApp.md
+2. 【注释】将文档头部的笔记属性（front-matter）完整追加到 message 的注释中（与 domain 一致）
+3. 【保留】中文注释「javaProperty」- 描述、[Java:xxx]、约束规范化等 V3 特性
 """
 
 import os
 import re
 import sys
 import argparse
+import yaml
 
 # ================= 1. 配置与映射表 =================
 
@@ -55,6 +54,49 @@ def extract_sql_type(type_def):
     match = re.match(r'([A-Z]+)', type_def.upper())
     return match.group(1) if match else 'VARCHAR'
 
+
+def _find_repo_doc(message_name, project_root):
+    """
+    从 .r2mo/repo/r2mo-spec 仓库中查找 {message_name}.md 文档。
+    返回: (front-matter dict, 命中的文件名) 或 (None, None)
+    """
+    repo_path = os.path.join(project_root, '.r2mo', 'repo', 'r2mo-spec')
+    if not os.path.isdir(repo_path):
+        return None, None
+    for root, dirs, files in os.walk(repo_path):
+        for f in files:
+            if f.lower() == f'{message_name.lower()}.md':
+                md_file = os.path.join(root, f)
+                try:
+                    with open(md_file, 'r', encoding='utf-8') as fp:
+                        content = fp.read()
+                    m = re.match(r'^---\s*\n(.*?)\n---\s*\n', content, re.DOTALL)
+                    if m:
+                        yaml_text = m.group(1)
+                        attrs = yaml.safe_load(yaml_text)
+                        if isinstance(attrs, dict):
+                            return attrs, os.path.basename(md_file)
+                except Exception:
+                    pass
+    return None, None
+
+
+def _build_message_comment(attrs):
+    """
+    将文档头部的所有 front-matter 属性解析到注释中，每个属性一行，格式为 key: value。
+    与 r2mo_proto_domain 保持一致。
+    """
+    if not attrs or not isinstance(attrs, dict):
+        return []
+    lines = []
+    for k, v in attrs.items():
+        if v is None or v == '':
+            continue
+        if isinstance(v, (list, dict)):
+            v = str(v)[:80]
+        lines.append(f"{k}: {v}")
+    return lines
+
 def extract_comment_parts(comment):
     """
     从 COMMENT 提取：Java属性名（「xxx」）、中文描述（- 后面的内容）
@@ -203,26 +245,37 @@ def parse_create_table(sql_content):
         'fields': fields
     }
 
-def generate_proto_from_table(table_info, java_package="domain"):
+def generate_proto_from_table(table_info, java_package="domain", project_root=None):
     """
     从表信息生成 Proto 文件内容。
-    java_package: 与 jOOQ 生成的 domain pojos 包一致，用于 option java_package 和 Generated from 注释。
+    java_package: 与 jOOQ 生成的 domain pojos 包一致。
+    project_root: 项目根目录，用于在 .r2mo/repo 中检索 {MessageName}.md 并追加笔记属性到注释；默认 getcwd()。
     """
     table_name = table_info['table_name']
     fields = table_info['fields']
     message_name = snake_to_pascal(table_name)
-    
+    root = project_root if project_root is not None else os.getcwd()
+
     lines = [
         'syntax = "proto3";',
         'package domain;',
         '',
         f'// Generated from {java_package}.{message_name}',
+    ]
+    # 从 .r2mo/repo 检索 {MessageName}.md，将文档头部的笔记属性追加到 message 注释（与 domain 一致）
+    doc_attrs, found_md = _find_repo_doc(message_name, root)
+    if doc_attrs and found_md:
+        for comment_line in _build_message_comment(doc_attrs):
+            if comment_line:
+                lines.append(f'// {comment_line}')
+        print(f"   ✓ {message_name}: 已从 {found_md} 追加笔记属性到注释")
+    lines.extend([
         f'option java_package = "{java_package}";',
         'option java_multiple_files = true;',
         '',
         f'message {message_name} {{'
-    ]
-    
+    ])
+
     for idx, field in enumerate(fields, 1):
         comment_suffix = f' // {field["comment"]}' if field["comment"] else ''
         lines.append(f'  {field["type"]} {field["name"]} = {idx};{comment_suffix}')
@@ -300,7 +353,7 @@ def main():
         sys.exit(1)
     
     # 查找所有 flyway 目录
-    print(f"🚀 R2MO Proto Generator (V2 - Flyway SQL Mode)")
+    print(f"🚀 R2MO Proto Generator (V4 - Flyway SQL Mode, .r2mo/repo docs)")
     print(f"   Scanning: {input_dir}")
     print("-" * 40)
     

package/src/python/r2mo_proto_domain.py

@@ -2,14 +2,13 @@
 # -*- coding: utf-8 -*-
 
 """
-R2MO Java Domain to Protobuf Converter (V9 - Enhanced Java Property & Constraints)
+R2MO Java Domain to Protobuf Converter (V11 - Shared .r2mo/repo & Note Properties)
 从 Java Domain 实体类生成 Protobuf 文件
 更新内容：
-1. 【强化】Java 属性名追加到注释：proto 字段用下划线，注释中保留原始驼峰名 [Java:xxx]
-2. 【强化】约束格式规范化：长度、必填、数值范围等统一为"中文:值"格式
-3. 【强化】更全面的注解支持：@Pattern、@DecimalMax/Min、@ApiModelProperty 等
-4. 【强化】注释提取优先级：@Schema > JavaDoc > 行内注释
-5. 保留所有 V8 特性（jOOQ Getter 提取、BaseEntity 补全、自动导入）
+1. 【共享】与 momo mmr0/mmr2 共用 .r2mo/repo 仓库；momo domain 执行前会克隆/更新该仓库
+2. 【检索】在仓库中按 message 名称（如 XApp）查找对应 XApp.md 文件
+3. 【注释】将文档头部的笔记属性（front-matter）完整追加到 message 的注释中（首行主描述，其余 key: value）
+4. 【保留】Java 属性名 [Java:xxx]、约束规范化、V9/V10 特性
 """
 
 import os
@@ -17,6 +16,7 @@ import re
 import sys
 import argparse
 import xml.etree.ElementTree as ET
+import yaml
 
 # ================= 1. 配置与映射表 =================
 
@@ -73,6 +73,70 @@ def get_package_name(content):
     match = re.search(r'package\s+([\w\.]+);', content)
     return match.group(1) if match else "domain"
 
+
+def _read_md_front_matter(md_path):
+    """只提取 .md 文件头部 front-matter，返回 (attrs dict, 文件名) 或 (None, None)。"""
+    if not os.path.isfile(md_path):
+        return None, None
+    try:
+        with open(md_path, 'r', encoding='utf-8') as fp:
+            content = fp.read()
+        m = re.match(r'^---\s*\n(.*?)\n---\s*\n', content, re.DOTALL)
+        if m:
+            attrs = yaml.safe_load(m.group(1))
+            if isinstance(attrs, dict):
+                return attrs, os.path.basename(md_path)
+    except Exception:
+        pass
+    return None, None
+
+
+def _find_doc_for_java(message_name, java_file_path, project_root):
+    """
+    查找与 Java 类对应的 .md 文档，只提取头部 front-matter。
+    1）优先：与 Java 同目录的同名 .md（如 Order.java 同目录的 Order.md）
+    2）回退：.r2mo/repo/r2mo-spec 中 {message_name}.md 或去掉 Entity 的 {name}.md
+    返回: (front-matter dict, 命中的文件名) 或 (None, None)
+    """
+    # 1）与 Java 同目录的 {ClassName}.md
+    if java_file_path and os.path.isfile(java_file_path):
+        same_dir = os.path.dirname(java_file_path)
+        same_dir_md = os.path.join(same_dir, f'{message_name}.md')
+        attrs, found = _read_md_front_matter(same_dir_md)
+        if attrs and found:
+            return attrs, found
+    # 2）.r2mo/repo/r2mo-spec
+    repo_path = os.path.join(project_root, '.r2mo', 'repo', 'r2mo-spec')
+    if not os.path.isdir(repo_path):
+        return None, None
+    candidates = [f'{message_name}.md']
+    if message_name.endswith('Entity'):
+        candidates.append(f'{message_name[:-6]}.md')
+    for root, dirs, files in os.walk(repo_path):
+        for f in files:
+            if f.lower() in [c.lower() for c in candidates]:
+                md_file = os.path.join(root, f)
+                attrs, _ = _read_md_front_matter(md_file)
+                if attrs:
+                    return attrs, os.path.basename(md_file)
+    return None, None
+
+
+def _build_message_comment(attrs):
+    """
+    将文档头部的所有 front-matter 属性解析到注释中，每个属性一行，格式为 key: value。
+    """
+    if not attrs or not isinstance(attrs, dict):
+        return []
+    lines = []
+    for k, v in attrs.items():
+        if v is None or v == '':
+            continue
+        if isinstance(v, (list, dict)):
+            v = str(v)[:80]
+        lines.append(f"{k}: {v}")
+    return lines
+
 def extract_constraints(lines):
     """
     从注解中提取约束信息（规范化格式），包括：
@@ -345,13 +409,12 @@ def _extract_fields_from_getters(content):
     
     return fields
 
-def generate_proto(name, pkg, content, ftype):
+def generate_proto(name, pkg, content, ftype, java_file_path=None):
     lines = [
         'syntax = "proto3";',
         'package domain;', ''
     ]
 
-    # 只有 class 类型才需要 import
     imports = set()
     fields = []
     enum_items = []
@@ -360,11 +423,9 @@ def generate_proto(name, pkg, content, ftype):
         enum_items = parse_java_enum(content, name)
         if not enum_items: return None
     else:
-        # 解析字段并获取依赖
         fields, imports = parse_java_class(content)
         if not fields: return None
 
-        # 生成 import 语句
         self_import = f"{camel_to_snake(name)}.proto"
         if self_import in imports:
             imports.remove(self_import)
@@ -373,9 +434,19 @@ def generate_proto(name, pkg, content, ftype):
             sorted_imports = sorted(list(imports))
             for imp in sorted_imports:
                 lines.append(f'import "{imp}";')
-            lines.append('') # 空行分隔
+            lines.append('')
 
     lines.append(f'// Generated from {pkg}.{name}')
+    
+    # 先查与 Java 同目录的同名 .md，再查 .r2mo/repo；只提取头部 front-matter，找到才打印
+    project_root = os.getcwd()
+    doc_attrs, found_md = _find_doc_for_java(name, java_file_path, project_root)
+    if doc_attrs and found_md:
+        for comment_line in _build_message_comment(doc_attrs):
+            if comment_line:
+                lines.append(f'// {comment_line}')
+        print(f"   ✓ {name}: 已从 {found_md} 追加笔记属性到注释")
+    
     lines.append(f'option java_package = "{pkg}";')
     lines.append('option java_multiple_files = true;')
     lines.append('')
@@ -387,7 +458,6 @@ def generate_proto(name, pkg, content, ftype):
     else:
         lines.append(f'message {name} {{')
         for idx, f in enumerate(fields, 1):
-            # BaseEntity 等字段用 java_name 拼注释；其余字段 comment 已含 [Java:xxx]
             comment_str = f.get("comment") or ""
             if f.get("java_name"):
                 comment_str = f"[Java:{f['java_name']}] {comment_str}".strip() if comment_str else f"[Java:{f['java_name']}]"
@@ -442,7 +512,7 @@ def main():
                         pkg = get_package_name(content)
                         ftype = 'enum' if is_enum else 'class'
 
-                        proto = generate_proto(name, pkg, content, ftype)
+                        proto = generate_proto(name, pkg, content, ftype, java_file_path=path)
                         if proto:
                             out_name = f"{camel_to_snake(name)}.proto"
                             with open(os.path.join(output_dir, out_name), 'w') as fh: fh.write(proto)

package/src/utils/momo-repo-spec.js

@@ -0,0 +1,18 @@
+/**
+ * @module momo-repo-spec
+ * 与 momo domain / momo mmr0 / momo mmr2 共享的 r2mo-spec 仓库配置。
+ * 仓库名为 r2mo-spec，直接从 .r2mo/repo/r2mo-spec 加载，不做 rename。
+ */
+const REPO_SPEC_NAME = 'r2mo-spec';
+const SPEC_REPO_URL = 'https://gitee.com/silentbalanceyh/r2mo-spec.git';
+/** 本地缓存目录：.r2mo/repo/{仓库名}，与仓库名一致 */
+const LOCAL_CACHE_DIR = `.r2mo/repo/${REPO_SPEC_NAME}`;
+/** .gitignore 中写入的条目（共享目录根） */
+const GITIGNORE_ENTRY = '.r2mo/repo';
+
+module.exports = {
+    REPO_SPEC_NAME,
+    SPEC_REPO_URL,
+    LOCAL_CACHE_DIR,
+    GITIGNORE_ENTRY
+};