feat(webapp): stay on the same page when switching project or organization

[claude]

Requested by Eric Allam · Slack thread

Before: you're on the API keys page in project X, you switch to project Y in the sidebar, and you land on project Y's Tasks page. Same for switching organization. Every switch threw away the page you were looking at.

After: you land on project Y's API keys page. Switching organization does the same thing, one project down. Pages that name a single thing — a run, a batch, a queue, a schedule, a deploy, a session, an error group — can't exist in another project, so those take you to the matching list page instead (a run page takes you to Runs).

The environment is still chosen exactly as it is today: nothing tries to guess it in the browser.

---

Testing

• New apps/webapp/app/utils/pageSwitching.test.ts (35 tests). It reads the compiled Remix route manifest, so the portable-page list can't silently drift from the routes:
  • every environment page that names no resource survives an environment switch — the same pages the old slug swap kept
  • the two branch lists are the only pages an environment switch keeps and a project switch drops
  • the pages gated per organization — Logs, Query and the queue metrics dashboard — travel with an environment or project switch but not an organization switch, and that list is derived from the route sources so a new gated page cannot be missed
  • every portable page points at a route that exists
  • every one of the 19 environment routes that takes a resource id truncates to a list page, with the id gone
  • portable pages resolve to themselves, so switching twice lands in the same place
  • every rejection case: leading slash, //, absolute URL, .., percent-encoded traversal, javascript:, unknown page — each falls back to Tasks rather than being sanitised into something
• Manual: switch project and organization from API keys, project settings, a run page, and a queue page.
• pnpm run typecheck --filter webapp passes.
• The rest of the webapp suite needs Docker for testcontainers, which wasn't available here; all colocated pure unit tests under app/utils/ pass (15 files, 150 tests).

---

Changelog

Switching project or organization in the sidebar keeps you on the same page instead of sending you back to Tasks. Pages for a specific run, deploy or other single item open the matching list instead.

---

How

The switcher links already pointed at /orgs/:org/projects/:project and /orgs/:org, whose _index loaders resolve the best environment (and, for the organization, the best project) and redirect. So the page travels as a search param on those links, and each loader appends it to the path it already builds:

• app/utils/pageSwitching.ts — one pure module. environmentPortablePage(suffix) and projectPortablePage(suffix) walk up the suffix until they find an entry in an allowlist of portable pages, and answer with the environment root if they find none. The result is therefore always a literal from that closed set, which is what makes it safe to concatenate into a redirect target; there is no regex sanitising. The allowlist is built from the landing pages already listed in deeplinkPages.ts plus the handful of nested pages that file doesn't know about, so this isn't a new URL-shape table.
• app/hooks/useEnvironmentSwitcher.ts — usePageSwitcher() derives the current page by slicing the environment layout route match's pathname off the current pathname, so there's no route table on the client either. The query string and hash are dropped on a project or organization switch, since filters encode task slugs and ids scoped to the project you're leaving.
• Both _index loaders re-validate the page through the same function before using it.

Two things worth a look:

• The environment switcher's truncation gap is fixed as a side effect. It had a hand-written switch covering runs/:runParam, deployments/:deploymentParam and schedules/:scheduleParam; the other 16 id-bearing routes carried their id straight into the new environment (e.g. queues/:queueParam, batches/:batchParam, errors/:fingerprint, sessions/:sessionParam). All three switchers now share one truncation, and the test asserts it covers every such route in the manifest.
• Portability turned out to be two properties, not one. Preview branches and dev branches render under any environment slug of their project — both loaders pass a hardcoded environment type and the project slug and never read envParam — so an environment switch keeps them, exactly as swapping the slug did before. A project or organization switch still falls back to Tasks, since the project you land in may have no preview branches. A test locks the environment half: every id-free page below an environment has to survive an environment switch.

---

Screenshots

n/a — no visual change; only where the switcher links point.

💯

[changeset-bot]

⚠️ No Changeset found

Latest commit: 00174eb

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[claude]

@coderabbitai review

---

Generated by Claude Code

[trigger-dot-bot]

Preview Deployment

Status	Preview	Commit	Updated
⚪ Removed	–	ed4461d	Aug 12, 14:40 UTC

[devin-ai-integration]

Devin Review found 3 new potential issues.

[devin-ai-integration]

Devin Review found 1 new potential issue.