@lark-apaas/miaoda-cli 0.1.45 → 0.1.47

package/dist/utils/project-snapshot.js

@@ -0,0 +1,99 @@
+"use strict";
+/**
+ * 工程目录快照 / 差异计算 —— migrate 记录本次写入了哪些工程文件。
+ *
+ *   snapshotTree：按内容哈希记录工程文件（排除依赖、构建产物、本地状态等目录）
+ *   diffSnapshots：对比转换前后快照，得到新增 / 修改 / 删除清单
+ *   isExcludedPath：排除规则，符号链接安全检查共用
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isExcludedPath = isExcludedPath;
+exports.snapshotTree = snapshotTree;
+exports.diffSnapshots = diffSnapshots;
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+/** 任意层级出现即排除的目录名 */
+const EXCLUDED_NAMES = new Set(['node_modules', '.git']);
+/** 仅项目根下排除的路径（相对项目根，POSIX 分隔） */
+const EXCLUDED_ROOT_PATHS = new Set([
+    'dist',
+    'logs',
+    'coverage',
+    '.swc',
+    '.vite',
+    '.npm_cache',
+    '.agent',
+    '.agents',
+    '.claude',
+    '.spark/local',
+]);
+function toPosix(rel) {
+    return rel.split(node_path_1.default.sep).join('/');
+}
+function isExcludedPath(relPosix) {
+    if (EXCLUDED_ROOT_PATHS.has(relPosix))
+        return true;
+    return relPosix.split('/').some((seg) => EXCLUDED_NAMES.has(seg));
+}
+function hashFile(abs) {
+    return node_crypto_1.default.createHash('sha256').update(node_fs_1.default.readFileSync(abs)).digest('hex');
+}
+function walk(root, visit) {
+    const stack = [''];
+    while (stack.length > 0) {
+        const rel = stack.pop() ?? '';
+        const absDir = node_path_1.default.join(root, rel);
+        for (const name of node_fs_1.default.readdirSync(absDir)) {
+            const childRel = rel === '' ? name : node_path_1.default.join(rel, name);
+            const relPosix = toPosix(childRel);
+            if (isExcludedPath(relPosix))
+                continue;
+            const abs = node_path_1.default.join(root, childRel);
+            const stat = node_fs_1.default.lstatSync(abs);
+            if (stat.isDirectory()) {
+                stack.push(childRel);
+                continue;
+            }
+            visit(relPosix, abs, stat);
+        }
+    }
+}
+function snapshotTree(root) {
+    const snap = new Map();
+    walk(root, (relPosix, abs, stat) => {
+        if (stat.isSymbolicLink()) {
+            const target = node_fs_1.default.readlinkSync(abs);
+            snap.set(relPosix, {
+                hash: node_crypto_1.default.createHash('sha256').update(`symlink:${target}`).digest('hex'),
+                mode: 0,
+                symlink: true,
+            });
+            return;
+        }
+        if (!stat.isFile())
+            return;
+        snap.set(relPosix, { hash: hashFile(abs), mode: stat.mode & 0o777, symlink: false });
+    });
+    return snap;
+}
+function diffSnapshots(before, after) {
+    const added = [];
+    const modified = [];
+    const deleted = [];
+    for (const [rel, entry] of after) {
+        const prev = before.get(rel);
+        if (prev === undefined)
+            added.push(rel);
+        else if (prev.hash !== entry.hash || prev.mode !== entry.mode)
+            modified.push(rel);
+    }
+    for (const rel of before.keys()) {
+        if (!after.has(rel))
+            deleted.push(rel);
+    }
+    return { added: added.sort(), modified: modified.sort(), deleted: deleted.sort() };
+}

package/dist/utils/spark-meta.js

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readSparkMeta = readSparkMeta;
+exports.readSparkMetaStrict = readSparkMetaStrict;
 exports.writeSparkMeta = writeSparkMeta;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const error_1 = require("./error");
 const SPARK_DIR = '.spark';
 const SPARK_META_FILE = 'meta.json';
 function readSparkMeta(appDir) {
@@ -20,22 +22,41 @@ function readSparkMeta(appDir) {
         return {};
     }
 }
+function corruptMetaError(metaPath, detail) {
+    return new error_1.AppError('SPARK_META_CORRUPT', `${metaPath} 无法解析：${detail}`, {
+        next_actions: ['从 Git 历史恢复 .spark/meta.json，或修复其 JSON 格式后重试'],
+    });
+}
 /**
- * merge 写入：已有字段保留，undefined 不覆盖；不再维护时间戳。
+ * 严格读取：文件不存在返回 undefined；存在但不是合法 JSON 对象时抛 SPARK_META_CORRUPT，
+ * 而不是当成空对象继续 —— 工程类操作（sync / migrate / init --strict）不能把损坏的 meta
+ * 读成"未初始化"后覆盖掉 app_id 等字段。
+ */
+function readSparkMetaStrict(appDir) {
+    const metaPath = node_path_1.default.join(appDir, SPARK_DIR, SPARK_META_FILE);
+    if (!node_fs_1.default.existsSync(metaPath))
+        return undefined;
+    let parsed;
+    try {
+        parsed = JSON.parse(node_fs_1.default.readFileSync(metaPath, 'utf-8'));
+    }
+    catch (err) {
+        throw corruptMetaError(metaPath, err instanceof Error ? err.message : String(err));
+    }
+    if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        throw corruptMetaError(metaPath, 'not a JSON object');
+    }
+    return parsed;
+}
+/**
+ * merge 写入：已有字段保留（含未知键），undefined 不覆盖；不再维护时间戳。
+ * 已有文件损坏时抛 SPARK_META_CORRUPT，不把损坏内容当空对象覆盖。
  */
 function writeSparkMeta(appDir, meta) {
     const sparkDir = node_path_1.default.join(appDir, SPARK_DIR);
     node_fs_1.default.mkdirSync(sparkDir, { recursive: true });
     const metaPath = node_path_1.default.join(sparkDir, SPARK_META_FILE);
-    let existing = {};
-    if (node_fs_1.default.existsSync(metaPath)) {
-        try {
-            existing = JSON.parse(node_fs_1.default.readFileSync(metaPath, 'utf-8'));
-        }
-        catch {
-            /* 读不出就当空 */
-        }
-    }
+    const existing = readSparkMetaStrict(appDir) ?? {};
     const defined = Object.fromEntries(Object.entries(meta).filter(([, v]) => v !== undefined));
     const merged = { ...existing, ...defined };
     node_fs_1.default.writeFileSync(metaPath, JSON.stringify(merged, null, 2) + '\n', 'utf-8');

package/dist/utils/sync-rule.js

@@ -107,6 +107,9 @@ function applyOne(rule, opts) {
         case 'patch-script': {
             return applyPatchScript(rule, targetDir, logPrefix);
         }
+        case 'ensure-dependency': {
+            return applyEnsureDependency(rule, targetDir, logPrefix);
+        }
         case 'typescript-exclude': {
             const changed = (0, typescript_exclude_1.excludeTypeScriptPath)(node_path_1.default.join(targetDir, rule.to), rule.path);
             (0, logger_1.log)(logPrefix, `  ${changed ? '✓' : '○'} ${rule.to} (exclude ${rule.path})`);
@@ -147,11 +150,11 @@ function applyOne(rule, opts) {
                 (0, logger_1.log)(logPrefix, `  ○ ${rule.to} (skipped, already exists)`);
                 return { rule, action: 'skipped', path: rule.to };
             }
-            const destDir = node_path_1.default.dirname(dest);
-            if (!node_fs_1.default.existsSync(destDir)) {
-                node_fs_1.default.mkdirSync(destDir, { recursive: true });
+            if (sameFile(src, dest)) {
+                (0, logger_1.log)(logPrefix, `  ○ ${rule.to} (already up to date)`);
+                return { rule, action: 'noop', path: rule.to };
             }
-            node_fs_1.default.copyFileSync(src, dest);
+            copyManagedFile(src, dest);
             (0, logger_1.log)(logPrefix, `  ✓ ${rule.to}`);
             return { rule, action: 'synced', path: rule.to };
         }
@@ -221,7 +224,7 @@ function applyPatchScript(rule, targetDir, logPrefix) {
         (0, logger_1.log)(logPrefix, `  ○ scripts.${rule.name} (already patched)`);
         return { rule, action: 'noop', path: 'package.json' };
     }
-    if (!current.startsWith(rule.ifStartsWith)) {
+    if (!patchConditionMatches(rule, current)) {
         (0, logger_1.log)(logPrefix, `  ⚠ scripts.${rule.name} customized, skip patch`);
         return { rule, action: 'skipped', path: 'package.json' };
     }
@@ -231,6 +234,53 @@ function applyPatchScript(rule, targetDir, logPrefix) {
     (0, logger_1.log)(logPrefix, `  ✓ scripts.${rule.name} (patched)`);
     return { rule, action: 'patched', path: 'package.json', detail: rule.name };
 }
+function patchConditionMatches(rule, current) {
+    if (rule.ifStartsWith !== undefined && current.startsWith(rule.ifStartsWith))
+        return true;
+    return (rule.ifMatches ?? []).some((re) => re.test(current));
+}
+function applyEnsureDependency(rule, targetDir, logPrefix) {
+    const pkgPath = node_path_1.default.join(targetDir, 'package.json');
+    const pkg = readPkgJson(pkgPath);
+    if (!pkg) {
+        (0, logger_1.log)(logPrefix, `  ⚠ package.json not found, skip ensure-dependency ${rule.name}`);
+        return { rule, action: 'skipped', path: 'package.json' };
+    }
+    for (const section of ['dependencies', 'devDependencies']) {
+        const declared = dependencyGroup(pkg, section)?.[rule.name];
+        if (declared !== undefined) {
+            // 用户已声明的版本不降级 / 不覆盖：兼容性由后续安装与构建验证
+            (0, logger_1.log)(logPrefix, `  ○ ${section}.${rule.name} (already declared: ${declared})`);
+            return {
+                rule,
+                action: 'noop',
+                path: 'package.json',
+                detail: `${section}.${rule.name}@${declared}`,
+            };
+        }
+    }
+    if (pkg[rule.section] !== undefined && dependencyGroup(pkg, rule.section) === undefined) {
+        (0, logger_1.log)(logPrefix, `  ⚠ package.json ${rule.section} is not an object, skip ensure-dependency`);
+        return { rule, action: 'skipped', path: 'package.json' };
+    }
+    const group = dependencyGroup(pkg, rule.section) ?? {};
+    group[rule.name] = rule.version;
+    pkg[rule.section] = group;
+    writePkgJson(pkgPath, pkg);
+    (0, logger_1.log)(logPrefix, `  ✓ ${rule.section}.${rule.name}@${rule.version} (added)`);
+    return {
+        rule,
+        action: 'patched',
+        path: 'package.json',
+        detail: `${rule.section}.${rule.name}@${rule.version}`,
+    };
+}
+function dependencyGroup(pkg, section) {
+    const group = pkg[section];
+    if (group === null || typeof group !== 'object' || Array.isArray(group))
+        return undefined;
+    return group;
+}
 function applyMergeJson(rule, sourceRoot, targetDir, logPrefix) {
     const src = node_path_1.default.join(sourceRoot, rule.from);
     const dest = node_path_1.default.join(targetDir, rule.to);
@@ -288,14 +338,33 @@ function syncDirectory(src, dest, overwrite) {
         if (stat.isDirectory()) {
             count += syncDirectory(srcChild, destChild, overwrite);
         }
-        else if (overwrite || !node_fs_1.default.existsSync(destChild)) {
-            node_fs_1.default.copyFileSync(srcChild, destChild);
-            // .sh 自动 +x
-            if (destChild.endsWith('.sh')) {
-                node_fs_1.default.chmodSync(destChild, 0o755);
-            }
+        else if ((overwrite || !node_fs_1.default.existsSync(destChild)) && !sameFile(srcChild, destChild)) {
+            copyManagedFile(srcChild, destChild);
             count++;
         }
     }
     return count;
 }
+/** 目标权限位：沿用源文件权限，`.sh` 一律 +x（历史行为） */
+function targetMode(src, dest) {
+    const srcMode = node_fs_1.default.statSync(src).mode & 0o777;
+    return dest.endsWith('.sh') ? srcMode | 0o755 : srcMode;
+}
+/** 内容与权限都一致时视为无需同步，保证连续 sync 不产生"已同步"的伪变化 */
+function sameFile(src, dest) {
+    if (!node_fs_1.default.existsSync(dest))
+        return false;
+    const destStat = node_fs_1.default.statSync(dest);
+    if (!destStat.isFile())
+        return false;
+    // Windows 上权限位不可靠（chmod 基本无效），只比内容
+    if (process.platform !== 'win32' && (destStat.mode & 0o777) !== targetMode(src, dest)) {
+        return false;
+    }
+    return node_fs_1.default.readFileSync(src).equals(node_fs_1.default.readFileSync(dest));
+}
+function copyManagedFile(src, dest) {
+    node_fs_1.default.mkdirSync(node_path_1.default.dirname(dest), { recursive: true });
+    node_fs_1.default.copyFileSync(src, dest);
+    node_fs_1.default.chmodSync(dest, targetMode(src, dest));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {