{
- queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() })
+ queryClient.invalidateQueries({ queryKey: subscriptionKeys.all })
}, 1000)
} catch (error: any) {
if (error.name === 'AbortError') {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
index f2d9cc2f76..61af9f0624 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
@@ -573,7 +573,7 @@ export function useWorkflowExecution() {
// Invalidate subscription queries to update usage
setTimeout(() => {
- queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() })
+ queryClient.invalidateQueries({ queryKey: subscriptionKeys.all })
}, 1000)
safeEnqueue(encodeSSE({ event: 'final', data: result }))
@@ -646,7 +646,7 @@ export function useWorkflowExecution() {
// Invalidate subscription queries to update usage
setTimeout(() => {
- queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() })
+ queryClient.invalidateQueries({ queryKey: subscriptionKeys.all })
}, 1000)
}
return result
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx
index c778f06603..2461f3e739 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx
@@ -165,7 +165,7 @@ export function CancelSubscription({ subscription, subscriptionData }: CancelSub
logger.info('Subscription restored successfully', result)
}
- await queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() })
+ await queryClient.invalidateQueries({ queryKey: subscriptionKeys.all })
if (activeOrgId) {
await queryClient.invalidateQueries({ queryKey: organizationKeys.detail(activeOrgId) })
await queryClient.invalidateQueries({ queryKey: organizationKeys.billing(activeOrgId) })
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/usage-indicator/usage-indicator.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/usage-indicator/usage-indicator.tsx
index dd1df673ae..97f4dc8c36 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/usage-indicator/usage-indicator.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/usage-indicator/usage-indicator.tsx
@@ -199,7 +199,7 @@ export function UsageIndicator({ onClick }: UsageIndicatorProps) {
useEffect(() => {
const handleOperationConfirmed = () => {
setTimeout(() => {
- queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() })
+ queryClient.invalidateQueries({ queryKey: subscriptionKeys.all })
}, 1000)
}
onOperationConfirmed(handleOperationConfirmed)
diff --git a/apps/sim/hooks/queries/subscription.ts b/apps/sim/hooks/queries/subscription.ts
index 750d5f5251..89ded91231 100644
--- a/apps/sim/hooks/queries/subscription.ts
+++ b/apps/sim/hooks/queries/subscription.ts
@@ -98,13 +98,13 @@ export function useUpdateUsageLimit() {
return response.json()
},
onMutate: async ({ limit }) => {
- await queryClient.cancelQueries({ queryKey: subscriptionKeys.user() })
- await queryClient.cancelQueries({ queryKey: subscriptionKeys.usage() })
+ await queryClient.cancelQueries({ queryKey: subscriptionKeys.all })
- const previousSubscriptionData = queryClient.getQueryData(subscriptionKeys.user())
+ const previousSubscriptionData = queryClient.getQueryData(subscriptionKeys.user(false))
+ const previousSubscriptionDataWithOrg = queryClient.getQueryData(subscriptionKeys.user(true))
const previousUsageData = queryClient.getQueryData(subscriptionKeys.usage())
- queryClient.setQueryData(subscriptionKeys.user(), (old: any) => {
+ const updateSubscriptionData = (old: any) => {
if (!old) return old
const currentUsage = old.data?.usage?.current || 0
const newPercentUsed = limit > 0 ? (currentUsage / limit) * 100 : 0
@@ -120,7 +120,10 @@ export function useUpdateUsageLimit() {
},
},
}
- })
+ }
+
+ queryClient.setQueryData(subscriptionKeys.user(false), updateSubscriptionData)
+ queryClient.setQueryData(subscriptionKeys.user(true), updateSubscriptionData)
queryClient.setQueryData(subscriptionKeys.usage(), (old: any) => {
if (!old) return old
@@ -133,19 +136,24 @@ export function useUpdateUsageLimit() {
}
})
- return { previousSubscriptionData, previousUsageData }
+ return { previousSubscriptionData, previousSubscriptionDataWithOrg, previousUsageData }
},
onError: (_err, _variables, context) => {
if (context?.previousSubscriptionData) {
- queryClient.setQueryData(subscriptionKeys.user(), context.previousSubscriptionData)
+ queryClient.setQueryData(subscriptionKeys.user(false), context.previousSubscriptionData)
+ }
+ if (context?.previousSubscriptionDataWithOrg) {
+ queryClient.setQueryData(
+ subscriptionKeys.user(true),
+ context.previousSubscriptionDataWithOrg
+ )
}
if (context?.previousUsageData) {
queryClient.setQueryData(subscriptionKeys.usage(), context.previousUsageData)
}
},
onSettled: () => {
- queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() })
- queryClient.invalidateQueries({ queryKey: subscriptionKeys.usage() })
+ queryClient.invalidateQueries({ queryKey: subscriptionKeys.all })
},
})
}
diff --git a/apps/sim/stores/panel/copilot/store.ts b/apps/sim/stores/panel/copilot/store.ts
index f963983ce0..8a5a634af2 100644
--- a/apps/sim/stores/panel/copilot/store.ts
+++ b/apps/sim/stores/panel/copilot/store.ts
@@ -2661,7 +2661,7 @@ export const useCopilotStore = create()(
// Invalidate subscription queries to update usage
setTimeout(() => {
const queryClient = getQueryClient()
- queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() })
+ queryClient.invalidateQueries({ queryKey: subscriptionKeys.all })
}, 1000)
} finally {
clearTimeout(timeoutId)
diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile
index 92f1c81292..d4faea4fac 100644
--- a/docker/app.Dockerfile
+++ b/docker/app.Dockerfile
@@ -1,21 +1,22 @@
# ========================================
-# Base Stage: Debian-based Bun
+# Base Stage: Debian-based Bun with Node.js 22
# ========================================
FROM oven/bun:1.3.3-slim AS base
+# Install Node.js 22 and common dependencies once in base stage
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+ --mount=type=cache,target=/var/lib/apt,sharing=locked \
+ apt-get update && apt-get install -y --no-install-recommends \
+ python3 python3-pip python3-venv make g++ curl ca-certificates bash ffmpeg \
+ && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+ && apt-get install -y nodejs
+
# ========================================
# Dependencies Stage: Install Dependencies
# ========================================
FROM base AS deps
WORKDIR /app
-# Install Node.js 22 for isolated-vm compilation (requires node-gyp and V8)
-RUN apt-get update && apt-get install -y --no-install-recommends \
- python3 make g++ curl ca-certificates \
- && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
- && apt-get install -y nodejs \
- && rm -rf /var/lib/apt/lists/*
-
COPY package.json bun.lock turbo.json ./
RUN mkdir -p apps packages/db packages/testing packages/logger
COPY apps/sim/package.json ./apps/sim/package.json
@@ -25,6 +26,7 @@ COPY packages/logger/package.json ./packages/logger/package.json
# Install turbo globally, then dependencies, then rebuild isolated-vm for Node.js
RUN --mount=type=cache,id=bun-cache,target=/root/.bun/install/cache \
+ --mount=type=cache,id=npm-cache,target=/root/.npm \
bun install -g turbo && \
HUSKY=0 bun install --omit=dev --ignore-scripts && \
cd $(readlink -f node_modules/isolated-vm) && npx node-gyp rebuild --release && cd /app
@@ -89,13 +91,7 @@ RUN bun run build
FROM base AS runner
WORKDIR /app
-# Install Node.js 22 (for isolated-vm worker), Python, and other runtime dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
- python3 python3-pip python3-venv bash ffmpeg curl ca-certificates \
- && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
- && apt-get install -y nodejs \
- && rm -rf /var/lib/apt/lists/*
-
+# Node.js 22, Python, ffmpeg, etc. are already installed in base stage
ENV NODE_ENV=production
# Create non-root user and group
@@ -113,15 +109,15 @@ COPY --from=deps --chown=nextjs:nodejs /app/node_modules/isolated-vm ./node_modu
# Copy the isolated-vm worker script
COPY --from=builder --chown=nextjs:nodejs /app/apps/sim/lib/execution/isolated-vm-worker.cjs ./apps/sim/lib/execution/isolated-vm-worker.cjs
-# Guardrails setup (files need to be owned by nextjs for runtime)
-COPY --from=builder --chown=nextjs:nodejs /app/apps/sim/lib/guardrails/setup.sh ./apps/sim/lib/guardrails/setup.sh
+# Guardrails setup with pip caching
COPY --from=builder --chown=nextjs:nodejs /app/apps/sim/lib/guardrails/requirements.txt ./apps/sim/lib/guardrails/requirements.txt
COPY --from=builder --chown=nextjs:nodejs /app/apps/sim/lib/guardrails/validate_pii.py ./apps/sim/lib/guardrails/validate_pii.py
-# Run guardrails setup as root, then fix ownership of generated venv files
-RUN chmod +x ./apps/sim/lib/guardrails/setup.sh && \
- cd ./apps/sim/lib/guardrails && \
- ./setup.sh && \
+# Install Python dependencies with pip cache mount for faster rebuilds
+RUN --mount=type=cache,target=/root/.cache/pip \
+ python3 -m venv ./apps/sim/lib/guardrails/venv && \
+ ./apps/sim/lib/guardrails/venv/bin/pip install --upgrade pip && \
+ ./apps/sim/lib/guardrails/venv/bin/pip install -r ./apps/sim/lib/guardrails/requirements.txt && \
chown -R nextjs:nodejs /app/apps/sim/lib/guardrails
# Create .next/cache directory with correct ownership
diff --git a/docker/realtime.Dockerfile b/docker/realtime.Dockerfile
index b1f9d4c9fe..863e403695 100644
--- a/docker/realtime.Dockerfile
+++ b/docker/realtime.Dockerfile
@@ -62,6 +62,9 @@ COPY --from=builder --chown=nextjs:nodejs /app/node_modules ./node_modules
# Copy db package (needed by socket)
COPY --from=builder --chown=nextjs:nodejs /app/packages/db ./packages/db
+# Copy logger package (workspace dependency used by socket)
+COPY --from=builder --chown=nextjs:nodejs /app/packages/logger ./packages/logger
+
# Copy sim app (changes most frequently - placed last)
COPY --from=builder --chown=nextjs:nodejs /app/apps/sim ./apps/sim