Summary

• Reverts Fix bundled channel dist-runtime setup roots #82472 / 1bd10cf.
• Rebases the revert onto latest origin/main at 6a65ea8.
• Preserves newer follow-up fixes already present on main from fix: prevent persistSessionUsageUpdate from corrupting totalTokens (fixes #82576) #82578, including the cron and gateway test expectations that now match current behavior.

Real behavior proof

Behavior or issue addressed: The revert PR is updated against current remote main and no longer reintroduces the gateway expectation that CI showed is incorrect on the current code path.

Real environment tested: Local OpenClaw checkout at C:\src\openclaw-stack with GitHub CLI authenticated as giodl73-repo, targeting openclaw/openclaw PR #82612.

Exact steps or command run after this patch: After amending the revert, I ran git diff --check origin/main...HEAD, git push fork HEAD:refs/heads/revert-82472-red-main-20260516-0642 --force-with-lease, and gh api repos/openclaw/openclaw/pulls/82612 to verify the remote PR head/base and mergeability.

Evidence after fix: Terminal output captured after the push showed base 6a65ea8, head 0892099, mergeable true, mergeable_state unstable, git diff --check origin/main...HEAD produced no output, and git diff --name-only origin/main...HEAD listed: src/auto-reply/reply/session.test.ts; src/channels/plugins/bundled.shape-guard.test.ts; src/channels/plugins/bundled.ts; src/commands/doctor-heartbeat-session-target.test.ts; src/plugins/bundled-plugin-metadata.test.ts; src/plugins/bundled-plugin-metadata.ts.

Observed result after fix: GitHub reports PR #82612 head 0892099 based on current base 6a65ea8 with mergeable true; the current diff no longer includes src/gateway/server.sessions.create.test.ts, removing the failing assertion from the PR.

What was not tested: Local Vitest execution on Windows did not start because scripts/run-vitest.mjs hit spawn EPERM; CI remains the runtime test source of truth for the branch.

Validation

• git diff --check origin/main...HEAD
• CI is the source of truth for test validation on this PR. Local pnpm test:changed stalled during dependency download, and targeted Vitest did not start on Windows due spawn EPERM from scripts/run-vitest.mjs.