From 86b70a81c6843a3f323ac24c03040bb3c4e3a86e Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:44:22 +0100
Subject: [PATCH 1/5] Fix execute error handling

---
 packages/cli-v3/src/entryPoints/deploy-run-controller.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/cli-v3/src/entryPoints/deploy-run-controller.ts b/packages/cli-v3/src/entryPoints/deploy-run-controller.ts
index 8b3bc88611..949d262b05 100644
--- a/packages/cli-v3/src/entryPoints/deploy-run-controller.ts
+++ b/packages/cli-v3/src/entryPoints/deploy-run-controller.ts
@@ -784,12 +784,6 @@ class ProdWorker {
               error,
             });
 
-            try {
-              await this._taskRunProcess.cancel();
-            } catch (error) {
-              logger.error("Failed to cancel task run process", { error });
-            }
-
             try {
               await this.#submitAttemptCompletion(execution, {
                 id: execution.run.id,

From 5919a5f3a167df85c56ba47dd16ae1c1374523cf Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:54:22 +0100
Subject: [PATCH 2/5] replace internal errors on attempts

---
 packages/core/src/v3/errors.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/core/src/v3/errors.ts b/packages/core/src/v3/errors.ts
index 17ae534149..f63f48b99f 100644
--- a/packages/core/src/v3/errors.ts
+++ b/packages/core/src/v3/errors.ts
@@ -395,6 +395,13 @@ export function exceptionEventEnhancer(
       }
       break;
     }
+    case TaskRunErrorCodes.TASK_PROCESS_MAYBE_OOM_KILLED:
+    case TaskRunErrorCodes.TASK_PROCESS_OOM_KILLED: {
+      return {
+        ...exception,
+        ...prettyInternalErrors[exception.type],
+      };
+    }
   }
 
   return exception;

From f1eb18715de4a651e0ca28553fab3d1f745ca441 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:54:56 +0100
Subject: [PATCH 3/5] correctly display env var errors while indexing

---
 packages/cli-v3/src/entryPoints/deploy-index-controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli-v3/src/entryPoints/deploy-index-controller.ts b/packages/cli-v3/src/entryPoints/deploy-index-controller.ts
index 9232c9acf5..5822acecd5 100644
--- a/packages/cli-v3/src/entryPoints/deploy-index-controller.ts
+++ b/packages/cli-v3/src/entryPoints/deploy-index-controller.ts
@@ -61,7 +61,7 @@ async function indexDeployment({
     const $env = await cliApiClient.getEnvironmentVariables(projectRef);
 
     if (!$env.success) {
-      throw new Error(`Failed to fetch environment variables: ${env.error}`);
+      throw new Error(`Failed to fetch environment variables: ${$env.error}`);
     }
 
     const workerManifest = await indexWorkerManifest({

From 2e012458e128c8d520f19f5de349fc969d6d628b Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:05:38 +0100
Subject: [PATCH 4/5] display correct errors on crashed attempts

---
 apps/webapp/app/v3/services/crashTaskRun.server.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/webapp/app/v3/services/crashTaskRun.server.ts b/apps/webapp/app/v3/services/crashTaskRun.server.ts
index e71c3717b1..6a337c000e 100644
--- a/apps/webapp/app/v3/services/crashTaskRun.server.ts
+++ b/apps/webapp/app/v3/services/crashTaskRun.server.ts
@@ -97,7 +97,7 @@ export class CrashTaskRunService extends BaseService {
           event: event,
           crashedAt: opts.crashedAt,
           exception: {
-            type: "Worker crashed",
+            type: opts.errorCode ?? "TASK_RUN_CRASHED",
             message: opts.reason,
             stacktrace: opts.logs,
           },
@@ -119,6 +119,7 @@ export class CrashTaskRunService extends BaseService {
         {
           reason: opts.reason,
           logs: opts.logs,
+          code: opts.errorCode,
         }
       );
     }

From b8ab8923e0da84e0978fdfb53006852f3d54a395 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:08:34 +0100
Subject: [PATCH 5/5] add changeset

---
 .changeset/sweet-spies-play.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/sweet-spies-play.md

diff --git a/.changeset/sweet-spies-play.md b/.changeset/sweet-spies-play.md
new file mode 100644
index 0000000000..e699ee2f71
--- /dev/null
+++ b/.changeset/sweet-spies-play.md
@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Correctly display errors on attempts and during indexing