@appthen/cli 1.2.5 → 1.2.7

package/dist/index.js

@@ -40834,7 +40834,31 @@ var ShadowSpace = /** @class */ (function () {
                     case 4:
                         writtenContent = _g.sent();
                         localHash = this.calculateHash(writtenContent);
+                        console.log('localHash: ', localHash);
                         remoteHash = file.hash || localHash;
+                        // 🔍 检测哈希差异，帮助诊断编码问题
+                        if (file.hash && file.hash !== localHash) {
+                            console.warn("[ShadowSpace] \u68C0\u6D4B\u5230\u54C8\u5E0C\u4E0D\u4E00\u81F4: ".concat(file.path), {
+                                editorHash: file.hash.substring(0, 16),
+                                localHash: localHash.substring(0, 16),
+                                editorHashFull: file.hash,
+                                localHashFull: localHash,
+                                contentLength: file.content.length,
+                                writtenLength: writtenContent.length,
+                                contentSame: file.content === writtenContent,
+                                filePath: file.path,
+                            });
+                            // 如果内容相同但哈希不同，可能是编码问题
+                            if (file.content === writtenContent) {
+                                console.error("[ShadowSpace] \u26A0\uFE0F \u5185\u5BB9\u76F8\u540C\u4F46\u54C8\u5E0C\u4E0D\u540C\uFF0C\u53EF\u80FD\u5B58\u5728\u7F16\u7801\u95EE\u9898: ".concat(file.path));
+                            }
+                            else {
+                                console.error("[ShadowSpace] \u26A0\uFE0F \u5185\u5BB9\u4E0D\u540C\uFF0C\u53EF\u80FD\u662F\u6587\u4EF6\u5199\u5165\u8FC7\u7A0B\u4E2D\u7684\u8F6C\u6362\u95EE\u9898: ".concat(file.path));
+                                // 显示前100个字符的差异
+                                console.log("\u7F16\u8F91\u5668\u5185\u5BB9\u524D100\u5B57\u7B26: ".concat(JSON.stringify(file.content.substring(0, 100))));
+                                console.log("\u5199\u5165\u5185\u5BB9\u524D100\u5B57\u7B26: ".concat(JSON.stringify(writtenContent.substring(0, 100))));
+                            }
+                        }
                         newFiles[file.path] = {
                             path: file.path,
                             hash: localHash,
@@ -40997,31 +41021,32 @@ var ShadowSpace = /** @class */ (function () {
     };
     /**
      * 检测本地文件系统与影子空间的差异
+     * 注意：跳过 remoteModified 标记的文件，避免与编辑器检测冲突
      */
     ShadowSpace.prototype.detectChanges = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var changes, _b, _c, _d, filePath, shadowEntry, localFilePath, localContent, localHash, _e, _f, _g, shadowContent, _h, _j, error_2, shadowContent, e_3_1, localFiles, localFiles_1, localFiles_1_1, localFile;
-            var e_3, _k, _l, _m, e_4, _o;
-            return __generator(this, function (_p) {
-                switch (_p.label) {
+            var changes, _b, _c, _d, filePath, shadowEntry, localFilePath, localContent, localHash, fileStat, fileModifyTime, shadowContent, _e, _f, error_2, shadowContent, e_3_1, localFiles, localFiles_1, localFiles_1_1, localFile;
+            var e_3, _g, _h, e_4, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         changes = [];
-                        _p.label = 1;
+                        _k.label = 1;
                     case 1:
-                        _p.trys.push([1, 16, 17, 18]);
+                        _k.trys.push([1, 16, 17, 18]);
                         _b = __values(Object.entries(this.state.files)), _c = _b.next();
-                        _p.label = 2;
+                        _k.label = 2;
                     case 2:
                         if (!!_c.done) return [3 /*break*/, 15];
                         _d = __read(_c.value, 2), filePath = _d[0], shadowEntry = _d[1];
                         localFilePath = path__default["default"].join(this.config.projectRoot, filePath);
-                        _p.label = 3;
+                        _k.label = 3;
                     case 3:
-                        _p.trys.push([3, 11, , 14]);
+                        _k.trys.push([3, 11, , 14]);
                         return [4 /*yield*/, fs__default$1["default"].readFile(localFilePath, 'utf8')];
                     case 4:
-                        localContent = _p.sent();
+                        localContent = _k.sent();
                         localHash = this.calculateHash(localContent);
                         if (!(localHash !== shadowEntry.hash)) return [3 /*break*/, 10];
                         console.log("[ShadowSpace] \u68C0\u6D4B\u5230\u6587\u4EF6\u53D8\u66F4: ".concat(filePath), {
@@ -41032,29 +41057,31 @@ var ShadowSpace = /** @class */ (function () {
                             version: shadowEntry.version,
                         });
                         if (!shadowEntry.remoteModified) return [3 /*break*/, 7];
-                        // 如果是远程修改，先更新影子空间记录并清除远程修改标记
-                        console.log("\u68C0\u6D4B\u5230\u8FDC\u7A0B\u4FEE\u6539\u6587\u4EF6\u7684\u672C\u5730\u53D8\u5316: ".concat(filePath));
-                        // 更新影子空间记录
-                        _e = this.state.files;
-                        _f = filePath;
-                        _g = [__assign({}, shadowEntry)];
-                        _l = { hash: localHash };
+                        console.log("[ShadowSpace] \u8DF3\u8FC7\u8FDC\u7A0B\u4FEE\u6539\u6587\u4EF6\u7684\u672C\u5730\u68C0\u6D4B: ".concat(filePath, "\uFF0C\u5C06\u7531\u65F6\u95F4\u6233\u6BD4\u5BF9\u51B3\u5B9A\u65B9\u5411"));
                         return [4 /*yield*/, fs__default$1["default"].stat(localFilePath)];
                     case 5:
-                        _l.size = (_p.sent()).size, _l.lastSyncTime = Date.now(), _l.version = shadowEntry.version + 1;
-                        return [4 /*yield*/, fs__default$1["default"].stat(localFilePath)];
+                        fileStat = _k.sent();
+                        fileModifyTime = fileStat.mtimeMs;
+                        console.log("[ShadowSpace] \uD83D\uDD0D \u66F4\u65B0\u6587\u4EF6\u65F6\u95F4\u6233: ".concat(filePath), {
+                            旧lastModified: new Date(shadowEntry.lastModified || 0).toISOString(),
+                            旧mtime: new Date(shadowEntry.mtime || 0).toISOString(),
+                            新fileModifyTime: new Date(fileModifyTime).toISOString(),
+                            时间戳是否变化: fileModifyTime !== shadowEntry.lastModified,
+                        });
+                        // 更新影子空间记录，清除远程修改标记
+                        this.state.files[filePath] = __assign(__assign({}, shadowEntry), { hash: localHash, size: fileStat.size, lastSyncTime: Date.now(), version: shadowEntry.version + 1, mtime: fileModifyTime, lastModified: fileModifyTime, remoteModified: false });
+                        // 保存状态
+                        return [4 /*yield*/, this.saveState()];
                     case 6:
-                        // 更新影子空间记录
-                        _e[_f] = __assign.apply(void 0, _g.concat([(_l.mtime = (_p.sent()).mtimeMs, _l.remoteModified = false, _l)]));
-                        // 如果本地内容与最初的远程内容不同，则认为是本地修改
-                        // 这里我们简化处理：任何在远程修改基础上的本地变化都视为本地修改
-                        console.log("\u6587\u4EF6 ".concat(filePath, " \u5728\u8FDC\u7A0B\u4FEE\u6539\u57FA\u7840\u4E0A\u53D1\u751F\u4E86\u672C\u5730\u53D8\u5316\uFF0C\u6807\u8BB0\u4E3A\u672C\u5730\u4FEE\u6539"));
-                        _p.label = 7;
+                        // 保存状态
+                        _k.sent();
+                        // 🔥 跳过，不添加到 changes
+                        return [3 /*break*/, 14];
                     case 7: return [4 /*yield*/, this.getShadowContent(filePath)];
                     case 8:
-                        shadowContent = _p.sent();
-                        _j = (_h = changes).push;
-                        _m = {
+                        shadowContent = _k.sent();
+                        _f = (_e = changes).push;
+                        _h = {
                             id: this.generateId(),
                             action: 'modify',
                             path: filePath,
@@ -41062,21 +41089,21 @@ var ShadowSpace = /** @class */ (function () {
                         };
                         return [4 /*yield*/, fs__default$1["default"].stat(localFilePath)];
                     case 9:
-                        _j.apply(_h, [(_m.timestamp = (_p.sent()).mtime.getTime(),
-                                _m.diff = {
+                        _f.apply(_e, [(_h.timestamp = (_k.sent()).mtime.getTime(),
+                                _h.diff = {
                                     before: shadowContent,
                                     after: localContent,
                                 },
-                                _m.projectId = this.state.projectId,
-                                _m)]);
-                        _p.label = 10;
+                                _h.projectId = this.state.projectId,
+                                _h)]);
+                        _k.label = 10;
                     case 10: return [3 /*break*/, 14];
                     case 11:
-                        error_2 = _p.sent();
+                        error_2 = _k.sent();
                         if (!(error_2.code === 'ENOENT')) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.getShadowContent(filePath)];
                     case 12:
-                        shadowContent = _p.sent();
+                        shadowContent = _k.sent();
                         changes.push({
                             id: this.generateId(),
                             action: 'delete',
@@ -41089,25 +41116,25 @@ var ShadowSpace = /** @class */ (function () {
                             },
                             projectId: this.state.projectId,
                         });
-                        _p.label = 13;
+                        _k.label = 13;
                     case 13: return [3 /*break*/, 14];
                     case 14:
                         _c = _b.next();
                         return [3 /*break*/, 2];
                     case 15: return [3 /*break*/, 18];
                     case 16:
-                        e_3_1 = _p.sent();
+                        e_3_1 = _k.sent();
                         e_3 = { error: e_3_1 };
                         return [3 /*break*/, 18];
                     case 17:
                         try {
-                            if (_c && !_c.done && (_k = _b.return)) _k.call(_b);
+                            if (_c && !_c.done && (_g = _b.return)) _g.call(_b);
                         }
                         finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 18: return [4 /*yield*/, this.scanLocalFiles()];
                     case 19:
-                        localFiles = _p.sent();
+                        localFiles = _k.sent();
                         try {
                             for (localFiles_1 = __values(localFiles), localFiles_1_1 = localFiles_1.next(); !localFiles_1_1.done; localFiles_1_1 = localFiles_1.next()) {
                                 localFile = localFiles_1_1.value;
@@ -41130,7 +41157,7 @@ var ShadowSpace = /** @class */ (function () {
                         catch (e_4_1) { e_4 = { error: e_4_1 }; }
                         finally {
                             try {
-                                if (localFiles_1_1 && !localFiles_1_1.done && (_o = localFiles_1.return)) _o.call(localFiles_1);
+                                if (localFiles_1_1 && !localFiles_1_1.done && (_j = localFiles_1.return)) _j.call(localFiles_1);
                             }
                             finally { if (e_4) throw e_4.error; }
                         }
@@ -41421,29 +41448,41 @@ var ShadowSpace = /** @class */ (function () {
      * 用于与编辑器快照进行比对
      */
     ShadowSpace.prototype.getSpaceSnapshots = function (_spaceId) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var snapshots, _a, _b, _c, filePath, shadowEntry, error_6;
-            var e_8, _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var snapshots, _c, _d, _e, filePath, shadowEntry, modifyTime, error_6;
+            var e_8, _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
-                        _e.trys.push([0, 2, , 3]);
+                        _g.trys.push([0, 2, , 3]);
                         // 确保状态已加载
                         return [4 /*yield*/, this.loadState()];
                     case 1:
                         // 确保状态已加载
-                        _e.sent();
+                        _g.sent();
                         snapshots = [];
                         try {
                             // 遍历影子空间中的所有文件
-                            for (_a = __values(Object.entries(this.state.files)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                _c = __read(_b.value, 2), filePath = _c[0], shadowEntry = _c[1];
+                            for (_c = __values(Object.entries(this.state.files)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                _e = __read(_d.value, 2), filePath = _e[0], shadowEntry = _e[1];
+                                // 🔍 调试哈希差异
+                                if (shadowEntry.hash !== shadowEntry.remoteHash) {
+                                    console.log("[ShadowSpace] \u5FEB\u7167\u4E2D\u7684\u54C8\u5E0C\u5DEE\u5F02: ".concat(filePath), {
+                                        localHash: (_a = shadowEntry.hash) === null || _a === void 0 ? void 0 : _a.substring(0, 16),
+                                        remoteHash: (_b = shadowEntry.remoteHash) === null || _b === void 0 ? void 0 : _b.substring(0, 16),
+                                        localHashFull: shadowEntry.hash,
+                                        remoteHashFull: shadowEntry.remoteHash,
+                                        remoteModified: shadowEntry.remoteModified,
+                                    });
+                                }
+                                modifyTime = shadowEntry.mtime ||
+                                    shadowEntry.lastModified ||
+                                    shadowEntry.lastSyncTime ||
+                                    Date.now();
                                 snapshots.push({
                                     path: filePath,
-                                    modify: shadowEntry.lastModified ||
-                                        shadowEntry.mtime ||
-                                        shadowEntry.lastSyncTime ||
-                                        Date.now(),
+                                    modify: modifyTime,
                                     hash: shadowEntry.hash,
                                     remoteHash: shadowEntry.remoteHash || shadowEntry.hash,
                                     updateBy: shadowEntry.remoteModified ? 'shadow-space' : 'local',
@@ -41455,14 +41494,14 @@ var ShadowSpace = /** @class */ (function () {
                         catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
-                                if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                                if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                             }
                             finally { if (e_8) throw e_8.error; }
                         }
                         console.log("[ShadowSpace] \u83B7\u53D6\u7A7A\u95F4\u5FEB\u7167: ".concat(snapshots.length, " \u4E2A\u6587\u4EF6"));
                         return [2 /*return*/, snapshots];
                     case 2:
-                        error_6 = _e.sent();
+                        error_6 = _g.sent();
                         console.error("[ShadowSpace] \u83B7\u53D6\u7A7A\u95F4\u5FEB\u7167\u5931\u8D25:", error_6);
                         return [2 /*return*/, []]; // 返回空数组而不是 undefined
                     case 3: return [2 /*return*/];
@@ -41665,7 +41704,11 @@ var ShadowSpace = /** @class */ (function () {
         });
     };
     ShadowSpace.prototype.calculateHash = function (content) {
-        return crypto__default["default"].createHash('sha256').update(content, 'utf8').digest('hex');
+        var normalizedContent = content.replace(/\r\n/g, '\n');
+        return crypto__default["default"]
+            .createHash('sha256')
+            .update(normalizedContent, 'utf8')
+            .digest('hex');
     };
     ShadowSpace.prototype.generateId = function () {
         return "change_".concat(Date.now(), "_").concat(Math.random().toString(36).substr(2, 9));
@@ -42809,7 +42852,7 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                             filePaths: filePaths || null,
                             timestamp: Date.now(),
                         };
-                        console.log("[ShadowSpace] \u8FDC\u7A0B\u4FEE\u6539\u6807\u8BB0\u6E05\u9664\u5B8C\u6210");
+                        console.log('[ShadowSpace] 远程修改标记清除完成');
                         return [2 /*return*/, result];
                 }
             });
@@ -42900,28 +42943,155 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
      */
     ShadowSpaceCommandHandler.prototype.detectEditorChanges = function (spaceId, editorSnapshots) {
         return __awaiter(this, void 0, void 0, function () {
-            var safeEditorSnapshots, spaceSnapshots, changes, summary, error_3;
+            var safeEditorSnapshots, localChanges, spaceSnapshots, spaceInfo, fs, spaceDir, spaceExists, files, error_3, snapshotChanges, localAddChanges, changes, summary, error_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 3, , 4]);
+                        _a.trys.push([0, 9, , 10]);
                         safeEditorSnapshots = Array.isArray(editorSnapshots)
                             ? editorSnapshots
                             : [];
-                        return [4 /*yield*/, this.shadowSpace.getSpaceSnapshots(spaceId)];
+                        // console.log(
+                        //   `[ShadowSpace] 开始检测变更: 空间=${spaceId}, 编辑器文件=${safeEditorSnapshots.length}个`
+                        // );
+                        // 1. 🔥 先检测本地文件变更，更新影子空间状态，并获取本地变更列表（包括新增文件）
+                        console.log("\n\uD83D\uDD0D [DEBUG] \u6B63\u5728\u68C0\u6D4B\u672C\u5730\u6587\u4EF6\u53D8\u66F4...");
+                        return [4 /*yield*/, this.shadowSpace.detectChanges()];
                     case 1:
+                        localChanges = _a.sent();
+                        console.log("\uD83D\uDD0D [DEBUG] \u672C\u5730\u6587\u4EF6\u53D8\u66F4\u68C0\u6D4B\u5B8C\u6210\uFF0C\u68C0\u6D4B\u5230 ".concat(localChanges.length, " \u4E2A\u672C\u5730\u53D8\u66F4"));
+                        // 2. 读取空间快照
+                        console.log("\n\uD83D\uDD0D [DEBUG] \u6B63\u5728\u83B7\u53D6\u7A7A\u95F4\u5FEB\u7167\uFF0C\u7A7A\u95F4ID: ".concat(spaceId));
+                        return [4 /*yield*/, this.shadowSpace.getSpaceSnapshots(spaceId)];
+                    case 2:
                         spaceSnapshots = _a.sent();
+                        console.log("\uD83D\uDD0D [DEBUG] getSpaceSnapshots \u8FD4\u56DE\u7ED3\u679C\u7C7B\u578B: ".concat(typeof spaceSnapshots));
+                        console.log("\uD83D\uDD0D [DEBUG] getSpaceSnapshots \u662F\u5426\u4E3A\u6570\u7EC4: ".concat(Array.isArray(spaceSnapshots)));
+                        console.log("\uD83D\uDD0D [DEBUG] getSpaceSnapshots \u539F\u59CB\u7ED3\u679C:", spaceSnapshots);
+                        // 🔍 友好的调试输出
+                        console.log('\n=== 影子空间变更检测调试 ===');
+                        console.log('📁 空间ID:', spaceId);
+                        console.log('📊 编辑器快照数量:', safeEditorSnapshots.length);
+                        console.log('📁 空间快照数量:', Array.isArray(spaceSnapshots) ? spaceSnapshots.length : 0);
+                        spaceInfo = this.shadowSpace.getSpaceInfo();
+                        console.log('\n🏠 影子空间信息:');
+                        console.log("  \uD83D\uDCC2 \u9879\u76EE\u6839\u76EE\u5F55: ".concat(spaceInfo.projectRoot));
+                        console.log("  \uD83D\uDCC1 \u7A7A\u95F4\u76EE\u5F55: ".concat(spaceInfo.spaceRoot));
+                        console.log("  \uD83D\uDCCA \u6587\u4EF6\u6570\u91CF: ".concat(spaceInfo.fileCount));
+                        console.log("  \uD83D\uDCE6 \u603B\u5927\u5C0F: ".concat(spaceInfo.totalSize));
+                        console.log("  \uD83C\uDD94 \u7528\u6237ID: ".concat(spaceInfo.userId));
+                        console.log("  \u23F0 \u521B\u5EFA\u65F6\u95F4: ".concat(spaceInfo.createdAt));
+                        console.log("  \u23F0 \u66F4\u65B0\u65F6\u95F4: ".concat(spaceInfo.updatedAt));
+                        require('path');
+                        fs = require('fs-extra');
+                        spaceDir = spaceInfo.spaceRoot;
+                        return [4 /*yield*/, fs.pathExists(spaceDir)];
+                    case 3:
+                        spaceExists = _a.sent();
+                        console.log("\n\uD83D\uDCC1 \u7A7A\u95F4\u76EE\u5F55\u68C0\u67E5:");
+                        console.log("  \uD83D\uDCC2 \u8DEF\u5F84: ".concat(spaceDir));
+                        console.log("  \u2705 \u662F\u5426\u5B58\u5728: ".concat(spaceExists));
+                        if (!spaceExists) return [3 /*break*/, 7];
+                        _a.label = 4;
+                    case 4:
+                        _a.trys.push([4, 6, , 7]);
+                        return [4 /*yield*/, fs.readdir(spaceDir)];
+                    case 5:
+                        files = _a.sent();
+                        console.log("  \uD83D\uDCC4 \u76EE\u5F55\u5185\u5BB9: ".concat(files.slice(0, 10).join(', ')).concat(files.length > 10 ? '...' : ''));
+                        return [3 /*break*/, 7];
+                    case 6:
+                        error_3 = _a.sent();
+                        console.log("  \u274C \u8BFB\u53D6\u76EE\u5F55\u5931\u8D25: ".concat(error_3.message));
+                        return [3 /*break*/, 7];
+                    case 7:
+                        // 编辑器快照详情（显示前5个）
+                        if (safeEditorSnapshots.length > 0) {
+                            console.log('\n📝 编辑器快照详情 (前5个):');
+                            safeEditorSnapshots.slice(0, 5).forEach(function (file, index) {
+                                var _a;
+                                console.log("  [".concat(index + 1, "] ").concat(file.path));
+                                console.log("      \uD83D\uDD11 hash: ".concat((_a = file.hash) === null || _a === void 0 ? void 0 : _a.substring(0, 16), "..."));
+                                console.log("      \u23F0 modified: ".concat(file.lastModified));
+                            });
+                            if (safeEditorSnapshots.length > 5) {
+                                console.log("      ... \u8FD8\u6709 ".concat(safeEditorSnapshots.length - 5, " \u4E2A\u6587\u4EF6"));
+                            }
+                        }
+                        // 空间快照详情（显示前5个）
+                        if (Array.isArray(spaceSnapshots) && spaceSnapshots.length > 0) {
+                            console.log('\n💾 空间快照详情 (前5个):');
+                            spaceSnapshots.slice(0, 5).forEach(function (file, index) {
+                                var _a, _b;
+                                console.log("  [".concat(index + 1, "] ").concat(file.path));
+                                console.log("      \uD83D\uDD11 \u672C\u5730hash: ".concat((_a = file.hash) === null || _a === void 0 ? void 0 : _a.substring(0, 16), "..."));
+                                console.log("      \u2601\uFE0F  \u4E91\u7AEFhash: ".concat((_b = file.remoteHash) === null || _b === void 0 ? void 0 : _b.substring(0, 16), "..."));
+                                console.log("      \u23F0 modified: ".concat(file.lastModified));
+                            });
+                            if (spaceSnapshots.length > 5) {
+                                console.log("      ... \u8FD8\u6709 ".concat(spaceSnapshots.length - 5, " \u4E2A\u6587\u4EF6"));
+                            }
+                        }
                         Array.isArray(spaceSnapshots)
                             ? spaceSnapshots.length
                             : 0;
                         return [4 /*yield*/, this.compareSnapshots(safeEditorSnapshots, spaceSnapshots)];
-                    case 2:
-                        changes = _a.sent();
+                    case 8:
+                        snapshotChanges = _a.sent();
+                        localAddChanges = localChanges
+                            .filter(function (change) { return change.action === 'add'; })
+                            .map(function (change) { return ({
+                            action: 'add',
+                            path: change.path,
+                            side: 'space',
+                            sourceLabel: 'shadow-space',
+                            targetLabel: 'editor',
+                            // 本地新增文件，编辑器中不存在，所以 editorHash 为空
+                            editorHash: undefined,
+                            // spaceHash 可以从文件内容计算，但这里我们不需要，因为前端只需要知道是新增文件
+                            spaceHash: undefined,
+                        }); });
+                        console.log("\uD83D\uDD0D [DEBUG] \u672C\u5730\u65B0\u589E\u6587\u4EF6\u6570\u91CF: ".concat(localAddChanges.length));
+                        if (localAddChanges.length > 0) {
+                            console.log("\uD83D\uDD0D [DEBUG] \u672C\u5730\u65B0\u589E\u6587\u4EF6\u5217\u8868:", localAddChanges.map(function (c) { return c.path; }));
+                        }
+                        changes = __spreadArray(__spreadArray([], __read(snapshotChanges), false), __read(localAddChanges), false);
                         summary = {
                             total: changes.length,
                             needPush: changes.filter(function (c) { return c.side === 'editor'; }).length,
                             needPull: changes.filter(function (c) { return c.side === 'space'; }).length,
                         };
+                        // 🔍 变更结果详细分析
+                        console.log('\n📋 变更检测结果:');
+                        console.log("  \uD83D\uDCCA \u603B\u53D8\u66F4\u6570: ".concat(summary.total));
+                        console.log("  \u2B06\uFE0F  \u9700\u8981\u63A8\u9001: ".concat(summary.needPush, " \u4E2A\u6587\u4EF6"));
+                        console.log("  \u2B07\uFE0F  \u9700\u8981\u62C9\u53D6: ".concat(summary.needPull, " \u4E2A\u6587\u4EF6"));
+                        if (changes.length > 0) {
+                            console.log('\n📝 变更详情:');
+                            changes.forEach(function (change, index) {
+                                var _a, _b, _c, _d;
+                                var actionIcon = change.action === 'add'
+                                    ? '➕'
+                                    : change.action === 'modify'
+                                        ? '🔄'
+                                        : change.action === 'delete'
+                                            ? '🗑️'
+                                            : '❓';
+                                var directionIcon = change.side === 'editor' ? '⬆️' : '⬇️';
+                                console.log("  [".concat(index + 1, "] ").concat(actionIcon, " ").concat(change.action.toUpperCase(), ": ").concat(change.path));
+                                console.log("        ".concat(directionIcon, " \u65B9\u5411: ").concat(change.side === 'editor' ? '编辑器→空间' : '空间→编辑器'));
+                                if (change.action === 'modify') {
+                                    console.log("        \uD83D\uDD11 \u6BD4\u5BF9: ".concat((_a = change.editorHash) === null || _a === void 0 ? void 0 : _a.substring(0, 16), "... vs ").concat((_b = change.spaceHash) === null || _b === void 0 ? void 0 : _b.substring(0, 16), "..."));
+                                }
+                                else if (change.action === 'add') {
+                                    console.log("        \uD83D\uDD11 hash: ".concat((_c = change.editorHash) === null || _c === void 0 ? void 0 : _c.substring(0, 16), "..."));
+                                }
+                                else if (change.action === 'delete') {
+                                    console.log("        \uD83D\uDD11 hash: ".concat((_d = change.spaceHash) === null || _d === void 0 ? void 0 : _d.substring(0, 16), "..."));
+                                }
+                            });
+                        }
+                        console.log('=== 调试信息结束 ===\n');
                         // console.log(
                         //   `[ShadowSpace] 变更检测完成: 总计${summary.total}个变更, 需推送${summary.needPush}个, 需拉取${summary.needPull}个`
                         // );
@@ -42935,27 +43105,29 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                                     summary: summary,
                                 },
                             }];
-                    case 3:
-                        error_3 = _a.sent();
-                        console.error("[ShadowSpace] \u68C0\u6D4B\u53D8\u66F4\u5931\u8D25:", error_3);
+                    case 9:
+                        error_4 = _a.sent();
+                        console.error('[ShadowSpace] 检测变更失败:', error_4);
                         return [2 /*return*/, {
                                 success: false,
-                                error: error_3 instanceof Error ? error_3.message : '检测变更失败',
+                                error: error_4 instanceof Error ? error_4.message : '检测变更失败',
                             }];
-                    case 4: return [2 /*return*/];
+                    case 10: return [2 /*return*/];
                 }
             });
         });
     };
     /**
      * 比对编辑器和空间快照
+     * 现在 hash 算法已统一，可以直接比对 hash
+     * 当 hash 不同时，通过时间戳判断谁是最新版本
      */
     ShadowSpaceCommandHandler.prototype.compareSnapshots = function (editorSnapshots, spaceSnapshots) {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var changes, safeEditorSnapshots, safeSpaceSnapshots, editorMap, spaceMap, editorMap_1, editorMap_1_1, _d, path, editorFile, spaceFile, spaceMap_1, spaceMap_1_1, _e, path, spaceFile, editorFile;
-            var e_2, _f, e_3, _g;
-            return __generator(this, function (_h) {
+            var changes, safeEditorSnapshots, safeSpaceSnapshots, editorMap, spaceMap, editorMap_1, editorMap_1_1, _c, path, editorFile, spaceFile, editorModify, spaceModify, spaceMap_1, spaceMap_1_1, _d, path, spaceFile, editorFile;
+            var e_2, _e, e_3, _f;
+            return __generator(this, function (_g) {
                 changes = [];
                 safeEditorSnapshots = Array.isArray(editorSnapshots)
                     ? editorSnapshots
@@ -42968,10 +43140,10 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                 try {
                     // 检测编辑器的变更（新增、修改）
                     for (editorMap_1 = __values(editorMap), editorMap_1_1 = editorMap_1.next(); !editorMap_1_1.done; editorMap_1_1 = editorMap_1.next()) {
-                        _d = __read(editorMap_1_1.value, 2), path = _d[0], editorFile = _d[1];
+                        _c = __read(editorMap_1_1.value, 2), path = _c[0], editorFile = _c[1];
                         spaceFile = spaceMap.get(path);
                         if (!spaceFile) {
-                            // 编辑器新增的文件
+                            // 编辑器新增的文件 → 推送到空间
                             changes.push({
                                 action: 'add',
                                 path: path,
@@ -42982,41 +43154,75 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                                 spaceHash: null,
                             });
                         }
-                        else if (editorFile.hash !== spaceFile.remoteHash) {
-                            // 编辑器修改的文件（基于云端哈希比对）
-                            console.log("[ShadowSpace] \u68C0\u6D4B\u5230\u7F16\u8F91\u5668\u4FEE\u6539: ".concat(path), {
+                        else if (editorFile.hash !== spaceFile.hash) {
+                            editorModify = editorFile.modify || 0;
+                            spaceModify = spaceFile.modify || 0;
+                            console.log("[ShadowSpace] \u68C0\u6D4B\u5230\u6587\u4EF6\u5DEE\u5F02: ".concat(path), {
                                 editorHash: (_a = editorFile.hash) === null || _a === void 0 ? void 0 : _a.substring(0, 16),
-                                spaceRemoteHash: (_b = spaceFile.remoteHash) === null || _b === void 0 ? void 0 : _b.substring(0, 16),
-                                spaceLocalHash: (_c = spaceFile.hash) === null || _c === void 0 ? void 0 : _c.substring(0, 16),
-                                editorHashFull: editorFile.hash,
-                                spaceRemoteHashFull: spaceFile.remoteHash,
-                            });
-                            changes.push({
-                                action: 'modify',
-                                path: path,
-                                side: 'editor',
-                                sourceLabel: 'editor',
-                                targetLabel: 'shadow-space',
-                                editorHash: editorFile.hash,
-                                spaceHash: spaceFile.remoteHash,
+                                spaceHash: (_b = spaceFile.hash) === null || _b === void 0 ? void 0 : _b.substring(0, 16),
+                                editorModify: new Date(editorModify).toISOString(),
+                                spaceModify: new Date(spaceModify).toISOString(),
+                                editorUpdateBy: editorFile.updateBy,
+                                spaceUpdateBy: spaceFile.updateBy,
                             });
+                            // 🔥 关键逻辑：根据时间戳判断方向
+                            if (editorModify > spaceModify) {
+                                // 编辑器更新 → 推送到空间
+                                console.log("[ShadowSpace] \u2192 \u7F16\u8F91\u5668\u66F4\u65B0\uFF0C\u9700\u8981\u63A8\u9001: ".concat(path));
+                                changes.push({
+                                    action: 'modify',
+                                    path: path,
+                                    side: 'editor',
+                                    sourceLabel: 'editor',
+                                    targetLabel: 'shadow-space',
+                                    editorHash: editorFile.hash,
+                                    spaceHash: spaceFile.hash,
+                                });
+                            }
+                            else if (spaceModify > editorModify) {
+                                // 空间更新 → 拉取到编辑器
+                                console.log("[ShadowSpace] \u2190 \u7A7A\u95F4\u66F4\u65B0\uFF0C\u9700\u8981\u62C9\u53D6: ".concat(path));
+                                changes.push({
+                                    action: 'modify',
+                                    path: path,
+                                    side: 'space',
+                                    sourceLabel: 'shadow-space',
+                                    targetLabel: 'editor',
+                                    editorHash: editorFile.hash,
+                                    spaceHash: spaceFile.hash,
+                                });
+                            }
+                            else {
+                                // 时间戳相同但 hash 不同 → 可能是冲突，默认以编辑器为准
+                                console.warn("[ShadowSpace] \u26A0\uFE0F \u65F6\u95F4\u6233\u76F8\u540C\u4F46\u5185\u5BB9\u4E0D\u540C\uFF0C\u9ED8\u8BA4\u4EE5\u7F16\u8F91\u5668\u4E3A\u51C6: ".concat(path));
+                                changes.push({
+                                    action: 'modify',
+                                    path: path,
+                                    side: 'editor',
+                                    sourceLabel: 'editor',
+                                    targetLabel: 'shadow-space',
+                                    editorHash: editorFile.hash,
+                                    spaceHash: spaceFile.hash,
+                                    conflict: true, // 标记为潜在冲突
+                                });
+                            }
                         }
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (editorMap_1_1 && !editorMap_1_1.done && (_f = editorMap_1.return)) _f.call(editorMap_1);
+                        if (editorMap_1_1 && !editorMap_1_1.done && (_e = editorMap_1.return)) _e.call(editorMap_1);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
                 try {
-                    // 检测空间的变更（删除、空间独有的修改）
+                    // 检测空间独有的文件（编辑器已删除或空间新增）
                     for (spaceMap_1 = __values(spaceMap), spaceMap_1_1 = spaceMap_1.next(); !spaceMap_1_1.done; spaceMap_1_1 = spaceMap_1.next()) {
-                        _e = __read(spaceMap_1_1.value, 2), path = _e[0], spaceFile = _e[1];
+                        _d = __read(spaceMap_1_1.value, 2), path = _d[0], spaceFile = _d[1];
                         editorFile = editorMap.get(path);
                         if (!editorFile) {
-                            // 空间独有的文件（编辑器已删除）
+                            // 空间独有的文件 → 拉取到编辑器（或编辑器已删除）
                             changes.push({
                                 action: 'delete',
                                 path: path,
@@ -43024,16 +43230,15 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                                 sourceLabel: 'shadow-space',
                                 targetLabel: 'editor',
                                 editorHash: null,
-                                spaceHash: spaceFile.remoteHash,
+                                spaceHash: spaceFile.hash,
                             });
                         }
-                        // 注意：空间的本地修改不在这里处理，因为我们主要关注编辑器 vs 云端哈希的比对
                     }
                 }
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (spaceMap_1_1 && !spaceMap_1_1.done && (_g = spaceMap_1.return)) _g.call(spaceMap_1);
+                        if (spaceMap_1_1 && !spaceMap_1_1.done && (_f = spaceMap_1.return)) _f.call(spaceMap_1);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthen/cli",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Appthen Cli Tool",
   "files": [
     "dist",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@alilc/lowcode-types": "^1.3.1",
-    "@appthen/base-generator": "link:/Users/huanglei/Documents/work/lowcode/alilc-engine/modules/code-generator",
+    "@appthen/base-generator": "^1.0.4",
     "@babel/core": "^7.24.0",
     "@babel/generator": "^7.24.0",
     "@babel/helpers": "^7.24.0",