Skip to content

chore: sync test → main (subscription endpoint refactor)#520

Merged
sweetmantech merged 11 commits intomainfrom
test
May 6, 2026
Merged

chore: sync test → main (subscription endpoint refactor)#520
sweetmantech merged 11 commits intomainfrom
test

Conversation

@sweetmantech
Copy link
Copy Markdown
Contributor

@sweetmantech sweetmantech commented May 6, 2026

Summary

Test plan


Summary by cubic

Adds GET /api/accounts/[id]/subscription to return an account’s subscription (account or org coverage) with a stable { isPro, status, plan, source } payload. Includes CORS preflight, no caching, strict UUID + auth validation, and resilient Stripe pagination.

  • New Features
    • New route with OPTIONS; thin shell delegates to getAccountSubscriptionHandler.
    • Prefers account subscription; falls back to org; normalizes Stripe status via toStatus.
    • Stripe helpers: getActiveSubscriptions (cursor pagination until match), getOrgSubscription (first match), isActiveSubscription.
    • Error handling: forwards auth/validation failures as 4xx with { error }; 500 guarded.
    • Tests added for the route, handler, and all helpers.

Written for commit d0aa31d. Summary will update on new commits.

Summary by CodeRabbit

  • New Features
    • Added API endpoint for retrieving account subscription information with support for both account-level and organization-level subscriptions.
    • Subscription status tracking including active, trialing, canceled, past_due, and inactive states.
    • CORS support enabled for subscription endpoint requests.

sweetmantech and others added 11 commits May 4, 2026 08:54
)

* refactor(sandbox): callers use open-agents abstraction (Phase 2.2)

Replaces direct @vercel/sandbox SDK calls with the open-agents sandbox
abstraction layer (inlined in Phase 2.1) for sandbox lifecycle (create
+ reconnect). HTTP response shapes preserved exactly.

Per the agreed Option B (hybrid): only the lifecycle creator helpers
get refactored. installClaudeCode / runClaudeCode / getSandboxStatus
stay on the SDK directly because the abstraction does not cover their
needs (sudo, stdout/stderr streaming, simple status reads). Those
two install/run files are also dead orphans (defined but never called)
and will be removed entirely after the full migration.

Production refactor:
  createSandbox.ts            Sandbox.create(...) -> VercelSandbox.create(...)
                              Input: VercelSandboxConfig (was SDK params)
                              Snapshot trigger: restoreSnapshotId field
                                (was source: { type: "snapshot", ... })
                              Returns VercelSandbox (was SDK Sandbox)
  createSandboxWithFallback.ts cascade — passes restoreSnapshotId to createSandbox
  createSandboxFromSnapshot.ts type cascade only (Sandbox -> VercelSandbox)
  getActiveSandbox.ts         Sandbox.get({name}) -> VercelSandbox.connect(name, {})
                              Status check: sandbox.status -> sandbox.sdkStatus
  getOrCreateSandbox.ts       no code change — type cascades automatically
  processCreateSandbox.ts     reads sandbox.sdkStatus instead of sandbox.status
                              defensive nullish on createdAt

Abstraction extension:
  vercel/sandbox/VercelSandbox.ts adds two readonly getters following
  the existing host/environmentDetails/expiresAt pattern:
    get sdkStatus(): string  — raw SDK session status (running/pending/
                                stopped/failed/aborted/snapshotting),
                                distinct from the abstraction's normalized
                                status getter
    get createdAt(): Date | undefined  — SDK session.createdAt

  These give api callers what they need to construct the existing
  HTTP response shape without breaking the abstraction's interface.

Tests updated:
  createSandbox.test.ts            mocks VercelSandbox.create instead of
                                    Sandbox.create; mock object uses
                                    sdkStatus instead of status
  createSandboxWithFallback.test.ts asserts restoreSnapshotId pass-through
  getActiveSandbox.test.ts         mocks VercelSandbox.connect; sdkStatus
                                    on mock objects
  processCreateSandbox.test.ts     mockSandbox uses sdkStatus

Verification:
  - pnpm lint:check: clean
  - pnpm test: 2391/2391 pass
  - HTTP response shape unchanged: same fields, same enum values for
    sandboxStatus (sourced from the SDK now via sdkStatus, was directly
    via SDK Sandbox.status before — identical strings either way)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix: address PR #509 review feedback

Three real issues from CodeRabbit + cubic:

1. createdAt staleness (CodeRabbit minor)
   The new `createdAt` getter on VercelSandbox skipped the
   `refreshStateFromCurrentSession()` step that `sdkStatus` uses, so
   readers right after a reconnect could see stale session metadata.
   Add the refresh.

2. Fabricated createdAt (cubic P2)
   Both createSandbox.ts and processCreateSandbox.ts had a
   `?? new Date().toISOString()` fallback that fabricated creation
   metadata when sandbox.createdAt was missing. The SDK guarantees
   createdAt is populated for any reachable instance, so the fallback
   was both wrong (fabricates data) and unnecessary.

   Tighten the getter to return `Date` (not `Date | undefined`) and
   throw with an explicit "SDK contract violation" message if the
   field is missing — fail-fast surfaces a real contract bug instead
   of silently lying.

   Drop the `?? new Date()` fallbacks at both call sites.

3. Misleading snapshot-restore branching (CodeRabbit major)
   createSandbox.ts had two paths — a "snapshot" branch that omitted
   DEFAULT_VCPUS/DEFAULT_RUNTIME (intent: let snapshot dictate), and
   a "fresh" branch that applied defaults. But VercelSandbox.create
   internally defaults vcpus=4 and runtime="node22" regardless, so
   the omission was a no-op — the abstraction always forwarded those
   to the SDK.

   Drop the misleading branching. Document the actual behavior at
   the top of createSandbox: "VercelSandbox.create applies its own
   defaults regardless of source — those apply to the runtime
   resources of the new sandbox even when restoring from a snapshot."

   Updated the snapshot-restore test to assert the actual call shape
   (vcpus + runtime + timeout + restoreSnapshotId) instead of just
   the original SDK-style truncated args.

Verification:
- pnpm lint:check: clean
- pnpm test: 2391/2391 pass

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(sandbox): delete dead Claude Code helpers (Phase 2.3)

installClaudeCode and runClaudeCode were defined but never imported
anywhere in api production code — confirmed by grep on main:

  $ grep -rn "installClaudeCode\b\|runClaudeCode\b" lib/ app/
  lib/sandbox/installClaudeCode.ts:9: export async function installClaudeCode(...)
  lib/sandbox/runClaudeCode.ts:10:    export async function runClaudeCode(...)

Both files were skipped during the Phase 2.2 abstraction refactor
(per the agreed Option B — they used SDK features the abstraction
doesn't expose: sudo, stdout/stderr streaming, batched writes). With
the broader migration moving to Vercel Workflow + open-agents' agent
package for sandbox bootstrap, these orphans have no path to being
called again.

Removed:
  lib/sandbox/installClaudeCode.ts                (32 lines)
  lib/sandbox/runClaudeCode.ts                    (29 lines)
  lib/sandbox/__tests__/installClaudeCode.test.ts (4 tests)
  lib/sandbox/__tests__/runClaudeCode.test.ts     (6 tests)

Verification:
  - pnpm lint:check: clean
  - pnpm test: 2381/2381 pass (was 2391 — net -10 tests from the
    two deleted test files)

Note: getOrCreateSandbox.ts also has zero importers per the audit
and is similarly dead, but is intentionally NOT deleted in this PR
since it was not explicitly flagged as orphan in the migration plan.
Worth a separate follow-up decision.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore(sandbox): also delete getOrCreateSandbox + getActiveSandbox (YAGNI)

Cascade audit found two more truly-dead helpers per YAGNI:

  getOrCreateSandbox.ts    0 importers (self-only references)
  getActiveSandbox.ts      only called by getOrCreateSandbox — orphan
                            once that goes

Removed:
  lib/sandbox/getOrCreateSandbox.ts                (39 lines)
  lib/sandbox/getActiveSandbox.ts                  (33 lines)
  lib/sandbox/__tests__/getOrCreateSandbox.test.ts (3 tests)
  lib/sandbox/__tests__/getActiveSandbox.test.ts   (4 tests)

Live consumers of related helpers preserved:
  - createSandboxFromSnapshot still used by processCreateSandbox
  - selectAccountSandboxes still used by aggregateAccountSandboxStats,
    buildGetSandboxesParams, getSandboxesHandler, validateGetSandboxesRequest

Verification:
  - pnpm lint:check: clean
  - pnpm test: 2374/2374 pass (was 2381 — net -7 from the two deleted
    test files; -3 from getOrCreateSandbox.test.ts + -4 from
    getActiveSandbox.test.ts)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(sessions): port GET /api/sessions/[sessionId] from open-agents (Phase 2.4 — first route)

First route in the route-by-route cutover plan. Strategy: open-agents
frontend stays unchanged in shape; api ports each route it calls in
priority order (simplest first), and the open-agents frontend gets
cut over to api one route at a time.

Why this route first:
- Pure DB read (single-row select by id) — no agent runner, no Vercel
  Workflow, no sandbox runtime
- Hits sessions table already migrated in database PR #20
- Frontend usage: agents-frontend hits /api/sessions/{id} on session
  detail page navigation
- Smallest possible blast radius for proving the cutover pattern

Files added:
  lib/supabase/sessions/selectSession.ts  Single-row helper + SessionRow
                                          type (hand-typed; database.types.ts
                                          regen pending — flagged in code
                                          comment)
  app/api/sessions/[sessionId]/route.ts   GET handler matching open-agents
                                          response shape exactly (camelCase
                                          fields, "userId" preserved on the
                                          wire even though stored as
                                          account_id internally)
  app/api/sessions/[sessionId]/__tests__/route.test.ts (5 tests)

Auth: validateAuthContext (Privy Bearer or x-api-key). Response codes
match open-agents: 200 happy path, 401 no auth, 403 not owner, 404 not
found.

Wire-format translation: snake_case Supabase row -> camelCase response,
with account_id surfaced as userId so the existing open-agents frontend
fetches with zero code changes. Translation lives at the route boundary
(toSessionResponse) where it is easy to remove once chat absorbs this
UI and we can switch to schema-natural naming.

Verification:
- pnpm lint:check: clean
- pnpm test: 2379/2379 pass (5 new for this route)

Up next:
- Cutover step (separate PR in open-agents): point the frontend at
  api's URL for this single route. Validate end-to-end before porting
  the next route.
- Next routes in priority order (still pure DB, no agent/workflow):
  GET /api/sessions (list with unread — needs Postgres RPC for the
  multi-table aggregation), GET /api/sessions/[id]/chats, GET
  /api/sessions/[id]/chats/[chatId].

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix: address PR review — SRP splits + use Tables<\"sessions\"> from regen'd types

Three review comments on PR #514:

1. SRP: extract toSessionResponse to its own file
   was: defined inline in app/api/sessions/[sessionId]/route.ts
   now: lib/sessions/toSessionResponse.ts (one exported fn per file)

2. SRP: add a handler function (mirroring api convention)
   was: GET handler logic inline in route.ts
   now: lib/sessions/getSessionByIdHandler.ts contains all the auth +
        ownership + DB lookup + response logic; route.ts is a thin
        shell that awaits options.params and delegates. Matches the
        pattern used by every other api route (e.g. socials/[id]/scrape,
        artists/[id]/...).

3. DRY: use existing db schema type
   was: hand-typed SessionRow interface in selectSession.ts
   now: Tables<\"sessions\"> from types/database.types.ts (regenerated
        via npx supabase gen types typescript --project-id ...
        --schema public)

The types regen also resolved the preview-build failure
(\"Type instantiation is excessively deep and possibly infinite\") on
the .from(\"sessions\") call — Supabase's type inference was choking
because the table was unknown to the generic.

Files added:
  lib/sessions/toSessionResponse.ts
  lib/sessions/getSessionByIdHandler.ts

Files modified:
  app/api/sessions/[sessionId]/route.ts        thin shell now
  app/api/sessions/[sessionId]/__tests__/
    route.test.ts                              type alias updated
  lib/supabase/sessions/selectSession.ts       Tables<\"sessions\">
  types/database.types.ts                      Supabase regen

Verification:
  - pnpm lint:check: clean
  - pnpm test: 2379/2379 pass (no test changes; same 5 route tests)
  - tsc compile clean (the local pnpm build progresses past compile
    into page-data collection where it fails on missing local env
    vars — Vercel preview will have those set, so the preview rebuild
    should now succeed)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sessions): make 404/403 errors emit status:"error" for shape consistency

The 401 returned by validateAuthContext shaped like
{status:"error", error:"..."} but 404/403 from this handler returned
{error:"..."} only. Same endpoint, two error shapes — inconsistent for
clients. Align all error responses on the validateAuthContext shape.

Tests now assert the full error body, not just the status code.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(sessions): port POST /api/sessions from open-agents

Implements the POST /api/sessions contract documented in
recoupable/docs PR #186 + #187. Creates a session row and an
initial chat row; rolls back the session if chat insert fails so
callers never observe an orphaned session.

Auth: validateAuthContext (Privy Bearer or x-api-key).
Validation: Zod schema + GitHub repo segment regex. Body is
optional — empty body creates a session with sensible defaults
(status=running, lifecycle_state=provisioning, sandbox_state.type=
vercel, title="New session").

Out of scope (will follow once database catches up):
  auto_commit_push_override, auto_create_pr_override, pr_number,
  pr_status — these columns don't yet exist on api's sessions
  table, so the docs spec was trimmed accordingly in docs PR #187.

TDD: 9 handler tests cover 401, 400 (sandboxType / repoOwner /
repoName), 200 happy path, branch generation, title pass-through,
500 (insertSession failure), and 500-with-rollback (insertChat
failure). Plus 1 thin test on the route shell.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(sessions): add OPTIONS handler + cache directives to POST route

Match the convention from app/api/sessions/[sessionId]/route.ts:
- OPTIONS handler returning 200 + CORS headers (preflight)
- dynamic="force-dynamic", fetchCache="force-no-store", revalidate=0

POST routes that mutate DB shouldn't be cached, and browsers issuing
preflight checks (POST with JSON body + custom auth headers) need
OPTIONS to respond.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sessions): address PR review feedback

- SRP: extract insert-row construction to lib/sessions/buildSessionInsertRow.ts
- YAGNI: drop generateSessionBranchName + isNewBranch handling (sessions
  commit to whatever branch the client provides; auto-generation was
  speculative)
- Tighten isValidGitHubRepoOwner: GitHub's actual rules are alphanumeric
  + hyphen only (no `_` or `.`), 1-39 chars, no leading/trailing or
  consecutive hyphens
- Tighten isValidGitHubRepoName: reject reserved `.` and `..`, reject
  `.git` suffix, cap at 100 chars
- Add unit tests for both validators (15 cases) and for the new
  buildSessionInsertRow (4 cases)
- Split createSessionHandler tests into auth/validation + persistence
  files; share fixtures via createSessionHandlerFixtures.ts. All test
  files now under 100 lines.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sessions): address second round of PR review

- 500 message: "Failed to create session" → "Internal server error"
  (per cubic.dev standardized 500 envelope feedback)
- SRP: extract failedToCreateSession to lib/sessions/failedToCreateSession.ts
- YAGNI: drop repoOwner from request body and remove
  isValidGitHubRepoOwner helper entirely (recoupable is the only
  owner; no need to validate)
- YAGNI: drop repoName from request body and remove
  isValidGitHubRepoName helper (repo identity is derived server-side
  from the authenticated account, not accepted from user input)
- Single-export per file: split createSessionHandlerFixtures.ts into
  makeCreateSessionReq.ts, baseSessionRow.ts, baseChatRow.ts.
  okAuth constant inlined where used.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(sessions): port random-city title fallback from open-agents

Generated session titles now match the open-agents UX — names like
"Anchorage", "Vienna", "Philadelphia" — instead of every untitled
session being called "New session". Closes a wire-shape gap with
open-agents production identified by the head-to-head test on PR.

Pieces:
- lib/sessions/cityNames.ts: ~200-city curated list (verbatim port)
- lib/sessions/getRandomCityName.ts: pick a city not in `usedNames`,
  numeric-suffix fallback when the curated list is exhausted
- lib/supabase/sessions/selectSessionTitlesByAccountId.ts: Supabase
  helper for collision avoidance
- lib/sessions/resolveSessionTitle.ts: orchestrates provided title
  (trimmed) > random city fallback. Async. Kept separate from the
  insert-row builder so that stays synchronous + pure.
- buildSessionInsertRow now takes `title` as a parameter
- createSessionHandler awaits resolveSessionTitle before building the
  row

TDD: 4 tests for getRandomCityName, 4 for resolveSessionTitle. Handler
tests updated to mock resolveSessionTitle.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore: remove GET-only files (scope this PR to POST)

The GET endpoint + handler + tests live in PR #514 and were
inadvertently brought in when this branch was rebased after #514's
work. This PR is scoped to POST only; GET ships in #514.

Shared infrastructure stays (types/database.types.ts regen +
lib/sessions/toSessionResponse.ts) — both are required by the POST
handler too. When either #514 or this PR merges to test first, the
other will see those files already present and resolve cleanly.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sessions): consolidate request validation + DRY supabase select

Two reviewer asks rolled into one commit:

SRP — validateCreateSessionBody now owns the full validation flow.
The handler used to call safeParseJson, validateAuthContext, and the
Zod body schema separately; that was three places to short-circuit
and three places to duplicate the error envelope. Folded them into
validateCreateSessionBody so the handler does one call → success or
NextResponse error. Returns { body, auth } on success.

DRY — replaced lib/supabase/sessions/selectSession.ts and
selectSessionTitlesByAccountId.ts with a single
selectSessions({ id?, accountId? }) that supports both call sites.
resolveSessionTitle now derives titles from the general fetch.

Tests:
- New validateCreateSessionBody.test.ts covers auth-failure / 400 /
  success / malformed-JSON tolerance (4 cases)
- Handler tests now mock validateCreateSessionBody (single mock
  surface instead of three)
- resolveSessionTitle tests mock selectSessions

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sessions): address automated review feedback

Four small fixes from the latest round:

1. Zod v4 migration: { message } → { error } on the sandboxType
   literal. v4 unified the error customization API; { message } is
   deprecated.

2. Orphan rollback observability: when insertChat fails AND the
   session-rollback delete also fails, log the session id so ops
   can detect orphaned rows. New persistence test asserts the log.

3. Defensive try/catch in selectSessions so a thrown exception
   (network-level rejection, not a Supabase {error} return) doesn't
   bubble up and 500 the entire session-creation flow.

4. Deterministic test for getRandomCityName suffix-increment: pin
   Math.random instead of looping until the random pick lands on
   baseCity. Previous test could pass without ever asserting if the
   loop cap was hit.

Skipped: cubic-dev-ai's note about logging raw sessionId in
selectSession.ts — that file was deleted earlier in this PR.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore: prettier format fix on persistence test

The new orphan-session test had a line that exceeded prettier's wrap
width. Auto-format fixed it; format-check now clean.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…514)

Rebased onto current main (which now has the POST endpoint + shared
infra from PR #515). Three pieces of GET-specific work:

- app/api/sessions/[sessionId]/route.ts: thin shell delegating to the
  handler, plus OPTIONS for CORS preflight + cache directives
- lib/sessions/getSessionByIdHandler.ts: validates auth via
  validateAuthContext, reads via selectSessions({id}), enforces
  ownership (403 if account_id mismatch), 404 if missing
- app/api/sessions/[sessionId]/__tests__/route.test.ts: 5 cases —
  401 / 404 / 403 / 200 happy path / OPTIONS smoke

Uses the new general selectSessions({id}) reader rather than the
deleted single-purpose selectSession helper. All other shared infra
(types, toSessionResponse) is already on main from #515.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(ai/models): enrich response with context_window + cost from models.dev

api's GET /api/ai/models previously returned just the gateway entries.
Open-agents' frontend depends on two extra fields per model that come
from the public models.dev catalog:

  - context_window (integer) — gates model selection in the picker
  - cost ({input, output}) — per-million-token pricing for display

Adds three pure helpers (TDD'd individually) plus a small refactor of
the existing fetcher to merge metadata in:

  - lib/ai/parseModelsDevMetadata.ts: tolerant unknown→Map parser
  - lib/ai/fetchModelsDevMetadata.ts: 750ms-bounded fetch with full
    error swallowing (metadata is best-effort, must never gate the
    underlying gateway response)
  - lib/ai/enrichGatewayModel.ts: pure, non-mutating merge

getAvailableModels now fetches gateway + metadata in parallel and
maps each non-embed model through enrichGatewayModel. If models.dev
is unreachable the response is identical to today (gateway models
unenriched).

Documented in recoupable/docs#188 (merged). Unblocks the eventual
open-agents frontend cutover for the model picker.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(ai): extract isRecord into its own lib (SRP)

Per PR feedback: each file should export one primary function.
Pulled isRecord out of parseModelsDevMetadata.ts into
lib/ai/isRecord.ts so the parser file is single-purpose.

Also includes the typecheck fix for enrichGatewayModel — the
`[key: string]: unknown` index signature on its generic constraint
was rejecting `GatewayLanguageModelEntry` and breaking the Vercel
build.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(sandbox): merge updates from main and align with @vercel/sandbox v2.0.0-beta.11

This commit merges the latest changes from the main branch and ensures compatibility with the updated @vercel/sandbox version. The API has been adjusted to reflect the renaming of Sandbox.sandboxId to Sandbox.name, with corresponding updates to method parameters. All relevant tests have been updated to mock the new Sandbox structure and verify functionality.

Verification steps have been executed successfully, confirming no issues with installation, type checking, linting, or tests.

* feat(stripe): enhance isActiveSubscription logic and add tests

- Refactored the isActiveSubscription function to improve clarity and efficiency in determining subscription status.
- Added comprehensive unit tests for isActiveSubscription to cover various subscription states, including active, trialing, and canceled scenarios.
- Ensured that the function correctly handles null or undefined inputs, returning false as expected.

* feat(stripe): improve getActiveSubscriptions to handle pagination and enhance filtering

- Refactored getActiveSubscriptions to implement pagination for fetching active subscriptions from Stripe, allowing for more than 100 results.
- Introduced a constant PAGE_LIMIT for better maintainability of the subscription listing limit.
- Enhanced filtering logic to ensure only subscriptions matching the specified accountId are returned.
- Improved error handling to log issues encountered during the subscription fetching process.

* refactor(stripe): optimize getOrgSubscription to return first active subscription

- Changed the implementation of getOrgSubscription to iterate through organization IDs and return the first active subscription found, improving efficiency by eliminating unnecessary parallel requests.
- Removed the previous logic that collected all subscriptions and filtered them, simplifying the function's flow.

* test(subscriptions): enhance route tests for GET and OPTIONS handlers

- Added tests for OPTIONS handler to verify it returns 200 status with CORS headers.
- Implemented tests for GET handler to ensure it correctly forwards requests to getSubscriptionStatusHandler and returns the expected response.
- Introduced beforeEach hook to clear mocks before each test, improving test isolation.

* feat(stripe): export querySchema and simplify request validation

- Exported the querySchema for use in other modules, enhancing reusability.
- Simplified the ValidatedGetSubscriptionStatusRequest type by inferring it directly from querySchema, improving type safety and maintainability.

* refactor(stripe): rename validation function and remove deprecated request validation

- Renamed `validateGetSubscriptionStatusRequest` to `validateGetSubscriptionStatusQuery` for clarity and consistency.
- Updated references in `getSubscriptionStatusHandler` and related tests to use the new validation function.
- Removed the deprecated `validateGetSubscriptionStatusRequest` file and its associated tests, streamlining the codebase.

* feat(stripe): enhance getActiveSubscriptions to limit pagination and improve filtering

- Introduced a maximum page limit for `subscriptions.list` calls to prevent excessive latency on large accounts.
- Updated the function to stop fetching after the first page that contains a matching subscription, optimizing performance.
- Added support for an optional `stripeCustomerId` parameter to scope the subscription list to a specific customer.
- Enhanced unit tests to cover new functionality, including early termination on matches and pagination limits.

* refactor(stripe): remove pagination limit in getActiveSubscriptions for improved match retrieval

- Eliminated the fixed page limit for `subscriptions.list` calls, allowing the function to paginate until all matches are found.
- Updated the logic to break pagination if the cursor does not advance, preventing infinite loops.
- Enhanced unit tests to verify behavior with no artificial page limits and to ensure correct handling of pagination scenarios.

* refactor(tests): streamline getActiveSubscriptions tests and improve mock handling

- Simplified test setup by consolidating mock definitions for `stripeClient.subscriptions.list`.
- Enhanced readability and maintainability of tests by using helper functions for mock data generation.
- Ensured consistent behavior across tests by standardizing the way mock responses are defined and utilized.

* refactor(tests): restructure getActiveSubscriptions test helpers for improved clarity

- Consolidated subscription-related helper functions into a single `getActiveSubscriptionsTestHelpers` function.
- Enhanced test readability by using destructured imports for mock data generation.
- Improved maintainability of tests by centralizing mock definitions and reducing redundancy.

* refactor(api): move subscription status to GET /api/accounts/{id}/subscription

Aligns the implementation with recoupable/docs#183: documents subscription
status as a resource nested under the account it belongs to, identifies the
account via path param, and returns the documented response shape.

- New route: app/api/accounts/[id]/subscription
- New response: { isPro, status, plan, source } (was { isPro })
- New handler/validator/mapper with unit tests covering account-active,
  org-active, neither-active, trialing-with-canceled_at, and unsupported
  Stripe statuses
- Deletes the old query-param endpoint and helpers

* refactor(stripe): drop unused stripeCustomerId; extract toStatus to its own file

- YAGNI: getActiveSubscriptions no longer accepts the unused stripeCustomerId
  parameter; corresponding test removed.
- SRP: toStatus (Stripe status → SubscriptionStatus enum) lives in its own
  module with focused unit tests; buildSubscriptionResponse now imports it.

---------

Co-authored-by: Sweets Sweetman <sweetmantech@gmail.com>
@vercel
Copy link
Copy Markdown
Contributor

vercel Bot commented May 6, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
api Ready Ready Preview May 6, 2026 2:07pm

Request Review

@sweetmantech sweetmantech merged commit 2c83920 into main May 6, 2026
4 of 6 checks passed
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 6, 2026

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 0ebe4b14-b5be-4ee5-8633-54a741760c4e

📥 Commits

Reviewing files that changed from the base of the PR and between 51723d7 and d0aa31d.

⛔ Files ignored due to path filters (10)
  • app/api/accounts/[id]/subscription/__tests__/route.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by app/**
  • app/api/accounts/[id]/subscription/__tests__/routeTestMocks.ts is excluded by !**/__tests__/** and included by app/**
  • lib/stripe/__tests__/buildSubscriptionResponse.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/stripe/__tests__/getAccountSubscriptionHandler.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/stripe/__tests__/getActiveSubscriptions.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/stripe/__tests__/getActiveSubscriptionsTestHelpers.ts is excluded by !**/__tests__/** and included by lib/**
  • lib/stripe/__tests__/getOrgSubscription.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/stripe/__tests__/isActiveSubscription.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/stripe/__tests__/toStatus.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
  • lib/stripe/__tests__/validateAccountSubscriptionParams.test.ts is excluded by !**/*.test.*, !**/__tests__/** and included by lib/**
📒 Files selected for processing (9)
  • app/api/accounts/[id]/subscription/route.ts
  • lib/stripe/buildSubscriptionResponse.ts
  • lib/stripe/getAccountSubscriptionHandler.ts
  • lib/stripe/getActiveSubscriptionDetails.ts
  • lib/stripe/getActiveSubscriptions.ts
  • lib/stripe/getOrgSubscription.ts
  • lib/stripe/isActiveSubscription.ts
  • lib/stripe/toStatus.ts
  • lib/stripe/validateAccountSubscriptionParams.ts

📝 Walkthrough

Walkthrough

This PR introduces a new per-account subscription retrieval API endpoint with supporting Stripe utilities. It adds route handlers, subscription status mapping, subscription queries, and response builders to enable unified access to account- and organization-level subscription data.

Changes

Subscription Retrieval API

Layer / File(s) Summary
Type & Status Utilities
lib/stripe/toStatus.ts, lib/stripe/isActiveSubscription.ts
SubscriptionStatus type and status mapping are defined; isActiveSubscription checks if a subscription qualifies as active based on status and cancellation state.
Subscription Querying
lib/stripe/getActiveSubscriptions.ts, lib/stripe/getActiveSubscriptionDetails.ts, lib/stripe/getOrgSubscription.ts
Stripe subscriptions are fetched with pagination and filtering by account metadata; individual active subscriptions are retrieved; organization-linked subscriptions are discovered via account-organization associations.
Response Builder
lib/stripe/buildSubscriptionResponse.ts
Account and organization subscriptions are normalized into a unified SubscriptionResponse shape with pro status, derived status code, plan name, and source attribution.
Validation & Handler
lib/stripe/validateAccountSubscriptionParams.ts, lib/stripe/getAccountSubscriptionHandler.ts
Route parameters are validated as UUIDs with authorization checks; the handler orchestrates parallel subscription retrieval and response building with error mapping and CORS headers.
API Route
app/api/accounts/[id]/subscription/route.ts
Next.js route handler exposes the GET endpoint with OPTIONS support for CORS preflight and revalidation configuration.

Sequence Diagram

sequenceDiagram
    participant Client
    participant Route as Route Handler
    participant Validator as Validator
    participant Handler as Handler
    participant StripeUtil as Stripe Utilities
    participant Stripe as Stripe API
    
    Client->>Route: GET /accounts/[id]/subscription
    Route->>Validator: validateAccountSubscriptionParams()
    Validator->>Validator: Parse UUID & check auth context
    Validator-->>Route: Validated accountId
    Route->>Handler: getAccountSubscriptionHandler()
    
    Handler->>StripeUtil: Parallel fetch
    StripeUtil->>StripeUtil: getActiveSubscriptionDetails(accountId)
    StripeUtil->>Stripe: List subscriptions by metadata
    Stripe-->>StripeUtil: Active subscription or null
    StripeUtil->>StripeUtil: getOrgSubscription(accountId)
    StripeUtil->>StripeUtil: getAccountOrganizations()
    loop For each org
        StripeUtil->>StripeUtil: getActiveSubscriptionDetails(orgId)
    end
    StripeUtil-->>Handler: account sub, org sub
    
    Handler->>Handler: buildSubscriptionResponse()
    Handler->>Handler: Select active sub, map status
    Handler-->>Route: SubscriptionResponse with CORS headers
    Route-->>Client: 200 OK + JSON
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~22 minutes

Possibly related PRs

  • recoupable/api#506: Introduces overlapping Stripe subscription utilities and handlers that are directly connected to this subscription endpoint.

Poem

📋 Account subscriptions now flow free,
With Stripe and status mapped with glee—
Status codes sing, CORS headers dance,
A unified subscription endpoint stance. 🎉

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch test

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants