Skip to content

[pull] main from Comfy-Org:main - #36

Merged
pull[bot] merged 2 commits into
Penguinjanator:mainfrom
Comfy-Org:main
Aug 14, 2026
Merged

[pull] main from Comfy-Org:main#36
pull[bot] merged 2 commits into
Penguinjanator:mainfrom
Comfy-Org:main

Conversation

@pull

@pull pull Bot commented Aug 14, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

christian-byrne and others added 2 commits August 14, 2026 03:46
…5094)

## Summary

Model the existing workspace lifecycle invariant directly in the store:
the active workspace is selected during initialization and changing
workspaces performs a full page reload, so consumers must not mutate
`activeWorkspaceId` in the current document.

## Why

The previous implementation exposed `activeWorkspaceId` as writable even
though production workspace transitions always persist the target and
reload. That allowed tests and defensive consumer logic to model an
unsupported same-document A → B transition. In `useSubscription`, this
led to workspace-keyed request coalescing and stale-workspace handling
for a transition that cannot occur through the production API.

The `null → workspace` initialization transition remains internal to
`teamWorkspaceStore` and is completed behind `WorkspaceAuthGate` before
routed content renders.

## Changes

- Expose `activeWorkspaceId` as a readonly computed value while
retaining mutations inside `teamWorkspaceStore` initialization and
identity reset.
- Coalesce subscription status requests only when both the authenticated
user and workspace context match.
- Discard responses from the previous account after an identity switch,
while removing tests based on unsupported direct workspace-only
mutation.
- Replace cross-store tests that need synthetic workspace state with
explicit dependency mocks rather than mutating the production store.

## Validation

- `pnpm typecheck`
- ESLint on all changed files
- 235 focused tests across subscription, workspace UI, partner-node
governance, and auth stores

No UI changed, so screenshots and E2E coverage are not applicable.

---------

Co-authored-by: Connor Byrne <c.byrne@comfy.org>
Co-authored-by: dante01yoon <bunggl@naver.com>
Co-authored-by: Amp <amp@ampcode.com>
Patch version increment to 1.51.4

**Base branch:** `main`

Co-authored-by: christian-byrne <72887196+christian-byrne@users.noreply.github.com>
@pull pull Bot locked and limited conversation to collaborators Aug 14, 2026
@pull pull Bot added the ⤵️ pull label Aug 14, 2026
@pull
pull Bot merged commit 82bad2e into Penguinjanator:main Aug 14, 2026
18 of 20 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants