Skip to content

Keep edits made while Load latest is reading - #130

Merged
jerelvelarde merged 1 commit into
CopilotKit:mainfrom
charan-rathore:fix/load-latest-preserves-newer-edits
Oct 14, 2026
Merged

jerelvelarde merged 1 commit into
CopilotKit:mainfrom
charan-rathore:fix/load-latest-preserves-newer-edits

Conversation

@charan-rathore

Copy link
Copy Markdown
Contributor

Problem

Edit a page, receive a conflicting remote revision, click Load latest and accept its replacement confirmation. While that read is pending, anything typed into the still-editable page is newer work that was never part of the confirmation. The old code unconditionally adopted the returned remote revision and discarded that newer work.

Fix

Capture the confirmed draft's identity before the read. When it lands, ignore an unmounted document and preserve any newer draft: the remote snapshot is retained and a notice asks the operator to choose Load latest again if they want the replacement. Confirmed drafts that stayed unchanged load exactly as before. No backend, API, schema or layout change.

Verification

  • New mounted React component test with a deferred API result fails on base (actual Remote A, expected the newer draft); the regression and the unchanged-confirmed-draft control pass with the fix. Actual PageDocument and the autosave hook/controller run; API, rich editor, chat and menu are mocked as in adjacent existing component tests.
  • Full native suite 304/304 across 49 files, tsc --noEmit, targeted ESLint, Prettier check and the production client Vite + server TypeScript builds pass. Pre-existing warnings only (react-test-renderer deprecation, native-loader extension warning, large chunks).

Not run: full-repo ESLint, live-host/browser pixel or narrow-screen keyboard verification; no layout change is claimed. Note for review: this touches the same PageDocument.tsx as the open #114 (history/trash), but not its code paths; #126 (external deletion reconciliation) is a different scope.

Load latest replaced the page with the returned remote revision even
when the operator typed newer work while the read was pending. Capture
the confirmed draft identity before the read, preserve a newer draft
when it lands, keep the remote snapshot, and ask the operator to
choose Load latest again to replace it. Unchanged confirmed drafts
load exactly as before.

Signed-off-by: Charan Rathore <180254320+charan-rathore@users.noreply.github.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 9, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-09T15:23:58.087861Z 94f08c0 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@charan-rathore

Copy link
Copy Markdown
Contributor Author

This is green on CI and conflict-free on my end. Is there anything you'd like changed before it can land? Happy to adjust.

@jerelvelarde jerelvelarde left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 94f08c0. No actionable findings.

Value: fixes reproducible draft loss when an operator types after confirming Load latest while its GET remains pending. I reproduced the new regression on base 625452e (Remote A overwrites the newer draft); both contributed tests pass on this head.

Template/security: follows the existing autosave controller and mounted React test style. Draft edits replace the draft object; conflict state freezes autosave; receive retains local edits and the newest remote revision. The change checks the confirmed draft before adopting the remote snapshot and ignores a successful read after unmount. SpaceWorkspace keys document instances by page ID. Confirmation, revision checks and API authorization remain intact. CONTRIBUTING.md applies; no repository AGENTS.md or PR description template exists. The PR body accurately states implementation, tests, mocks and verification limits. External deletion reconciliation (#126) and history/trash (#114) remain separate scopes.

Verification: isolated macOS Node 24.16.0 checkout with contributor execution inside a clean-environment sandbox denying user credentials and external network. Exact head passed format, lint, typecheck, 304 tests across 49 files and production build; focused autosave/document tests passed 11/11. Three additional mounted diagnostics passed: newer draft remains dirty without automatic PATCH, a second confirmation uses the newest known remote revision over an older GET, cancelled confirmation does not read, and a deferred successful read after unmount does not reach the controller. Prospective integration with main 831f330 merges cleanly (tree 980d6199428526d98923adac97d9d1d98c772d4d) and passes format, lint, typecheck, 310 tests across 51 files and production build.

Limits: component checks use react-test-renderer with API/editor/chat/menu mocked, rather than an actual DOM/browser or live provider. No pixel, narrow-screen or keyboard UI validation was performed; no layout change is introduced. Dependencies were installed with lifecycle scripts disabled. Existing React renderer deprecation, Vite native-config and bundle-size warnings remain. Merge remains subject to current required CI and unchanged reviewed head.

@jerelvelarde
jerelvelarde merged commit 3556312 into CopilotKit:main Oct 14, 2026
1 check passed
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