Add branch and git data to the Run ctx

Author: matt-aitken

internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts

@@ -2,6 +2,7 @@ import { startSpan } from "@internal/tracing";
 import {
   CompleteRunAttemptResult,
   ExecutionResult,
+  GitMeta,
   StartRunAttemptResult,
   TaskRunError,
   TaskRunExecution,
@@ -33,6 +34,7 @@ import {
 import { SystemResources } from "./systems.js";
 import { WaitpointSystem } from "./waitpointSystem.js";
 import { DelayedRunSystem } from "./delayedRunSystem.js";
+import { tryCatch } from "@trigger.dev/core";
 
 export type RunAttemptSystemOptions = {
   resources: SystemResources;
@@ -280,6 +282,14 @@ export class RunAttemptSystem {
             dataType: taskRun.metadataType,
           });
 
+          let git: GitMeta | undefined = undefined;
+          if (environment.git) {
+            const parsed = GitMeta.safeParse(environment.git);
+            if (parsed.success) {
+              git = parsed.data;
+            }
+          }
+
           const execution: TaskRunExecution = {
             task: {
               id: run.lockedBy!.slug,
@@ -330,6 +340,8 @@ export class RunAttemptSystem {
               id: environment.id,
               slug: environment.slug,
               type: environment.type,
+              branchName: environment.branchName ?? undefined,
+              git,
             },
             organization: {
               id: environment.organization.id,

packages/core/src/v3/schemas/api.ts

@@ -1,6 +1,12 @@
 import { z } from "zod";
 import { DeserializedJsonSchema } from "../../schemas/json.js";
-import { FlushedRunMetadata, MachinePresetName, SerializedError, TaskRunError } from "./common.js";
+import {
+  FlushedRunMetadata,
+  GitMeta,
+  MachinePresetName,
+  SerializedError,
+  TaskRunError,
+} from "./common.js";
 import { BackgroundWorkerMetadata } from "./resources.js";
 import { DequeuedMessage, MachineResources } from "./runEngine.js";
 
@@ -302,18 +308,6 @@ export const ExternalBuildData = z.object({
 
 export type ExternalBuildData = z.infer<typeof ExternalBuildData>;
 
-export const GitMeta = z.object({
-  commitAuthorName: z.string().optional(),
-  commitMessage: z.string().optional(),
-  commitRef: z.string().optional(),
-  commitSha: z.string().optional(),
-  dirty: z.boolean().optional(),
-  remoteUrl: z.string().optional(),
-  pullRequestNumber: z.number().optional(),
-});
-
-export type GitMeta = z.infer<typeof GitMeta>;
-
 export const UpsertBranchRequestBody = z.object({
   git: GitMeta.optional(),
   env: z.enum(["preview"]),

packages/core/src/v3/schemas/common.ts

@@ -263,12 +263,26 @@ export const TaskRunExecutionAttempt = z.object({
   status: z.string(),
 });
 
+export const GitMeta = z.object({
+  commitAuthorName: z.string().optional(),
+  commitMessage: z.string().optional(),
+  commitRef: z.string().optional(),
+  commitSha: z.string().optional(),
+  dirty: z.boolean().optional(),
+  remoteUrl: z.string().optional(),
+  pullRequestNumber: z.number().optional(),
+});
+
+export type GitMeta = z.infer<typeof GitMeta>;
+
 export type TaskRunExecutionAttempt = z.infer<typeof TaskRunExecutionAttempt>;
 
 export const TaskRunExecutionEnvironment = z.object({
   id: z.string(),
   slug: z.string(),
   type: z.enum(["PRODUCTION", "STAGING", "DEVELOPMENT", "PREVIEW"]),
+  branchName: z.string().optional(),
+  git: GitMeta.optional(),
 });
 
 export type TaskRunExecutionEnvironment = z.infer<typeof TaskRunExecutionEnvironment>;