zero-ai 1.0.71 → 1.0.73

package/package.json

@@ -1,53 +1,54 @@
 {
-    "name": "zero-ai",
-    "version": "1.0.71",
-    "description": "Zero Ecotope AI",
-    "main": "src/ai.js",
-    "bin": {
-        "ai": "./src/ai.js"
-    },
-    "scripts": {
-        "test": "src/index.test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/silentbalanceyh/vertx-ai.git"
-    },
-    "keywords": [
-        "Zero",
-        "UI"
-    ],
-    "author": "Lang",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/silentbalanceyh/vertx-ai/issues"
-    },
-    "dependencies": {
-        "bluebird": "^3.7.2",
-        "child_process": "^1.0.2",
-        "clipboard-copy": "^4.0.1",
-        "co": "^4.6.0",
-        "colors": "^1.4.0",
-        "commander": "^11.0.0",
-        "crypto-js": "^4.1.1",
-        "dox": "^1.0.0",
-        "ejs": "^3.1.10",
-        "exceljs": "^4.3.0",
-        "extend": "^3.0.2",
-        "handlebars": "^4.7.7",
-        "i": "^0.3.7",
-        "immutable": "^4.3.0",
-        "inquirer": "^8.2.5",
-        "linebyline": "^1.3.0",
-        "lodash": "^4.17.21",
-        "mkdirp": "^3.0.1",
-        "mockjs": "^1.1.0",
-        "random-js": "^2.1.0",
-        "superagent": "^8.0.9",
-        "taffydb": "^2.7.3",
-        "underscore": "^1.13.6",
-        "uuid": "^9.0.0"
-    },
-    "homepage": "http://www.vertxai.cn",
-    "github": "https://github.com/silentbalanceyh/vertx-ai.git"
+  "name": "zero-ai",
+  "version": "1.0.73",
+  "description": "Zero Ecotope AI",
+  "main": "src/ai.js",
+  "bin": {
+    "ai": "./src/ai.js"
+  },
+  "scripts": {
+    "test": "src/index.test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/silentbalanceyh/vertx-ai.git"
+  },
+  "keywords": [
+    "Zero",
+    "UI"
+  ],
+  "author": "Lang",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/silentbalanceyh/vertx-ai/issues"
+  },
+  "dependencies": {
+    "bluebird": "^3.7.2",
+    "child_process": "^1.0.2",
+    "clipboard-copy": "^4.0.1",
+    "co": "^4.6.0",
+    "colors": "^1.4.0",
+    "commander": "^11.0.0",
+    "crypto-js": "^4.1.1",
+    "dox": "^1.0.0",
+    "ejs": "^3.1.10",
+    "exceljs": "^4.3.0",
+    "extend": "^3.0.2",
+    "handlebars": "^4.7.7",
+    "i": "^0.3.7",
+    "immutable": "^4.3.0",
+    "inquirer": "^8.2.5",
+    "linebyline": "^1.3.0",
+    "lodash": "^4.17.21",
+    "mkdirp": "^3.0.1",
+    "mockjs": "^1.1.0",
+    "random-js": "^2.1.0",
+    "superagent": "^8.0.9",
+    "taffydb": "^2.7.3",
+    "underscore": "^1.13.6",
+    "uuid": "^9.0.0",
+    "mysql2": "^3.11.0"
+  },
+  "homepage": "http://www.vertxai.cn",
+  "github": "https://github.com/silentbalanceyh/vertx-ai.git"
 }

package/src/commander/perm.json

@@ -0,0 +1,8 @@
+{
+    "executor": "executePerm",
+    "description": "按参考角色复制权限到指定角色（-r 为角色 NAME 或 CODE）",
+    "command": "perm",
+    "options": [
+        {"name": "role", "alias": "r", "description": "角色名或角色 code，对应 S_ROLE.NAME 或 S_ROLE.CODE", "required": true}
+    ]
+}

package/src/commander-ai/fn.perm.js

@@ -0,0 +1,188 @@
+const Ec = require("../epic");
+const fs = require("fs");
+const path = require("path");
+const Ut = require("../commander-shared");
+
+const REF_ROLE_ID = "e501b47a-c08b-4c83-b12b-95ad82873e96";
+const REQUIRED_ENV_KEYS = ["Z_DB_TYPE", "Z_DBS_INSTANCE", "Z_DB_APP_USER", "Z_DB_APP_PASS"];
+
+/**
+ * 从 pom.xml 读取当前项目的 artifactId（排除 <parent> 内的）
+ */
+function getArtifactIdFromPom(cwd) {
+    const pomPath = path.resolve(cwd, "pom.xml");
+    if (!fs.existsSync(pomPath)) return null;
+    let content = fs.readFileSync(pomPath, "utf-8");
+    content = content.replace(/<parent>[\s\S]*?<\/parent>/i, "");
+    const m = content.match(/<artifactId>([^<]+)<\/artifactId>/);
+    return m ? m[1].trim() : null;
+}
+
+/**
+ * 解析 app.env：export KEY="value" 或 export KEY='value'，写入 process.env
+ */
+function loadAppEnv(filePath) {
+    if (!fs.existsSync(filePath)) return false;
+    const content = fs.readFileSync(filePath, "utf-8");
+    const lines = content.split(/\r?\n/);
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (trimmed.startsWith("#") || !trimmed.startsWith("export ")) continue;
+        const match = trimmed.match(/^export\s+([A-Za-z0-9_]+)=["']?([^"'\n]*)["']?/);
+        if (match) process.env[match[1]] = match[2].trim();
+    }
+    return true;
+}
+
+/**
+ * 解析 .r2mo/app.env 路径：
+ * ONE：当前目录 .r2mo/app.env
+ * DPA：{id}-api/.r2mo/app.env，id 来自 pom.xml 或当前目录名
+ * 支持两种布局：api 在项目内 (cwd/{id}-api) 或 与项目并列 (cwd/../{id}-api)
+ */
+function resolveAppEnvPath(cwd) {
+    const primary = path.resolve(cwd, ".r2mo", "app.env");
+    if (fs.existsSync(primary)) return primary;
+
+    let artifactId = getArtifactIdFromPom(cwd);
+    if (!artifactId) {
+        const base = path.basename(cwd);
+        if (base && base !== ".") artifactId = base;
+    }
+    if (artifactId) {
+        const apiDir = `${artifactId}-api`;
+        const nested = path.resolve(cwd, apiDir, ".r2mo", "app.env");
+        if (fs.existsSync(nested)) return nested;
+        const sibling = path.resolve(cwd, "..", apiDir, ".r2mo", "app.env");
+        if (fs.existsSync(sibling)) return sibling;
+    }
+    return null;
+}
+
+module.exports = async (options) => {
+    try {
+        const parsed = Ut.parseArgument(options);
+        const roleInput = parsed.role;
+        if (!roleInput || !String(roleInput).trim()) {
+            Ec.error("请使用 -r 指定角色（NAME 或 CODE）");
+            Ec.info("示例：ai perm -r 管理员  或  ai perm -r ADMIN");
+            process.exit(1);
+        }
+
+        Ec.execute(`ai perm：目标角色（-r）= ${roleInput}`);
+
+        const cwd = process.cwd();
+        const appEnvPath = resolveAppEnvPath(cwd);
+        if (!appEnvPath) {
+            const tried = [path.resolve(cwd, ".r2mo", "app.env")];
+            const id = getArtifactIdFromPom(cwd) || path.basename(cwd);
+            if (id) {
+                tried.push(path.resolve(cwd, `${id}-api`, ".r2mo", "app.env"));
+                tried.push(path.resolve(cwd, "..", `${id}-api`, ".r2mo", "app.env"));
+            }
+            Ec.error(".r2mo/app.env 不存在；DPA 下也未找到 {id}-api/.r2mo/app.env");
+            Ec.info("已尝试路径（id=" + (id || "未解析") + "）：");
+            tried.forEach((p) => Ec.info(`  - ${p}`));
+            Ec.info("请确认：1) 在项目根执行  2) 存在 .r2mo/app.env 或 {id}-api/.r2mo/app.env（嵌套或与项目并列）");
+            process.exit(1);
+        }
+        loadAppEnv(appEnvPath);
+        Ec.info(`已加载环境变量：${appEnvPath}`);
+
+        const missing = REQUIRED_ENV_KEYS.filter((k) => !process.env[k] || !String(process.env[k]).trim());
+        if (missing.length > 0) {
+            Ec.error(`环境变量不齐，缺少：${missing.join(", ")}，已跳过并给出警告。`);
+            Ec.info("请在 .r2mo/app.env 中配置：Z_DB_TYPE、Z_DBS_INSTANCE、Z_DB_APP_USER、Z_DB_APP_PASS");
+            process.exit(1);
+        }
+
+        const mysql = require("mysql2/promise");
+        const dbConfig = {
+            host: process.env.Z_DB_HOST || "localhost",
+            port: parseInt(process.env.Z_DB_PORT || "3306", 10),
+            user: process.env.Z_DB_APP_USER,
+            password: process.env.Z_DB_APP_PASS,
+            database: process.env.Z_DBS_INSTANCE
+        };
+        Ec.execute(`连接数据库：${dbConfig.database} @ ${dbConfig.host}:${dbConfig.port}（用户 ${dbConfig.user}）`);
+
+        const conn = await mysql.createConnection(dbConfig);
+        try {
+            Ec.execute("查询 S_ROLE 表：按 NAME 或 CODE 匹配角色…");
+            const [rowsRole] = await conn.execute(
+                "SELECT ID, NAME, CODE FROM S_ROLE WHERE NAME = ? OR CODE = ? LIMIT 1",
+                [roleInput.trim(), roleInput.trim()]
+            );
+            if (!rowsRole || rowsRole.length === 0) {
+                Ec.error(`查询不到角色：${roleInput}`);
+                Ec.info("请确认 S_ROLE 表中存在该 NAME 或 CODE；可在库中执行：SELECT ID, NAME, CODE FROM S_ROLE; 查看已有角色。");
+                process.exit(1);
+            }
+            const targetRoleId = rowsRole[0].ID;
+            Ec.info(`已找到角色：ID=${targetRoleId}，NAME=${rowsRole[0].NAME || "-"}，CODE=${rowsRole[0].CODE || "-"}`);
+
+            Ec.execute(`查询参考角色权限：R_ROLE_PERM，ROLE_ID = ${REF_ROLE_ID}`);
+            const [refPerms] = await conn.execute(
+                "SELECT * FROM R_ROLE_PERM WHERE ROLE_ID = ?",
+                [REF_ROLE_ID]
+            );
+            if (!refPerms || refPerms.length === 0) {
+                Ec.info(`参考角色 ${REF_ROLE_ID} 在 R_ROLE_PERM 中无记录，无需复制。`);
+                return;
+            }
+            Ec.info(`参考角色共 ${refPerms.length} 条权限，开始复制到角色 ${targetRoleId}…`);
+
+            const columns = Object.keys(refPerms[0]);
+            const placeholders = columns.map(() => "?").join(", ");
+            const colList = columns.map((c) => "`" + c + "`").join(", ");
+            let inserted = 0;
+            let skipped = 0;
+
+            for (const row of refPerms) {
+                const values = columns.map((col) => (col === "ROLE_ID" ? targetRoleId : row[col]));
+                try {
+                    const [result] = await conn.execute(
+                        `INSERT IGNORE INTO R_ROLE_PERM (${colList}) VALUES (${placeholders})`,
+                        values
+                    );
+                    if (result && result.affectedRows > 0) inserted++;
+                    else skipped++;
+                } catch (err) {
+                    if (err.code === "ER_DUP_ENTRY" || err.errno === 1062) skipped++;
+                    else throw err;
+                }
+            }
+
+            // Report：详细汇总
+            const sep = "----------------------------------------";
+            Ec.info(sep);
+            Ec.info("  ai perm 执行报告");
+            Ec.info(sep);
+            Ec.info("  ⚙️  环境");
+            Ec.info(`    app.env     : ${appEnvPath}`);
+            Ec.info(`    数据库类型  : ${process.env.Z_DB_TYPE || "-"}`);
+            Ec.info(`    数据库实例  : ${dbConfig.database}`);
+            Ec.info(`    连接地址    : ${dbConfig.host}:${dbConfig.port}`);
+            Ec.info(`    数据库用户  : ${dbConfig.user}`);
+            Ec.info("  👤  目标角色（-r 指定）");
+            Ec.info(`    输入        : ${roleInput}`);
+            Ec.info(`    ID         : ${targetRoleId}`);
+            Ec.info(`    NAME       : ${rowsRole[0].NAME ?? "-"}`);
+            Ec.info(`    CODE       : ${rowsRole[0].CODE ?? "-"}`);
+            Ec.info("  📋  参考角色（复制来源）");
+            Ec.info(`    ROLE_ID    : ${REF_ROLE_ID}`);
+            Ec.info(`    R_ROLE_PERM 条数 : ${refPerms.length}`);
+            Ec.info("  ✅  权限复制结果");
+            Ec.info(`    本次插入   : ${inserted} 条`);
+            Ec.info(`    重复跳过   : ${skipped} 条`);
+            Ec.info(`    合计处理   : ${inserted + skipped} 条`);
+            Ec.info(sep);
+        } finally {
+            await conn.end();
+        }
+    } catch (err) {
+        Ec.error(`执行失败：${err.message}`);
+        if (err.code) Ec.info(`错误码：${err.code}`);
+        process.exit(1);
+    }
+};

package/src/commander-ai/fn.source.apply.js

@@ -181,7 +181,7 @@ module.exports = async (options) => {
         Ec.info(`安装位置：${targetLabels.join("、")}`);
         Ec.info(`已安装 ${selectedFiles.length} 个规则文件`);
 
-        // work-claude/：提取标题形成菜单，用户选择后拷贝 CLAUDE-*.md 为项目根目录 CLAUDE.md
+        // work-claude/：从笔记 frontmatter 提取 title 构造菜单，用户选择后拷贝该文件为项目根目录 CLAUDE.md
         const workClaudeDir = path.join(repoCache, "work-claude");
         if (fs.existsSync(workClaudeDir)) {
             const workClaudeFiles = fs.readdirSync(workClaudeDir).filter((file) => {
@@ -192,10 +192,16 @@ module.exports = async (options) => {
                 const choicesWithTitle = workClaudeFiles.map((file) => {
                     const fullPath = path.join(workClaudeDir, file);
                     const content = fs.readFileSync(fullPath, "utf-8");
-                    const match = content.match(/^#\s+(.+)$/m);
-                    const title = match ? match[1].trim() : path.basename(file, ".md");
+                    const fmMatch = content.match(/^---\s*\n([\s\S]*?)\n---/);
+                    let title = path.basename(file, ".md");
+                    if (fmMatch) {
+                        const block = fmMatch[1];
+                        const titleMatch = block.match(/title:\s*["']([^"']+)["']/);
+                        if (titleMatch) title = titleMatch[1].trim();
+                    }
                     return { name: title, value: file };
                 });
+                choicesWithTitle.sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true }));
                 const { selectedClaude } = await inquirer.prompt([
                     {
                         type: "list",
@@ -208,21 +214,6 @@ module.exports = async (options) => {
                 const targetClaude = path.resolve(outputPath, "CLAUDE.md");
                 fs.copyFileSync(sourceClaude, targetClaude);
                 Ec.info(`已安装：${selectedClaude} → CLAUDE.md`);
-                // 将 CLAUDE.md 追加到 .gitignore
-                const gitignorePathClaude = path.resolve(outputPath, ".gitignore");
-                const claudeIgnoreEntry = "CLAUDE.md";
-                if (fs.existsSync(gitignorePathClaude)) {
-                    const content = fs.readFileSync(gitignorePathClaude, "utf-8");
-                    const hasClaude = content.split("\n").some((line) => line.trim() === claudeIgnoreEntry);
-                    if (!hasClaude) {
-                        const newContent = content.endsWith("\n") ? `${content}${claudeIgnoreEntry}\n` : `${content}\n${claudeIgnoreEntry}\n`;
-                        fs.writeFileSync(gitignorePathClaude, newContent, "utf-8");
-                        Ec.info(`已将 ${claudeIgnoreEntry} 添加到 .gitignore`);
-                    }
-                } else {
-                    fs.writeFileSync(gitignorePathClaude, `${claudeIgnoreEntry}\n`, "utf-8");
-                    Ec.info(`已创建 .gitignore 并添加 ${claudeIgnoreEntry}`);
-                }
             }
         }
 

package/src/commander-ai/index.js

@@ -8,6 +8,7 @@ const executeWeb = require('./fn.source.front');
 const executeSpring = require('./fn.source.spring');
 const executeZero = require('./fn.source.zero');
 const executeApply = require('./fn.source.apply');
+const executePerm = require('./fn.perm');
 const exported = {
     executeUuid,                // ai uuid
     executeString,              // ai str
@@ -21,6 +22,7 @@ const exported = {
     executeZero,                // ai zero
     // Cursor 规则安装
     executeApply,               // ai apply
+    executePerm,                // ai perm
 };
 module.exports = exported;
 /**