@superblocksteam/cli 2.0.6-next.16 → 2.0.6-next.17

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/2.0.6-next.16 linux-x64 node-v20.19.0
+@superblocksteam/cli/2.0.6-next.17 linux-x64 node-v20.19.0
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND

package/dist/index.js

@@ -413073,7 +413073,7 @@ init_cjs_shims();
 var templates = {
   "api-builder-to-yaml": {
     "bootstrap.mjs": 'import { register } from "node:module";\nimport { pathToFileURL } from "node:url";\n\nregister("./shim-loader.mjs", pathToFileURL("./"));\n',
-    "package.json": '{\n  "type": "module",\n  "dependencies": {\n    "acorn": "^8.14.0",\n    "prettier": "^3.5.3",\n    "yaml": "^2.7.1"\n  },\n  "devDependencies": {\n    "@types/node": "^22.15.18",\n    "@typescript-eslint/parser": "^8.17.0",\n    "eslint": "^9.26.0",\n    "typescript": "^5.8.3",\n    "vitest": "^3.0.9"\n  }\n}',
+    "package.json": '{\n  "type": "module",\n  "dependencies": {\n    "acorn": "^8.14.0",\n    "prettier": "^3.5.3",\n    "yaml": "^2.7.1"\n  },\n  "devDependencies": {\n    "@types/node": "^22.15.18",\n    "@typescript-eslint/parser": "^8.17.0",\n    "eslint": "^9.26.0",\n    "typescript": "^5.8.3",\n    "vitest": "^3.2.0"\n  }\n}\n',
     "shim-loader.mjs": 'import path from "path";\nimport { pathToFileURL } from "url";\n\nconst overrideMap = {\n  "@superblocksteam/library": "./dist/superblocks-library-shim/index.js",\n};\n\nexport async function resolve(specifier, context, nextResolve) {\n  if (overrideMap[specifier]) {\n    const fullPath = path.resolve(overrideMap[specifier]);\n    return {\n      shortCircuit: true,\n      url: pathToFileURL(fullPath).href,\n    };\n  }\n\n  return nextResolve(specifier, context);\n}\n',
     "src/do-eval-to-sdk.ts": 'import fs from "fs";\nimport path from "path";\nimport { fileURLToPath } from "url";\n\n// finds all JavaScript files in the `dist/apis-to-transform` directory,\n// imports each module, converts its JSON representation to SDK,\n// and outputs a JSON map with filenames as keys and SDK content as values.\n\nasync function main() {\n  const __filename = fileURLToPath(import.meta.url);\n  const __dirname = path.dirname(__filename);\n\n  const apisDir = path.resolve(__dirname, "./to-sdk");\n\n  const files = fs.readdirSync(apisDir);\n\n  const jsFiles = files.filter(\n    (file) => file.endsWith(".js") && file !== "__template__.js",\n  );\n\n  const results: Record<string, string> = {};\n\n  for (const jsFile of jsFiles) {\n    const filePath = path.join(apisDir, jsFile);\n    const absolutePath = path.resolve(filePath);\n\n    try {\n      const fileUrl = new URL(`file://${absolutePath}`);\n      const module = await import(fileUrl.href);\n\n      const defaultExport = module.default;\n\n      if (defaultExport && typeof defaultExport.toSDK === "function") {\n        const sdkData = await defaultExport.toSDK();\n\n        results[jsFile] = sdkData;\n      } else {\n        console.warn(`${jsFile}: Default export doesn\'t have a toSDK method`);\n      }\n    } catch (error) {\n      console.error(`Error processing ${jsFile}:`, error);\n    }\n  }\n\n  console.log(JSON.stringify(results, null, 2));\n}\n\nmain().catch((error) => {\n  console.error("Error:", error);\n  process.exit(1);\n});\n',
     "src/do-eval-to-yaml.ts": 'import fs from "fs";\nimport path from "path";\nimport { fileURLToPath } from "url";\nimport yaml from "yaml";\n\n// finds all JavaScript files in the `dist/apis-to-transform` directory,\n// imports each module, converts its JSON representation to YAML,\n// and outputs a JSON map with filenames as keys and YAML content as values.\n\nasync function main() {\n  const __filename = fileURLToPath(import.meta.url);\n  const __dirname = path.dirname(__filename);\n\n  const apisDir = path.resolve(__dirname, "./to-yaml");\n\n  const files = fs.readdirSync(apisDir);\n\n  const jsFiles = files.filter((file) => file.endsWith(".js"));\n\n  const results: Record<string, string> = {};\n\n  for (const jsFile of jsFiles) {\n    const filePath = path.join(apisDir, jsFile);\n    const absolutePath = path.resolve(filePath);\n\n    try {\n      const fileUrl = new URL(`file://${absolutePath}`);\n      const module = await import(fileUrl.href);\n\n      const defaultExport = module.default;\n\n      if (defaultExport && typeof defaultExport.toJSON === "function") {\n        const jsonData = await defaultExport.toJSON();\n\n        const yamlContent = yaml.stringify(jsonData);\n\n        results[jsFile] = yamlContent;\n      } else {\n        console.warn(`${jsFile}: Default export doesn\'t have a toJSON method`);\n      }\n    } catch (error) {\n      console.error(`Error processing ${jsFile}:`, error);\n    }\n  }\n\n  console.log(JSON.stringify(results, null, 2));\n}\n\nmain().catch((error) => {\n  console.error("Error:", error);\n  process.exit(1);\n});\n',
@@ -417871,6 +417871,7 @@ Address the errors and return the fixed code.`;
     switch (event.type) {
       case USER_SENT_PROMPT: {
         const { request, peer } = event;
+        params.signals.emit("generationStarted");
         const initialElementIds = clark.context.initialElementIds ?? Object.keys(params.sourceTrackerInterface.getElementToFilePathMap() ?? {});
         clark.updateContext((context2) => ({
           ...context2,
@@ -431924,6 +431925,9 @@ function getPageFolder(rootPath, pageName) {
 function getPageFilePath(rootPath, pageName) {
   return path21.join(getPageFolder(rootPath, pageName), "index.tsx");
 }
+function isPageFilePath(filePath) {
+  return /pages\/.*\/index\.tsx/.test(filePath);
+}
 
 // ../../../vite-plugin-file-sync/dist/traverse.js
 init_cjs_shims();
@@ -433797,6 +433801,87 @@ function addLegacyCustomComponentVariables(path55, tracker) {
   });
 }
 
+// ../../../vite-plugin-file-sync/dist/operations/operation-processor.js
+init_cjs_shims();
+var OperationProcessor = class {
+  config;
+  operationQueue;
+  pendingOperations = [];
+  batchTimer = null;
+  _enabled = true;
+  constructor(config2 = {}) {
+    this.config = {
+      batchWindowMs: 50,
+      maxBatchSize: 100,
+      ...config2
+    };
+    this.operationQueue = new OperationQueue();
+  }
+  async addOperation(operation) {
+    const timestamp2 = Date.now();
+    const id2 = `operation-${timestamp2}-${Math.random()}`;
+    const fullOperation = {
+      ...operation,
+      id: id2,
+      timestamp: timestamp2
+    };
+    if (!this._enabled || fullOperation.priority) {
+      return this.processOperations([fullOperation]);
+    }
+    this.pendingOperations.push(fullOperation);
+    if (this.pendingOperations.length >= this.config.maxBatchSize) {
+      return this.flush();
+    }
+    this.resetBatchTimer();
+  }
+  async flush() {
+    if (this.pendingOperations.length === 0) {
+      return;
+    }
+    const operations = [...this.pendingOperations];
+    this.pendingOperations = [];
+    this.clearBatchTimer();
+    return this.operationQueue.enqueue(() => this.processOperations(operations));
+  }
+  disable() {
+    this.setEnabled(false);
+  }
+  enable() {
+    this.setEnabled(true);
+  }
+  setEnabled(enabled) {
+    const wasEnabled = this._enabled;
+    this._enabled = enabled;
+    if (!enabled && wasEnabled && this.pendingOperations.length > 0) {
+      this.flush().catch((error) => {
+        console.error("Error flushing operations on priority mode enable:", error);
+      });
+    }
+  }
+  async processOperations(operations) {
+    if (operations.length === 0) {
+      return;
+    }
+    for (const operation of operations) {
+      await operation.execute();
+    }
+  }
+  resetBatchTimer() {
+    this.clearBatchTimer();
+    this.batchTimer = setTimeout(() => {
+      this.flush().catch((error) => {
+        console.error("Error flushing operations on timer:", error);
+      });
+    }, this.config.batchWindowMs);
+  }
+  clearBatchTimer() {
+    if (this.batchTimer) {
+      clearTimeout(this.batchTimer);
+      this.batchTimer = null;
+    }
+  }
+};
+
 // ../../../vite-plugin-file-sync/dist/parsing/bindings.js
 init_cjs_shims();
 var localBindingKinds = /* @__PURE__ */ new Set(["local", "param", "var", "const", "let"]);
@@ -435896,6 +435981,7 @@ var SourceTracker = class {
     const extension = path26.extname(fileName);
     if (extension !== ".ts" && extension !== ".tsx")
       return;
+    const existingFile = fileName in this.fileToMeta;
     try {
       const astMap = this.parseJsxFromEntrypoint({
         files: [{ fileName, code: fileContents }]
@@ -435918,7 +436004,19 @@ var SourceTracker = class {
         delete this.elementToLocation[key2];
         delete this.elementToFilePath[key2];
       });
-      const changedFiles = this.sbScopeManager.resetScope(fileName);
+      let changedFiles = [];
+      if (existingFile) {
+        changedFiles = this.sbScopeManager.resetScope(fileName);
+      } else {
+        this.sbScopeManager.parseScopes({
+          [fileName]: {
+            code: fileContents,
+            ast,
+            imports: extractImportsFromAst(ast)
+          }
+        });
+        changedFiles.push(fileName);
+      }
       if (!fileName.endsWith(SCOPE_FILE)) {
         const { idMap } = supplementElementIds({
           fileName,
@@ -436044,7 +436142,7 @@ var SourceTracker = class {
     });
     return scopeDefinition.id;
   };
-  deleteApi = async ({ pageName, apiName }) => {
+  deleteApi = ({ pageName, apiName }) => {
     const { scopeDefinition, filePath: scopeFilePath } = this.sbScopeManager.getScopeDefinitionAndFilePathByNameOrId({
       identifier: pageName,
       type: "name"
@@ -436076,24 +436174,24 @@ var SourceTracker = class {
     });
     return scopeDefinition.id;
   };
-  addEntity = async ({ scopeId, entity }) => {
+  addEntity = ({ scopeId, entity }) => {
     const changedFiles = this.sbScopeManager.addScopeEntity(scopeId, entity);
     changedFiles.forEach((file) => {
       this.changedFiles.add(file);
     });
   };
-  updateEntity = async (payload) => {
+  updateEntity = (payload) => {
     const changedFile = this.sbScopeManager.updateScopeEntity(payload);
     this.changedFiles.add(changedFile);
   };
-  deleteEntity = async ({ entityId }) => {
+  deleteEntity = ({ entityId }) => {
     const { changedFiles, deletedEntitiesNames } = this.sbScopeManager.deleteScopeEntity(entityId);
     changedFiles.forEach((file) => {
       this.changedFiles.add(file);
     });
     return deletedEntitiesNames[0];
   };
-  renameEntity = async ({ entityId, oldName, newName, scopeName }) => {
+  renameEntity = ({ entityId, oldName, newName, scopeName }) => {
     const { changedFiles, scopeFile } = this.sbScopeManager.renameScopeEntity({
       entityId,
       newName,
@@ -436124,7 +436222,7 @@ var SourceTracker = class {
     }
   };
   // THEMING
-  updateTheme = async ({ themeFilePath, theme }) => {
+  updateTheme = ({ themeFilePath, theme }) => {
     const ast = this.getCurrentFiles()[themeFilePath]?.ast;
     if (!ast) {
       throw new Error("File not found in source tracker " + path26);
@@ -436137,7 +436235,7 @@ var SourceTracker = class {
       throw e;
     }
   };
-  addElement = async ({ parentElement, tagName, properties, children, id: id2, scopeName }) => {
+  addElement = ({ parentElement, tagName, properties, children, id: id2, scopeName }) => {
     const logger3 = getLogger();
     const parentOpeningElementPath = this.getElementToLocation(parentElement.source.id);
     const parentFilepath = this.getElementToFilePath(parentElement.source.id);
@@ -436281,7 +436379,7 @@ var SourceTracker = class {
       throw new Error("Error updating source tracker during add" + e.message);
     }
   };
-  deleteElement = async ({ source: source2, scopeName }) => {
+  deleteElement = ({ source: source2, scopeName }) => {
     const logger3 = getLogger();
     let openingTag = this.getElementToLocation(source2.id);
     if (!openingTag) {
@@ -436440,13 +436538,13 @@ var SourceTracker = class {
       element.node.closingElement = import_types24.default.jsxClosingElement(import_types24.default.jsxIdentifier(getTagName(openingElement.node.name) ?? ""));
     }
   };
-  setProperty = async ({ source: source2, property, info }) => {
-    await this.setProperties({
+  setProperty = ({ source: source2, property, info }) => {
+    this.setProperties({
       source: source2,
       changes: { [property]: info }
     });
   };
-  setProperties = async ({ source: source2, changes }) => {
+  setProperties = ({ source: source2, changes }) => {
     const logger3 = getLogger();
     if (Object.keys(changes).length === 0)
       return;
@@ -436672,12 +436770,13 @@ var SUPPORTED_FILETYPES = [
   }
 ];
 var APP_THEME_FILE_NAME = "appTheme.ts";
-var FileSyncManager = class extends import_shared32.TracedEventEmitter {
+var FileSystemManager = class extends import_shared32.TracedEventEmitter {
   rootDir;
   tsFiles = {};
   apiFiles = {};
   sourceTracker;
   fsOperationQueue;
+  operationProcessor;
   generationNumberSequence;
   routes = {};
   watcher;
@@ -436690,6 +436789,11 @@ var FileSyncManager = class extends import_shared32.TracedEventEmitter {
     this.fsOperationQueue = fsOperationQueue;
     this.generationNumberSequence = generationNumberSequence;
     this._tracer = tracer2;
+    this.operationProcessor = new OperationProcessor({
+      batchWindowMs: 50,
+      maxBatchSize: 100
+    });
+    this.operationProcessor.disable();
     applyErrorHandling(this, {
       watch: { operation: "editing from code" },
       handleCreatePage: { operation: "creating a page" },
@@ -436836,132 +436940,193 @@ var FileSyncManager = class extends import_shared32.TracedEventEmitter {
         this.updateApi(content2, path55);
       }
     });
-    const handleFileChange = async (event, filePath) => {
-      logger3.info(`File changed: ${filePath}, event: ${event}`);
-      switch (event) {
-        case "add": {
-          const fileType = SUPPORTED_FILETYPES.find((f) => filePath.endsWith(f.extension));
-          if (!fileType || !filePath.startsWith(rootPath)) {
-            return;
-          }
-          const data = await readFile6(filePath);
-          if (typeof data !== "string")
-            return;
-          if (/pages\/.*\/index\.tsx/.test(filePath)) {
-            const file = await readFile6(filePath);
-            if (!file) {
-              logger3.error(`Failed to read file: ${filePath}`);
-              return;
-            }
-            if (!(filePath in this.tsFiles)) {
-              this.tsFiles[filePath] = file;
-              this.handleNonVisualChangeByDeletingIds(filePath, file);
-              this.emit("addPage", filePath);
+    watcher.on("all", this.handleFileChange);
+  }
+  enableOperationsQueue() {
+    this.operationProcessor.enable();
+  }
+  disableOperationsQueue() {
+    this.operationProcessor.disable();
+  }
+  async flushOperations() {
+    await this.operationProcessor.flush();
+  }
+  handleFileChange = async (event, filePath) => {
+    const logger3 = getLogger();
+    logger3.info(`File changed: ${filePath}, event: ${event}`);
+    const rootPath = this.rootDir;
+    if (!rootPath) {
+      throw new Error("Root directory not set");
+    }
+    if (event === "addDir" || event === "unlinkDir") {
+      return;
+    }
+    const routePath = path27.join(rootPath, ROUTES_FILE);
+    const fileType = SUPPORTED_FILETYPES.find((f) => filePath.endsWith(f.extension));
+    if (!fileType || !filePath.startsWith(rootPath)) {
+      return;
+    }
+    switch (event) {
+      case "add": {
+        const data = await readFile6(filePath);
+        if (typeof data !== "string")
+          return;
+        const isPage = isPageFilePath(filePath);
+        if (isPage) {
+          void this.operationProcessor.addOperation({
+            metadata: {
+              filePath
+            },
+            execute: async () => {
+              const file = await readFile6(filePath);
+              if (!file) {
+                logger3.error(`Failed to read file: ${filePath}`);
+                return;
+              }
+              if (!(filePath in this.tsFiles)) {
+                this.tsFiles[filePath] = file;
+                this.handleNonVisualChangeByDeletingIds(filePath, file);
+                this.emit("addPage", filePath);
+              }
             }
-          }
-          switch (fileType.type) {
-            case "api":
-            case "python-api-step":
-            case "js-api-step": {
-              await this.processApiUpdates(filePath, fileType);
-              break;
+          });
+        } else {
+          void this.operationProcessor.addOperation({
+            metadata: {
+              filePath
+            },
+            execute: async () => {
+              switch (fileType.type) {
+                case "api":
+                case "python-api-step":
+                case "js-api-step": {
+                  await this.processApiUpdates(filePath, fileType);
+                  break;
+                }
+              }
             }
-          }
-          break;
+          });
         }
-        case "change": {
-          if (filePath === routePath) {
-            const data2 = await readFile6(filePath);
-            try {
-              this.routes = JSON.parse(data2);
-              this.emit("routesChanged", this.routes);
-            } catch (e) {
-              logger3.error("Error parsing routes file", getErrorMeta(e));
-            }
-            return;
-          }
-          const fileType = SUPPORTED_FILETYPES.find((f) => filePath.endsWith(f.extension));
-          if (!fileType || !filePath.startsWith(rootPath)) {
-            return;
-          }
-          const data = await readFile6(filePath);
-          if (typeof data !== "string")
-            return;
-          switch (fileType.type) {
-            case "tsx":
-            case "scope":
-              {
-                if (!(filePath in this.tsFiles && this.tsFiles[filePath] === data)) {
-                  logger3.info(`File changed: ${filePath} updating AST tracker`);
-                  this.tsFiles[filePath] = data;
-                  this.handleNonVisualChangeByDeletingIds(filePath, data);
-                  this.emit("fileChanged", filePath, data, true);
-                } else {
-                  logger3.info(`File unchanged from last tracked state: ${filePath}`);
-                  this.emit("fileChanged", filePath, data, false);
+        break;
+      }
+      case "change": {
+        if (filePath === routePath) {
+          void this.operationProcessor.addOperation({
+            metadata: {
+              filePath
+            },
+            priority: true,
+            execute: async () => {
+              try {
+                const data = JSON.parse(await readFile6(filePath) ?? "{}");
+                if (!isEqual_default(this.routes, data)) {
+                  this.routes = data;
+                  this.emit("routesChanged", this.routes);
                 }
+              } catch (e) {
+                logger3.error("Error parsing routes file", getErrorMeta(e));
               }
-              break;
-            case "api":
-            case "python-api-step":
-            case "js-api-step":
-              {
-                await this.processApiUpdates(filePath, fileType);
+            }
+          });
+          return;
+        } else {
+          void this.operationProcessor.addOperation({
+            metadata: {
+              filePath
+            },
+            execute: async () => {
+              const fileType2 = SUPPORTED_FILETYPES.find((f) => filePath.endsWith(f.extension));
+              if (!fileType2 || !filePath.startsWith(rootPath)) {
+                return;
               }
-              break;
-          }
-          break;
-        }
-        case "unlink": {
-          if (filePath in this.apiFiles) {
-            const api = this.apiFiles[filePath];
-            delete this.apiFiles[filePath];
-            if (!api || !this.sourceTracker)
-              break;
-            const scopeId = await this.sourceTracker.deleteApi({
-              pageName: api.pageName,
-              apiName: api.apiPb.metadata.name
-            });
-            const changes = await this.sourceTracker?.getAndFlushChanges() ?? [];
-            await this.writeChanges(changes);
-            this.emit("apiManualDelete", {
-              api: {
-                id: getClientApiId(api.apiPb.metadata.name, api.pageName),
-                apiName: api.apiPb.metadata.name,
-                // TODO(saksham): get pagename more defensively
-                pageName: getPageName2(filePath),
-                scopeId
+              const data = await readFile6(filePath);
+              if (typeof data !== "string")
+                return;
+              switch (fileType2.type) {
+                case "tsx":
+                case "scope":
+                  {
+                    if (!(filePath in this.tsFiles && this.tsFiles[filePath] === data)) {
+                      logger3.info(`File changed: ${filePath} updating AST tracker`);
+                      this.tsFiles[filePath] = data;
+                      this.handleNonVisualChangeByDeletingIds(filePath, data);
+                      this.emit("fileChanged", filePath, data, true);
+                    } else {
+                      logger3.info(`File unchanged from last tracked state: ${filePath}`);
+                      this.emit("fileChanged", filePath, data, false);
+                    }
+                  }
+                  break;
+                case "api":
+                case "python-api-step":
+                case "js-api-step":
+                  {
+                    await this.processApiUpdates(filePath, fileType2);
+                  }
+                  break;
               }
-            });
-          }
-          if (filePath in this.tsFiles) {
-            delete this.tsFiles[filePath];
-            this.sourceTracker?.removeFile(filePath);
-            this.emit("deletePage", filePath);
-          }
-          break;
+            }
+          });
         }
+        break;
       }
-    };
-    watcher.on("all", async (event, filePath) => {
-      const fileType = SUPPORTED_FILETYPES.find((f) => filePath.endsWith(f.extension));
-      switch (fileType?.type) {
-        case "tsx":
-        case "scope":
-          this.fsOperationQueue.enqueue(async () => {
-            return await handleFileChange(event, filePath);
+      case "unlink": {
+        if (filePath in this.tsFiles) {
+          void this.operationProcessor.addOperation({
+            metadata: {
+              filePath
+            },
+            execute: async () => {
+              await this.deleteTsFile(filePath);
+            }
           });
-          break;
-        default:
-          this.fsOperationQueue.enqueue(async () => {
-            void handleFileChange(event, filePath);
+        } else if (filePath in this.apiFiles) {
+          void this.operationProcessor.addOperation({
+            metadata: {
+              filePath
+            },
+            execute: async () => {
+              await this.deleteApiFile(filePath);
+            }
           });
+        }
+        break;
       }
-    });
-  }
+    }
+  };
   getApiFiles() {
     return this.formatApisToClientApis(this.apiFiles);
   }
+  async deleteTsFile(filePath) {
+    delete this.tsFiles[filePath];
+    this.sourceTracker?.removeFile(filePath);
+    if (isPageFilePath(filePath)) {
+      this.emit("deletePage", filePath);
+    }
+  }
+  async deleteApiFile(filePath) {
+    const api = this.apiFiles[filePath];
+    if (!api) {
+      return;
+    }
+    delete this.apiFiles[filePath];
+    this.sourceTracker?.deleteApi({
+      pageName: api.pageName,
+      apiName: api.apiPb.metadata.name
+    });
+    const changes = await this.sourceTracker?.getAndFlushChanges() ?? [];
+    await this.writeChanges(changes);
+    const scopeId = this.sourceTracker?.getScopeDefinitionForPage(api.pageName)?.id;
+    this.emit("apiManualDelete", {
+      api: {
+        id: getClientApiId(api.apiPb.metadata.name, api.pageName),
+        apiName: api.apiPb.metadata.name,
+        // TODO(saksham): get pagename more defensively
+        pageName: getPageName2(filePath),
+        scopeId
+      }
+    });
+  }
   getTsFilePaths() {
     return Object.keys(this.tsFiles);
   }
@@ -437169,11 +437334,11 @@ export default registerPage(Page, { name: "${name18}" });
   handleReparent = async (payload, writeFile9 = true) => {
     const { from, to, changedProps, transaction } = payload;
     this.trackTransaction(transaction?.id);
-    await this.sourceTracker?.setProperties({
+    this.sourceTracker?.setProperties({
       source: from.source,
       changes: changedProps ?? {}
     });
-    await this.sourceTracker?.moveElement({
+    this.sourceTracker?.moveElement({
       from,
       to
     });
@@ -437187,7 +437352,7 @@ export default registerPage(Page, { name: "${name18}" });
   };
   handleCreateComponent = async (payload, writeFile9 = true) => {
     this.trackTransaction(payload.transaction?.id);
-    const sourceId = await this.sourceTracker?.addElement(payload);
+    const sourceId = this.sourceTracker?.addElement(payload);
     if (writeFile9) {
       const changes = await this.sourceTracker?.getAndFlushChanges() ?? [];
       await this.writeChanges(changes ?? [], (fileName) => {
@@ -437201,7 +437366,7 @@ export default registerPage(Page, { name: "${name18}" });
     const { elements, transaction } = payload;
     this.trackTransaction(transaction?.id);
     for (const element of elements) {
-      await this.sourceTracker?.deleteElement({
+      this.sourceTracker?.deleteElement({
         source: element.source,
         scopeName: element.scopeName
       });
@@ -437217,7 +437382,7 @@ export default registerPage(Page, { name: "${name18}" });
   handleSetProperty = async (payload, writeFile9 = true) => {
     const { element: { source: source2 }, property, value: value2, transaction } = payload;
     this.trackTransaction(transaction?.id);
-    await this.sourceTracker?.setProperty({
+    this.sourceTracker?.setProperty({
       source: source2,
       property,
       info: value2
@@ -437232,7 +437397,7 @@ export default registerPage(Page, { name: "${name18}" });
   handleSetProperties = async (payload, writeFile9 = true) => {
     const { element: { source: source2 }, properties, transaction } = payload;
     this.trackTransaction(transaction?.id);
-    await this.sourceTracker?.setProperties({
+    this.sourceTracker?.setProperties({
       source: source2,
       changes: properties
     });
@@ -437362,7 +437527,7 @@ export default registerPage(Page, { name: "${name18}" });
               await fs12.rmdir(apiDir, { recursive: true });
             }
             delete this.apiFiles[apiFilePath];
-            const scopeId = await this.sourceTracker.deleteApi({
+            const scopeId = this.sourceTracker.deleteApi({
               pageName,
               apiName
             });
@@ -437456,7 +437621,7 @@ export default registerPage(Page, { name: "${name18}" });
     }));
   };
   handleAddEntity = async (payload) => {
-    await this.sourceTracker?.addEntity({
+    this.sourceTracker?.addEntity({
       scopeId: payload.scopeId,
       entity: {
         type: payload.type,
@@ -437470,7 +437635,7 @@ export default registerPage(Page, { name: "${name18}" });
     });
   };
   handleUpdateEntity = async (payload) => {
-    await this.sourceTracker?.updateEntity({
+    this.sourceTracker?.updateEntity({
       entityId: payload.entityId,
       updates: payload.updates
     });
@@ -437480,7 +437645,7 @@ export default registerPage(Page, { name: "${name18}" });
     });
   };
   handleDeleteEntity = async (payload) => {
-    const deletedEntityName = await this.sourceTracker?.deleteEntity({
+    const deletedEntityName = this.sourceTracker?.deleteEntity({
       entityId: payload.entityId
     });
     const changes = await this.sourceTracker?.getAndFlushChanges() ?? [];
@@ -437496,7 +437661,7 @@ export default registerPage(Page, { name: "${name18}" });
       throw new Error("Root directory not set");
     }
     const filePath = path27.join(this.rootDir, APP_THEME_FILE_NAME);
-    await this.sourceTracker?.updateTheme({
+    this.sourceTracker?.updateTheme({
       themeFilePath: filePath,
       theme
     });
@@ -437532,7 +437697,7 @@ export default registerPage(Page, { name: "${name18}" });
   };
   handleRenameEntity = async (payload) => {
     const { elementId, newName, oldName, scopeName } = payload;
-    await this.sourceTracker?.renameEntity({
+    this.sourceTracker?.renameEntity({
       entityId: elementId,
       oldName,
       newName,
@@ -438217,7 +438382,7 @@ var fileSyncVitePlugin = (pluginParams, options9) => {
   const aiService = pluginParams.aiService;
   const fsOperationQueue = pluginParams.fsOperationQueue;
   const httpServer2 = pluginParams.httpServer;
-  const fileSyncManager = new FileSyncManager(fsOperationQueue, generationNumberSequence, pluginParams.tracer);
+  const fileSyncManager = new FileSystemManager(fsOperationQueue, generationNumberSequence, pluginParams.tracer);
   if (syncService) {
     syncService.generationNumberSequence = generationNumberSequence;
   }
@@ -438630,7 +438795,12 @@ var fileSyncVitePlugin = (pluginParams, options9) => {
             return socket.call.aiSetDraftState({ hasDraft });
           });
         });
-        aiService.on("generationCompleted", (hasDraft) => {
+        aiService.on("generationStarted", () => {
+          fileSyncManager.enableOperationsQueue();
+        });
+        aiService.on("generationCompleted", async (hasDraft) => {
+          fileSyncManager.disableOperationsQueue();
+          await fileSyncManager.flushOperations();
           if (hasDraft) {
             logger3.info("Requesting full reload to render AI draft");
             server.ws.send({
@@ -442607,7 +442777,7 @@ var import_util30 = __toESM(require_dist3(), 1);
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.6-next.16",
+  version: "2.0.6-next.17",
   type: "module",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
@@ -442648,11 +442818,11 @@ var package_default = {
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.5.0",
-    "@superblocksteam/library": "2.0.6-next.16",
-    "@superblocksteam/library-shared": "2.0.6-next.16",
+    "@superblocksteam/library": "2.0.6-next.17",
+    "@superblocksteam/library-shared": "2.0.6-next.17",
     "@superblocksteam/shared": "0.9198.0",
-    "@superblocksteam/util": "2.0.6-next.16",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.6-next.16",
+    "@superblocksteam/util": "2.0.6-next.17",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.6-next.17",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -450223,7 +450393,8 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, port
   };
   const isCustomBuildEnabled2 = await isCustomComponentsEnabled();
   const customFolder = path37.join(root2, "custom");
-  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.6-next.16";
+  const draftsFolder = path37.join(root2, ".superblocks");
+  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.6-next.17";
   const env3 = loadEnv(mode, root2, "");
   const hmrPort = await getFreePort();
   const hmrOptions = {
@@ -450254,10 +450425,7 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, port
     server: {
       middlewareMode: true,
       watch: {
-        ignored: [
-          `${customFolder}/**/*`,
-          `${root2}/.superblocks/{generations,drafts}/**/*`
-        ]
+        ignored: [`${customFolder}/**/*`, `${draftsFolder}/**/*`]
       },
       hmr: hmrOptions,
       cors: {

package/oclif.manifest.json

@@ -585,5 +585,5 @@
       "strict": true
     }
   },
-  "version": "2.0.6-next.16"
+  "version": "2.0.6-next.17"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "2.0.6-next.16",
+  "version": "2.0.6-next.17",
   "type": "module",
   "description": "Official Superblocks CLI",
   "homepage": "https://www.superblocks.com",
@@ -42,9 +42,9 @@
   "devDependencies": {
     "@eslint/js": "^9.16.0",
     "@oclif/test": "^4.1.11",
-    "@superblocksteam/sdk": "2.0.6-next.16",
+    "@superblocksteam/sdk": "2.0.6-next.17",
     "@superblocksteam/shared": "0.9198.0",
-    "@superblocksteam/util": "2.0.6-next.16",
+    "@superblocksteam/util": "2.0.6-next.17",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",