## Summary
Backport of PR #6378 to `rh-test` branch.
## Changes
- Extract credit calculations into useSubscriptionCredits composable
- Extract action handlers into useSubscriptionActions composable
- Add comprehensive component and unit tests
- Update subscription panel layout to match Figma design exactly
- Add proper design tokens for modal card surfaces
- Update terminology from "API Nodes" to "Partner Nodes"
- Make credit breakdown dynamic with real API data
- Add proper loading states and error handling
- Remove unused tailwindcss eslint dependencies
## Conflicts Resolved
- Resolved merge conflicts in `packages/design-system/src/css/style.css`
related to button surface CSS variables
## Test plan
- Existing tests pass
- New tests for subscription composables and components
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6397-Backport-update-subscription-panel-for-new-designs-29c6d73d3650812aaa12ff242fd5e078)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com>
## Summary
This PR improves code comments to accurately describe the whitelist
feature flag implementation logic.
## Changes
- Updated comments in `router.ts` and `UserCheckView.vue` to clarify
that the feature flag is checked first before user status
- Removed unreachable comment after return statement in
`UserCheckView.vue`
- Comments now accurately reflect the actual code execution order
## Technical Details
The logic flow remains unchanged:
1. Check `require_whitelist` feature flag first (defaults to `true`)
2. If flag is `true` AND user status is not `'active'`, redirect to
waitlist
3. If flag is `false`, allow all users to proceed regardless of status
## Testing
No functional changes - only comment improvements for better code
maintainability.
🤖 Generated with [Claude Code](https://claude.ai/code)
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6457-fix-improve-whitelist-feature-flag-comments-for-clarity-29c6d73d365081cf8a59d662118f7243)
by [Unito](https://www.unito.io)
Co-authored-by: Claude <noreply@anthropic.com>
## 🐛 Problem
Users were experiencing the following issues during WebSocket
reconnection:
1. Automatic redirect to login page after "Reconnecting" toast message
appears
2. Automatic re-login after a few seconds, returning to the main
interface
3. This cycle repeats, severely degrading user experience
## 🔍 Root Cause Analysis
### 1. Router Guard Catching Too Many Errors
```typescript
// Problematic code
try {
const { getUserCloudStatus, getSurveyCompletedStatus } = await import('@/api/auth')
const userStatus = await getUserCloudStatus()
// ...
} catch (error) {
// All types of errors are caught here
return next({ name: 'cloud-user-check' })
}
```
With dynamic import inside the try block, the following were all being
caught:
- Errors during `@/api/auth` module loading
- Runtime errors from the API singleton
- Actual API call errors
Everything was caught and redirected to `cloud-user-check`.
### 2. Full Page Reload in UserCheckView
```typescript
// Problematic code
window.location.href = '/' // Full page reload!
```
This caused:
- Loss of SPA benefits
- Firebase Auth re-initialization → temporarily null user
- Router guard re-execution → potential for another redirect
## ✅ Solution
### 1. router.ts: Move dynamic import outside try block
```typescript
// After fix
const { getUserCloudStatus, getSurveyCompletedStatus } = await import('@/api/auth')
try {
// Only API calls inside try
const userStatus = await getUserCloudStatus()
// ...
} catch (error) {
// Now only catches pure API call errors
return next({ name: 'cloud-user-check' })
}
```
### 2. UserCheckView.vue: Use SPA routing
```typescript
// After fix
await router.replace('/') // Use Vue Router instead of window.location.href
```
🤖 Generated with [Claude Code](https://claude.ai/code)
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6410-fix-prevent-unwanted-login-redirects-during-WebSocket-reconnection-29c6d73d3650818a8a1acbdcebd2f703)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: GitHub Action <action@github.com>
Fixes subscription dialog incorrectly appearing on cloud onboarding
pages (email verification, survey, waitlist). Root cause: logout uses
SPA routing leaving extensions with stale auth state. Solution: (1) use
full page navigation for logout to reset app state, (2) add defensive
route guard to skip subscription checks on /cloud/* paths. Prevents
subscription modal from showing during account switching and onboarding
flows.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6367-Fix-subscription-dialog-appearing-during-onboarding-29b6d73d3650818d88e0d59ade7de02e)
by [Unito](https://www.unito.io)
## Summary
Fixes all usages of `SurveyResponses` interface to match the updated
structure.
## Problem
After PR #6314 updated the `SurveyResponses` interface, several files
still used the old property names causing TypeScript errors:
- `team_size` (removed)
- `use_case` (should be `useCase`)
- `intended_use` (removed)
## Changes
Updated all survey response usages:
**CloudSurveyView.vue:**
- Updated `trackSurvey` call to use new field names
- Removed obsolete `team_size` and `intended_use` fields
- Added `making` field for content type tracking
**MixpanelTelemetryProvider.ts (4 locations):**
- User properties from cached store
- User properties from dynamic import
- Event properties in `trackSurvey`
- `setSurveyUserProperties` method
## Testing
- [x] Type checking passes
- [x] Survey data now maps 1-to-1 with actual survey fields
## Related
Follow-up to PR #6314 which updated the interface definition.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6325-bugfix-update-survey-response-usage-to-match-new-interface-2996d73d36508128bb62deb545b76c7b)
by [Unito](https://www.unito.io)
## Summary
Track template metadata in English for analytics regardless of user's
locale to enable consistent statistical analysis.
## Changes
- **What**: Load English template index alongside localized version
(cloud builds only)
- **What**: Added getEnglishMetadata() method to workflowTemplatesStore
that returns English versions of template tags, category, useCase,
models, and license
- **What**: Updated MixpanelTelemetryProvider to prefer English metadata
for analytics events, falling back to localized values
## Review Focus
English template fetch only triggers in cloud builds via isCloud flag.
Non-cloud builds see no bundle size impact. Method returns null when
English templates unavailable, with fallback to localized data ensuring
analytics continue working in edge cases.
Backport of main PR to rh-test branch.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6305-feat-track-analytics-in-English-for-template-metadata-2986d73d365081d1acf6eeeaadb224b5)
by [Unito](https://www.unito.io)
## Summary
Backport of session cookie authentication implementation from main to
rh-test.
## Changes
- Added session cookie management via extension hooks
- Cookie created on login, refreshed on token refresh, deleted on logout
- New extension hooks: `onAuthTokenRefreshed()` and `onAuthUserLogout()`
- DDD-compliant structure with platform layer
(`src/platform/auth/session/`)
## Conflict Resolution
- Resolved import conflict in `firebaseAuthStore.ts` (merged
`onIdTokenChanged` + `sendEmailVerification`)
- Added `onIdTokenChanged` mock to tests
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6299-backport-rh-test-Add-session-cookie-auth-2986d73d365081238507f99ae789d44b)
by [Unito](https://www.unito.io)
The await was causing the app to hang on deployment with a white screen
because the service worker registration promise was not resolving.
Changed back to void import() to allow the app to mount immediately
while service worker registration happens in the background.
## Summary
Cleans up the cloud login page by removing redundant UI elements.
## Changes
1. **Removed duplicate signup text**: "Don't have an account yet? Sign
up instead" was appearing twice - once at the top and once at the
bottom. Now it only appears once at the top where it's most visible.
2. **Removed beta banner**: The "Cloud is currently in private beta"
banner at the top of the page has been removed.
## Before/After
**Before:**
- Beta banner at top
- "Don't have an account yet?" at top
- Form in middle
- "Don't have an account yet?" again at bottom (duplicate)
**After:**
- "Don't have an account yet?" at top only
- Form in middle
- Contact info at bottom
The page is now cleaner and less repetitive.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6270-ux-clean-up-cloud-login-page-remove-duplicate-signup-text-and-beta-banner-2976d73d365081c5a7a5c15dd426317d)
by [Unito](https://www.unito.io)
## Summary
Backport of #6139 to `rh-test` branch.
Added Service Worker to inject Firebase auth headers into browser-native
`/api/view` requests (img, video, audio tags) for cloud distribution.
## Changes
- **What**: Implemented [Service
Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API)
to intercept and authenticate media requests that cannot natively send
custom headers
- **Dependencies**: None (uses native Service Worker API)
## Implementation Details
**Tree-shaking**: Uses compile-time `isCloud` constant - completely
removed from localhost/desktop builds (verified via bundle analysis).
**Caching**: 50-minute auth header cache with automatic invalidation on
login/logout to prevent redundant token fetches.
## Backport Notes
- Resolved merge conflict in `src/main.ts` where remote config loading
logic was added on `rh-test`
- Preserved the CRITICAL comment about loading remote config first
- All files from original commit included
- Typecheck passed successfully
Original commit: 26f587c956
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6259-backport-rh-test-add-service-worker-on-cloud-distribution-to-attach-auth-header-to-brow-2966d73d365081b39cdac969b6c24d0d)
by [Unito](https://www.unito.io)
## Summary
- Fixed duplicate verification email issue where emails were sent every
time users returned to the root page
- Emails are now only sent automatically when coming from signup/login
flow
- Added proper toast notifications to cloud onboarding pages
## Changes
- **Conditional email sending**: Only send verification email when
`fromAuth=true` query parameter is present (from signup/login flow)
- **Auto-cleanup**: Remove `fromAuth` parameter after sending email to
prevent re-sending on page refresh
- **Toast system fix**:
- Added `GlobalToast` component to `CloudLayoutView` for proper toast
display in onboarding pages
- Migrated from PrimeVue `useToast()` to ComfyUI's `useToastStore()`
- **UI improvements**:
- Better spacing and layout for email verification page
- Added multiline support for tips and instructions
- Improved toast messages with clearer titles and summaries
## Problem it solves
Previously, when users signed up and received a verification email,
every time they navigated back to the root page (`/`), the router guard
would redirect them to the email verification page which would
automatically send another email. This caused multiple emails to be
sent, often ending up in spam folders.
## Test plan
- [x] Sign up for a new account → Should receive ONE verification email
- [x] Navigate away and back to root → Should NOT receive another email
- [x] Click "Resend email" button → Should receive a new email
- [x] Refresh the verification page → Should NOT receive another email
- [x] Toast notifications appear correctly in all auth flows
[screen-capture
(1).webm](https://github.com/user-attachments/assets/25ffad94-d129-4051-b29e-5bdec696cd11)
## Summary
- Complete telemetry implementation with circular dependency fix
- Add build performance optimizations from main branch
### Telemetry Features
- ✅ Final telemetry events: signup opened, survey flow, email
verification
- ✅ Onboarding mode to prevent circular dependencies during app
initialization
- ✅ Lazy composable loading with dynamic imports for workflow tracking
- ✅ Survey responses as both event properties and persistent user
properties
- ✅ User identification method for onboarding flow
- ✅ Deferred user property setting until user is authenticated
### Performance Optimizations
- ✅ Tree-shaking enabled to remove unused code
- ✅ Manual chunk splitting for vendor libraries (primevue, vue, tiptap,
chart.js, etc.)
- ✅ Enhanced esbuild minification with console removal in production
builds
- ✅ GENERATE_SOURCEMAP environment variable control
- ✅ Maintained ImportMap disabled for cloud performance
## Test plan
- [x] Telemetry events track correctly in Mixpanel
- [x] No circular dependency errors on app startup
- [x] Survey responses appear as both event properties and user
properties
- [x] Build optimizations reduce bundle size and improve loading
performance
- [x] All lint/format/typecheck passes
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6158-track-cloud-specific-onboarding-events-and-add-performance-optimizations-for-hosted-cloud-2926d73d365081a7b533dde249d5f734)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Claude <noreply@anthropic.com>
## Summary
Backport of PR #6144 to the `rh-test` branch.
This adds build time feature flags system starting with a flag that
indicates whether subscription is required to use the app. This is only
used on cloud.
## Changes
- Added build feature flags system via `__BUILD_FLAGS__` global
- Added `REQUIRE_SUBSCRIPTION` flag that can be set via environment
variable
- Conditionally load subscription-related components based on the flag
- Updated run button logic to respect the subscription requirement flag
- Updated settings UI to show subscription panel only when required
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6147-Backport-make-require-subscription-toggleable-in-build-to-rh-test-2916d73d365081e89bcfc4502315a812)
by [Unito](https://www.unito.io)
## Summary
Backport of #6064 (subscription page) to the `rh-test` branch.
This PR manually cherry-picks commit
7e1e8e3b65 to the rh-test branch and
resolves merge conflicts that prevented automatic backporting.
## Conflicts Resolved
### 1. `src/components/actionbar/ComfyActionbar.vue`
- **Conflict**: HEAD (rh-test) used `<ComfyQueueButton />` while the
subscription PR introduced `<ComfyRunButton />`
- **Resolution**: Updated to use `<ComfyRunButton />` to include the
subscription functionality wrapper while maintaining the existing
rh-test template structure
### 2. `src/composables/auth/useFirebaseAuthActions.ts`
- **Conflict**: Simple ordering difference in the return statement
- **Resolution**: Used the subscription PR's ordering: `deleteAccount,
accessError, reportError`
## Testing
The cherry-pick completed successfully and passed all pre-commit hooks:
- ✅ ESLint
- ✅ Prettier formatting
- ⚠️ Note: 2 unused i18n keys detected (informational only, same as
original PR)
## Related
- Original PR: #6064
- Cherry-picked commit: 7e1e8e3b65
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6140-backport-subscription-page-to-rh-test-2916d73d365081f38f00df422004f61a)
by [Unito](https://www.unito.io)
Co-authored-by: Terry Jia <terryjia88@gmail.com>
Co-authored-by: GitHub Action <action@github.com>
## 🎯 Summary
Improves the user experience for already authenticated users when
accessing invite links by skipping the unnecessary login step.
## 📋 Changes
### Modified CloudInviteEntryView.vue
- Added authentication check on component mount
- Implemented conditional routing based on authentication status:
- **Not authenticated**: Routes to login page (original behavior)
- **Authenticated but email not verified**: Routes to email verification
- **Authenticated and verified with invite code**: Routes to invite
check page
- **Authenticated and verified without invite code**: Routes to user
check page
## 🔍 Impact
- **Before**: All users were redirected to login page, even if already
logged in
- **After**: Authenticated users skip login and go directly to the
appropriate next step
[invite-code-entry.webm](https://github.com/user-attachments/assets/79ea13cd-c7ba-4ff7-b755-cd62ecef91eb)
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6113-Skip-login-step-for-authenticated-users-in-invite-flow-28f6d73d3650813ba635fc74c7fe445b)
by [Unito](https://www.unito.io)
Co-authored-by: Claude <noreply@anthropic.com>
## Summary
- Display signed-in user email in waitlist view for better user clarity
- Add switch accounts option for users on waitlist to change their
account
- Simplify claim invite view by removing avatar box and reorganizing
layout
## Changes Made
### CloudWaitlistView.vue
- Added display of signed-in user email
- Added "Switch accounts" option with navigation to cloud-login
- Improved visual hierarchy and styling for better readability
### CloudClaimInviteView.vue
- Removed avatar box component to simplify UI
- Moved "Switch accounts" link below user info section
- Reorganized layout for better flow
## Test Plan
- [ ] Verify waitlist view displays signed-in user email correctly
- [ ] Test "Switch accounts" navigation works in both views
- [ ] Confirm visual changes display properly in both light/dark themes
- [ ] Ensure no regressions in cloud onboarding flow
🤖 Generated with [Claude Code](https://claude.ai/code)
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6071-fix-Improve-cloud-waitlist-view-UX-with-signed-in-user-display-28d6d73d365081618c19cfb56f4a12b6)
by [Unito](https://www.unito.io)
Co-authored-by: Claude <noreply@anthropic.com>
## Summary
- Removed the "Don't have an account? Sign up" link from the
CloudLoginView when users access the page with an invite code (from
invite link in email)
- The signup option now only shows when there's no invite code present
## Changes
- Modified `CloudLoginView.vue` to conditionally show the signup text
only when `!hasInviteCode`
- Used `<template>` wrapper for better conditional rendering
## Why this change?
Users coming from an invite email link should focus on logging in with
their existing account rather than being presented with a signup option,
as they've already been invited to join.
Fixes the UX issue where invited users might get confused by seeing a
signup option when they should be logging in with their invited account.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6070-chore-Remove-signup-option-on-invite-page-when-using-invite-code-28d6d73d365081e29ac7d58140b2079f)
by [Unito](https://www.unito.io)
## Summary
Improve cloud onboarding flow by adding email verification polling and
fixing signup auto-logout issue.
## Changes
- **What**:
- Add polling mechanism to automatically check email verification status
every 5 seconds on the verify email page
- Fix auto-logout issue after signup by redirecting to root instead of
login page
- Remove automatic logout on login page mount to preserve user session
after signup
- **Breaking**: None
- **Dependencies**: None
## Review Focus
- Email verification polling implementation uses Firebase Auth's
`reload()` method to refresh user state
- Polling stops after 5 minutes to prevent indefinite resource usage
- Proper cleanup of intervals/timeouts in `onUnmounted` hook to prevent
memory leaks
- Signup flow now maintains user session instead of forcing re-login
## User Experience Improvements
1. **Before**: Users had to manually refresh the page after clicking
email verification link
**After**: Page automatically detects verification and proceeds to next
step
2. **Before**: After signup, users were redirected to login page and
automatically logged out, requiring them to sign in again
**After**: Users stay logged in after signup and are redirected to root,
maintaining their session
## Testing
- Tested email verification polling with both verified and unverified
states
- Verified that invite codes are preserved throughout the flow
- Confirmed no memory leaks from polling intervals
- Tested signup flow with email/password authentication
## Related Issues
- Resolves user complaints about having to sign in twice during signup
flow
- Addresses email verification page not auto-advancing after
verification
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6030-fix-Improve-cloud-onboarding-UX-with-email-verification-polling-and-signup-flow-28a6d73d365081be8020caee6337c3e7)
by [Unito](https://www.unito.io)
