@botonic/nx-plugin 2.29.0 → 2.31.0

package/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 2.31.0 (2026-06-15)
+
+### 🚀 Features
+
+- refactored botonic/HT credentials stored and serve/deploy bots flow refinement ([#934](https://github.com/metis-ai/hubtype-product/pull/934))
+- **lambda:** self-contained bundle with noExternal: true #BLT-2432 ([#936](https://github.com/metis-ai/hubtype-product/pull/936))
+- **serve:** replace deploy-local-runtime with integrated dev session registration ([#921](https://github.com/metis-ai/hubtype-product/pull/921))
+
+### ❤️ Thank You
+
+- David Hidalgo @Davidhidalgo
+- Marc Rabat @vanbasten17
+
+## 2.30.0 (2026-06-11)
+
+### 🚀 Features
+
+- update botonic-basic-template ([#932](https://github.com/metis-ai/hubtype-product/pull/932))
+- update plugins to last botonicV0 changes #BLT-2370 ([#920](https://github.com/metis-ai/hubtype-product/pull/920))
+- **@botonic/dx-bundling:** derive Lambda noExternal deps programmatically ([#918](https://github.com/metis-ai/hubtype-product/pull/918))
+- support botonic v2 preview in flow builder ([#916](https://github.com/metis-ai/hubtype-product/pull/916))
+- wire plugin-hubtype-analytics into bot apps ([#909](https://github.com/metis-ai/hubtype-product/pull/909))
+
+### 🩹 Fixes
+
+- allow multiple, only picking webchat app id ([#896](https://github.com/metis-ai/hubtype-product/pull/896))
+
+### ❤️ Thank You
+
+- Marc Rabat @vanbasten17
+- Oriol Raventós @Iru89
+
 ## 2.29.0 (2026-05-12)
 
 ### 🚀 Features

package/executors.json

@@ -26,11 +26,6 @@
       "schema": "./src/executors/deploy-to-hubtype/schema.json",
       "description": "Deploy Botonic app to Hubtype"
     },
-    "deploy-local-runtime": {
-      "implementation": "./src/executors/deploy-local-runtime/executor",
-      "schema": "./src/executors/deploy-local-runtime/schema.json",
-      "description": "Deploy Botonic app to Hubtype Local Runtime"
-    },
     "integrate-provider": {
       "implementation": "./src/executors/integrate-provider/executor",
       "schema": "./src/executors/integrate-provider/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botonic/nx-plugin",
-  "version": "2.29.0",
+  "version": "2.31.0",
   "description": "Nx plugin for creating Botonic bot applications",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -42,7 +42,8 @@
     "fs-extra": "^11.1.1",
     "qs": "^6.11.0",
     "yaml": "^2.6.1",
-    "zip-a-folder": "^1.1.0"
+    "zip-a-folder": "^1.1.0",
+    "zod": "^4.4.3"
   },
   "peerDependencies": {
     "nx": ">=21.0.0"

package/src/executors/delete-bot/executor.js

@@ -22,7 +22,6 @@ __export(executor_exports, {
 });
 module.exports = __toCommonJS(executor_exports);
 var import_enquirer = require("enquirer");
-var import_path = require("path");
 var import_api_service = require("../../lib/api-service");
 var import_executor_helpers = require("../../lib/util/executor-helpers");
 async function deleteBotExecutor(options, context) {
@@ -32,7 +31,6 @@ async function deleteBotExecutor(options, context) {
   try {
     const { targetEnvironment, environmentVariables } = (0, import_executor_helpers.resolveHubtypeEnvironment)(context, options);
     const botonicApiService = new import_api_service.BotonicAPIService({
-      workspaceRoot: (0, import_path.resolve)(context.root),
       environmentVariables,
       targetEnvironment
     });

package/src/executors/deploy-to-hubtype/executor.js

@@ -22,16 +22,12 @@ __export(executor_exports, {
 });
 module.exports = __toCommonJS(executor_exports);
 var import_enquirer = require("enquirer");
-var import_fs = require("fs");
-var import_path = require("path");
-var import_zip_a_folder = require("zip-a-folder");
 var import_api_service = require("../../lib/api-service");
-var import_bot_config = require("../../lib/bot-config");
 var import_executor_helpers = require("../../lib/util/executor-helpers");
-var import_file_system = require("../../lib/util/file-system");
-var import_system = require("../../lib/util/system");
-const BOTONIC_BUNDLE_FILE = "botonic_bundle.zip";
-const BOTONIC_TEMP_DIRNAME = "tmp";
+const CREATE_PROD_CHOICE = "Create Production Bot";
+function botLabel(bot) {
+  return bot.is_test ? `${bot.name} (Staging bot)` : `${bot.name} (Production bot)`;
+}
 let PROJECT_ROOT;
 async function deployToHubtypeExecutor(options, context) {
   if (!context.projectName) {
@@ -42,7 +38,6 @@ async function deployToHubtypeExecutor(options, context) {
     const { targetEnvironment, environmentVariables } = (0, import_executor_helpers.resolveHubtypeEnvironment)(context, options);
     const botonicApiService = new import_api_service.BotonicAPIService({
       projectRoot: PROJECT_ROOT,
-      workspaceRoot: (0, import_path.resolve)(context.root),
       environmentVariables,
       targetEnvironment
     });
@@ -69,7 +64,11 @@ async function deployToHubtypeExecutor(options, context) {
     } else {
       await handleBotFlow(botonicApiService);
     }
-    await deploy(botonicApiService, PROJECT_ROOT, context.projectName);
+    await (0, import_executor_helpers.deployBotToHubtype)(
+      botonicApiService,
+      PROJECT_ROOT,
+      context.projectName
+    );
     return { success: true };
   } catch (error) {
     return (0, import_executor_helpers.handleExecutorError)(error, "Deployment");
@@ -148,161 +147,26 @@ async function createNewBot(botonicApiService, botName) {
 }
 async function selectExistentBot(botonicApiService, bots) {
   console.log("\u{1F4CB} Select a bot to deploy:\n");
-  const providersPromises = bots.map((b) => botonicApiService.getProviders(b.id));
-  const providers = await Promise.all(providersPromises);
-  const botsWithProviders = bots.map((bot2, index) => ({
-    ...bot2,
-    providers: providers[index].data.results
-  }));
   const response = await (0, import_enquirer.prompt)({
     type: "select",
-    name: "bot_name",
+    name: "bot_id",
     message: "\u{1F916} Please select a bot:",
-    choices: botsWithProviders.map((bot2) => {
-      return {
-        name: bot2.name,
-        message: bot2.name
-      };
-    })
+    choices: [
+      ...bots.map((bot2) => ({
+        name: bot2.id,
+        message: botLabel(bot2)
+      })),
+      { name: CREATE_PROD_CHOICE, message: "+ Create Production Bot" }
+    ]
   });
-  const selectedBotName = response.bot_name;
-  const bot = botsWithProviders.find((bot2) => bot2.name === selectedBotName);
+  const selectedBotId = response.bot_id;
+  if (selectedBotId === CREATE_PROD_CHOICE) {
+    await createNewBot(botonicApiService);
+    return;
+  }
+  const bot = bots.find((b) => b.id === selectedBotId);
   if (bot) {
     botonicApiService.setCurrentBot(bot);
-    console.log(`\u2705 Selected bot: ${bot.name}`);
-  }
-}
-async function deploy(botonicApiService, projectRoot, projectName) {
-  console.log("\u{1F528} Preparing your bot for deployment...\n");
-  const buildOut = await botonicApiService.build({
-    projectRoot,
-    projectName
-  });
-  if (!buildOut) {
-    throw new Error("Build failed");
-  }
-  const botConfigJson = await import_bot_config.BotConfig.get(projectRoot);
-  await createBundle(projectRoot);
-  const { hasDeployErrors } = await deployBundle(
-    botonicApiService,
-    botConfigJson
-  );
-  await displayDeployResults(botonicApiService, { hasDeployErrors });
-  (0, import_fs.rmSync)((0, import_path.join)(projectRoot, BOTONIC_BUNDLE_FILE));
-  (0, import_file_system.removeRecursively)((0, import_path.join)(projectRoot, BOTONIC_TEMP_DIRNAME));
-  botonicApiService.saveAllCredentials();
-}
-async function createBundle(projectRoot) {
-  console.log("\u{1F4E6} Creating deployment bundle...");
-  if ((0, import_file_system.pathExists)((0, import_path.join)(projectRoot, BOTONIC_TEMP_DIRNAME))) {
-    (0, import_file_system.removeRecursively)((0, import_path.join)(projectRoot, BOTONIC_TEMP_DIRNAME));
-  }
-  const webchatHtmlPath = (0, import_path.join)(projectRoot, "dist", "webchat", "webchat.html");
-  const webchatIndexPath = (0, import_path.join)(projectRoot, "dist", "webchat", "index.html");
-  if ((0, import_file_system.pathExists)(webchatHtmlPath)) {
-    (0, import_fs.renameSync)(webchatHtmlPath, webchatIndexPath);
-  }
-  const webviewsHtmlPath = (0, import_path.join)(
-    projectRoot,
-    "dist",
-    "webviews",
-    "webviews.html"
-  );
-  const webviewsIndexPath = (0, import_path.join)(projectRoot, "dist", "webviews", "index.html");
-  if ((0, import_file_system.pathExists)(webviewsHtmlPath)) {
-    (0, import_fs.renameSync)(webviewsHtmlPath, webviewsIndexPath);
-  }
-  (0, import_file_system.createDir)((0, import_path.join)(projectRoot, BOTONIC_TEMP_DIRNAME));
-  (0, import_file_system.copy)(
-    (0, import_path.join)(projectRoot, "dist"),
-    (0, import_path.join)(projectRoot, BOTONIC_TEMP_DIRNAME, "dist")
-  );
-  const zipRes = await import_zip_a_folder.ZipAFolder.zip(
-    (0, import_path.join)(projectRoot, BOTONIC_TEMP_DIRNAME),
-    (0, import_path.join)(projectRoot, BOTONIC_BUNDLE_FILE)
-  );
-  if (zipRes instanceof Error) {
-    throw zipRes;
-  }
-  const zipStats = (0, import_fs.statSync)((0, import_path.join)(projectRoot, BOTONIC_BUNDLE_FILE));
-  console.log("\u2705 Bundle created successfully!");
-  if (zipStats.size >= 20 * 10 ** 6) {
-    throw new Error(
-      `Bundle too large: ${(zipStats.size / 1024 / 1024).toFixed(2)}MB (max: 20MB)`
-    );
-  }
-}
-async function deployBundle(botonicApiService, botConfigJson) {
-  console.log("\u{1F680} Deploying to Hubtype Cloud...");
-  try {
-    const deploy2 = await botonicApiService.deployBot(
-      (0, import_path.join)(PROJECT_ROOT, BOTONIC_BUNDLE_FILE),
-      botConfigJson
-    );
-    if (deploy2.response?.status === 403 || !deploy2.data.deploy_id) {
-      throw new Error(
-        `Deploy Botonic Error: ${String(deploy2.response?.data?.status)}`
-      );
-    }
-    console.log("\u23F3 Waiting for deployment to complete...");
-    while (true) {
-      await (0, import_system.sleep)(500);
-      const deployStatus = await botonicApiService.deployStatus(
-        deploy2.data.deploy_id
-      );
-      if (deployStatus.data.is_completed) {
-        if (deployStatus.data.status === "deploy_status_completed_ok") {
-          console.log("\u2705 Deployment completed successfully!");
-          return { hasDeployErrors: false };
-        } else {
-          throw new Error(deployStatus.data.error);
-        }
-      }
-    }
-  } catch (error) {
-    console.error("\u274C Deployment failed");
-    let reason = String(error);
-    if (error.response?.data) {
-      reason = error.response.data.join("");
-    }
-    console.error(`${reason}`);
-    return { hasDeployErrors: true };
-  }
-}
-async function displayDeployResults(botonicApiService, { hasDeployErrors }) {
-  try {
-    const providersRes = await botonicApiService.getProviders();
-    const providers = providersRes.data.results;
-    if (hasDeployErrors) return false;
-    if (!providers.length) {
-      const botId = botonicApiService.botInfo().id;
-      const accessToken = botonicApiService.getOauth().access_token;
-      const links = `Now, you can integrate a channel in:
-https://app.hubtype.com/bots/${botId}/integrations?access_token=${accessToken}`;
-      console.log(links);
-    } else {
-      displayProviders(providers);
-    }
-    return true;
-  } catch (e) {
-    console.error(`   There was an error getting the providers: ${String(e)}`);
-    return false;
+    console.log(`\u2705 Selected bot: ${botLabel(bot)}`);
   }
 }
-function displayProviders(providers) {
-  console.log("\u{1F389} DEPLOYMENT SUCCESSFUL!");
-  console.log("\u{1F680} Your bot is now live and ready to chat!");
-  console.log("\u{1F4F1} Your bot is published on:");
-  providers.forEach((p) => {
-    if (p.provider === "whatsapp")
-      console.log(`   \u{1F4AC}  [WhatsApp] https://wa.me/${p.username}`);
-    if (p.provider === "facebook")
-      console.log(`   \u{1F4AC}  [Facebook] https://m.me/${p.username}`);
-    if (p.provider === "telegram")
-      console.log(`   \u{1F4AC}  [Telegram] https://t.me/${p.username}`);
-    if (p.provider === "twitter")
-      console.log(`   \u{1F4AC}  [Twitter] https://t.me/${p.username}`);
-    if (p.provider === "generic")
-      console.log(`   \u{1F4AC}  [Generic] Your app or website`);
-  });
-}

package/src/executors/e2e-webchat/botonic-package-publish.spec.ts

@@ -14,13 +14,13 @@ test.describe('Botonic Publish E2E', () => {
 
     await page.goto('/')
     await page.waitForLoadState('networkidle')
-    await page.waitForSelector('button[class*="webchat-trigger"]', {
+    await page.waitForSelector('[data-testid="webchat-trigger"]', {
       timeout: 3000,
     })
   })
 
   async function ensureWebchatOpen(page: any) {
-    const trigger = page.locator('button[class*="webchat-trigger"]').first()
+    const trigger = page.getByTestId('webchat-trigger')
     await expect(trigger).toBeVisible({ timeout: 10000 })
 
     const ariaExpanded = await trigger.getAttribute('aria-expanded')
@@ -29,16 +29,14 @@ test.describe('Botonic Publish E2E', () => {
       await page.waitForTimeout(300)
     }
 
-    const container = page
-      .locator('[class*="webchat-container-module"]')
-      .first()
+    const container = page.getByTestId('webchat-container')
     await expect(container).toBeVisible({ timeout: 5000 })
 
     return { trigger, container }
   }
 
   test('webchat trigger renders and opens webchat', async ({ page }) => {
-    const trigger = page.locator('button[class*="webchat-trigger"]').first()
+    const trigger = page.getByTestId('webchat-trigger')
     await expect(trigger).toBeVisible({ timeout: 10000 })
 
     const ariaExpanded = await trigger.getAttribute('aria-expanded')
@@ -47,9 +45,7 @@ test.describe('Botonic Publish E2E', () => {
       await page.waitForTimeout(300)
     }
 
-    const container = page
-      .locator('[class*="webchat-container-module"]')
-      .first()
+    const container = page.getByTestId('webchat-container')
     await expect(container).toBeVisible({ timeout: 5000 })
   })
 
@@ -62,7 +58,7 @@ test.describe('Botonic Publish E2E', () => {
     await input.fill('hello')
     await input.press('Enter')
 
-    const messages = page.locator('[class*="message-module"]')
+    const messages = page.locator('[data-testid^="webchat-message-"]')
     await expect(messages.first()).toBeVisible({ timeout: 15000 })
   })
 
@@ -78,7 +74,7 @@ test.describe('Botonic Publish E2E', () => {
     await expect(sendButton).toBeVisible()
     await sendButton.click()
 
-    const messages = page.locator('[class*="message-module"]')
+    const messages = page.locator('[data-testid^="webchat-message-"]')
     await expect(messages.first()).toBeVisible({ timeout: 15000 })
   })
 })

package/src/executors/integrate-provider/executor.js

@@ -22,7 +22,6 @@ __export(executor_exports, {
 });
 module.exports = __toCommonJS(executor_exports);
 var import_enquirer = require("enquirer");
-var import_path = require("path");
 var import_api_service = require("../../lib/api-service");
 var import_executor_helpers = require("../../lib/util/executor-helpers");
 let PROJECT_ROOT;
@@ -32,7 +31,6 @@ async function integrateProviderExecutor(options, context) {
     const { targetEnvironment, environmentVariables } = (0, import_executor_helpers.resolveHubtypeEnvironment)(context, options);
     const botonicApiService = new import_api_service.BotonicAPIService({
       projectRoot: PROJECT_ROOT,
-      workspaceRoot: (0, import_path.resolve)(context.root),
       environmentVariables,
       targetEnvironment
     });

package/src/executors/login-to-hubtype/executor.js

@@ -22,7 +22,6 @@ __export(executor_exports, {
 });
 module.exports = __toCommonJS(executor_exports);
 var import_enquirer = require("enquirer");
-var import_path = require("path");
 var import_api_service = require("../../lib/api-service");
 var import_executor_helpers = require("../../lib/util/executor-helpers");
 async function loginToHubtypeExecutor(options, context) {
@@ -31,7 +30,6 @@ async function loginToHubtypeExecutor(options, context) {
     const { targetEnvironment, environmentVariables } = (0, import_executor_helpers.resolveHubtypeEnvironment)(context, options);
     const botonicApiService = new import_api_service.BotonicAPIService({
       projectRoot,
-      workspaceRoot: (0, import_path.resolve)(context.root),
       environmentVariables,
       targetEnvironment
     });

package/src/executors/logout-from-hubtype/executor.js

@@ -30,12 +30,12 @@ async function logoutFromHubtypeExecutor(options, context) {
   const homeCredsPath = (0, import_path.join)(
     (0, import_os.homedir)(),
     import_constants.BOTONIC_HOME_DIRNAME,
-    import_constants.GLOBAL_CREDS_FILENAME
+    import_constants.ENV_CREDENTIALS_FILENAME
   );
   const workspaceCredsPath = (0, import_path.join)(
     (0, import_path.resolve)(context.root),
     import_constants.BOTONIC_HOME_DIRNAME,
-    import_constants.GLOBAL_CREDS_FILENAME
+    import_constants.ENV_CREDENTIALS_FILENAME
   );
   let removed = false;
   if (await (0, import_fs_extra.pathExists)(workspaceCredsPath)) {

package/src/executors/serve-bot/executor.js

@@ -70,7 +70,10 @@ function writeToLogFile(line) {
 }
 function checkFrontailInstalled(cwd) {
   try {
-    (0, import_child_process.execSync)("npx --no frontail --help", { stdio: "pipe", cwd });
+    (0, import_child_process.execSync)(`${cwd}/node_modules/.bin/frontail --help`, {
+      stdio: "pipe",
+      cwd
+    });
     return true;
   } catch {
     return false;
@@ -86,10 +89,8 @@ function startFrontail(logPath, port, cwd) {
     return null;
   }
   const frontailProcess = (0, import_child_process.spawn)(
-    "npx",
+    `${cwd}/node_modules/.bin/frontail`,
     [
-      "--no",
-      "frontail",
       "--port",
       port.toString(),
       "--theme",
@@ -205,33 +206,60 @@ async function serveBotExecutor(options, context) {
       `${colors.dim}[lambda] No previous Lambda container to clean up.${colors.reset}`
     );
   }
-  const logViewerEnabled = options.logViewer === true;
   logFilePath = null;
   const logViewerPort = options.logViewerPort ?? 9001;
   const webchatDevPort = tryReadWebchatDevPort(fullProjectRoot);
-  let frontailProcess = null;
-  if (logViewerEnabled) {
-    logFilePath = initLogFile(fullProjectRoot);
-    frontailProcess = startFrontail(logFilePath, logViewerPort, context.root);
-  }
-  const logViewerInfo = logViewerEnabled ? `${colors.dim}Webchat:${colors.reset}       ${colors.bold}http://localhost:${webchatDevPort}/?logs=${logViewerPort}${colors.reset} (with logs panel)
-${colors.dim}Log viewer:${colors.reset}    http://localhost:${logViewerPort}` : "";
+  logFilePath = initLogFile(fullProjectRoot);
+  const frontailProcess = startFrontail(
+    logFilePath,
+    logViewerPort,
+    context.root
+  );
+  const logViewerInfo = `${colors.dim}Webchat:${colors.reset}       ${colors.bold}http://localhost:${webchatDevPort}/?logs=${logViewerPort}${colors.reset} (with logs panel)
+${colors.dim}Log viewer:${colors.reset}    http://localhost:${logViewerPort}`;
   const useTunnel = true;
   const tunnelPort = options.tunnelPort ?? 3001;
   let effectiveLambdaEndpoint = options.lambdaEndpoint;
   let startLambda = !options.skipLambda && !effectiveLambdaEndpoint;
   let tunnelDeployResult;
+  let devSessionLambdaFunctionName;
+  let registeredTunnelUrl;
+  let deployedBotId;
+  let selectedBotId;
+  let deployedApiUrl;
+  let deployedAccessToken;
+  let deployedRefreshToken;
+  let deployedClientId;
   if (useTunnel) {
     await (0, import_executor_helpers.ensureHubtypeLoginBeforeTunnel)(context, fullProjectRoot, {
       env: options.env,
       configuration
     });
-    await (0, import_executor_helpers.ensureLocalRuntimeBotBeforeTunnel)(context, fullProjectRoot, {
-      env: options.env,
-      configuration
-    });
+    try {
+      selectedBotId = await (0, import_executor_helpers.selectBotForServe)(context, fullProjectRoot, {
+        env: options.env,
+        configuration,
+        botName: options.botName
+      });
+    } catch (botDeployErr) {
+      if ((0, import_executor_helpers.isBotDeployedRestartRequired)(botDeployErr)) {
+        if (frontailProcess) {
+          frontailProcess.kill("SIGTERM");
+        }
+        if (process.stdin.isTTY) {
+          try {
+            process.stdin.setRawMode(false);
+          } catch {
+          }
+        }
+        process.stdin.pause();
+        process.stdin.unref();
+        return { success: true };
+      }
+      throw botDeployErr;
+    }
     console.log(
-      `${colors.dim}Starting tunnel flow (Lambda + cloudflared + deploy_local_runtime)...${colors.reset}
+      `${colors.dim}Starting tunnel flow (Lambda + cloudflared + dev session registration)...${colors.reset}
 `
     );
   }
@@ -256,18 +284,79 @@ ${colors.dim}Log viewer:${colors.reset}    http://localhost:${logViewerPort}` :
       console.log(`${colors.dim}Tunnel URL: ${tunnelUrl}${colors.reset}
 `);
       console.log(
-        `${colors.dim}Registering tunnel with backend (deploy_local_runtime)...${colors.reset}`
+        `${colors.dim}Setting up dev bot and writing dev session env vars...${colors.reset}`
       );
       const deployResult = await (0, import_executor_helpers.performDeployLocalRuntimeWithEndpoint)(
         context,
         fullProjectRoot,
         tunnelUrl,
-        { env: options.env, configuration }
+        {
+          env: options.env,
+          configuration,
+          whatsappPhone: options.phone,
+          selectedBotId
+        }
       );
       tunnelDeployResult = {
         targetEnvironment: deployResult.targetEnvironment,
-        environmentVariables: deployResult.environmentVariables
+        environmentVariables: deployResult.environmentVariables,
+        teardownWebchat: deployResult.teardownWebchat
       };
+      devSessionLambdaFunctionName = deployResult.lambdaFunctionName;
+      registeredTunnelUrl = tunnelUrl;
+      deployedBotId = deployResult.botId ?? "";
+      deployedApiUrl = deployResult.apiUrl ?? "https://api.hubtype.com";
+      deployedAccessToken = deployResult.accessToken ?? "";
+      deployedRefreshToken = deployResult.refreshToken ?? "";
+      deployedClientId = deployResult.clientId ?? "";
+      const resolvedEnv = ["local", "dev", "dev2", "qa", "prod"].includes(deployResult.targetEnvironment) ? deployResult.targetEnvironment : "local";
+      (0, import_executor_helpers.writeEnvVarToEnvFile)(
+        fullProjectRoot,
+        "VITE_DEV_SESSION_URL",
+        tunnelUrl,
+        resolvedEnv
+      );
+      if (devSessionLambdaFunctionName) {
+        (0, import_executor_helpers.writeEnvVarToEnvFile)(
+          fullProjectRoot,
+          "VITE_DEV_LAMBDA_FUNCTION_NAME",
+          devSessionLambdaFunctionName,
+          resolvedEnv
+        );
+      }
+      (0, import_executor_helpers.writeEnvVarToEnvFile)(
+        fullProjectRoot,
+        "VITE_DEV_BOT_ID",
+        deployResult.botId ?? "",
+        resolvedEnv
+      );
+      (0, import_executor_helpers.writeEnvVarToEnvFile)(
+        fullProjectRoot,
+        "VITE_DEV_API_URL",
+        deployResult.apiUrl ?? "https://api.hubtype.com",
+        resolvedEnv
+      );
+      (0, import_executor_helpers.writeEnvVarToEnvFile)(
+        fullProjectRoot,
+        "VITE_DEV_ACCESS_TOKEN",
+        deployResult.accessToken ?? "",
+        resolvedEnv
+      );
+      (0, import_executor_helpers.writeEnvVarToEnvFile)(
+        fullProjectRoot,
+        "VITE_DEV_REFRESH_TOKEN",
+        deployResult.refreshToken ?? "",
+        resolvedEnv
+      );
+      (0, import_executor_helpers.writeEnvVarToEnvFile)(
+        fullProjectRoot,
+        "VITE_DEV_CLIENT_ID",
+        deployResult.clientId ?? "",
+        resolvedEnv
+      );
+      console.log(
+        `${colors.dim}VITE_DEV_SESSION_URL written to .env.${resolvedEnv}${colors.reset}`
+      );
       effectiveLambdaEndpoint = tunnelUrl;
       startLambda = false;
     }
@@ -312,7 +401,7 @@ ${colors.webviews}[webviews]${colors.reset} - Webviews Vite dev server
 `);
   if (useExternalLambda && !useTunnel) {
     console.log(
-      `${colors.dim}\u{1F4A1} Ensure you have run deploy_local_runtime with this URL so the backend can invoke your Lambda.${colors.reset}
+      `${colors.dim}\u{1F4A1} Ensure you have run the serve target first to register your dev session.${colors.reset}
 `
     );
   }
@@ -340,13 +429,23 @@ ${colors.webviews}[webviews]${colors.reset} - Webviews Vite dev server
     }
     const noOpenEnv = options.open === false ? "VITE_SERVE_OPEN=false " : "";
     const viteEnvAppId = `VITE_HUBTYPE_APP_ID=${effectiveAppId}`;
-    const logViewerEnv = logViewerEnabled ? `LOG_VIEWER_PORT=${logViewerPort} ` : "";
-    const webchatCommand = `${noOpenEnv}${logViewerEnv}${viteEnvAppId} TARGET_APP=webchat MODE=${configuration} vite --config ${configPath}`;
+    const viteDevSessionEnv = registeredTunnelUrl && devSessionLambdaFunctionName ? `VITE_DEV_SESSION_URL=${registeredTunnelUrl} VITE_DEV_LAMBDA_FUNCTION_NAME=${devSessionLambdaFunctionName} ` : "";
+    const viteDevCredentialsEnv = deployedBotId ? [
+      `VITE_DEV_BOT_ID=${deployedBotId}`,
+      `VITE_DEV_API_URL=${deployedApiUrl ?? "https://api.hubtype.com"}`,
+      `VITE_DEV_ACCESS_TOKEN=${deployedAccessToken ?? ""}`,
+      `VITE_DEV_REFRESH_TOKEN=${deployedRefreshToken ?? ""}`,
+      `VITE_DEV_CLIENT_ID=${deployedClientId ?? ""}`
+    ].join(" ") + " " : "";
+    const logViewerEnv = `LOG_VIEWER_PORT=${logViewerPort} `;
+    const botHasWhatsapp = deployedBotId ? (0, import_executor_helpers.selectedBotHasActiveWhatsapp)(deployedBotId) : false;
+    const whatsappPanelEnv = botHasWhatsapp ? `BOT_HAS_WHATSAPP=1 ${options.phone ? `WHATSAPP_PANEL_PHONE=${options.phone} ` : ""}` : "";
+    const webchatCommand = `${noOpenEnv}${logViewerEnv}${viteDevSessionEnv}${viteDevCredentialsEnv}${whatsappPanelEnv}${viteEnvAppId} TARGET_APP=webchat MODE=${configuration} vite --config ${configPath}`;
     processes.push(
       spawnProcess(webchatCommand, "webchat", colors.webchat, fullProjectRoot)
     );
     if (!options.skipWebviews) {
-      const webviewsCommand = `${noOpenEnv}${viteEnvAppId} TARGET_APP=webviews MODE=${configuration} vite --config ${configPath}`;
+      const webviewsCommand = `${noOpenEnv}${viteDevSessionEnv}${viteEnvAppId} TARGET_APP=webviews MODE=${configuration} vite --config ${configPath}`;
       processes.push(
         spawnProcess(
           webviewsCommand,
@@ -364,6 +463,22 @@ ${colors.webviews}[webviews]${colors.reset} - Webviews Vite dev server
         `
 ${colors.bold}\u{1F6D1} Shutting down all processes...${colors.reset}`
       );
+      try {
+        const envConfig = ["local", "dev", "dev2", "qa", "prod"].includes(tunnelDeployResult?.targetEnvironment ?? "") ? tunnelDeployResult.targetEnvironment : "local";
+        (0, import_executor_helpers.writeEnvVarToEnvFile)(
+          fullProjectRoot,
+          "VITE_DEV_SESSION_URL",
+          "",
+          envConfig
+        );
+        (0, import_executor_helpers.writeEnvVarToEnvFile)(
+          fullProjectRoot,
+          "VITE_DEV_LAMBDA_FUNCTION_NAME",
+          "",
+          envConfig
+        );
+      } catch {
+      }
       processes.forEach(({ name, color, process: proc }) => {
         console.log(`${color}[${name}]${colors.reset} Stopping...`);
         proc.kill("SIGTERM");
@@ -405,6 +520,9 @@ ${colors.bold}\u{1F6D1} Shutting down all processes...${colors.reset}`
       });
     });
   } catch (error) {
+    if ((0, import_executor_helpers.isBotDeployedRestartRequired)(error)) {
+      return { success: true };
+    }
     const errorMessage = error instanceof Error ? error.message : String(error);
     console.error(`\u274C Error starting dev server:`, errorMessage);
     return { success: false };