Repository navigation
fix(sync): resolve main into v1.2.5 conflicts - #727
Merged
Merged
Conversation
The OpenAI-compatible provider defaulted to a 120s request timeout, which caused frequent timeouts during evaluation runs where model responses legitimately take longer. Raise the default to 300s. The MEMMY_AGENT_OPENAI_COMPAT_TIMEOUT_S env override is unchanged; only the fallback default changes. Update the two default-timeout assertions accordingly. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…ations Expose OpenAI Completions/Responses and Custom providers in the model workspace, persist thinking/image capability on Custom presets, and send thinking fields through the chat turn so the backend can map them onto reasoningEffort. Co-authored-by: Cursor <cursoragent@cursor.com>
…ponses. Settings can save those protocols for both memory roles, and the memory runtime now sends the matching request instead of rejecting the assignment or falling through to chat completions. Co-authored-by: Cursor <cursoragent@cursor.com>
GPT-6, Claude Opus 5.5, Gemini 3.8 Flash, and DeepSeek V4.1 Flash were missing from the picker table, so the composer had no effort control for those model ids. Co-authored-by: Cursor <cursoragent@cursor.com>
The label and switch already identify the control, and the icon crowded the composer action bar. Co-authored-by: Cursor <cursoragent@cursor.com>
The thinking and image checkboxes did not say what they change, and the checkbox itself did not show a pointer. Co-authored-by: Cursor <cursoragent@cursor.com>
…ng client. Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…t Completions. Co-authored-by: Cursor <cursoragent@cursor.com>
…and warn Custom users to turn it off. Co-authored-by: Cursor <cursoragent@cursor.com>
…soning models are called with tools. Co-authored-by: Cursor <cursoragent@cursor.com>
…s model with tools, including Custom when thinking is off. Co-authored-by: Cursor <cursoragent@cursor.com>
…t, and show 自定义 for that provider in Chinese. Co-authored-by: Cursor <cursoragent@cursor.com>
… with the OpenAI logo. Co-authored-by: Cursor <cursoragent@cursor.com>
merge main into zy_npm_1008
…into zy_npm_1008
Zy npm 1008
fix(providers): raise default model call timeout to 300s
…opy-v1.2.2 fix(chat): 修复多轮对话中历史助手回复缺少复制按钮 #666
release/v1.2.4
fix(release): retry GitHub PR metadata snapshot
…tion fix(release): avoid paginated PR metadata lookup
fix(release): retry commit PR API with curl
…otes-isolated docs(release): translate v1.2.4 notes to English
Memtensor-AI
added
area:app
area:docs
area:memory
status:in-progress
area:agent
and removed
status:needs-triage
labels
syzsunshine219
marked this pull request as ready for review
October 23, 2026 11:54
syzsunshine219
requested review from
Wang-Daoji,
ZongYue99,
hijzy and
wustzdy
as code owners
October 23, 2026 11:54
Collaborator
🤖 Open Code ReviewTarget: PR #727 ✅ OpenCodeReview: Review skipped: no items were selected. Generated by cloud-assistant via Open Code Review. |
Collaborator
|
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
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.
Resolves the main → v1.2.5 synchronization conflicts tracked by #719. This Draft merges source
main@74b26fc78ebd14a784981ba8e83bebf878c20865with targetv1.2.5@b153c31a09e5387a34bdabb089b5c8b992567858on a separate repair branch.Preserves model thinking controls and session state alongside plugin contracts, model locking, structured UI feedback, both migration sets, and packaging guards. Keeps leading-command and flat-subcommand matching while preserving caret insertion. Fixes duplicate runner stream termination, orders task-plan continuation after the finalization hook, replaces the complete slash query when selecting a subcommand, and restores ordinary sending while a Stop request is in flight.
Validation passed:
Full verification for
cda6424c734425e42fe4316f94e0d75deeab44db: failed (9 checks passed, 4 failed). Lint and type checks, smoke, build, distribution boundary and diff checks passed. Workspace tests, browser/history/Windows validation, the API matrix and UI assertions failed. This Draft is not ready for merge.Follow-up diagnostic captures on the same head: backend 1310, Memory 1441, desktop shell 1300, and browser/history Agent 1122 tests passed. The complete frontend run has 2943 passed and 26 failed assertions. The complete Agent run has 7196 passed and 3 failures: a local plugin metadata expectation that omits the current cloud-skills marker, a reproducible private Desktop guide timeout, and a full-suite
/stoptimeout that passes in isolation. Source comparisons show several UI/metadata expectations already differ from their target-branch implementations; no target-baseline execution is claimed. Windows-native validation remains unverified. These diagnostic results do not change the failed Full result.Draft for review; not merged.