Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .oxfmtrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"sortPackageJson": false,
"ignorePatterns": [
"node_modules",
"apps/webapp",
".env",
".env.local",
"pnpm-lock.yaml",
Expand Down
3 changes: 1 addition & 2 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"**/*.d.ts",
"**/seed.js",
"**/seedCloud.ts",
"**/populate.js",
"apps/webapp/**"
"**/populate.js"
],
// All rules below are disabled because they currently fire on the existing
// codebase (1748 warnings across these 20 rules as of this commit). Disabled
Expand Down
8 changes: 1 addition & 7 deletions apps/webapp/app/assets/icons/AIPenIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,7 @@ export function AIPenIcon({ className }: { className?: string }) {
stroke="currentColor"
strokeWidth="2"
/>
<line
x1="17.6464"
y1="10.3536"
x2="13.6464"
y2="6.35355"
stroke="currentColor"
/>
<line x1="17.6464" y1="10.3536" x2="13.6464" y2="6.35355" stroke="currentColor" />
</svg>
);
}
8 changes: 6 additions & 2 deletions apps/webapp/app/assets/icons/AiProviderIcons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,12 @@ export function CerebrasIcon({ className }: IconProps) {

export function MistralIcon({ className }: IconProps) {
return (
<svg className={className} viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<svg
className={className}
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M7.28516 3.74658H4.1416V6.8809H7.28516V3.74658Z" />
<path d="M19.8579 3.74658H16.7144V6.8809H19.8579V3.74658Z" />
<path d="M10.4277 6.88086H4.1416V10.0152H10.4277V6.88086Z" />
Expand All @@ -174,4 +179,3 @@ export function AzureIcon({ className }: IconProps) {
</svg>
);
}

18 changes: 2 additions & 16 deletions apps/webapp/app/assets/icons/AttemptIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,8 @@ export function AttemptIcon({ className }: { className?: string }) {
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<rect
x="3"
y="3"
width="18"
height="18"
rx="2"
stroke="currentColor"
strokeWidth="2"
/>
<rect
width="6"
height="2"
rx="1"
transform="matrix(1 0 0 -1 9 15)"
fill="currentColor"
/>
<rect x="3" y="3" width="18" height="18" rx="2" stroke="currentColor" strokeWidth="2" />
<rect width="6" height="2" rx="1" transform="matrix(1 0 0 -1 9 15)" fill="currentColor" />
<rect
width="2.48444"
height="2"
Expand Down
7 changes: 1 addition & 6 deletions apps/webapp/app/assets/icons/ClockIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@ export function ClockIcon({ className }: { className?: string }) {
strokeWidth="2"
strokeLinecap="round"
/>
<path
d="M15.5 15.5L12 12"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
<path d="M15.5 15.5L12 12" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
</svg>
);
}
10 changes: 1 addition & 9 deletions apps/webapp/app/assets/icons/FunctionIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,7 @@ export function FunctionIcon({ className }: { className?: string }) {
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<rect
x="3"
y="3"
width="18"
height="18"
rx="2"
stroke="currentColor"
strokeWidth="2"
/>
<rect x="3" y="3" width="18" height="18" rx="2" stroke="currentColor" strokeWidth="2" />
<path
fillRule="evenodd"
clipRule="evenodd"
Expand Down
10 changes: 1 addition & 9 deletions apps/webapp/app/assets/icons/InfoIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,7 @@ export function InfoIcon({ className }: { className?: string }) {
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<rect
x="3"
y="3"
width="18"
height="18"
rx="9"
stroke="currentColor"
strokeWidth="2"
/>
<rect x="3" y="3" width="18" height="18" rx="9" stroke="currentColor" strokeWidth="2" />
<path
d="M9.90005 11.7C9.90005 11.2029 10.303 10.8 10.8 10.8H11.1041C12.4476 10.8 13.4455 12.044 13.1541 13.3555L12.6031 15.8348C12.5615 16.0222 12.704 16.1999 12.896 16.1999H13.2C13.6971 16.1999 14.1 16.6029 14.1 17.0999C14.1 17.597 13.6971 17.9999 13.2 17.9999H12.896C11.5525 17.9999 10.5545 16.7558 10.846 15.4444L11.397 12.965C11.4386 12.7777 11.296 12.5999 11.1041 12.5999H10.8C10.303 12.5999 9.90005 12.197 9.90005 11.7Z"
fill="currentColor"
Expand Down
6 changes: 1 addition & 5 deletions apps/webapp/app/assets/icons/IntegrationsIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ export function IntegrationsIcon({ className }: { className?: string }) {
stroke="currentColor"
strokeWidth="2"
/>
<path
d="M4 7H10V14H3V8C3 7.44772 3.44772 7 4 7Z"
stroke="currentColor"
strokeWidth="2"
/>
<path d="M4 7H10V14H3V8C3 7.44772 3.44772 7 4 7Z" stroke="currentColor" strokeWidth="2" />
<path
d="M17 14V20C17 20.5523 16.5523 21 16 21H10V14H17Z"
stroke="currentColor"
Expand Down
10 changes: 1 addition & 9 deletions apps/webapp/app/assets/icons/RightSideMenuIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,7 @@ export function RightSideMenuIcon({ className }: { className?: string }) {
onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)}
>
<rect
x="4"
y="4"
width="16"
height="16"
rx="2"
stroke="currentColor"
strokeWidth="2"
/>
<rect x="4" y="4" width="16" height="16" rx="2" stroke="currentColor" strokeWidth="2" />
<motion.rect
y="6"
height="12"
Expand Down
10 changes: 1 addition & 9 deletions apps/webapp/app/assets/icons/RunFunctionIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,7 @@ export function RunFunctionIcon({ className }: { className?: string }) {
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<rect
x="3"
y="3"
width="18"
height="18"
rx="2"
stroke="currentColor"
strokeWidth="2"
/>
<rect x="3" y="3" width="18" height="18" rx="2" stroke="currentColor" strokeWidth="2" />
<path
fillRule="evenodd"
clipRule="evenodd"
Expand Down
7 changes: 6 additions & 1 deletion apps/webapp/app/assets/icons/SlackMonoIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
export function SlackMonoIcon({ className }: { className?: string }) {
return (
<svg className={className} viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<svg
className={className}
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M5.042 15.165a2.528 2.528 0 0 1-2.52 2.523A2.528 2.528 0 0 1 0 15.165a2.527 2.527 0 0 1 2.522-2.52h2.52v2.52zm1.271 0a2.527 2.527 0 0 1 2.521-2.52 2.527 2.527 0 0 1 2.521 2.52v6.313A2.528 2.528 0 0 1 8.834 24a2.528 2.528 0 0 1-2.521-2.522v-6.313z" />
<path d="M8.834 5.042a2.528 2.528 0 0 1-2.521-2.52A2.528 2.528 0 0 1 8.834 0a2.528 2.528 0 0 1 2.521 2.522v2.52H8.834zm0 1.271a2.528 2.528 0 0 1 2.521 2.521 2.528 2.528 0 0 1-2.521 2.521H2.522A2.528 2.528 0 0 1 0 8.834a2.528 2.528 0 0 1 2.522-2.521h6.312z" />
<path d="M18.956 8.834a2.528 2.528 0 0 1 2.522-2.521A2.528 2.528 0 0 1 24 8.834a2.528 2.528 0 0 1-2.522 2.521h-2.522V8.834zm-1.27 0a2.528 2.528 0 0 1-2.522 2.521 2.527 2.527 0 0 1-2.521-2.521V2.522A2.527 2.527 0 0 1 15.165 0a2.528 2.528 0 0 1 2.522 2.522v6.312z" />
Expand Down
26 changes: 20 additions & 6 deletions apps/webapp/app/assets/icons/StreamsIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
export function StreamsIcon({ className }: { className?: string }) {
return (
<svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3 19C3 19 5.01155 17 8 17C10.9885 17 13 18.9973 16 18.9973C19 18.9973 21 17 21 17" stroke="currentColor" strokeWidth="2" strokeLinecap="round"/>
<path d="M3 13.0001C3 13.0001 5.01155 11 8 11C10.9885 11 13 13 16 13C19 13 21 11.0001 21 11.0001" stroke="currentColor" strokeWidth="2" strokeLinecap="round"/>
<path d="M3 7C3 7 5.01155 5 8 5C10.9885 5 13 6.9973 16 6.9973C19 6.9973 21 5 21 5" stroke="currentColor" strokeWidth="2" strokeLinecap="round"/>
</svg>
<svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M3 19C3 19 5.01155 17 8 17C10.9885 17 13 18.9973 16 18.9973C19 18.9973 21 17 21 17"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
<path
d="M3 13.0001C3 13.0001 5.01155 11 8 11C10.9885 11 13 13 16 13C19 13 21 11.0001 21 11.0001"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
<path
d="M3 7C3 7 5.01155 5 8 5C10.9885 5 13 6.9973 16 6.9973C19 6.9973 21 5 21 5"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
</svg>
);
}

40 changes: 36 additions & 4 deletions apps/webapp/app/assets/icons/TextSquareIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,42 @@ export function TextSquareIcon({ className }: { className?: string }) {
xmlns="http://www.w3.org/2000/svg"
>
<rect x="3" y="4" width="18" height="16" rx="2" stroke="currentColor" strokeWidth="2" />
<line x1="7" y1="8" x2="13" y2="8" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
<line x1="7" y1="12" x2="10" y2="12" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
<line x1="13" y1="12" x2="17" y2="12" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
<line x1="7" y1="16" x2="15" y2="16" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
<line
x1="7"
y1="8"
x2="13"
y2="8"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
<line
x1="7"
y1="12"
x2="10"
y2="12"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
<line
x1="13"
y1="12"
x2="17"
y2="12"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
<line
x1="7"
y1="16"
x2="15"
y2="16"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
</svg>
);
}
5 changes: 1 addition & 4 deletions apps/webapp/app/clientBeforeFirstRender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ function cleanupLegacyResizablePanelStorage() {
const toRemove: string[] = [];
for (let i = 0; i < window.localStorage.length; i++) {
const key = window.localStorage.key(i);
if (
key &&
(key.startsWith("panel-group-react-aria") || key === "panel-run-parent-v2")
) {
if (key && (key.startsWith("panel-group-react-aria") || key === "panel-run-parent-v2")) {
toRemove.push(key);
}
}
Expand Down
6 changes: 1 addition & 5 deletions apps/webapp/app/components/AskAI.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,7 @@ function AskAIProvider({ websiteId, isCollapsed = false }: AskAIProviderProps) {
</Button>
</span>
</TooltipTrigger>
<TooltipContent
side="right"
sideOffset={8}
className="flex items-center gap-2 text-xs"
>
<TooltipContent side="right" sideOffset={8} className="flex items-center gap-2 text-xs">
Ask AI
<span className="flex items-center">
<ShortcutKey shortcut={{ modifiers: ["mod"] }} variant="medium/bright" />
Expand Down
14 changes: 7 additions & 7 deletions apps/webapp/app/components/BlankStatePanels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -208,17 +208,17 @@ export function SessionsNone() {
}
>
<Paragraph spacing variant="small">
A session is a stateful execution of an agent, with two-way streaming and durable
compute. A single session can have multiple runs associated with it, so one conversation
can span many task triggers. The input stream carries incoming user messages, and the
output stream carries everything the agent produces, including AI generation parts (text,
reasoning, tool calls, etc.) and any custom data parts your task emits.
A session is a stateful execution of an agent, with two-way streaming and durable compute. A
single session can have multiple runs associated with it, so one conversation can span many
task triggers. The input stream carries incoming user messages, and the output stream
carries everything the agent produces, including AI generation parts (text, reasoning, tool
calls, etc.) and any custom data parts your task emits.
</Paragraph>
<Paragraph spacing variant="small">
The easiest way to create one is to trigger a <InlineCode>chat.agent</InlineCode> task,
which is built on sessions and handles the chat turn loop for you. You can also call{" "}
<InlineCode>sessions.start()</InlineCode> directly for non-chat patterns like agent
inboxes, approval flows, or server-to-server streaming.
<InlineCode>sessions.start()</InlineCode> directly for non-chat patterns like agent inboxes,
approval flows, or server-to-server streaming.
</Paragraph>
</InfoPanel>
);
Expand Down
8 changes: 4 additions & 4 deletions apps/webapp/app/components/DevPresence.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ export function DevPresencePanel({ isConnected }: { isConnected: boolean | undef
{isConnected === undefined
? "Checking connection..."
: isConnected
? "Your dev server is connected"
: "Your dev server is not connected"}
? "Your dev server is connected"
: "Your dev server is not connected"}
</DialogHeader>
<div className="mt-2 flex flex-col gap-3 px-2">
<div className="flex flex-col items-center justify-center gap-6 px-6 py-10">
Expand All @@ -169,8 +169,8 @@ export function DevPresencePanel({ isConnected }: { isConnected: boolean | undef
{isConnected === undefined
? "Checking connection..."
: isConnected
? "Your local dev server is connected to Trigger.dev"
: "Your local dev server is not connected to Trigger.dev"}
? "Your local dev server is connected to Trigger.dev"
: "Your local dev server is not connected to Trigger.dev"}
</Paragraph>
</div>
{isConnected ? null : (
Expand Down
4 changes: 2 additions & 2 deletions apps/webapp/app/components/LoginPageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ export function LoginPageLayout({ children }: { children: React.ReactNode }) {
</div>
<div className="flex h-full max-w-sm items-center justify-center">{children}</div>
<Paragraph variant="small" className="text-center">
Having login issues? <TextLink href="https://trigger.dev/contact">Email us</TextLink>{" "}
or <TextLink href="https://trigger.dev/discord">ask us in Discord</TextLink>
Having login issues? <TextLink href="https://trigger.dev/contact">Email us</TextLink> or{" "}
<TextLink href="https://trigger.dev/discord">ask us in Discord</TextLink>
</Paragraph>
</div>
</div>
Expand Down
5 changes: 4 additions & 1 deletion apps/webapp/app/components/SetupCommands.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,10 @@ export function TriggerLoginStepV3({ title }: TabsProps) {
);
}

export function TriggerDeployStep({ title, environment }: TabsProps & { environment: { type: string } }) {
export function TriggerDeployStep({
title,
environment,
}: TabsProps & { environment: { type: string } }) {
const triggerCliTag = useTriggerCliTag();
const { activePackageManager, setActivePackageManager } = usePackageManager();

Expand Down
10 changes: 2 additions & 8 deletions apps/webapp/app/components/Shortcuts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@ import { useShortcutKeys } from "~/hooks/useShortcutKeys";
import { Button } from "./primitives/Buttons";
import { Header3 } from "./primitives/Headers";
import { Paragraph } from "./primitives/Paragraph";
import {
Sheet,
SheetContent,
SheetHeader,
SheetTitle,
SheetTrigger
} from "./primitives/SheetV3";
import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetTrigger } from "./primitives/SheetV3";
import { ShortcutKey } from "./primitives/ShortcutKey";

export function Shortcuts() {
Expand Down Expand Up @@ -83,7 +77,7 @@ function ShortcutContent() {
<ShortcutKey shortcut={{ key: "f" }} variant="medium/bright" />
</Shortcut>
<Shortcut name="Toggle side menu">
<ShortcutKey shortcut={{ modifiers: ["mod"]}} variant="medium/bright" />
<ShortcutKey shortcut={{ modifiers: ["mod"] }} variant="medium/bright" />
<ShortcutKey shortcut={{ key: "b" }} variant="medium/bright" />
</Shortcut>
<Shortcut name="Select filter">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ export const apiRateLimitDomain: RateLimitDomain = {
},
};

export function resolveEffectiveApiRateLimit(
override: unknown
): EffectiveRateLimit {
export function resolveEffectiveApiRateLimit(override: unknown): EffectiveRateLimit {
return resolveEffectiveRateLimit(override, apiRateLimitDomain);
}

Expand Down
Loading
Loading