chore: revert actor v2 hack

[NathanFlurry]

Description

Please include a summary of the changes and the related issue. Please also include relevant motivation and context.

Type of change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes.

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes

[NathanFlurry]

• DO NOT MERGE: sandbox benches #4597 : 2 dependent PRs (#4599 , #4600 )
• fix(envoy-client): add tls #4595
• chore: fix driver test suite #4591
• chore: tunnel auth #4588
• chore: remove udb as a dependency of envoy-client #4587
• chore: revert actor v2 hack #4586 👈 (View in Graphite)
• fix: fix pool metadata protocol version refresh, rivetkit native ws #4585
• feat: US-001 - Define SqliteKv trait in rivetkit-sqlite-native #4584
• feat(rust/engine-runner): minimal rust engine runner #4289
• chore: delete kv channel #4583
• feat(engine): rust runner #4582
• chore: remove non-engine drivers #4574 : 1 other dependent PR (#4581 )
• feat: dynamic actors #4397
• fix: driver test suite & sqlite reliability #4559
• fix: remove serverless token #4572
• fix: misc token fixes #4569
• fix(pb): clean up actor stop decision handling #4566
• fix(envoy): use global instance, add signal handlers #4565
• chore: misc fixes, add pb snapshot test #4561
• fix(cache): make in memory cache global #4560
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[railway-app]

🚅 Deployed to the rivet-pr-4586 environment in rivet-frontend

Service	Status	Web	Updated (UTC)
kitchen-sink	❌ Build Failed (View Logs)	Web	Apr 8, 2026 at 9:27 pm
website	😴 Sleeping (View Logs)	Web	Apr 8, 2026 at 4:29 am
mcp-hub	✅ Success (View Logs)	Web	Apr 8, 2026 at 4:21 am
frontend-cloud	❌ Build Failed (View Logs)	Web	Apr 8, 2026 at 4:21 am
frontend-inspector	❌ Build Failed (View Logs)	Web	Apr 8, 2026 at 4:21 am
ladle	❌ Build Failed (View Logs)	Web	Apr 8, 2026 at 4:20 am

[claude]

PR Review: chore: revert actor v2 hack

Small, focused revert removing a workaround that forced serverless pool actors into the v2 migration path regardless of protocol version.

Change Analysis

The early-return condition previously included an additional || for_serverless clause alongside pool.as_ref().and_then(|p| p.protocol_version).is_some(). That extra clause has been removed, so the condition now only checks whether a protocol version is present on the pool.

Serverless actors without a protocol_version set will now go through the standard allocation path instead of unconditionally migrating to v2.

Issue: Stale Comment

runtime.rs:267 still reads "or this is a serverless pool" but that clause was removed. The comment should be updated to: // Protocol version is set; migrate to actor v2

Minor Notes

• The .as_ref() removal is correct. pool is consumed by and_then; for_serverless (bool, Copy) was already computed so no borrow issue.
• for_serverless remains used at line 304 for ServerlessDesiredSlotsKey atomic op -- no dead code.

Summary

The change is correct. The only actionable fix is updating the comment on line 267 to remove the now-inaccurate "or this is a serverless pool" clause.

[MasterPtato]

Merge activity

• Apr 8, 8:52 PM UTC: A user started a stack merge that includes this pull request via Graphite.
• Apr 8, 9:27 PM UTC: Graphite rebased this pull request as part of a merge.
• Apr 8, 9:28 PM UTC: @MasterPtato merged this pull request with Graphite.