Blacksmith optimizations created based on Blacksmith support ticket 2052 with Waleed

[ConnorMul]

Summary

Brief description of what this PR does and why.

Fixes #(issue)

Type of Change

• Bug fix
• New feature
• Breaking change
• Documentation
• Other: ___________

Testing

How has this been tested? What should reviewers focus on?

Checklist

• Code follows project style guidelines
• Self-reviewed my changes
• Tests added/updated and passing
• No new warnings introduced
• I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

Screenshots/Videos

[vercel]

Someone is attempting to deploy a commit to the Sim Team on Vercel.

A member of the Team first needs to authorize it.

[greptile-apps]

Greptile Summary

• Implemented Blacksmith CI/CD optimizations including Docker layer caching and Bun dependency caching across all workflows
• Added cancelAtPeriodEnd field to subscription data model and improved restore subscription UX
• Critical bug in billing portal query logic uses or() when it should use and() for the cancelAtPeriodEnd condition

Confidence Score: 2/5

• This PR has a critical logic error in the billing portal that will cause incorrect subscription lookups
• Score reflects that while the Blacksmith optimizations are well-implemented, there is a critical bug in apps/sim/app/api/billing/portal/route.ts where the query logic incorrectly uses or() instead of and() for the cancelAtPeriodEnd condition. This will match subscriptions that are either active OR have cancelAtPeriodEnd=true, when it should only match active subscriptions that have cancelAtPeriodEnd=true
• Pay close attention to apps/sim/app/api/billing/portal/route.ts - the query logic must be fixed before merging

Important Files Changed

Filename	Overview
docker/app.Dockerfile	Reorganized layer ordering to maximize Docker cache hits by placing frequently-changing files last
apps/sim/app/api/billing/portal/route.ts	Added query condition for subscriptions with cancelAtPeriodEnd=true, but logic appears flawed
apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx	Improved restore subscription UX by removing tooltip and adding proper restore flow for both personal and org subscriptions

Sequence Diagram

sequenceDiagram
    participant User
    participant UI as "Cancel Subscription Component"
    participant API as "Better Auth API"
    participant DB as "Database"
    participant Stripe as "Stripe API"

    User->>UI: "Click Restore Button"
    UI->>UI: "Determine subscription type (personal/org)"
    UI->>API: "betterAuthSubscription.restore({referenceId, subscriptionId?})"
    API->>DB: "Query subscription by referenceId"
    DB-->>API: "Return subscription data"
    API->>Stripe: "Update subscription (cancel_at_period_end: false)"
    Stripe-->>API: "Return updated subscription"
    API->>DB: "Update cancelAtPeriodEnd = false"
    DB-->>API: "Confirm update"
    API-->>UI: "Return success"
    UI->>UI: "Refresh subscription state"
    UI->>User: "Show restored subscription"

Loading

[greptile-apps]

_{17 files reviewed, 1 comment}

_{Edit Code Review Agent Settings | Greptile
React with 👍 or 👎 to share your feedback on this new summary format}

[greptile-apps]

logic: Query logic incorrectly uses or() - subscriptions with cancelAtPeriodEnd=true should still have status='active', not be an alternative condition

Suggested change

	or(
	eq(subscriptionTable.status, 'active'),
	eq(subscriptionTable.cancelAtPeriodEnd, true)
	)
	and(
	eq(subscriptionTable.status, 'active'),
	eq(subscriptionTable.cancelAtPeriodEnd, true)
	)

Prompt To Fix With AI

This is a comment left during a code review.
Path: apps/sim/app/api/billing/portal/route.ts
Line: 41:44

Comment:
**logic:** Query logic incorrectly uses `or()` - subscriptions with `cancelAtPeriodEnd=true` should still have `status='active'`, not be an alternative condition

```suggestion
            and(
              eq(subscriptionTable.status, 'active'),
              eq(subscriptionTable.cancelAtPeriodEnd, true)
            )
```

How can I resolve this? If you propose a fix, please make it concise.

[waleedlatif1]

@ConnorMul can we rebase, and I'll get this merged in right away. And make this PR against staging instead of against main. thanks!

[waleedlatif1]

merged in #2055