@superblocksteam/cli 2.0.142-next.0 → 2.0.142-next.2

package/dist/{chunk-TQTWTZU7.js → chunk-CMNID6AS.js}

@@ -1,7 +1,7 @@
 if (typeof process === 'object' && process !== null &&
     process.env !== null && typeof process.env === 'object') {
   process.env.DD_GIT_REPOSITORY_URL = 'https://token@github.com/superblocksteam/superblocks.git';
-  process.env.DD_GIT_COMMIT_SHA = '238ffafe56481afd68e4a6b196c2fa222e168bdf';
+  process.env.DD_GIT_COMMIT_SHA = '52f1e7a2c8429d93bf5498ef5aa3b18a844b1d12';
 }
 import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
@@ -15,7 +15,7 @@ import {
   require_lib as require_lib2,
   require_lib2 as require_lib3,
   require_picocolors
-} from "./chunk-HHOHQYKG.js";
+} from "./chunk-L6JIORBN.js";
 import {
   debounce_default,
   get_default,
@@ -32,20 +32,20 @@ import {
   require_lib,
   require_slugify,
   throttle_default
-} from "./chunk-S55DRBPL.js";
+} from "./chunk-AT4BZSJH.js";
 import {
   require_dd_trace,
   require_js_yaml,
   require_module_details_from_path,
   require_p_limit,
   require_path_to_regexp
-} from "./chunk-FXRQCAWN.js";
+} from "./chunk-KX2ALRUY.js";
 import {
   require_commonjs
-} from "./chunk-ETJRIT6Q.js";
+} from "./chunk-BTV5BL4N.js";
 import {
   require_dc_polyfill
-} from "./chunk-DKR5EWDW.js";
+} from "./chunk-4L5E7Q4C.js";
 import {
   ATTR_SUPERBLOCKS_BASE_URL,
   ATTR_SUPERBLOCKS_CSB_ID,
@@ -54,10 +54,10 @@ import {
   SERVICE_NAME,
   getEnvironmentFromHostname,
   otlpBaseUrl
-} from "./chunk-RDYWEXME.js";
+} from "./chunk-IQ2YJIET.js";
 import {
   require_token_error
-} from "./chunk-6ZW6DTXI.js";
+} from "./chunk-ATL4D4HA.js";
 import {
   ROOT_CONTEXT,
   SpanKind,
@@ -70,7 +70,7 @@ import {
   metrics,
   propagation,
   trace
-} from "./chunk-TXGWVXL6.js";
+} from "./chunk-JVSS6SZH.js";
 import {
   __commonJS,
   __esm,
@@ -79,7 +79,7 @@ import {
   __toCommonJS,
   __toESM,
   init_cjs_shims
-} from "./chunk-42G3CDZT.js";
+} from "./chunk-R426MZT7.js";
 
 // ../../../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/internal/constants.js
 var require_constants2 = __commonJS({
@@ -5502,7 +5502,7 @@ var require_lodash = __commonJS({
             }
             return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
           });
-          function join45(array3, separator) {
+          function join46(array3, separator) {
             return array3 == null ? "" : nativeJoin.call(array3, separator);
           }
           function last3(array3) {
@@ -7426,7 +7426,7 @@ var require_lodash = __commonJS({
           lodash.isUndefined = isUndefined2;
           lodash.isWeakMap = isWeakMap;
           lodash.isWeakSet = isWeakSet;
-          lodash.join = join45;
+          lodash.join = join46;
           lodash.kebabCase = kebabCase;
           lodash.last = last3;
           lodash.lastIndexOf = lastIndexOf;
@@ -38426,7 +38426,7 @@ var require_quota_paywall = __commonJS({
     exports.AI_QUOTA_PAYWALL_REASON_CONFIG = {
       credit_limit_exceeded: {
         title: "Your organization has reached its AI usage limit",
-        subtitle: "Ask your admin to purchase additional AI credits to continue using Clark AI."
+        subtitle: "Ask your admin to purchase additional GAUs to continue using Clark AI."
       },
       no_seat_assigned: {
         title: "You don't have an AI Builder license",
@@ -38464,11 +38464,11 @@ var require_quota_paywall = __commonJS({
     exports.AI_QUOTA_PAYWALL_MIN_SEATS = 1;
     exports.AI_QUOTA_PAYWALL_MAX_SEATS = 100;
     exports.AI_QUOTA_PAYWALL_TEAMS_FEATURES = [
-      "100 AI Credits per AI Builder / month",
-      "Org-level credit top-ups, shared across team",
+      "100 GAUs per AI Builder / month",
+      "Org-level GAU top-ups, shared across team",
       "Clark AI agent for app building",
       "Clark User Memory",
-      "AI Credit Packs add-on available"
+      "GAU Packs add-on available"
     ];
     exports.AI_QUOTA_PAYWALL_ENTERPRISE_FEATURES = [
       "Clark Integration and Organization memory",
@@ -98056,15 +98056,15 @@ var require_api_files = __commonJS({
     exports.readAppApiYamlFile = readAppApiYamlFile4;
     exports.resolveLanguageSpecificStepContentFromBlocks = resolveLanguageSpecificStepContentFromBlocks2;
     async function writeApiFiles3(...args) {
-      const esmFunction = await import("./api-AE5SDDID.js");
+      const esmFunction = await import("./api-MNZPLV4E.js");
       return esmFunction.writeApiFiles(...args);
     }
     async function readAppApiYamlFile4(...args) {
-      const esmFunction = await import("./api-AE5SDDID.js");
+      const esmFunction = await import("./api-MNZPLV4E.js");
       return esmFunction.readAppApiYamlFile(...args);
     }
     async function resolveLanguageSpecificStepContentFromBlocks2(...args) {
-      const esmFunction = await import("./api-AE5SDDID.js");
+      const esmFunction = await import("./api-MNZPLV4E.js");
       return esmFunction.resolveLanguageSpecificStepContentFromBlocks(...args);
     }
   }
@@ -104752,19 +104752,19 @@ var require_getMachineId = __commonJS({
       if (!getMachineIdImpl) {
         switch (process5.platform) {
           case "darwin":
-            getMachineIdImpl = (await import("./getMachineId-darwin-ZVQM5NBT.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-darwin-WRUNLH62.js")).getMachineId;
             break;
           case "linux":
-            getMachineIdImpl = (await import("./getMachineId-linux-AHW4ADGP.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-linux-YACRTTHO.js")).getMachineId;
             break;
           case "freebsd":
-            getMachineIdImpl = (await import("./getMachineId-bsd-SNG6ZPCH.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-bsd-GF5JGAJM.js")).getMachineId;
             break;
           case "win32":
-            getMachineIdImpl = (await import("./getMachineId-win-RLT2QM63.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-win-UYZPCZAW.js")).getMachineId;
             break;
           default:
-            getMachineIdImpl = (await import("./getMachineId-unsupported-SHNJ2HMG.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-unsupported-YUCBAVFM.js")).getMachineId;
             break;
         }
       }
@@ -154337,7 +154337,7 @@ var require_safe_stable_stringify = __commonJS({
               return circularValue;
             }
             let res = "";
-            let join45 = ",";
+            let join46 = ",";
             const originalIndentation = indentation2;
             if (Array.isArray(value2)) {
               if (value2.length === 0) {
@@ -154351,7 +154351,7 @@ var require_safe_stable_stringify = __commonJS({
                 indentation2 += spacer;
                 res += `
 ${indentation2}`;
-                join45 = `,
+                join46 = `,
 ${indentation2}`;
               }
               const maximumValuesToStringify = Math.min(value2.length, maximumBreadth);
@@ -154359,13 +154359,13 @@ ${indentation2}`;
               for (; i2 < maximumValuesToStringify - 1; i2++) {
                 const tmp2 = stringifyFnReplacer(String(i2), value2, stack2, replacer, spacer, indentation2);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join45;
+                res += join46;
               }
               const tmp = stringifyFnReplacer(String(i2), value2, stack2, replacer, spacer, indentation2);
               res += tmp !== void 0 ? tmp : "null";
               if (value2.length - 1 > maximumBreadth) {
                 const removedKeys = value2.length - maximumBreadth - 1;
-                res += `${join45}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join46}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -154386,7 +154386,7 @@ ${originalIndentation}`;
             let separator = "";
             if (spacer !== "") {
               indentation2 += spacer;
-              join45 = `,
+              join46 = `,
 ${indentation2}`;
               whitespace2 = " ";
             }
@@ -154400,13 +154400,13 @@ ${indentation2}`;
               const tmp = stringifyFnReplacer(key3, value2, stack2, replacer, spacer, indentation2);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}:${whitespace2}${tmp}`;
-                separator = join45;
+                separator = join46;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...":${whitespace2}"${getItemCount(removedKeys)} not stringified"`;
-              separator = join45;
+              separator = join46;
             }
             if (spacer !== "" && separator.length > 1) {
               res = `
@@ -154447,7 +154447,7 @@ ${originalIndentation}`;
             }
             const originalIndentation = indentation2;
             let res = "";
-            let join45 = ",";
+            let join46 = ",";
             if (Array.isArray(value2)) {
               if (value2.length === 0) {
                 return "[]";
@@ -154460,7 +154460,7 @@ ${originalIndentation}`;
                 indentation2 += spacer;
                 res += `
 ${indentation2}`;
-                join45 = `,
+                join46 = `,
 ${indentation2}`;
               }
               const maximumValuesToStringify = Math.min(value2.length, maximumBreadth);
@@ -154468,13 +154468,13 @@ ${indentation2}`;
               for (; i2 < maximumValuesToStringify - 1; i2++) {
                 const tmp2 = stringifyArrayReplacer(String(i2), value2[i2], stack2, replacer, spacer, indentation2);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join45;
+                res += join46;
               }
               const tmp = stringifyArrayReplacer(String(i2), value2[i2], stack2, replacer, spacer, indentation2);
               res += tmp !== void 0 ? tmp : "null";
               if (value2.length - 1 > maximumBreadth) {
                 const removedKeys = value2.length - maximumBreadth - 1;
-                res += `${join45}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join46}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -154487,7 +154487,7 @@ ${originalIndentation}`;
             let whitespace2 = "";
             if (spacer !== "") {
               indentation2 += spacer;
-              join45 = `,
+              join46 = `,
 ${indentation2}`;
               whitespace2 = " ";
             }
@@ -154496,7 +154496,7 @@ ${indentation2}`;
               const tmp = stringifyArrayReplacer(key3, value2[key3], stack2, replacer, spacer, indentation2);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}:${whitespace2}${tmp}`;
-                separator = join45;
+                separator = join46;
               }
             }
             if (spacer !== "" && separator.length > 1) {
@@ -154554,20 +154554,20 @@ ${originalIndentation}`;
               indentation2 += spacer;
               let res2 = `
 ${indentation2}`;
-              const join46 = `,
+              const join47 = `,
 ${indentation2}`;
               const maximumValuesToStringify = Math.min(value2.length, maximumBreadth);
               let i2 = 0;
               for (; i2 < maximumValuesToStringify - 1; i2++) {
                 const tmp2 = stringifyIndent(String(i2), value2[i2], stack2, spacer, indentation2);
                 res2 += tmp2 !== void 0 ? tmp2 : "null";
-                res2 += join46;
+                res2 += join47;
               }
               const tmp = stringifyIndent(String(i2), value2[i2], stack2, spacer, indentation2);
               res2 += tmp !== void 0 ? tmp : "null";
               if (value2.length - 1 > maximumBreadth) {
                 const removedKeys = value2.length - maximumBreadth - 1;
-                res2 += `${join46}"... ${getItemCount(removedKeys)} not stringified"`;
+                res2 += `${join47}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               res2 += `
 ${originalIndentation}`;
@@ -154583,16 +154583,16 @@ ${originalIndentation}`;
               return '"[Object]"';
             }
             indentation2 += spacer;
-            const join45 = `,
+            const join46 = `,
 ${indentation2}`;
             let res = "";
             let separator = "";
             let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
             if (isTypedArrayWithEntries(value2)) {
-              res += stringifyTypedArray(value2, join45, maximumBreadth);
+              res += stringifyTypedArray(value2, join46, maximumBreadth);
               keys = keys.slice(value2.length);
               maximumPropertiesToStringify -= value2.length;
-              separator = join45;
+              separator = join46;
             }
             if (deterministic) {
               keys = sort(keys, comparator);
@@ -154603,13 +154603,13 @@ ${indentation2}`;
               const tmp = stringifyIndent(key3, value2[key3], stack2, spacer, indentation2);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key3)}: ${tmp}`;
-                separator = join45;
+                separator = join46;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-              separator = join45;
+              separator = join46;
             }
             if (separator !== "") {
               res = `
@@ -156083,7 +156083,7 @@ var require_buffer_list = __commonJS({
         }
       }, {
         key: "join",
-        value: function join45(s4) {
+        value: function join46(s4) {
           if (this.length === 0) return "";
           var p3 = this.head;
           var ret = "" + p3.data;
@@ -185967,8 +185967,8 @@ var require_get_vercel_oidc_token = __commonJS({
       }
       try {
         const [{ getTokenPayload, isExpired }, { refreshToken }] = await Promise.all([
-          await import("./token-util-SBIQNSCU.js"),
-          await import("./token-E3LBBH4N.js")
+          await import("./token-util-MH4U2T5O.js"),
+          await import("./token-342EBOW2.js")
         ]);
         if (!token2 || isExpired(getTokenPayload(token2))) {
           await refreshToken();
@@ -216927,14 +216927,14 @@ var require_lib8 = __commonJS({
     };
     var mixinPluginNames = Object.keys(mixinPlugins);
     var ExpressionParser = class extends LValParser {
-      checkProto(prop2, isRecord4, sawProto, refExpressionErrors) {
+      checkProto(prop2, isRecord5, sawProto, refExpressionErrors) {
         if (prop2.type === "SpreadElement" || this.isObjectMethod(prop2) || prop2.computed || prop2.shorthand) {
           return sawProto;
         }
         const key2 = prop2.key;
         const name16 = key2.type === "Identifier" ? key2.name : key2.value;
         if (name16 === "__proto__") {
-          if (isRecord4) {
+          if (isRecord5) {
             this.raise(Errors.RecordNoProto, key2);
             return true;
           }
@@ -217992,8 +217992,8 @@ var require_lib8 = __commonJS({
       parseTemplateSubstitution() {
         return this.parseExpression();
       }
-      parseObjectLike(close, isPattern, isRecord4, refExpressionErrors) {
-        if (isRecord4) {
+      parseObjectLike(close, isPattern, isRecord5, refExpressionErrors) {
+        if (isRecord5) {
           this.expectPlugin("recordAndTuple");
         }
         const oldInFSharpPipelineDirectBody = this.state.inFSharpPipelineDirectBody;
@@ -218018,9 +218018,9 @@ var require_lib8 = __commonJS({
             prop2 = this.parseBindingProperty();
           } else {
             prop2 = this.parsePropertyDefinition(refExpressionErrors);
-            sawProto = this.checkProto(prop2, isRecord4, sawProto, refExpressionErrors);
+            sawProto = this.checkProto(prop2, isRecord5, sawProto, refExpressionErrors);
           }
-          if (isRecord4 && !this.isObjectProperty(prop2) && prop2.type !== "SpreadElement") {
+          if (isRecord5 && !this.isObjectProperty(prop2) && prop2.type !== "SpreadElement") {
             this.raise(Errors.InvalidRecordProperty, prop2);
           }
           if (prop2.shorthand) {
@@ -218033,7 +218033,7 @@ var require_lib8 = __commonJS({
         let type = "ObjectExpression";
         if (isPattern) {
           type = "ObjectPattern";
-        } else if (isRecord4) {
+        } else if (isRecord5) {
           type = "RecordExpression";
         }
         return this.finishNode(node, type);
@@ -284031,14 +284031,14 @@ var require_lib15 = __commonJS({
     };
     var mixinPluginNames = Object.keys(mixinPlugins);
     var ExpressionParser = class extends LValParser {
-      checkProto(prop2, isRecord4, sawProto, refExpressionErrors) {
+      checkProto(prop2, isRecord5, sawProto, refExpressionErrors) {
         if (prop2.type === "SpreadElement" || this.isObjectMethod(prop2) || prop2.computed || prop2.shorthand) {
           return sawProto;
         }
         const key2 = prop2.key;
         const name16 = key2.type === "Identifier" ? key2.name : key2.value;
         if (name16 === "__proto__") {
-          if (isRecord4) {
+          if (isRecord5) {
             this.raise(Errors.RecordNoProto, key2);
             return true;
           }
@@ -285096,8 +285096,8 @@ var require_lib15 = __commonJS({
       parseTemplateSubstitution() {
         return this.parseExpression();
       }
-      parseObjectLike(close, isPattern, isRecord4, refExpressionErrors) {
-        if (isRecord4) {
+      parseObjectLike(close, isPattern, isRecord5, refExpressionErrors) {
+        if (isRecord5) {
           this.expectPlugin("recordAndTuple");
         }
         const oldInFSharpPipelineDirectBody = this.state.inFSharpPipelineDirectBody;
@@ -285122,9 +285122,9 @@ var require_lib15 = __commonJS({
             prop2 = this.parseBindingProperty();
           } else {
             prop2 = this.parsePropertyDefinition(refExpressionErrors);
-            sawProto = this.checkProto(prop2, isRecord4, sawProto, refExpressionErrors);
+            sawProto = this.checkProto(prop2, isRecord5, sawProto, refExpressionErrors);
           }
-          if (isRecord4 && !this.isObjectProperty(prop2) && prop2.type !== "SpreadElement") {
+          if (isRecord5 && !this.isObjectProperty(prop2) && prop2.type !== "SpreadElement") {
             this.raise(Errors.InvalidRecordProperty, prop2);
           }
           if (prop2.shorthand) {
@@ -285137,7 +285137,7 @@ var require_lib15 = __commonJS({
         let type = "ObjectExpression";
         if (isPattern) {
           type = "ObjectPattern";
-        } else if (isRecord4) {
+        } else if (isRecord5) {
           type = "RecordExpression";
         }
         return this.finishNode(node, type);
@@ -300067,7 +300067,7 @@ var require_BufferList = __commonJS({
         this.head = this.tail = null;
         this.length = 0;
       };
-      BufferList.prototype.join = function join45(s4) {
+      BufferList.prototype.join = function join46(s4) {
         if (this.length === 0) return "";
         var p3 = this.head;
         var ret = "" + p3.data;
@@ -329396,7 +329396,7 @@ var require_parse10 = __commonJS({
         extension: url4.getExtension(path81)
       };
       try {
-        const resolver = await readFile30(file2, options8, $refs);
+        const resolver = await readFile31(file2, options8, $refs);
         $ref.pathType = resolver.plugin.name;
         file2.data = resolver.result;
         const parser8 = await parseFile4(file2, options8, $refs);
@@ -329409,7 +329409,7 @@ var require_parse10 = __commonJS({
         throw err;
       }
     }
-    function readFile30(file2, options8, $refs) {
+    function readFile31(file2, options8, $refs) {
       return new Promise(((resolve14, reject) => {
         let resolvers = plugins.all(options8.resolve);
         resolvers = plugins.filter(resolvers, "canRead", file2);
@@ -347456,14 +347456,14 @@ var require_turndown_cjs = __commonJS({
         } else if (node.nodeType === 1) {
           replacement = replacementForNode.call(self2, node);
         }
-        return join45(output, replacement);
+        return join46(output, replacement);
       }, "");
     }
     function postProcess(output) {
       var self2 = this;
       this.rules.forEach(function(rule) {
         if (typeof rule.append === "function") {
-          output = join45(output, rule.append(self2.options));
+          output = join46(output, rule.append(self2.options));
         }
       });
       return output.replace(/^[\t\r\n]+/, "").replace(/[\t\r\n\s]+$/, "");
@@ -347475,7 +347475,7 @@ var require_turndown_cjs = __commonJS({
       if (whitespace2.leading || whitespace2.trailing) content19 = content19.trim();
       return whitespace2.leading + rule.replacement(content19, node, this.options) + whitespace2.trailing;
     }
-    function join45(output, replacement) {
+    function join46(output, replacement) {
       var s1 = trimTrailingNewlines(output);
       var s22 = trimLeadingNewlines(replacement);
       var nls = Math.max(output.length - s1.length, replacement.length - s22.length);
@@ -365785,7 +365785,7 @@ var require_snapshot_recorder = __commonJS({
   "../../../../node_modules/.pnpm/undici@7.28.0/node_modules/undici/lib/mock/snapshot-recorder.js"(exports, module) {
     "use strict";
     init_cjs_shims();
-    var { writeFile: writeFile24, readFile: readFile30, mkdir: mkdir28 } = __require("node:fs/promises");
+    var { writeFile: writeFile24, readFile: readFile31, mkdir: mkdir29 } = __require("node:fs/promises");
     var { dirname: dirname28, resolve: resolve14 } = __require("node:path");
     var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("node:timers");
     var { InvalidArgumentError: InvalidArgumentError2, UndiciError } = require_errors11();
@@ -365987,7 +365987,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError2("Snapshot path is required");
         }
         try {
-          const data3 = await readFile30(resolve14(path81), "utf8");
+          const data3 = await readFile31(resolve14(path81), "utf8");
           const parsed = JSON.parse(data3);
           if (Array.isArray(parsed)) {
             this.#snapshots.clear();
@@ -366017,7 +366017,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError2("Snapshot path is required");
         }
         const resolvedPath = resolve14(path81);
-        await mkdir28(dirname28(resolvedPath), { recursive: true });
+        await mkdir29(dirname28(resolvedPath), { recursive: true });
         const data3 = Array.from(this.#snapshots.entries()).map(([hash3, snapshot]) => ({
           hash: hash3,
           snapshot
@@ -444058,7 +444058,7 @@ var require_Str = __commonJS({
   "../../../../node_modules/.pnpm/prelude-ls@1.2.1/node_modules/prelude-ls/lib/Str.js"(exports, module) {
     init_cjs_shims();
     var split;
-    var join45;
+    var join46;
     var lines;
     var unlines;
     var words;
@@ -444073,7 +444073,7 @@ var require_Str = __commonJS({
     split = curry$(function(sep5, str) {
       return str.split(sep5);
     });
-    join45 = curry$(function(sep5, xs2) {
+    join46 = curry$(function(sep5, xs2) {
       return xs2.join(sep5);
     });
     lines = function(str) {
@@ -444132,7 +444132,7 @@ var require_Str = __commonJS({
     };
     module.exports = {
       split,
-      join: join45,
+      join: join46,
       lines,
       unlines,
       words,
@@ -460949,7 +460949,7 @@ var require_posix = __commonJS({
       if (isAbsolute8) return `/${path81}`;
       return path81;
     }
-    function join45(path81, ...paths) {
+    function join46(path81, ...paths) {
       if (path81 === void 0) return ".";
       if (path81 instanceof URL) {
         path81 = fromFileUrl(path81);
@@ -461427,7 +461427,7 @@ var require_posix = __commonJS({
     function joinGlobs(globs, options8 = {}) {
       const { globstar = false } = options8;
       if (!globstar || globs.length === 0) {
-        return join45(...globs);
+        return join46(...globs);
       }
       let joined;
       for (const glob3 of globs) {
@@ -461454,7 +461454,7 @@ var require_posix = __commonJS({
     exports.globToRegExp = globToRegExp;
     exports.isAbsolute = isAbsolute7;
     exports.isGlob = isGlob;
-    exports.join = join45;
+    exports.join = join46;
     exports.joinGlobs = joinGlobs;
     exports.normalize = normalize6;
     exports.normalizeGlob = normalizeGlob;
@@ -461855,7 +461855,7 @@ var require_windows = __commonJS({
       }
       return device + tail;
     }
-    function join45(path81, ...paths) {
+    function join46(path81, ...paths) {
       if (path81 instanceof URL) {
         path81 = fromFileUrl(path81);
       }
@@ -462501,7 +462501,7 @@ var require_windows = __commonJS({
     function joinGlobs(globs, options8 = {}) {
       const { globstar = false } = options8;
       if (!globstar || globs.length === 0) {
-        return join45(...globs);
+        return join46(...globs);
       }
       let joined;
       for (const glob3 of globs) {
@@ -462528,7 +462528,7 @@ var require_windows = __commonJS({
     exports.globToRegExp = globToRegExp;
     exports.isAbsolute = isAbsolute7;
     exports.isGlob = isGlob;
-    exports.join = join45;
+    exports.join = join46;
     exports.joinGlobs = joinGlobs;
     exports.normalize = normalize6;
     exports.normalizeGlob = normalizeGlob;
@@ -470728,7 +470728,7 @@ var require_config_loader = __commonJS({
        * @returns {Promise<{createJiti: Function|undefined, version: string;}>} A promise that fulfills with an object containing the jiti module's createJiti function and version.
        */
       static async loadJiti() {
-        const { createJiti } = await import("./jiti-7NQA6EIF.js");
+        const { createJiti } = await import("./jiti-ZYIUTG3C.js");
         const version3 = require_package5().version;
         return { createJiti, version: version3 };
       }
@@ -471057,7 +471057,7 @@ var require_eslint_helpers = __commonJS({
     }
     async function globMatch({ basePath, pattern }) {
       let found = false;
-      const { hfs } = await import("./src-JTYX334G.js");
+      const { hfs } = await import("./src-HQGEFTJ3.js");
       const patternToUse = normalizeToPosix(path81.relative(basePath, pattern));
       const matcher = new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       const walkSettings = {
@@ -471097,7 +471097,7 @@ var require_eslint_helpers = __commonJS({
         return new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       });
       const unmatchedPatterns = /* @__PURE__ */ new Set([...relativeToPatterns.keys()]);
-      const { hfs } = await import("./src-JTYX334G.js");
+      const { hfs } = await import("./src-HQGEFTJ3.js");
       const walk2 = hfs.walk(basePath, {
         async directoryFilter(entry) {
           if (!matchers.some((matcher) => matcher.match(entry.path, true))) {
@@ -474750,14 +474750,14 @@ Require stack:
     function isFilePath(nameOrPath) {
       return /^\.{1,2}[/\\]/u.test(nameOrPath) || path__default["default"].isAbsolute(nameOrPath);
     }
-    function readFile30(filePath) {
+    function readFile31(filePath) {
       return fs__default["default"].readFileSync(filePath, "utf8").replace(/^\ufeff/u, "");
     }
     function loadYAMLConfigFile(filePath) {
       debug$2(`Loading YAML config file: ${filePath}`);
       const yaml8 = require$1("js-yaml");
       try {
-        return yaml8.load(readFile30(filePath)) || {};
+        return yaml8.load(readFile31(filePath)) || {};
       } catch (e) {
         debug$2(`Error reading YAML file: ${filePath}`);
         e.message = `Cannot read config file: ${filePath}
@@ -474768,7 +474768,7 @@ Error: ${e.message}`;
     function loadJSONConfigFile(filePath) {
       debug$2(`Loading JSON config file: ${filePath}`);
       try {
-        return JSON.parse(stripComments__default["default"](readFile30(filePath)));
+        return JSON.parse(stripComments__default["default"](readFile31(filePath)));
       } catch (e) {
         debug$2(`Error reading JSON file: ${filePath}`);
         e.message = `Cannot read config file: ${filePath}
@@ -474785,7 +474785,7 @@ Error: ${e.message}`;
       debug$2(`Loading legacy config file: ${filePath}`);
       const yaml8 = require$1("js-yaml");
       try {
-        return yaml8.load(stripComments__default["default"](readFile30(filePath))) || /* istanbul ignore next */
+        return yaml8.load(stripComments__default["default"](readFile31(filePath))) || /* istanbul ignore next */
         {};
       } catch (e) {
         debug$2("Error reading YAML file: %s\n%o", filePath, e);
@@ -474826,7 +474826,7 @@ Error: ${e.message}`;
     function loadESLintIgnoreFile(filePath) {
       debug$2(`Loading .eslintignore file: ${filePath}`);
       try {
-        return readFile30(filePath).split(/\r?\n/gu).filter((line3) => line3.trim() !== "" && !line3.startsWith("#"));
+        return readFile31(filePath).split(/\r?\n/gu).filter((line3) => line3.trim() !== "" && !line3.startsWith("#"));
       } catch (e) {
         debug$2(`Error reading .eslintignore file: ${filePath}`);
         e.message = `Cannot read .eslintignore file: ${filePath}
@@ -505282,7 +505282,7 @@ var require_fs8 = __commonJS({
       };
       return data3;
     }
-    var readFile30 = exports.readFile = _gensync()({
+    var readFile31 = exports.readFile = _gensync()({
       sync: _fs().readFileSync,
       errback: _fs().readFile
     });
@@ -532476,7 +532476,7 @@ var require_view = __commonJS({
     var dirname28 = path81.dirname;
     var basename11 = path81.basename;
     var extname4 = path81.extname;
-    var join45 = path81.join;
+    var join46 = path81.join;
     var resolve14 = path81.resolve;
     module.exports = View;
     function View(name16, options8) {
@@ -532524,12 +532524,12 @@ var require_view = __commonJS({
     };
     View.prototype.resolve = function resolve15(dir, file2) {
       var ext2 = this.ext;
-      var path83 = join45(dir, file2);
+      var path83 = join46(dir, file2);
       var stat11 = tryStat(path83);
       if (stat11 && stat11.isFile()) {
         return path83;
       }
-      path83 = join45(dir, basename11(file2, ext2), "index" + ext2);
+      path83 = join46(dir, basename11(file2, ext2), "index" + ext2);
       stat11 = tryStat(path83);
       if (stat11 && stat11.isFile()) {
         return path83;
@@ -533009,7 +533009,7 @@ var require_send = __commonJS({
     var Stream2 = __require("stream");
     var util5 = __require("util");
     var extname4 = path81.extname;
-    var join45 = path81.join;
+    var join46 = path81.join;
     var normalize6 = path81.normalize;
     var resolve14 = path81.resolve;
     var sep5 = path81.sep;
@@ -533228,7 +533228,7 @@ var require_send = __commonJS({
           return res;
         }
         parts = path83.split(sep5);
-        path83 = normalize6(join45(root3, path83));
+        path83 = normalize6(join46(root3, path83));
       } else {
         if (UP_PATH_REGEXP.test(path83)) {
           debug3('malicious path "%s"', path83);
@@ -533363,7 +533363,7 @@ var require_send = __commonJS({
           if (err) return self2.onStatError(err);
           return self2.error(404);
         }
-        var p3 = join45(path83, self2._index[i2]);
+        var p3 = join46(path83, self2._index[i2]);
         debug3('stat "%s"', p3);
         fs39.stat(p3, function(err2, stat11) {
           if (err2) return next2(err2);
@@ -539506,7 +539506,7 @@ init_cjs_shims();
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.142-next.0",
+  version: "2.0.142-next.2",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
   license: "Superblocks Community Software License",
@@ -539863,7 +539863,7 @@ var config = void 0;
 var configured = false;
 var ddTracePromise = void 0;
 async function getDdTrace() {
-  ddTracePromise ??= import("./dd-trace-AR2756K7.js").then((module) => module.default);
+  ddTracePromise ??= import("./dd-trace-6WP6ICAN.js").then((module) => module.default);
   return await ddTracePromise;
 }
 var deploymentType = (() => {
@@ -573754,7 +573754,7 @@ var MAX_ATTRIBUTE_LENGTH = 64e3;
 var LLMObsSpanWriter = null;
 async function loadLLMObsSpanWriter() {
   if (!LLMObsSpanWriter) {
-    const module = await import("./spans-VP4ANRE4.js");
+    const module = await import("./spans-YUASCP6K.js");
     LLMObsSpanWriter = module.default;
   }
   return LLMObsSpanWriter;
@@ -596847,7 +596847,7 @@ function buildIntegrationDocumentation(integrationIds, services) {
         `**IMPORTANT \u2014 Correct import name**: \`import { ${sdkName} } from "@superblocksteam/sdk-api"\`. Do NOT use \`${plugin.id}\` as the import \u2014 the correct SDK export is \`${sdkName}\`.`,
         ""
       ] : [],
-      "**SDK access**: In your API `run` function, use the **key name** you declared: `ctx.integrations.<name>` (e.g. `ctx.integrations.db`). Do not use the integration ID when accessing\u2014only when declaring the integration.",
+      "**SDK access**: In your API `run` function, use the **key name** you declared: `ctx.integrations.<key>` (e.g. `ctx.integrations.orders_db`). Prefer a descriptive key derived from the integration/database name, not a generic `db`. Do not use the integration ID when accessing\u2014only when declaring the integration.",
       "",
       "### TypeScript Type Definition",
       "```typescript",
@@ -597354,6 +597354,32 @@ async function getSdkRootReadmeDocumentation() {
     return "";
   }
 }
+var SDK_INTEGRATIONS_KEY_GUIDANCE = [
+  "## Integrations map keys (CRITICAL \u2014 read before README examples)",
+  "",
+  "SDK README snippets below often use a generic `db` key for brevity. Treat those as **placeholders only**. When the integration already has a meaningful display name / Native DB `logicalName`, you MUST use a descriptive `integrations` map key instead \u2014 that key is what appears in generated code and TraceView.",
+  "",
+  "**Derive a valid JS identifier (lowercase snake_case):**",
+  "1. Lowercase the display name / `logicalName`.",
+  "2. Replace spaces, hyphens, and other non-alphanumeric characters with `_`; collapse repeated `_`.",
+  "3. If the result starts with a digit, prefix `db_` (e.g. `2024_orders` \u2192 `db_2024_orders`).",
+  "4. If the result is empty or a JS reserved word (`default`, `class`, `function`, \u2026), prefix `db_`.",
+  "5. Examples: `pokemon_tracker` \u2192 `pokemon_tracker`; `Orders DB` \u2192 `orders_db`; `Order's DB!` \u2192 `orders_db`.",
+  "",
+  "**Collisions:** If two integrations would derive the same key, disambiguate (e.g. append `_2` or a short plugin/type suffix like `_pg`) so every object key is unique. Duplicate keys silently drop a binding.",
+  "",
+  "In `run()`, access via `ctx.integrations.<key>` (e.g. `ctx.integrations.pokemon_tracker`). Use the integration ID only in the declaration (`postgres(UUID)`), never for access."
+].join("\n");
+function withIntegrationsKeyGuidance(documentation) {
+  const guidance = SDK_INTEGRATIONS_KEY_GUIDANCE.trim();
+  const base = documentation.trim();
+  if (!base) {
+    return guidance;
+  }
+  return `${guidance}
+
+${base}`;
+}
 function normalizeSemVer(version3) {
   return version3 && /^\d+\.\d+\.\d+$/.test(version3) ? version3 : void 0;
 }
@@ -597447,13 +597473,13 @@ ALWAYS call this tool:
     const requestedPluginIds = resolveRequestedPluginIds(integrationIds, pluginIds, services);
     if (requestedPluginIds.length === 0) {
       return {
-        documentation: await getSdkRootReadmeDocumentation(),
+        documentation: withIntegrationsKeyGuidance(await getSdkRootReadmeDocumentation()),
         plugins: []
       };
     }
     const { documentation, plugins: resolvedPlugins } = await buildSdkPluginReadmeDocumentation(requestedPluginIds, services);
     return {
-      documentation,
+      documentation: withIntegrationsKeyGuidance(documentation),
       plugins: resolvedPlugins
     };
   },
@@ -602447,6 +602473,9 @@ var buildManageChecklistToolFactory = createToolFactory("build_manageChecklist",
           };
         }
         case "clear": {
+          if (isV2ToV3MigrationInProgress(checklistState)) {
+            throw new Error("Cannot clear the checklist during an active 2.0 -> 3.0 migration. Mark items as 'failed' (with a failureReason) or 'cancelled' instead so the finalize checklist and Finish migration button remain intact.");
+          }
           await clearChecklist({
             appRootDirPath: services.appRootDirPath
           });
@@ -611762,6 +611791,7 @@ function defineBackgroundTaskFactory(metadata) {
       const status = handle.initialStatus;
       const message = "message" in status ? status.message : void 0;
       const error40 = "error" in status ? status.error : void 0;
+      const detail = status.state === "failed" ? status.detail : void 0;
       const result = {
         taskId: handle.taskId,
         state: status.state,
@@ -611771,6 +611801,8 @@ function defineBackgroundTaskFactory(metadata) {
         result.message = message;
       if (error40 !== void 0)
         result.error = error40;
+      if (detail !== void 0)
+        result.detail = detail;
       return result;
     }
   }));
@@ -611969,7 +612001,7 @@ function assertCredentialRefDoesNotContainRawMaterial(value2) {
 
 // ../../../vite-plugin-file-sync/dist/ai-service/agent/tools/databases/dev-database-tasks.js
 var databaseRequirementSchema = external_exports.object({
-  logicalName: external_exports.string().min(1).describe("The app-local database name"),
+  logicalName: external_exports.string().min(1).describe("The app-local database name. Becomes the lifecycle integration's display name. When wiring SDK APIs, derive a valid lowercase snake_case integrations map key from this name (replace non-alphanumeric with _, prefix db_ if empty/digit-leading/reserved; disambiguate collisions). Examples: 'pokemon_tracker' \u2192 pokemon_tracker; 'Orders DB' \u2192 orders_db. Do not use a generic key like 'db'."),
   migrationDirectory: external_exports.string().optional().describe("Repo-relative path to the directory holding the app's SQL migrations. Set this explicitly when provisionDatabase should enable startApplyDevDatabaseMigrations; `db/migrations/` is the recommended convention. Files inside must match `<digits>_<description>.sql` (e.g. `0001_init.sql`, `0002_add_users.sql`); the leading digits are the sort key and the runner applies them in lexicographic order against the in-DB ledger.")
 });
 var provisionInputSchema = external_exports.object({
@@ -611981,6 +612013,11 @@ var provisionHandleSchema = external_exports.object({
   integrationId: external_exports.string().optional(),
   lifecycleState: external_exports.string().optional(),
   logicalName: external_exports.string().optional(),
+  // Correlates to the server-side lifecycle_request row for oncall/debug
+  // (mirrors ApplyMigrationsHandle). Persisted on the task handle so
+  // classified failures still carry a durable request id even when the
+  // user-facing error string omits it.
+  requestId: external_exports.string().min(1).optional(),
   requirement: databaseRequirementSchema
 });
 var applyMigrationsInputSchema = external_exports.object({
@@ -612001,7 +612038,7 @@ var provisionDevDatabaseTaskMetadata = {
   // dev environment name are platform-controlled, so they're not in the
   // input. BG wrapping (taskId, don't waitForTask, check first) is the
   // only behavioral delta from master.
-  description: "Create or reuse a lifecycle-managed dev database binding for this application on Amazon RDS as a BACKGROUND TASK. Clark provisions the database and returns lifecycle progress. Returns a taskId IMMEDIATELY while RDS provisioning runs in the background; the user already sees live progress in the chat's background-tasks indicator. DO NOT call waitForTask right after this \u2014 that defeats the whole point of a background task and blocks your turn for minutes while RDS spins up. Instead: keep working on whatever does NOT depend on the database (scaffold the UI, draft API code that will use the binding, write or read SQL migration files, plan next steps). When you reach a step that genuinely cannot proceed without the connection details, FIRST call checkTask({ taskId }) \u2014 it returns instantly. Only fall back to waitForTask if checkTask still reports state='running' AND you literally have no other useful work to do. On completion the result includes bindingKey, integrationId, lifecycleState, connectionMetadata, and credentialRefs. Use integrationId only for tool inputs or generated source code such as postgres(...); do not repeat internal UUIDs in user-facing chat. This task ONLY creates the database server + an integration; it does NOT apply SQL migrations \u2014 query attempts will fail with `relation \"X\" does not exist` until you call startApplyDevDatabaseMigrations. Cancellation only stops local polling; the underlying RDS provisioning continues on the server.",
+  description: "Create or reuse a lifecycle-managed dev database binding for this application on Amazon RDS as a BACKGROUND TASK. Clark provisions the database and returns lifecycle progress. Returns a taskId IMMEDIATELY while RDS provisioning runs in the background; the user already sees live progress in the chat's background-tasks indicator. DO NOT call waitForTask right after this \u2014 that defeats the whole point of a background task and blocks your turn for minutes while RDS spins up. Instead: keep working on whatever does NOT depend on the database (scaffold the UI, draft API code that will use the binding, write or read SQL migration files, plan next steps). When you reach a step that genuinely cannot proceed without the connection details, FIRST call checkTask({ taskId }) \u2014 it returns instantly. Only fall back to waitForTask if checkTask still reports state='running' AND you literally have no other useful work to do. On completion the result includes bindingKey, integrationId, lifecycleState, connectionMetadata, and credentialRefs. Use integrationId only for tool inputs or generated source code such as postgres(...); do not repeat internal UUIDs in user-facing chat. When declaring the integration in an SDK API, derive a valid lowercase snake_case integrations map key from requirement.logicalName (normalize non-alphanumeric to _, prefix db_ if needed, disambiguate collisions; e.g. pokemon_tracker \u2192 pokemon_tracker: postgres(POKEMON_TRACKER), Orders DB \u2192 orders_db) so code and TraceView match the database name \u2014 never a generic key like db. This task ONLY creates the database server + an integration; it does NOT apply SQL migrations \u2014 query attempts will fail with `relation \"X\" does not exist` until you call startApplyDevDatabaseMigrations. Cancellation only stops local polling; the underlying RDS provisioning continues on the server.",
   externalHandleSchema: provisionHandleSchema,
   inputSchema: provisionInputSchema,
   name: "provisionDatabase",
@@ -612037,30 +612074,99 @@ function toToolError(error40) {
   }
   return error40 instanceof Error ? error40 : new Error(String(error40));
 }
-function lifecycleStatusFor(response) {
+var LIFECYCLE_FAILURE_USER_MESSAGE = {
+  "dev database provisioning": {
+    backend_locked: "Database setup is briefly busy. Try again in a moment.",
+    callback_failed: "Database setup didn't finish reporting status. Try again.",
+    credential_resolution_failed: "Database setup couldn't access required credentials. Contact your admin, then try again.",
+    migration_failed: "A database schema update failed. Check your migration SQL, then try again.",
+    policy_blocked: "Your organization blocked this database operation. Contact your admin.",
+    terraform_failed: "Cloud database setup failed. Check cloud credentials with your admin, then try again.",
+    unsupported_provider_capability: "This database operation isn't supported in your environment. Contact your admin."
+  },
+  "applying migrations": {
+    backend_locked: "Database schema update is briefly busy. Try again in a moment.",
+    callback_failed: "Database schema update didn't finish reporting status. Try again.",
+    credential_resolution_failed: "Database schema update couldn't access required credentials. Contact your admin, then try again.",
+    migration_failed: "A database schema update failed. Check your migration SQL, then try again.",
+    policy_blocked: "Your organization blocked this database operation. Contact your admin.",
+    terraform_failed: "Cloud database setup failed. Check cloud credentials with your admin, then try again.",
+    unsupported_provider_capability: "This database operation isn't supported in your environment. Contact your admin."
+  }
+};
+var LIFECYCLE_FAILURE_AGENT_GUIDANCE = {
+  "dev database provisioning": {
+    backend_locked: "This is usually transient; retry the provisioning task.",
+    callback_failed: "The agent failed to report a terminal result; retry, and check the database-lifecycle worker if it persists.",
+    credential_resolution_failed: "Credentials could not be resolved for the worker; verify secrets configuration, then retry.",
+    migration_failed: "A schema migration failed during provisioning; inspect the migration SQL, fix it, then retry the provisioning task.",
+    policy_blocked: "An organization policy blocked this operation; adjust policy or agent capability coverage, then retry.",
+    terraform_failed: "Infrastructure provisioning failed on the agent; verify OPA/database-lifecycle worker setup and cloud credentials, then retry.",
+    unsupported_provider_capability: "The agent does not support this database operation; update OPA lifecycle configuration, then retry."
+  },
+  "applying migrations": {
+    backend_locked: "This is usually transient; retry startApplyDevDatabaseMigrations.",
+    callback_failed: "The agent failed to report a terminal result; retry startApplyDevDatabaseMigrations, and check the database-lifecycle worker if it persists.",
+    credential_resolution_failed: "Credentials could not be resolved for the worker; verify secrets configuration, then retry startApplyDevDatabaseMigrations.",
+    migration_failed: "A schema migration failed; inspect the migration SQL, fix it, then retry startApplyDevDatabaseMigrations.",
+    policy_blocked: "An organization policy blocked this operation; adjust policy or agent capability coverage, then retry.",
+    terraform_failed: "Infrastructure provisioning failed on the agent; verify OPA/database-lifecycle worker setup and cloud credentials, then retry.",
+    unsupported_provider_capability: "The agent does not support this database operation; update OPA lifecycle configuration, then retry."
+  }
+};
+var LIFECYCLE_FAILURE_FIELD_MAX_LEN = 100;
+function sanitizeLifecycleFailureField(value2) {
+  const scrubbed = stripUnsafeChars(scrubSecrets(value2)).trim();
+  return scrubbed.length > LIFECYCLE_FAILURE_FIELD_MAX_LEN ? `${scrubbed.slice(0, LIFECYCLE_FAILURE_FIELD_MAX_LEN)}\u2026` : scrubbed;
+}
+function formatLifecycleTaskFailure(action, response, fallbackRequestId) {
+  const code = response.errorCode ? sanitizeLifecycleFailureField(response.errorCode) : "";
+  const message = response.errorMessage ? sanitizeLifecycleFailureField(response.errorMessage) : "";
+  const rawRequestId = response.requestId || fallbackRequestId || "";
+  const requestId = rawRequestId ? sanitizeLifecycleFailureField(rawRequestId) : "";
+  const requestSuffix = requestId ? `, request ${requestId}` : "";
+  let detail;
+  if (code && message) {
+    detail = `${action} failed (${code}${requestSuffix}): ${message}`;
+  } else if (message) {
+    detail = requestId ? `${action} failed (request ${requestId}): ${message}` : `${action} failed: ${message}`;
+  } else if (code) {
+    detail = `${action} failed (${code}${requestSuffix})`;
+  } else if (requestId) {
+    detail = `${action} failed (request ${requestId})`;
+  } else {
+    detail = `${action} failed`;
+  }
+  const agentGuidance = code ? LIFECYCLE_FAILURE_AGENT_GUIDANCE[action][code] : void 0;
+  if (agentGuidance) {
+    detail = `${detail}. ${agentGuidance}`;
+  }
+  const userDefault = action === "applying migrations" ? "A database schema update failed. Try again, or contact support if it keeps happening." : "Database setup failed. Try again, or contact support if it keeps happening.";
+  const error40 = (code ? LIFECYCLE_FAILURE_USER_MESSAGE[action][code] : void 0) ?? userDefault;
+  return { error: error40, detail };
+}
+function lifecycleStatusFor(response, fallbackRequestId) {
   switch (response.lifecycleState) {
     case "ready":
       return { state: "completed", result: response };
-    case "failed":
-      return {
-        state: "failed",
-        error: `dev database provisioning failed (request ${response.requestId})`
-      };
+    case "failed": {
+      const { error: error40, detail } = formatLifecycleTaskFailure("dev database provisioning", response, fallbackRequestId);
+      return { state: "failed", error: error40, detail };
+    }
     case "cancelled":
       return { state: "cancelled" };
     default:
       return { state: "running", message: response.lifecycleState };
   }
 }
-function migrationStatusFor(response) {
+function migrationStatusFor(response, fallbackRequestId) {
   switch (response.migrationState) {
     case "migrated":
       return { state: "completed", result: response };
-    case "failed":
-      return {
-        state: "failed",
-        error: `applying migrations failed (request ${response.requestId})`
-      };
+    case "failed": {
+      const { error: error40, detail } = formatLifecycleTaskFailure("applying migrations", response, fallbackRequestId);
+      return { state: "failed", error: error40, detail };
+    }
     case "pending":
     default:
       return { state: "running", message: response.migrationState };
@@ -612074,6 +612180,9 @@ function updateProvisionHandleFromResponse(handle, response) {
   handle.integrationId = response.integrationId;
   handle.lifecycleState = response.lifecycleState;
   handle.logicalName = response.logicalName;
+  if (response.requestId) {
+    handle.requestId = response.requestId;
+  }
 }
 function createDevDatabaseTaskTypes(deps) {
   const provisionDevDatabaseTaskType = {
@@ -612130,7 +612239,7 @@ function createDevDatabaseTaskTypes(deps) {
         throw toToolError(error40);
       }
       updateProvisionHandleFromResponse(handle, response);
-      return lifecycleStatusFor(response);
+      return lifecycleStatusFor(response, handle.requestId);
     }
   };
   const applyDevDatabaseMigrationsTaskType = {
@@ -612177,7 +612286,7 @@ function createDevDatabaseTaskTypes(deps) {
       if (response.migrationState === "failed") {
         return {
           externalHandle: handle,
-          initialStatus: migrationStatusFor(response),
+          initialStatus: migrationStatusFor(response, handle.requestId),
           label: label2
         };
       }
@@ -612197,9 +612306,9 @@ function createDevDatabaseTaskTypes(deps) {
         throw toToolError(error40);
       }
       if (TERMINAL_LIFECYCLE_STATES.has(response.lifecycleState) && response.lifecycleState !== "ready") {
-        return lifecycleStatusFor(response);
+        return lifecycleStatusFor(response, handle.requestId);
       }
-      return migrationStatusFor(response);
+      return migrationStatusFor(response, handle.requestId);
     }
   };
   return {
@@ -646666,6 +646775,7 @@ init_esm();
 var METER_NAME10 = "superblocks.clark.context";
 var METRIC_LOAD_DURATION = "superblocks.clark.context.load_duration_seconds";
 var METRIC_PERSIST_DURATION = "superblocks.clark.context.persist_duration_seconds";
+var METRIC_LOAD_OUTCOMES = "superblocks.clark.context.load_outcomes_total";
 var METRIC_FILE_BYTES = "superblocks.clark.context.file_bytes";
 var METRIC_RESTORE_EMPTY_CREATED = "superblocks.clark.context.restore_empty_created_total";
 var METRIC_ATTACHMENT_PERSIST = "superblocks.clark.context.attachment_persist_total";
@@ -646759,6 +646869,10 @@ var ClarkContextMetrics = class {
         unit: "s",
         advice: { explicitBucketBoundaries: DURATION_BUCKETS_SECONDS2 }
       }),
+      loadOutcomesCounter: meter.createCounter(METRIC_LOAD_OUTCOMES, {
+        description: "Count of Clark context loads by final low-cardinality outcome.",
+        unit: "{load}"
+      }),
       restoreEmptyCreatedCounter: meter.createCounter(METRIC_RESTORE_EMPTY_CREATED, {
         description: "Count of remote context restore attempts that still created a new empty Clark context.",
         unit: "{restore}"
@@ -646815,14 +646929,20 @@ var ClarkContextMetrics = class {
       trigger: input.trigger
     });
   }
-  recordFileBytes(input) {
-    this.getInstruments().fileBytesHistogram.record(Math.max(0, input.bytes), {
-      operation: input.operation
+  recordLoadOutcome(input) {
+    this.getInstruments().loadOutcomesCounter.add(1, {
+      outcome: input.outcome,
+      source: input.source
     });
   }
   recordRestoreEmptyCreated() {
     this.getInstruments().restoreEmptyCreatedCounter.add(1);
   }
+  recordFileBytes(input) {
+    this.getInstruments().fileBytesHistogram.record(Math.max(0, input.bytes), {
+      operation: input.operation
+    });
+  }
   recordAttachmentPersist(input) {
     this.getInstruments().attachmentPersistCounter.add(1, {
       status: input.status
@@ -646882,15 +647002,18 @@ function recordContextLoad(input) {
 function recordContextPersist(input) {
   clarkContextMetrics.recordPersist(input);
 }
+function recordContextLoadOutcome(input) {
+  clarkContextMetrics.recordLoadOutcome(input);
+}
+function recordContextRestoreEmptyCreated() {
+  clarkContextMetrics.recordRestoreEmptyCreated();
+}
 function recordContextFileBytes(input) {
   clarkContextMetrics.recordFileBytes(input);
 }
 function recordContextDocuments(input) {
   clarkContextMetrics.recordDocuments(input);
 }
-function recordContextRestoreEmptyCreated() {
-  clarkContextMetrics.recordRestoreEmptyCreated();
-}
 function recordAttachmentPersist(input) {
   clarkContextMetrics.recordAttachmentPersist(input);
 }
@@ -653049,15 +653172,17 @@ var ContextManagerV2 = class {
       logger18.info(`Loading context '${id2.name}' from storage...`);
       const loadStartedAt = performance.now();
       try {
-        const { record: record2, source: source2, migrationRan, migrationFailed } = await this.loadRecord(id2);
+        const { record: record2, source: source2, migrationRan, migrationFailed, loadOutcome } = await this.loadRecord(id2);
         const loadMs = Math.round(performance.now() - loadStartedAt);
+        const outcome = loadOutcome ?? this.getLoadOutcome(record2, source2);
         tracer3.annotate(span, {
           tags: { source: source2 },
           metadata: {
             durationMs: loadMs,
             messageCount: record2?.messages.length ?? 0,
             migrationFailed,
-            migrationRan
+            migrationRan,
+            outcome
           }
         });
         recordContextLoad({
@@ -653065,6 +653190,10 @@ var ContextManagerV2 = class {
           durationMs: loadMs,
           identity: metricIdentity
         });
+        recordContextLoadOutcome({
+          source: source2,
+          outcome
+        });
         return { record: record2, loadMs };
       } catch (error40) {
         tracer3.annotate(span, { error: error40 });
@@ -653137,13 +653266,36 @@ var ContextManagerV2 = class {
         }
         logger18.warn(`Remote restore attempted for '${id2.name}' but returned no context record; creating a new empty context`);
         recordContextRestoreEmptyCreated();
+        return {
+          record: void 0,
+          source: "remote",
+          migrationRan,
+          migrationFailed,
+          loadOutcome: "missing_archive"
+        };
       } catch (err) {
         logger18.warn(`Remote restore fallback failed for '${id2.name}': ${err}`);
         recordContextRestoreEmptyCreated();
+        return {
+          record: void 0,
+          source: "remote",
+          migrationRan,
+          migrationFailed,
+          loadOutcome: "restore_failed"
+        };
       }
     }
     return { record: void 0, source: "new", migrationRan, migrationFailed };
   }
+  getLoadOutcome(record2, source2) {
+    if (record2) {
+      return record2.messages.length > 0 ? "success_non_empty" : "success_empty";
+    }
+    if (source2 === "remote") {
+      return "missing_archive";
+    }
+    return "created_empty";
+  }
   /**
    * Gets an already-loaded context without async operations.
    * For use by tools executing within an LLM stream where context is already loaded.
@@ -658449,7 +658601,7 @@ var PlaywrightMcpServerManager = class {
       this.logger.info(`Starting embedded Playwright MCP server: browser=${options8?.browser || "chromium"}, headless=${options8?.headless !== false}`);
     }
     try {
-      const { startEmbeddedPlaywrightMcpServer } = await import("./embedded-playwright-mcp-server-IB6ZRN45.js");
+      const { startEmbeddedPlaywrightMcpServer } = await import("./embedded-playwright-mcp-server-UZV5UV7C.js");
       this.server = await startEmbeddedPlaywrightMcpServer({
         storageStatePath: options8?.storageStatePath,
         jwt: options8?.jwt,
@@ -658600,6 +658752,7 @@ var METER_NAME12 = "superblocks.migration";
 var METRIC_OUTCOMES2 = "migration.autodispatch.outcome";
 var BUSY_REASON_PREFIX = "busy:";
 var STATIC_OUTCOME_REASONS = /* @__PURE__ */ new Set([
+  "already-settled",
   "already-triggered",
   "awaiting-interactive-response",
   "checklist-unavailable",
@@ -658773,6 +658926,70 @@ async function isMigrationSessionActive(appRootDirPath) {
   }
 }
 
+// ../../../vite-plugin-file-sync/dist/ai-service/migration-turns-log.js
+init_cjs_shims();
+import { appendFile as appendFile2, mkdir as mkdir15, readFile as readFile17, rm as rm12 } from "node:fs/promises";
+import { join as join24 } from "node:path";
+var SCRATCH_DIR_NAME3 = "scratch";
+var MIGRATION_TURNS_LOG_FILE = "migration-turns.jsonl";
+function migrationTurnsLogPath(appRootDirPath) {
+  return join24(appRootDirPath, SCRATCH_DIR_NAME3, MIGRATION_TURNS_LOG_FILE);
+}
+function isRecord4(value2) {
+  return typeof value2 === "object" && value2 !== null;
+}
+async function appendRecord(appRootDirPath, record2) {
+  const logPath = migrationTurnsLogPath(appRootDirPath);
+  await mkdir15(join24(appRootDirPath, SCRATCH_DIR_NAME3), { recursive: true });
+  await appendFile2(logPath, `${JSON.stringify(record2)}
+`, "utf8");
+}
+async function recordMigrationTurnDispatched(appRootDirPath, entry) {
+  await appendRecord(appRootDirPath, {
+    at: (/* @__PURE__ */ new Date()).toISOString(),
+    event: "dispatched",
+    ...entry
+  });
+}
+async function recordMigrationTurnSettled(appRootDirPath, entry) {
+  await appendRecord(appRootDirPath, {
+    at: (/* @__PURE__ */ new Date()).toISOString(),
+    event: "settled",
+    ...entry
+  });
+}
+async function readMigrationTurnRecords(appRootDirPath) {
+  let raw;
+  try {
+    raw = await readFile17(migrationTurnsLogPath(appRootDirPath), "utf8");
+  } catch {
+    return [];
+  }
+  const records = [];
+  for (const line3 of raw.split("\n")) {
+    const trimmed2 = line3.trim();
+    if (!trimmed2) {
+      continue;
+    }
+    try {
+      const parsed = JSON.parse(trimmed2);
+      if (!isRecord4(parsed) || parsed.event !== "dispatched" && parsed.event !== "settled") {
+        continue;
+      }
+      records.push(parsed);
+    } catch {
+    }
+  }
+  return records;
+}
+async function hasSettledNormalMigrationTurn(appRootDirPath) {
+  const records = await readMigrationTurnRecords(appRootDirPath);
+  return records.some((record2) => record2.event === "settled" && record2.retryMode === "none" && record2.outcome === "success");
+}
+async function clearMigrationTurnsLog(appRootDirPath) {
+  await rm12(migrationTurnsLogPath(appRootDirPath), { force: true });
+}
+
 // ../../../vite-plugin-file-sync/dist/ai-service/policy-gate-step.js
 init_cjs_shims();
 var HIDDEN_TOOLS = /* @__PURE__ */ new Set(["reportReviewRun"]);
@@ -661372,7 +661589,7 @@ Before writing ANY API, you MUST:
    - Do NOT read SDK documentation directly from filesystem files; fetch documentation through \`getSdkApiDocs\` only
 
 **Trace Metadata:**
-All integration client methods accept an optional \`metadata\` parameter as the last argument: \`{ label?: string, description?: string }\`. When \`includeDiagnostics\` is enabled, this metadata appears in the trace view. Always include a \`label\` on each integration call to make traces readable. Example: \`ctx.integrations.db.query(sql, Schema, params, { label: "Fetch active users" })\`.
+All integration client methods accept an optional \`metadata\` parameter as the last argument: \`{ label?: string, description?: string }\`. When \`includeDiagnostics\` is enabled, this metadata appears in the trace view. Always include a \`label\` on each integration call to make traces readable. Example: \`ctx.integrations.orders_db.query(sql, Schema, params, { label: "Fetch active users" })\`.
 
 **CRITICAL - Method Validation:**
 Before calling ANY integration client method, you MUST:
@@ -661392,22 +661609,23 @@ Before creating APIs with new integrations:
 </integrations_and_data_sources>
 
 <integration_ids>
-**CRITICAL: Integration IDs**
+**CRITICAL: Integration IDs and map keys**
 
 When using integrations in SDK APIs:
 1. **Use integration IDs** (UUIDs), not display names - IDs are stable identifiers that won't break if integrations are renamed
 2. **Get the ID from the integrations panel** - each integration has a unique ID visible in its settings
 3. **Store IDs in constants** with descriptive names at the top of the API file for clarity
+4. **Choose a descriptive \`integrations\` map key** \u2014 a valid JS identifier derived from the integration's display name / Native DB \`logicalName\` (lowercase snake_case). Normalize: lowercase \u2192 replace non-alphanumeric with \`_\` \u2192 collapse \`_\` \u2192 if empty/starts with a digit/reserved word, prefix \`db_\`. Examples: \`pokemon_tracker\` \u2192 \`pokemon_tracker\`; \`Orders DB\` \u2192 \`orders_db\`; \`2024-orders\` \u2192 \`db_2024_orders\`. If two integrations would share a key, disambiguate (e.g. \`orders_db\` / \`orders_db_2\`). Do **not** use a generic placeholder like \`db\` when the integration already has a meaningful name \u2014 that key is what appears in generated code and TraceView. SDK README examples that use \`db\` are placeholders only.
 
 Example:
 \`\`\`typescript
 // Store integration IDs in constants with descriptive names
-const PROD_POSTGRES = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr";
+const ORDERS_DB = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr";
 const OPS_SLACK = "e5f6g7h8-1234-56ab-cdef-ghijklmnopqr";
 
 export default api({
   integrations: {
-    db: postgres(PROD_POSTGRES),
+    orders_db: postgres(ORDERS_DB),
     notifier: slack(OPS_SLACK),
   },
   // ...
@@ -661416,7 +661634,7 @@ export default api({
 
 **NEVER use integration display names** like \`postgres("Production Postgres")\` - always use the UUID.
 
-**Access in run(): use \`ctx.integrations.<name>\` pattern.** In your API \`run\` function, access each integration by the **key name** you declared in \`integrations\`, not by integration ID. Example: \`integrations: { db: postgres(PROD_POSTGRES), notifier: slack(OPS_SLACK) }\` \u2192 use \`ctx.integrations.db\` and \`ctx.integrations.notifier\`. The integration ID (UUID) is only for the declaration (e.g. \`postgres(UUID)\`); access is always \`ctx.integrations.<key>\`.
+**Access in run(): use \`ctx.integrations.<key>\` pattern.** In your API \`run\` function, access each integration by the **key name** you declared in \`integrations\`, not by integration ID. Example: \`integrations: { orders_db: postgres(ORDERS_DB), notifier: slack(OPS_SLACK) }\` \u2192 use \`ctx.integrations.orders_db\` and \`ctx.integrations.notifier\`. The integration ID (UUID) is only for the declaration (e.g. \`postgres(UUID)\`); access is always \`ctx.integrations.<key>\`.
 </integration_ids>
 
 <creating_and_editing_apis>
@@ -661463,7 +661681,7 @@ You must NEVER attempt to rely on frontend data for security-critical operations
 import { api, z, postgres } from "@superblocksteam/sdk-api";
 
 // Integration IDs from the integrations panel - store in constants with descriptive names
-const PROD_POSTGRES = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr";
+const USERS_DB = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr";
 
 const UserSchema = z.object({
   id: z.string(),
@@ -661480,9 +661698,10 @@ export default api({
   // REQUIRED: plain-language summary for non-technical readers
   description: "Looks up users from the production database, with optional filtering by email or name. Returns a list of matching users.",
 
-  // Declare integrations upfront using their IDs for type safety
+  // Declare integrations upfront using their IDs for type safety.
+  // Key = descriptive snake_case from the integration/database name (not a generic "db").
   integrations: {
-    db: postgres(PROD_POSTGRES),
+    users_db: postgres(USERS_DB),
   },
 
   input: z.object({
@@ -661495,10 +661714,10 @@ export default api({
   }),
 
   async run(ctx, { email, name }) {
-    // ctx.integrations.db is fully typed as PostgresClient
+    // ctx.integrations.users_db is fully typed as PostgresClient
     // All integration methods accept an optional metadata arg as the last parameter
     // for trace labeling: { label?: string, description?: string }
-    const users = await ctx.integrations.db.query(
+    const users = await ctx.integrations.users_db.query(
       "SELECT id, email, name FROM users WHERE ($1::text IS NULL OR email = $1) AND ($2::text IS NULL OR name = $2)",
       UserSchema,
       [email, name],
@@ -662777,7 +662996,7 @@ var DEFAULT_SAFETY_GUIDANCE = (
 // ../../../vite-plugin-file-sync/dist/ai-service/attachments/text-upload-artifacts.js
 init_cjs_shims();
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { lstat as lstat5, mkdir as mkdir15, readdir as readdir10, realpath as realpath4, rm as rm12, writeFile as writeFile13 } from "node:fs/promises";
+import { lstat as lstat5, mkdir as mkdir16, readdir as readdir10, realpath as realpath4, rm as rm13, writeFile as writeFile13 } from "node:fs/promises";
 import path48 from "node:path";
 var TEXT_UPLOAD_ARTIFACT_ROOT = path48.join(".superblocks", "uploads");
 var MAX_TEXT_UPLOAD_ARTIFACT_BYTES = 10 * 1024 * 1024;
@@ -662859,7 +663078,7 @@ var TextUploadArtifactMaterializer = class {
       });
       return false;
     }
-    await mkdir15(outputRoot, { recursive: true });
+    await mkdir16(outputRoot, { recursive: true });
     const [resolvedAppRoot, resolvedOutputRoot] = await Promise.all([
       realpath4(this.appRootDirPath),
       realpath4(outputRoot)
@@ -662888,7 +663107,7 @@ var TextUploadArtifactMaterializer = class {
       return;
     }
     entries.sort();
-    await Promise.all(entries.slice(0, entries.length - keepLast).map((entry) => rm12(path48.join(uploadsDir, entry), { force: true, recursive: true })));
+    await Promise.all(entries.slice(0, entries.length - keepLast).map((entry) => rm13(path48.join(uploadsDir, entry), { force: true, recursive: true })));
   }
 };
 function getUploadedAttachmentArtifactKey(attachment) {
@@ -664698,6 +664917,7 @@ var TaskStore = class {
       message: "message" in initialStatus ? initialStatus.message : void 0,
       result: initialStatus.state === "completed" ? initialStatus.result : void 0,
       error: initialStatus.state === "failed" ? initialStatus.error : void 0,
+      detail: initialStatus.state === "failed" ? initialStatus.detail : void 0,
       ownerUserId: options8.ownerUserId
     };
     this.tasks.set(taskId, task);
@@ -664826,7 +665046,8 @@ var TaskStore = class {
       message: task.message,
       ageMs: Math.max(0, this.clock.now() - startedAtMs),
       completedAt: task.state === "running" ? void 0 : new Date(this.clock.now()).toISOString(),
-      error: task.error
+      error: task.error,
+      detail: task.detail
     };
   }
   async spawnPollLoop(taskId, type, controller) {
@@ -664858,6 +665079,7 @@ var TaskStore = class {
     task.message = "message" in status ? status.message : task.message;
     task.result = status.state === "completed" ? status.result : void 0;
     task.error = status.state === "failed" ? status.error : void 0;
+    task.detail = status.state === "failed" ? status.detail : void 0;
     this.emit(taskId, status, task);
   }
   emit(taskId, status, task) {
@@ -664875,7 +665097,11 @@ var TaskStore = class {
       case "completed":
         return { state: "completed", result: task.result };
       case "failed":
-        return { state: "failed", error: task.error ?? "unknown error" };
+        return {
+          state: "failed",
+          error: task.error ?? "unknown error",
+          ...task.detail !== void 0 ? { detail: task.detail } : {}
+        };
       case "cancelled":
         return { state: "cancelled" };
     }
@@ -667443,6 +667669,13 @@ var AiService = class extends import_shared55.TracedEventEmitter {
     if (request.retryMode === "focused-debug") {
       this.migrationTurnTriggered = false;
     }
+    if (request.retryMode !== "focused-debug") {
+      if (await hasSettledNormalMigrationTurn(this.appRootDirPath)) {
+        recordAutoDispatchOutcome("already-settled");
+        this.getLogger().info("[ai-service] Skipping v2\u2192v3 migration turn \u2014 prior normal turn completed successfully", { appRootDirPath: this.appRootDirPath });
+        return { dispatched: false, reason: "already-settled" };
+      }
+    }
     if (this.migrationTurnTriggered) {
       recordAutoDispatchOutcome("already-triggered");
       return { dispatched: false, reason: "already-triggered" };
@@ -667501,6 +667734,8 @@ var AiService = class extends import_shared55.TracedEventEmitter {
       mode: AiMode.BUILD
     };
     const promptId = randomUUID5();
+    const retryMode = request.retryMode === "focused-debug" ? "focused-debug" : "none";
+    const triggeredBy = request.triggeredBy ?? (request.retryMode === "focused-debug" ? "focused-debug" : "ui-rpc");
     const branchName = this._syncContextProvider?.getBranchName();
     const migrationUsageMetadata = {
       applicationId: this.config.applicationId,
@@ -667508,8 +667743,8 @@ var AiService = class extends import_shared55.TracedEventEmitter {
       migrationSource: "superblocks_2_0",
       origin: "app_migration",
       pendingSeedApiCount,
-      retryMode: request.retryMode ?? "none",
-      triggeredBy: request.triggeredBy ?? (request.retryMode === "focused-debug" ? "focused-debug" : "ui-rpc")
+      retryMode,
+      triggeredBy
     };
     this.clark.updateContext((context2) => ({
       ...context2,
@@ -667518,17 +667753,38 @@ var AiService = class extends import_shared55.TracedEventEmitter {
       llmConfig: migrationLlmConfig
     }));
     const transitionTo = transitionFrom(this.clark);
+    let settleOutcome = "success";
     transitionTo({
       type: USER_SENT_PROMPT,
       request: generateRequest,
       internal: true,
       visibleInChatHistory: true
     }).catch((error40) => {
+      settleOutcome = "error";
       this.getLogger().error("[ai-service] Migration translation turn failed", getErrorMeta2(error40));
-    }).finally(() => {
+    }).finally(async () => {
+      try {
+        await recordMigrationTurnSettled(this.appRootDirPath, {
+          outcome: settleOutcome,
+          promptId,
+          retryMode
+        });
+      } catch (error40) {
+        this.getLogger().error(`[ai-service] Failed to record migration turn settlement (promptId=${promptId})`, getErrorMeta2(error40));
+      }
       this.migrationTurnTriggered = false;
       this.appShell.setApiHandlerEnabled(true);
     });
+    try {
+      await recordMigrationTurnDispatched(this.appRootDirPath, {
+        pendingSeedApiCount,
+        promptId,
+        retryMode,
+        triggeredBy
+      });
+    } catch (error40) {
+      this.getLogger().error(`[ai-service] Failed to record migration turn dispatch (promptId=${promptId})`, getErrorMeta2(error40));
+    }
     recordAutoDispatchOutcome("dispatched");
     return { dispatched: true };
   }
@@ -672151,7 +672407,7 @@ var import_shared67 = __toESM(require_dist2());
 // ../../../vite-plugin-file-sync/package.json
 var package_default2 = {
   name: "@superblocksteam/vite-plugin-file-sync",
-  version: "2.0.142-next.0",
+  version: "2.0.142-next.2",
   keywords: [
     "vite-plugin"
   ],
@@ -672648,9 +672904,9 @@ init_cjs_shims();
 init_cjs_shims();
 var import_ws = __toESM(require_ws());
 var import_shared73 = __toESM(require_dist2());
-import { cp as cp3, mkdir as mkdir21, mkdtemp as mkdtemp2, rm as rm15 } from "node:fs/promises";
+import { cp as cp3, mkdir as mkdir22, mkdtemp as mkdtemp2, rm as rm16 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
-import { join as join28 } from "node:path";
+import { join as join29 } from "node:path";
 
 // ../../../vite-plugin-file-sync/dist/ai-service/recording/recorders/socket-recorder.js
 init_cjs_shims();
@@ -672695,8 +672951,8 @@ var import_shared68 = __toESM(require_dist2());
 
 // ../../../vite-plugin-file-sync/dist/git-service/ensure-workflow-file.js
 init_cjs_shims();
-import { access as access7, mkdir as mkdir19, writeFile as writeFile17 } from "node:fs/promises";
-import { dirname as dirname17, join as join27 } from "node:path";
+import { access as access7, mkdir as mkdir20, writeFile as writeFile17 } from "node:fs/promises";
+import { dirname as dirname17, join as join28 } from "node:path";
 async function ensureWorkflowFile(gitService, config4, superblocksBaseUrl) {
   const operationName = `ensure-${config4.providerName}-workflow-file`;
   let remoteUrl;
@@ -672716,7 +672972,7 @@ async function ensureWorkflowFile(gitService, config4, superblocksBaseUrl) {
   if (!config4.isProviderRemoteUrl(remoteUrl)) {
     return { created: false };
   }
-  const workflowPath = join27(gitService.workDir, config4.workflowPath);
+  const workflowPath = join28(gitService.workDir, config4.workflowPath);
   try {
     await access7(workflowPath);
     return { created: false };
@@ -672733,7 +672989,7 @@ async function ensureWorkflowFile(gitService, config4, superblocksBaseUrl) {
       gitOutcome: "degraded"
     });
   }
-  await mkdir19(dirname17(workflowPath), { recursive: true });
+  await mkdir20(dirname17(workflowPath), { recursive: true });
   await writeFile17(workflowPath, config4.buildWorkflowFromBaseUrl(resolvedUrl), "utf-8");
   getLogger3().info(`[git] ${operationName}: created ${config4.workflowPath}`);
   return { created: true };
@@ -672795,7 +673051,7 @@ var import_shared72 = __toESM(require_dist2());
 
 // ../../../vite-plugin-file-sync/dist/git-service/managed-excludes.js
 init_cjs_shims();
-import { mkdir as mkdir20, readFile as readFile19, writeFile as writeFile18 } from "node:fs/promises";
+import { mkdir as mkdir21, readFile as readFile20, writeFile as writeFile18 } from "node:fs/promises";
 import path55 from "node:path";
 var SUPERBLOCKS_DIR = ".superblocks";
 var MANAGED_GIT_EXCLUDE_PATTERNS = [
@@ -672848,12 +673104,12 @@ async function ensureManagedGitExcludes(gitService) {
   try {
     const relPath = (await gitService.raw(["rev-parse", "--git-path", "info/exclude"])).trim();
     const excludePath = path55.isAbsolute(relPath) ? relPath : path55.join(gitService.workDir, relPath);
-    const existing = await readFile19(excludePath, "utf8").catch(() => "");
+    const existing = await readFile20(excludePath, "utf8").catch(() => "");
     const next2 = mergeManagedExcludeBlock(existing);
     if (next2 === existing) {
       return;
     }
-    await mkdir20(path55.dirname(excludePath), { recursive: true });
+    await mkdir21(path55.dirname(excludePath), { recursive: true });
     await writeFile18(excludePath, next2, "utf8");
     getLogger3().info("[git] applied managed git excludes", {
       gitCategory: "setup",
@@ -673025,7 +673281,7 @@ async function rollbackLastCommit({ gitService, expectedSha }) {
 }
 
 // ../../../vite-plugin-file-sync/dist/socket-manager.js
-var SB_WORKTREE_SNAPSHOTS_DIR2 = join28(tmpdir3(), "sb-worktree-snapshots");
+var SB_WORKTREE_SNAPSHOTS_DIR2 = join29(tmpdir3(), "sb-worktree-snapshots");
 function extractCallerUserId(peerAuthorization) {
   if (!peerAuthorization)
     return void 0;
@@ -673837,7 +674093,7 @@ var SocketManager = class extends import_shared73.TracedEventEmitter {
                 }
               }
               if (serviceToDisconnect) {
-                const gitDir = join28(serviceToDisconnect.workDir, ".git");
+                const gitDir = join29(serviceToDisconnect.workDir, ".git");
                 let checkoutBranchBeforeDisconnect = import_shared73.DEFAULT_NON_GIT_BRANCH;
                 try {
                   checkoutBranchBeforeDisconnect = await serviceToDisconnect.getDefaultBranch();
@@ -673863,7 +674119,7 @@ var SocketManager = class extends import_shared73.TracedEventEmitter {
                   });
                 }
                 try {
-                  await rm15(gitDir, { recursive: true, force: true });
+                  await rm16(gitDir, { recursive: true, force: true });
                 } catch (rmErr) {
                   getLogger3().warn("[git] gitDisconnect failed to remove .git directory; manual cleanup may be required", {
                     gitCategory: "setup",
@@ -673993,8 +674249,8 @@ var SocketManager = class extends import_shared73.TracedEventEmitter {
                   });
                 }
               }
-              const worktreeBase = await mkdtemp2(join28(tmpdir3(), "sb-main-deploy-"));
-              const worktreePath = join28(worktreeBase, "worktree");
+              const worktreeBase = await mkdtemp2(join29(tmpdir3(), "sb-main-deploy-"));
+              const worktreePath = join29(worktreeBase, "worktree");
               try {
                 await readyGitService.raw([
                   "worktree",
@@ -674003,16 +674259,16 @@ var SocketManager = class extends import_shared73.TracedEventEmitter {
                   worktreePath,
                   sha
                 ]);
-                await rm15(join28(worktreePath, ".git"), {
+                await rm16(join29(worktreePath, ".git"), {
                   force: true,
                   recursive: true
                 });
                 const { directoryHash } = await syncService.uploadSnapshotToDbfs(worktreePath);
-                const snapshotPath = join28(SB_WORKTREE_SNAPSHOTS_DIR2, encodeURIComponent(directoryHash));
-                await mkdir21(SB_WORKTREE_SNAPSHOTS_DIR2, {
+                const snapshotPath = join29(SB_WORKTREE_SNAPSHOTS_DIR2, encodeURIComponent(directoryHash));
+                await mkdir22(SB_WORKTREE_SNAPSHOTS_DIR2, {
                   recursive: true
                 });
-                await rm15(snapshotPath, {
+                await rm16(snapshotPath, {
                   recursive: true,
                   force: true
                 });
@@ -674038,7 +674294,7 @@ var SocketManager = class extends import_shared73.TracedEventEmitter {
                     ...getErrorMeta2(cleanupErr)
                   });
                 }
-                await rm15(worktreeBase, {
+                await rm16(worktreeBase, {
                   recursive: true,
                   force: true
                 });
@@ -676128,8 +676384,8 @@ function createIdResolver(config4, environment) {
 // ../../../vite-plugin-file-sync/dist/router-parser.js
 init_cjs_shims();
 var import_parser14 = __toESM(require_lib8());
-import { readFile as readFile20, access as access8, stat as stat8, readdir as readdir12 } from "node:fs/promises";
-import { join as join29, resolve as resolve12, dirname as dirname18, relative as relative11 } from "node:path";
+import { readFile as readFile21, access as access8, stat as stat8, readdir as readdir12 } from "node:fs/promises";
+import { join as join30, resolve as resolve12, dirname as dirname18, relative as relative11 } from "node:path";
 
 // ../../../../node_modules/.pnpm/mlly@1.8.0/node_modules/mlly/dist/index.mjs
 init_cjs_shims();
@@ -682299,7 +682555,7 @@ async function resolveSourceFile(jsPath) {
         "index.jsx",
         "index.js"
       ]) {
-        const indexPath = join29(jsPath, indexFile);
+        const indexPath = join30(jsPath, indexFile);
         try {
           if ((await stat8(indexPath)).isFile()) {
             return indexPath;
@@ -682389,7 +682645,7 @@ async function findAllTsFiles(rootDir) {
     try {
       const entries = await readdir12(dir, { withFileTypes: true });
       for (const entry of entries) {
-        const fullPath = join29(dir, entry.name);
+        const fullPath = join30(dir, entry.name);
         if (entry.name === "node_modules" || entry.name.startsWith(".")) {
           continue;
         }
@@ -682420,10 +682676,10 @@ async function findRouterFile(rootDir) {
     }
   }
   for (const conventionalPath of CONVENTIONAL_ROUTER_PATHS) {
-    const fullPath = join29(rootDir, conventionalPath);
+    const fullPath = join30(rootDir, conventionalPath);
     try {
       await access8(fullPath);
-      const content19 = await readFile20(fullPath, "utf-8");
+      const content19 = await readFile21(fullPath, "utf-8");
       if (hasCreateBrowserRouter(content19)) {
         const stats = await stat8(fullPath);
         cachedRouterFileLocation = { path: fullPath, mtime: stats.mtimeMs };
@@ -682438,7 +682694,7 @@ async function findRouterFile(rootDir) {
   const allTsFiles = await findAllTsFiles(rootDir);
   for (const file2 of allTsFiles) {
     try {
-      const content19 = await readFile20(file2, "utf-8");
+      const content19 = await readFile21(file2, "utf-8");
       if (hasCreateBrowserRouter(content19)) {
         const stats = await stat8(file2);
         cachedRouterFileLocation = { path: file2, mtime: stats.mtimeMs };
@@ -682586,7 +682842,7 @@ function extractAllImports(content19) {
 }
 async function parseRouterFile(routerFilePath, rootDir) {
   try {
-    const content19 = await readFile20(routerFilePath, "utf-8");
+    const content19 = await readFile21(routerFilePath, "utf-8");
     const { createBrowserRouterAliases, namespaceImports } = extractReactRouterImports(content19);
     const allImports = extractAllImports(content19);
     const ast = (0, import_parser14.parse)(content19, {
@@ -683366,7 +683622,7 @@ function cleanDoc(doc) {
   return mapDoc(doc, (currentDoc) => cleanDocFn(currentDoc));
 }
 function replaceEndOfLine(doc, replacement = literalline) {
-  return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? join30(replacement, currentDoc.split("\n")) : currentDoc);
+  return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? join31(replacement, currentDoc.split("\n")) : currentDoc);
 }
 function canBreakFn(doc) {
   if (doc.type === DOC_TYPE_LINE) {
@@ -683508,7 +683764,7 @@ function indentIfBreak(contents2, options8) {
     negate: options8.negate
   };
 }
-function join30(separator, docs) {
+function join31(separator, docs) {
   assertDoc(separator);
   assertDocArray(docs);
   const parts = [];
@@ -684220,7 +684476,7 @@ function printDocToString(doc, options8) {
   }
 }
 var builders = {
-  join: join30,
+  join: join31,
   line,
   softline,
   hardline,
@@ -696491,7 +696747,7 @@ function parse42(toml, { maxDepth = 1e3, integersAsBigInt } = {}) {
   }
   return res;
 }
-async function readFile21(file2) {
+async function readFile22(file2) {
   if (isUrlString(file2)) {
     file2 = new URL(file2);
   }
@@ -696504,7 +696760,7 @@ async function readFile21(file2) {
     throw new Error(`Unable to read '${file2}': ${error40.message}`);
   }
 }
-var read_file_default = readFile21;
+var read_file_default = readFile22;
 async function readJson(file2) {
   const content19 = await read_file_default(file2);
   try {
@@ -696545,7 +696801,7 @@ var parseYaml3;
 async function loadYaml(file2) {
   const content19 = await read_file_default(file2);
   if (!parseYaml3) {
-    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-UZZWIT6V.js"));
+    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-FXHOCIJS.js"));
   }
   try {
     return parseYaml3(content19);
@@ -699174,7 +699430,7 @@ var {
   breakParent: breakParent2,
   hardline: hardline2,
   indent: indent3,
-  join: join32,
+  join: join33,
   line: line22,
   lineSuffix: lineSuffix2
 } = builders;
@@ -701939,7 +702195,7 @@ function createParsersAndPrinters(modules) {
 }
 var estreePlugin = createParsersAndPrinters([
   {
-    importPlugin: () => import("./estree-CAYUOQBQ.js"),
+    importPlugin: () => import("./estree-CBQZDSXJ.js"),
     printers: ["estree", "estree-json"]
   }
 ]);
@@ -701963,11 +702219,11 @@ var languages = [
 ];
 var { parsers: parsers12, printers } = createParsersAndPrinters([
   {
-    importPlugin: () => import("./acorn-5ISNX2MF.js"),
+    importPlugin: () => import("./acorn-GSO23EEG.js"),
     parsers: ["acorn", "espree"]
   },
   {
-    importPlugin: () => import("./angular-O6AH53X4.js"),
+    importPlugin: () => import("./angular-ZHRDU23D.js"),
     parsers: [
       "__ng_action",
       "__ng_binding",
@@ -701976,7 +702232,7 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./babel-ZCWHS6EQ.js"),
+    importPlugin: () => import("./babel-ZSNVX2PZ.js"),
     parsers: [
       "babel",
       "babel-flow",
@@ -701995,44 +702251,44 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./flow-OXBFZA6O.js"),
+    importPlugin: () => import("./flow-S3H3Y74D.js"),
     parsers: ["flow"]
   },
   {
-    importPlugin: () => import("./glimmer-5XUQEU3N.js"),
+    importPlugin: () => import("./glimmer-WTH53HRW.js"),
     parsers: ["glimmer"],
     printers: ["glimmer"]
   },
   {
-    importPlugin: () => import("./graphql-F6OICFXZ.js"),
+    importPlugin: () => import("./graphql-PODLQZYP.js"),
     parsers: ["graphql"],
     printers: ["graphql"]
   },
   {
-    importPlugin: () => import("./html-BFYHSX7V.js"),
+    importPlugin: () => import("./html-SUAQB3PV.js"),
     parsers: ["html", "angular", "vue", "lwc", "mjml"],
     printers: ["html"]
   },
   {
-    importPlugin: () => import("./markdown-XMQ7A2L7.js"),
+    importPlugin: () => import("./markdown-LMLFITGX.js"),
     parsers: ["markdown", "mdx", "remark"],
     printers: ["mdast"]
   },
   {
-    importPlugin: () => import("./meriyah-BM2JQ6C3.js"),
+    importPlugin: () => import("./meriyah-K62VQEL5.js"),
     parsers: ["meriyah"]
   },
   {
-    importPlugin: () => import("./postcss-R3X7PEXV.js"),
+    importPlugin: () => import("./postcss-SRWVCB56.js"),
     parsers: ["css", "less", "scss"],
     printers: ["postcss"]
   },
   {
-    importPlugin: () => import("./typescript-K5K6KZAA.js"),
+    importPlugin: () => import("./typescript-F65AOVRT.js"),
     parsers: ["typescript"]
   },
   {
-    importPlugin: () => import("./yaml-UZZWIT6V.js"),
+    importPlugin: () => import("./yaml-FXHOCIJS.js"),
     parsers: ["yaml"],
     printers: ["yaml"]
   }
@@ -702771,7 +703027,7 @@ var FileSystemManager = class extends import_shared76.TracedEventEmitter {
         return {
           type: "tsx",
           path: f2,
-          content: readFile22(f2)
+          content: readFile23(f2)
         };
       }),
       ...yamlFiles.map((f2) => {
@@ -702969,7 +703225,7 @@ var FileSystemManager = class extends import_shared76.TracedEventEmitter {
     }
     switch (event) {
       case "add": {
-        const file2 = await readFile22(normalizedFilePath);
+        const file2 = await readFile23(normalizedFilePath);
         if (typeof file2 !== "string")
           return;
         switch (fileType.type) {
@@ -703004,7 +703260,7 @@ var FileSystemManager = class extends import_shared76.TracedEventEmitter {
         if (!fileType2 || !normalizedFilePath.startsWith(rootPath)) {
           return;
         }
-        const data3 = await readFile22(normalizedFilePath);
+        const data3 = await readFile23(normalizedFilePath);
         if (typeof data3 !== "string")
           return;
         if (this.routerFilePath && normalizedFilePath === this.routerFilePath) {
@@ -703562,7 +703818,7 @@ var FileSystemManager = class extends import_shared76.TracedEventEmitter {
     return filePath.includes("/skills/app/") && filePath.endsWith(".md");
   }
 };
-async function readFile22(path81) {
+async function readFile23(path81) {
   try {
     return await fs26.readFile(path81, "utf-8");
   } catch (e) {
@@ -703870,14 +704126,14 @@ function getIndexHtml2(features, entryPoint, viewMode = "dev") {
 init_cjs_shims();
 var import_body_parser = __toESM(require_body_parser());
 var import_yaml11 = __toESM(require_dist());
-import { access as access9, mkdir as mkdir23, readFile as readFile27, readdir as readdir16, rm as rm17, writeFile as writeFile20 } from "node:fs/promises";
-import { dirname as dirname24, join as join39 } from "node:path";
+import { access as access9, mkdir as mkdir24, readFile as readFile28, readdir as readdir16, rm as rm18, writeFile as writeFile20 } from "node:fs/promises";
+import { dirname as dirname24, join as join40 } from "node:path";
 var import_shared78 = __toESM(require_dist2());
 
 // ../../../vite-plugin-file-sync/dist/migration/get-fullstack-template-dir.js
 init_cjs_shims();
 import { existsSync as existsSync4, statSync as statSync3 } from "node:fs";
-import { dirname as dirname21, join as join33 } from "node:path";
+import { dirname as dirname21, join as join34 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 var CANDIDATE_SUBPATHS = [
   "migration-templates/app-fullstack",
@@ -703898,7 +704154,7 @@ function findFullstackTemplate(startDir) {
   let current2 = startDir;
   for (let hops = 0; hops < MAX_WALK_HOPS; hops++) {
     for (const sub of CANDIDATE_SUBPATHS) {
-      const candidate = join33(current2, sub);
+      const candidate = join34(current2, sub);
       if (isUsableDir(candidate))
         return candidate;
     }
@@ -703914,7 +704170,7 @@ function enumerateSearchedPaths(startDir) {
   let current2 = startDir;
   for (let hops = 0; hops < MAX_WALK_HOPS; hops++) {
     for (const sub of CANDIDATE_SUBPATHS) {
-      paths.push(join33(current2, sub));
+      paths.push(join34(current2, sub));
     }
     const parent2 = dirname21(current2);
     if (parent2 === current2)
@@ -703933,9 +704189,13 @@ function isUsableDir(dirPath) {
 
 // ../../../vite-plugin-file-sync/dist/migration/migration-session-reconcile.js
 init_cjs_shims();
-import { join as join34 } from "node:path";
-var SCRATCH_DIR_NAME3 = "scratch";
+import { join as join35 } from "node:path";
+var SCRATCH_DIR_NAME4 = "scratch";
 var MIGRATION_STATE_FILE4 = "migration-state.json";
+var rehydrateInFlight = false;
+function isMigrationScratchRehydrateInFlight() {
+  return rehydrateInFlight;
+}
 var ACTIVE_MIGRATION_SESSION_PHASES = /* @__PURE__ */ new Set([
   "aborting",
   "in_progress",
@@ -703979,7 +704239,7 @@ async function fetchActiveMigrationSession({ syncService }) {
   return body.data?.session ?? null;
 }
 async function rehydrateMigrationScratchOnBoot({ appRootDir, syncService, logger: logger25 }) {
-  const stateFilePath = join34(appRootDir, SCRATCH_DIR_NAME3, MIGRATION_STATE_FILE4);
+  const stateFilePath = join35(appRootDir, SCRATCH_DIR_NAME4, MIGRATION_STATE_FILE4);
   if (await pathExists3(stateFilePath)) {
     return;
   }
@@ -703997,17 +704257,22 @@ async function rehydrateMigrationScratchOnBoot({ appRootDir, syncService, logger
       phase: session.phase,
       migrationCommitId: session.migrationCommitId
     });
-    await syncService.downloadDirectory();
-    logger25.info("[migrate-route] Forced DBFS download to restore migration scratch completed", {
-      applicationId: syncService.applicationId,
-      branchName: syncService.branchName
-    });
+    rehydrateInFlight = true;
+    try {
+      await syncService.downloadDirectory();
+      logger25.info("[migrate-route] Forced DBFS download to restore migration scratch completed", {
+        applicationId: syncService.applicationId,
+        branchName: syncService.branchName
+      });
+    } finally {
+      rehydrateInFlight = false;
+    }
   } catch (error40) {
     logger25.warn("[migrate-route] Failed to rehydrate migration scratch on boot", getErrorMeta2(error40));
   }
 }
 async function reconcileMigrationSessionOnBoot({ appRootDir, syncService, logger: logger25 }) {
-  const stateFilePath = join34(appRootDir, SCRATCH_DIR_NAME3, MIGRATION_STATE_FILE4);
+  const stateFilePath = join35(appRootDir, SCRATCH_DIR_NAME4, MIGRATION_STATE_FILE4);
   if (!await pathExists3(stateFilePath)) {
     return;
   }
@@ -704050,20 +704315,20 @@ async function reconcileMigrationSessionOnBoot({ appRootDir, syncService, logger
 init_cjs_shims();
 var import_yaml9 = __toESM(require_dist());
 import { existsSync as existsSync6 } from "node:fs";
-import { cp as cp4, mkdir as mkdir22, readdir as readdir14, readFile as readFile25, rename as rename5, rm as rm16, stat as stat10, writeFile as writeFile19 } from "node:fs/promises";
-import { dirname as dirname22, join as join37, relative as relative13 } from "node:path";
+import { cp as cp4, mkdir as mkdir23, readdir as readdir14, readFile as readFile26, rename as rename5, rm as rm17, stat as stat10, writeFile as writeFile19 } from "node:fs/promises";
+import { dirname as dirname22, join as join38, relative as relative13 } from "node:path";
 
 // ../../../vite-plugin-file-sync/dist/migration/recommended-user-deps.js
 init_cjs_shims();
-import { readFile as readFile24 } from "node:fs/promises";
-import { join as join36 } from "node:path";
+import { readFile as readFile25 } from "node:fs/promises";
+import { join as join37 } from "node:path";
 
 // ../../../vite-plugin-file-sync/dist/migration/scan-imports.js
 init_cjs_shims();
 import { existsSync as existsSync5 } from "node:fs";
-import { readFile as readFile23, readdir as readdir13, lstat as lstat8 } from "node:fs/promises";
+import { readFile as readFile24, readdir as readdir13, lstat as lstat8 } from "node:fs/promises";
 import { builtinModules as builtinModules3 } from "node:module";
-import { extname as extname3, join as join35 } from "node:path";
+import { extname as extname3, join as join36 } from "node:path";
 var NODE_BUILTINS = new Set(builtinModules3);
 var SCANNABLE_EXTENSIONS = /* @__PURE__ */ new Set([
   ".cjs",
@@ -704150,7 +704415,7 @@ async function walkScannableFiles(rootPath, files, logger25) {
   for (const entry of entries) {
     if (SKIPPED_DIR_NAMES.has(entry))
       continue;
-    const fullPath = join35(rootPath, entry);
+    const fullPath = join36(rootPath, entry);
     let entryStat;
     try {
       entryStat = await lstat8(fullPath);
@@ -704178,7 +704443,7 @@ async function scanImportedPackages(args) {
   for (const file2 of files) {
     let content19;
     try {
-      content19 = await readFile23(file2, "utf-8");
+      content19 = await readFile24(file2, "utf-8");
     } catch (error40) {
       logger25.warn("[scan-imports] Failed to read file", {
         error: error40 instanceof Error ? error40.message : String(error40),
@@ -704207,7 +704472,7 @@ var CorruptManifestError = class extends Error {
 async function loadPackageJsonManifest(filePath) {
   let raw;
   try {
-    raw = await readFile24(filePath, "utf-8");
+    raw = await readFile25(filePath, "utf-8");
   } catch (error40) {
     if (error40.code === "ENOENT") {
       return { kind: "missing" };
@@ -704251,7 +704516,7 @@ function isDeclaredInActive(active, name16) {
 }
 async function computeRecommendedUserDeps(args) {
   const { appRootDirPath, backupDirPath, logger: logger25 } = args;
-  const activePath = join36(appRootDirPath, "package.json");
+  const activePath = join37(appRootDirPath, "package.json");
   const activeLoad = await loadPackageJsonManifest(activePath);
   if (activeLoad.kind === "corrupt") {
     throw new CorruptManifestError(activePath, activeLoad.error);
@@ -704265,7 +704530,7 @@ async function computeRecommendedUserDeps(args) {
     };
   }
   const active = activeLoad.manifest;
-  const backupPath = join36(backupDirPath, "package.json");
+  const backupPath = join37(backupDirPath, "package.json");
   const backupLoad = await loadPackageJsonManifest(backupPath);
   if (backupLoad.kind === "corrupt") {
     logger25.warn("[migrate] Backup package.json is corrupt; recommendations will fall back to 'latest' for any imported package", {
@@ -704278,7 +704543,7 @@ async function computeRecommendedUserDeps(args) {
   const backup = backupLoad.kind === "ok" ? backupLoad.manifest : null;
   const importedPackages = await scanImportedPackages({
     logger: logger25,
-    roots: [join36(appRootDirPath, "client"), join36(appRootDirPath, "server")]
+    roots: [join37(appRootDirPath, "client"), join37(appRootDirPath, "server")]
   });
   const recommendedUserDeps = [];
   const importedButMissingFromBackup = [];
@@ -704369,7 +704634,7 @@ var BACKUP_SINGLE_FILE_DIFFS = [
   { backupPath: "App.tsx", clientPath: "client/App.tsx" },
   { backupPath: "root.tsx", clientPath: "client/root.tsx" }
 ];
-var SCRATCH_DIR_NAME4 = "scratch";
+var SCRATCH_DIR_NAME5 = "scratch";
 var BACKUP_SUBDIR_NAME = "v2-backup";
 var MIGRATION_STATE_FILE5 = "migration-state.json";
 var MIGRATION_STATE_VERSION = 1;
@@ -704381,8 +704646,8 @@ async function migrateToFullstack(args) {
   });
   await assertDirectoryExists(appRootDirPath, "app root");
   await assertDirectoryExists(templateSourceDirPath, "template source");
-  const scratchDirPath = join37(appRootDirPath, SCRATCH_DIR_NAME4);
-  const backupDirPath = join37(scratchDirPath, BACKUP_SUBDIR_NAME);
+  const scratchDirPath = join38(appRootDirPath, SCRATCH_DIR_NAME5);
+  const backupDirPath = join38(scratchDirPath, BACKUP_SUBDIR_NAME);
   await assertBackupSlotIsEmpty(backupDirPath);
   await moveAllTopLevelIntoBackup({ appRootDirPath, backupDirPath, logger: logger25 });
   await copyTemplateIntoAppRoot({
@@ -704423,7 +704688,7 @@ async function migrateToFullstack(args) {
     });
   }
   restructuredFiles += apiStubResult.apiStubs.length;
-  const stateFilePath = join37(scratchDirPath, MIGRATION_STATE_FILE5);
+  const stateFilePath = join38(scratchDirPath, MIGRATION_STATE_FILE5);
   const integrationWritePolicy = args.integrationWritePolicy ?? await readPersistedIntegrationWritePolicy(stateFilePath);
   const state = {
     version: MIGRATION_STATE_VERSION,
@@ -704462,7 +704727,7 @@ async function migrateToFullstack(args) {
     migrationChecklistFilePath,
     itemCount: migrationChecklist.items.length
   });
-  const sbTemplatePath = join37(appRootDirPath, ".sb_template");
+  const sbTemplatePath = join38(appRootDirPath, ".sb_template");
   await writeFile19(sbTemplatePath, "app-fullstack", "utf-8");
   logger25.info("[migrate] Wrote .sb_template", { sbTemplatePath });
   return {
@@ -704476,8 +704741,8 @@ async function migrateToFullstack(args) {
 }
 async function restoreFromV2Backup(args) {
   const { appRootDirPath, logger: logger25 } = args;
-  const scratchDirPath = join37(appRootDirPath, SCRATCH_DIR_NAME4);
-  const backupDirPath = join37(scratchDirPath, BACKUP_SUBDIR_NAME);
+  const scratchDirPath = join38(appRootDirPath, SCRATCH_DIR_NAME5);
+  const backupDirPath = join38(scratchDirPath, BACKUP_SUBDIR_NAME);
   if (!existsSync6(backupDirPath)) {
     return { restored: false };
   }
@@ -704491,9 +704756,9 @@ async function restoreFromV2Backup(args) {
   for (const entry of topLevelEntries) {
     if (GUARDED_TOP_LEVEL.has(entry.name))
       continue;
-    if (entry.name === SCRATCH_DIR_NAME4)
+    if (entry.name === SCRATCH_DIR_NAME5)
       continue;
-    await rm16(join37(appRootDirPath, entry.name), {
+    await rm17(join38(appRootDirPath, entry.name), {
       recursive: true,
       force: true
     });
@@ -704503,15 +704768,15 @@ async function restoreFromV2Backup(args) {
   }
   const backupEntries = await readdir14(backupDirPath, { withFileTypes: true });
   for (const entry of backupEntries) {
-    const from = join37(backupDirPath, entry.name);
-    const to2 = join37(appRootDirPath, entry.name);
+    const from = join38(backupDirPath, entry.name);
+    const to2 = join38(appRootDirPath, entry.name);
     await rename5(from, to2);
     logger25.debug("[migrate] Restored from backup", { entry: entry.name });
   }
-  await rm16(scratchDirPath, { recursive: true, force: true });
-  const sbTemplatePath = join37(appRootDirPath, ".sb_template");
+  await rm17(scratchDirPath, { recursive: true, force: true });
+  const sbTemplatePath = join38(appRootDirPath, ".sb_template");
   if (existsSync6(sbTemplatePath)) {
-    await rm16(sbTemplatePath, { force: true });
+    await rm17(sbTemplatePath, { force: true });
     logger25.debug("[migrate] Removed .sb_template marker written during restructure");
   }
   logger25.info("[migrate] Restored live tree from scratch/v2-backup");
@@ -704533,15 +704798,15 @@ async function assertBackupSlotIsEmpty(backupDirPath) {
 }
 async function moveAllTopLevelIntoBackup(opts) {
   const { appRootDirPath, backupDirPath, logger: logger25 } = opts;
-  await mkdir22(backupDirPath, { recursive: true });
+  await mkdir23(backupDirPath, { recursive: true });
   const entries = await readdir14(appRootDirPath, { withFileTypes: true });
   for (const entry of entries) {
     if (GUARDED_TOP_LEVEL.has(entry.name))
       continue;
-    if (entry.name === SCRATCH_DIR_NAME4)
+    if (entry.name === SCRATCH_DIR_NAME5)
       continue;
-    const from = join37(appRootDirPath, entry.name);
-    const to2 = join37(backupDirPath, entry.name);
+    const from = join38(appRootDirPath, entry.name);
+    const to2 = join38(backupDirPath, entry.name);
     await rename5(from, to2);
     logger25.debug("[migrate] Moved to backup", { entry: entry.name });
   }
@@ -704552,8 +704817,8 @@ async function copyTemplateIntoAppRoot(opts) {
   for (const entry of entries) {
     if (GUARDED_TOP_LEVEL.has(entry.name))
       continue;
-    const from = join37(templateSourceDirPath, entry.name);
-    const to2 = join37(appRootDirPath, entry.name);
+    const from = join38(templateSourceDirPath, entry.name);
+    const to2 = join38(appRootDirPath, entry.name);
     await cp4(from, to2, { recursive: true });
   }
   logger25.debug("[migrate] Template overlaid onto app root");
@@ -704562,11 +704827,11 @@ async function remapBackupDirsIntoClient(opts) {
   const { backupDirPath, appRootDirPath, templateSourceDirPath, logger: logger25 } = opts;
   let copied = 0;
   for (const mapping of BACKUP_TO_CLIENT_MAPPINGS) {
-    const src3 = join37(backupDirPath, mapping.backupSubpath);
+    const src3 = join38(backupDirPath, mapping.backupSubpath);
     if (!existsSync6(src3))
       continue;
-    const dst = join37(appRootDirPath, "client", mapping.clientSubpath);
-    const templateEquivalent = join37(templateSourceDirPath, "client", mapping.clientSubpath);
+    const dst = join38(appRootDirPath, "client", mapping.clientSubpath);
+    const templateEquivalent = join38(templateSourceDirPath, "client", mapping.clientSubpath);
     copied += await copyTreeWithDiff({
       src: src3,
       dst,
@@ -704583,18 +704848,18 @@ async function remapBackupSingleFiles(opts) {
   const { backupDirPath, appRootDirPath, templateSourceDirPath, logger: logger25 } = opts;
   let copied = 0;
   for (const mapping of BACKUP_SINGLE_FILE_DIFFS) {
-    const backupFile = join37(backupDirPath, mapping.backupPath);
+    const backupFile = join38(backupDirPath, mapping.backupPath);
     if (!existsSync6(backupFile))
       continue;
-    const destFile = join37(appRootDirPath, mapping.clientPath);
-    const templateFile = join37(templateSourceDirPath, mapping.clientPath);
+    const destFile = join38(appRootDirPath, mapping.clientPath);
+    const templateFile = join38(templateSourceDirPath, mapping.clientPath);
     if (existsSync6(templateFile) && await filesEqual(backupFile, templateFile)) {
       logger25.debug("[migrate] Skipping unmodified single file", {
         file: mapping.backupPath
       });
       continue;
     }
-    await mkdir22(dirname22(destFile), { recursive: true });
+    await mkdir23(dirname22(destFile), { recursive: true });
     await cp4(backupFile, destFile);
     copied += 1;
   }
@@ -704608,7 +704873,7 @@ async function copyTreeWithDiff(opts) {
     const current2 = stack2.pop();
     const entries = await readdir14(current2, { withFileTypes: true });
     for (const entry of entries) {
-      const absEntry = join37(current2, entry.name);
+      const absEntry = join38(current2, entry.name);
       const relFromSrc = relative13(src3, absEntry);
       if (skipSubpath && relFromSrc.split("/").includes(skipSubpath)) {
         continue;
@@ -704620,7 +704885,7 @@ async function copyTreeWithDiff(opts) {
       if (!entry.isFile())
         continue;
       if (templateBaseline) {
-        const baselineFile = join37(templateBaseline, relFromSrc);
+        const baselineFile = join38(templateBaseline, relFromSrc);
         if (existsSync6(baselineFile) && await filesEqual(absEntry, baselineFile)) {
           logger25.debug("[migrate] Skipping unmodified file", {
             path: relFromSrc
@@ -704628,8 +704893,8 @@ async function copyTreeWithDiff(opts) {
           continue;
         }
       }
-      const destFile = join37(dst, relFromSrc);
-      await mkdir22(dirname22(destFile), { recursive: true });
+      const destFile = join38(dst, relFromSrc);
+      await mkdir23(dirname22(destFile), { recursive: true });
       await cp4(absEntry, destFile);
       copied += 1;
     }
@@ -704648,9 +704913,9 @@ async function stubV2Apis(opts) {
     const baseName = toValidApiName(rawName ?? fallback);
     const uniqueName = ensureUniqueName(baseName, seenNames);
     seenNames.add(uniqueName);
-    const stubRelPath = join37("server", "apis", uniqueName, "api.ts");
-    const stubAbsPath = join37(appRootDirPath, stubRelPath);
-    await mkdir22(dirname22(stubAbsPath), { recursive: true });
+    const stubRelPath = join38("server", "apis", uniqueName, "api.ts");
+    const stubAbsPath = join38(appRootDirPath, stubRelPath);
+    await mkdir23(dirname22(stubAbsPath), { recursive: true });
     await writeFile19(stubAbsPath, renderApiStub(uniqueName, yamlPath, backupDirPath), "utf-8");
     apiStubs.push(stubRelPath);
     checklist.push({
@@ -704676,7 +704941,7 @@ async function findApiYamls(rootDir) {
       continue;
     }
     for (const entry of entries) {
-      const abs = join37(dir, entry.name);
+      const abs = join38(dir, entry.name);
       if (entry.isDirectory()) {
         stack2.push(abs);
         continue;
@@ -704716,7 +704981,7 @@ async function discoverRoutesFromBackupRouter(args) {
   }
 }
 async function discoverRoutesFromBackupPages(backupDirPath) {
-  const pagesRoot = join37(backupDirPath, "pages");
+  const pagesRoot = join38(backupDirPath, "pages");
   if (!existsSync6(pagesRoot)) {
     return [];
   }
@@ -704737,7 +705002,7 @@ async function discoverRoutesFromBackupPages(backupDirPath) {
       continue;
     }
     for (const entry of entries) {
-      const abs = join37(current2, entry.name);
+      const abs = join38(current2, entry.name);
       if (entry.isDirectory()) {
         stack2.push(abs);
         continue;
@@ -704768,7 +705033,7 @@ function normalizeRoutePath(path81) {
   return withLeadingSlash.replace(/\/{2,}/g, "/");
 }
 async function extractApiName(yamlPath) {
-  const raw = await readFile25(yamlPath, "utf-8");
+  const raw = await readFile26(yamlPath, "utf-8");
   const parsed = (0, import_yaml9.parse)(raw);
   if (parsed && typeof parsed === "object" && "metadata" in parsed && typeof parsed.metadata === "object" && parsed.metadata && typeof parsed.metadata.name === "string") {
     return parsed.metadata.name;
@@ -704793,7 +705058,7 @@ function ensureUniqueName(name16, seen) {
 }
 function renderApiStub(name16, yamlPath, backupDirPath) {
   const originalRel = relative13(backupDirPath, yamlPath);
-  const scratchRel = join37(SCRATCH_DIR_NAME4, BACKUP_SUBDIR_NAME, originalRel);
+  const scratchRel = join38(SCRATCH_DIR_NAME5, BACKUP_SUBDIR_NAME, originalRel);
   return `import { api, z } from "@superblocksteam/sdk-api";
 
 /**
@@ -704820,7 +705085,7 @@ export default api({
 }
 async function writeApiRegistry(opts) {
   const { appRootDirPath, stubs, logger: logger25 } = opts;
-  const registryPath = join37(appRootDirPath, "server", "apis", "index.ts");
+  const registryPath = join38(appRootDirPath, "server", "apis", "index.ts");
   const orderedStubs = [...stubs].sort((a, b3) => a.name.localeCompare(b3.name));
   const imports = orderedStubs.map((s4) => `import ${s4.name} from "./${s4.name}/api.js";`).join("\n");
   const entries = orderedStubs.map((s4) => `  ${s4.name},`).join("\n");
@@ -704845,7 +705110,7 @@ export default apis;
 /** Type for useApi inference - exported for client type-only imports */
 export type ApiRegistry = typeof apis;
 `;
-  await mkdir22(dirname22(registryPath), { recursive: true });
+  await mkdir23(dirname22(registryPath), { recursive: true });
   await writeFile19(registryPath, contents2, "utf-8");
   logger25.debug("[migrate] Rewrote server/apis/index.ts", {
     registryPath,
@@ -704866,7 +705131,7 @@ async function assertDirectoryExists(path81, label2) {
   }
 }
 async function filesEqual(a, b3) {
-  const [aBuf, bBuf] = await Promise.all([readFile25(a), readFile25(b3)]);
+  const [aBuf, bBuf] = await Promise.all([readFile26(a), readFile26(b3)]);
   if (aBuf.length !== bBuf.length)
     return false;
   return aBuf.equals(bBuf);
@@ -704875,8 +705140,8 @@ async function filesEqual(a, b3) {
 // ../../../vite-plugin-file-sync/dist/migration/unsupported-integrations.js
 init_cjs_shims();
 var import_yaml10 = __toESM(require_dist());
-import { readdir as readdir15, readFile as readFile26 } from "node:fs/promises";
-import { basename as basename10, dirname as dirname23, join as join38, relative as relative14 } from "node:path";
+import { readdir as readdir15, readFile as readFile27 } from "node:fs/promises";
+import { basename as basename10, dirname as dirname23, join as join39, relative as relative14 } from "node:path";
 
 // ../../../sdk-api/dist/index.js
 init_cjs_shims();
@@ -704932,6 +705197,9 @@ init_cjs_shims();
 // ../../../sdk-api/dist/errors.js
 init_cjs_shims();
 
+// ../../../sdk-api/dist/integrations/base/types.js
+init_cjs_shims();
+
 // ../../../sdk-api/dist/integrations/base/rest-api-integration-client.js
 init_cjs_shims();
 
@@ -705462,7 +705730,7 @@ async function findApiYamls2(appRootDirPath) {
       continue;
     }
     for (const entry of entries) {
-      const absPath = join38(current2, entry.name);
+      const absPath = join39(current2, entry.name);
       if (entry.isDirectory()) {
         if (current2 === appRootDirPath && IGNORED_ROOT_DIRS.has(entry.name) || IGNORED_DIRS_ANY_DEPTH.has(entry.name) || entry.name.startsWith(".")) {
           continue;
@@ -705510,7 +705778,7 @@ function isUnsupportedPluginId(pluginId) {
   return !SUPPORTED_PLUGIN_ID_SET.has(pluginId);
 }
 async function readApiIntegrations(yamlPath) {
-  const raw = await readFile26(yamlPath, "utf-8");
+  const raw = await readFile27(yamlPath, "utf-8");
   const parsed = (0, import_yaml10.parse)(raw);
   const integrationRefs = collectIntegrationRefs(parsed);
   const fallbackApiName = basename10(dirname23(yamlPath)) || "UnknownApi";
@@ -705597,7 +705865,7 @@ function extractBearerJwt(authorizationHeader) {
 }
 var TARGET_TEMPLATE_NAME = "app-fullstack";
 var MIGRATION_STATE_FILE6 = "migration-state.json";
-var SCRATCH_DIR_NAME5 = "scratch";
+var SCRATCH_DIR_NAME6 = "scratch";
 var RESTART_TELEMETRY_FLUSH_TIMEOUT_MS = 2e3;
 async function flushTelemetryBeforeExit(logger25) {
   if (!isTelemetryInitialized()) {
@@ -705635,6 +705903,7 @@ async function requestSelfRestart(logger25, prepareInPlaceRestart2) {
   process.exit(RESTART_EXIT_CODE);
 }
 var inMemoryStatus = { state: "idle" };
+var migrationCompleteCommitInFlight = false;
 async function findLiveApiYamls(rootDir) {
   const results = [];
   const stack2 = [rootDir];
@@ -705647,10 +705916,10 @@ async function findLiveApiYamls(rootDir) {
       continue;
     }
     for (const entry of entries) {
-      if (entry.name === SCRATCH_DIR_NAME5 || entry.name === "node_modules") {
+      if (entry.name === SCRATCH_DIR_NAME6 || entry.name === "node_modules") {
         continue;
       }
-      const abs = join39(dir, entry.name);
+      const abs = join40(dir, entry.name);
       if (entry.isDirectory()) {
         stack2.push(abs);
       } else if (entry.isFile() && (entry.name === "api.yaml" || entry.name === "api.yml")) {
@@ -705668,7 +705937,7 @@ async function extractIntegrationsFromYamls(yamlPaths) {
   const integrationSteps = /* @__PURE__ */ new Map();
   for (const yamlPath of yamlPaths) {
     try {
-      const raw = await readFile27(yamlPath, "utf-8");
+      const raw = await readFile28(yamlPath, "utf-8");
       const parsed = (0, import_yaml11.parse)(raw);
       forEachYamlStep(parsed, (step) => {
         const integrationId = step["integration"];
@@ -705690,7 +705959,7 @@ async function extractIntegrationsFromYamls(yamlPaths) {
   }));
 }
 async function collectMigrationIntegrations(appRootDir) {
-  const backupDir = join39(appRootDir, SCRATCH_DIR_NAME5, "v2-backup");
+  const backupDir = join40(appRootDir, SCRATCH_DIR_NAME6, "v2-backup");
   const yamlPaths = await findLiveApiYamls(backupDir);
   return extractIntegrationsFromYamls(yamlPaths);
 }
@@ -705700,9 +705969,9 @@ async function collectPreMigrationIntegrations(appRootDir) {
 }
 async function resolveStatus(appRootDir, opts = {}) {
   const ignoreInMemory = opts.ignoreInMemory ?? false;
-  const stateFilePath = join39(appRootDir, SCRATCH_DIR_NAME5, MIGRATION_STATE_FILE6);
+  const stateFilePath = join40(appRootDir, SCRATCH_DIR_NAME6, MIGRATION_STATE_FILE6);
   const [hasV2Backup, hasMigrationStateFile] = await Promise.all([
-    pathExists4(join39(appRootDir, SCRATCH_DIR_NAME5, "v2-backup")),
+    pathExists4(join40(appRootDir, SCRATCH_DIR_NAME6, "v2-backup")),
     pathExists4(stateFilePath)
   ]);
   const [checklist, integrations] = await Promise.all([
@@ -705725,7 +705994,7 @@ async function resolveStatus(appRootDir, opts = {}) {
   if (!hasMigrationStateFile) {
     const unsupportedStatus = await detectUnsupportedIntegrations(appRootDir);
     return {
-      state: "idle",
+      state: isMigrationScratchRehydrateInFlight() ? "translating" : "idle",
       hasV2Backup,
       ...unsupportedStatus,
       checklist: checklistPayload,
@@ -705802,7 +706071,7 @@ async function resolveStatus(appRootDir, opts = {}) {
 }
 async function readPersistedMigrationState(stateFilePath) {
   try {
-    const raw = await readFile27(stateFilePath, "utf-8");
+    const raw = await readFile28(stateFilePath, "utf-8");
     const parsed = JSON.parse(raw);
     return {
       startedAt: typeof parsed.startedAt === "string" ? parsed.startedAt : void 0,
@@ -705819,10 +706088,10 @@ async function readPersistedMigrationState(stateFilePath) {
 async function persistMigrationStateMetadata(stateFilePath, metadata) {
   let parsed = {};
   try {
-    const raw = await readFile27(stateFilePath, "utf-8");
+    const raw = await readFile28(stateFilePath, "utf-8");
     parsed = JSON.parse(raw);
   } catch {
-    await mkdir23(dirname24(stateFilePath), { recursive: true });
+    await mkdir24(dirname24(stateFilePath), { recursive: true });
     if (metadata.startedAt) {
       parsed.startedAt = metadata.startedAt;
     }
@@ -705943,10 +706212,10 @@ function registerMigrationRoutes(server, options8) {
       })) {
         return;
       }
-      const scratchDirPath = join39(appRootDir, SCRATCH_DIR_NAME5);
-      const stateFilePath = join39(scratchDirPath, MIGRATION_STATE_FILE6);
-      const backupDirPath = join39(scratchDirPath, "v2-backup");
-      const verificationDirPath = join39(scratchDirPath, "migration-verification");
+      const scratchDirPath = join40(appRootDir, SCRATCH_DIR_NAME6);
+      const stateFilePath = join40(scratchDirPath, MIGRATION_STATE_FILE6);
+      const backupDirPath = join40(scratchDirPath, "v2-backup");
+      const verificationDirPath = join40(scratchDirPath, "migration-verification");
       let autoSyncPaused = false;
       let shouldResumeAutoSync = true;
       let diskRestored = false;
@@ -705966,9 +706235,10 @@ function registerMigrationRoutes(server, options8) {
           await clearChecklist({ appRootDirPath: appRootDir });
         } else {
           await Promise.all([
-            rm17(stateFilePath, { force: true }),
+            rm18(stateFilePath, { force: true }),
             clearChecklist({ appRootDirPath: appRootDir }),
-            rm17(verificationDirPath, { recursive: true, force: true })
+            clearMigrationTurnsLog(appRootDir),
+            rm18(verificationDirPath, { recursive: true, force: true })
           ]);
         }
       } finally {
@@ -706080,7 +706350,7 @@ function registerMigrationRoutes(server, options8) {
         ...willSelfRestart ? { willSelfRestart: true } : {},
         message: "Upgrade started. The editor will reconnect automatically when the new runtime is ready."
       }));
-      const stateFilePath = join39(appRootDir, SCRATCH_DIR_NAME5, MIGRATION_STATE_FILE6);
+      const stateFilePath = join40(appRootDir, SCRATCH_DIR_NAME6, MIGRATION_STATE_FILE6);
       let backupCommitId;
       let restructured = false;
       let autoSyncPaused = false;
@@ -706290,6 +706560,26 @@ function registerMigrationRoutes(server, options8) {
         state: status.state,
         hasV2Backup: status.hasV2Backup
       });
+      if (migrationCompleteCommitInFlight) {
+        res.statusCode = 409;
+        res.end(JSON.stringify({
+          error: "Upgrade completion is already in progress."
+        }));
+        return;
+      }
+      if (!status.hasV2Backup && await isAlreadyOnFullstack(appRootDir)) {
+        logger25.info("[migrate-route] completion is a no-op; migration already finalized");
+        recordMigrationStage("complete", "success");
+        res.statusCode = 200;
+        res.setHeader("Content-Type", "application/json");
+        res.end(JSON.stringify({
+          ok: true,
+          alreadyComplete: true,
+          completionCommitId: status.migrationCommitId,
+          status
+        }));
+        return;
+      }
       if (status.state !== "done") {
         res.statusCode = 409;
         res.end(JSON.stringify({
@@ -706333,16 +706623,22 @@ function registerMigrationRoutes(server, options8) {
           remainingCount: clearedUpgradeItems.remainingCount
         });
       }
-      await rm17(join39(appRootDir, SCRATCH_DIR_NAME5, "v2-backup"), {
+      await rm18(join40(appRootDir, SCRATCH_DIR_NAME6, "v2-backup"), {
         recursive: true,
         force: true
       });
-      await rm17(join39(appRootDir, SCRATCH_DIR_NAME5), {
+      await rm18(join40(appRootDir, SCRATCH_DIR_NAME6), {
         recursive: true,
         force: true
       });
       logger25.info("[migrate-route] removed scratch directory");
-      const completionCommit = await syncService.commitLocalDraftChanges("migrate:complete");
+      migrationCompleteCommitInFlight = true;
+      let completionCommit;
+      try {
+        completionCommit = await syncService.commitLocalDraftChanges("migrate:complete");
+      } finally {
+        migrationCompleteCommitInFlight = false;
+      }
       if (!completionCommit?.commitId) {
         throw new Error("Upgrade completion checkpoint was not created; aborting completion flow.");
       }
@@ -706408,16 +706704,16 @@ function registerMigrationRoutes(server, options8) {
         res.end(JSON.stringify({ error: parsedPolicy.error }));
         return;
       }
-      const scratchDirPath = join39(appRootDir, SCRATCH_DIR_NAME5);
-      const stateFilePath = join39(scratchDirPath, MIGRATION_STATE_FILE6);
+      const scratchDirPath = join40(appRootDir, SCRATCH_DIR_NAME6);
+      const stateFilePath = join40(scratchDirPath, MIGRATION_STATE_FILE6);
       let parsed;
       try {
-        parsed = JSON.parse(await readFile27(stateFilePath, "utf-8"));
+        parsed = JSON.parse(await readFile28(stateFilePath, "utf-8"));
       } catch {
         parsed = {};
       }
       parsed.integrationWritePolicy = parsedPolicy.policy;
-      await mkdir23(scratchDirPath, { recursive: true });
+      await mkdir24(scratchDirPath, { recursive: true });
       await writeFile20(stateFilePath, JSON.stringify(parsed, null, 2) + "\n", "utf-8");
       const status = await resolveStatus(appRootDir);
       res.statusCode = 200;
@@ -706531,8 +706827,8 @@ function registerMigrationRoutes(server, options8) {
 }
 async function isAlreadyOnFullstack(appRootDir) {
   const [hasClient, hasServerApisIndex] = await Promise.all([
-    pathExists4(join39(appRootDir, "client")),
-    pathExists4(join39(appRootDir, "server", "apis", "index.ts"))
+    pathExists4(join40(appRootDir, "client")),
+    pathExists4(join40(appRootDir, "server", "apis", "index.ts"))
   ]);
   return hasClient && hasServerApisIndex;
 }
@@ -717427,7 +717723,7 @@ ${stderr}`;
 // ../sdk/dist/cli-replacement/home-npmrc.mjs
 init_cjs_shims();
 init_esm();
-import { mkdir as mkdir25 } from "node:fs/promises";
+import { mkdir as mkdir26 } from "node:fs/promises";
 import * as os7 from "node:os";
 import * as path74 from "node:path";
 var HOME_NPMRC_MODE = 256;
@@ -717473,7 +717769,7 @@ async function syncHomeNpmrcImpl(deps) {
   if (!result.config.configured) {
     if (result.config.allowInstallScripts === false) {
       try {
-        await mkdir25(path74.dirname(targetPath), { recursive: true });
+        await mkdir26(path74.dirname(targetPath), { recursive: true });
         await writeNpmrc(targetPath, result.config, {
           mode: HOME_NPMRC_MODE
         });
@@ -717510,7 +717806,7 @@ async function syncHomeNpmrcImpl(deps) {
     }
   }
   try {
-    await mkdir25(path74.dirname(targetPath), { recursive: true });
+    await mkdir26(path74.dirname(targetPath), { recursive: true });
     const snapshotOutcome = await snapshotInitialNpmrc(targetPath, backupPath);
     lastSnapshotOutcomeByPath.set(targetPath, snapshotOutcome);
     if (snapshotOutcome === "failed") {
@@ -720021,7 +720317,7 @@ async function isSocketAlive(socketPath) {
 init_cjs_shims();
 import { createHash as createHash6 } from "node:crypto";
 import * as fs36 from "node:fs/promises";
-import { join as join43 } from "node:path";
+import { join as join44 } from "node:path";
 var SUPERBLOCKS_LIBRARY_PACKAGE = "@superblocksteam/library";
 var SUPERBLOCKS_SDK_API_PACKAGE = "@superblocksteam/sdk-api";
 var MANAGED_PACKAGE_DEPENDENCIES = [
@@ -720176,7 +720472,7 @@ async function readPackageJson2(cwd) {
 }
 async function readPackageJsonFile(cwd) {
   try {
-    const source2 = await fs36.readFile(join43(cwd, "package.json"), "utf-8");
+    const source2 = await fs36.readFile(join44(cwd, "package.json"), "utf-8");
     return {
       packageJson: JSON.parse(source2),
       source: source2
@@ -720250,7 +720546,7 @@ async function restoreManagedPackageDependencies(cwd, warmPackageJson) {
   if (!changed) {
     return false;
   }
-  await fs36.writeFile(join43(cwd, "package.json"), JSON.stringify(restoredPackageJson, null, detectJsonIndent(restoredPackageJsonSource)) + (hasFinalNewline(restoredPackageJsonSource) ? "\n" : ""));
+  await fs36.writeFile(join44(cwd, "package.json"), JSON.stringify(restoredPackageJson, null, detectJsonIndent(restoredPackageJsonSource)) + (hasFinalNewline(restoredPackageJsonSource) ? "\n" : ""));
   return true;
 }
 
@@ -720625,7 +720921,7 @@ async function handleLockConflict(error40, lockSvc, span, logger25) {
 }
 async function readPkgJson(cwd) {
   try {
-    const { readPackage } = await import("./read-pkg-YSXIPKFE.js");
+    const { readPackage } = await import("./read-pkg-PGWLINNT.js");
     return await readPackage({ cwd });
   } catch {
     return null;
@@ -722500,4 +722796,4 @@ serve-static/index.js:
 chokidar/esm/index.js:
   (*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-TQTWTZU7.js.map
+//# sourceMappingURL=chunk-CMNID6AS.js.map