merge: synchronize main into v1.1.9 - #539
Merged
Merged
Conversation
Show a one-time campaign dialog with CN/intl copy, and stack a token-credit notification after the comment-draw reward lands. Co-authored-by: Cursor <cursoragent@cursor.com>
feat(desktop): add Mid-Autumn campaign prompt and token credit toast
In account mode the model dropdown re-derives modelAssignments.account.agent.candidates from modelAssignments.byok.agent.candidates on every startup. A custom (source: "byok") model added while in account mode was written only to the account candidate list, so it was dropped on the next restart; the last-used model reverted to the platform default for the same reason (its default preset was no longer in the re-derived candidates). - upsertModelConnection now also enrolls newly added BYOK presets into modelAssignments.byok.agent.candidates (the source of truth the backend account projection reads), so custom models survive the restart re-projection. - Selecting a model in the chat model picker now persists it as the mode default (new defaultModelSelectionInput helper + saveModelCatalog), so a new chat after restart defaults to the last-used model instead of the platform preset. - Add regression tests for candidate enrollment, default survival, and the helper. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
feat: add lottery campaign rewards
Sync main into drawing
Stop nested folder deletes from freezing the knowledge page
…rsistence fix(desktop): persist custom models and last-used model in account mode
Account mode needs an authenticated user, and BYOK counts as signed in without a cloud account. Co-authored-by: Cursor <cursoragent@cursor.com>
Account mode waits for guidance, and BYOK waits until an Agent model is saved. Co-authored-by: Cursor <cursoragent@cursor.com>
Account and BYOK now share the same post-guidance gate, while the remote campaign status still decides whether to offer it. Co-authored-by: Cursor <cursoragent@cursor.com>
feat(desktop): add Mid-Autumn campaign
Wait until guidance has settled and the user is on a workspace route, and require a saved BYOK Agent model before offering the prompt. Co-authored-by: Cursor <cursoragent@cursor.com>
feat: show the campaign prompt after workspace entry
fix(desktop): prevent memory-service blocking Windows updates
…ory-service fix(desktop): stop Windows memory service on exit by default
fix(desktop): keep Windows startup alive through splash timeout
fix(agent): persist WebUI transcript event timestamps
…lette fix(desktop): hide standalone search ownership label (MEMMY-517)
…p-errors fix(chat): de-emphasize recovered tool errors (MEMMY-590)
…hain fix(upgrade): prefer packaged cloud endpoint over stale env (MEMMY-600)
Added release notes for Memmy version 1.1.8, detailing highlights and upgrade notes.
release: Memmy v1.1.8
fix(release): normalize v1.1.8 version metadata
…5828663453 chore(release): normalize v1.1.8 generated version metadata
syzsunshine219
requested review from
Wang-Daoji,
ZongYue99,
hijzy and
wustzdy
as code owners
September 23, 2026 09:10
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Synchronize the latest
mainbranch intov1.1.9so the existing release sync can be reviewed and merged without conflicts. This PR targetsv1.1.9; it does not mergev1.1.9intomain.The only textual conflict was in
App/frontend/desktop/src/state/model-workspace.ts. The resolution keeps both behaviors:mainbranch BYOK candidate persistence fix;v1.1.9invalid-assignment pruning.Validation completed on the combined branch:
npm run version:check: passed (1.1.8 metadata followsmain)npm run build -w @memmy/local-api-contracts: passednpm run build -w @memmy/migrations: passednpm run build -w @memmy/agent-source-core: passedgit diff --check: passedThe earlier PR #538 was closed because it had the wrong direction and would have brought untested
v1.1.9changes intomain.