chore(cli): tighten layout — restore upstream order + offlineEnvShim

Three small refactors after the BuildKit-native cleanup:

1. buildImage.ts: move loadContainerfileModule + generateContainerfile back
   above parseGenerateOptions to match upstream's ordering. The fork's
   addition of loadContainerfileModule had pushed the helpers below their
   sole consumer; restoring upstream order makes the file's structure
   easier to scan against the upstream version.

2. buildImage.ts: inline `BASE_IMAGE[options.runtime]` directly into the
   parseGenerateOptions return literal instead of binding it to a local
   const first. One fewer named binding for a value used exactly once.

3. managed-index-controller.ts: introduce offlineEnvShim() that returns the
   same `{ success: true, data: { variables } }` envelope as
   `cliApiClient.getEnvironmentVariables`. Lets the indexer treat both
   modes uniformly — single `if (!$env.success)` check, single
   `$env.data.variables` use site — instead of branching on `result.mode`
   to assemble the envVars value.

No behavior change.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ConProgramming

packages/cli-v3/src/deploy/buildImage.ts

@@ -715,34 +715,6 @@ const BASE_IMAGE: Record<BuildRuntime, string> = {
 
 const DEFAULT_PACKAGES = ["busybox", "ca-certificates", "dumb-init", "git", "openssl"];
 
-export const parseGenerateOptions = (options: GenerateContainerfileOptions) => {
-  const buildArgs = Object.entries(options.build.env || {})
-    .flatMap(([key]) => `ARG ${key}`)
-    .join("\n");
-
-  const buildEnvVars = Object.entries(options.build.env || {})
-    .flatMap(([key]) => `ENV ${key}=$${key}`)
-    .join("\n");
-
-  const postInstallCommands = (options.build.commands || []).map((cmd) => `RUN ${cmd}`).join("\n");
-
-  const baseInstructions = (options.image?.instructions || []).join("\n");
-  const packages = Array.from(new Set(DEFAULT_PACKAGES.concat(options.image?.pkgs || []))).join(
-    " "
-  );
-
-  const baseImage = BASE_IMAGE[options.runtime];
-
-  return {
-    baseImage,
-    baseInstructions,
-    buildArgs,
-    buildEnvVars,
-    packages,
-    postInstallCommands,
-  };
-};
-
 async function loadContainerfileModule(modulePath: string): Promise<ContainerfileTemplate> {
   const absolutePath = resolve(modulePath);
 
@@ -792,6 +764,35 @@ export async function generateContainerfile(options: GenerateContainerfileOption
   }
 }
 
+export const parseGenerateOptions = (options: GenerateContainerfileOptions) => {
+  const buildArgs = Object.entries(options.build.env || {})
+    .flatMap(([key]) => `ARG ${key}`)
+    .join("\n");
+
+  const buildEnvVars = Object.entries(options.build.env || {})
+    .flatMap(([key]) => `ENV ${key}=$${key}`)
+    .join("\n");
+
+  const postInstallCommands = (options.build.commands || []).map((cmd) => `RUN ${cmd}`).join("\n");
+
+  const baseInstructions = (options.image?.instructions || []).join("\n");
+  const packages = Array.from(new Set(DEFAULT_PACKAGES.concat(options.image?.pkgs || []))).join(
+    " "
+  );
+
+  return {
+    baseImage: BASE_IMAGE[options.runtime],
+    baseInstructions,
+    buildArgs,
+    buildEnvVars,
+    packages,
+    postInstallCommands,
+  };
+};
+
+
+
+
 export async function generateBunContainerfile(options: GenerateContainerfileOptions) {
   const { baseImage, buildArgs, buildEnvVars, postInstallCommands, baseInstructions, packages } =
     parseGenerateOptions(options);

packages/cli-v3/src/entryPoints/managed-index-controller.ts

@@ -56,6 +56,16 @@ type OfflineBootstrap = {
 
 type BootstrapResult = OnlineBootstrap | OfflineBootstrap;
 
+/**
+ * Returns the same shape as `cliApiClient.getEnvironmentVariables` for the
+ * offline path. We never have project env vars at index time in offline mode
+ * (the build container has no API access), so it's just an empty `variables`
+ * map wrapped in the success envelope so downstream code can branch once on
+ * `$env.success`.
+ */
+const offlineEnvShim = () =>
+  ({ success: true as const, data: { variables: {} as Record<string, string> } });
+
 async function bootstrap(): Promise<BootstrapResult> {
   const buildManifest = await loadBuildManifest();
 
@@ -105,23 +115,21 @@ async function indexDeployment(result: BootstrapResult) {
   const stderr: string[] = [];
 
   try {
-    const envVars =
+    const $env =
       result.mode === "offline"
-        ? {}
-        : await (async () => {
-            const $env = await result.cliApiClient.getEnvironmentVariables(result.projectRef);
-            if (!$env.success) {
-              throw new Error(`Failed to fetch environment variables: ${$env.error}`);
-            }
-            return $env.data.variables;
-          })();
+        ? offlineEnvShim()
+        : await result.cliApiClient.getEnvironmentVariables(result.projectRef);
+
+    if (!$env.success) {
+      throw new Error(`Failed to fetch environment variables: ${$env.error}`);
+    }
 
     const workerManifest = await indexWorkerManifest({
       runtime: buildManifest.runtime,
       indexWorkerPath: buildManifest.indexWorkerEntryPoint,
       buildManifestPath: "./build.json",
       nodeOptions: execOptionsForRuntime(buildManifest.runtime, buildManifest),
-      env: envVars,
+      env: $env.data.variables,
       otelHookExclude: buildManifest.otelImportHook?.exclude,
       otelHookInclude: buildManifest.otelImportHook?.include,
       handleStdout(data) {