@superblocksteam/cli 2.0.0-next.70 → 2.0.0-next.71

package/dist/index.js

@@ -6933,8 +6933,8 @@ var require_pattern = __commonJS({
     }
     exports2.endsWithSlashGlobStar = endsWithSlashGlobStar;
     function isAffectDepthOfReadingPattern(pattern) {
-      const basename7 = path51.basename(pattern);
-      return endsWithSlashGlobStar(pattern) || isStaticPattern(basename7);
+      const basename8 = path51.basename(pattern);
+      return endsWithSlashGlobStar(pattern) || isStaticPattern(basename8);
     }
     exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
     function expandPatternsWithBraceExpansion(patterns) {
@@ -18190,15 +18190,15 @@ var require_file = __commonJS({
       _incFile(callback) {
         debug5("_incFile", this.filename);
         const ext2 = path51.extname(this._basename);
-        const basename7 = path51.basename(this._basename, ext2);
+        const basename8 = path51.basename(this._basename, ext2);
         const tasks = [];
         if (this.zippedArchive) {
           tasks.push(
             function(cb) {
               const num = this._created > 0 && !this.tailable ? this._created : "";
               this._compressFile(
-                path51.join(this.dirname, `${basename7}${num}${ext2}`),
-                path51.join(this.dirname, `${basename7}${num}${ext2}.gz`),
+                path51.join(this.dirname, `${basename8}${num}${ext2}`),
+                path51.join(this.dirname, `${basename8}${num}${ext2}.gz`),
                 cb
               );
             }.bind(this)
@@ -18208,9 +18208,9 @@ var require_file = __commonJS({
           function(cb) {
             if (!this.tailable) {
               this._created += 1;
-              this._checkMaxFilesIncrementing(ext2, basename7, cb);
+              this._checkMaxFilesIncrementing(ext2, basename8, cb);
             } else {
-              this._checkMaxFilesTailable(ext2, basename7, cb);
+              this._checkMaxFilesTailable(ext2, basename8, cb);
             }
           }.bind(this)
         );
@@ -18224,9 +18224,9 @@ var require_file = __commonJS({
        */
       _getFile() {
         const ext2 = path51.extname(this._basename);
-        const basename7 = path51.basename(this._basename, ext2);
+        const basename8 = path51.basename(this._basename, ext2);
         const isRotation = this.rotationFormat ? this.rotationFormat() : this._created;
-        return !this.tailable && this._created ? `${basename7}${isRotation}${ext2}` : `${basename7}${ext2}`;
+        return !this.tailable && this._created ? `${basename8}${isRotation}${ext2}` : `${basename8}${ext2}`;
       }
       /**
        * Increment the number of files created or checked by this instance.
@@ -18236,14 +18236,14 @@ var require_file = __commonJS({
        * @returns {undefined}
        * @private
        */
-      _checkMaxFilesIncrementing(ext2, basename7, callback) {
+      _checkMaxFilesIncrementing(ext2, basename8, callback) {
         if (!this.maxFiles || this._created < this.maxFiles) {
           return setImmediate(callback);
         }
         const oldest = this._created - this.maxFiles;
         const isOldest = oldest !== 0 ? oldest : "";
         const isZipped = this.zippedArchive ? ".gz" : "";
-        const filePath = `${basename7}${isOldest}${ext2}${isZipped}`;
+        const filePath = `${basename8}${isOldest}${ext2}${isZipped}`;
         const target = path51.join(this.dirname, filePath);
         fs30.unlink(target, callback);
       }
@@ -18258,7 +18258,7 @@ var require_file = __commonJS({
        * @returns {undefined}
        * @private
        */
-      _checkMaxFilesTailable(ext2, basename7, callback) {
+      _checkMaxFilesTailable(ext2, basename8, callback) {
         const tasks = [];
         if (!this.maxFiles) {
           return;
@@ -18266,21 +18266,21 @@ var require_file = __commonJS({
         const isZipped = this.zippedArchive ? ".gz" : "";
         for (let x = this.maxFiles - 1; x > 1; x--) {
           tasks.push(function(i2, cb) {
-            let fileName = `${basename7}${i2 - 1}${ext2}${isZipped}`;
+            let fileName = `${basename8}${i2 - 1}${ext2}${isZipped}`;
             const tmppath = path51.join(this.dirname, fileName);
             fs30.exists(tmppath, (exists2) => {
               if (!exists2) {
                 return cb(null);
               }
-              fileName = `${basename7}${i2}${ext2}${isZipped}`;
+              fileName = `${basename8}${i2}${ext2}${isZipped}`;
               fs30.rename(tmppath, path51.join(this.dirname, fileName), cb);
             });
           }.bind(this, x));
         }
         asyncSeries(tasks, () => {
           fs30.rename(
-            path51.join(this.dirname, `${basename7}${ext2}${isZipped}`),
-            path51.join(this.dirname, `${basename7}1${ext2}${isZipped}`),
+            path51.join(this.dirname, `${basename8}${ext2}${isZipped}`),
+            path51.join(this.dirname, `${basename8}1${ext2}${isZipped}`),
             callback
           );
         });
@@ -249830,7 +249830,7 @@ var require_view = __commonJS({
     var path51 = __require("path");
     var fs30 = __require("fs");
     var dirname9 = path51.dirname;
-    var basename7 = path51.basename;
+    var basename8 = path51.basename;
     var extname3 = path51.extname;
     var join10 = path51.join;
     var resolve8 = path51.resolve;
@@ -249869,7 +249869,7 @@ var require_view = __commonJS({
         var root2 = roots[i2];
         var loc = resolve8(root2, name18);
         var dir = dirname9(loc);
-        var file = basename7(loc);
+        var file = basename8(loc);
         path53 = this.resolve(dir, file);
       }
       return path53;
@@ -249885,7 +249885,7 @@ var require_view = __commonJS({
       if (stat4 && stat4.isFile()) {
         return path53;
       }
-      path53 = join10(dir, basename7(file, ext2), "index" + ext2);
+      path53 = join10(dir, basename8(file, ext2), "index" + ext2);
       stat4 = tryStat(path53);
       if (stat4 && stat4.isFile()) {
         return path53;
@@ -249909,7 +249909,7 @@ var require_content_disposition = __commonJS({
     init_cjs_shims();
     module2.exports = contentDisposition;
     module2.exports.parse = parse17;
-    var basename7 = __require("path").basename;
+    var basename8 = __require("path").basename;
     var Buffer2 = require_safe_buffer().Buffer;
     var ENCODE_URL_ATTR_CHAR_REGEXP = /[\x00-\x20"'()*,/:;<=>?@[\\\]{}\x7f]/g;
     var HEX_ESCAPE_REGEXP = /%[0-9A-Fa-f]{2}/;
@@ -249945,9 +249945,9 @@ var require_content_disposition = __commonJS({
       if (typeof fallback === "string" && NON_LATIN1_REGEXP.test(fallback)) {
         throw new TypeError("fallback must be ISO-8859-1 string");
       }
-      var name18 = basename7(filename);
+      var name18 = basename8(filename);
       var isQuotedString = TEXT_REGEXP.test(name18);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name18) : basename7(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name18) : basename8(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name18;
       if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name18)) {
         params["filename*"] = name18;
@@ -254980,10 +254980,10 @@ var ReaddirpStream = class extends Readable {
   }
   async _formatEntry(dirent, path51) {
     let entry;
-    const basename7 = this._isDirent ? dirent.name : dirent;
+    const basename8 = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = presolve(pjoin(path51, basename7));
-      entry = { path: prelative(this._root, fullPath), fullPath, basename: basename7 };
+      const fullPath = presolve(pjoin(path51, basename8));
+      entry = { path: prelative(this._root, fullPath), fullPath, basename: basename8 };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
       this._onError(err);
@@ -255523,9 +255523,9 @@ var NodeFsHandler = class {
   _watchWithNodeFs(path51, listener) {
     const opts = this.fsw.options;
     const directory = sysPath.dirname(path51);
-    const basename7 = sysPath.basename(path51);
+    const basename8 = sysPath.basename(path51);
     const parent = this.fsw._getWatchedDir(directory);
-    parent.add(basename7);
+    parent.add(basename8);
     const absolutePath = sysPath.resolve(path51);
     const options8 = {
       persistent: opts.persistent
@@ -255535,7 +255535,7 @@ var NodeFsHandler = class {
     let closer;
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
-      options8.interval = enableBin && isBinaryPath(basename7) ? opts.binaryInterval : opts.interval;
+      options8.interval = enableBin && isBinaryPath(basename8) ? opts.binaryInterval : opts.interval;
       closer = setFsWatchFileListener(path51, absolutePath, options8, {
         listener,
         rawEmitter: this.fsw._emitRaw
@@ -255558,10 +255558,10 @@ var NodeFsHandler = class {
       return;
     }
     const dirname9 = sysPath.dirname(file);
-    const basename7 = sysPath.basename(file);
+    const basename8 = sysPath.basename(file);
     const parent = this.fsw._getWatchedDir(dirname9);
     let prevStats = stats;
-    if (parent.has(basename7))
+    if (parent.has(basename8))
       return;
     const listener = async (path51, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
@@ -255586,9 +255586,9 @@ var NodeFsHandler = class {
             prevStats = newStats2;
           }
         } catch (error) {
-          this.fsw._remove(dirname9, basename7);
+          this.fsw._remove(dirname9, basename8);
         }
-      } else if (parent.has(basename7)) {
+      } else if (parent.has(basename8)) {
         const at3 = newStats.atimeMs;
         const mt = newStats.mtimeMs;
         if (!at3 || at3 <= mt || mt !== prevStats.mtimeMs) {
@@ -261179,8 +261179,8 @@ var require_pattern2 = __commonJS2({
     }
     exports2.endsWithSlashGlobStar = endsWithSlashGlobStar;
     function isAffectDepthOfReadingPattern(pattern) {
-      const basename7 = path132.basename(pattern);
-      return endsWithSlashGlobStar(pattern) || isStaticPattern(basename7);
+      const basename8 = path132.basename(pattern);
+      return endsWithSlashGlobStar(pattern) || isStaticPattern(basename8);
     }
     exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
     function expandPatternsWithBraceExpansion(patterns) {
@@ -274893,11 +274893,11 @@ function getLanguageByFileName(languages2, file) {
   if (!file) {
     return;
   }
-  const basename7 = getFileBasename(file).toLowerCase();
+  const basename8 = getFileBasename(file).toLowerCase();
   return languages2.find(
-    ({ filenames }) => filenames == null ? void 0 : filenames.some((name18) => name18.toLowerCase() === basename7)
+    ({ filenames }) => filenames == null ? void 0 : filenames.some((name18) => name18.toLowerCase() === basename8)
   ) ?? languages2.find(
-    ({ extensions }) => extensions == null ? void 0 : extensions.some((extension) => basename7.endsWith(extension))
+    ({ extensions }) => extensions == null ? void 0 : extensions.some((extension) => basename8.endsWith(extension))
   );
 }
 function getLanguageByLanguageName(languages2, languageName) {
@@ -286389,7 +286389,7 @@ function createAnthropic(options8 = {}) {
 var anthropic = createAnthropic();
 
 // ../../../vite-plugin-file-sync/dist/ai-service/index.js
-var import_shared10 = __toESM(require_dist2(), 1);
+var import_shared11 = __toESM(require_dist2(), 1);
 
 // ../../../vite-plugin-file-sync/dist/ai-service/app-interface/shell.js
 init_cjs_shims();
@@ -292880,6 +292880,49 @@ var AppShell = class {
   }
 };
 
+// ../../../vite-plugin-file-sync/dist/ai-service/app-interface/source-tracker.js
+init_cjs_shims();
+var SourceTrackerInterface = class {
+  sourceTracker;
+  setSourceTracker(sourceTracker) {
+    this.sourceTracker = sourceTracker;
+  }
+  getCurrentFiles() {
+    if (!this.sourceTracker) {
+      throw new Error("Source tracker not initialized");
+    }
+    return this.sourceTracker.getCurrentFiles();
+  }
+  getElementToFilePathMap() {
+    return this.sourceTracker?.getElementToFilePath();
+  }
+  getElementToFilePath(el) {
+    if (!this.sourceTracker) {
+      throw new Error("Source tracker not initialized");
+    }
+    if (el === void 0)
+      return this.sourceTracker.getElementToFilePath();
+    return this.sourceTracker.getElementToFilePath(el);
+  }
+  getElementToLocationMap() {
+    return this.sourceTracker?.getElementToLocation();
+  }
+  getElementToLocation(el) {
+    if (!this.sourceTracker) {
+      throw new Error("Source tracker not initialized");
+    }
+    if (el === void 0)
+      return this.sourceTracker.getElementToLocation();
+    return this.sourceTracker.getElementToLocation(el);
+  }
+  getScopeDefinitionForPage(pageName) {
+    if (!this.sourceTracker) {
+      throw new Error("Source tracker not initialized");
+    }
+    return this.sourceTracker.getScopeDefinitionForPage(pageName);
+  }
+};
+
 // ../../../vite-plugin-file-sync/dist/ai-service/artifacts/bolt.js
 init_cjs_shims();
 var BoltArtifactProcessor = class {
@@ -292910,7 +292953,7 @@ ${boltActions.join("\n")}
       return content2 ? {
         type: "file",
         filePath,
-        content: content2
+        content: content2.trim()
       } : null;
     }).filter((file) => file !== null);
   }
@@ -293152,7 +293195,7 @@ var FSM = class {
         event
       });
     } catch (error) {
-      logger3.error(`[ai-service] Transition handler threw an error for ${toState}:`, getErrorMeta(error));
+      logger3.error(`[ai-service] Transition handler threw an error for ${toState} on event ${event.type}:`, getErrorMeta(error));
       throw error;
     }
   }
@@ -293166,9 +293209,15 @@ init_cjs_shims();
 var Paths;
 (function(Paths2) {
   Paths2["GeneratedApis"] = "pages/:pageName/apis/:apiName";
-  Paths2["PageIndexes"] = "pages/:pageName/index.tsx";
   Paths2["ApiYamls"] = "pages/:pageName/apis/:apiName/api.yaml";
-  Paths2["AllScopes"] = "**/*.scope.ts";
+  Paths2["PageIndexes"] = "pages/:pageName/index.tsx";
+  Paths2["PageScopes"] = "pages/:pageName/scope.ts";
+  Paths2["Components"] = "components/:componentName";
+  Paths2["AppScope"] = "scope.ts";
+  Paths2["AppTheme"] = "appTheme.ts";
+  Paths2["AppRoutes"] = "routes.json";
+  Paths2["AppRoot"] = "App.tsx";
+  Paths2["PackageJson"] = "package.json";
   Paths2["AllFiles"] = "**/*";
 })(Paths || (Paths = {}));
 var LOG_SYSTEM_PROMPT = false;
@@ -293551,7 +293600,7 @@ init_cjs_shims();
 init_cjs_shims();
 var generated = {};
 try {
-  generated = await import("./generated-7KVX5RHQ.js");
+  generated = await import("./generated-Q3KPLOVI.js");
 } catch (_error) {
   getLogger().warn("[ai-service] Generated markdown modules not found. Run `pnpm generate:markdown` first.");
 }
@@ -293683,6 +293732,10 @@ var superblocksParts = [
   {
     name: "superblocks_rbac",
     content: loadSubprompt("subprompts/superblocks_rbac")
+  },
+  {
+    name: "superblocks_data_filtering",
+    content: loadSubprompt("subprompts/superblocks_data_filtering")
   }
 ];
 var wrapWithTags = (name18, content2, tab2 = 2) => {
@@ -293788,6 +293841,28 @@ var matchPath = (pattern) => {
     return { matched: true, params };
   };
 };
+var matchMultiplePaths = (...patterns) => {
+  const matchers = patterns.map((pattern) => {
+    if (!matcherCache.has(pattern)) {
+      matcherCache.set(pattern, compileMatcher(pattern));
+    }
+    return matcherCache.get(pattern);
+  });
+  return (path51) => {
+    for (const { regex, paramNames } of matchers) {
+      const match3 = regex.exec(path51);
+      if (match3) {
+        const values = match3.slice(1);
+        const params = {};
+        paramNames.forEach((name18, i2) => {
+          params[name18] = values[i2] ?? "";
+        });
+        return { matched: true, params };
+      }
+    }
+    return { matched: false };
+  };
+};
 var compileMatcher = (pattern) => {
   const paramNames = [];
   const regexParts = pattern.split("/").map((segment) => {
@@ -293902,7 +293977,7 @@ var ApiBuilderTransformer = class extends FileTransformer {
   runEvaluation(cwd) {
     return new Promise((resolve8, reject) => {
       const logger3 = getLogger();
-      logger3.debug("[ai-service] Evaluating in", cwd);
+      logger3.debug(`[ai-service] Evaluating in ${cwd}`);
       const tsc = spawn2("npx", ["tsc", "--noEmitOnError", "false"], { cwd });
       tsc.stdout.on("data", (data) => {
         logger3.info("[ai-service] tsc stdout", data.toString());
@@ -293990,6 +294065,176 @@ var YamlToApiBuilderTransformer = class extends ApiBuilderTransformer {
   }
 };
 
+// ../../../vite-plugin-file-sync/dist/ai-service/state-machine/helpers/change-info.js
+init_cjs_shims();
+import { basename as basename6 } from "node:path";
+
+// ../../../vite-plugin-file-sync/dist/ai-service/state-machine/helpers/peer.js
+init_cjs_shims();
+
+// ../../../vite-plugin-file-sync/dist/util/operation-queue.js
+init_cjs_shims();
+var OperationQueue = class {
+  // Invariant: `lastOperation` is a promise that never rejects. This is needed to ensure that the queue
+  // can always enqueue a new operation, even if the previous operation rejected.
+  lastOperation = Promise.resolve();
+  /**
+   * Enqueue an operation to be executed one at a time.
+   *
+   * @param operation - The operation to execute.
+   * @returns A promise that resolves to the result of the operation.
+   */
+  enqueue(operation) {
+    const promise = this.lastOperation.then(operation);
+    this.lastOperation = promise.then(() => {
+    }, () => {
+    });
+    return promise;
+  }
+};
+
+// ../../../vite-plugin-file-sync/dist/ai-service/state-machine/helpers/peer.js
+var peerQueue = (clark) => {
+  const queue = clark.context.peerChannelQueue ?? new OperationQueue();
+  clark.updateContext({
+    peerChannelQueue: queue
+  });
+  return (operation, delay4 = 0) => {
+    if (delay4) {
+      queue.enqueue(() => new Promise((resolve8) => {
+        setTimeout(() => {
+          operation().then(resolve8);
+        }, delay4);
+      }));
+    } else {
+      queue.enqueue(operation);
+    }
+  };
+};
+var sendUserMessageChannel = (clark) => {
+  const queue = peerQueue(clark);
+  return async (payload, delay4 = 0) => {
+    return queue(async () => clark.context.peer?.call.aiPushMessage(payload), delay4);
+  };
+};
+var sendUserCompletionChannel = (clark) => {
+  const queue = peerQueue(clark);
+  return async (payload, delay4 = 0) => {
+    return queue(async () => clark.context.peer?.call.aiSetCompleted(payload), delay4);
+  };
+};
+var sendChangeInfoChannel = (clark) => {
+  const queue = peerQueue(clark);
+  return async (payload, delay4 = 0) => {
+    return queue(async () => clark.context.peer?.call.aiPushChangeInfo(payload), delay4);
+  };
+};
+
+// ../../../vite-plugin-file-sync/dist/ai-service/state-machine/helpers/change-info.js
+var DependencyInfoPath = "package.json/:packageName";
+var sendChangeInfoHelper = (clark) => {
+  const apiPathMatcher = matchPath(Paths.GeneratedApis);
+  const componentPathMatcher = matchPath(Paths.Components);
+  const pagePathMatcher = matchPath(Paths.PageIndexes);
+  const dependencyPathMatcher = matchPath(DependencyInfoPath);
+  const sendChangeInfo = sendChangeInfoChannel(clark);
+  const push2 = (info) => {
+    clark.updateContext((context2) => ({
+      ...context2,
+      generatedChangeInfo: {
+        ...context2.generatedChangeInfo,
+        [info.filePath]: info
+      }
+    }));
+    return sendChangeInfo(info);
+  };
+  if (!clark.context.generatedChangeInfo) {
+    clark.updateContext({
+      generatedChangeInfo: {}
+    });
+  }
+  return ({ type: type2, filePath, action }) => {
+    const { initialFilePaths } = clark.context;
+    const existingChangeInfo = clark.context.generatedChangeInfo?.[filePath];
+    switch (type2) {
+      case "ready":
+      case "validated":
+      case "error": {
+        if (!existingChangeInfo) {
+          getLogger().warn(`[ai-service] can't update changeInfo for unknown file: ${filePath} (type: ${type2}, action: ${action})`);
+          getLogger().info(`[ai-service] ${JSON.stringify({
+            generatedChangeInfo: clark.context.generatedChangeInfo
+          })}`);
+          return;
+        }
+        return push2({
+          ...existingChangeInfo,
+          status: type2
+        });
+      }
+      case "pending": {
+        const { apis, components: components2 } = initialFilePaths ?? {};
+        if (existingChangeInfo) {
+          return push2({
+            ...existingChangeInfo,
+            status: "pending"
+          });
+        }
+        const dependencyPath = dependencyPathMatcher(filePath);
+        if (dependencyPath.matched) {
+          const { packageName } = dependencyPath.params;
+          return push2({
+            type: "dependency",
+            name: packageName,
+            action: action ?? "create",
+            status: "pending",
+            filePath
+          });
+        }
+        const componentPath = componentPathMatcher(filePath);
+        if (componentPath.matched) {
+          let { componentName } = componentPath.params;
+          componentName = basename6(componentName, ".tsx");
+          return push2({
+            type: "component",
+            name: componentName,
+            action: components2?.includes(componentName) ? "edit" : "create",
+            status: "pending",
+            filePath
+          });
+        }
+        const pagePath = pagePathMatcher(filePath);
+        if (pagePath.matched) {
+          const { pageName } = pagePath.params;
+          return push2({
+            type: "page",
+            name: pageName,
+            action: "edit",
+            status: "pending",
+            filePath
+          });
+        }
+        const apiPath = apiPathMatcher(filePath);
+        if (apiPath.matched) {
+          let { apiName } = apiPath.params;
+          apiName = basename6(apiName, ".ts");
+          const yamlPath = renderPath(Paths.ApiYamls, {
+            ...apiPath.params,
+            apiName
+          });
+          return push2({
+            type: "api",
+            name: apiName,
+            action: apis?.includes(yamlPath) ? "edit" : "create",
+            status: "pending",
+            filePath
+          });
+        }
+      }
+    }
+  };
+};
+
 // ../../../vite-plugin-file-sync/dist/ai-service/state-machine/helpers/metadata.js
 init_cjs_shims();
 var handlerMetadata = (clark) => {
@@ -294003,15 +294248,6 @@ var handlerMetadata = (clark) => {
   };
 };
 
-// ../../../vite-plugin-file-sync/dist/ai-service/state-machine/helpers/peer.js
-init_cjs_shims();
-var sendUserMessageChannel = (clark) => (payload) => {
-  return void clark.context.peer?.call.aiPushMessage(payload);
-};
-var sendUserCompletionChannel = (clark) => async (payload) => {
-  return void clark.context.peer?.call.aiSetCompleted(payload);
-};
-
 // ../../../vite-plugin-file-sync/dist/ai-service/state-machine/helpers/transition.js
 init_cjs_shims();
 var transitionFrom = (clark) => {
@@ -294029,6 +294265,7 @@ var doAgentPlanning = (clark, params) => {
   const transitionTo = transitionFrom(clark);
   const sendUserMessage = sendUserMessageChannel(clark);
   const sendUserCompletion = sendUserCompletionChannel(clark);
+  const sendChangeInfo = sendChangeInfoHelper(clark);
   const { getMeta, updateMeta } = handlerMetadata(clark);
   const debug5 = async (debuggingPromptIntro, filePaths = []) => {
     let { debugCount = 0 } = getMeta() ?? {};
@@ -294037,6 +294274,9 @@ var doAgentPlanning = (clark, params) => {
     }
     debugCount++;
     updateMeta({ debugCount });
+    clark.updateContext({
+      usedDebugging: true
+    });
     if (debugCount > MAX_DEBUG_ATTEMPTS) {
       transitionTo({
         type: AGENT_NEEDS_USER_INPUT,
@@ -294045,6 +294285,9 @@ var doAgentPlanning = (clark, params) => {
       return;
     }
     sendUserMessage({
+      type: "control",
+      group: "debugging",
+      status: "pending",
       text: debugCount === 1 ? "I found some problems in the app. Let me address them." : `Still trying to fix the errors\u2026 (attempt ${debugCount} of ${MAX_DEBUG_ATTEMPTS})`
     });
     const diff2 = await params.draftInterface.getDraftDiff(filePaths);
@@ -294056,7 +294299,7 @@ ${diff2}
 ---
 
 Address the errors and return the fixed code.`;
-    const systemPrompt = await createSystemPrompt(getMeta()?.request, params, filePaths);
+    const { systemPrompt } = await createSystemPrompt(getMeta()?.request, params, filePaths);
     transitionTo({
       type: AGENT_PLANNED,
       systemPrompt,
@@ -294068,11 +294311,19 @@ Address the errors and return the fixed code.`;
     switch (event.type) {
       case USER_SENT_PROMPT: {
         const { request, peer } = event;
+        const initialElementIds = clark.context.initialElementIds ?? Object.keys(params.sourceTrackerInterface.getElementToFilePathMap() ?? {});
         clark.updateContext((context2) => ({
           ...context2,
           abortController: context2.abortController ?? new AbortController(),
-          peer
+          peer,
+          initialElementIds
         }));
+        void sendUserMessage({
+          type: "control",
+          group: "clark",
+          status: "pending",
+          text: "Thinking\u2026"
+        });
         if (clark.context.hasSuggestions) {
           const meta2 = getMeta();
           const previousPrompts = meta2?.promptsForCurrentDraft ?? [];
@@ -294093,11 +294344,23 @@ ${newPrompt}`;
           updateMeta({
             promptsForCurrentDraft: [request.prompt]
           });
+          if (request.promptContext?.fromEmptyState) {
+            sendVerboseControlMessages(sendUserMessage);
+          }
+        }
+        const { systemPrompt, filePaths } = await createSystemPrompt(request, params);
+        if (!clark.context.initialFilePaths) {
+          const apiPathMatcher = matchPath(Paths.ApiYamls);
+          const componentPathMatcher = matchPath(Paths.Components);
+          const apis = filePaths.filter((path51) => apiPathMatcher(path51).matched);
+          const components2 = filePaths.filter((path51) => componentPathMatcher(path51).matched);
+          clark.updateContext({
+            initialFilePaths: {
+              apis,
+              components: components2
+            }
+          });
         }
-        const systemPrompt = await createSystemPrompt(request, params);
-        setTimeout(() => {
-          sendUserMessage({ text: "Planning my approach\u2026" });
-        }, 500);
         updateMeta({
           request,
           systemPrompt,
@@ -294182,6 +294445,12 @@ ${error.stack ?? error.message}
       case RUNTIME_REVIEW_ERRORED: {
         const { tsErrorsByPath } = event;
         const filePaths = Object.keys(tsErrorsByPath);
+        for (const filePath of filePaths) {
+          void sendChangeInfo({
+            type: "error",
+            filePath
+          });
+        }
         await debug5(`The following TypeScript errors were found in the project:
 ---
 ${Object.values(tsErrorsByPath).map((errors) => errors.join("\n")).join("\n")}
@@ -294251,7 +294520,28 @@ ${artifactContext.content}
     logger3.info(systemPrompt);
     logger3.info("[ai-service] " + "=".repeat(80));
   }
-  return systemPrompt;
+  return { systemPrompt, filePaths: appFiles.map((file) => file.filePath) };
+};
+var sendVerboseControlMessages = (sendUserMessage) => {
+  const messages2 = [
+    [0, "Referencing your design system"],
+    [500, "Identifying your available enterprise integrations"],
+    [1300, "Referencing users and groups"]
+  ];
+  for (const [delay4, text2] of messages2) {
+    void sendUserMessage({
+      text: text2,
+      type: "control",
+      group: text2,
+      status: "pending"
+    }, delay4);
+    void sendUserMessage({
+      text: text2,
+      type: "control",
+      group: text2,
+      status: "validated"
+    }, delay4 + 200 + Math.random() * 1e3);
+  }
 };
 
 // ../../../vite-plugin-file-sync/dist/ai-service/state-machine/handlers/awaiting-user.js
@@ -300406,7 +300696,6 @@ var BoltResultBuffer = class extends ResultBuffer {
       const [lhs, rhs] = text2.split("</boltArtifact>");
       this.buffer += lhs + "</boltArtifact>";
       this.currentType = BoltResultType.Artifact;
-      this.checkFileActions();
       this.maybeFlush(true);
       if (rhs) {
         this.add(rhs);
@@ -300433,9 +300722,13 @@ var BoltResultBuffer = class extends ResultBuffer {
   maybeFlush(force = false) {
     if (this.buffer && (force || this.shouldFlush())) {
       this.removeTrailingTags();
+      if (this.processingFilePath) {
+        this.params.onFlushFile(this.processingFilePath, this.buffer);
+      }
       this.params.onFlush(this.currentType, this.buffer);
       this.buffer = "";
       this.currentType = BoltResultType.Text;
+      this.processingFilePath = null;
     }
   }
   checkFileActions() {
@@ -300570,6 +300863,7 @@ var doLLMGenerating = (clark, { anthropicProvider, artifactProcessor, templateRe
   const transitionTo = transitionFrom(clark);
   const sendUserMessage = sendUserMessageChannel(clark);
   const sendUserCompletion = sendUserCompletionChannel(clark);
+  const sendChangeInfo = sendChangeInfoHelper(clark);
   const logger3 = getLogger();
   const matchGeneratedApi = matchPath(Paths.GeneratedApis);
   return async ({ event }) => {
@@ -300592,20 +300886,27 @@ var doLLMGenerating = (clark, { anthropicProvider, artifactProcessor, templateRe
           onTypeChange: async (type2) => {
             switch (type2) {
               case BoltResultType.Artifact:
-                if (!debugging) {
-                  void sendUserMessage({ text: "Starting to build\u2026" });
-                }
                 pendingArtifacts = true;
                 break;
+              case BoltResultType.Text:
+                void sendUserMessage({
+                  type: "control",
+                  group: "clark",
+                  status: "ready",
+                  text: "Generating\u2026"
+                });
+                break;
             }
           },
           onFlush: async (type2, text2) => {
             switch (type2) {
               case BoltResultType.Text:
-                if (artifactChunk) {
-                  flushedAfterArtifacts.push([type2, text2]);
-                } else {
-                  void sendUserMessage({ text: text2, type: "text" });
+                if (!debugging) {
+                  if (artifactChunk) {
+                    flushedAfterArtifacts.push([type2, text2]);
+                  } else {
+                    void sendUserMessage({ text: text2, type: "text" });
+                  }
                 }
                 break;
               case BoltResultType.Think:
@@ -300616,14 +300917,24 @@ var doLLMGenerating = (clark, { anthropicProvider, artifactProcessor, templateRe
                 }
                 break;
               case BoltResultType.Artifact: {
-                artifactChunk = text2;
+                if (!artifactChunk) {
+                  artifactChunk = text2;
+                }
                 break;
               }
             }
           },
-          onPendingFile: (_filePath) => {
+          onPendingFile: async (filePath) => {
+            void sendChangeInfo({
+              type: "pending",
+              filePath
+            });
           },
           onFlushFile: async (filePath, buffer2) => {
+            void sendChangeInfo({
+              type: "ready",
+              filePath
+            });
             if (!matchGeneratedApi(filePath).matched) {
               return;
             }
@@ -300751,44 +301062,103 @@ var playDead = () => async ({ event }) => {
 init_cjs_shims();
 var doPostProcessing = (clark, { draftInterface, appShell }) => {
   const transitionTo = transitionFrom(clark);
+  const sendChangeInfo = sendChangeInfoHelper(clark);
   const sendUserMessage = sendUserMessageChannel(clark);
   const createDraftFiles = (files) => {
+    for (const file of files) {
+      void sendChangeInfo({
+        type: "ready",
+        filePath: file.filePath
+      });
+    }
     return Promise.all(files.map((file) => draftInterface.createDraftFile(file.filePath, file.content)));
   };
+  const handleDependencies = async (packageJson) => {
+    void sendUserMessage({
+      type: "control",
+      group: "dependency-resolve",
+      status: "pending",
+      text: "Resolving dependencies\u2026"
+    });
+    const packageChanges = await parsePackageJsonChanges(draftInterface, packageJson.content);
+    for (const change of packageChanges) {
+      void sendChangeInfo({
+        type: "pending",
+        filePath: renderPath(DependencyInfoPath, {
+          packageName: change.package
+        }),
+        action: change.type
+      });
+    }
+    void sendUserMessage({
+      type: "control",
+      group: "dependency-resolve",
+      status: "validated",
+      text: "Resolved dependencies"
+    });
+    const previousReadyChanges = Object.values(clark.context.generatedChangeInfo ?? {}).filter((change) => change.status === "ready" && change.action !== "delete" && change.filePath.startsWith(DependencyInfoPath));
+    for (const change of previousReadyChanges) {
+      sendChangeInfo({
+        type: "ready",
+        filePath: change.filePath,
+        action: "delete"
+      });
+    }
+    void sendUserMessage({
+      type: "control",
+      group: "dependency-validate",
+      status: "pending",
+      text: "Verifying dependencies\u2026"
+    });
+    await appShell.runNpmInstall(clark.context.abortController?.signal);
+    for (const change of packageChanges) {
+      sendChangeInfo({
+        type: "validated",
+        filePath: renderPath(DependencyInfoPath, {
+          packageName: change.package
+        })
+      });
+    }
+    void sendUserMessage({
+      type: "control",
+      group: "dependency-validate",
+      status: "validated",
+      text: "Dependencies verified"
+    });
+  };
   return async ({ event }) => {
     switch (event.type) {
       case LLM_FINISHED: {
         const { files } = event;
+        const scopeAndApiPaths = matchMultiplePaths(
+          // we have already drafted the generated apis into yaml at this point,
+          // but the api builder files are still in the event's files list
+          Paths.ApiYamls,
+          Paths.GeneratedApis,
+          // the llm created scope files, but we do not draft them because this
+          // could interfere with file sync manager logic that:
+          // 1) has already updated the page scope based on API changes in the previous stage
+          // 2) will update scope when page changes are drafted
+          Paths.PageScopes,
+          Paths.AppScope
+        );
         try {
-          const scopePathMatcher = matchPath(Paths.AllScopes);
-          const apiPathMatcher = matchPath(Paths.ApiYamls);
-          const generatedApiPathMatcher = matchPath(Paths.GeneratedApis);
-          const { packageJson, scopes, otherArtifacts } = files.reduce((acc, file) => {
-            if (file.filePath === "package.json") {
+          const { packageJson, notScopeOrApiArtifacts } = files.reduce((acc, file) => {
+            if (file.filePath === Paths.PackageJson) {
               acc.packageJson = file;
-            } else if (scopePathMatcher(file.filePath).matched) {
-              acc.scopes.push(file);
-            } else if (apiPathMatcher(file.filePath).matched) {
-              acc.apiYamls.push(file);
-            } else if (!generatedApiPathMatcher(file.filePath).matched) {
-              acc.otherArtifacts.push(file);
+            } else if (!scopeAndApiPaths(file.filePath).matched) {
+              acc.notScopeOrApiArtifacts.push(file);
             }
             return acc;
           }, {
             packageJson: null,
-            apiYamls: [],
-            scopes: [],
-            otherArtifacts: []
+            notScopeOrApiArtifacts: []
           });
           if (packageJson) {
-            sendUserMessage({
-              text: "Installing dependencies\u2026"
-            });
             await createDraftFiles([packageJson]);
-            await appShell.runNpmInstall(clark.context.abortController?.signal);
+            await handleDependencies(packageJson);
           }
-          await createDraftFiles(scopes);
-          await createDraftFiles(otherArtifacts);
+          await createDraftFiles(notScopeOrApiArtifacts);
           transitionTo({
             type: POST_PROCESSING_FINISHED,
             files
@@ -300807,11 +301177,85 @@ var doPostProcessing = (clark, { draftInterface, appShell }) => {
     }
   };
 };
+var parsePackageJsonChanges = async (draftInterface, updatedPackageJsonContent) => {
+  const diff2 = await draftInterface.getDraftDiff([Paths.PackageJson]);
+  if (!diff2) {
+    return [];
+  }
+  let updatedPackageJson;
+  try {
+    updatedPackageJson = JSON.parse(updatedPackageJsonContent);
+  } catch {
+    return [];
+  }
+  const allCurrentPackages = /* @__PURE__ */ new Set([
+    // we only surface packages in the dependencies object
+    ...Object.keys(updatedPackageJson.dependencies || {})
+  ]);
+  const changes = [];
+  const lines = diff2.split("\n");
+  const addedPackages = /* @__PURE__ */ new Set();
+  const removedPackages = /* @__PURE__ */ new Set();
+  const packageRegex = /^\s*"([^"]+)":\s*"[^"]*",?$/;
+  for (const line3 of lines) {
+    if (!line3.startsWith("+") && !line3.startsWith("-")) {
+      continue;
+    }
+    if (line3.startsWith("+++") || line3.startsWith("---")) {
+      continue;
+    }
+    const lineContent = line3.slice(1);
+    const match3 = lineContent.match(packageRegex);
+    if (match3) {
+      const packageName = match3[1];
+      if (!packageName) {
+        continue;
+      }
+      if (line3.startsWith("+")) {
+        if (allCurrentPackages.has(packageName)) {
+          addedPackages.add(packageName);
+        }
+      } else if (line3.startsWith("-")) {
+        if (!commonTopLevelPackageJsonFields.has(packageName)) {
+          removedPackages.add(packageName);
+        }
+      }
+    }
+  }
+  for (const packageName of addedPackages) {
+    if (removedPackages.has(packageName)) {
+      changes.push({ type: "edit", package: packageName });
+    } else {
+      changes.push({ type: "create", package: packageName });
+    }
+  }
+  for (const packageName of removedPackages) {
+    if (!addedPackages.has(packageName)) {
+      changes.push({ type: "delete", package: packageName });
+    }
+  }
+  return changes;
+};
+var commonTopLevelPackageJsonFields = /* @__PURE__ */ new Set([
+  "name",
+  "version",
+  "description",
+  "main",
+  "scripts",
+  "keywords",
+  "author",
+  "license",
+  "repository",
+  "homepage",
+  "bugs"
+]);
 
 // ../../../vite-plugin-file-sync/dist/ai-service/state-machine/handlers/runtime-reviewing.js
 init_cjs_shims();
 var doRuntimeReviewing = (clark, params) => {
   const transitionTo = transitionFrom(clark);
+  const sendChangeInfo = sendChangeInfoHelper(clark);
+  const sendUserMessage = sendUserMessageChannel(clark);
   return async ({ event }) => {
     switch (event.type) {
       case USER_REJECTED_DRAFT:
@@ -300833,6 +301277,20 @@ var doRuntimeReviewing = (clark, params) => {
               tsErrorsByPath
             });
           } else {
+            for (const filePath of Object.keys(clark.context.generatedChangeInfo ?? {})) {
+              void sendChangeInfo({
+                type: "validated",
+                filePath
+              });
+            }
+            if (clark.context.usedDebugging) {
+              void sendUserMessage({
+                type: "control",
+                group: "debugging",
+                status: "pending",
+                text: "QA checks passed"
+              });
+            }
             transitionTo({
               type: RUNTIME_REVIEW_FINISHED
             });
@@ -300852,6 +301310,7 @@ var AiService = class extends EventEmitter3 {
   anthropicProvider;
   templateRenderer;
   appShell;
+  sourceTrackerInterface;
   clark;
   tracer;
   constructor(config2) {
@@ -300868,6 +301327,7 @@ var AiService = class extends EventEmitter3 {
       appRootDirPath: config2.appRootDirPath,
       fsOperationQueue: config2.fsOperationQueue
     });
+    this.sourceTrackerInterface = new SourceTrackerInterface();
     this.clark = new FSM({
       transitions,
       initialState: ClarkStateNames.Idle,
@@ -300891,7 +301351,7 @@ var AiService = class extends EventEmitter3 {
       "handleUserCanceled",
       "handleBuildSystemError"
     ];
-    (0, import_shared10.addTracingToMethods)(this, methods, this.tracer);
+    (0, import_shared11.addTracingToMethods)(this, methods, this.tracer);
   }
   createClarkTransitionHandler() {
     const clarkStateHandlerFactories = {
@@ -300910,7 +301370,8 @@ var AiService = class extends EventEmitter3 {
         artifactProcessor: this.artifactProcessor,
         anthropicProvider: this.anthropicProvider,
         appShell: this.appShell,
-        signals: this
+        signals: this,
+        sourceTrackerInterface: this.sourceTrackerInterface
       };
       const clarkStateHandlers = Object.fromEntries(Object.entries(clarkStateHandlerFactories).map(([state, handlerFactory]) => [state, handlerFactory(clark, params)]));
       return async (transition) => {
@@ -300983,6 +301444,9 @@ var AiService = class extends EventEmitter3 {
   isBusy() {
     return this.clark.state !== ClarkStateNames.Idle && this.clark.state !== ClarkStateNames.AwaitingUser && this.clark.state !== ClarkStateNames.Dead;
   }
+  setSourceTracker(sourceTracker) {
+    this.sourceTrackerInterface.setSourceTracker(sourceTracker);
+  }
 };
 
 // ../../../vite-plugin-file-sync/dist/sync-service/index.js
@@ -300994,7 +301458,7 @@ init_cjs_shims();
 
 // ../../../library-shared/dist/types/entities.js
 init_cjs_shims();
-var import_shared11 = __toESM(require_dist2(), 1);
+var import_shared12 = __toESM(require_dist2(), 1);
 var sbEntitySymbol = Symbol("sbEntity");
 var SbEntityType = {
   VARIABLE: "SbVariable",
@@ -301067,8 +301531,11 @@ init_cjs_shims();
 init_cjs_shims();
 var BindingMetaSymbol = Symbol("binding-meta");
 
+// ../../../library-shared/dist/types/ai-operations.js
+init_cjs_shims();
+
 // ../../../vite-plugin-file-sync/dist/sync-service/index.js
-var import_shared17 = __toESM(require_dist2(), 1);
+var import_shared18 = __toESM(require_dist2(), 1);
 
 // ../../../vite-plugin-file-sync/dist/errors/error-handler.js
 init_cjs_shims();
@@ -301142,27 +301609,6 @@ var makeServerError = (error, { critical = "critical" in error ? error.critical
   };
 };
 
-// ../../../vite-plugin-file-sync/dist/util/operation-queue.js
-init_cjs_shims();
-var OperationQueue = class {
-  // Invariant: `lastOperation` is a promise that never rejects. This is needed to ensure that the queue
-  // can always enqueue a new operation, even if the previous operation rejected.
-  lastOperation = Promise.resolve();
-  /**
-   * Enqueue an operation to be executed one at a time.
-   *
-   * @param operation - The operation to execute.
-   * @returns A promise that resolves to the result of the operation.
-   */
-  enqueue(operation) {
-    const promise = this.lastOperation.then(operation);
-    this.lastOperation = promise.then(() => {
-    }, () => {
-    });
-    return promise;
-  }
-};
-
 // ../../../vite-plugin-file-sync/dist/util/with-resolvers.js
 init_cjs_shims();
 function withResolvers() {
@@ -301181,7 +301627,7 @@ import * as fsp2 from "node:fs/promises";
 
 // ../../../vite-plugin-file-sync/dist/sync-service/hash-dir-tree.js
 init_cjs_shims();
-var import_shared12 = __toESM(require_dist2(), 1);
+var import_shared13 = __toESM(require_dist2(), 1);
 var import_util4 = __toESM(require_dist3(), 1);
 
 // ../../../vite-plugin-file-sync/dist/sync-service/list-dir.js
@@ -301244,7 +301690,7 @@ async function hashLocalDirectory(localDirectoryPath) {
     let entry;
     switch (localDirEntry.type) {
       case "-": {
-        const hash3 = await (0, import_shared12.hashFileContents)(localDirEntry.contents);
+        const hash3 = await (0, import_shared13.hashFileContents)(localDirEntry.contents);
         entry = {
           type: "-",
           executable: localDirEntry.executable,
@@ -301276,20 +301722,20 @@ async function hashLocalDirectory(localDirectoryPath) {
     }
     directoryContents.push(entry);
   }
-  const hash2 = await (0, import_shared12.hashDirectoryContents)(directoryContents);
+  const hash2 = await (0, import_shared13.hashDirectoryContents)(directoryContents);
   return { contents: directoryContents, hash: hash2 };
 }
 
 // ../../../vite-plugin-file-sync/dist/sync-service/server-rpc/client.js
 init_cjs_shims();
-var import_shared14 = __toESM(require_dist2(), 1);
 var import_shared15 = __toESM(require_dist2(), 1);
+var import_shared16 = __toESM(require_dist2(), 1);
 
 // ../../../vite-plugin-file-sync/dist/sync-service/server-rpc/handlers.js
 init_cjs_shims();
-var import_shared13 = __toESM(require_dist2(), 1);
+var import_shared14 = __toESM(require_dist2(), 1);
 async function notImplemented() {
-  throw new import_shared13.NotImplementedError("Signing methods are not implemented");
+  throw new import_shared14.NotImplementedError("Signing methods are not implemented");
 }
 function createRequestHandlers() {
   const requestHandlers = {
@@ -301309,7 +301755,7 @@ function createRequestHandlers() {
 async function connectToISocketRPCServer({ superblocksBaseUrl, token: token2, tracer: tracer2 }) {
   const requestHandlers = createRequestHandlers();
   const authorization = `Bearer ${token2}`;
-  const wsUrl = new URL(`api/${import_shared14.serverWsPath}`, superblocksBaseUrl);
+  const wsUrl = new URL(`api/${import_shared15.serverWsPath}`, superblocksBaseUrl);
   if (wsUrl.protocol === "http:") {
     wsUrl.protocol = "ws:";
   } else if (wsUrl.protocol === "https:") {
@@ -301320,7 +301766,7 @@ async function connectToISocketRPCServer({ superblocksBaseUrl, token: token2, tr
   } else if (wsUrl.hostname === "localhost") {
     wsUrl.hostname = "127.0.0.1";
   }
-  return await (0, import_shared14.connectISocket)(wsUrl.href, authorization, requestHandlers, [], tracer2, {
+  return await (0, import_shared15.connectISocket)(wsUrl.href, authorization, requestHandlers, [], tracer2, {
     connectionTimeoutInSeconds: 6 * 60,
     // 6 minutes
     noResponseTimeoutInSeconds: 5 * 60
@@ -301332,9 +301778,9 @@ async function unwrapResponseDto(request) {
   if (!response.responseMeta.success || response.responseMeta.error || response.responseMeta.status !== 200) {
     const errorMessage = response.responseMeta.error?.message ?? response.responseMeta.message ?? `Request failed with status ${response.responseMeta.status}`;
     if (response.responseMeta.status === 409) {
-      throw new import_shared15.ConflictError(errorMessage);
+      throw new import_shared16.ConflictError(errorMessage);
     } else if (response.responseMeta.status === 404) {
-      throw new import_shared14.NotFoundError(errorMessage);
+      throw new import_shared15.NotFoundError(errorMessage);
     }
     throw new Error(errorMessage);
   }
@@ -301438,6 +301884,505 @@ async function doDownloadApplicationDirectory(rpcClient, directoryHash, localDir
 init_cjs_shims();
 import * as fsp3 from "node:fs/promises";
 import * as path19 from "node:path";
+
+// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/index.js
+init_cjs_shims();
+
+// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/diff/base.js
+init_cjs_shims();
+var Diff2 = class {
+  diff(oldStr, newStr, options8 = {}) {
+    let callback;
+    if (typeof options8 === "function") {
+      callback = options8;
+      options8 = {};
+    } else if ("callback" in options8) {
+      callback = options8.callback;
+    }
+    const oldString = this.castInput(oldStr, options8);
+    const newString = this.castInput(newStr, options8);
+    const oldTokens = this.removeEmpty(this.tokenize(oldString, options8));
+    const newTokens = this.removeEmpty(this.tokenize(newString, options8));
+    return this.diffWithOptionsObj(oldTokens, newTokens, options8, callback);
+  }
+  diffWithOptionsObj(oldTokens, newTokens, options8, callback) {
+    var _a18;
+    const done = (value2) => {
+      value2 = this.postProcess(value2, options8);
+      if (callback) {
+        setTimeout(function() {
+          callback(value2);
+        }, 0);
+        return void 0;
+      } else {
+        return value2;
+      }
+    };
+    const newLen = newTokens.length, oldLen = oldTokens.length;
+    let editLength = 1;
+    let maxEditLength = newLen + oldLen;
+    if (options8.maxEditLength != null) {
+      maxEditLength = Math.min(maxEditLength, options8.maxEditLength);
+    }
+    const maxExecutionTime = (_a18 = options8.timeout) !== null && _a18 !== void 0 ? _a18 : Infinity;
+    const abortAfterTimestamp = Date.now() + maxExecutionTime;
+    const bestPath = [{ oldPos: -1, lastComponent: void 0 }];
+    let newPos = this.extractCommon(bestPath[0], newTokens, oldTokens, 0, options8);
+    if (bestPath[0].oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
+      return done(this.buildValues(bestPath[0].lastComponent, newTokens, oldTokens));
+    }
+    let minDiagonalToConsider = -Infinity, maxDiagonalToConsider = Infinity;
+    const execEditLength = () => {
+      for (let diagonalPath = Math.max(minDiagonalToConsider, -editLength); diagonalPath <= Math.min(maxDiagonalToConsider, editLength); diagonalPath += 2) {
+        let basePath;
+        const removePath = bestPath[diagonalPath - 1], addPath = bestPath[diagonalPath + 1];
+        if (removePath) {
+          bestPath[diagonalPath - 1] = void 0;
+        }
+        let canAdd = false;
+        if (addPath) {
+          const addPathNewPos = addPath.oldPos - diagonalPath;
+          canAdd = addPath && 0 <= addPathNewPos && addPathNewPos < newLen;
+        }
+        const canRemove = removePath && removePath.oldPos + 1 < oldLen;
+        if (!canAdd && !canRemove) {
+          bestPath[diagonalPath] = void 0;
+          continue;
+        }
+        if (!canRemove || canAdd && removePath.oldPos < addPath.oldPos) {
+          basePath = this.addToPath(addPath, true, false, 0, options8);
+        } else {
+          basePath = this.addToPath(removePath, false, true, 1, options8);
+        }
+        newPos = this.extractCommon(basePath, newTokens, oldTokens, diagonalPath, options8);
+        if (basePath.oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
+          return done(this.buildValues(basePath.lastComponent, newTokens, oldTokens)) || true;
+        } else {
+          bestPath[diagonalPath] = basePath;
+          if (basePath.oldPos + 1 >= oldLen) {
+            maxDiagonalToConsider = Math.min(maxDiagonalToConsider, diagonalPath - 1);
+          }
+          if (newPos + 1 >= newLen) {
+            minDiagonalToConsider = Math.max(minDiagonalToConsider, diagonalPath + 1);
+          }
+        }
+      }
+      editLength++;
+    };
+    if (callback) {
+      (function exec8() {
+        setTimeout(function() {
+          if (editLength > maxEditLength || Date.now() > abortAfterTimestamp) {
+            return callback(void 0);
+          }
+          if (!execEditLength()) {
+            exec8();
+          }
+        }, 0);
+      })();
+    } else {
+      while (editLength <= maxEditLength && Date.now() <= abortAfterTimestamp) {
+        const ret = execEditLength();
+        if (ret) {
+          return ret;
+        }
+      }
+    }
+  }
+  addToPath(path51, added, removed, oldPosInc, options8) {
+    const last2 = path51.lastComponent;
+    if (last2 && !options8.oneChangePerToken && last2.added === added && last2.removed === removed) {
+      return {
+        oldPos: path51.oldPos + oldPosInc,
+        lastComponent: { count: last2.count + 1, added, removed, previousComponent: last2.previousComponent }
+      };
+    } else {
+      return {
+        oldPos: path51.oldPos + oldPosInc,
+        lastComponent: { count: 1, added, removed, previousComponent: last2 }
+      };
+    }
+  }
+  extractCommon(basePath, newTokens, oldTokens, diagonalPath, options8) {
+    const newLen = newTokens.length, oldLen = oldTokens.length;
+    let oldPos = basePath.oldPos, newPos = oldPos - diagonalPath, commonCount = 0;
+    while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(oldTokens[oldPos + 1], newTokens[newPos + 1], options8)) {
+      newPos++;
+      oldPos++;
+      commonCount++;
+      if (options8.oneChangePerToken) {
+        basePath.lastComponent = { count: 1, previousComponent: basePath.lastComponent, added: false, removed: false };
+      }
+    }
+    if (commonCount && !options8.oneChangePerToken) {
+      basePath.lastComponent = { count: commonCount, previousComponent: basePath.lastComponent, added: false, removed: false };
+    }
+    basePath.oldPos = oldPos;
+    return newPos;
+  }
+  equals(left, right, options8) {
+    if (options8.comparator) {
+      return options8.comparator(left, right);
+    } else {
+      return left === right || !!options8.ignoreCase && left.toLowerCase() === right.toLowerCase();
+    }
+  }
+  removeEmpty(array2) {
+    const ret = [];
+    for (let i2 = 0; i2 < array2.length; i2++) {
+      if (array2[i2]) {
+        ret.push(array2[i2]);
+      }
+    }
+    return ret;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  castInput(value2, options8) {
+    return value2;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  tokenize(value2, options8) {
+    return Array.from(value2);
+  }
+  join(chars) {
+    return chars.join("");
+  }
+  postProcess(changeObjects, options8) {
+    return changeObjects;
+  }
+  get useLongestToken() {
+    return false;
+  }
+  buildValues(lastComponent, newTokens, oldTokens) {
+    const components2 = [];
+    let nextComponent;
+    while (lastComponent) {
+      components2.push(lastComponent);
+      nextComponent = lastComponent.previousComponent;
+      delete lastComponent.previousComponent;
+      lastComponent = nextComponent;
+    }
+    components2.reverse();
+    const componentLen = components2.length;
+    let componentPos = 0, newPos = 0, oldPos = 0;
+    for (; componentPos < componentLen; componentPos++) {
+      const component = components2[componentPos];
+      if (!component.removed) {
+        if (!component.added && this.useLongestToken) {
+          let value2 = newTokens.slice(newPos, newPos + component.count);
+          value2 = value2.map(function(value3, i2) {
+            const oldValue = oldTokens[oldPos + i2];
+            return oldValue.length > value3.length ? oldValue : value3;
+          });
+          component.value = this.join(value2);
+        } else {
+          component.value = this.join(newTokens.slice(newPos, newPos + component.count));
+        }
+        newPos += component.count;
+        if (!component.added) {
+          oldPos += component.count;
+        }
+      } else {
+        component.value = this.join(oldTokens.slice(oldPos, oldPos + component.count));
+        oldPos += component.count;
+      }
+    }
+    return components2;
+  }
+};
+
+// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/diff/line.js
+init_cjs_shims();
+var LineDiff = class extends Diff2 {
+  constructor() {
+    super(...arguments);
+    this.tokenize = tokenize2;
+  }
+  equals(left, right, options8) {
+    if (options8.ignoreWhitespace) {
+      if (!options8.newlineIsToken || !left.includes("\n")) {
+        left = left.trim();
+      }
+      if (!options8.newlineIsToken || !right.includes("\n")) {
+        right = right.trim();
+      }
+    } else if (options8.ignoreNewlineAtEof && !options8.newlineIsToken) {
+      if (left.endsWith("\n")) {
+        left = left.slice(0, -1);
+      }
+      if (right.endsWith("\n")) {
+        right = right.slice(0, -1);
+      }
+    }
+    return super.equals(left, right, options8);
+  }
+};
+var lineDiff2 = new LineDiff();
+function diffLines2(oldStr, newStr, options8) {
+  return lineDiff2.diff(oldStr, newStr, options8);
+}
+function tokenize2(value2, options8) {
+  if (options8.stripTrailingCr) {
+    value2 = value2.replace(/\r\n/g, "\n");
+  }
+  const retLines = [], linesAndNewlines = value2.split(/(\n|\r\n)/);
+  if (!linesAndNewlines[linesAndNewlines.length - 1]) {
+    linesAndNewlines.pop();
+  }
+  for (let i2 = 0; i2 < linesAndNewlines.length; i2++) {
+    const line3 = linesAndNewlines[i2];
+    if (i2 % 2 && !options8.newlineIsToken) {
+      retLines[retLines.length - 1] += line3;
+    } else {
+      retLines.push(line3);
+    }
+  }
+  return retLines;
+}
+
+// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/diff/json.js
+init_cjs_shims();
+var JsonDiff = class extends Diff2 {
+  constructor() {
+    super(...arguments);
+    this.tokenize = tokenize2;
+  }
+  get useLongestToken() {
+    return true;
+  }
+  castInput(value2, options8) {
+    const { undefinedReplacement, stringifyReplacer = (k, v) => typeof v === "undefined" ? undefinedReplacement : v } = options8;
+    return typeof value2 === "string" ? value2 : JSON.stringify(canonicalize2(value2, null, null, stringifyReplacer), null, "  ");
+  }
+  equals(left, right, options8) {
+    return super.equals(left.replace(/,([\r\n])/g, "$1"), right.replace(/,([\r\n])/g, "$1"), options8);
+  }
+};
+var jsonDiff2 = new JsonDiff();
+function diffJson(oldStr, newStr, options8) {
+  return jsonDiff2.diff(oldStr, newStr, options8);
+}
+function canonicalize2(obj, stack2, replacementStack, replacer, key2) {
+  stack2 = stack2 || [];
+  replacementStack = replacementStack || [];
+  if (replacer) {
+    obj = replacer(key2 === void 0 ? "" : key2, obj);
+  }
+  let i2;
+  for (i2 = 0; i2 < stack2.length; i2 += 1) {
+    if (stack2[i2] === obj) {
+      return replacementStack[i2];
+    }
+  }
+  let canonicalizedObj;
+  if ("[object Array]" === Object.prototype.toString.call(obj)) {
+    stack2.push(obj);
+    canonicalizedObj = new Array(obj.length);
+    replacementStack.push(canonicalizedObj);
+    for (i2 = 0; i2 < obj.length; i2 += 1) {
+      canonicalizedObj[i2] = canonicalize2(obj[i2], stack2, replacementStack, replacer, String(i2));
+    }
+    stack2.pop();
+    replacementStack.pop();
+    return canonicalizedObj;
+  }
+  if (obj && obj.toJSON) {
+    obj = obj.toJSON();
+  }
+  if (typeof obj === "object" && obj !== null) {
+    stack2.push(obj);
+    canonicalizedObj = {};
+    replacementStack.push(canonicalizedObj);
+    const sortedKeys = [];
+    let key3;
+    for (key3 in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key3)) {
+        sortedKeys.push(key3);
+      }
+    }
+    sortedKeys.sort();
+    for (i2 = 0; i2 < sortedKeys.length; i2 += 1) {
+      key3 = sortedKeys[i2];
+      canonicalizedObj[key3] = canonicalize2(obj[key3], stack2, replacementStack, replacer, key3);
+    }
+    stack2.pop();
+    replacementStack.pop();
+  } else {
+    canonicalizedObj = obj;
+  }
+  return canonicalizedObj;
+}
+
+// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/patch/create.js
+init_cjs_shims();
+function structuredPatch2(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options8) {
+  let optionsObj;
+  if (!options8) {
+    optionsObj = {};
+  } else if (typeof options8 === "function") {
+    optionsObj = { callback: options8 };
+  } else {
+    optionsObj = options8;
+  }
+  if (typeof optionsObj.context === "undefined") {
+    optionsObj.context = 4;
+  }
+  const context2 = optionsObj.context;
+  if (optionsObj.newlineIsToken) {
+    throw new Error("newlineIsToken may not be used with patch-generation functions, only with diffing functions");
+  }
+  if (!optionsObj.callback) {
+    return diffLinesResultToPatch(diffLines2(oldStr, newStr, optionsObj));
+  } else {
+    const { callback } = optionsObj;
+    diffLines2(oldStr, newStr, Object.assign(Object.assign({}, optionsObj), { callback: (diff2) => {
+      const patch = diffLinesResultToPatch(diff2);
+      callback(patch);
+    } }));
+  }
+  function diffLinesResultToPatch(diff2) {
+    if (!diff2) {
+      return;
+    }
+    diff2.push({ value: "", lines: [] });
+    function contextLines(lines) {
+      return lines.map(function(entry) {
+        return " " + entry;
+      });
+    }
+    const hunks = [];
+    let oldRangeStart = 0, newRangeStart = 0, curRange = [], oldLine = 1, newLine = 1;
+    for (let i2 = 0; i2 < diff2.length; i2++) {
+      const current = diff2[i2], lines = current.lines || splitLines3(current.value);
+      current.lines = lines;
+      if (current.added || current.removed) {
+        if (!oldRangeStart) {
+          const prev = diff2[i2 - 1];
+          oldRangeStart = oldLine;
+          newRangeStart = newLine;
+          if (prev) {
+            curRange = context2 > 0 ? contextLines(prev.lines.slice(-context2)) : [];
+            oldRangeStart -= curRange.length;
+            newRangeStart -= curRange.length;
+          }
+        }
+        for (const line3 of lines) {
+          curRange.push((current.added ? "+" : "-") + line3);
+        }
+        if (current.added) {
+          newLine += lines.length;
+        } else {
+          oldLine += lines.length;
+        }
+      } else {
+        if (oldRangeStart) {
+          if (lines.length <= context2 * 2 && i2 < diff2.length - 2) {
+            for (const line3 of contextLines(lines)) {
+              curRange.push(line3);
+            }
+          } else {
+            const contextSize = Math.min(lines.length, context2);
+            for (const line3 of contextLines(lines.slice(0, contextSize))) {
+              curRange.push(line3);
+            }
+            const hunk = {
+              oldStart: oldRangeStart,
+              oldLines: oldLine - oldRangeStart + contextSize,
+              newStart: newRangeStart,
+              newLines: newLine - newRangeStart + contextSize,
+              lines: curRange
+            };
+            hunks.push(hunk);
+            oldRangeStart = 0;
+            newRangeStart = 0;
+            curRange = [];
+          }
+        }
+        oldLine += lines.length;
+        newLine += lines.length;
+      }
+    }
+    for (const hunk of hunks) {
+      for (let i2 = 0; i2 < hunk.lines.length; i2++) {
+        if (hunk.lines[i2].endsWith("\n")) {
+          hunk.lines[i2] = hunk.lines[i2].slice(0, -1);
+        } else {
+          hunk.lines.splice(i2 + 1, 0, "\");
+          i2++;
+        }
+      }
+    }
+    return {
+      oldFileName,
+      newFileName,
+      oldHeader,
+      newHeader,
+      hunks
+    };
+  }
+}
+function formatPatch2(patch) {
+  if (Array.isArray(patch)) {
+    return patch.map(formatPatch2).join("\n");
+  }
+  const ret = [];
+  if (patch.oldFileName == patch.newFileName) {
+    ret.push("Index: " + patch.oldFileName);
+  }
+  ret.push("===================================================================");
+  ret.push("--- " + patch.oldFileName + (typeof patch.oldHeader === "undefined" ? "" : "	" + patch.oldHeader));
+  ret.push("+++ " + patch.newFileName + (typeof patch.newHeader === "undefined" ? "" : "	" + patch.newHeader));
+  for (let i2 = 0; i2 < patch.hunks.length; i2++) {
+    const hunk = patch.hunks[i2];
+    if (hunk.oldLines === 0) {
+      hunk.oldStart -= 1;
+    }
+    if (hunk.newLines === 0) {
+      hunk.newStart -= 1;
+    }
+    ret.push("@@ -" + hunk.oldStart + "," + hunk.oldLines + " +" + hunk.newStart + "," + hunk.newLines + " @@");
+    for (const line3 of hunk.lines) {
+      ret.push(line3);
+    }
+  }
+  return ret.join("\n") + "\n";
+}
+function createTwoFilesPatch2(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options8) {
+  if (typeof options8 === "function") {
+    options8 = { callback: options8 };
+  }
+  if (!(options8 === null || options8 === void 0 ? void 0 : options8.callback)) {
+    const patchObj = structuredPatch2(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options8);
+    if (!patchObj) {
+      return;
+    }
+    return formatPatch2(patchObj);
+  } else {
+    const { callback } = options8;
+    structuredPatch2(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, Object.assign(Object.assign({}, options8), { callback: (patchObj) => {
+      if (!patchObj) {
+        callback(void 0);
+      } else {
+        callback(formatPatch2(patchObj));
+      }
+    } }));
+  }
+}
+function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options8) {
+  return createTwoFilesPatch2(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options8);
+}
+function splitLines3(text2) {
+  const hasTrailingNl = text2.endsWith("\n");
+  const result = text2.split("\n").map((line3) => line3 + "\n");
+  if (hasTrailingNl) {
+    result.pop();
+  } else {
+    result.push(result.pop().slice(0, -1));
+  }
+  return result;
+}
+
+// ../../../vite-plugin-file-sync/dist/sync-service/draft-helpers.js
 var EDIT_EXT = ".sbswap.edit";
 var ADD_EXT = ".sbswap.add";
 function getMarkerFilePath(filePath, appRootDirPath, markerType) {
@@ -301659,7 +302604,7 @@ async function generateDraftDiff(appRootDirPath, specificPaths = []) {
   } catch {
     return "No draft changes found.";
   }
-  const diffLines2 = [];
+  const diffLines3 = [];
   let { edits, additions } = await getDraftInfo(appRootDirPath);
   edits = edits.filter((edit) => specificPaths.length === 0 || specificPaths.some((path51) => edit.startsWith(path51)));
   additions = additions.filter((add) => specificPaths.length === 0 || specificPaths.some((path51) => add.startsWith(path51)));
@@ -301672,13 +302617,9 @@ async function generateDraftDiff(appRootDirPath, specificPaths = []) {
     try {
       const currentContent = await fsp3.readFile(originalPath, "utf8");
       const originalContent = await fsp3.readFile(markerPath, "utf8");
-      diffLines2.push(`diff --git a/${editPath} b/${editPath}`);
-      diffLines2.push(`index 0000000..1000000 100644`);
-      diffLines2.push(`--- a/${editPath}`);
-      diffLines2.push(`+++ b/${editPath}`);
-      const unifiedDiff = generateUnifiedDiff(originalContent, currentContent);
-      diffLines2.push(...unifiedDiff);
-      diffLines2.push("");
+      const patch = createPatch(editPath, originalContent, currentContent);
+      diffLines3.push(patch);
+      diffLines3.push("");
     } catch (_error) {
       continue;
     }
@@ -301687,81 +302628,17 @@ async function generateDraftDiff(appRootDirPath, specificPaths = []) {
     const filePath = path19.join(appRootDirPath, addPath);
     try {
       const content2 = await fsp3.readFile(filePath, "utf8");
-      diffLines2.push(`diff --git a/${addPath} b/${addPath}`);
-      diffLines2.push(`new file mode 100644`);
-      diffLines2.push(`index 0000000..1000000`);
-      diffLines2.push(`--- /dev/null`);
-      diffLines2.push(`+++ b/${addPath}`);
-      diffLines2.push(`@@ -0,0 +1,${content2.split("\n").length} @@`);
-      const lines = content2.split("\n");
-      for (const line3 of lines) {
-        diffLines2.push(`+${line3}`);
-      }
-      diffLines2.push("");
+      const patch = createPatch(addPath, "", content2);
+      diffLines3.push(patch);
+      diffLines3.push("");
     } catch (_error) {
       continue;
     }
   }
-  if (diffLines2[diffLines2.length - 1] === "") {
-    diffLines2.pop();
-  }
-  return diffLines2.join("\n");
-}
-function generateUnifiedDiff(originalContent, currentContent) {
-  const originalLines = originalContent.split("\n");
-  const currentLines = currentContent.split("\n");
-  const diffLines2 = [];
-  let hasChanges = false;
-  const changes = [];
-  let i2 = 0, j = 0;
-  while (i2 < originalLines.length || j < currentLines.length) {
-    if (i2 < originalLines.length && j < currentLines.length) {
-      const originalLine = originalLines[i2] ?? "";
-      const currentLine = currentLines[j] ?? "";
-      if (originalLine === currentLine) {
-        changes.push({ type: "context", line: originalLine });
-        i2++;
-        j++;
-      } else {
-        changes.push({ type: "remove", line: originalLine });
-        changes.push({ type: "add", line: currentLine });
-        i2++;
-        j++;
-        hasChanges = true;
-      }
-    } else if (i2 < originalLines.length) {
-      const originalLine = originalLines[i2] ?? "";
-      changes.push({ type: "remove", line: originalLine });
-      i2++;
-      hasChanges = true;
-    } else {
-      const currentLine = currentLines[j] ?? "";
-      changes.push({ type: "add", line: currentLine });
-      j++;
-      hasChanges = true;
-    }
-  }
-  if (!hasChanges) {
-    return [];
+  if (diffLines3[diffLines3.length - 1] === "") {
+    diffLines3.pop();
   }
-  const hunkStart = 1;
-  const hunkOriginalCount = originalLines.length;
-  const hunkCurrentCount = currentLines.length;
-  diffLines2.push(`@@ -${hunkStart},${hunkOriginalCount} +${hunkStart},${hunkCurrentCount} @@`);
-  for (const change of changes) {
-    switch (change.type) {
-      case "context":
-        diffLines2.push(` ${change.line}`);
-        break;
-      case "remove":
-        diffLines2.push(`-${change.line}`);
-        break;
-      case "add":
-        diffLines2.push(`+${change.line}`);
-        break;
-    }
-  }
-  return diffLines2;
+  return diffLines3.join("\n");
 }
 
 // ../../../vite-plugin-file-sync/dist/sync-service/hash-cache.js
@@ -301817,7 +302694,7 @@ var HashCache = class {
 
 // ../../../vite-plugin-file-sync/dist/sync-service/snapshot/take-snapshot.js
 init_cjs_shims();
-var import_shared16 = __toESM(require_dist2(), 1);
+var import_shared17 = __toESM(require_dist2(), 1);
 var import_util5 = __toESM(require_dist3(), 1);
 async function snapshotLocalDirectory(localDirectoryPath) {
   const directoryContents = [];
@@ -301826,7 +302703,7 @@ async function snapshotLocalDirectory(localDirectoryPath) {
     let entry;
     switch (localDirEntry.type) {
       case "-": {
-        const hash2 = await (0, import_shared16.hashFileContents)(localDirEntry.contents);
+        const hash2 = await (0, import_shared17.hashFileContents)(localDirEntry.contents);
         entry = {
           type: "-",
           name: localDirEntry.name,
@@ -301859,7 +302736,7 @@ async function snapshotLocalDirectory(localDirectoryPath) {
     }
     directoryContents.push(entry);
   }
-  const directoryHash = await (0, import_shared16.hashDirectoryContents)(directoryContents);
+  const directoryHash = await (0, import_shared17.hashDirectoryContents)(directoryContents);
   return {
     hash: directoryHash,
     contents: directoryContents
@@ -301990,7 +302867,7 @@ var SyncService = class extends EventEmitter4 {
       "discardLocalDraftChanges",
       "commitLocalDraftChanges"
     ];
-    (0, import_shared17.addTracingToMethods)(this, methods, this._tracer);
+    (0, import_shared18.addTracingToMethods)(this, methods, this._tracer);
   }
   /** The current status of the sync service, which indicates what the service is currently doing */
   get status() {
@@ -302252,7 +303129,7 @@ var SyncService = class extends EventEmitter4 {
 
 // ../../../vite-plugin-file-sync/dist/lock-service/index.js
 init_cjs_shims();
-var import_shared18 = __toESM(require_dist2(), 1);
+var import_shared19 = __toESM(require_dist2(), 1);
 import EventEmitter5 from "node:events";
 var LOCK_HEARTBEAT_INTERVAL_MS = 30 * 1e3;
 var SHUTDOWN_TIMEOUT_MS = 5 * 60 * 1e3;
@@ -302307,7 +303184,7 @@ var LockService = class extends EventEmitter5 {
       "shutdown",
       "shutdownAndExit"
     ];
-    (0, import_shared18.addTracingToMethods)(this, methods, this._tracer);
+    (0, import_shared19.addTracingToMethods)(this, methods, this._tracer);
   }
   setSyncCallback(callback) {
     this.syncCallback = callback;
@@ -302352,7 +303229,7 @@ var LockService = class extends EventEmitter5 {
         return;
       }
     } catch (error) {
-      if (error instanceof import_shared18.ConflictError) {
+      if (error instanceof import_shared19.ConflictError) {
         logger3.error(`[lock-service] ${error.message}`);
         this.emit("statusChange", LockServiceStatus.FAILED_TO_ACQUIRE_LOCK);
         this.status = LockServiceStatus.FAILED_TO_ACQUIRE_LOCK;
@@ -302408,7 +303285,7 @@ var LockService = class extends EventEmitter5 {
           return true;
         }
       } catch (error) {
-        if (error instanceof import_shared18.NotFoundError) {
+        if (error instanceof import_shared19.NotFoundError) {
           logger3.info(`[lock-service] Lock was removed, shutting down: ${error.message}`);
           this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
           this.status = LockServiceStatus.LOCK_INVALID;
@@ -302544,7 +303421,7 @@ var LockService = class extends EventEmitter5 {
 
 // ../../../vite-plugin-file-sync/dist/file-sync-vite-plugin.js
 init_cjs_shims();
-var import_shared30 = __toESM(require_dist2(), 1);
+var import_shared31 = __toESM(require_dist2(), 1);
 var import_body_parser = __toESM(require_body_parser(), 1);
 var import_common_tags4 = __toESM(require_lib4(), 1);
 import path28 from "node:path";
@@ -302707,16 +303584,16 @@ init_cjs_shims();
 
 // ../../../library-shared/dist/scope.js
 init_cjs_shims();
-var import_shared19 = __toESM(require_dist2(), 1);
+var import_shared20 = __toESM(require_dist2(), 1);
 function getStableScopeId(scopeName) {
-  return (0, import_shared19.generatePredictableId)(`sc-${scopeName}`);
+  return (0, import_shared20.generatePredictableId)(`sc-${scopeName}`);
 }
 function getStableEntityId(scopeId, entityName) {
-  return `SB-${(0, import_shared19.generatePredictableId)(scopeId + entityName)}-type`;
+  return `SB-${(0, import_shared20.generatePredictableId)(scopeId + entityName)}-type`;
 }
 
 // ../../../vite-plugin-file-sync/dist/binding-extraction/extract-identifiers.js
-var import_shared21 = __toESM(require_dist2(), 1);
+var import_shared22 = __toESM(require_dist2(), 1);
 
 // ../../../vite-plugin-file-sync/dist/binding-extraction/extract-control-block-identifiers.js
 init_cjs_shims();
@@ -307422,9 +308299,9 @@ var extractPythonEvaluationBindings = async (pythonSnippet) => {
 async function extractBindingsFromValue(value2, pluginID) {
   if (value2?.toString) {
     const stringValue = value2.toString();
-    if (pluginID === import_shared21.LanguagePluginID.JavaScript) {
+    if (pluginID === import_shared22.LanguagePluginID.JavaScript) {
       return await extractJsEvaluationBindings(stringValue);
-    } else if (pluginID === import_shared21.LanguagePluginID.Python) {
+    } else if (pluginID === import_shared22.LanguagePluginID.Python) {
       return await extractPythonEvaluationBindings(stringValue);
     }
     const { jsSnippets } = getDynamicBindings(stringValue);
@@ -307461,14 +308338,14 @@ async function extractBindingsFromAction(action) {
 }
 var getLanguageConfiguration = (block) => {
   switch (block.step?.integration) {
-    case import_shared21.LanguagePluginID.JavaScript:
+    case import_shared22.LanguagePluginID.JavaScript:
       return {
-        pluginId: import_shared21.LanguagePluginID.JavaScript,
+        pluginId: import_shared22.LanguagePluginID.JavaScript,
         configuration: block.step?.javascript
       };
-    case import_shared21.LanguagePluginID.Python:
+    case import_shared22.LanguagePluginID.Python:
       return {
-        pluginId: import_shared21.LanguagePluginID.Python,
+        pluginId: import_shared22.LanguagePluginID.Python,
         configuration: block.step?.python
       };
     default:
@@ -307481,7 +308358,7 @@ var getLanguageConfiguration = (block) => {
 var computeStepBlockBindings = async (block) => {
   const { name: name18 } = block;
   const config2 = {
-    type: import_shared21.ActionType.Integration,
+    type: import_shared22.ActionType.Integration,
     name: name18,
     id: name18,
     datasourceId: block.step?.integration,
@@ -307736,7 +308613,7 @@ var import_types25 = __toESM(require_lib7(), 1);
 import fs13 from "fs/promises";
 import EventEmitter8 from "node:events";
 import path27 from "node:path";
-var import_shared28 = __toESM(require_dist2(), 1);
+var import_shared29 = __toESM(require_dist2(), 1);
 var import_util23 = __toESM(require_dist3(), 1);
 init_lodash();
 var import_yaml3 = __toESM(require_dist(), 1);
@@ -307772,7 +308649,7 @@ var generatePredictableId2 = (name18) => {
 // ../../../vite-plugin-file-sync/dist/parsing/jsx.js
 init_cjs_shims();
 var import_types10 = __toESM(require_lib7(), 1);
-var import_shared24 = __toESM(require_dist2(), 1);
+var import_shared25 = __toESM(require_dist2(), 1);
 
 // ../../../vite-plugin-file-sync/dist/parsing/properties.js
 init_cjs_shims();
@@ -307803,6 +308680,9 @@ function objectExpressionToObject(obj, context2) {
     return acc;
   }, {});
 }
+function createObjectKey(key2) {
+  return import_types7.default.isValidIdentifier(key2) ? import_types7.default.identifier(key2) : import_types7.default.stringLiteral(key2);
+}
 function stringToTaggedTemplate(str2) {
   return import_types7.default.taggedTemplateExpression(import_types7.default.identifier("SB"), import_types7.default.templateLiteral([import_types7.default.templateElement({ raw: str2, cooked: str2 }, true)], []));
 }
@@ -308292,7 +309172,7 @@ init_cjs_shims();
 
 // ../../../vite-plugin-file-sync/dist/parsing/events/to-code-events.js
 init_cjs_shims();
-var import_shared22 = __toESM(require_dist2(), 1);
+var import_shared23 = __toESM(require_dist2(), 1);
 var getDynamicValue = (value2) => {
   if (value2 === void 0) {
     return "undefined";
@@ -308319,7 +309199,7 @@ function toCodeEventFlow(stepDefs_) {
   }
   let code = `SbEventFlow`;
   for (const stepDef_ of stepDefs_) {
-    if (!(0, import_shared22.isValidStepDef)(stepDef_))
+    if (!(0, import_shared23.isValidStepDef)(stepDef_))
       continue;
     const stepDef = stepDef_;
     switch (stepDef.type) {
@@ -308352,7 +309232,7 @@ function toCodeEventFlow(stepDefs_) {
       }
       case TriggerStepType.NAVIGATE_TO: {
         const url3 = stepDef.url;
-        if ((0, import_shared22.containsBindingsAnywhere)(url3)) {
+        if ((0, import_shared23.containsBindingsAnywhere)(url3)) {
           code = `${code}.navigateTo({
           url: SB\`${url3}\`,
         })`;
@@ -308364,14 +309244,14 @@ function toCodeEventFlow(stepDefs_) {
         break;
       }
       case TriggerStepType.SET_STATE_VAR: {
-        const variableName = stepDef.state?.name !== void 0 ? `${stepDef.state?.scope === import_shared22.ApplicationScope.APP ? "App." : ""}${stepDef.state.name}` : "undefined";
+        const variableName = stepDef.state?.name !== void 0 ? `${stepDef.state?.scope === import_shared23.ApplicationScope.APP ? "App." : ""}${stepDef.state.name}` : "undefined";
         const value2 = stepDef.value;
         const valueToCode = getDynamicValue(value2);
         code = `${code}.setStateVar(${variableName}, ${valueToCode})`;
         break;
       }
       case TriggerStepType.RESET_STATE_VAR: {
-        const variableName = stepDef.state?.name !== void 0 ? `${stepDef.state?.scope === import_shared22.ApplicationScope.APP ? "App." : ""}${stepDef.state.name}` : "undefined";
+        const variableName = stepDef.state?.name !== void 0 ? `${stepDef.state?.scope === import_shared23.ApplicationScope.APP ? "App." : ""}${stepDef.state.name}` : "undefined";
         code = `${code}.resetStateVar(${variableName})`;
         break;
       }
@@ -308397,7 +309277,7 @@ function toCodeEventFlow(stepDefs_) {
 // ../../../vite-plugin-file-sync/dist/parsing/events/to-value-events.js
 init_cjs_shims();
 var import_types9 = __toESM(require_lib7(), 1);
-var import_shared23 = __toESM(require_dist2(), 1);
+var import_shared24 = __toESM(require_dist2(), 1);
 var getApiCallbackNode = (nodePath) => {
   if (nodePath && (0, import_types9.isCallExpression)(nodePath.node) && (0, import_types9.isMemberExpression)(nodePath.node.callee) && (0, import_types9.isIdentifier)(nodePath.node.callee.object) && nodePath.node.callee.object.name === "SbEventFlow") {
     return toValueEventFlow(nodePath);
@@ -308459,7 +309339,7 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
         ...existingSteps,
         {
           id: id2,
-          type: import_shared23.TriggerStepType.RUN_JS,
+          type: import_shared24.TriggerStepType.RUN_JS,
           code: expression.toString()
         }
       ];
@@ -308476,7 +309356,7 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
         ...existingSteps,
         {
           id: id2,
-          type: import_shared23.TriggerStepType.NAVIGATE_TO,
+          type: import_shared24.TriggerStepType.NAVIGATE_TO,
           url: obj.url ?? "",
           newWindow: obj.newWindow ?? false,
           replaceHistory: obj.replaceHistory ?? false,
@@ -308497,7 +309377,7 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
         ...existingSteps,
         {
           id: id2,
-          type: import_shared23.TriggerStepType.RUN_APIS,
+          type: import_shared24.TriggerStepType.RUN_APIS,
           apiNames: nodeToValue(expression.node),
           onSuccess,
           onError: onError2
@@ -308511,7 +309391,7 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
       const apiNames = nodeToValue(expression.node);
       return [
         ...existingSteps,
-        { id: id2, type: import_shared23.TriggerStepType.CANCEL_APIS, apiNames }
+        { id: id2, type: import_shared24.TriggerStepType.CANCEL_APIS, apiNames }
       ];
     }
     case "setStateVar": {
@@ -308530,10 +309410,10 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
         ...existingSteps,
         {
           id: id2,
-          type: import_shared23.TriggerStepType.SET_STATE_VAR,
+          type: import_shared24.TriggerStepType.SET_STATE_VAR,
           state: variableName ? {
             name: variableName,
-            scope: isAppScoped ? import_shared23.ApplicationScope.APP : import_shared23.ApplicationScope.PAGE
+            scope: isAppScoped ? import_shared24.ApplicationScope.APP : import_shared24.ApplicationScope.PAGE
           } : void 0,
           value: value2
         }
@@ -308553,10 +309433,10 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
         ...existingSteps,
         {
           id: id2,
-          type: import_shared23.TriggerStepType.RESET_STATE_VAR,
+          type: import_shared24.TriggerStepType.RESET_STATE_VAR,
           state: variableName ? {
             name: variableName,
-            scope: isAppScoped ? import_shared23.ApplicationScope.APP : import_shared23.ApplicationScope.PAGE
+            scope: isAppScoped ? import_shared24.ApplicationScope.APP : import_shared24.ApplicationScope.PAGE
           } : void 0
         }
       ];
@@ -308574,7 +309454,7 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
         ...existingSteps,
         {
           id: id2,
-          type: import_shared23.TriggerStepType.CONTROL_MODAL,
+          type: import_shared24.TriggerStepType.CONTROL_MODAL,
           name: name18,
           direction
         }
@@ -308589,7 +309469,7 @@ function toValueEventFlow(nodePath, existingSteps = [], parentId) {
         ...existingSteps,
         {
           id: id2,
-          type: import_shared23.TriggerStepType.SHOW_ALERT,
+          type: import_shared24.TriggerStepType.SHOW_ALERT,
           message,
           style: type2,
           alertDuration: duration,
@@ -308746,43 +309626,43 @@ function makeJSXAttribute(key2, value2) {
 function tagNameToWidgetType(tagName) {
   switch (tagName) {
     case "SbPage":
-      return import_shared24.WidgetTypes.PAGE_WIDGET;
+      return import_shared25.WidgetTypes.PAGE_WIDGET;
     case "SbText":
-      return import_shared24.WidgetTypes.TEXT_WIDGET;
+      return import_shared25.WidgetTypes.TEXT_WIDGET;
     case "SbButton":
-      return import_shared24.WidgetTypes.BUTTON_WIDGET;
+      return import_shared25.WidgetTypes.BUTTON_WIDGET;
     case "SbInput":
-      return import_shared24.WidgetTypes.INPUT_WIDGET;
+      return import_shared25.WidgetTypes.INPUT_WIDGET;
     case "SbModal":
-      return import_shared24.WidgetTypes.MODAL_WIDGET;
+      return import_shared25.WidgetTypes.MODAL_WIDGET;
     case "SbSlideout":
-      return import_shared24.WidgetTypes.SLIDEOUT_WIDGET;
+      return import_shared25.WidgetTypes.SLIDEOUT_WIDGET;
     case "SbKeyValue":
-      return import_shared24.WidgetTypes.KEY_VALUE_WIDGET;
+      return import_shared25.WidgetTypes.KEY_VALUE_WIDGET;
     case "SbContainer":
-      return import_shared24.WidgetTypes.CONTAINER_WIDGET;
+      return import_shared25.WidgetTypes.CONTAINER_WIDGET;
     case "SbColumn":
-      return import_shared24.WidgetTypes.CANVAS_WIDGET;
+      return import_shared25.WidgetTypes.CANVAS_WIDGET;
     case "SbSection":
-      return import_shared24.WidgetTypes.SECTION_WIDGET;
+      return import_shared25.WidgetTypes.SECTION_WIDGET;
     case "SbCheckbox":
-      return import_shared24.WidgetTypes.CHECKBOX_WIDGET;
+      return import_shared25.WidgetTypes.CHECKBOX_WIDGET;
     case "SbCustom":
-      return import_shared24.WidgetTypes.CUSTOM_WIDGET;
+      return import_shared25.WidgetTypes.CUSTOM_WIDGET;
     case "SbDatePicker":
-      return import_shared24.WidgetTypes.DATE_PICKER_WIDGET;
+      return import_shared25.WidgetTypes.DATE_PICKER_WIDGET;
     case "SbTable":
-      return import_shared24.WidgetTypes.TABLE_WIDGET;
+      return import_shared25.WidgetTypes.TABLE_WIDGET;
     case "SbImage":
-      return import_shared24.WidgetTypes.IMAGE_WIDGET;
+      return import_shared25.WidgetTypes.IMAGE_WIDGET;
     case "SbDropdown":
-      return import_shared24.WidgetTypes.DROP_DOWN_WIDGET;
+      return import_shared25.WidgetTypes.DROP_DOWN_WIDGET;
     case "SbSwitch":
-      return import_shared24.WidgetTypes.SWITCH_WIDGET;
+      return import_shared25.WidgetTypes.SWITCH_WIDGET;
     case "SbIcon":
-      return import_shared24.WidgetTypes.ICON_WIDGET;
+      return import_shared25.WidgetTypes.ICON_WIDGET;
     default:
-      return import_shared24.WidgetTypes.CUSTOM_WIDGET;
+      return import_shared25.WidgetTypes.CUSTOM_WIDGET;
   }
 }
 function getProperties(element) {
@@ -309278,10 +310158,26 @@ function getPropertyExpression(info, fieldName = "") {
       }
     }
     if (Array.isArray(value2)) {
-      return import_types12.default.arrayExpression(value2.map((v) => isPropertyInfo(v) ? getPropertyExpression(v, fieldName) : (0, import_types12.valueToNode)(v)));
+      const arrayElements = value2.map((v) => {
+        const propertyInfo = isPropertyInfo(v) ? v : Property.Any(v);
+        return getPropertyExpression(propertyInfo, fieldName);
+      });
+      return import_types12.default.arrayExpression(arrayElements);
     }
     if (typeof value2 === "object" && value2 !== null) {
-      return import_types12.default.objectExpression(Object.entries(value2).map(([key2, value3]) => import_types12.default.objectProperty(import_types12.default.stringLiteral(key2), isPropertyInfo(value3) ? getPropertyExpression(value3, fieldName) : (0, import_types12.valueToNode)(value3))));
+      return import_types12.default.objectExpression(Object.entries(value2).map(([key2, value3]) => {
+        let objectValue;
+        if (isPropertyInfo(value3)) {
+          objectValue = getPropertyExpression(value3, key2);
+        } else if (Array.isArray(value3)) {
+          objectValue = getPropertyExpression(Property.Any(value3), key2);
+        } else if (typeof value3 === "object" && value3 !== null) {
+          objectValue = getPropertyExpression(Property.Any(value3), key2);
+        } else {
+          objectValue = (0, import_types12.valueToNode)(value3);
+        }
+        return import_types12.default.objectProperty(createObjectKey(key2), objectValue);
+      }));
     }
     if (typeof value2 === "number") {
       return import_types12.default.numericLiteral(value2);
@@ -309534,10 +310430,10 @@ init_cjs_shims();
 
 // ../../../vite-plugin-file-sync/dist/parsing/entity/to-code-entity.js
 init_cjs_shims();
-var import_shared25 = __toESM(require_dist2(), 1);
+var import_shared26 = __toESM(require_dist2(), 1);
 var toCodeProperty = (value2) => {
   if (typeof value2 === "string") {
-    if ((0, import_shared25.containsBindingsAnywhere)(value2)) {
+    if ((0, import_shared26.containsBindingsAnywhere)(value2)) {
       return `SB\`${value2}\``;
     }
     return `"${value2}"`;
@@ -309556,7 +310452,7 @@ function toCodeEntity(entity) {
     case SbEntityType.VARIABLE:
       return `SbVariable({
         defaultValue: ${toCodeProperty(entity.defaultValue)},
-        persistence: ${entity.persistence === import_shared11.AppStateVarPersistence6.LOCAL_STORAGE ? "SbVariablePersistence.LOCAL_STORAGE" : "SbVariablePersistence.TEMPORARY"}
+        persistence: ${entity.persistence === import_shared12.AppStateVarPersistence6.LOCAL_STORAGE ? "SbVariablePersistence.LOCAL_STORAGE" : "SbVariablePersistence.TEMPORARY"}
       })`;
     case SbEntityType.API:
       return `SbApi({
@@ -309637,7 +310533,7 @@ function toValueEntity(nodePath, { key: key2, id: id2 }) {
         type: SbEntityType.VARIABLE,
         name: key2,
         defaultValue: args.defaultValue ?? Property.Static(""),
-        persistence: args.persistence ?? Property.Expression(import_shared11.AppStateVarPersistence6.TEMPORARY),
+        persistence: args.persistence ?? Property.Expression(import_shared12.AppStateVarPersistence6.TEMPORARY),
         value: args.defaultValue ?? Property.Static(""),
         id: id2
       };
@@ -310221,7 +311117,7 @@ var import_types19 = __toESM(require_lib7(), 1);
 
 // ../../../vite-plugin-file-sync/dist/refactor/blocks.js
 init_cjs_shims();
-var import_shared26 = __toESM(require_dist2(), 1);
+var import_shared27 = __toESM(require_dist2(), 1);
 var import_esprima2 = __toESM(require_esprima(), 1);
 init_lodash();
 function flattenBlocks(blocks) {
@@ -310229,19 +311125,19 @@ function flattenBlocks(blocks) {
     return [];
   }
   return blocks.flatMap((block) => {
-    const localBlock = (0, import_shared26.convertBlock)(block);
+    const localBlock = (0, import_shared27.convertBlock)(block);
     if (!localBlock) {
       return null;
     }
-    if ((0, import_shared26.isStepBlock)(localBlock)) {
+    if ((0, import_shared27.isStepBlock)(localBlock)) {
       return localBlock;
-    } else if ((0, import_shared26.isControlBlock)(localBlock)) {
+    } else if ((0, import_shared27.isControlBlock)(localBlock)) {
       switch (localBlock.type) {
-        case import_shared26.BlockType.PARALLEL: {
+        case import_shared27.BlockType.PARALLEL: {
           const config2 = localBlock.config;
           return flattenBlocks(config2.dynamic?.blocks);
         }
-        case import_shared26.BlockType.CONDITION: {
+        case import_shared27.BlockType.CONDITION: {
           const config2 = localBlock.config;
           const blocks2 = [
             ...flattenBlocks(config2.if?.blocks),
@@ -310250,7 +311146,7 @@ function flattenBlocks(blocks) {
           ];
           if (config2.if?.condition) {
             blocks2.push({
-              type: import_shared26.BlockType.CONDITION,
+              type: import_shared27.BlockType.CONDITION,
               config: {
                 if: config2.if
               }
@@ -310258,7 +311154,7 @@ function flattenBlocks(blocks) {
           }
           if (config2.elseIf?.length) {
             blocks2.push({
-              type: import_shared26.BlockType.CONDITION,
+              type: import_shared27.BlockType.CONDITION,
               config: {
                 elseIf: config2.elseIf
               }
@@ -310266,11 +311162,11 @@ function flattenBlocks(blocks) {
           }
           return blocks2;
         }
-        case import_shared26.BlockType.LOOP: {
+        case import_shared27.BlockType.LOOP: {
           const config2 = localBlock.config;
           return flattenBlocks(config2.blocks);
         }
-        case import_shared26.BlockType.TRY_CATCH: {
+        case import_shared27.BlockType.TRY_CATCH: {
           const config2 = localBlock.config;
           return [
             ...flattenBlocks(config2.try?.blocks),
@@ -310278,7 +311174,7 @@ function flattenBlocks(blocks) {
             ...flattenBlocks(config2.finally?.blocks)
           ];
         }
-        case import_shared26.BlockType.STREAM: {
+        case import_shared27.BlockType.STREAM: {
           const config2 = localBlock.config;
           return flattenBlocks(config2.process?.blocks);
         }
@@ -310289,19 +311185,19 @@ function flattenBlocks(blocks) {
   }).filter(Boolean);
 }
 var extractPythonEvaluationPairs2 = async (code, entities, dataTree, namespacedEntitiesToExtract) => {
-  return (0, import_shared26.extractPythonEvaluationPairsWithParser)(code, entities, dataTree, parser, namespacedEntitiesToExtract);
+  return (0, import_shared27.extractPythonEvaluationPairsWithParser)(code, entities, dataTree, parser, namespacedEntitiesToExtract);
 };
 var extractJsEvaluationPairs2 = async (jsSnippet, entitiesToExtract, dataTree, namespacedEntitiesToExtract) => {
-  return (0, import_shared26.extractJsEvaluationPairsWithTokenizer)(jsSnippet, entitiesToExtract, dataTree, import_esprima2.tokenize, namespacedEntitiesToExtract);
+  return (0, import_shared27.extractJsEvaluationPairsWithTokenizer)(jsSnippet, entitiesToExtract, dataTree, import_esprima2.tokenize, namespacedEntitiesToExtract);
 };
 function getExtractorByPluginId(pluginId) {
   if (!pluginId) {
     return extractJsEvaluationPairs2;
   }
   switch (pluginId.trim().toLowerCase()) {
-    case import_shared26.LanguagePluginID.Python:
+    case import_shared27.LanguagePluginID.Python:
       return extractPythonEvaluationPairs2;
-    case import_shared26.LanguagePluginID.JavaScript:
+    case import_shared27.LanguagePluginID.JavaScript:
     default:
       return extractJsEvaluationPairs2;
   }
@@ -310310,14 +311206,14 @@ async function refactorNameInBlocks(params) {
   const { blocks, oldName, newName, namespace } = params;
   const flattenedBlocks = flattenBlocks(blocks);
   for (const block of flattenedBlocks) {
-    const pluginType = (0, import_shared26.getPluginType)(block) ?? void 0;
+    const pluginType = (0, import_shared27.getPluginType)(block) ?? void 0;
     const extractor = getExtractorByPluginId(pluginType);
-    if ((0, import_shared26.isStepBlock)(block) && pluginType) {
+    if ((0, import_shared27.isStepBlock)(block) && pluginType) {
       const configuration = block.config[pluginType];
       if (typeof configuration !== "object" || configuration == null) {
         continue;
       }
-      await (0, import_shared26.refactorNameInStep)({
+      await (0, import_shared27.refactorNameInStep)({
         ...params,
         dataTree: {
           [newName]: {},
@@ -310327,9 +311223,9 @@ async function refactorNameInBlocks(params) {
         configuration,
         extractor
       });
-    } else if ((0, import_shared26.isControlBlock)(block)) {
+    } else if ((0, import_shared27.isControlBlock)(block)) {
       for (const [value2, setValue] of getSetControlBlockExpressions2(block)) {
-        const newValue = await (0, import_shared26.refactorNameInString)({
+        const newValue = await (0, import_shared27.refactorNameInString)({
           value: value2,
           oldName,
           newName,
@@ -310359,34 +311255,34 @@ function getSetControlBlockExpressions2(block) {
   const { config: config2, type: type2 } = block;
   const results = [];
   switch (type2) {
-    case import_shared26.BlockType.BREAK: {
+    case import_shared27.BlockType.BREAK: {
       const controlConfig = config2;
       results.push(makeGetSet2(controlConfig, "condition"));
       break;
     }
-    case import_shared26.BlockType.THROW: {
+    case import_shared27.BlockType.THROW: {
       const controlConfig = config2;
       results.push(makeGetSet2(controlConfig, "error"));
       break;
     }
-    case import_shared26.BlockType.RETURN: {
+    case import_shared27.BlockType.RETURN: {
       const controlConfig = config2;
       results.push(makeGetSet2(controlConfig, "data"));
       break;
     }
-    case import_shared26.BlockType.WAIT: {
+    case import_shared27.BlockType.WAIT: {
       const controlConfig = config2;
       results.push(makeGetSet2(controlConfig, "condition"));
       break;
     }
-    case import_shared26.BlockType.PARALLEL: {
+    case import_shared27.BlockType.PARALLEL: {
       const controlConfig = config2;
       if (controlConfig.dynamic) {
         results.push(makeGetSet2(controlConfig.dynamic, "paths"));
       }
       break;
     }
-    case import_shared26.BlockType.CONDITION: {
+    case import_shared27.BlockType.CONDITION: {
       const controlConfig = config2;
       if (controlConfig.if) {
         results.push(makeGetSet2(controlConfig.if, "condition"));
@@ -310396,15 +311292,15 @@ function getSetControlBlockExpressions2(block) {
       }
       break;
     }
-    case import_shared26.BlockType.LOOP: {
+    case import_shared27.BlockType.LOOP: {
       const controlConfig = config2;
       results.push(makeGetSet2(controlConfig, "range"));
       break;
     }
-    case import_shared26.BlockType.TRY_CATCH: {
+    case import_shared27.BlockType.TRY_CATCH: {
       break;
     }
-    case import_shared26.BlockType.VARIABLES: {
+    case import_shared27.BlockType.VARIABLES: {
       const controlConfig = config2;
       for (const variable of controlConfig.items) {
         if (variable.value) {
@@ -310413,12 +311309,12 @@ function getSetControlBlockExpressions2(block) {
       }
       break;
     }
-    case import_shared26.BlockType.SEND: {
+    case import_shared27.BlockType.SEND: {
       const controlConfig = config2;
       results.push(makeGetSet2(controlConfig, "message"));
       break;
     }
-    case import_shared26.BlockType.STREAM: {
+    case import_shared27.BlockType.STREAM: {
       break;
     }
     default: {
@@ -310432,7 +311328,7 @@ function getSetControlBlockExpressions2(block) {
 // ../../../vite-plugin-file-sync/dist/refactor/javascript.js
 init_cjs_shims();
 var import_types18 = __toESM(require_lib7(), 1);
-var import_shared27 = __toESM(require_dist2(), 1);
+var import_shared28 = __toESM(require_dist2(), 1);
 function renameEntityInJavascript({ oldName, newName, nodePath, parentBinding, checkFunctionBinding = false }) {
   const functionVisitor = checkFunctionBinding ? {
     Function(path51) {
@@ -310558,6 +311454,13 @@ function renameEntityInJavascript({ oldName, newName, nodePath, parentBinding, c
     },
     MemberExpression(path51) {
       handleMemberExpression(path51);
+    },
+    Identifier(path51) {
+      if (path51.parentPath.isArrayExpression()) {
+        if (path51.node.name === oldName) {
+          path51.replaceInline(import_types18.default.identifier(newName));
+        }
+      }
     }
   });
 }
@@ -310658,6 +311561,17 @@ var RenameManager = class {
           checkFunctionBinding: true,
           parentBinding
         });
+      },
+      ArrayExpression(path51) {
+        if (import_types19.default.isCallExpression(path51.parentPath.node)) {
+          renameEntityInJavascript({
+            oldName,
+            newName,
+            nodePath: path51,
+            checkFunctionBinding: true,
+            parentBinding
+          });
+        }
       }
     };
     traverseFn(ast, {
@@ -310666,7 +311580,7 @@ var RenameManager = class {
         path51.skip();
       },
       CallExpression(path51) {
-        if (path51.node.callee.type === "Identifier" && (path51.node.callee.name === "SbVariable" || path51.node.callee.name === "SbTimer" || path51.node.callee.name === "SbEventFlow")) {
+        if (path51.node.callee.type === "Identifier" && (path51.node.callee.name === "SbVariable" || path51.node.callee.name === "SbTimer" || path51.node.callee.name === "SbEventFlow") || path51.node.callee.type === "MemberExpression" && path51.node.arguments.length > 0) {
           path51.traverse(elementVisitor);
           path51.skip();
         }
@@ -312296,7 +313210,7 @@ var FileSyncManager = class extends EventEmitter8 {
       "handleUpdateTheme",
       "handleRenameElement"
     ];
-    (0, import_shared28.addTracingToMethods)(this, methods, tracer2);
+    (0, import_shared29.addTracingToMethods)(this, methods, tracer2);
   }
   get appFilePath() {
     if (!this.rootDir) {
@@ -312534,6 +313448,9 @@ var FileSyncManager = class extends EventEmitter8 {
   getTsFilePaths() {
     return Object.keys(this.tsFiles);
   }
+  getSourceTracker() {
+    return this.sourceTracker;
+  }
   async writeFile(path51, content2, kind) {
     if (kind === "ts") {
       this.tsFiles[path51] = content2;
@@ -313438,7 +314355,7 @@ function generateRootSource(code, routes) {
 
 // ../../../vite-plugin-file-sync/dist/socket-manager.js
 init_cjs_shims();
-var import_shared29 = __toESM(require_dist2(), 1);
+var import_shared30 = __toESM(require_dist2(), 1);
 import EventEmitter9 from "node:events";
 
 // ../../../../node_modules/.pnpm/ws@8.18.2/node_modules/ws/wrapper.mjs
@@ -313549,7 +314466,7 @@ var SocketManager = class extends EventEmitter9 {
       }
     });
     wss.on("connection", (ws, isEditor, peerId, userId) => {
-      const socket = (0, import_shared29.createISocketClient)(new import_shared29.TracedSocket(ws, withMethodTracing(tracer2, {
+      const socket = (0, import_shared30.createISocketClient)(new import_shared30.TracedSocket(ws, withMethodTracing(tracer2, {
         editor: {
           // Update widgets
           setProperties: [fileSyncManager.handleSetProperties],
@@ -313744,6 +314661,9 @@ var fileSyncVitePlugin = (pluginParams, options8) => {
           }
         })
       ]);
+      if (aiService) {
+        aiService.setSourceTracker(fileSyncManager.getSourceTracker());
+      }
       server.middlewares.use(indexHtmlMiddleware(server, fileSyncManager));
       server.middlewares.use("/sb-init", import_body_parser.default.json({ strict: true }));
       server.middlewares.use("/sb-init", async (req, res, next) => {
@@ -314303,7 +315223,7 @@ async function getAppScope(fileSyncManager) {
     pageId: apiPb.trigger.application?.pageId,
     organizationId: apiPb.metadata.organization,
     updated: apiPb.metadata?.timestamps?.updated ? new Date(apiPb.metadata?.timestamps?.updated) : void 0,
-    triggerType: import_shared30.ApiTriggerType.UI,
+    triggerType: import_shared31.ApiTriggerType.UI,
     apiPb
   }));
   const appScope = {
@@ -314485,7 +315405,7 @@ async function buildWithVite({ root: root2, dest: dest4, mode, libraryUrl, asset
 // ../sdk/dist/client.js
 init_cjs_shims();
 var import_bucketeer_sdk = __toESM(require_dist5(), 1);
-var import_shared32 = __toESM(require_dist2(), 1);
+var import_shared33 = __toESM(require_dist2(), 1);
 var import_util30 = __toESM(require_dist3(), 1);
 import * as fs16 from "node:fs";
 import path31 from "node:path";
@@ -317937,7 +318857,7 @@ var FeatureFlags = class {
 
 // ../sdk/dist/socket/index.js
 init_cjs_shims();
-var import_shared31 = __toESM(require_dist2(), 1);
+var import_shared32 = __toESM(require_dist2(), 1);
 
 // ../sdk/dist/dev-utils/dev-tracer.js
 init_cjs_shims();
@@ -317954,7 +318874,7 @@ var import_util29 = __toESM(require_dist3(), 1);
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.0-next.70",
+  version: "2.0.0-next.71",
   type: "module",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
@@ -317996,8 +318916,8 @@ var package_default = {
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.5.0",
     "@superblocksteam/shared": "0.9146.0",
-    "@superblocksteam/util": "2.0.0-next.70",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.70",
+    "@superblocksteam/util": "2.0.0-next.71",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.71",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -318390,7 +319310,7 @@ async function connectToISocketRPCServer2({ superblocksBaseUrl, agentUrl, token:
   } else if (wsUrl.hostname === "localhost") {
     wsUrl.hostname = "127.0.0.1";
   }
-  return await (0, import_shared31.connectISocket)(wsUrl.href, authorization, requestHandlers, [], dev_tracer_default, {
+  return await (0, import_shared32.connectISocket)(wsUrl.href, authorization, requestHandlers, [], dev_tracer_default, {
     connectionTimeoutInSeconds: 6 * 60,
     // 6 minutes
     noResponseTimeoutInSeconds: 5 * 60
@@ -318413,7 +319333,7 @@ var ResourceType;
   ResourceType2["BACKEND"] = "BACKEND";
 })(ResourceType || (ResourceType = {}));
 async function fetchApplication({ cliVersion, applicationId, branch, token: token2, superblocksBaseUrl, viewMode, commitId, skipSigningVerification = false, injectedHeaders = {} }) {
-  if (commitId && viewMode !== import_shared32.ExportViewMode.EXPORT_COMMIT) {
+  if (commitId && viewMode !== import_shared33.ExportViewMode.EXPORT_COMMIT) {
     throw new Error(`If commitId ${commitId} is provided, viewMode cannot be ${viewMode}`);
   }
   try {
@@ -319075,7 +319995,7 @@ function filesToFileDescriptors(files, appRoot) {
 
 // ../sdk/dist/sdk.js
 init_cjs_shims();
-var import_shared34 = __toESM(require_dist2(), 1);
+var import_shared35 = __toESM(require_dist2(), 1);
 
 // ../sdk/dist/dbfs/client.js
 init_cjs_shims();
@@ -319083,7 +320003,7 @@ var import_util32 = __toESM(require_dist3(), 1);
 
 // ../sdk/dist/dbfs/local.js
 init_cjs_shims();
-var import_shared33 = __toESM(require_dist2(), 1);
+var import_shared34 = __toESM(require_dist2(), 1);
 var import_util31 = __toESM(require_dist3(), 1);
 import * as fsp4 from "node:fs/promises";
 async function doDownloadDirectoryToLocal(rpcClient, directoryHash, localDirectoryPath) {
@@ -319128,7 +320048,7 @@ async function hashLocalDirectory2(localDirectoryPath) {
     let entry;
     switch (localDirEntry.type) {
       case "-": {
-        const hash3 = await (0, import_shared33.hashFileContents)(localDirEntry.contents);
+        const hash3 = await (0, import_shared34.hashFileContents)(localDirEntry.contents);
         entry = {
           type: "-",
           executable: localDirEntry.executable,
@@ -319160,7 +320080,7 @@ async function hashLocalDirectory2(localDirectoryPath) {
     }
     directoryContents.push(entry);
   }
-  const hash2 = await (0, import_shared33.hashDirectoryContents)(directoryContents);
+  const hash2 = await (0, import_shared34.hashDirectoryContents)(directoryContents);
   return { contents: directoryContents, hash: hash2 };
 }
 async function doUploadLocalDirectory(rpcClient, localDirectoryPath) {
@@ -319320,7 +320240,7 @@ var SuperblocksSdk = class {
   getFeatureFlagsForUser(user) {
     return new FeatureFlags(user.flagBootstrap);
   }
-  async fetchApplication({ applicationId, branch, headers = {}, viewMode = import_shared34.ExportViewMode.EXPORT_LIVE, skipSigningVerification = false }) {
+  async fetchApplication({ applicationId, branch, headers = {}, viewMode = import_shared35.ExportViewMode.EXPORT_LIVE, skipSigningVerification = false }) {
     return fetchApplication({
       cliVersion: this.cliVersion,
       applicationId,
@@ -319341,7 +320261,7 @@ var SuperblocksSdk = class {
       injectedHeaders: headers
     });
   }
-  async fetchApplicationWithComponents({ applicationId, branch, headers = {}, viewMode = import_shared34.ExportViewMode.EXPORT_LIVE, commitId, skipSigningVerification = false }) {
+  async fetchApplicationWithComponents({ applicationId, branch, headers = {}, viewMode = import_shared35.ExportViewMode.EXPORT_LIVE, commitId, skipSigningVerification = false }) {
     return fetchApplicationWithComponents({
       cliVersion: this.cliVersion,
       applicationId,
@@ -319381,7 +320301,7 @@ var SuperblocksSdk = class {
   async fetchApplications(headers) {
     return fetchApplications(this.cliVersion, this.token, this.superblocksBaseUrl, headers);
   }
-  async fetchApi({ apiId, branch, viewMode = import_shared34.ExportViewMode.EXPORT_LIVE, commitId, skipSigningVerification = false }) {
+  async fetchApi({ apiId, branch, viewMode = import_shared35.ExportViewMode.EXPORT_LIVE, commitId, skipSigningVerification = false }) {
     return fetchApi(this.cliVersion, apiId, this.token, this.superblocksBaseUrl, viewMode, branch, commitId, skipSigningVerification);
   }
   async fetchApis() {
@@ -319457,7 +320377,7 @@ var SuperblocksSdk = class {
 
 // ../sdk/dist/version-control.mjs
 init_cjs_shims();
-var import_shared35 = __toESM(require_dist2(), 1);
+var import_shared36 = __toESM(require_dist2(), 1);
 var import_util33 = __toESM(require_dist3(), 1);
 import * as https2 from "https";
 import path33 from "node:path";
@@ -324038,11 +324958,11 @@ var FileStructureType;
 function modeFlagToViewMode(modeFlag) {
   switch (modeFlag) {
     case LATEST_EDITS_MODE:
-      return import_shared35.ExportViewMode.EXPORT_LIVE;
+      return import_shared36.ExportViewMode.EXPORT_LIVE;
     case MOST_RECENT_COMMIT_MODE:
-      return import_shared35.ExportViewMode.EXPORT_LATEST;
+      return import_shared36.ExportViewMode.EXPORT_LATEST;
     case DEPLOYED_MODE:
-      return import_shared35.ExportViewMode.EXPORT_DEPLOYED;
+      return import_shared36.ExportViewMode.EXPORT_DEPLOYED;
     default:
       throw new Error(`Unsupported mode flag: ${modeFlag}`);
   }
@@ -324940,7 +325860,7 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, port
   };
   const isCustomBuildEnabled2 = await isCustomComponentsEnabled();
   const customFolder = path34.join(root2, "custom");
-  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.0-next.70";
+  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.0-next.71";
   const env3 = loadEnv(mode, root2, "");
   const hmrPort = await getFreePort();
   const hmrOptions = {
@@ -325052,331 +325972,6 @@ import * as child_process2 from "node:child_process";
 import * as fsp5 from "node:fs/promises";
 import { promisify as promisify2 } from "node:util";
 
-// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/index.js
-init_cjs_shims();
-
-// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/diff/base.js
-init_cjs_shims();
-var Diff2 = class {
-  diff(oldStr, newStr, options8 = {}) {
-    let callback;
-    if (typeof options8 === "function") {
-      callback = options8;
-      options8 = {};
-    } else if ("callback" in options8) {
-      callback = options8.callback;
-    }
-    const oldString = this.castInput(oldStr, options8);
-    const newString = this.castInput(newStr, options8);
-    const oldTokens = this.removeEmpty(this.tokenize(oldString, options8));
-    const newTokens = this.removeEmpty(this.tokenize(newString, options8));
-    return this.diffWithOptionsObj(oldTokens, newTokens, options8, callback);
-  }
-  diffWithOptionsObj(oldTokens, newTokens, options8, callback) {
-    var _a18;
-    const done = (value2) => {
-      value2 = this.postProcess(value2, options8);
-      if (callback) {
-        setTimeout(function() {
-          callback(value2);
-        }, 0);
-        return void 0;
-      } else {
-        return value2;
-      }
-    };
-    const newLen = newTokens.length, oldLen = oldTokens.length;
-    let editLength = 1;
-    let maxEditLength = newLen + oldLen;
-    if (options8.maxEditLength != null) {
-      maxEditLength = Math.min(maxEditLength, options8.maxEditLength);
-    }
-    const maxExecutionTime = (_a18 = options8.timeout) !== null && _a18 !== void 0 ? _a18 : Infinity;
-    const abortAfterTimestamp = Date.now() + maxExecutionTime;
-    const bestPath = [{ oldPos: -1, lastComponent: void 0 }];
-    let newPos = this.extractCommon(bestPath[0], newTokens, oldTokens, 0, options8);
-    if (bestPath[0].oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
-      return done(this.buildValues(bestPath[0].lastComponent, newTokens, oldTokens));
-    }
-    let minDiagonalToConsider = -Infinity, maxDiagonalToConsider = Infinity;
-    const execEditLength = () => {
-      for (let diagonalPath = Math.max(minDiagonalToConsider, -editLength); diagonalPath <= Math.min(maxDiagonalToConsider, editLength); diagonalPath += 2) {
-        let basePath;
-        const removePath = bestPath[diagonalPath - 1], addPath = bestPath[diagonalPath + 1];
-        if (removePath) {
-          bestPath[diagonalPath - 1] = void 0;
-        }
-        let canAdd = false;
-        if (addPath) {
-          const addPathNewPos = addPath.oldPos - diagonalPath;
-          canAdd = addPath && 0 <= addPathNewPos && addPathNewPos < newLen;
-        }
-        const canRemove = removePath && removePath.oldPos + 1 < oldLen;
-        if (!canAdd && !canRemove) {
-          bestPath[diagonalPath] = void 0;
-          continue;
-        }
-        if (!canRemove || canAdd && removePath.oldPos < addPath.oldPos) {
-          basePath = this.addToPath(addPath, true, false, 0, options8);
-        } else {
-          basePath = this.addToPath(removePath, false, true, 1, options8);
-        }
-        newPos = this.extractCommon(basePath, newTokens, oldTokens, diagonalPath, options8);
-        if (basePath.oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
-          return done(this.buildValues(basePath.lastComponent, newTokens, oldTokens)) || true;
-        } else {
-          bestPath[diagonalPath] = basePath;
-          if (basePath.oldPos + 1 >= oldLen) {
-            maxDiagonalToConsider = Math.min(maxDiagonalToConsider, diagonalPath - 1);
-          }
-          if (newPos + 1 >= newLen) {
-            minDiagonalToConsider = Math.max(minDiagonalToConsider, diagonalPath + 1);
-          }
-        }
-      }
-      editLength++;
-    };
-    if (callback) {
-      (function exec8() {
-        setTimeout(function() {
-          if (editLength > maxEditLength || Date.now() > abortAfterTimestamp) {
-            return callback(void 0);
-          }
-          if (!execEditLength()) {
-            exec8();
-          }
-        }, 0);
-      })();
-    } else {
-      while (editLength <= maxEditLength && Date.now() <= abortAfterTimestamp) {
-        const ret = execEditLength();
-        if (ret) {
-          return ret;
-        }
-      }
-    }
-  }
-  addToPath(path51, added, removed, oldPosInc, options8) {
-    const last2 = path51.lastComponent;
-    if (last2 && !options8.oneChangePerToken && last2.added === added && last2.removed === removed) {
-      return {
-        oldPos: path51.oldPos + oldPosInc,
-        lastComponent: { count: last2.count + 1, added, removed, previousComponent: last2.previousComponent }
-      };
-    } else {
-      return {
-        oldPos: path51.oldPos + oldPosInc,
-        lastComponent: { count: 1, added, removed, previousComponent: last2 }
-      };
-    }
-  }
-  extractCommon(basePath, newTokens, oldTokens, diagonalPath, options8) {
-    const newLen = newTokens.length, oldLen = oldTokens.length;
-    let oldPos = basePath.oldPos, newPos = oldPos - diagonalPath, commonCount = 0;
-    while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(oldTokens[oldPos + 1], newTokens[newPos + 1], options8)) {
-      newPos++;
-      oldPos++;
-      commonCount++;
-      if (options8.oneChangePerToken) {
-        basePath.lastComponent = { count: 1, previousComponent: basePath.lastComponent, added: false, removed: false };
-      }
-    }
-    if (commonCount && !options8.oneChangePerToken) {
-      basePath.lastComponent = { count: commonCount, previousComponent: basePath.lastComponent, added: false, removed: false };
-    }
-    basePath.oldPos = oldPos;
-    return newPos;
-  }
-  equals(left, right, options8) {
-    if (options8.comparator) {
-      return options8.comparator(left, right);
-    } else {
-      return left === right || !!options8.ignoreCase && left.toLowerCase() === right.toLowerCase();
-    }
-  }
-  removeEmpty(array2) {
-    const ret = [];
-    for (let i2 = 0; i2 < array2.length; i2++) {
-      if (array2[i2]) {
-        ret.push(array2[i2]);
-      }
-    }
-    return ret;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  castInput(value2, options8) {
-    return value2;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  tokenize(value2, options8) {
-    return Array.from(value2);
-  }
-  join(chars) {
-    return chars.join("");
-  }
-  postProcess(changeObjects, options8) {
-    return changeObjects;
-  }
-  get useLongestToken() {
-    return false;
-  }
-  buildValues(lastComponent, newTokens, oldTokens) {
-    const components2 = [];
-    let nextComponent;
-    while (lastComponent) {
-      components2.push(lastComponent);
-      nextComponent = lastComponent.previousComponent;
-      delete lastComponent.previousComponent;
-      lastComponent = nextComponent;
-    }
-    components2.reverse();
-    const componentLen = components2.length;
-    let componentPos = 0, newPos = 0, oldPos = 0;
-    for (; componentPos < componentLen; componentPos++) {
-      const component = components2[componentPos];
-      if (!component.removed) {
-        if (!component.added && this.useLongestToken) {
-          let value2 = newTokens.slice(newPos, newPos + component.count);
-          value2 = value2.map(function(value3, i2) {
-            const oldValue = oldTokens[oldPos + i2];
-            return oldValue.length > value3.length ? oldValue : value3;
-          });
-          component.value = this.join(value2);
-        } else {
-          component.value = this.join(newTokens.slice(newPos, newPos + component.count));
-        }
-        newPos += component.count;
-        if (!component.added) {
-          oldPos += component.count;
-        }
-      } else {
-        component.value = this.join(oldTokens.slice(oldPos, oldPos + component.count));
-        oldPos += component.count;
-      }
-    }
-    return components2;
-  }
-};
-
-// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/diff/line.js
-init_cjs_shims();
-var LineDiff = class extends Diff2 {
-  constructor() {
-    super(...arguments);
-    this.tokenize = tokenize4;
-  }
-  equals(left, right, options8) {
-    if (options8.ignoreWhitespace) {
-      if (!options8.newlineIsToken || !left.includes("\n")) {
-        left = left.trim();
-      }
-      if (!options8.newlineIsToken || !right.includes("\n")) {
-        right = right.trim();
-      }
-    } else if (options8.ignoreNewlineAtEof && !options8.newlineIsToken) {
-      if (left.endsWith("\n")) {
-        left = left.slice(0, -1);
-      }
-      if (right.endsWith("\n")) {
-        right = right.slice(0, -1);
-      }
-    }
-    return super.equals(left, right, options8);
-  }
-};
-var lineDiff2 = new LineDiff();
-function tokenize4(value2, options8) {
-  if (options8.stripTrailingCr) {
-    value2 = value2.replace(/\r\n/g, "\n");
-  }
-  const retLines = [], linesAndNewlines = value2.split(/(\n|\r\n)/);
-  if (!linesAndNewlines[linesAndNewlines.length - 1]) {
-    linesAndNewlines.pop();
-  }
-  for (let i2 = 0; i2 < linesAndNewlines.length; i2++) {
-    const line3 = linesAndNewlines[i2];
-    if (i2 % 2 && !options8.newlineIsToken) {
-      retLines[retLines.length - 1] += line3;
-    } else {
-      retLines.push(line3);
-    }
-  }
-  return retLines;
-}
-
-// ../../../../node_modules/.pnpm/diff@8.0.2/node_modules/diff/libesm/diff/json.js
-init_cjs_shims();
-var JsonDiff = class extends Diff2 {
-  constructor() {
-    super(...arguments);
-    this.tokenize = tokenize4;
-  }
-  get useLongestToken() {
-    return true;
-  }
-  castInput(value2, options8) {
-    const { undefinedReplacement, stringifyReplacer = (k, v) => typeof v === "undefined" ? undefinedReplacement : v } = options8;
-    return typeof value2 === "string" ? value2 : JSON.stringify(canonicalize2(value2, null, null, stringifyReplacer), null, "  ");
-  }
-  equals(left, right, options8) {
-    return super.equals(left.replace(/,([\r\n])/g, "$1"), right.replace(/,([\r\n])/g, "$1"), options8);
-  }
-};
-var jsonDiff2 = new JsonDiff();
-function diffJson(oldStr, newStr, options8) {
-  return jsonDiff2.diff(oldStr, newStr, options8);
-}
-function canonicalize2(obj, stack2, replacementStack, replacer, key2) {
-  stack2 = stack2 || [];
-  replacementStack = replacementStack || [];
-  if (replacer) {
-    obj = replacer(key2 === void 0 ? "" : key2, obj);
-  }
-  let i2;
-  for (i2 = 0; i2 < stack2.length; i2 += 1) {
-    if (stack2[i2] === obj) {
-      return replacementStack[i2];
-    }
-  }
-  let canonicalizedObj;
-  if ("[object Array]" === Object.prototype.toString.call(obj)) {
-    stack2.push(obj);
-    canonicalizedObj = new Array(obj.length);
-    replacementStack.push(canonicalizedObj);
-    for (i2 = 0; i2 < obj.length; i2 += 1) {
-      canonicalizedObj[i2] = canonicalize2(obj[i2], stack2, replacementStack, replacer, String(i2));
-    }
-    stack2.pop();
-    replacementStack.pop();
-    return canonicalizedObj;
-  }
-  if (obj && obj.toJSON) {
-    obj = obj.toJSON();
-  }
-  if (typeof obj === "object" && obj !== null) {
-    stack2.push(obj);
-    canonicalizedObj = {};
-    replacementStack.push(canonicalizedObj);
-    const sortedKeys = [];
-    let key3;
-    for (key3 in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key3)) {
-        sortedKeys.push(key3);
-      }
-    }
-    sortedKeys.sort();
-    for (i2 = 0; i2 < sortedKeys.length; i2 += 1) {
-      key3 = sortedKeys[i2];
-      canonicalizedObj[key3] = canonicalize2(obj[key3], stack2, replacementStack, replacer, key3);
-    }
-    stack2.pop();
-    replacementStack.pop();
-  } else {
-    canonicalizedObj = obj;
-  }
-  return canonicalizedObj;
-}
-
 // ../../../../node_modules/.pnpm/package-manager-detector@1.3.0/node_modules/package-manager-detector/dist/index.mjs
 init_cjs_shims();
 
@@ -326039,11 +326634,11 @@ async function dev(options8) {
 
 // ../sdk/dist/cli-replacement/init.js
 init_cjs_shims();
-var import_shared36 = __toESM(require_dist2(), 1);
+var import_shared37 = __toESM(require_dist2(), 1);
 var import_util36 = __toESM(require_dist3(), 1);
 async function fetchAndWriteApplication({ resourceId, viewMode, featureFlags, projectRootFolder, appRelativePath, sdk: sdk2, skipSigningVerification }) {
   const headers = {
-    [import_util36.COMPONENT_EVENT_HEADER]: import_shared36.ComponentEvent.INIT
+    [import_util36.COMPONENT_EVENT_HEADER]: import_shared37.ComponentEvent.INIT
   };
   const application = await sdk2.fetchApplicationWithComponents({
     applicationId: resourceId,
@@ -326064,7 +326659,7 @@ async function fetchAndWriteApplication({ resourceId, viewMode, featureFlags, pr
 }
 
 // ../sdk/dist/index.js
-var import_shared37 = __toESM(require_dist2(), 1);
+var import_shared38 = __toESM(require_dist2(), 1);
 
 // src/commands/commits.mts
 var import_util39 = __toESM(require_dist3(), 1);
@@ -331233,7 +331828,7 @@ ${error.message}.`
             task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
             let viewMode;
             if (commitId) {
-              viewMode = import_shared37.ExportViewMode.EXPORT_COMMIT;
+              viewMode = import_shared38.ExportViewMode.EXPORT_COMMIT;
             } else {
               viewMode = await getMode(task, mode);
             }