chore(cli): keep @fern-api/docker-utils as plain Error, add CONTAINER_ERROR wrappers at call sites

Author: FedeZara

packages/cli/generation/local-generation/local-workspace-runner/src/ContainerExecutionEnvironment.ts

@@ -1,5 +1,6 @@
 import { ContainerRunner } from "@fern-api/core-utils";
 import { runContainer } from "@fern-api/docker-utils";
+import { CliError } from "@fern-api/task-context";
 import {
     CONTAINER_CODEGEN_OUTPUT_DIRECTORY,
     CONTAINER_GENERATOR_CONFIG_PATH,
@@ -79,15 +80,25 @@ export class ContainerExecutionEnvironment implements ExecutionEnvironment {
             ports[DEFAULT_NODE_DEBUG_PORT] = DEFAULT_NODE_DEBUG_PORT;
         }
 
-        await runContainer({
-            logger: context.logger,
-            imageName: this.containerImage,
-            args: [CONTAINER_GENERATOR_CONFIG_PATH],
-            binds,
-            envVars,
-            ports,
-            removeAfterCompletion: !this.keepContainer,
-            runner: this.runner ?? runner
-        });
+        try {
+            await runContainer({
+                logger: context.logger,
+                imageName: this.containerImage,
+                args: [CONTAINER_GENERATOR_CONFIG_PATH],
+                binds,
+                envVars,
+                ports,
+                removeAfterCompletion: !this.keepContainer,
+                runner: this.runner ?? runner
+            });
+        } catch (error) {
+            if (error instanceof CliError) {
+                throw error;
+            }
+            throw new CliError({
+                message: `Container execution failed: ${error instanceof Error ? error.message : String(error)}`,
+                code: CliError.Code.ContainerError
+            });
+        }
     }
 }

packages/cli/generation/local-generation/local-workspace-runner/src/ReusableContainerExecutionEnvironment.ts

@@ -8,6 +8,7 @@ import {
 } from "@fern-api/docker-utils";
 import { Logger, LogLevel } from "@fern-api/logger";
 import { loggingExeca } from "@fern-api/logging-execa";
+import { CliError } from "@fern-api/task-context";
 import {
     CONTAINER_CODEGEN_OUTPUT_DIRECTORY,
     CONTAINER_FERN_DIRECTORY,
@@ -90,7 +91,13 @@ export class ReusableContainerExecutionEnvironment implements ExecutionEnvironme
             }
             this.containers = [];
             this.availableContainers = [];
-            throw error;
+            if (error instanceof CliError) {
+                throw error;
+            }
+            throw new CliError({
+                message: `Failed to start containers: ${error instanceof Error ? error.message : String(error)}`,
+                code: CliError.Code.ContainerError
+            });
         }
 
         if (isDebug) {
@@ -108,6 +115,14 @@ export class ReusableContainerExecutionEnvironment implements ExecutionEnvironme
         const containerId = await this.acquire();
         try {
             await this.doExecute(containerId, args);
+        } catch (error) {
+            if (error instanceof CliError) {
+                throw error;
+            }
+            throw new CliError({
+                message: `Container execution failed: ${error instanceof Error ? error.message : String(error)}`,
+                code: CliError.Code.ContainerError
+            });
         } finally {
             this.release(containerId);
         }