@superblocksteam/cli 2.0.105-next.4 → 2.0.105-next.5

package/dist/{chunk-MAQLTSHB.js → chunk-AVKVXWKJ.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 = '077dbb7ff3e00f7ca942247a66b71279427b1b00';
+  process.env.DD_GIT_COMMIT_SHA = '8e1822386833b3e535aac72538348bb99b9da073';
 }
 import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
@@ -24,7 +24,7 @@ import {
   require_re,
   require_semver,
   require_valid
-} from "./chunk-JQIBWPYB.js";
+} from "./chunk-DKXQ57WS.js";
 import {
   debounce_default,
   get_default,
@@ -41,7 +41,7 @@ import {
   require_lib,
   require_slugify,
   throttle_default
-} from "./chunk-PHWLMXDX.js";
+} from "./chunk-LXPILG67.js";
 import {
   require_dd_trace,
   require_import_in_the_middle,
@@ -50,16 +50,16 @@ import {
   require_p_limit,
   require_path_to_regexp,
   require_src
-} from "./chunk-HYRE2UIV.js";
+} from "./chunk-7M4YHJV2.js";
 import {
   require_commonjs
-} from "./chunk-UT2PIQQW.js";
+} from "./chunk-OQDZI7FE.js";
 import {
   require_dc_polyfill
-} from "./chunk-M62PQGNW.js";
+} from "./chunk-I63GF7VA.js";
 import {
   require_token_error
-} from "./chunk-SP7QB3NW.js";
+} from "./chunk-LUJ4CJWP.js";
 import {
   SpanKind,
   SpanStatusCode,
@@ -68,7 +68,7 @@ import {
   init_esm,
   metrics,
   trace
-} from "./chunk-7ZHHOLLO.js";
+} from "./chunk-3RV7M2PT.js";
 import {
   __commonJS,
   __esm,
@@ -77,7 +77,7 @@ import {
   __toCommonJS,
   __toESM,
   init_cjs_shims
-} from "./chunk-NBOHJQPH.js";
+} from "./chunk-HIJJKWAX.js";
 
 // ../../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/constants.js
 var require_constants3 = __commonJS({
@@ -38310,14 +38310,14 @@ var require_quota_paywall = __commonJS({
         subtitle: "Your organization has reached its deployed app limit. Add more deployed apps to continue."
       }
     };
-    exports2.AI_QUOTA_PAYWALL_PRICE_PER_SEAT_ANNUAL = 80;
-    exports2.AI_QUOTA_PAYWALL_PRICE_PER_SEAT_MONTHLY = 100;
-    exports2.AI_QUOTA_PAYWALL_CREDITS_PER_SEAT = 80;
+    exports2.AI_QUOTA_PAYWALL_PRICE_PER_SEAT_ANNUAL = 100;
+    exports2.AI_QUOTA_PAYWALL_PRICE_PER_SEAT_MONTHLY = 125;
+    exports2.AI_QUOTA_PAYWALL_CREDITS_PER_SEAT = 100;
     exports2.AI_QUOTA_PAYWALL_APPS_PER_SEAT = 1;
     exports2.AI_QUOTA_PAYWALL_MIN_SEATS = 1;
     exports2.AI_QUOTA_PAYWALL_MAX_SEATS = 100;
     exports2.AI_QUOTA_PAYWALL_TEAMS_FEATURES = [
-      "80 AI Credits per AI Builder / month",
+      "100 AI Credits per AI Builder / month",
       "Org-level credit top-ups, shared across team",
       "Clark AI agent for app building",
       "Clark User Memory",
@@ -40714,8 +40714,9 @@ var require_integration2 = __commonJS({
       configurations;
       slug;
       ownerEmail;
+      creator;
       enabledForV2;
-      constructor({ id: id2, created, updated, name: name17, pluginId, organizationId, configurations, demoIntegrationId, isUserConfigured, ownerEmail, kind, slug, enabledForV2 }) {
+      constructor({ id: id2, created, updated, name: name17, pluginId, organizationId, configurations, demoIntegrationId, isUserConfigured, ownerEmail, creator, kind, slug, enabledForV2 }) {
         super();
         this.id = id2;
         this.created = created;
@@ -40727,6 +40728,7 @@ var require_integration2 = __commonJS({
         this.configurations = configurations;
         this.isUserConfigured = isUserConfigured;
         this.ownerEmail = ownerEmail;
+        this.creator = creator;
         this.kind = kind;
         this.slug = slug;
         this.enabledForV2 = enabledForV2;
@@ -96496,15 +96498,15 @@ var require_api_files = __commonJS({
     exports2.readAppApiYamlFile = readAppApiYamlFile4;
     exports2.resolveLanguageSpecificStepContentFromBlocks = resolveLanguageSpecificStepContentFromBlocks2;
     async function writeApiFiles3(...args) {
-      const esmFunction = await import("./api-3XZF2X7G.js");
+      const esmFunction = await import("./api-5LWZ2RJV.js");
       return esmFunction.writeApiFiles(...args);
     }
     async function readAppApiYamlFile4(...args) {
-      const esmFunction = await import("./api-3XZF2X7G.js");
+      const esmFunction = await import("./api-5LWZ2RJV.js");
       return esmFunction.readAppApiYamlFile(...args);
     }
     async function resolveLanguageSpecificStepContentFromBlocks2(...args) {
-      const esmFunction = await import("./api-3XZF2X7G.js");
+      const esmFunction = await import("./api-5LWZ2RJV.js");
       return esmFunction.resolveLanguageSpecificStepContentFromBlocks(...args);
     }
   }
@@ -109296,19 +109298,19 @@ var require_getMachineId = __commonJS({
       if (!getMachineIdImpl) {
         switch (process5.platform) {
           case "darwin":
-            getMachineIdImpl = (await import("./getMachineId-darwin-54K2BDUE.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-darwin-7SOYKEDM.js")).getMachineId;
             break;
           case "linux":
-            getMachineIdImpl = (await import("./getMachineId-linux-AWND2HGT.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-linux-VOAZGOQK.js")).getMachineId;
             break;
           case "freebsd":
-            getMachineIdImpl = (await import("./getMachineId-bsd-OMUMBPUC.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-bsd-TYV34NXZ.js")).getMachineId;
             break;
           case "win32":
-            getMachineIdImpl = (await import("./getMachineId-win-7TESEAM6.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-win-ZDDTCX7C.js")).getMachineId;
             break;
           default:
-            getMachineIdImpl = (await import("./getMachineId-unsupported-4AF5C7FT.js")).getMachineId;
+            getMachineIdImpl = (await import("./getMachineId-unsupported-KYTYK754.js")).getMachineId;
             break;
         }
       }
@@ -185171,8 +185173,8 @@ var require_get_vercel_oidc_token = __commonJS({
       }
       try {
         const [{ getTokenPayload, isExpired }, { refreshToken }] = await Promise.all([
-          await import("./token-util-3KK5CXUZ.js"),
-          await import("./token-BG7HAGYR.js")
+          await import("./token-util-4CO5DF4C.js"),
+          await import("./token-FLDOMOR4.js")
         ]);
         if (!token2 || isExpired(getTokenPayload(token2))) {
           await refreshToken();
@@ -367372,7 +367374,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-EXDQILFH.js");
+        const { createJiti } = await import("./jiti-XX3MTTOH.js");
         const version5 = require_package6().version;
         return { createJiti, version: version5 };
       }
@@ -367701,7 +367703,7 @@ var require_eslint_helpers = __commonJS({
     }
     async function globMatch({ basePath, pattern }) {
       let found = false;
-      const { hfs } = await import("./src-SSBA3WSK.js");
+      const { hfs } = await import("./src-S5UPWBUY.js");
       const patternToUse = normalizeToPosix(path77.relative(basePath, pattern));
       const matcher = new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       const walkSettings = {
@@ -367741,7 +367743,7 @@ var require_eslint_helpers = __commonJS({
         return new Minimatch2(patternToUse, MINIMATCH_OPTIONS);
       });
       const unmatchedPatterns = /* @__PURE__ */ new Set([...relativeToPatterns.keys()]);
-      const { hfs } = await import("./src-SSBA3WSK.js");
+      const { hfs } = await import("./src-S5UPWBUY.js");
       const walk2 = hfs.walk(basePath, {
         async directoryFilter(entry) {
           if (!matchers.some((matcher) => matcher.match(entry.path, true))) {
@@ -368764,7 +368766,7 @@ var require_eslint = __commonJS({
   "../../../../node_modules/.pnpm/eslint@9.39.2_jiti@2.6.1/node_modules/eslint/lib/eslint/eslint.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
-    var { existsSync: existsSync5 } = __require("node:fs");
+    var { existsSync: existsSync6 } = __require("node:fs");
     var fs44 = __require("node:fs/promises");
     var os8 = __require("node:os");
     var path77 = __require("node:path");
@@ -369172,7 +369174,7 @@ var require_eslint = __commonJS({
           configLoader: this.#configLoader,
           warningService
         });
-        if (existsSync5(path77.resolve(processedOptions.cwd, ".eslintignore"))) {
+        if (existsSync6(path77.resolve(processedOptions.cwd, ".eslintignore"))) {
           warningService.emitESLintIgnoreWarning();
         }
       }
@@ -369340,11 +369342,11 @@ var require_eslint = __commonJS({
         if (!lintResultCache && cacheFilePath) {
           debug3(`Deleting cache file at ${cacheFilePath}`);
           try {
-            if (existsSync5(cacheFilePath)) {
+            if (existsSync6(cacheFilePath)) {
               await fs44.unlink(cacheFilePath);
             }
           } catch (error40) {
-            if (existsSync5(cacheFilePath)) {
+            if (existsSync6(cacheFilePath)) {
               throw error40;
             }
           }
@@ -520393,7 +520395,7 @@ init_cjs_shims();
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.105-next.4",
+  version: "2.0.105-next.5",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
   license: "Superblocks Community Software License",
@@ -520747,7 +520749,7 @@ var config = void 0;
 var configured = false;
 var ddTracePromise = void 0;
 async function getDdTrace() {
-  ddTracePromise ??= import("./dd-trace-V6PA7MZX.js").then((module2) => module2.default);
+  ddTracePromise ??= import("./dd-trace-KWF2WUPA.js").then((module2) => module2.default);
   return await ddTracePromise;
 }
 var deploymentType = (() => {
@@ -529838,7 +529840,7 @@ var MAX_ATTRIBUTE_LENGTH = 64e3;
 var LLMObsSpanWriter = null;
 async function loadLLMObsSpanWriter() {
   if (!LLMObsSpanWriter) {
-    const module2 = await import("./spans-46V2JXGY.js");
+    const module2 = await import("./spans-UIF2GQWZ.js");
     LLMObsSpanWriter = module2.default;
   }
   return LLMObsSpanWriter;
@@ -543857,7 +543859,7 @@ init_cjs_shims();
 var openIntegrationSetupToolFactory = createToolFactory("openIntegrationSetup", ({ clark }) => ({
   category: ToolCategory.INTERACTIVE,
   defaultPermission: PermissionLevel.ALLOW,
-  description: "Opens the integration setup tab so the user can configure a new connection to a data source. Use when the user needs to connect to a data source or set up a new integration. If unsure of the pluginId, call listAvailableIntegrationTypes first to get the correct ID. The tab will open in the UI and the user can fill in the required fields. The response includes a formState with the exact field names, types, and required flags for this plugin. You can pre-fill non-sensitive fields (host, port, database, region, etc.) by passing them in the fields parameter. Sensitive fields (passwords, API keys, tokens) will be ignored \u2014 the user must enter those directly in the form.",
+  description: "Opens the integration setup tab so the user can configure a new connection to a data source. Use when the user needs to connect to a data source or set up a new integration. If unsure of the pluginId, call listAvailableIntegrationTypes first to get the correct ID. The tab will open in the UI and the user can fill in the required fields. The response includes a formState with the exact field names, types, and required flags for this plugin. IMPORTANT: If you already know any field values (host, port, database, name, region, etc.), you MUST pass them in the `fields` parameter of this call. You will not be able to call updateIntegrationFields in the same turn after opening. Sensitive fields (passwords, API keys, tokens) will be ignored \u2014 the user must enter those directly in the form.",
   inputSchema: zod_default.object({
     pluginId: zod_default.string().describe("The plugin identifier for the integration type to set up. Use listAvailableIntegrationTypes to discover valid IDs."),
     displayName: zod_default.string().optional().describe("Optional suggested display name for the new integration."),
@@ -543890,16 +543892,18 @@ var openIntegrationSetupToolFactory = createToolFactory("openIntegrationSetup",
 var openExistingIntegrationToolFactory = createToolFactory("openExistingIntegration", ({ clark }) => ({
   category: ToolCategory.INTERACTIVE,
   defaultPermission: PermissionLevel.ALLOW,
-  description: "Opens an existing integration for editing by its datasource ID. Use when the user wants to view or update the configuration of an integration they have already created. The integration setup tab will open with the existing field values pre-filled.",
+  description: "Opens an existing integration for editing by its datasource ID. Use when the user wants to view or update the configuration of an integration they have already created. The integration setup tab will open with the existing field values pre-filled. IMPORTANT: If you need to update any fields, you MUST pass them in the `fields` parameter of this call. You will not be able to call updateIntegrationFields in the same turn after opening.",
   inputSchema: zod_default.object({
-    integrationId: zod_default.string().describe("The ID of the existing datasource/integration to open for editing.")
+    integrationId: zod_default.string().describe("The ID of the existing datasource/integration to open for editing."),
+    fields: zod_default.record(zod_default.union([zod_default.string(), zod_default.number(), zod_default.boolean()])).optional().describe("Optional map of non-sensitive field names to values to apply immediately after opening. Preferred over a separate updateIntegrationFields call when opening and updating together.")
   }),
   execute: async (input) => {
     if (!clark.context.peer) {
       return { success: false, error: "No peer connection available." };
     }
     return clark.context.peer.call.aiOpenExistingIntegration({
-      integrationId: input.integrationId
+      integrationId: input.integrationId,
+      fields: input.fields
     });
   },
   getActionName: () => ({
@@ -546221,7 +546225,6 @@ function extractParentPrefixes(matches) {
     columns: /* @__PURE__ */ new Map(),
     schemas: /* @__PURE__ */ new Set(),
     paths: /* @__PURE__ */ new Set(),
-    operations: /* @__PURE__ */ new Set(),
     types: /* @__PURE__ */ new Set(),
     fields: /* @__PURE__ */ new Map(),
     rawValues: []
@@ -546252,11 +546255,6 @@ function extractParentPrefixes(matches) {
       const pathKey2 = stripQuotes(pathMatch[1]);
       matched.paths.add(pathKey2);
     }
-    const opMatch = match2.match(/json\.openApiSpec\.operations\[((?:"(?:[^"\\]|\\.)+"|[0-9]+))\]/);
-    if (opMatch?.[1]) {
-      const opKey = stripQuotes(opMatch[1]);
-      matched.operations.add(opKey);
-    }
     const typeMatch = match2.match(/json\.graphql\.data\.__schema\.types\[(\d+)\]/);
     if (typeMatch?.[1]) {
       matched.types.add(parseInt(typeMatch[1], 10));
@@ -546729,7 +546727,7 @@ function extractResultsFromJSON(json2, matched, limit, includeDetails, startGlob
     }
     globalIndex++;
   }
-  const totalMatched = matched.tables.size + Array.from(matched.columns.values()).reduce((sum, cols) => sum + cols.size, 0) + matched.schemas.size + matched.paths.size + matched.operations.size + matched.types.size + Array.from(matched.fields.values()).reduce((sum, fields) => sum + fields.size, 0) + matched.rawValues.length;
+  const totalMatched = matched.tables.size + Array.from(matched.columns.values()).reduce((sum, cols) => sum + cols.size, 0) + matched.schemas.size + matched.paths.size + matched.types.size + Array.from(matched.fields.values()).reduce((sum, fields) => sum + fields.size, 0) + matched.rawValues.length;
   const truncated = results.length >= limit && totalMatched > limit;
   logger15.debug(`[extract] Built ${results.length} results from ${totalMatched} total matched items (truncated: ${truncated})`);
   return {
@@ -546901,16 +546899,15 @@ Find OpenAPI paths (string keys, not arrays!):
   '\\.paths\\[".*repos.*"\\]'
   (Quotes constrain search to the path key, not descriptions)
 
-Find OpenAPI operations:
-  '\\.operations\\[.*\\]\\.method = "GET"'
+Find OpenAPI operations by method:
+  '\\.paths\\[.*\\]\\.get\\.operationId'
   \u2192 Returns: Operation with method, path, parameters array, requestBody, and responses
   \u2192 parameters array includes path/query/header/cookie parameters with types and descriptions
   \u2192 responses object shows response schemas by status code (200, 404, etc.)
 
-Find OpenAPI by operation:
-  '\\.paths\\[.*\\]\\.get\\.operationId'
-  '\\.operationId.*keyword'
-  '\\.summary.*keyword'
+Find OpenAPI by operation ID or summary:
+  '\\.operationId = ".*keyword.*"'
+  '\\.summary = ".*keyword.*"'
 
 Find GraphQL types:
   '\\.graphql\\.data\\.__schema\\.types\\[\\d+\\]\\.name = ".*User.*"'
@@ -564999,24 +564996,57 @@ const { data } = useApiData("GetUsers", { email }, {
 });
 \`\`\`
 
-### Cache Invalidation and Optimistic Updates
+### Cache invalidation and optimistic updates
+
+**Same scope as the read**: After a mutation, prefer \`refetch()\` from the \`useApiData\` that loads the data (same component or wherever you can pass \`refetch\`).
+
+\`\`\`typescript
+import { useApi, useApiData } from "@superblocksteam/library";
+import { toast } from "sonner";
+
+const { data: orders, refetch } = useApiData("GetOrders", { status });
+const { run: createOrder } = useApi("CreateOrder");
+
+const handleSubmit = useCallback(async () => {
+  try {
+    await createOrder({ item, qty });
+    await refetch();
+  } catch (error) {
+    const message =
+      error && typeof error === "object" && "message" in error
+        ? String((error as { message: unknown }).message)
+        : String(error);
+    toast.error("Error creating order: " + message);
+  }
+}, [item, qty, createOrder, refetch]);
+\`\`\`
 
-Use \`queryClient\` to invalidate caches after mutations or set data optimistically:
+**Cross-scope or broad invalidation**: Use \`queryClient.invalidateQueries\` when you cannot call that \`refetch\` (mutation in a different place than the \`useApiData\`, or you need every cached variant of an API to refetch). For **\`queryClient.invalidateQueries\`, \`buildCacheKey\`, \`setQueryData\`, and any other \`queryClient\` usage, always import \`queryClient\` from \`@superblocksteam/library\`**.
 
 \`\`\`typescript
 import { queryClient, useApi } from "@superblocksteam/library";
+import { toast } from "sonner";
 
 const { run: createOrder } = useApi("CreateOrder");
 
 const handleSubmit = useCallback(async () => {
-  await createOrder({ item, qty });
-  // Invalidate all GetOrders queries so they refetch
-  await queryClient.invalidateQueries("GetOrders");
+  try {
+    await createOrder({ item, qty });
+    await queryClient.invalidateQueries("GetOrders");
+  } catch (error) {
+    const message =
+      error && typeof error === "object" && "message" in error
+        ? String((error as { message: unknown }).message)
+        : String(error);
+    toast.error("Error creating order: " + message);
+  }
 }, [item, qty, createOrder]);
 \`\`\`
 
 \`\`\`typescript
 // Optimistic update: set cached data without refetching
+import { queryClient } from "@superblocksteam/library";
+
 const cacheKey = queryClient.buildCacheKey("GetOrders", { status: "active" });
 queryClient.setQueryData(cacheKey, (old) => ({
   ...old,
@@ -587270,6 +587300,66 @@ var OperationQueue2 = class {
   }
 };
 
+// ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/uniquify-filenames.js
+init_cjs_shims();
+function uniquifySuffix(filename, counter) {
+  const dotIndex = filename.lastIndexOf(".");
+  if (dotIndex === -1) {
+    return `${filename}_${counter}`;
+  }
+  return `${filename.slice(0, dotIndex)}_${counter}${filename.slice(dotIndex)}`;
+}
+function uniquifyFilePartFilenames(messages3) {
+  const taken = /* @__PURE__ */ new Set();
+  for (const msg of messages3) {
+    if (typeof msg.content === "string" || !Array.isArray(msg.content)) {
+      continue;
+    }
+    for (const part of msg.content) {
+      if (typeof part === "object" && part !== null && "type" in part && part.type === "file" && "filename" in part && typeof part.filename === "string") {
+        taken.add(part.filename);
+      }
+    }
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const counters = /* @__PURE__ */ new Map();
+  let anyMutation = false;
+  const result = messages3.map((msg) => {
+    if (typeof msg.content === "string" || !Array.isArray(msg.content)) {
+      return msg;
+    }
+    let contentMutated = false;
+    const newContent = msg.content.map((part) => {
+      if (typeof part === "object" && part !== null && "type" in part && part.type === "file" && "filename" in part && typeof part.filename === "string") {
+        const filePart = part;
+        const filename = filePart.filename;
+        if (!seen.has(filename)) {
+          seen.add(filename);
+          return part;
+        }
+        let counter = (counters.get(filename) ?? 1) + 1;
+        let candidate = uniquifySuffix(filename, counter);
+        while (taken.has(candidate) || seen.has(candidate)) {
+          counter++;
+          candidate = uniquifySuffix(filename, counter);
+        }
+        counters.set(filename, counter);
+        seen.add(candidate);
+        taken.add(candidate);
+        contentMutated = true;
+        anyMutation = true;
+        return { ...part, filename: candidate };
+      }
+      return part;
+    });
+    if (contentMutated) {
+      return { ...msg, content: newContent };
+    }
+    return msg;
+  });
+  return anyMutation ? result : messages3;
+}
+
 // ../../../vite-plugin-file-sync/dist/ai-service/llm/context-v2/context.js
 var logger7 = getPrefixedLogger("[context-v2]");
 function hasScreenshotMedia(msg) {
@@ -587512,12 +587602,13 @@ var ContextV2 = class _ContextV2 {
       const sanitized = toSdkMessages(allMessages);
       const normalized = sanitized.map((msg) => normalizeToolMessage(stripUndefinedFromToolOutputs(msg)));
       const repaired = normalized.map(repairBrokenToolCalls);
+      const deduped = uniquifyFilePartFilenames(repaired);
       for (const idx of breakpoints) {
-        if (repaired[idx]) {
-          repaired[idx].providerOptions = CACHE_BREAKPOINT_PROVIDER_OPTIONS;
+        if (deduped[idx]) {
+          deduped[idx].providerOptions = CACHE_BREAKPOINT_PROVIDER_OPTIONS;
         }
       }
-      return repaired;
+      return deduped;
     });
   }
   /**
@@ -597315,7 +597406,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-FM3NWCX4.js");
+      const { startEmbeddedPlaywrightMcpServer } = await import("./embedded-playwright-mcp-server-QS5LX4BK.js");
       this.server = await startEmbeddedPlaywrightMcpServer({
         storageStatePath: options8?.storageStatePath,
         jwt: options8?.jwt,
@@ -606722,7 +606813,9 @@ ${config4.features.nativeGitRawEnabled ? `
 - Do not run raw push commands. If you run \`git_raw\` commit, it will automatically push to \`origin/${import_shared34.SUPERBLOCKS_LIVE_GIT_BRANCH}\` after the commit succeeds.
 - Favor inspection commands first when debugging git state, and only use mutating git commands when they clearly preserve the single live-branch workflow.
 ` : ""}
-` : ""}Here are some additional guidelines to follow:
+` : `**Version Control:**
+If the user asks about committing, deploying, publishing, or version-controlling their application, read the documentation at \`https://docs.superblocks.com/development-lifecycle/deploy/version-control\` using \`web_fetch\` and guide them based on its contents.
+`}Here are some additional guidelines to follow:
 
 `;
   }
@@ -631248,11 +631341,27 @@ The integration setup form is already open for ${pluginId}${nameLabel} in ${mode
 `
     });
   }
-  if (promptContext) {
+  if (promptContext?.currentView) {
+    const viewDescriptions = {
+      preview: "the Preview, where the user sees a live preview of their application as it would appear in a browser.",
+      "code-viewer": "the Code view. The Code view is a read-only file viewer \u2014 the user cannot edit files directly in this view. Do not suggest editing files through the Code view UI. To make code changes, use your own tools instead.",
+      "integration-setup": "the Integration Setup view, where the user configures an integration (e.g. database credentials, API keys, or connection settings)."
+    };
+    const desc2 = viewDescriptions[promptContext.currentView];
+    content9.push({
+      type: "text",
+      text: `<current_view>
+The user is currently in ${desc2}
+</current_view>
+
+`
+    });
+  }
+  if (promptContext && (!promptContext.currentView || promptContext.currentView === "preview")) {
     content9.push({
       type: "text",
       text: `<preview_device>
-The user is currently viewing the app in ${promptContext?.previewDevice === "mobile" ? "mobile preview mode (viewport width: 375px)" : "desktop preview mode (full width)"}.
+The user is currently viewing the app in ${promptContext.previewDevice === "mobile" ? "mobile preview mode (viewport width: 375px)" : "desktop preview mode (full width)"}.
 </preview_device>
 
 `
@@ -636213,12 +636322,12 @@ ${request3.prompt}`;
     };
   }
   async handleRestoreToCommit(sinceTimestamp, commitId, applicationId, branchName) {
-    await this.chatSessionStore.truncateAfterTimestamp(sinceTimestamp);
     const jwt2 = this.clark?.context?.jwt;
     if (!jwt2) {
       this.getLogger().warn(`[handleRestoreToCommit] No JWT available, cannot restore or truncate context`);
       return;
     }
+    let restored = false;
     try {
       const contextId = getContextId(this.clark, this.config);
       const result = await restoreContextFromCheckpoint({
@@ -636233,24 +636342,22 @@ ${request3.prompt}`;
         contextManagerV2: this.contextManagerV2
       });
       if (result.success) {
-        this.getLogger().info(`[handleRestoreToCommit] Successfully restored main.json from checkpoint commitId=${commitId}, skipping truncation`);
-        return;
+        restored = true;
       } else {
-        const reason = result.savedFiles.length > 0 ? "main.json not found in checkpoint" : "no file saved from checkpoint";
-        this.getLogger().info(`[handleRestoreToCommit] Context restore failed: ${reason} for commitId=${commitId}, using truncation fallback`);
+        const reason = result.savedFiles.length > 0 ? "main.json not found in checkpoint" : "no checkpoint found";
+        this.getLogger().info(`[handleRestoreToCommit] Context restore failed: ${reason} for commitId=${commitId}, preserving chat messages`);
       }
     } catch (error40) {
-      this.getLogger().warn(`[handleRestoreToCommit] Error restoring context from checkpoint, using truncation fallback`, getErrorMeta2(error40));
+      this.getLogger().warn(`[handleRestoreToCommit] Error restoring context from checkpoint, preserving chat messages`, getErrorMeta2(error40));
     }
-    const context = getActiveContext(this.clark, {
-      contextManagerV2: this.contextManagerV2,
-      applicationId: this.config.applicationId
-    });
-    if (context) {
-      context.truncateAfterTimestamp(sinceTimestamp);
-      this.getLogger().info(`[handleRestoreToCommit] Context truncated after timestamp ${sinceTimestamp}`);
-    } else {
-      this.getLogger().info(`[handleRestoreToCommit] No active context loaded, skipping truncation`);
+    if (!restored) {
+      return;
+    }
+    try {
+      await this.chatSessionStore.truncateAfterTimestamp(sinceTimestamp);
+      this.getLogger().info(`[handleRestoreToCommit] Successfully restored context and truncated chat for commitId=${commitId}`);
+    } catch (error40) {
+      this.getLogger().warn(`[handleRestoreToCommit] Context restored but failed to truncate chat for commitId=${commitId}`, getErrorMeta2(error40));
     }
   }
   async handleApiUpdate(update3) {
@@ -639080,11 +639187,11 @@ var SocketManager = class extends import_shared57.TracedEventEmitter {
             ws.close(1008, "No peerId found");
             return;
           }
-          if (url4.searchParams.get("applicationId") !== syncService?.applicationId) {
+          if (syncService?.applicationId && url4.searchParams.get("applicationId") !== syncService.applicationId) {
             getLogger3().error("Application ID mismatch", {
               error: {
                 kind: "ValidationError",
-                message: `Expected application ID ${syncService?.applicationId}, received ${url4.searchParams.get("applicationId")}`
+                message: `Expected application ID ${syncService.applicationId}, received ${url4.searchParams.get("applicationId")}`
               }
             });
             ws.close(1008, "Application ID mismatch");
@@ -661363,7 +661470,7 @@ var parseYaml3;
 async function loadYaml(file2) {
   const content9 = await read_file_default(file2);
   if (!parseYaml3) {
-    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-XW544KRJ.js"));
+    ({ __parsePrettierYamlConfig: parseYaml3 } = await import("./yaml-3X6V5R6M.js"));
   }
   try {
     return parseYaml3(content9);
@@ -666757,7 +666864,7 @@ function createParsersAndPrinters(modules) {
 }
 var estreePlugin = createParsersAndPrinters([
   {
-    importPlugin: () => import("./estree-P3FRTTSR.js"),
+    importPlugin: () => import("./estree-PVMY34ZL.js"),
     printers: ["estree", "estree-json"]
   }
 ]);
@@ -666781,11 +666888,11 @@ var languages = [
 ];
 var { parsers: parsers12, printers } = createParsersAndPrinters([
   {
-    importPlugin: () => import("./acorn-BTNM3FZI.js"),
+    importPlugin: () => import("./acorn-6R47IUFK.js"),
     parsers: ["acorn", "espree"]
   },
   {
-    importPlugin: () => import("./angular-IAGGJ6XA.js"),
+    importPlugin: () => import("./angular-LVNL3NNR.js"),
     parsers: [
       "__ng_action",
       "__ng_binding",
@@ -666794,7 +666901,7 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./babel-IOJIVLBY.js"),
+    importPlugin: () => import("./babel-K6JZSYBV.js"),
     parsers: [
       "babel",
       "babel-flow",
@@ -666813,44 +666920,44 @@ var { parsers: parsers12, printers } = createParsersAndPrinters([
     ]
   },
   {
-    importPlugin: () => import("./flow-RKTJXFTE.js"),
+    importPlugin: () => import("./flow-JYIJFJXK.js"),
     parsers: ["flow"]
   },
   {
-    importPlugin: () => import("./glimmer-VF5APVO2.js"),
+    importPlugin: () => import("./glimmer-O2HVFRLS.js"),
     parsers: ["glimmer"],
     printers: ["glimmer"]
   },
   {
-    importPlugin: () => import("./graphql-UDCFEARF.js"),
+    importPlugin: () => import("./graphql-6DTV46OU.js"),
     parsers: ["graphql"],
     printers: ["graphql"]
   },
   {
-    importPlugin: () => import("./html-XSCIOP23.js"),
+    importPlugin: () => import("./html-VJSOS5JX.js"),
     parsers: ["html", "angular", "vue", "lwc", "mjml"],
     printers: ["html"]
   },
   {
-    importPlugin: () => import("./markdown-CCT4U2OD.js"),
+    importPlugin: () => import("./markdown-573GJL7H.js"),
     parsers: ["markdown", "mdx", "remark"],
     printers: ["mdast"]
   },
   {
-    importPlugin: () => import("./meriyah-JUHUZ7QV.js"),
+    importPlugin: () => import("./meriyah-TN2VK6HX.js"),
     parsers: ["meriyah"]
   },
   {
-    importPlugin: () => import("./postcss-F3GU35AQ.js"),
+    importPlugin: () => import("./postcss-3RNLSVAL.js"),
     parsers: ["css", "less", "scss"],
     printers: ["postcss"]
   },
   {
-    importPlugin: () => import("./typescript-POHXZHCC.js"),
+    importPlugin: () => import("./typescript-US5OJORY.js"),
     parsers: ["typescript"]
   },
   {
-    importPlugin: () => import("./yaml-XW544KRJ.js"),
+    importPlugin: () => import("./yaml-3X6V5R6M.js"),
     parsers: ["yaml"],
     printers: ["yaml"]
   }
@@ -678677,6 +678784,7 @@ async function checkVersionsAndWritePackageJson(lockService, config4, forceUpgra
 init_cjs_shims();
 var import_cors = __toESM(require_lib51(), 1);
 var import_express = __toESM(require_express2(), 1);
+import { existsSync as existsSync4 } from "node:fs";
 import net from "node:net";
 import os6 from "node:os";
 import path73 from "node:path";
@@ -678745,7 +678853,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 }) {
+async function createDevServer({ root: root3, mode, fsOperationQueue, syncService, lockService, aiService, gitService, activateGitService, snapshotManager, logger: loggerOverride, port, sdk, superblocksBaseUrl: explicitBaseUrl, existingServer }) {
   const logger15 = getLogger2(loggerOverride);
   if (httpServer) {
     logger15.debug("Dev server already running");
@@ -678918,43 +679026,14 @@ async function createDevServer({ root: root3, mode, fsOperationQueue, syncServic
         return;
       }
     }
-    logger15.info("Initializing dev server...");
-    if (isViteServerInitialized) {
-      logger15.info("Dev server already initialized");
+    logger15.info("Received connect request, waiting for vite server...");
+    try {
+      await vitePromise;
       res.send(JSON.stringify(healthResponse));
-      return;
+    } catch (e) {
+      logger15.error("Vite server failed to initialize", getErrorMeta(e));
+      res.status(500).send(JSON.stringify({ error: "Dev server failed to initialize" }));
     }
-    logger15.info("Starting dev server");
-    isViteServerInitialized = true;
-    const featureFlags = await sdk?.getFeatureFlagsForCurrentUser();
-    startVite({
-      port,
-      app,
-      root: root3,
-      mode,
-      fsOperationQueue,
-      syncService,
-      lockService,
-      aiService,
-      gitService,
-      activateGitService,
-      snapshotManager,
-      checkAuthorization,
-      logger: loggerOverride,
-      httpServer,
-      superblocksBaseUrl: explicitBaseUrl || localToken?.superblocksBaseUrl,
-      features: {
-        enableSessionRecording: featureFlags?.enableSessionRecording() ?? false
-      }
-    }).then((result) => {
-      logger15.info("Dev server initialized");
-      viteResolve();
-      viteCreationResults = result;
-      res.send(JSON.stringify(healthResponse));
-    }, (e) => {
-      logger15.error("Error initializing dev server", getErrorMeta(e));
-      viteReject(e);
-    });
   });
   app.post("/_sb_disconnect", authHandler, async (req, res) => {
     logger15.info("Disconnecting dev server...");
@@ -679017,8 +679096,11 @@ async function createDevServer({ root: root3, mode, fsOperationQueue, syncServic
         timeSinceLastActivityMs: lockService.timeSinceLastActivity
       });
     } else {
-      logger15.error("Lock service not found, rejecting request");
-      viteReject(new Error("Lock service not found, rejecting request"));
+      res.send({
+        isUserActive: false,
+        connectedUsers: [],
+        timeSinceLastActivityMs: 0
+      });
     }
   });
   process.on("SIGINT", async () => {
@@ -679040,9 +679122,48 @@ async function createDevServer({ root: root3, mode, fsOperationQueue, syncServic
       process.exit(1);
     });
   });
-  logger15.info(`Starting HTTP server on port ${port}`);
-  httpServer = await app.listen(port);
-  logger15.info(`HTTP server started successfully on port ${port}`);
+  if (existingServer) {
+    existingServer.removeAllListeners("request");
+    existingServer.on("request", app);
+    httpServer = existingServer;
+    logger15.info(`Attached full dev server to existing HTTP server on port ${port}`);
+  } else {
+    logger15.info(`Starting HTTP server on port ${port}`);
+    httpServer = await app.listen(port);
+    logger15.info(`HTTP server started successfully on port ${port}`);
+  }
+  if (!isViteServerInitialized) {
+    isViteServerInitialized = true;
+    logger15.info("Eagerly starting vite server...");
+    const featureFlags = await sdk?.getFeatureFlagsForCurrentUser().catch(() => void 0);
+    startVite({
+      port,
+      app,
+      root: root3,
+      mode,
+      fsOperationQueue,
+      syncService,
+      lockService,
+      aiService,
+      gitService,
+      activateGitService,
+      snapshotManager,
+      checkAuthorization,
+      logger: loggerOverride,
+      httpServer,
+      superblocksBaseUrl: explicitBaseUrl || localToken?.superblocksBaseUrl,
+      features: {
+        enableSessionRecording: featureFlags?.enableSessionRecording() ?? false
+      }
+    }).then((result) => {
+      logger15.info("Vite server initialized eagerly");
+      viteResolve();
+      viteCreationResults = result;
+    }, (e) => {
+      logger15.error("Error initializing vite server", getErrorMeta(e));
+      viteReject(e);
+    });
+  }
   return httpServer;
 }
 async function startVite({ app, httpServer: httpServer2, root: root3, mode, port, fsOperationQueue, syncService, lockService, aiService, gitService, activateGitService, snapshotManager, checkAuthorization, logger: loggerOverride, superblocksBaseUrl, features }) {
@@ -679191,6 +679312,32 @@ async function startVite({ app, httpServer: httpServer2, root: root3, mode, port
     }
   });
 }
+async function preWarmViteCache(root3) {
+  const start = Date.now();
+  console.log("[warm] Pre-warming Vite dependency cache...");
+  try {
+    const server = await createServer({
+      root: root3,
+      mode: "development",
+      server: { middlewareMode: true, hmr: false },
+      plugins: [src_default()],
+      logLevel: "warn",
+      optimizeDeps: { noDiscovery: true }
+    });
+    const depsDir = path73.join(root3, "node_modules", ".vite", "deps");
+    const maxWaitMs = 5e3;
+    const pollMs = 50;
+    const deadline = Date.now() + maxWaitMs;
+    while (!existsSync4(depsDir) && Date.now() < deadline) {
+      await new Promise((r2) => setTimeout(r2, pollMs));
+    }
+    await server.close();
+    const cached2 = existsSync4(depsDir);
+    console.log(`[warm] Vite cache ${cached2 ? "warmed" : "not committed (timed out)"} in ${Date.now() - start}ms`);
+  } catch (error40) {
+    console.warn(`[warm] Vite cache pre-warm failed (non-fatal, ${Date.now() - start}ms):`, error40);
+  }
+}
 var DEFAULT_HMR_PORT = 24678;
 function getFreePort() {
   return new Promise((resolve9) => {
@@ -679330,7 +679477,7 @@ async function fetchAndWriteApplication({ resourceId, viewMode, featureFlags, pr
 
 // ../sdk/dist/cli-replacement/socket-utils.mjs
 init_cjs_shims();
-import { existsSync as existsSync4 } from "node:fs";
+import { existsSync as existsSync5 } from "node:fs";
 import * as fs41 from "node:fs/promises";
 import * as net2 from "node:net";
 import * as os7 from "node:os";
@@ -679378,7 +679525,7 @@ async function getAllSocketFiles() {
 }
 async function getSocketFileForPid(pid) {
   const socketPath = path74.join(getSocketDirectory(), `superblocks-auth-${pid}.sock`);
-  return existsSync4(socketPath) ? socketPath : null;
+  return existsSync5(socketPath) ? socketPath : null;
 }
 async function cleanupSocketFile(socketPath) {
   try {
@@ -679707,7 +679854,7 @@ async function handleLockConflict(error40, lockSvc, span, logger15) {
 }
 async function readPkgJson(cwd) {
   try {
-    const { readPackage } = await import("./read-pkg-OP7WVLBF.js");
+    const { readPackage } = await import("./read-pkg-US2CH2JR.js");
     return await readPackage({ cwd });
   } catch {
     return null;
@@ -680149,7 +680296,8 @@ async function dev(options8) {
           snapshotManager,
           logger: options8.logger,
           sdk,
-          superblocksBaseUrl: tokenConfig.superblocksBaseUrl
+          superblocksBaseUrl: tokenConfig.superblocksBaseUrl,
+          existingServer: options8.existingServer
         };
         const result = await createDevServer(createDevServerOptions);
         span.end();
@@ -680496,6 +680644,7 @@ export {
   SuperblocksSdk,
   AUTO_UPGRADE_EXIT_CODE,
   RESTART_EXIT_CODE,
+  preWarmViteCache,
   TokenManager,
   tryDecodeJwtToken,
   fetchAndWriteApplication,
@@ -681047,4 +681196,4 @@ serve-static/index.js:
 chokidar/esm/index.js:
   (*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-MAQLTSHB.js.map
+//# sourceMappingURL=chunk-AVKVXWKJ.js.map