Merge remote-tracking branch 'origin/main' into kapa-ai-widget

Author: matt-aitken

.changeset/green-lions-relate.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/sdk": patch
+---
+
+The envvars.list() and retrieve() functions receive isSecret for each value. Secret values are always redacted.

.changeset/pre.json

@@ -19,6 +19,7 @@
   "changesets": [
     "breezy-turtles-talk",
     "four-needles-add",
+    "green-lions-relate",
     "honest-files-decide",
     "late-chairs-ring",
     "moody-squids-count",
@@ -27,6 +28,10 @@
     "red-wasps-cover",
     "shiny-kiwis-beam",
     "smart-coins-hammer",
+    "sour-mirrors-accept",
+    "tiny-buckets-teach",
+    "tricky-houses-invite",
+    "two-tigers-dream",
     "weak-jobs-hide"
   ]
 }

.changeset/sour-mirrors-accept.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Improve usage flushing

.changeset/tiny-buckets-teach.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix stalled run detection

.changeset/tricky-houses-invite.md

@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Managed run controller performance and reliability improvements

.changeset/two-tigers-dream.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/sdk": patch
+---
+
+maintain proper context in metadata.root and parent getters

.configs/tsconfig.base.json

@@ -10,7 +10,7 @@
 
     "strict": true,
     "alwaysStrict": true,
-    "strictPropertyInitialization": false,
+    "strictPropertyInitialization": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "noUnusedLocals": false,

apps/supervisor/src/env.ts

@@ -27,6 +27,7 @@ const Env = z.object({
   RUNNER_HEARTBEAT_INTERVAL_SECONDS: z.coerce.number().optional(),
   RUNNER_SNAPSHOT_POLL_INTERVAL_SECONDS: z.coerce.number().optional(),
   RUNNER_ADDITIONAL_ENV_VARS: AdditionalEnvVars, // optional (csv)
+  RUNNER_DOCKER_AUTOREMOVE: BoolEnv.default(true),
 
   // Dequeue settings (provider mode)
   TRIGGER_DEQUEUE_ENABLED: BoolEnv.default("true"),

apps/supervisor/src/index.ts

@@ -66,6 +66,7 @@ class ManagedSupervisor {
       heartbeatIntervalSeconds: env.RUNNER_HEARTBEAT_INTERVAL_SECONDS,
       snapshotPollIntervalSeconds: env.RUNNER_SNAPSHOT_POLL_INTERVAL_SECONDS,
       additionalEnvVars: env.RUNNER_ADDITIONAL_ENV_VARS,
+      dockerAutoremove: env.RUNNER_DOCKER_AUTOREMOVE,
     } satisfies WorkloadManagerOptions;
 
     if (this.isKubernetes) {

apps/supervisor/src/services/podCleaner.ts

@@ -1,7 +1,7 @@
 import { SimpleStructuredLogger } from "@trigger.dev/core/v3/utils/structuredLogger";
 import { K8sApi } from "../clients/kubernetes.js";
 import { createK8sApi } from "../clients/kubernetes.js";
-import { HeartbeatService } from "@trigger.dev/core/v3";
+import { IntervalService } from "@trigger.dev/core/v3";
 import { Counter, Gauge, Registry } from "prom-client";
 import { register } from "../metrics.js";
 
@@ -19,7 +19,7 @@ export class PodCleaner {
   private readonly namespace: string;
 
   private readonly batchSize: number;
-  private readonly deletionHeartbeat: HeartbeatService;
+  private readonly deletionInterval: IntervalService;
 
   // Metrics
   private readonly register: Registry;
@@ -32,10 +32,10 @@ export class PodCleaner {
     this.namespace = opts.namespace;
     this.batchSize = opts.batchSize ?? 500;
 
-    this.deletionHeartbeat = new HeartbeatService({
+    this.deletionInterval = new IntervalService({
       intervalMs: opts.intervalMs ?? 10000,
       leadingEdge: true,
-      heartbeat: this.deleteCompletedPods.bind(this),
+      onInterval: this.deleteCompletedPods.bind(this),
     });
 
     // Initialize metrics
@@ -57,11 +57,11 @@ export class PodCleaner {
   }
 
   async start() {
-    this.deletionHeartbeat.start();
+    this.deletionInterval.start();
   }
 
   async stop() {
-    this.deletionHeartbeat.stop();
+    this.deletionInterval.stop();
   }
 
   private async deleteCompletedPods() {

apps/supervisor/src/workloadManager/docker.ts

@@ -43,6 +43,10 @@ export class DockerWorkloadManager implements WorkloadManager {
       `--name=${runnerId}`,
     ];
 
+    if (this.opts.dockerAutoremove) {
+      runArgs.push("--rm");
+    }
+
     if (this.opts.warmStartUrl) {
       runArgs.push(`--env=TRIGGER_WARM_START_URL=${this.opts.warmStartUrl}`);
     }

apps/supervisor/src/workloadManager/types.ts

@@ -10,6 +10,7 @@ export interface WorkloadManagerOptions {
   heartbeatIntervalSeconds?: number;
   snapshotPollIntervalSeconds?: number;
   additionalEnvVars?: Record<string, string>;
+  dockerAutoremove?: boolean;
 }
 
 export interface WorkloadManager {

apps/supervisor/src/workloadServer/index.ts

@@ -452,7 +452,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
         logger.debug("runConnected", { ...getSocketMetadata() });
 
         // If there's already a run ID set, we should "disconnect" it from this socket
-        if (socket.data.runFriendlyId) {
+        if (socket.data.runFriendlyId && socket.data.runFriendlyId !== friendlyId) {
           logger.debug("runConnected: disconnecting existing run", {
             ...getSocketMetadata(),
             newRunId: friendlyId,

apps/webapp/app/components/Feedback.tsx

@@ -1,6 +1,6 @@
 import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
-import { InformationCircleIcon } from "@heroicons/react/20/solid";
+import { InformationCircleIcon, ArrowUpCircleIcon } from "@heroicons/react/20/solid";
 import { EnvelopeIcon } from "@heroicons/react/24/solid";
 import { Form, useActionData, useLocation, useNavigation } from "@remix-run/react";
 import { type ReactNode, useEffect, useState } from "react";
@@ -64,7 +64,9 @@ export function Feedback({ button, defaultValue = "bug" }: FeedbackProps) {
               How can we help? We read every message and will respond as quickly as we can.
             </Paragraph>
           </div>
-          <hr className="border-charcoal-800" />
+          {!(type === "feature" || type === "help" || type === "concurrency") && (
+            <hr className="border-grid-dimmed" />
+          )}
           <Form method="post" action="/resources/feedback" {...form.props} className="w-full">
             <Fieldset className="max-w-full gap-y-3">
               <input value={location.pathname} {...conform.input(path, { type: "hidden" })} />
@@ -97,6 +99,19 @@ export function Feedback({ button, defaultValue = "bug" }: FeedbackProps) {
                     </Paragraph>
                   </InfoPanel>
                 )}
+                {type === "concurrency" && (
+                  <InfoPanel
+                    icon={ArrowUpCircleIcon}
+                    iconClassName="text-indigo-500"
+                    panelClassName="w-full mb-2"
+                  >
+                    <Paragraph variant="small">
+                      How much extra concurrency do you need? You can add bundles of 50 for
+                      $50/month each. To help us advise you, please let us know what your tasks do,
+                      your typical run volume, and if your workload is spiky (many runs at once).
+                    </Paragraph>
+                  </InfoPanel>
+                )}
                 <Select
                   {...conform.select(feedbackType)}
                   variant="tertiary/medium"

apps/webapp/app/components/primitives/CopyableText.tsx

@@ -51,7 +51,7 @@ export function CopyableText({ value, className }: { value: string; className?:
               )}
             </span>
           }
-          content={copied ? "Copied!" : "Copy text"}
+          content={copied ? "Copied!" : "Copy"}
           className="font-sans"
           disableHoverableContent
         />

apps/webapp/app/components/primitives/Switch.tsx

@@ -33,6 +33,13 @@ const variations = {
       "transition group-hover:text-text-bright group-disabled:group-hover:text-text-dimmed"
     ),
   },
+  medium: {
+    container:
+      "flex items-center gap-x-2 rounded-md hover:bg-tertiary py-1.5 px-2 transition focus-custom",
+    root: "h-4 w-8",
+    thumb: "size-3.5 data-[state=checked]:translate-x-3.5 data-[state=unchecked]:translate-x-0",
+    text: "text-sm text-text-dimmed",
+  },
 };
 
 type SwitchProps = React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root> & {

apps/webapp/app/components/primitives/Table.tsx

@@ -349,7 +349,9 @@ export const TableCellMenu = forwardRef<
                   variants[variant].menuButtonDivider
                 )}
               >
-                <div className={cn("flex items-center gap-x-0.5")}>{hiddenButtons}</div>
+                <div className={cn("flex items-center gap-x-0.5 divide-x divide-grid-bright")}>
+                  {hiddenButtons}
+                </div>
               </div>
             )}
             {/* Always visible buttons  */}

apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx

@@ -11,7 +11,7 @@ import { InputGroup } from "~/components/primitives/InputGroup";
 import { Label } from "~/components/primitives/Label";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { Select, SelectItem } from "~/components/primitives/Select";
-import { ButtonSpinner, Spinner } from "~/components/primitives/Spinner";
+import { Spinner, SpinnerWhite } from "~/components/primitives/Spinner";
 import { type loader } from "~/routes/resources.taskruns.$runParam.replay";
 
 type ReplayRunDialogProps = {
@@ -157,7 +157,7 @@ function ReplayForm({
         <Button
           type="submit"
           variant="primary/medium"
-          LeadingIcon={isSubmitting ? ButtonSpinner : undefined}
+          LeadingIcon={isSubmitting ? SpinnerWhite : undefined}
           disabled={isSubmitting}
           shortcut={{ modifiers: ["mod"], key: "enter", enabledOnInputElements: true }}
         >

apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts

@@ -1,3 +1,4 @@
+import { flipCauseOption } from "effect/Cause";
 import { PrismaClient, prisma } from "~/db.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
@@ -48,6 +49,7 @@ export class EnvironmentVariablesPresenter {
                 key: true,
               },
             },
+            isSecret: true,
           },
         },
       },
@@ -82,34 +84,43 @@ export class EnvironmentVariablesPresenter {
       },
     });
 
-    const sortedEnvironments = sortEnvironments(filterOrphanedEnvironments(environments));
+    const sortedEnvironments = sortEnvironments(filterOrphanedEnvironments(environments)).filter(
+      (e) => e.orgMember?.userId === userId || e.orgMember === null
+    );
 
     const repository = new EnvironmentVariablesRepository(this.#prismaClient);
     const variables = await repository.getProject(project.id);
 
     return {
-      environmentVariables: environmentVariables.map((environmentVariable) => {
-        const variable = variables.find((v) => v.key === environmentVariable.key);
+      environmentVariables: environmentVariables
+        .flatMap((environmentVariable) => {
+          const variable = variables.find((v) => v.key === environmentVariable.key);
 
-        return {
-          id: environmentVariable.id,
-          key: environmentVariable.key,
-          values: sortedEnvironments.reduce((previous, env) => {
+          return sortedEnvironments.flatMap((env) => {
             const val = variable?.values.find((v) => v.environment.id === env.id);
-            previous[env.id] = {
-              value: val?.value,
-              environment: { type: env.type, id: env.id },
-            };
-            return { ...previous };
-          }, {} as Record<string, { value: string | undefined; environment: { type: string; id: string } }>),
-        };
-      }),
-      environments: sortedEnvironments
-        .filter((e) => e.orgMember?.userId === userId || e.orgMember === null)
-        .map((environment) => ({
-          id: environment.id,
-          type: environment.type,
-        })),
+            const isSecret =
+              environmentVariable.values.find((v) => v.environmentId === env.id)?.isSecret ?? false;
+
+            if (!val) {
+              return [];
+            }
+
+            return [
+              {
+                id: environmentVariable.id,
+                key: environmentVariable.key,
+                environment: { type: env.type, id: env.id },
+                value: isSecret ? "" : val.value,
+                isSecret,
+              },
+            ];
+          });
+        })
+        .sort((a, b) => a.key.localeCompare(b.key)),
+      environments: sortedEnvironments.map((environment) => ({
+        id: environment.id,
+        type: environment.type,
+      })),
       hasStaging: environments.some((environment) => environment.type === "STAGING"),
     };
   }

apps/webapp/app/presenters/v3/ScheduleListPresenter.server.ts

@@ -163,6 +163,7 @@ export class ScheduleListPresenter extends BasePresenter {
         },
         active: true,
         lastRunTriggeredAt: true,
+        createdAt: true,
       },
       where: {
         projectId: project.id,
@@ -206,6 +207,9 @@ export class ScheduleListPresenter extends BasePresenter {
             }
           : undefined,
       },
+      orderBy: {
+        createdAt: "desc",
+      },
       take: pageSize,
       skip: (page - 1) * pageSize,
     });

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx

@@ -545,6 +545,8 @@ function TaskActivityGraph({ activity }: { activity: TaskActivity }) {
         <Bar dataKey="SYSTEM_FAILURE" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
         <Bar dataKey="PAUSED" fill="#FCD34D" stackId="a" strokeWidth={0} barSize={10} />
         <Bar dataKey="CRASHED" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
+        <Bar dataKey="EXPIRED" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
+        <Bar dataKey="TIMED_OUT" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
       </BarChart>
     </ResponsiveContainer>
   );