Skip to content

chore: merge latest upstream main into develop - #3

Merged
mvkvc merged 1016 commits into
developfrom
merge-main-thread-folder-cursor-origin
Oct 23, 2026
Merged

mvkvc merged 1016 commits into
developfrom
merge-main-thread-folder-cursor-origin

Conversation

@mvkvc

@mvkvc mvkvc commented Oct 23, 2026

Copy link
Copy Markdown

The fork's develop branch contains thread event capture to a folder and Cursor Origin code-host support, but was 1,015 upstream commits behind. Merge upstream main at c58d558e1 into develop while retaining both features.

Resolve the capture-worker and source-control conflicts, preserve Origin opaque pagination tokens alongside upstream timestamp pagination, carry Origin discovery coverage into the retained tests, and update the Origin compiler command and lock entry for upstream tooling.

Validation: 247 focused tests passed across 11 files. Typechecks passed for server, web, contracts, client-runtime, and source-control-origin. Targeted lint passed with two existing upstream warnings; formatting and whitespace checks passed for the feature delta against upstream. Browser/mobile and live Origin verification were not run. Remote main and develop are unchanged by this PR creation.

Model: GPT-6.1-sol. Harness: Codex through T3 Code.

juliusmarminge and others added 30 commits October 21, 2026 01:12
…e branch live in their own components (pingdotgg#22672)

Co-authored-by: Claude Opus 5.5 <[email protected]>
jieyuexing and others added 28 commits October 22, 2026 22:33
… pending (pingdotgg#16668)

Co-authored-by: Julius Marminge <[email protected]>
Co-authored-by: Claude Fable 5.1 <[email protected]>
…t started them (pingdotgg#21299)

Co-authored-by: Julius Marminge <[email protected]>
Co-authored-by: Theo Browne <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
@mvkvc
mvkvc merged commit 4743ad1 into develop Oct 23, 2026
@mvkvc
mvkvc deleted the merge-main-thread-folder-cursor-origin branch October 23, 2026 12:06
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.