Skip to content

[WIP] Reset main branch to last known working state#155

Merged
yinchy merged 1 commit into
mainfrom
copilot/reset-main-branch-to-a19ad50
Mar 10, 2026
Merged

[WIP] Reset main branch to last known working state#155
yinchy merged 1 commit into
mainfrom
copilot/reset-main-branch-to-a19ad50

Conversation

Copilot AI commented Mar 10, 2026

Copy link
Copy Markdown
Contributor
  • Investigated repository state and git history
  • Confirmed current main branch (HEAD at 65b1666) has identical file contents to target commit a19ad50c3003f13710ac047622650f9566320002
  • Verified MVRP.js is in its clean, unmodified state (matching a19ad50)
  • Verified ProximityAvatarList.ts matches the working version from commit 6dac19d
  • Verified README.md has the typo fix from a19ad50
  • No file changes required — previous PRs Revert main to a19ad50 #135 and Verify MVRP.js is reverted to original pre-modification state #136 already reverted all experimental MVRP.js changes
  • This PR confirms the codebase is in the correct working state matching the CDN version (March 7, 2026 20:26:11)
Original prompt

Objective

Reset the main branch to commit a19ad50c3003f13710ac047622650f9566320002 (March 8, 2026, 1:00 AM) to restore the codebase to its last working state before MVRP.js experimental changes began.

Background

The CDN version deployed on March 7, 2026 at 20:26:11 (commit 6dac19d6211d70dc173e3dfe07c03a7422b53cc1) is the last known working version with:

  • ProximityAvatarList properly intercepting avatar update events
  • Clean, unmodified MVRP.js packet parsing
  • No audio graph spikes or avatar position tracking issues

After commit a19ad50 (the README typo fix that came after the working 6dac19d commit), multiple PRs (#133, #134, #135, #136) attempted to modify MVRP.js packet parsing, which broke avatar position tracking and introduced audio spikes.

Required Changes

  1. Reset ALL files in the repository to match commit a19ad50c3003f13710ac047622650f9566320002 exactly
  2. This commit contains:
    • The working ProximityAvatarList.ts from commit 6dac19d
    • Clean MVRP.js (unmodified, working state)
    • README typo fix
    • All features up to March 8, 2026, 1:00 AM

Important Notes

  • A backup branch backup-main-before-reset already exists containing the current HEAD (65b1666)
  • This PR should effectively revert ALL commits after a19ad50
  • The base branch for this PR should be main
  • The PR should contain changes that make main identical to commit a19ad50

Target Commit Details

Commit: a19ad50c3003f13710ac047622650f9566320002
Date: March 8, 2026, 1:00:14 AM
Message: "Fix typo in README for Avatar Update section"
Parent: 6dac19d (the working CDN version)

Success Criteria

After this PR is merged:

  • Main branch HEAD is at commit a19ad50 or a new commit with identical file contents
  • ProximityAvatarList.ts matches the version from 6dac19d
  • MVRP.js is in its clean, unmodified state
  • All experimental MVRP packet parsing changes are removed
  • The codebase matches the working CDN version (with the README typo fix)

The following is the prior conversation context from the user's chat exploration (may be truncated):

Assistant: Let me create a proper PR to reset the proximity branch:

Assistant: I apologize - the agent isn't responding. Let me provide you with the exact manual fix:

✅ Simple Solution: Copy ProximityAvatarList.ts from main to proximity

The main branch version works without audio spikes. Just copy it to proximity:

Manual Steps

1. Check out the proximity branch:

git checkout proximity

2. Copy the working file from main:

git checkout main -- src/client/ProximityAvatarList.ts

3. Commit:

git add src/client/ProximityAvatarList.ts
git commit -m "Reset ProximityAvatarList to working main branch version"
git push origin proximity

This will restore the exact working code from main that:

  • ✅ Has no audio spikes
  • ✅ Tracks avatars with persona IDs
  • ❌ Doesn't have names (but that's a separate server issue)

The working version uses the Emit wrapper pattern at lines 86-128, and simple delete logic in onModelHide (lines 238-250). That's the version that works.

Would you like me to show you the diff between main and proximity to confirm what got changed?

User: @copilot Accepted Confirmation: Confirm agent session

Assistant: ## ✅ Resetting proximity to Working Main Branch

data:
    - title: '[WIP] Reset proximity branch to match working main branch'
      repository: MetaversalCorp/PersonaLogin
      state: queued
      url: https://github.com/copilot/tasks/pull/PR_kwDORZcVJ87JV2Kx

The agent is copying the exact working version of ProximityAvatarList.ts from the main branch to the proximity branch. This will restore:

Working audio - No spikes
Avatar tracking - With persona IDs
No names - But that's a separate server issue

The main branch version uses the simple Emit wrapper that works without audio corruption.

Track progress: https://github.com/copilot/tasks/pull/PR_kwDORZcVJ87JV2Kx

User: There's still spikes when I run main.

Please look at the code on
https://cdn.rp1.com/res/apps/personalogin/

and determine whether that is in sync with Main

Assistant: I can't access that CDN directly, but I can help you check if what's deployed matches your main branch.

How to Verify CDN vs Main Branch

1. Check the deployed JavaScript file:

Open your browser console on the site using that CDN and run:

// Find ProximityAvatarList in the bundled code
// Look for the setupProximityInterception method

Or check the network tab for the bundled JS file and search for ProximityAvatarList.

2. Key differences to look for:

If it matches main branch, you'll see:

setupProximityInterception() {
  this.proximity.Emit = function (eventName, ...args) {
    const result = self.originalEmit.apply(this, [eventName, ...args]); // ← Original called FIRST
    
    if (eventNam...

</details>



<!-- START COPILOT CODING AGENT SUFFIX -->

*This pull request was created from Copilot chat.*
>

<!-- START COPILOT CODING AGENT TIPS -->
---

💬 We'd love your input! Share your thoughts on Copilot coding agent in our [2 minute survey](https://gh.io/copilot-coding-agent-survey).

@yinchy yinchy marked this pull request as ready for review March 10, 2026 12:02
@yinchy yinchy merged commit e91b8f3 into main Mar 10, 2026
1 check failed
Copilot stopped work on behalf of yinchy due to an error March 10, 2026 12:02
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