@superblocksteam/cli 2.0.116-next.1 → 2.0.116-next.2

package/dist/{chunk-JQW6DXYI.js → chunk-24DKMS3B.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 = '94c1006cab1308d3a346e02b7b7a6e6b9740542a';
+  process.env.DD_GIT_COMMIT_SHA = '81c2a295cc4509d2efa3f9161840000077094340';
 }
 import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
@@ -15,17 +15,17 @@ import {
   require_lib as require_lib2,
   require_lib2 as require_lib3,
   require_picocolors
-} from "./chunk-T4I24DT7.js";
+} from "./chunk-AXZ6TDDO.js";
 import {
   require_dd_trace,
   require_js_yaml,
   require_module_details_from_path,
   require_p_limit,
   require_path_to_regexp
-} from "./chunk-A6LIJT25.js";
+} from "./chunk-MODIJWJU.js";
 import {
   require_commonjs
-} from "./chunk-TKVJWGQX.js";
+} from "./chunk-EEZGYDB3.js";
 import {
   debounce_default,
   get_default,
@@ -42,13 +42,13 @@ import {
   require_lib,
   require_slugify,
   throttle_default
-} from "./chunk-A3BWIW47.js";
+} from "./chunk-5LIHJBYZ.js";
 import {
   require_dc_polyfill
-} from "./chunk-27XIMDTV.js";
+} from "./chunk-3IPIAPRG.js";
 import {
   require_token_error
-} from "./chunk-MZ2J2ULN.js";
+} from "./chunk-TQMWIRQ2.js";
 import {
   SpanKind,
   SpanStatusCode,
@@ -57,7 +57,7 @@ import {
   init_esm,
   metrics,
   trace
-} from "./chunk-AVFCLSXO.js";
+} from "./chunk-IO3HZVCH.js";
 import {
   __commonJS,
   __esm,
@@ -66,7 +66,7 @@ import {
   __toCommonJS,
   __toESM,
   init_cjs_shims
-} from "./chunk-BLB5NFEP.js";
+} from "./chunk-NNPHYHB2.js";
 
 // ../../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/constants.js
 var require_constants2 = __commonJS({
@@ -96870,15 +96870,15 @@ var require_api_files = __commonJS({
     exports2.readAppApiYamlFile = readAppApiYamlFile4;
     exports2.resolveLanguageSpecificStepContentFromBlocks = resolveLanguageSpecificStepContentFromBlocks2;
     async function writeApiFiles3(...args) {
-      const esmFunction = await import("./api-YH2HRVTC.js");
+      const esmFunction = await import("./api-A6MJTUXA.js");
       return esmFunction.writeApiFiles(...args);
     }
     async function readAppApiYamlFile4(...args) {
-      const esmFunction = await import("./api-YH2HRVTC.js");
+      const esmFunction = await import("./api-A6MJTUXA.js");
       return esmFunction.readAppApiYamlFile(...args);
     }
     async function resolveLanguageSpecificStepContentFromBlocks2(...args) {
-      const esmFunction = await import("./api-YH2HRVTC.js");
+      const esmFunction = await import("./api-A6MJTUXA.js");
       return esmFunction.resolveLanguageSpecificStepContentFromBlocks(...args);
     }
   }
@@ -104934,19 +104934,19 @@ var require_getMachineId = __commonJS({
       if (!getMachineIdImpl) {
         switch (process5.platform) {
           case "darwin":
-            getMachineIdImpl = (await import("./getMachineId-darwin-K56MEIIS.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-darwin-JXYW4NMH.js")).getMachineId;
             break;
           case "linux":
-            getMachineIdImpl = (await import("./getMachineId-linux-3JCREFHI.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-linux-5LUBIGXP.js")).getMachineId;
             break;
           case "freebsd":
-            getMachineIdImpl = (await import("./getMachineId-bsd-MW572OED.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-bsd-5TBLHARX.js")).getMachineId;
             break;
           case "win32":
-            getMachineIdImpl = (await import("./getMachineId-win-MHCIYAF4.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-win-IZP3KMWX.js")).getMachineId;
             break;
           default:
-            getMachineIdImpl = (await import("./getMachineId-unsupported-QTMJORAX.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-unsupported-UIQ4GUC6.js")).getMachineId;
             break;
         }
       }
@@ -116570,19 +116570,19 @@ var require_getMachineId2 = __commonJS({
       if (!getMachineIdImpl) {
         switch (process5.platform) {
           case "darwin":
-            getMachineIdImpl = (await import("./getMachineId-darwin-ZISN3KQL.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-darwin-E4T3JNRF.js")).getMachineId;
             break;
           case "linux":
-            getMachineIdImpl = (await import("./getMachineId-linux-PFC2JIP5.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-linux-NVYOIKHR.js")).getMachineId;
             break;
           case "freebsd":
-            getMachineIdImpl = (await import("./getMachineId-bsd-7ZLYAKYZ.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-bsd-XCZTC6LS.js")).getMachineId;
             break;
           case "win32":
-            getMachineIdImpl = (await import("./getMachineId-win-WR3KIJFV.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-win-RVFJNBX4.js")).getMachineId;
             break;
           default:
-            getMachineIdImpl = (await import("./getMachineId-unsupported-EZETQYMO.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-unsupported-GDPSTMNB.js")).getMachineId;
             break;
         }
       }
@@ -195850,8 +195850,8 @@ var require_get_vercel_oidc_token = __commonJS({
       }
       try {
         const [{ getTokenPayload, isExpired }, { refreshToken }] = await Promise.all([
-          await import("./token-util-IHXF2B5A.js"),
-          await import("./token-AW76GNVN.js")
+          await import("./token-util-VMLEINDJ.js"),
+          await import("./token-XLY2YZFR.js")
         ]);
         if (!token2 || isExpired(getTokenPayload(token2))) {
           await refreshToken();
@@ -393110,7 +393110,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-C2BEAO6I.js");
+        const { createJiti } = await import("./jiti-AUBZYQYQ.js");
         const version5 = require_package5().version;
         return { createJiti, version: version5 };
       }
@@ -393439,7 +393439,7 @@ var require_eslint_helpers = __commonJS({
     }
     async function globMatch({ basePath, pattern }) {
       let found = false;
-      const { hfs } = await import("./src-T47XNTSI.js");
+      const { hfs } = await import("./src-M2SIGNDK.js");
       const patternToUse = normalizeToPosix(path79.relative(basePath, pattern));
       const matcher = new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       const walkSettings = {
@@ -393479,7 +393479,7 @@ var require_eslint_helpers = __commonJS({
         return new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       });
       const unmatchedPatterns = /* @__PURE__ */ new Set([...relativeToPatterns.keys()]);
-      const { hfs } = await import("./src-T47XNTSI.js");
+      const { hfs } = await import("./src-M2SIGNDK.js");
       const walk2 = hfs.walk(basePath, {
         async directoryFilter(entry) {
           if (!matchers.some((matcher) => matcher.match(entry.path, true))) {
@@ -531232,7 +531232,7 @@ init_cjs_shims();
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.116-next.1",
+  version: "2.0.116-next.2",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
   license: "Superblocks Community Software License",
@@ -531594,7 +531594,7 @@ var config = void 0;
 var configured = false;
 var ddTracePromise = void 0;
 async function getDdTrace() {
-  ddTracePromise ??= import("./dd-trace-XFEDSACL.js").then((module2) => module2.default);
+  ddTracePromise ??= import("./dd-trace-PTBPDT2B.js").then((module2) => module2.default);
   return await ddTracePromise;
 }
 var deploymentType = (() => {
@@ -541252,7 +541252,7 @@ var MAX_ATTRIBUTE_LENGTH = 64e3;
 var LLMObsSpanWriter = null;
 async function loadLLMObsSpanWriter() {
   if (!LLMObsSpanWriter) {
-    const module2 = await import("./spans-RS7WII6K.js");
+    const module2 = await import("./spans-W3TA52H3.js");
     LLMObsSpanWriter = module2.default;
   }
   return LLMObsSpanWriter;
@@ -564342,6 +564342,13 @@ var IntegrationStore = (() => {
       getLogger3().debug(`[integration-store] availableIntegrations() returning ${integrationHeaders.length} integrations: ${integrationHeaders.map((i) => `${i.name}(${i.id})`).join(", ")}`);
       return integrationHeaders;
     }
+    /**
+     * Look up a single available integration by id. Same filters as `availableIntegrations()`
+     * (BUILD-permission via UI hydration + `UNSUPPORTED_INTEGRATIONS`).
+     */
+    async availableIntegration(id2) {
+      return (await this.availableIntegrations()).find((i) => i.id === id2);
+    }
     getPlugin(pluginId) {
       return this.pluginRegistry.get(pluginId);
     }
@@ -582995,6 +583002,7 @@ Only modify when:
 
 - User explicitly requests branding/theme changes
 - Replicating a specific brand look (e.g., Yelp, Instacart)
+- Migrating an attached third-party app \u2014 see \`skills/system/third-party-migration/SKILL.md\` (its theme-port rules override the Modification Rules below \u2014 copy source tokens as-is, do not convert to OKLCH or trim the palette)
 - Feature requests (lists, filters, CRUD) do NOT require changes
 
 **Modification Rules:**
@@ -583689,7 +583697,7 @@ For each Lovable page, only these change:
 
 - **Data hooks**: direct Supabase calls + \`@tanstack/react-query\` \u2192 \`useApi\` / \`useApiData\`.
 - **Auth touchpoints**: \`supabase.auth\` / custom \`AuthContext\` \u2192 platform-managed (drop the provider; consume \`ctx.user\` server-side).
-- **Router primitives**: if the source uses \`wouter\` or v6 patterns, adapt to \`react-router\` v7.
+- **Router primitives**: if the source uses \`wouter\` or v6 patterns, adapt to \`react-router\` v7. The router is statically parsed by the editor \u2014 bind page components only via static imports or \`lazy(() => import("..."))\` (see "Router shape" in the framework SKILL). Lovable sources commonly emit a long \`<Routes>\` block with \`<Route element={<Page />} />\` JSX; rewrite this as a \`createBrowserRouter([...])\` array using \`Component:\` (or inline \`lazy:\`), keeping the \`const Page = lazy(() => import("./pages/Page/index.tsx"))\` declarations intact.
 
 Everything else \u2014 JSX structure, Tailwind classes, shadcn variants, custom CSS, theme tokens, fonts, layout containers \u2014 transfers unchanged. If the diff goes beyond data + auth + routing, you are over-editing.
 
@@ -583802,7 +583810,7 @@ The app you are running inside looks like this. Do not invent new top-level dire
 \`\`\`
 client/
   App.tsx           \u2014 root with <AppProvider> + <Outlet />
-  router.tsx        \u2014 react-router v7, lazy imports
+  router.tsx        \u2014 react-router v7 data mode (\`createBrowserRouter\`); see Router shape below
   index.css         \u2014 Tailwind v4 + theme tokens
   hooks/
     useApi.ts       \u2014 typed wrapper around useTypedApi<ApiRegistry>
@@ -583832,6 +583840,28 @@ These hold regardless of source platform. Per-platform specifics layer on top.
 - **Each frontend page \u2192 one Superblocks page** at \`client/pages/<Name>/index.tsx\`, wired into \`client/router.tsx\`.
 - **Each backend data source (DB, REST client, S3, ...) \u2192 one Superblocks integration** referenced by UUID. Credentials live on the integration, never in code.
 
+### Router shape (\`client/router.tsx\`)
+
+The editor parses this file statically to build the page list and route table. **Use one of the supported page-component bindings \u2014 anything else silently drops every route and the editor shows a "404 / route has been deleted" overlay.**
+
+Supported page bindings (mix freely):
+
+\`\`\`tsx
+// 1. Inline lazy on the route object (preferred \u2014 matches the template):
+{ path: "about", lazy: () => import("./pages/About/index.tsx").then(m => ({ Component: m.default })) }
+
+// 2. Static default import + Component / element:
+import About from "./pages/About/index.tsx";
+{ path: "about", Component: About }
+{ path: "about", element: <About /> }
+
+// 3. Top-level \`const\` bound to React.lazy + Component / element:
+const About = lazy(() => import("./pages/About/index.tsx"));
+{ path: "about", Component: About }
+\`\`\`
+
+Do **not**: assign \`Component\` / \`element\` to identifiers bound by anything other than a static import or \`lazy(() => import("..."))\` (no IIFEs, no helper wrappers, no conditional \`lazy(...)\`, no objects whose keys are computed from a loop). The parser only resolves the shapes above.
+
 ## Authoritative references (read just-in-time, not up front)
 
 - \`node_modules/@superblocksteam/sdk-api/README.md\` and \`src/index.ts\` \u2014 the server \`api()\` contract and the full list of factory names. **Never invent factory names.** If a required file is missing, mark the affected checklist item \`failed\` with the missing path as the reason.
@@ -601179,6 +601209,70 @@ var clarkFailedResponseHandler = createJsonErrorResponseHandler({
   errorToMessage: (data3) => data3.responseMetadata.error.message
 });
 
+// ../../../clark/dist/content-block-utils.js
+init_cjs_shims();
+function isContentBlockArray(value2) {
+  if (!Array.isArray(value2) || value2.length === 0)
+    return false;
+  return value2.every((item) => {
+    if (typeof item !== "object" || item === null)
+      return false;
+    const keys = Object.keys(item);
+    if (!keys.every((k) => k === "text" || k === "type"))
+      return false;
+    const record2 = item;
+    return typeof record2.text === "string" && (!("type" in record2) || record2.type === "text");
+  });
+}
+function extractTextFromContentBlocks(blocks) {
+  return blocks.map((b) => b.text).join("");
+}
+function tryUnwrapContentBlock(value2) {
+  if (isContentBlockArray(value2)) {
+    return { unwrapped: true, text: extractTextFromContentBlocks(value2) };
+  }
+  if (typeof value2 === "string" && value2.startsWith("[")) {
+    try {
+      const parsed = JSON.parse(value2);
+      if (isContentBlockArray(parsed)) {
+        return {
+          unwrapped: true,
+          text: extractTextFromContentBlocks(parsed)
+        };
+      }
+    } catch {
+    }
+  }
+  return { unwrapped: false };
+}
+function unwrapContentBlockValues(obj) {
+  if (typeof obj !== "object" || obj === null || Array.isArray(obj))
+    return obj;
+  const entries = Object.entries(obj);
+  let changed = false;
+  const result = {};
+  for (const [key2, value2] of entries) {
+    const attempt = tryUnwrapContentBlock(value2);
+    if (attempt.unwrapped) {
+      result[key2] = attempt.text;
+      changed = true;
+    } else {
+      result[key2] = value2;
+    }
+  }
+  return changed ? result : obj;
+}
+function serializeToolInput(input) {
+  return JSON.stringify(unwrapContentBlockValues(input ?? {}));
+}
+function unwrapToolInputDelta(delta) {
+  const attempt = tryUnwrapContentBlock(delta);
+  if (attempt.unwrapped) {
+    return attempt.text;
+  }
+  return delta;
+}
+
 // ../../../clark/dist/clark-language-model.js
 function toFinishReason(rawFinishReason) {
   const normalized = rawFinishReason === "stop" || rawFinishReason === "length" || rawFinishReason === "content-filter" || rawFinishReason === "tool-calls" || rawFinishReason === "error" || rawFinishReason === "other" ? rawFinishReason : "other";
@@ -601411,7 +601505,7 @@ var ClarkChatLanguageModel = class {
           type: "tool-call",
           toolCallId: toolCall.toolCallId,
           toolName: toolCall.toolName,
-          input: JSON.stringify(toolCall.args ?? {})
+          input: serializeToolInput(toolCall.args)
         });
       }
     }
@@ -601572,7 +601666,7 @@ var ClarkChatLanguageModel = class {
                 controller.enqueue({
                   type: "tool-input-delta",
                   id: id2,
-                  delta
+                  delta: unwrapToolInputDelta(delta)
                 });
                 break;
               }
@@ -601597,7 +601691,7 @@ var ClarkChatLanguageModel = class {
                   type: "tool-call",
                   toolCallId,
                   toolName,
-                  input: JSON.stringify(value2.input ?? {})
+                  input: serializeToolInput(value2.input)
                 });
                 break;
               }
@@ -616259,7 +616353,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-QX6HZ5FP.js");
+      const { startEmbeddedPlaywrightMcpServer } = await import("./embedded-playwright-mcp-server-QSSXJHIK.js");
       this.server = await startEmbeddedPlaywrightMcpServer({
         storageStatePath: options8?.storageStatePath,
         jwt: options8?.jwt,
@@ -620726,7 +620820,8 @@ An \`<attachment_reference>\` block means the bytes are NOT in context \u2014 yo
 Rules:
 - Never fetch the attachment \`url\` directly (no ad-hoc code, shell, urllib/curl, or HTTP requests) \u2014 \`downloadAttachments\` is the only path.
 - Do not claim contents were reviewed unless you actually downloaded and inspected them in this turn.
-- If the block's \`note\` says the file is unsupported, do not download \u2014 tell the user and ask how to proceed.
+- If the block's \`note\` says the file is unsupported, do not download \u2014 tell the user and ask how to proceed.${thirdPartyImportEnabled ? `
+- If the attachment is a third-party app export (e.g. Replit, Lovable, v0, Next.js), \`build_readFile\` \`skills/system/third-party-migration/SKILL.md\` before drafting a plan, and the plan you submit to \`exitPlanMode\` must include theme/styling fidelity (color tokens, fonts, layout shells) \u2014 not just the functional spec.` : ""}
 - In Plan mode after inspection, don't freeform implement; use \`askMultiChoice\` or \`exitPlanMode\`. In Build mode, continue.` : `**Attachment workflow:**
 - Call \`listAttachments\` to discover attachment IDs when the user references uploaded files, then inspect them inline.
 - Do not fetch attachment URLs directly with ad-hoc code, shell scripts, or HTTP requests.`}
@@ -646070,7 +646165,7 @@ note: This archive was not uploaded to persistent storage, so downloadAttachment
     throw new Error("Unsupported attachment type");
   });
 };
-var buildUserMessage = ({ userPrompt, promptContext, planContext, mode, services, userChanges, userFactsSection, pendingKnowledgeFreeTextTurn, pendingKnowledgeEntries, skillsNeedReload, useSystemSkills }) => {
+var buildUserMessage = ({ preferredAppInferenceIntegration, userPrompt, promptContext, planContext, mode, services, userChanges, userFactsSection, pendingKnowledgeFreeTextTurn, pendingKnowledgeEntries, skillsNeedReload, useSystemSkills }) => {
   const content16 = [];
   if (skillsNeedReload && useSystemSkills) {
     const sdkApiEnabled = services.features?.sdkApiEnabled ?? false;
@@ -646323,21 +646418,19 @@ Do NOT proceed with API work until you have read these files. They contain integ
       });
     }
   }
-  const defaultAiIntegrationId = promptContext?.aiConfiguration?.preferredAppInferenceIntegrationId;
-  if (defaultAiIntegrationId) {
-    const defaultFromContext = promptContext?.integrations?.find((i) => i.id === defaultAiIntegrationId);
-    const defaultPayload = defaultFromContext ? {
-      id: defaultFromContext.id,
-      name: defaultFromContext.displayName || defaultFromContext.name,
-      tagName: defaultFromContext.name,
-      type: defaultFromContext.type
-    } : { id: defaultAiIntegrationId };
+  if (preferredAppInferenceIntegration) {
+    const defaultPayload = {
+      id: preferredAppInferenceIntegration.id,
+      name: preferredAppInferenceIntegration.displayName || preferredAppInferenceIntegration.name,
+      tagName: preferredAppInferenceIntegration.name,
+      type: preferredAppInferenceIntegration.type
+    };
     content16.push({
       type: "text",
       text: `<default_ai_integration>
 The organization has configured the following integration as the default for AI inference in customer-built apps:
 ${escapeTagDelimiters(safeJsonStringify(defaultPayload))}
-When the user asks for AI-powered functionality (chatbots, summarization, classification, content generation, semantic search, etc.), use this integration for AI inference WITHOUT asking the user which provider to use. Only pick a different AI integration if the user explicitly names another provider.
+When the user asks for AI-powered functionality (chatbots, summarization, classification, content generation, semantic search, etc.), DIRECTLY use this integration for AI inference. Do NOT use askMultiChoice or searchIntegrations to ask which AI provider to use \u2014 this integration is already the organization's chosen default. Include its ID in integrationIds when calling exitPlanMode for plans that involve AI-powered features. Only pick a different AI integration if the user explicitly names another provider.
 </default_ai_integration>
 
 `
@@ -646492,7 +646585,10 @@ var doLLMGenerating = (clark, services) => {
         void services.logger.info("[llm-generating] System prompt:", {
           system
         });
+        const preferredAppInferenceIntegrationId = promptContext?.aiConfiguration?.preferredAppInferenceIntegrationId;
+        const preferredAppInferenceIntegration = preferredAppInferenceIntegrationId ? await services.integrationStore.availableIntegration(preferredAppInferenceIntegrationId) : void 0;
         const user = buildUserMessage({
+          preferredAppInferenceIntegration,
           userPrompt,
           promptContext,
           planContext,
@@ -653418,7 +653514,7 @@ var SocketManager = class extends import_shared62.TracedEventEmitter {
     super(tracer4);
   }
   socketServer;
-  startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, gitService, activateGitService, checkAuthorization, path: path79, tracer: tracer4, gitOperationLock, superblocksBaseUrl }) {
+  startSocketServer({ server, fileSyncManager, syncService, lockService, aiService, gitService, gitBootstrapFailed, activateGitService, checkAuthorization, path: path79, tracer: tracer4, gitOperationLock, superblocksBaseUrl }) {
     if (this.socketServer) {
       throw new Error("Socket server already started");
     }
@@ -653985,7 +654081,7 @@ var SocketManager = class extends import_shared62.TracedEventEmitter {
             async () => {
               const readyGitService = await getActiveGitService();
               if (!readyGitService) {
-                return null;
+                return gitBootstrapFailed ? { bootstrapFailed: true } : null;
               }
               let hasUncommittedChanges = false;
               try {
@@ -662663,14 +662759,69 @@ async function findRouterFile(rootDir) {
   }
   throw new Error("Could not find router file with createBrowserRouter in project");
 }
+function isRelativeOrAliasImport(specifier) {
+  return specifier.startsWith(".") || specifier.startsWith("/") || specifier.startsWith("@/");
+}
+function logUnresolvedComponent(kind, name16, routerFilePath) {
+  getLogger3().debug(`Router parser: could not resolve ${kind} identifier "${name16}" to an import in ${routerFilePath}. Supported page-component bindings: \`import X from "..."\`, \`import { X } from "..."\`, or \`const X = lazy(() => import("..."))\`.`);
+}
+function extractImportSpecifierFromExpression(node) {
+  if (!node)
+    return null;
+  if (node.type === "CallExpression" && node.callee.type === "Import" && node.arguments[0]?.type === "StringLiteral") {
+    return node.arguments[0].value;
+  }
+  if (node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.callee.object.type === "CallExpression" && node.callee.object.callee.type === "Import" && node.callee.object.arguments[0]?.type === "StringLiteral") {
+    return node.callee.object.arguments[0].value;
+  }
+  return null;
+}
+function extractImportPathFromArrowFunction(node) {
+  const body = node.body;
+  if (body.type === "BlockStatement") {
+    for (const statement of body.body) {
+      if (statement.type === "VariableDeclaration") {
+        for (const decl of statement.declarations) {
+          let init2 = decl.init;
+          if (init2?.type === "AwaitExpression")
+            init2 = init2.argument;
+          const path79 = extractImportSpecifierFromExpression(init2);
+          if (path79)
+            return path79;
+        }
+      } else if (statement.type === "ReturnStatement") {
+        let arg = statement.argument;
+        if (arg?.type === "AwaitExpression")
+          arg = arg.argument;
+        const path79 = extractImportSpecifierFromExpression(arg);
+        if (path79)
+          return path79;
+      }
+    }
+    return null;
+  }
+  const expr = body.type === "AwaitExpression" && body.argument ? body.argument : body;
+  return extractImportSpecifierFromExpression(expr);
+}
+function extractLazyImportPath(node) {
+  if (node.type !== "CallExpression")
+    return null;
+  const callee = node.callee;
+  const isLazy = callee.type === "Identifier" && callee.name === "lazy" || callee.type === "MemberExpression" && !callee.computed && callee.object.type === "Identifier" && callee.object.name === "React" && callee.property.type === "Identifier" && callee.property.name === "lazy";
+  if (!isLazy)
+    return null;
+  const arg = node.arguments[0];
+  if (!arg || arg.type !== "ArrowFunctionExpression")
+    return null;
+  return extractImportPathFromArrowFunction(arg);
+}
 function extractAllImports(content16) {
   const imports = /* @__PURE__ */ new Map();
   try {
     const staticImports = findStaticImports(content16);
     for (const staticImport of staticImports) {
       const parsed = parseStaticImport(staticImport);
-      const isRelativeOrAlias = parsed.specifier.startsWith(".") || parsed.specifier.startsWith("/") || parsed.specifier.startsWith("@/");
-      if (!isRelativeOrAlias) {
+      if (!isRelativeOrAliasImport(parsed.specifier)) {
         continue;
       }
       if (parsed.defaultImport) {
@@ -662703,15 +662854,23 @@ async function parseRouterFile(routerFilePath, rootDir) {
     traverse(ast, {
       VariableDeclarator(astPath) {
         const node = astPath.node;
-        if (node.id.type === "Identifier" && node.init?.type === "ArrayExpression") {
+        if (node.id.type !== "Identifier" || !node.init)
+          return;
+        if (node.init.type === "ArrayExpression") {
           variableDeclarations.set(node.id.name, node.init);
-        }
-        if (node.id.type === "Identifier" && node.init?.type === "TSAsExpression" && node.init.expression.type === "ArrayExpression") {
+        } else if (node.init.type === "TSAsExpression" && node.init.expression.type === "ArrayExpression") {
           variableDeclarations.set(node.id.name, node.init.expression);
-        }
-        if (node.id.type === "Identifier" && node.init?.type === "TSSatisfiesExpression" && node.init.expression.type === "ArrayExpression") {
+        } else if (node.init.type === "TSSatisfiesExpression" && node.init.expression.type === "ArrayExpression") {
           variableDeclarations.set(node.id.name, node.init.expression);
         }
+        const declarationParent = astPath.parentPath?.parentPath;
+        const isTopLevel = declarationParent ? declarationParent.isProgram() || declarationParent.isExportNamedDeclaration() && (declarationParent.parentPath?.isProgram() ?? false) : false;
+        if (isTopLevel && !allImports.has(node.id.name)) {
+          const lazyImportPath = extractLazyImportPath(node.init);
+          if (lazyImportPath && isRelativeOrAliasImport(lazyImportPath)) {
+            allImports.set(node.id.name, lazyImportPath);
+          }
+        }
       }
     });
     traverse(ast, {
@@ -662770,46 +662929,15 @@ async function extractRouteFromObject(node, routes, routerFilePath, rootDir, par
     } else if (key2 === "index" && prop2.value.type === "BooleanLiteral") {
       hasIndex = prop2.value.value;
     } else if (key2 === "lazy" && prop2.value.type === "ArrowFunctionExpression") {
-      let body = prop2.value.body;
-      if (body.type === "BlockStatement") {
-        for (const statement of body.body) {
-          if (statement.type !== "VariableDeclaration")
-            continue;
-          for (const declarator of statement.declarations) {
-            let init2 = declarator.init;
-            if (init2?.type === "AwaitExpression") {
-              init2 = init2.argument;
-            }
-            if (init2?.type === "CallExpression" && init2.callee.type === "Import" && init2.arguments[0]?.type === "StringLiteral") {
-              pageImportPath = init2.arguments[0].value;
-              break;
-            }
-          }
-          if (pageImportPath)
-            break;
-        }
-        continue;
-      }
-      if (body.type === "AwaitExpression") {
-        body = body.argument;
-      }
-      if (body.type === "CallExpression" && body.callee.type === "Import") {
-        if (body.arguments[0]?.type === "StringLiteral") {
-          pageImportPath = body.arguments[0].value;
-        }
-        continue;
-      }
-      if (body.type === "CallExpression" && body.callee.type === "MemberExpression" && body.callee.object.type === "CallExpression" && body.callee.object.callee.type === "Import") {
-        const importCall = body.callee.object;
-        if (importCall.arguments[0]?.type === "StringLiteral") {
-          pageImportPath = importCall.arguments[0].value;
-        }
-        continue;
-      }
+      const path79 = extractImportPathFromArrowFunction(prop2.value);
+      if (path79)
+        pageImportPath = path79;
     } else if (key2 === "Component" && prop2.value.type === "Identifier") {
       const componentName = prop2.value.name;
       if (allImports.has(componentName)) {
         pageImportPath = allImports.get(componentName);
+      } else {
+        logUnresolvedComponent("Component", componentName, routerFilePath);
       }
     } else if (key2 === "element" && prop2.value.type === "JSXElement") {
       const jsxElement = prop2.value;
@@ -662817,6 +662945,8 @@ async function extractRouteFromObject(node, routes, routerFilePath, rootDir, par
         const componentName = jsxElement.openingElement.name.name;
         if (allImports.has(componentName)) {
           pageImportPath = allImports.get(componentName);
+        } else {
+          logUnresolvedComponent("element", componentName, routerFilePath);
         }
       }
     } else if (key2 === "children" && prop2.value.type === "ArrayExpression") {
@@ -676624,7 +676754,7 @@ var parseYaml3;
 async function loadYaml(file2) {
   const content16 = await read_file_default(file2);
   if (!parseYaml3) {
-    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-7OTOPLZG.js"));
+    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-RTSSBABK.js"));
   }
   try {
     return parseYaml3(content16);
@@ -682018,7 +682148,7 @@ function createParsersAndPrinters(modules) {
 }
 var estreePlugin = createParsersAndPrinters([
   {
-    importPlugin: () => import("./estree-DKDBWMWV.js"),
+    importPlugin: () => import("./estree-NUS4QSAG.js"),
     printers: ["estree", "estree-json"]
   }
 ]);
@@ -682042,11 +682172,11 @@ var languages = [
 ];
 var { parsers: parsers12, printers } = createParsersAndPrinters([
   {
-    importPlugin: () => import("./acorn-U72GJHXJ.js"),
+    importPlugin: () => import("./acorn-QUZNODVK.js"),
     parsers: ["acorn", "espree"]
   },
   {
-    importPlugin: () => import("./angular-RFNJE6BH.js"),
+    importPlugin: () => import("./angular-J5OAYFZO.js"),
     parsers: [
       "__ng_action",
       "__ng_binding",
@@ -682055,7 +682185,7 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./babel-I3KEV5HB.js"),
+    importPlugin: () => import("./babel-I3HB6RUW.js"),
     parsers: [
       "babel",
       "babel-flow",
@@ -682074,44 +682204,44 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./flow-D2EFJCNB.js"),
+    importPlugin: () => import("./flow-E7DRCMMI.js"),
     parsers: ["flow"]
   },
   {
-    importPlugin: () => import("./glimmer-KROCBZZS.js"),
+    importPlugin: () => import("./glimmer-6ANTYH2P.js"),
     parsers: ["glimmer"],
     printers: ["glimmer"]
   },
   {
-    importPlugin: () => import("./graphql-ZBVIIMSI.js"),
+    importPlugin: () => import("./graphql-EWI2TEWV.js"),
     parsers: ["graphql"],
     printers: ["graphql"]
   },
   {
-    importPlugin: () => import("./html-EJOIUUS4.js"),
+    importPlugin: () => import("./html-YOPXDSS2.js"),
     parsers: ["html", "angular", "vue", "lwc", "mjml"],
     printers: ["html"]
   },
   {
-    importPlugin: () => import("./markdown-2ER5VOWK.js"),
+    importPlugin: () => import("./markdown-OPEAPKNT.js"),
     parsers: ["markdown", "mdx", "remark"],
     printers: ["mdast"]
   },
   {
-    importPlugin: () => import("./meriyah-BM44GXM4.js"),
+    importPlugin: () => import("./meriyah-A3S6H7ZT.js"),
     parsers: ["meriyah"]
   },
   {
-    importPlugin: () => import("./postcss-LMHTYA72.js"),
+    importPlugin: () => import("./postcss-XTQ6SCBH.js"),
     parsers: ["css", "less", "scss"],
     printers: ["postcss"]
   },
   {
-    importPlugin: () => import("./typescript-WEDRVYCM.js"),
+    importPlugin: () => import("./typescript-DUC5CKYO.js"),
     parsers: ["typescript"]
   },
   {
-    importPlugin: () => import("./yaml-7OTOPLZG.js"),
+    importPlugin: () => import("./yaml-RTSSBABK.js"),
     parsers: ["yaml"],
     printers: ["yaml"]
   }
@@ -686558,6 +686688,7 @@ function fileSyncVitePlugin(pluginParams, options8) {
             syncService,
             aiService,
             gitService,
+            gitBootstrapFailed: pluginParams.gitBootstrapFailed,
             activateGitService,
             checkAuthorization: pluginParams.checkAuthorization,
             tracer: pluginParams.tracer,
@@ -695436,7 +695567,7 @@ function getJwksUriWithBaseUrl(superblocksBaseUrl) {
   return jwksUri;
 }
 var httpServer;
-async function createDevServer({ root: root3, mode, fsOperationQueue, syncService, lockService, aiService, gitService, activateGitService, snapshotManager, logger: loggerOverride, port, sdk, superblocksBaseUrl: explicitBaseUrl, existingServer }) {
+async function createDevServer({ root: root3, mode, fsOperationQueue, syncService, lockService, aiService, gitService, gitBootstrapFailed, activateGitService, snapshotManager, logger: loggerOverride, port, sdk, superblocksBaseUrl: explicitBaseUrl, existingServer }) {
   const logger16 = getLogger2(loggerOverride);
   if (httpServer) {
     logger16.debug("Dev server already running");
@@ -695777,6 +695908,7 @@ async function createDevServer({ root: root3, mode, fsOperationQueue, syncServic
       lockService,
       aiService,
       gitService,
+      gitBootstrapFailed,
       activateGitService,
       snapshotManager,
       checkAuthorization,
@@ -695798,7 +695930,7 @@ async function createDevServer({ root: root3, mode, fsOperationQueue, syncServic
   }
   return httpServer;
 }
-async function startVite({ app, httpServer: httpServer2, root: root3, mode, port, fsOperationQueue, syncService, lockService, aiService, gitService, activateGitService, snapshotManager, checkAuthorization, logger: loggerOverride, superblocksBaseUrl, features }) {
+async function startVite({ app, httpServer: httpServer2, root: root3, mode, port, fsOperationQueue, syncService, lockService, aiService, gitService, gitBootstrapFailed, activateGitService, snapshotManager, checkAuthorization, logger: loggerOverride, superblocksBaseUrl, features }) {
   return tracer3.startActiveSpan("startVite", async (startViteSpan) => {
     try {
       const logger16 = getLogger2(loggerOverride);
@@ -695850,6 +695982,7 @@ async function startVite({ app, httpServer: httpServer2, root: root3, mode, port
         lockService,
         aiService,
         gitService,
+        gitBootstrapFailed,
         activateGitService,
         snapshotManager,
         httpServer: httpServer2,
@@ -696712,7 +696845,7 @@ async function handleLockConflict(error40, lockSvc, span, logger16) {
 }
 async function readPkgJson(cwd) {
   try {
-    const { readPackage } = await import("./read-pkg-ONODI7W3.js");
+    const { readPackage } = await import("./read-pkg-47YN6Y5W.js");
     return await readPackage({ cwd });
   } catch {
     return null;
@@ -696820,6 +696953,7 @@ async function dev(options8) {
       const port = devServerPort ?? 5173;
       const fsOperationQueue = new OperationQueue();
       let activeDbfsBranchName = applicationConfig?.branchName ?? "main";
+      let devStartupGitOutcome = "skipped_no_remote";
       if (applicationConfig && !skipSync) {
         const rpcClient = new AutoConnectingRpcClient(tokenConfig.superblocksBaseUrl, tokenConfig.token, tracer4, tokenManager, logger16);
         const featureFlags = await tracer4.startActiveSpan("getFeatureFlags", async (span) => {
@@ -696935,7 +697069,6 @@ async function dev(options8) {
               }
             });
             logger16.info(`[dev-startup] Starting git sync (${downloadFirst ? "download" : "upload"}-first) on branch '${activeDbfsBranchName}'`);
-            let devStartupGitOutcome = "skipped_no_remote";
             await tracer4.startActiveSpan("gitSync", async (gitSpan) => {
               try {
                 const bootstrappedGitService = await bootstrapGitService({
@@ -697249,6 +697382,7 @@ async function dev(options8) {
           lockService,
           aiService,
           gitService,
+          gitBootstrapFailed: devStartupGitOutcome === "bootstrap_failed",
           activateGitService: activateRuntimeGitService,
           snapshotManager,
           logger: options8.logger,
@@ -697319,6 +697453,12 @@ async function bootstrapGitService({ sdk, applicationId, cwd, logger: logger16,
     }
   }
   await service.configure({ credentials, userName, userEmail });
+  logger16.info("[git] configure complete, proceeding to ensureGitRepo", {
+    gitCategory: "setup",
+    gitOperation: "bootstrap",
+    applicationId,
+    workDir: cwd
+  });
   await ensureGitRepo(service, gitConfig.gitRemoteUrl, superblocksBaseUrl);
   return service;
 }
@@ -697346,6 +697486,13 @@ async function ensureGitRepo(git, remoteUrl, superblocksBaseUrl) {
   const hasGit = await nodeFs.access(path78.join(git.workDir, ".git")).then(() => true, () => false);
   if (!hasGit) {
     await git.init();
+    const gitDirAfterInit = await nodeFs.access(path78.join(git.workDir, ".git")).then(() => true, () => false);
+    getLogger2().info("[git] ensureGitRepo init complete", {
+      gitCategory: "setup",
+      gitOperation: "ensure-repo",
+      gitDirCreated: gitDirAfterInit,
+      workDir: git.workDir
+    });
     await git.addRemote("origin", remoteUrl);
     const remoteRefs = await git.raw([
       "ls-remote",
@@ -698161,4 +698308,4 @@ serve-static/index.js:
 chokidar/esm/index.js:
   (*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-JQW6DXYI.js.map
+//# sourceMappingURL=chunk-24DKMS3B.js.map