@appthen/cli 1.2.10 → 1.2.11

package/dist/index.js

@@ -29,6 +29,7 @@ var prettier = require('prettier');
 var fs$2 = require('fs-extra');
 var io = require('socket.io-client');
 var fs$3 = require('fs/promises');
+var chokidar = require('chokidar');
 var whatwgUrl = require('whatwg-url');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -80,6 +81,7 @@ var fs__default$1 = /*#__PURE__*/_interopDefaultLegacy(fs$2);
 var fs__namespace$1 = /*#__PURE__*/_interopNamespace(fs$2);
 var io__default = /*#__PURE__*/_interopDefaultLegacy(io);
 var fs__default$2 = /*#__PURE__*/_interopDefaultLegacy(fs$3);
+var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 var whatwgUrl__default = /*#__PURE__*/_interopDefaultLegacy(whatwgUrl);
 
 /******************************************************************************
@@ -2803,36 +2805,29 @@ browser$1.destroy;
 browser$1.colors;
 browser$1.log;
 
-var hasFlag = (flag, argv = process.argv) => {
+var hasFlag = (flag, argv) => {
+	argv = argv || process.argv;
 	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-	const position = argv.indexOf(prefix + flag);
-	const terminatorPosition = argv.indexOf('--');
-	return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+	const pos = argv.indexOf(prefix + flag);
+	const terminatorPos = argv.indexOf('--');
+	return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
 };
 
-const {env} = process;
+const env = process.env;
 
 let forceColor;
 if (hasFlag('no-color') ||
 	hasFlag('no-colors') ||
-	hasFlag('color=false') ||
-	hasFlag('color=never')) {
-	forceColor = 0;
+	hasFlag('color=false')) {
+	forceColor = false;
 } else if (hasFlag('color') ||
 	hasFlag('colors') ||
 	hasFlag('color=true') ||
 	hasFlag('color=always')) {
-	forceColor = 1;
+	forceColor = true;
 }
-
 if ('FORCE_COLOR' in env) {
-	if (env.FORCE_COLOR === 'true') {
-		forceColor = 1;
-	} else if (env.FORCE_COLOR === 'false') {
-		forceColor = 0;
-	} else {
-		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
-	}
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
 }
 
 function translateLevel(level) {
@@ -2848,8 +2843,8 @@ function translateLevel(level) {
 	};
 }
 
-function supportsColor(haveStream, streamIsTTY) {
-	if (forceColor === 0) {
+function supportsColor(stream) {
+	if (forceColor === false) {
 		return 0;
 	}
 
@@ -2863,21 +2858,22 @@ function supportsColor(haveStream, streamIsTTY) {
 		return 2;
 	}
 
-	if (haveStream && !streamIsTTY && forceColor === undefined) {
+	if (stream && !stream.isTTY && forceColor !== true) {
 		return 0;
 	}
 
-	const min = forceColor || 0;
-
-	if (env.TERM === 'dumb') {
-		return min;
-	}
+	const min = forceColor ? 1 : 0;
 
 	if (process.platform === 'win32') {
-		// Windows 10 build 10586 is the first Windows release that supports 256 colors.
-		// Windows 10 build 14931 is the first release that supports 16m/TrueColor.
+		// Node.js 7.5.0 is the first version of Node.js to include a patch to
+		// libuv that enables 256 color output on Windows. Anything earlier and it
+		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
+		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
 		const osRelease = os__default["default"].release().split('.');
 		if (
+			Number(process.versions.node.split('.')[0]) >= 8 &&
 			Number(osRelease[0]) >= 10 &&
 			Number(osRelease[2]) >= 10586
 		) {
@@ -2888,7 +2884,7 @@ function supportsColor(haveStream, streamIsTTY) {
 	}
 
 	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
 			return 1;
 		}
 
@@ -2927,18 +2923,22 @@ function supportsColor(haveStream, streamIsTTY) {
 		return 1;
 	}
 
+	if (env.TERM === 'dumb') {
+		return min;
+	}
+
 	return min;
 }
 
 function getSupportLevel(stream) {
-	const level = supportsColor(stream, stream && stream.isTTY);
+	const level = supportsColor(stream);
 	return translateLevel(level);
 }
 
 var supportsColor_1 = {
 	supportsColor: getSupportLevel,
-	stdout: translateLevel(supportsColor(true, tty__default["default"].isatty(1))),
-	stderr: translateLevel(supportsColor(true, tty__default["default"].isatty(2)))
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
 };
 supportsColor_1.supportsColor;
 supportsColor_1.stdout;
@@ -17179,7 +17179,7 @@ FormData$2.prototype.submit = function (params, cb) {
         request.removeListener('error', callback);
         request.removeListener('response', onResponse);
 
-        return cb.call(this, error, responce); // eslint-disable-line no-invalid-this
+        return cb.call(this, error, responce);
       };
 
       onResponse = callback.bind(this, null);
@@ -17203,7 +17203,7 @@ FormData$2.prototype._error = function (err) {
 FormData$2.prototype.toString = function () {
   return '[object FormData]';
 };
-setToStringTag(FormData$2, 'FormData');
+setToStringTag(FormData$2.prototype, 'FormData');
 
 // Public API
 var form_data = FormData$2;
@@ -18819,9 +18819,8 @@ var request = function (url, params, _a) {
                     };
                     return [4 /*yield*/, axios({
                             method: method,
-                            url: (process.env.DEV
-                                ? 'http://127.0.0.1:1626'
-                                : 'https://editor.appthen.com') + url,
+                            url: (process.env.DEV ? 'http://127.0.0.1:1626' : 'https://api.appthen.com') +
+                                url,
                             data: params,
                             headers: headers,
                         })];
@@ -37899,7 +37898,7 @@ function create(options) {
 
 var fuck = function () { };
 
-var server = 'wss://editor.appthen.com';
+var server = 'wss://api.appthen.com';
 var devServer = 'ws://127.0.0.1:1626';
 var DEV_MODE$1 = process.env.DEV;
 var SocketStore = /** @class */ (function () {
@@ -40668,8 +40667,13 @@ function regExpEscape (s) {
   return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
 }
 
-// import chokidar, { FSWatcher } from 'chokidar';
-var logger = function () { };
+var logger = function () {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    console.log.apply(console, __spreadArray([], __read(args), false));
+};
 /**
  * 影子空间管理器
  * 维护编辑器状态的本地镜像，用于检测文件变更
@@ -40951,6 +40955,7 @@ var ShadowSpace = /** @class */ (function () {
                         return [4 /*yield*/, fs__default$1["default"].unlink(fullPath)];
                     case 2:
                         _a.sent();
+                        logger("\u672C\u5730\u6587\u4EF6\u5DF2\u5220\u9664: ".concat(fullPath));
                         return [3 /*break*/, 4];
                     case 3:
                         error_1 = _a.sent();
@@ -40964,6 +40969,7 @@ var ShadowSpace = /** @class */ (function () {
                         return [4 /*yield*/, this.saveState()];
                     case 5:
                         _a.sent();
+                        logger("\u5F71\u5B50\u7A7A\u95F4\u6587\u4EF6\u5DF2\u5220\u9664: ".concat(filePath));
                         return [2 /*return*/, true];
                 }
             });
@@ -40975,33 +40981,33 @@ var ShadowSpace = /** @class */ (function () {
      */
     ShadowSpace.prototype.detectChanges = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var changes, _a, _b, _c, filePath, shadowEntry, localFilePath, localContent, localHash, fileStat, fileModifyTime, shadowContent, _d, _e, error_2, shadowContent, e_3_1, localFiles, localFiles_1, localFiles_1_1, localFile;
-            var e_3, _f, _g, e_4, _h;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
+            var changes, _a, _b, _c, filePath, shadowEntry, localFilePath, localContent, localHash, fileStat, fileModifyTime, shadowContent, _d, _e, error_2, shadowContent, e_3_1, localFiles, localFiles_1, localFiles_1_1, localFile, tempNormalizePath, addsFromRemote, addsFromLocal, _loop_1, addsFromRemote_1, addsFromRemote_1_1, remoteAdd;
+            var e_3, _f, _g, e_4, _h, e_5, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         changes = [];
-                        _j.label = 1;
+                        _k.label = 1;
                     case 1:
-                        _j.trys.push([1, 16, 17, 18]);
+                        _k.trys.push([1, 16, 17, 18]);
                         _a = __values(Object.entries(this.state.files)), _b = _a.next();
-                        _j.label = 2;
+                        _k.label = 2;
                     case 2:
                         if (!!_b.done) return [3 /*break*/, 15];
                         _c = __read(_b.value, 2), filePath = _c[0], shadowEntry = _c[1];
                         localFilePath = path__default["default"].join(this.config.projectRoot, filePath);
-                        _j.label = 3;
+                        _k.label = 3;
                     case 3:
-                        _j.trys.push([3, 11, , 14]);
+                        _k.trys.push([3, 11, , 14]);
                         return [4 /*yield*/, fs__default$1["default"].readFile(localFilePath, 'utf8')];
                     case 4:
-                        localContent = _j.sent();
+                        localContent = _k.sent();
                         localHash = this.calculateHash(localContent);
                         if (!(localHash !== shadowEntry.hash)) return [3 /*break*/, 10];
                         if (!shadowEntry.remoteModified) return [3 /*break*/, 7];
                         return [4 /*yield*/, fs__default$1["default"].stat(localFilePath)];
                     case 5:
-                        fileStat = _j.sent();
+                        fileStat = _k.sent();
                         fileModifyTime = fileStat.mtimeMs;
                         // logger(`[ShadowSpace] 🔍 更新文件时间戳: ${filePath}`, {
                         //   旧lastModified: new Date(
@@ -41017,12 +41023,12 @@ var ShadowSpace = /** @class */ (function () {
                         return [4 /*yield*/, this.saveState()];
                     case 6:
                         // 保存状态
-                        _j.sent();
+                        _k.sent();
                         // 🔥 跳过，不添加到 changes
                         return [3 /*break*/, 14];
                     case 7: return [4 /*yield*/, this.getShadowContent(filePath)];
                     case 8:
-                        shadowContent = _j.sent();
+                        shadowContent = _k.sent();
                         _e = (_d = changes).push;
                         _g = {
                             id: this.generateId(),
@@ -41032,21 +41038,21 @@ var ShadowSpace = /** @class */ (function () {
                         };
                         return [4 /*yield*/, fs__default$1["default"].stat(localFilePath)];
                     case 9:
-                        _e.apply(_d, [(_g.timestamp = (_j.sent()).mtime.getTime(),
+                        _e.apply(_d, [(_g.timestamp = (_k.sent()).mtime.getTime(),
                                 _g.diff = {
                                     before: shadowContent,
                                     after: localContent,
                                 },
                                 _g.projectId = this.state.projectId,
                                 _g)]);
-                        _j.label = 10;
+                        _k.label = 10;
                     case 10: return [3 /*break*/, 14];
                     case 11:
-                        error_2 = _j.sent();
+                        error_2 = _k.sent();
                         if (!(error_2.code === 'ENOENT')) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.getShadowContent(filePath)];
                     case 12:
-                        shadowContent = _j.sent();
+                        shadowContent = _k.sent();
                         changes.push({
                             id: this.generateId(),
                             action: 'delete',
@@ -41059,14 +41065,14 @@ var ShadowSpace = /** @class */ (function () {
                             },
                             projectId: this.state.projectId,
                         });
-                        _j.label = 13;
+                        _k.label = 13;
                     case 13: return [3 /*break*/, 14];
                     case 14:
                         _b = _a.next();
                         return [3 /*break*/, 2];
                     case 15: return [3 /*break*/, 18];
                     case 16:
-                        e_3_1 = _j.sent();
+                        e_3_1 = _k.sent();
                         e_3 = { error: e_3_1 };
                         return [3 /*break*/, 18];
                     case 17:
@@ -41077,7 +41083,7 @@ var ShadowSpace = /** @class */ (function () {
                         return [7 /*endfinally*/];
                     case 18: return [4 /*yield*/, this.scanLocalFiles()];
                     case 19:
-                        localFiles = _j.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;
@@ -41104,6 +41110,53 @@ var ShadowSpace = /** @class */ (function () {
                             }
                             finally { if (e_4) throw e_4.error; }
                         }
+                        tempNormalizePath = function (p) { return p.replace(/\\/g, '/'); };
+                        addsFromRemote = changes.filter(function (c) { return c.action === 'add' && c.side === 'editor'; });
+                        addsFromLocal = changes.filter(function (c) { return c.action === 'add' && c.side === 'space'; });
+                        _loop_1 = function (remoteAdd) {
+                            var localAdd = addsFromLocal.find(function (l) {
+                                return tempNormalizePath(l.path) === tempNormalizePath(remoteAdd.path);
+                            });
+                            if (localAdd) {
+                                // 发现双向 Add，说明 Map Key 匹配失败了，但路径标准化后是一样的
+                                console.error("[ShadowSpace] CRITICAL: Detected dual ADD for ".concat(remoteAdd.path, ". Merging to CONFLICT."));
+                                // 移除这两个 Add
+                                var indexR = changes.indexOf(remoteAdd);
+                                if (indexR > -1)
+                                    changes.splice(indexR, 1);
+                                var indexL = changes.indexOf(localAdd);
+                                if (indexL > -1)
+                                    changes.splice(indexL, 1);
+                                // 添加一个 Modify Conflict
+                                changes.push({
+                                    action: 'modify',
+                                    path: tempNormalizePath(remoteAdd.path),
+                                    side: 'editor',
+                                    sourceLabel: 'remote',
+                                    targetLabel: 'local',
+                                    // @ts-ignore
+                                    editorHash: remoteAdd.editorHash,
+                                    // @ts-ignore
+                                    spaceHash: localAdd.spaceHash,
+                                    conflict: true,
+                                    // @ts-ignore
+                                    debug: 'merged_dual_add',
+                                });
+                            }
+                        };
+                        try {
+                            for (addsFromRemote_1 = __values(addsFromRemote), addsFromRemote_1_1 = addsFromRemote_1.next(); !addsFromRemote_1_1.done; addsFromRemote_1_1 = addsFromRemote_1.next()) {
+                                remoteAdd = addsFromRemote_1_1.value;
+                                _loop_1(remoteAdd);
+                            }
+                        }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        finally {
+                            try {
+                                if (addsFromRemote_1_1 && !addsFromRemote_1_1.done && (_j = addsFromRemote_1.return)) _j.call(addsFromRemote_1);
+                            }
+                            finally { if (e_5) throw e_5.error; }
+                        }
                         return [2 /*return*/, changes];
                 }
             });
@@ -41114,16 +41167,16 @@ var ShadowSpace = /** @class */ (function () {
      */
     ShadowSpace.prototype.applyChanges = function (changes) {
         return __awaiter(this, void 0, void 0, function () {
-            var changes_1, changes_1_1, change, _a, e_5_1;
-            var e_5, _b;
+            var changes_1, changes_1_1, change, _a, e_6_1;
+            var e_6, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _c.trys.push([0, 9, 10, 11]);
+                        _c.trys.push([0, 10, 11, 12]);
                         changes_1 = __values(changes), changes_1_1 = changes_1.next();
                         _c.label = 1;
                     case 1:
-                        if (!!changes_1_1.done) return [3 /*break*/, 8];
+                        if (!!changes_1_1.done) return [3 /*break*/, 9];
                         change = changes_1_1.value;
                         _a = change.action;
                         switch (_a) {
@@ -41138,26 +41191,27 @@ var ShadowSpace = /** @class */ (function () {
                     case 3:
                         _c.sent();
                         _c.label = 4;
-                    case 4: return [3 /*break*/, 7];
+                    case 4: return [3 /*break*/, 8];
                     case 5: return [4 /*yield*/, this.deleteFile(change.path)];
                     case 6:
                         _c.sent();
-                        return [3 /*break*/, 7];
-                    case 7:
+                        return [3 /*break*/, 8];
+                    case 7: return [3 /*break*/, 8];
+                    case 8:
                         changes_1_1 = changes_1.next();
                         return [3 /*break*/, 1];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
-                        e_5_1 = _c.sent();
-                        e_5 = { error: e_5_1 };
-                        return [3 /*break*/, 11];
+                    case 9: return [3 /*break*/, 12];
                     case 10:
+                        e_6_1 = _c.sent();
+                        e_6 = { error: e_6_1 };
+                        return [3 /*break*/, 12];
+                    case 11:
                         try {
                             if (changes_1_1 && !changes_1_1.done && (_b = changes_1.return)) _b.call(changes_1);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
-                    case 11:
+                    case 12:
                         logger("\u5F71\u5B50\u7A7A\u95F4\u5DF2\u5E94\u7528 ".concat(changes.length, " \u4E2A\u53D8\u66F4"));
                         return [2 /*return*/];
                 }
@@ -41205,6 +41259,7 @@ var ShadowSpace = /** @class */ (function () {
                     case 0:
                         // 检查文件是否在影子空间中
                         if (!this.hasFile(filePath)) {
+                            logger("[ShadowSpace] \u6587\u4EF6\u4E0D\u5728\u5F71\u5B50\u7A7A\u95F4\u4E2D: ".concat(filePath));
                             return [2 /*return*/, null];
                         }
                         _a.label = 1;
@@ -41262,8 +41317,8 @@ var ShadowSpace = /** @class */ (function () {
      */
     ShadowSpace.prototype.markAsRemoteModified = function (filePaths) {
         return __awaiter(this, void 0, void 0, function () {
-            var now, hasChanges, filePaths_1, filePaths_1_1, filePath, fullPath, stats, content, hash, existingFile, remoteHash, error_5, e_6_1;
-            var e_6, _a;
+            var now, hasChanges, filePaths_1, filePaths_1_1, filePath, fullPath, stats, content, hash, existingFile, remoteHash, error_5, e_7_1;
+            var e_7, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -41313,14 +41368,14 @@ var ShadowSpace = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_6_1 = _b.sent();
-                        e_6 = { error: e_6_1 };
+                        e_7_1 = _b.sent();
+                        e_7 = { error: e_7_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
                             if (filePaths_1_1 && !filePaths_1_1.done && (_a = filePaths_1.return)) _a.call(filePaths_1);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_7) throw e_7.error; }
                         return [7 /*endfinally*/];
                     case 11:
                         if (!hasChanges) return [3 /*break*/, 13];
@@ -41342,7 +41397,7 @@ var ShadowSpace = /** @class */ (function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var hasChanges, pathsToProcess, pathsToProcess_1, pathsToProcess_1_1, filePath;
-            var e_7, _b;
+            var e_8, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -41358,12 +41413,12 @@ var ShadowSpace = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
                                 if (pathsToProcess_1_1 && !pathsToProcess_1_1.done && (_b = pathsToProcess_1.return)) _b.call(pathsToProcess_1);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                         if (!hasChanges) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.saveState()];
@@ -41383,7 +41438,7 @@ var ShadowSpace = /** @class */ (function () {
     ShadowSpace.prototype.getSpaceSnapshots = function (_spaceId) {
         return __awaiter(this, void 0, void 0, function () {
             var snapshots, _a, _b, _c, filePath, shadowEntry, modifyTime, error_6;
-            var e_8, _d;
+            var e_9, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -41413,12 +41468,12 @@ var ShadowSpace = /** @class */ (function () {
                                 });
                             }
                         }
-                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                             }
-                            finally { if (e_8) throw e_8.error; }
+                            finally { if (e_9) throw e_9.error; }
                         }
                         logger("[ShadowSpace] \u83B7\u53D6\u7A7A\u95F4\u5FEB\u7167: ".concat(snapshots.length, " \u4E2A\u6587\u4EF6"));
                         return [2 /*return*/, snapshots];
@@ -41457,6 +41512,633 @@ var ShadowSpace = /** @class */ (function () {
             });
         });
     };
+    /**
+     * 独立同步：获取远端文件快照
+     */
+    ShadowSpace.prototype.fetchRemoteSnapshot = function () {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function () {
+            var requestParams, response, files, snapshot_1, processNode_1, error_8;
+            var _this = this;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        _g.trys.push([0, 2, , 3]);
+                        requestParams = {
+                            projectId: this.config.projectId,
+                            path: '/',
+                            options: {
+                                recursive: true,
+                                includeTypeEntity: false,
+                            },
+                        };
+                        logger('[ShadowSpace] 开始获取远端快照...', requestParams);
+                        return [4 /*yield*/, request('/editor/vfs/readdir', requestParams)];
+                    case 1:
+                        response = _g.sent();
+                        // Log response structure for debugging
+                        logger('[ShadowSpace] 远端响应数据结构:', {
+                            type: typeof response.data,
+                            isSuccess: (_a = response.data) === null || _a === void 0 ? void 0 : _a.success,
+                            dataType: typeof ((_b = response.data) === null || _b === void 0 ? void 0 : _b.data),
+                            isArray: Array.isArray((_c = response.data) === null || _c === void 0 ? void 0 : _c.data),
+                            dataKeys: ((_d = response.data) === null || _d === void 0 ? void 0 : _d.data) ? Object.keys(response.data.data) : [],
+                        });
+                        if (!((_e = response.data) === null || _e === void 0 ? void 0 : _e.success)) {
+                            throw new Error(((_f = response.data) === null || _f === void 0 ? void 0 : _f.message) || 'Failed to fetch remote snapshot');
+                        }
+                        files = response.data.data;
+                        if (!Array.isArray(files)) {
+                            // If it's an object with a children property (common file system tree structure)
+                            if (files && Array.isArray(files.children)) {
+                                files = files.children;
+                            }
+                            else if (files && Array.isArray(files.entries)) {
+                                // Fix: Support entries array
+                                files = files.entries;
+                            }
+                            else if (files && typeof files === 'object') {
+                                // If it's a map/object structure, try to convert values to array or wrap single object
+                                files = [files];
+                            }
+                            else {
+                                logger('[ShadowSpace] 警告: 远端返回的数据不是数组', files);
+                                files = [];
+                            }
+                        }
+                        snapshot_1 = [];
+                        processNode_1 = function (node) {
+                            if (!node)
+                                return;
+                            // Try to normalize node structure
+                            // If node has 'stats', use it. Otherwise, node itself might be stats or metadata.
+                            // Based on user provided example:
+                            // { "path": "...", "stats": { "type": "file", "contentHash": "..." } }
+                            var stats = node.stats || node;
+                            var type = stats.type || node.type;
+                            var filePath = node.path || stats.path;
+                            if (type === 'file') {
+                                // 去除开头的 /
+                                var relativePath = filePath;
+                                if (relativePath.startsWith('/')) {
+                                    relativePath = relativePath.slice(1);
+                                }
+                                // 🔥 调试：打印原始路径和标准化后的路径
+                                if (relativePath.includes('TicketHistory') ||
+                                    filePath.includes('TicketHistory')) {
+                                    logger("[ShadowSpace] Path Normalization: \"".concat(filePath, "\" -> \"").concat(relativePath, "\""));
+                                }
+                                // 忽略文件
+                                if (_this.shouldIgnoreFile(relativePath)) {
+                                    return;
+                                }
+                                snapshot_1.push({
+                                    path: relativePath,
+                                    hash: stats.contentHash || '',
+                                    modify: stats.modifyTime || 0,
+                                    size: stats.size || 0,
+                                });
+                            }
+                            // Handle recursive directory structure if present
+                            if (node.children && Array.isArray(node.children)) {
+                                node.children.forEach(processNode_1);
+                            }
+                        };
+                        files.forEach(processNode_1);
+                        logger("[ShadowSpace] \u83B7\u53D6\u5230 ".concat(snapshot_1.length, " \u4E2A\u8FDC\u7AEF\u6587\u4EF6"));
+                        return [2 /*return*/, snapshot_1];
+                    case 2:
+                        error_8 = _g.sent();
+                        console.error('[ShadowSpace] 获取远端快照失败:', error_8);
+                        if (error_8.response) {
+                            console.error('[ShadowSpace] 远端响应详情:', {
+                                status: error_8.response.status,
+                                statusText: error_8.response.statusText,
+                                data: error_8.response.data,
+                                headers: error_8.response.headers,
+                            });
+                        }
+                        throw error_8;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * 独立同步：下载远端文件
+     */
+    ShadowSpace.prototype.downloadRemoteFile = function (filePath) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var remotePath, response, error_9;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _c.trys.push([0, 2, , 3]);
+                        remotePath = filePath.startsWith('/') ? filePath : '/' + filePath;
+                        return [4 /*yield*/, request('/editor/vfs/read', {
+                                projectId: this.config.projectId,
+                                path: remotePath,
+                                isCodeMode: true,
+                            })];
+                    case 1:
+                        response = _c.sent();
+                        if (!((_a = response.data) === null || _a === void 0 ? void 0 : _a.success)) {
+                            throw new Error(((_b = response.data) === null || _b === void 0 ? void 0 : _b.message) || "Failed to download file: ".concat(filePath));
+                        }
+                        return [2 /*return*/, response.data.data.content];
+                    case 2:
+                        error_9 = _c.sent();
+                        console.error("[ShadowSpace] \u4E0B\u8F7D\u6587\u4EF6\u5931\u8D25: ".concat(filePath), error_9);
+                        throw error_9;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * 独立同步：上传本地文件
+     */
+    ShadowSpace.prototype.uploadLocalFile = function (filePath, content) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var remotePath, response, error_10;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _c.trys.push([0, 2, , 3]);
+                        remotePath = filePath.startsWith('/') ? filePath : '/' + filePath;
+                        return [4 /*yield*/, request('/editor/vfs/write', {
+                                projectId: this.config.projectId,
+                                path: remotePath,
+                                content: content,
+                                options: {
+                                    writeMode: 'code',
+                                    skipValidation: true,
+                                },
+                            })];
+                    case 1:
+                        response = _c.sent();
+                        if (!((_a = response.data) === null || _a === void 0 ? void 0 : _a.success)) {
+                            throw new Error(((_b = response.data) === null || _b === void 0 ? void 0 : _b.message) || "Failed to upload file: ".concat(filePath));
+                        }
+                        return [3 /*break*/, 3];
+                    case 2:
+                        error_10 = _c.sent();
+                        console.error("[ShadowSpace] \u4E0A\u4F20\u6587\u4EF6\u5931\u8D25: ".concat(filePath), error_10);
+                        throw error_10;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * 比对快照，生成变更列表
+     * (从 ShadowSpaceCommandHandler 移动而来，核心比对逻辑)
+     */
+    ShadowSpace.prototype.compareSnapshots = function (remoteSnapshots, localSnapshots) {
+        var e_10, _a, e_11, _b;
+        var changes = [];
+        // 标准化路径工具函数
+        var normalizePath = function (p) {
+            // 统一替换反斜杠为正斜杠
+            var normalized = p.replace(/\\/g, '/');
+            // 去除开头的 ./
+            if (normalized.startsWith('./'))
+                normalized = normalized.substring(2);
+            // 去除开头的 /
+            if (normalized.startsWith('/'))
+                normalized = normalized.substring(1);
+            return normalized;
+        };
+        // 确保输入参数是数组
+        var safeRemoteSnapshots = Array.isArray(remoteSnapshots)
+            ? remoteSnapshots
+            : [];
+        var safeLocalSnapshots = Array.isArray(localSnapshots)
+            ? localSnapshots
+            : [];
+        // 构建映射表 (强制标准化 key)
+        var remoteMap = new Map(safeRemoteSnapshots.map(function (f) { return [normalizePath(f.path), f]; }));
+        var localMap = new Map(safeLocalSnapshots.map(function (f) { return [normalizePath(f.path), f]; }));
+        var remoteKeys = Array.from(remoteMap.keys());
+        var localKeys = Array.from(localMap.keys());
+        var remoteKey = remoteKeys.find(function (k) { return k.includes('__afterRequest'); });
+        var localKey = localKeys.find(function (k) { return k.includes('__afterRequest'); });
+        if (remoteKey || localKey) {
+            logger('[ShadowSpace] CharCodes Debug:', {
+                remoteKey: remoteKey,
+                remoteCodes: remoteKey
+                    ? Array.from(remoteKey).map(function (c) { return c.charCodeAt(0); })
+                    : null,
+                localKey: localKey,
+                localCodes: localKey
+                    ? Array.from(localKey).map(function (c) { return c.charCodeAt(0); })
+                    : null,
+                isEqual: remoteKey === localKey,
+            });
+        }
+        logger('[ShadowSpace] 比对文件列表 (Normalized):', {
+            remoteCount: remoteMap.size,
+            localCount: localMap.size,
+            remoteFiles: Array.from(remoteMap.keys()),
+            localFiles: Array.from(localMap.keys()),
+        });
+        // 1. 检测远端的变更（相对于本地）
+        // 遍历远端文件
+        console.log('localMap: ', localMap.keys());
+        var _loop_2 = function (filePath, remoteFile) {
+            var localFile = localMap.get(filePath);
+            if (!localFile) {
+                console.log('filePath: ', filePath, filePath.length, filePath.startsWith(' '));
+                // 本地缺失 -> 需要从远端拉取 (Pull)
+                logger("[ShadowSpace] \u53D1\u73B0\u672C\u5730\u7F3A\u5931: ".concat(filePath, " (Add to Local)"));
+                changes.push({
+                    action: 'add',
+                    path: filePath,
+                    side: 'editor',
+                    sourceLabel: 'remote',
+                    targetLabel: 'local',
+                    editorHash: remoteFile.hash,
+                    spaceHash: null,
+                });
+            }
+            else if (remoteFile.hash !== localFile.hash) {
+                // Hash 不同，需要判断谁是最新版本
+                var remoteModify = remoteFile.modify || 0;
+                var localModify = localFile.modify || 0;
+                logger("[ShadowSpace] \u53D1\u73B0\u53D8\u66F4: ".concat(filePath), {
+                    remoteHash: remoteFile.hash,
+                    localHash: localFile.hash,
+                    remoteModify: remoteModify,
+                    localModify: localModify,
+                    diff: remoteModify - localModify,
+                });
+                // 如果远端哈希与本地记录的"上次远端哈希"不同，说明远端更新了
+                // const remoteChanged = remoteFile.hash !== localFile.remoteHash;
+                // 如果本地哈希与本地记录的"上次远端哈希"不同，说明本地更新了 (注意：localFile.hash 是当前本地hash)
+                // 实际上 localFile.remoteHash 是上次同步时的远端hash
+                // 如果 localFile.hash != localFile.remoteHash，说明本地有修改
+                // 简单策略：基于时间戳 (或者后续基于 remoteHash 追踪)
+                // 这里沿用 Handler 的时间戳逻辑
+                if (remoteModify > localModify) {
+                    // 远端更新 -> 拉取
+                    changes.push({
+                        action: 'modify',
+                        path: filePath,
+                        side: 'editor',
+                        sourceLabel: 'remote',
+                        targetLabel: 'local',
+                        editorHash: remoteFile.hash,
+                        spaceHash: localFile.hash,
+                    });
+                }
+                else if (localModify > remoteModify) {
+                    // 本地更新 -> 推送
+                    changes.push({
+                        action: 'modify',
+                        path: filePath,
+                        side: 'space',
+                        sourceLabel: 'local',
+                        targetLabel: 'remote',
+                        editorHash: remoteFile.hash,
+                        spaceHash: localFile.hash,
+                    });
+                }
+                else {
+                    // 时间戳相同但哈希不同？冲突，默认拉取远端
+                    // 只有当两者都没被放入changes时才放入，避免重复
+                    var existingChange = changes.find(function (c) { return c.path === filePath; });
+                    if (!existingChange) {
+                        changes.push({
+                            action: 'modify',
+                            path: filePath,
+                            side: 'editor',
+                            sourceLabel: 'remote',
+                            targetLabel: 'local',
+                            editorHash: remoteFile.hash,
+                            spaceHash: localFile.hash,
+                            conflict: true,
+                        });
+                    }
+                }
+            }
+        };
+        try {
+            for (var remoteMap_1 = __values(remoteMap), remoteMap_1_1 = remoteMap_1.next(); !remoteMap_1_1.done; remoteMap_1_1 = remoteMap_1.next()) {
+                var _c = __read(remoteMap_1_1.value, 2), filePath = _c[0], remoteFile = _c[1];
+                _loop_2(filePath, remoteFile);
+            }
+        }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        finally {
+            try {
+                if (remoteMap_1_1 && !remoteMap_1_1.done && (_a = remoteMap_1.return)) _a.call(remoteMap_1);
+            }
+            finally { if (e_10) throw e_10.error; }
+        }
+        try {
+            // 2. 检测本地的新增/删除 (相对于远端)
+            for (var localMap_1 = __values(localMap), localMap_1_1 = localMap_1.next(); !localMap_1_1.done; localMap_1_1 = localMap_1.next()) {
+                var _d = __read(localMap_1_1.value, 2), filePath = _d[0], localFile = _d[1];
+                var remoteFile = remoteMap.get(filePath);
+                if (remoteFile) {
+                    // 远端存在，已经在上面处理过了 (Hash不同或相同)
+                    // 除非我们要处理元数据更新等，否则跳过
+                    continue;
+                }
+                if (!remoteFile) {
+                    // 远端不存在
+                    // 如果本地文件有 remoteHash 且不为空，说明之前存在于远端 -> 远端删除了 -> 本地也删除 (Pull)
+                    if (localFile.remoteHash) {
+                        logger("[ShadowSpace] \u53D1\u73B0\u8FDC\u7AEF\u5220\u9664: ".concat(filePath, " (Delete Local)"));
+                        changes.push({
+                            action: 'delete',
+                            path: filePath,
+                            side: 'editor',
+                            sourceLabel: 'remote',
+                            targetLabel: 'local',
+                            editorHash: null,
+                            spaceHash: localFile.hash,
+                        });
+                    }
+                    else {
+                        // 本地新增 -> 推送到远端 (Push)
+                        logger("[ShadowSpace] \u53D1\u73B0\u672C\u5730\u65B0\u589E: ".concat(filePath, " (Push to Remote)"));
+                        changes.push({
+                            action: 'add',
+                            path: filePath,
+                            side: 'space',
+                            sourceLabel: 'local',
+                            targetLabel: 'remote',
+                            editorHash: null,
+                            spaceHash: localFile.hash,
+                        });
+                    }
+                }
+            }
+        }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        finally {
+            try {
+                if (localMap_1_1 && !localMap_1_1.done && (_b = localMap_1.return)) _b.call(localMap_1);
+            }
+            finally { if (e_11) throw e_11.error; }
+        }
+        return changes;
+    };
+    /**
+     * 独立同步：执行完整同步
+     */
+    ShadowSpace.prototype.syncWithRemote = function (options) {
+        if (options === void 0) { options = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            var remoteSnapshot, localSnapshot, changes, result, changes_2, changes_2_1, change, content, remoteHash, content, err_1, e_12_1;
+            var e_12, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.fetchRemoteSnapshot()];
+                    case 1:
+                        remoteSnapshot = _b.sent();
+                        if (!(Object.keys(this.state.files).length === 0)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.syncLocalState()];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3: return [4 /*yield*/, this.getSpaceSnapshots()];
+                    case 4:
+                        localSnapshot = _b.sent();
+                        changes = this.compareSnapshots(remoteSnapshot, localSnapshot);
+                        result = {
+                            changes: changes,
+                            summary: {
+                                total: changes.length,
+                                pull: changes.filter(function (c) { return c.side === 'editor'; }).length,
+                                push: changes.filter(function (c) { return c.side === 'space'; }).length,
+                            },
+                        };
+                        if (options.dryRun || !options.autoApply) {
+                            return [2 /*return*/, result];
+                        }
+                        _b.label = 5;
+                    case 5:
+                        _b.trys.push([5, 22, 23, 24]);
+                        changes_2 = __values(changes), changes_2_1 = changes_2.next();
+                        _b.label = 6;
+                    case 6:
+                        if (!!changes_2_1.done) return [3 /*break*/, 21];
+                        change = changes_2_1.value;
+                        _b.label = 7;
+                    case 7:
+                        _b.trys.push([7, 19, , 20]);
+                        if (!(change.side === 'editor')) return [3 /*break*/, 15];
+                        if (!(change.action === 'delete')) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.deleteFile(change.path)];
+                    case 8:
+                        _b.sent();
+                        return [3 /*break*/, 14];
+                    case 9: return [4 /*yield*/, this.downloadRemoteFile(change.path)];
+                    case 10:
+                        content = _b.sent();
+                        remoteHash = change.editorHash;
+                        if (!remoteHash) return [3 /*break*/, 12];
+                        return [4 /*yield*/, this.updateFileFromRemote(change.path, content, remoteHash)];
+                    case 11:
+                        _b.sent();
+                        return [3 /*break*/, 14];
+                    case 12: 
+                    // 如果没有 remoteHash (理论上不应该)，回退到普通 update
+                    return [4 /*yield*/, this.updateFile(change.path, content)];
+                    case 13:
+                        // 如果没有 remoteHash (理论上不应该)，回退到普通 update
+                        _b.sent();
+                        _b.label = 14;
+                    case 14: return [3 /*break*/, 18];
+                    case 15:
+                        if (!(change.action === 'add' || change.action === 'modify')) return [3 /*break*/, 18];
+                        return [4 /*yield*/, this.getShadowContent(change.path)];
+                    case 16:
+                        content = _b.sent();
+                        if (!content) return [3 /*break*/, 18];
+                        return [4 /*yield*/, this.uploadLocalFile(change.path, content)];
+                    case 17:
+                        _b.sent();
+                        // 更新状态
+                        if (this.state.files[change.path]) {
+                            // Push 成功后，远端 Hash 应该等于本地 Hash
+                            this.state.files[change.path].remoteHash =
+                                this.state.files[change.path].hash;
+                        }
+                        _b.label = 18;
+                    case 18: return [3 /*break*/, 20];
+                    case 19:
+                        err_1 = _b.sent();
+                        console.error("Failed to apply change for ".concat(change.path), err_1);
+                        return [3 /*break*/, 20];
+                    case 20:
+                        changes_2_1 = changes_2.next();
+                        return [3 /*break*/, 6];
+                    case 21: return [3 /*break*/, 24];
+                    case 22:
+                        e_12_1 = _b.sent();
+                        e_12 = { error: e_12_1 };
+                        return [3 /*break*/, 24];
+                    case 23:
+                        try {
+                            if (changes_2_1 && !changes_2_1.done && (_a = changes_2.return)) _a.call(changes_2);
+                        }
+                        finally { if (e_12) throw e_12.error; }
+                        return [7 /*endfinally*/];
+                    case 24: return [4 /*yield*/, this.saveState()];
+                    case 25:
+                        _b.sent();
+                        return [2 /*return*/, result];
+                }
+            });
+        });
+    };
+    /**
+     * 🆕 从远端更新文件（正确维护 remoteHash）
+     */
+    ShadowSpace.prototype.updateFileFromRemote = function (filePath, content, remoteHash) {
+        return __awaiter(this, void 0, void 0, function () {
+            var localHash, size, now, currentEntry;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.shouldIgnoreFile(filePath)) {
+                            return [2 /*return*/, false];
+                        }
+                        // 1. 写入本地文件
+                        return [4 /*yield*/, this.writeLocalFile(filePath, content)];
+                    case 1:
+                        // 1. 写入本地文件
+                        _a.sent();
+                        localHash = this.calculateHash(content);
+                        size = Buffer.byteLength(content, 'utf8');
+                        now = Date.now();
+                        currentEntry = this.state.files[filePath];
+                        this.state.files[filePath] = {
+                            path: filePath,
+                            hash: localHash,
+                            remoteHash: remoteHash,
+                            size: size,
+                            lastSyncTime: now,
+                            lastModified: now,
+                            version: currentEntry ? currentEntry.version + 1 : 1,
+                            mtime: now,
+                            remoteModified: false, // 已同步，清除标记
+                        };
+                        // 更新缓存
+                        this.contentCache.set(filePath, content);
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    // ==================== 🆕 文件监听功能 ====================
+    /**
+     * 启动文件监听
+     */
+    ShadowSpace.prototype.startWatching = function () {
+        var _this = this;
+        if (this.isWatching) {
+            logger('[ShadowSpace] 文件监听已经在运行中');
+            return;
+        }
+        logger('[ShadowSpace] 启动文件监听...');
+        logger('[ShadowSpace] 监听目录:', this.config.projectRoot);
+        try {
+            // 🔥 使用轮询模式 + ignored 函数过滤
+            this.watcher = chokidar__default["default"].watch(this.config.projectRoot, {
+                ignored: function (filePath) {
+                    var relativePath = path__default["default"].relative(_this.config.projectRoot, filePath);
+                    // 忽略根目录本身
+                    if (!relativePath || relativePath === '.') {
+                        return true;
+                    }
+                    // 使用白名单过滤
+                    return _this.shouldIgnoreFile(relativePath);
+                },
+                persistent: true,
+                ignoreInitial: true,
+                usePolling: true,
+                interval: 2000,
+                binaryInterval: 3000,
+                depth: 99,
+                awaitWriteFinish: {
+                    stabilityThreshold: 500,
+                    pollInterval: 100,
+                },
+            });
+            logger('[ShadowSpace] chokidar.watch 已调用，等待 ready 事件...');
+        }
+        catch (error) {
+            console.error('[ShadowSpace] 创建文件监听器失败:', error);
+        }
+        if (this.watcher) {
+            this.watcher
+                .on('change', function (filePath) {
+                _this.onFileChanged(filePath);
+            })
+                .on('add', function (filePath) {
+                _this.onFileAdded(filePath);
+            })
+                .on('unlink', function (filePath) {
+                _this.onFileDeleted(filePath);
+            })
+                .on('error', function (error) {
+                console.error('[ShadowSpace] 文件监听错误:', error);
+            })
+                .on('ready', function () {
+                _this.isWatching = true;
+                logger('[ShadowSpace] 文件监听已启动，正在监听:', _this.config.projectRoot);
+                logger('[ShadowSpace] 监听配置: 轮询模式 (interval: 2s)');
+            });
+        }
+    };
+    /**
+     * 停止文件监听
+     */
+    ShadowSpace.prototype.stopWatching = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.isWatching || !this.watcher) {
+                            logger('[ShadowSpace] 文件监听未运行');
+                            return [2 /*return*/];
+                        }
+                        logger('[ShadowSpace] 停止文件监听...');
+                        return [4 /*yield*/, this.watcher.close()];
+                    case 1:
+                        _a.sent();
+                        this.watcher = null;
+                        this.isWatching = false;
+                        logger('[ShadowSpace] 文件监听已停止');
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * 添加变更事件监听器
+     */
+    ShadowSpace.prototype.addChangeListener = function (listener) {
+        this.changeListeners.add(listener);
+    };
+    /**
+     * 移除变更事件监听器
+     */
+    ShadowSpace.prototype.removeChangeListener = function (listener) {
+        this.changeListeners.delete(listener);
+    };
+    /**
+     * 获取监听状态
+     */
+    ShadowSpace.prototype.isFileWatching = function () {
+        return this.isWatching;
+    };
     // ==================== 私有方法 ====================
     /**
      * 生成基于路径的唯一空间ID
@@ -41477,6 +42159,7 @@ var ShadowSpace = /** @class */ (function () {
         var dirName = path__default["default"].basename(absolutePath);
         // 组合生成空间ID: 目录名-路径hash
         var spaceId = "".concat(dirName, "-").concat(pathHash);
+        logger("[ShadowSpace] \u751F\u6210\u7A7A\u95F4ID: ".concat(spaceId, " (\u8DEF\u5F84: ").concat(absolutePath, ")"));
         return spaceId;
     };
     /**
@@ -41484,7 +42167,7 @@ var ShadowSpace = /** @class */ (function () {
      */
     ShadowSpace.prototype.saveSpaceConfig = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var configFile, config, error_8;
+            var configFile, config, error_11;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -41506,10 +42189,11 @@ var ShadowSpace = /** @class */ (function () {
                         return [4 /*yield*/, fs__default$1["default"].writeFile(configFile, JSON.stringify(config, null, 2))];
                     case 3:
                         _a.sent();
+                        logger("[ShadowSpace] \u7A7A\u95F4\u914D\u7F6E\u5DF2\u4FDD\u5B58: ".concat(configFile));
                         return [3 /*break*/, 5];
                     case 4:
-                        error_8 = _a.sent();
-                        console.warn('[ShadowSpace] 保存空间配置失败:', error_8);
+                        error_11 = _a.sent();
+                        console.warn('[ShadowSpace] 保存空间配置失败:', error_11);
                         return [3 /*break*/, 5];
                     case 5: return [2 /*return*/];
                 }
@@ -41521,14 +42205,15 @@ var ShadowSpace = /** @class */ (function () {
      */
     ShadowSpace.prototype.migrateOldStateFiles = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var appthenDir, files, oldStateFiles, oldStateFiles_1, oldStateFiles_1_1, oldFile, oldFilePath, oldState, backupFile, e_9_1, error_9;
-            var e_9, _a;
+            var appthenDir, files, oldStateFiles, oldStateFiles_1, oldStateFiles_1_1, oldFile, oldFilePath, oldState, backupFile, e_13_1, error_12;
+            var e_13, _a;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _b.trys.push([0, 12, , 13]);
                         appthenDir = path__default["default"].join(this.config.projectRoot, '.appthen');
+                        logger("[ShadowSpace] \u68C0\u67E5\u8FC1\u79FB: ".concat(appthenDir));
                         return [4 /*yield*/, fs__default$1["default"].readdir(appthenDir)];
                     case 1:
                         files = _b.sent();
@@ -41568,25 +42253,26 @@ var ShadowSpace = /** @class */ (function () {
                     case 6:
                         _b.sent();
                         logger("[ShadowSpace] \u5DF2\u8FC1\u79FB ".concat(Object.keys(this.state.files).length, " \u4E2A\u6587\u4EF6\u5230\u65B0\u7A7A\u95F4 ").concat(this.config.spaceId));
+                        logger("[ShadowSpace] \u65E7\u6587\u4EF6\u5DF2\u5907\u4EFD\u4E3A: ".concat(backupFile));
                         return [3 /*break*/, 8]; // 只迁移第一个匹配的文件
                     case 7:
                         oldStateFiles_1_1 = oldStateFiles_1.next();
                         return [3 /*break*/, 3];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_9_1 = _b.sent();
-                        e_9 = { error: e_9_1 };
+                        e_13_1 = _b.sent();
+                        e_13 = { error: e_13_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
                             if (oldStateFiles_1_1 && !oldStateFiles_1_1.done && (_a = oldStateFiles_1.return)) _a.call(oldStateFiles_1);
                         }
-                        finally { if (e_9) throw e_9.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 11: return [3 /*break*/, 13];
                     case 12:
-                        error_9 = _b.sent();
-                        console.warn('[ShadowSpace] 迁移旧状态文件失败:', error_9);
+                        error_12 = _b.sent();
+                        console.warn('[ShadowSpace] 迁移旧状态文件失败:', error_12);
                         return [3 /*break*/, 13];
                     case 13: return [2 /*return*/];
                 }
@@ -41595,7 +42281,7 @@ var ShadowSpace = /** @class */ (function () {
     };
     ShadowSpace.prototype.getShadowContent = function (filePath) {
         return __awaiter(this, void 0, void 0, function () {
-            var localPath, content, error_10;
+            var localPath, content, error_13;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -41613,8 +42299,8 @@ var ShadowSpace = /** @class */ (function () {
                         this.contentCache.set(filePath, content);
                         return [2 /*return*/, content];
                     case 3:
-                        error_10 = _a.sent();
-                        console.warn("\u65E0\u6CD5\u83B7\u53D6\u5F71\u5B50\u5185\u5BB9: ".concat(filePath), error_10);
+                        error_13 = _a.sent();
+                        console.warn("\u65E0\u6CD5\u83B7\u53D6\u5F71\u5B50\u5185\u5BB9: ".concat(filePath), error_13);
                         return [2 /*return*/, ''];
                     case 4: return [2 /*return*/];
                 }
@@ -41629,11 +42315,13 @@ var ShadowSpace = /** @class */ (function () {
             .digest('hex');
     };
     ShadowSpace.prototype.generateId = function () {
-        return "change_".concat(Date.now(), "_").concat(Math.random().toString(36).substr(2, 9));
+        return "change_".concat(Date.now(), "_").concat(Math.random()
+            .toString(36)
+            .substring(2, 11));
     };
     ShadowSpace.prototype.shouldIgnoreFile = function (filePath) {
         // logger(`[ShadowSpace] shouldIgnoreFile 检查: "${filePath}"`);
-        var e_10, _a;
+        var e_14, _a;
         // 特殊处理：过滤掉特定的系统文件
         var fileName = filePath.split('/').pop() || '';
         if (fileName === '.dirty_files.json') {
@@ -41648,12 +42336,14 @@ var ShadowSpace = /** @class */ (function () {
         // 🔥 目录白名单检查：简化逻辑，允许 src/ 和 docs/ 下的所有文件
         var isInSrc = filePath.startsWith('src/');
         var isInDocs = filePath.startsWith('docs/');
-        var isRootConfig = filePath.match(/^[^\/]+\.(json|md|yml|yaml|toml|js|ts|py|go|rs)$/);
+        var isRootConfig = filePath.match(/^[^/]+\.(json|md|yml|yaml|toml|js|ts|py|go|rs)$/);
         if (!isInSrc && !isInDocs && !isRootConfig) {
+            logger("[ShadowSpace] \u6587\u4EF6\u4E0D\u5728\u767D\u540D\u5355\u76EE\u5F55\u4E2D: ".concat(filePath));
             return true;
         }
         // 特殊处理：不忽略其他 .json 文件（即使以 . 开头）
         if (filePath.endsWith('.json')) {
+            logger("[ShadowSpace] JSON\u6587\u4EF6\u4E0D\u5FFD\u7565: ".concat(filePath));
             return false;
         }
         try {
@@ -41666,27 +42356,28 @@ var ShadowSpace = /** @class */ (function () {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         // 检查扩展名白名单
         if (this.config.includeExtensions &&
             this.config.includeExtensions.length > 0) {
             var ext = path__default["default"].extname(filePath).toLowerCase();
             if (!this.config.includeExtensions.includes(ext)) {
+                logger("[ShadowSpace] \u6587\u4EF6\u6269\u5C55\u540D\u4E0D\u5728\u767D\u540D\u5355: ".concat(filePath, " -> ").concat(ext));
                 return true;
             }
         }
-        // logger(`[ShadowSpace] 文件通过忽略检查: ${filePath}`);
+        logger("[ShadowSpace] \u6587\u4EF6\u901A\u8FC7\u5FFD\u7565\u68C0\u67E5: ".concat(filePath));
         return false;
     };
     ShadowSpace.prototype.writeLocalFile = function (filePath, content) {
         return __awaiter(this, void 0, void 0, function () {
-            var fullPath, error_11;
+            var fullPath, error_14;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -41708,18 +42399,99 @@ var ShadowSpace = /** @class */ (function () {
                         _a.sent();
                         return [3 /*break*/, 5];
                     case 4:
-                        error_11 = _a.sent();
-                        console.error("[ShadowSpace] \u6587\u4EF6\u5199\u5165\u5931\u8D25: ".concat(fullPath), error_11);
-                        throw error_11;
+                        error_14 = _a.sent();
+                        console.error("[ShadowSpace] \u6587\u4EF6\u5199\u5165\u5931\u8D25: ".concat(fullPath), error_14);
+                        throw error_14;
                     case 5: return [2 /*return*/];
                 }
             });
         });
     };
+    /**
+     * 同步本地文件状态到内存和状态文件
+     * (用于CLI独立运行时刷新状态)
+     */
+    ShadowSpace.prototype.syncLocalState = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var localFiles, snapshots, currentPaths, localFiles_2, localFiles_2_1, file, hash, entry, _a, _b, key;
+            var e_15, _c, e_16, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0: return [4 /*yield*/, this.loadState()];
+                    case 1:
+                        _e.sent();
+                        return [4 /*yield*/, this.scanLocalFiles()];
+                    case 2:
+                        localFiles = _e.sent();
+                        snapshots = [];
+                        currentPaths = new Set();
+                        try {
+                            for (localFiles_2 = __values(localFiles), localFiles_2_1 = localFiles_2.next(); !localFiles_2_1.done; localFiles_2_1 = localFiles_2.next()) {
+                                file = localFiles_2_1.value;
+                                currentPaths.add(file.relativePath);
+                                hash = this.calculateHash(file.content);
+                                // Update state
+                                if (!this.state.files[file.relativePath]) {
+                                    this.state.files[file.relativePath] = {
+                                        path: file.relativePath,
+                                        hash: hash,
+                                        size: file.content.length,
+                                        lastSyncTime: 0,
+                                        lastModified: 0,
+                                        version: 1,
+                                        mtime: file.mtime,
+                                    };
+                                }
+                                else {
+                                    entry = this.state.files[file.relativePath];
+                                    if (entry.hash !== hash || entry.mtime !== file.mtime) {
+                                        entry.hash = hash;
+                                        entry.mtime = file.mtime;
+                                    }
+                                }
+                                snapshots.push({
+                                    path: file.relativePath,
+                                    hash: hash,
+                                    modify: file.mtime,
+                                    remoteHash: this.state.files[file.relativePath].remoteHash,
+                                });
+                            }
+                        }
+                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                        finally {
+                            try {
+                                if (localFiles_2_1 && !localFiles_2_1.done && (_c = localFiles_2.return)) _c.call(localFiles_2);
+                            }
+                            finally { if (e_15) throw e_15.error; }
+                        }
+                        try {
+                            // Remove deleted files from state
+                            for (_a = __values(Object.keys(this.state.files)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                key = _b.value;
+                                if (!currentPaths.has(key)) {
+                                    delete this.state.files[key];
+                                }
+                            }
+                        }
+                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                            }
+                            finally { if (e_16) throw e_16.error; }
+                        }
+                        return [4 /*yield*/, this.saveState()];
+                    case 3:
+                        _e.sent();
+                        return [2 /*return*/, snapshots];
+                }
+            });
+        });
+    };
     ShadowSpace.prototype.scanLocalFiles = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var files, pattern, options, filePaths, filePaths_2, filePaths_2_1, filePath, fullPath, content, stats, error_12, e_11_1;
-            var e_11, _a;
+            var files, pattern, options, globPromise, filePaths, filePaths_2, filePaths_2_1, filePath, fullPath, content, stats, error_15, e_17_1;
+            var e_17, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -41730,52 +42502,55 @@ var ShadowSpace = /** @class */ (function () {
                             ignore: this.config.ignorePatterns,
                             nodir: true,
                         };
-                        filePaths = glob$1.glob.sync(pattern, options);
-                        _b.label = 1;
+                        globPromise = util$3.promisify(glob__default["default"]);
+                        return [4 /*yield*/, globPromise(pattern, options)];
                     case 1:
-                        _b.trys.push([1, 9, 10, 11]);
-                        filePaths_2 = __values(filePaths), filePaths_2_1 = filePaths_2.next();
+                        filePaths = _b.sent();
                         _b.label = 2;
                     case 2:
-                        if (!!filePaths_2_1.done) return [3 /*break*/, 8];
-                        filePath = filePaths_2_1.value;
-                        if (this.shouldIgnoreFile(filePath))
-                            return [3 /*break*/, 7];
+                        _b.trys.push([2, 10, 11, 12]);
+                        filePaths_2 = __values(filePaths), filePaths_2_1 = filePaths_2.next();
                         _b.label = 3;
                     case 3:
-                        _b.trys.push([3, 6, , 7]);
+                        if (!!filePaths_2_1.done) return [3 /*break*/, 9];
+                        filePath = filePaths_2_1.value;
+                        if (this.shouldIgnoreFile(filePath))
+                            return [3 /*break*/, 8];
+                        _b.label = 4;
+                    case 4:
+                        _b.trys.push([4, 7, , 8]);
                         fullPath = path__default["default"].join(this.config.projectRoot, filePath);
                         return [4 /*yield*/, fs__default$1["default"].readFile(fullPath, 'utf8')];
-                    case 4:
+                    case 5:
                         content = _b.sent();
                         return [4 /*yield*/, fs__default$1["default"].stat(fullPath)];
-                    case 5:
+                    case 6:
                         stats = _b.sent();
                         files.push({
                             relativePath: filePath,
                             content: content,
                             mtime: stats.mtime.getTime(),
                         });
-                        return [3 /*break*/, 7];
-                    case 6:
-                        error_12 = _b.sent();
-                        console.warn("\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25: ".concat(filePath), error_12);
-                        return [3 /*break*/, 7];
+                        return [3 /*break*/, 8];
                     case 7:
+                        error_15 = _b.sent();
+                        console.warn("\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25: ".concat(filePath), error_15);
+                        return [3 /*break*/, 8];
+                    case 8:
                         filePaths_2_1 = filePaths_2.next();
-                        return [3 /*break*/, 2];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
-                        e_11_1 = _b.sent();
-                        e_11 = { error: e_11_1 };
-                        return [3 /*break*/, 11];
+                        return [3 /*break*/, 3];
+                    case 9: return [3 /*break*/, 12];
                     case 10:
+                        e_17_1 = _b.sent();
+                        e_17 = { error: e_17_1 };
+                        return [3 /*break*/, 12];
+                    case 11:
                         try {
                             if (filePaths_2_1 && !filePaths_2_1.done && (_a = filePaths_2.return)) _a.call(filePaths_2);
                         }
-                        finally { if (e_11) throw e_11.error; }
+                        finally { if (e_17) throw e_17.error; }
                         return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/, files];
+                    case 12: return [2 /*return*/, files];
                 }
             });
         });
@@ -41817,20 +42592,33 @@ var ShadowSpace = /** @class */ (function () {
     };
     ShadowSpace.prototype.loadState = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var content;
+            var content, error_16;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
+                        _a.trys.push([0, 2, , 6]);
                         return [4 /*yield*/, fs__default$1["default"].readFile(this.stateFile, 'utf8')];
                     case 1:
                         content = _a.sent();
                         this.state = __assign(__assign({}, this.state), JSON.parse(content));
-                        return [3 /*break*/, 3];
+                        return [3 /*break*/, 6];
                     case 2:
+                        error_16 = _a.sent();
+                        if (!(error_16.code === 'ENOENT')) return [3 /*break*/, 4];
+                        logger('影子空间状态文件不存在，使用默认状态');
+                        // Ensure directory exists for future saves
+                        // 使用 ensureDir 确保整个路径存在，包括 .appthen
+                        return [4 /*yield*/, fs__default$1["default"].ensureDir(path__default["default"].dirname(this.stateFile))];
+                    case 3:
+                        // Ensure directory exists for future saves
+                        // 使用 ensureDir 确保整个路径存在，包括 .appthen
                         _a.sent();
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 4:
+                        console.warn('[ShadowSpace] 读取状态文件失败:', error_16);
+                        _a.label = 5;
+                    case 5: return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -41841,100 +42629,13 @@ var ShadowSpace = /** @class */ (function () {
         var k = 1024;
         var sizes = ['B', 'KB', 'MB', 'GB'];
         var i = Math.floor(Math.log(bytes) / Math.log(k));
-        return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-    };
-    // ==================== 🆕 文件监听功能 ====================
-    /**
-     * 启动文件监听
-     */
-    ShadowSpace.prototype.startWatching = function () {
-        if (this.isWatching) {
-            return;
-        }
-        logger('[ShadowSpace] 监听目录:', this.config.projectRoot);
-        try {
-            // 🔥 使用轮询模式 + ignored 函数过滤
-            // this.watcher = chokidar.watch(this.config.projectRoot, {
-            //   ignored: (filePath: string) => {
-            //     const relativePath = path.relative(this.config.projectRoot, filePath);
-            //     // 忽略根目录本身
-            //     if (!relativePath || relativePath === '.') {
-            //       return true;
-            //     }
-            //     // 使用白名单过滤
-            //     return this.shouldIgnoreFile(relativePath);
-            //   },
-            //   persistent: true,
-            //   ignoreInitial: true, // 忽略初始扫描
-            //   usePolling: true, // 🔥 macOS 上使用轮询模式（fsevents 在某些环境下不可靠）
-            //   interval: 2000, // 轮询间隔 2 秒（降低 CPU 占用）
-            //   binaryInterval: 3000, // 二进制文件轮询间隔 3 秒
-            //   depth: 99, // 监听所有子目录
-            //   awaitWriteFinish: {
-            //     stabilityThreshold: 500, // 文件稳定后 500ms 才触发
-            //     pollInterval: 100,
-            //   },
-            // });
-            logger('[ShadowSpace] chokidar.watch 已调用，等待 ready 事件...');
-        }
-        catch (error) {
-            console.error('[ShadowSpace] 创建文件监听器失败:', error);
-            return;
-        }
-        // this.watcher
-        //   .on('change', (filePath: string) => {
-        //     this.onFileChanged(filePath);
-        //   })
-        //   .on('add', (filePath: string) => {
-        //     this.onFileAdded(filePath);
-        //   })
-        //   .on('unlink', (filePath: string) => {
-        //     this.onFileDeleted(filePath);
-        //   })
-        //   .on('error', (error) => {
-        //     console.error('[ShadowSpace] 文件监听错误:', error);
-        //   })
-        //   .on('ready', () => {
-        //     this.isWatching = true;
-        //     logger(
-        //       '[ShadowSpace] 文件监听已启动，正在监听:',
-        //       this.config.projectRoot
-        //     );
-        //     logger('[ShadowSpace] 监听配置: 轮询模式 (interval: 2s)');
-        //   });
-    };
-    /**
-     * 停止文件监听
-     */
-    ShadowSpace.prototype.stopWatching = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                if (!this.isWatching || !this.watcher) {
-                    return [2 /*return*/];
-                }
-                // await this.watcher.close();
-                this.watcher = null;
-                this.isWatching = false;
-                return [2 /*return*/];
-            });
-        });
-    };
-    /**
-     * 添加变更事件监听器
-     */
-    ShadowSpace.prototype.addChangeListener = function (listener) {
-        this.changeListeners.add(listener);
-    };
-    /**
-     * 移除变更事件监听器
-     */
-    ShadowSpace.prototype.removeChangeListener = function (listener) {
-        this.changeListeners.delete(listener);
+        return "".concat(parseFloat((bytes / Math.pow(k, i)).toFixed(2)), " ").concat(sizes[i]);
     };
     /**
      * 触发变更事件
      */
     ShadowSpace.prototype.emitChangeEvent = function (event) {
+        logger('[ShadowSpace] 触发变更事件:', event);
         this.changeListeners.forEach(function (listener) {
             try {
                 listener(event);
@@ -41949,13 +42650,15 @@ var ShadowSpace = /** @class */ (function () {
      */
     ShadowSpace.prototype.onFileChanged = function (filePath) {
         return __awaiter(this, void 0, void 0, function () {
-            var relativePath, shadowEntry, content, hash, stats, error_14;
+            var relativePath, shadowEntry, content, hash, stats, error_17;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         relativePath = path__default["default"].relative(this.config.projectRoot, filePath);
+                        logger("[ShadowSpace] \u68C0\u6D4B\u5230\u6587\u4EF6\u53D8\u66F4: ".concat(relativePath));
                         shadowEntry = this.state.files[relativePath];
                         if (!(shadowEntry === null || shadowEntry === void 0 ? void 0 : shadowEntry.remoteModified)) return [3 /*break*/, 2];
+                        logger("[ShadowSpace] \u8DF3\u8FC7\u8FDC\u7A0B\u4FEE\u6539\u7684\u6587\u4EF6: ".concat(relativePath));
                         shadowEntry.remoteModified = false; // 清除标记
                         return [4 /*yield*/, this.saveState()];
                     case 1:
@@ -41981,8 +42684,8 @@ var ShadowSpace = /** @class */ (function () {
                         });
                         return [3 /*break*/, 6];
                     case 5:
-                        error_14 = _a.sent();
-                        console.error("[ShadowSpace] \u5904\u7406\u6587\u4EF6\u53D8\u66F4\u5931\u8D25: ".concat(relativePath), error_14);
+                        error_17 = _a.sent();
+                        console.error("[ShadowSpace] \u5904\u7406\u6587\u4EF6\u53D8\u66F4\u5931\u8D25: ".concat(relativePath), error_17);
                         return [3 /*break*/, 6];
                     case 6: return [2 /*return*/];
                 }
@@ -41994,11 +42697,12 @@ var ShadowSpace = /** @class */ (function () {
      */
     ShadowSpace.prototype.onFileAdded = function (filePath) {
         return __awaiter(this, void 0, void 0, function () {
-            var relativePath, content, hash, stats, error_15;
+            var relativePath, content, hash, stats, error_18;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         relativePath = path__default["default"].relative(this.config.projectRoot, filePath);
+                        logger("[ShadowSpace] \u68C0\u6D4B\u5230\u6587\u4EF6\u65B0\u589E: ".concat(relativePath));
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 4, , 5]);
@@ -42020,8 +42724,8 @@ var ShadowSpace = /** @class */ (function () {
                         });
                         return [3 /*break*/, 5];
                     case 4:
-                        error_15 = _a.sent();
-                        console.error("[ShadowSpace] \u5904\u7406\u6587\u4EF6\u65B0\u589E\u5931\u8D25: ".concat(relativePath), error_15);
+                        error_18 = _a.sent();
+                        console.error("[ShadowSpace] \u5904\u7406\u6587\u4EF6\u65B0\u589E\u5931\u8D25: ".concat(relativePath), error_18);
                         return [3 /*break*/, 5];
                     case 5: return [2 /*return*/];
                 }
@@ -42038,8 +42742,10 @@ var ShadowSpace = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         relativePath = path__default["default"].relative(this.config.projectRoot, filePath);
+                        logger("[ShadowSpace] \u68C0\u6D4B\u5230\u6587\u4EF6\u5220\u9664: ".concat(relativePath));
                         shadowEntry = this.state.files[relativePath];
                         if (!(shadowEntry === null || shadowEntry === void 0 ? void 0 : shadowEntry.remoteModified)) return [3 /*break*/, 2];
+                        logger("[ShadowSpace] \u8DF3\u8FC7\u8FDC\u7A0B\u5220\u9664\u7684\u6587\u4EF6: ".concat(relativePath));
                         shadowEntry.remoteModified = false; // 清除标记
                         return [4 /*yield*/, this.saveState()];
                     case 1:
@@ -42058,12 +42764,6 @@ var ShadowSpace = /** @class */ (function () {
             });
         });
     };
-    /**
-     * 获取监听状态
-     */
-    ShadowSpace.prototype.isFileWatching = function () {
-        return this.isWatching;
-    };
     return ShadowSpace;
 }());
 
@@ -42316,22 +43016,7 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                         changes = _a.sent();
                         result = {
                             spaceId: this.shadowSpace.getSpaceInfo().spaceId,
-                            changes: changes.map(function (change) { return ({
-                                id: change.id,
-                                action: change.action,
-                                path: change.path,
-                                version: change.version,
-                                timestamp: change.timestamp,
-                                hasContent: !!change.diff.before || !!change.diff.after,
-                                size: {
-                                    before: change.diff.before
-                                        ? Buffer.byteLength(change.diff.before, 'utf8')
-                                        : 0,
-                                    after: change.diff.after
-                                        ? Buffer.byteLength(change.diff.after, 'utf8')
-                                        : 0,
-                                },
-                            }); }),
+                            changes: changes,
                             summary: {
                                 total: changes.length,
                                 added: changes.filter(function (c) { return c.action === 'add'; }).length,
@@ -42853,7 +43538,7 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                         //   `[ShadowSpace] 开始检测变更: 空间=${spaceId}, 编辑器文件=${safeEditorSnapshots.length}个`
                         // );
                         // 1. 🔥 先检测本地文件变更，更新影子空间状态，并获取本地变更列表（包括新增文件）
-                        console.log("\n\uD83D\uDD0D [DEBUG] \u6B63\u5728\u68C0\u6D4B\u672C\u5730\u6587\u4EF6\u53D8\u66F4...");
+                        console.log('\n🔍 [DEBUG] 正在检测本地文件变更...');
                         return [4 /*yield*/, this.shadowSpace.detectChanges()];
                     case 1:
                         localChanges = _a.sent();
@@ -42865,7 +43550,7 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                         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('🔍 [DEBUG] getSpaceSnapshots 原始结果:', spaceSnapshots);
                         // 🔍 友好的调试输出
                         console.log('\n=== 影子空间变更检测调试 ===');
                         console.log('📁 空间ID:', spaceId);
@@ -42874,19 +43559,19 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                         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(`  📁 空间目录: ${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));
+                        console.log("  \u23F0 \u66F4\u65B0\u65F6\u95F4: ".concat(spaceInfo.lastUpdate)); // 修正属性名
                         require('path');
                         fs = require('fs-extra');
-                        spaceDir = spaceInfo.spaceRoot;
+                        spaceDir = spaceInfo.projectRoot;
                         return [4 /*yield*/, fs.pathExists(spaceDir)];
                     case 3:
                         spaceExists = _a.sent();
-                        console.log("\n\uD83D\uDCC1 \u7A7A\u95F4\u76EE\u5F55\u68C0\u67E5:");
+                        console.log('\n📁 空间目录检查:');
                         console.log("  \uD83D\uDCC2 \u8DEF\u5F84: ".concat(spaceDir));
                         console.log("  \u2705 \u662F\u5426\u5B58\u5728: ".concat(spaceExists));
                         if (!spaceExists) return [3 /*break*/, 7];
@@ -42951,7 +43636,7 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                         }); });
                         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; }));
+                            console.log('🔍 [DEBUG] 本地新增文件列表:', localAddChanges.map(function (c) { return c.path; }));
                         }
                         changes = __spreadArray(__spreadArray([], __read(snapshotChanges), false), __read(localAddChanges), false);
                         summary = {
@@ -43023,18 +43708,29 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
     ShadowSpaceCommandHandler.prototype.compareSnapshots = function (editorSnapshots, spaceSnapshots) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            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 changes, normalizePath, 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 = [];
+                normalizePath = function (p) {
+                    // 统一替换反斜杠为正斜杠
+                    var normalized = p.replace(/\\/g, '/');
+                    // 去除开头的 ./
+                    if (normalized.startsWith('./'))
+                        normalized = normalized.substring(2);
+                    // 去除开头的 /
+                    if (normalized.startsWith('/'))
+                        normalized = normalized.substring(1);
+                    return normalized;
+                };
                 safeEditorSnapshots = Array.isArray(editorSnapshots)
                     ? editorSnapshots
                     : [];
                 safeSpaceSnapshots = Array.isArray(spaceSnapshots)
                     ? spaceSnapshots
                     : [];
-                editorMap = new Map(safeEditorSnapshots.map(function (f) { return [f.path, f]; }));
-                spaceMap = new Map(safeSpaceSnapshots.map(function (f) { return [f.path, f]; }));
+                editorMap = new Map(safeEditorSnapshots.map(function (f) { return [normalizePath(f.path), f]; }));
+                spaceMap = new Map(safeSpaceSnapshots.map(function (f) { return [normalizePath(f.path), f]; }));
                 try {
                     // 检测编辑器的变更（新增、修改）
                     for (editorMap_1 = __values(editorMap), editorMap_1_1 = editorMap_1.next(); !editorMap_1_1.done; editorMap_1_1 = editorMap_1.next()) {
@@ -43042,6 +43738,10 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                         spaceFile = spaceMap.get(path);
                         if (!spaceFile) {
                             // 编辑器新增的文件 → 推送到空间
+                            // 🔥 调试：打印路径标准化情况
+                            if (path.includes('TicketHistory')) {
+                                console.log("[ShadowSpace] \u68C0\u6D4B\u5230\u7F16\u8F91\u5668\u65B0\u589E: \"".concat(path, "\" (Original: \"").concat(editorFile.path, "\")"));
+                            }
                             changes.push({
                                 action: 'add',
                                 path: path,
@@ -43065,8 +43765,8 @@ var ShadowSpaceCommandHandler = /** @class */ (function () {
                             });
                             // 🔥 关键逻辑：根据时间戳判断方向
                             if (editorModify > spaceModify) {
-                                // 编辑器更新 → 推送到空间
-                                console.log("[ShadowSpace] \u2192 \u7F16\u8F91\u5668\u66F4\u65B0\uFF0C\u9700\u8981\u63A8\u9001: ".concat(path));
+                                // 编辑器更新 → 推送到空间 (Remote -> Local) => Pull
+                                console.log("[ShadowSpace] \u2B07\uFE0F  \u8FDC\u7AEF\u66F4\u65B0 (\u9700\u62C9\u53D6): ".concat(path));
                                 changes.push({
                                     action: 'modify',
                                     path: path,
@@ -50082,6 +50782,146 @@ function getToolName(tool) {
     return toolChoice ? toolChoice.name : tool;
 }
 
+function startShadowSync(options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var userId, config, shadowSpace, result, changes, changes_1, changes_1_1, change, action, filePath, side, direction, content, remoteHash, content, err_1, e_1_1, error_1;
+        var e_1, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    // Set auth token globally for request utils
+                    updateAuthToken(options.authToken);
+                    userId = options.userId || 'unknown-user';
+                    config = {
+                        projectRoot: options.cwd ? path__default["default"].resolve(options.cwd) : process.cwd(),
+                        projectId: options.projectId,
+                        userId: userId,
+                        spaceId: options.spaceId || 'default',
+                    };
+                    shadowSpace = new ShadowSpace(config);
+                    if (options.verbose) {
+                        console.log('Starting shadow sync...');
+                        console.log("Project ID: ".concat(config.projectId));
+                        console.log("Space ID: ".concat(config.spaceId));
+                        console.log("User ID: ".concat(config.userId));
+                    }
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 26, , 27]);
+                    // 使用抽象后的通用同步逻辑
+                    // 调用 syncWithRemote({ dryRun: true }) 获取变更
+                    // 然后复用 ShadowSpace 的公共方法进行处理
+                    console.log('Checking for changes...');
+                    return [4 /*yield*/, shadowSpace.syncWithRemote({ dryRun: true })];
+                case 2:
+                    result = _b.sent();
+                    changes = result.changes;
+                    if (!(changes.length === 0)) return [3 /*break*/, 3];
+                    console.log('Everything is up to date.');
+                    return [3 /*break*/, 25];
+                case 3:
+                    console.log("Found ".concat(changes.length, " changes."));
+                    _b.label = 4;
+                case 4:
+                    _b.trys.push([4, 21, 22, 23]);
+                    changes_1 = __values(changes), changes_1_1 = changes_1.next();
+                    _b.label = 5;
+                case 5:
+                    if (!!changes_1_1.done) return [3 /*break*/, 20];
+                    change = changes_1_1.value;
+                    action = change.action, filePath = change.path, side = change.side;
+                    direction = side === 'editor' ? 'Remote->Local (Pull)' : 'Local->Remote (Push)';
+                    console.log("Processing ".concat(action, " ").concat(filePath, " (").concat(direction, ")..."));
+                    _b.label = 6;
+                case 6:
+                    _b.trys.push([6, 18, , 19]);
+                    if (!(side === 'editor')) return [3 /*break*/, 14];
+                    if (!(action === 'delete')) return [3 /*break*/, 8];
+                    return [4 /*yield*/, shadowSpace.deleteFile(filePath)];
+                case 7:
+                    _b.sent();
+                    console.log("Deleted local file: ".concat(filePath));
+                    return [3 /*break*/, 13];
+                case 8: return [4 /*yield*/, shadowSpace.downloadRemoteFile(filePath)];
+                case 9:
+                    content = _b.sent();
+                    remoteHash = change.editorHash;
+                    if (!remoteHash) return [3 /*break*/, 11];
+                    return [4 /*yield*/, shadowSpace.updateFileFromRemote(filePath, content, remoteHash)];
+                case 10:
+                    _b.sent();
+                    console.log("Updated local file: ".concat(filePath, " (with remoteHash)"));
+                    return [3 /*break*/, 13];
+                case 11: return [4 /*yield*/, shadowSpace.updateFile(filePath, content)];
+                case 12:
+                    _b.sent();
+                    console.log("Updated local file: ".concat(filePath));
+                    _b.label = 13;
+                case 13: return [3 /*break*/, 17];
+                case 14:
+                    if (!(side === 'space')) return [3 /*break*/, 17];
+                    if (!(action === 'delete')) return [3 /*break*/, 15];
+                    console.warn("Skipping remote delete for: ".concat(filePath, " (Not supported)"));
+                    return [3 /*break*/, 17];
+                case 15: return [4 /*yield*/, shadowSpace.getShadowContent(filePath)];
+                case 16:
+                    content = _b.sent();
+                    if (content !== null) {
+                        // DryRun for Push
+                        console.log("[DryRun] Would upload remote file: ".concat(filePath));
+                        // 注意：在 DryRun 模式下，我们不能更新 remoteHash，因为没有真实上传，
+                        // 远端的 Hash 依然是旧的。如果现在更新了 remoteHash，下次比对就会出错。
+                        // 所以这里什么都不做。
+                    }
+                    else {
+                        console.error("Failed to read local content for: ".concat(filePath));
+                    }
+                    _b.label = 17;
+                case 17: return [3 /*break*/, 19];
+                case 18:
+                    err_1 = _b.sent();
+                    console.error("Failed to process ".concat(filePath, ":"), err_1);
+                    return [3 /*break*/, 19];
+                case 19:
+                    changes_1_1 = changes_1.next();
+                    return [3 /*break*/, 5];
+                case 20: return [3 /*break*/, 23];
+                case 21:
+                    e_1_1 = _b.sent();
+                    e_1 = { error: e_1_1 };
+                    return [3 /*break*/, 23];
+                case 22:
+                    try {
+                        if (changes_1_1 && !changes_1_1.done && (_a = changes_1.return)) _a.call(changes_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                    return [7 /*endfinally*/];
+                case 23: 
+                // Save state after sync
+                return [4 /*yield*/, shadowSpace.saveState()];
+                case 24:
+                    // Save state after sync
+                    _b.sent();
+                    _b.label = 25;
+                case 25: return [3 /*break*/, 27];
+                case 26:
+                    error_1 = _b.sent();
+                    console.error('Shadow sync failed:', error_1);
+                    process.exit(1);
+                    return [3 /*break*/, 27];
+                case 27:
+                    if (options.watch) {
+                        shadowSpace.startWatching();
+                        console.log('Watching for file changes...');
+                        // Keep process alive
+                        return [2 /*return*/, new Promise(function () { })];
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+
 exports.ShadowSpace = ShadowSpace;
 exports.ShadowSpaceDebugger = ShadowSpaceDebugger;
 exports.TSXComplianceChecker = TSXComplianceChecker;
@@ -50106,6 +50946,7 @@ exports.releaseMaterial = releaseMaterial;
 exports.run = run;
 exports.startConnecting = startConnecting;
 exports.startProxy = startProxy;
+exports.startShadowSync = startShadowSync;
 exports.startWatching = startWatching;
 exports.stopConnecting = stopConnecting;
 exports.stopProxy = stopProxy;