Skip to content

Sync main into v1.2.6 with conflict fixes - #728

Merged
syzsunshine219 merged 153 commits into
v1.2.6from
codex/pr720-sync-main-v126-20261023
Oct 23, 2026
Merged

syzsunshine219 merged 153 commits into
v1.2.6from
codex/pr720-sync-main-v126-20261023

Conversation

@syzsunshine219

@syzsunshine219 syzsunshine219 commented Oct 23, 2026 •

Copy link
Copy Markdown
Collaborator

Synchronizes main@74b26fc78ebd14a784981ba8e83bebf878c20865 into v1.2.6@b04f5c88c2000a1c7a936230a70401178aca4842 as an independent Draft candidate for #720. Final source head: dc597e071e3962fff2c029cb83d1fa4297b5013f.

The merge preserves the target's consolidated Memory/AgentSourceCore reader layout and scan lifecycle alongside main's OpenCode V2 behavior, thinking contracts, and final-answer controls for every completed turn. It excludes interrupted drafts followed by activity, preserves explicit OpenCode removal when memory is cleared, prevents a pending automatic refresh after clearing begins, and accepts both recognized Linux Gateway startup responses while rejecting unrelated upstream HTTP 503 responses.

The expanded verification fixes also retain the existing BYOK credential assertions while awaiting both catalog persistence phases, add controlled assignment-publication navigation regressions, and keep real adapter I/O active under a test clock that still checks the original 10ms startup and 100ms recurring deadlines. No production latency budget or test timeout was increased.

Windows validation now checks out and verifies the exact source SHA, runs both native Go modules and the existing History/platform/packaging checks, and uploads a machine-generated provider receipt only after the required Windows job steps succeed. Its scope explicitly excludes live capture and signed-installer acceptance.

Validation on the final source:

  • BYOK credential suite: 174 passed; frontend typecheck passed.
  • Memory runtime suite: 24 passed; the nested-I/O case failed before its selective-clock fix.
  • Workflow contracts: 5 failures / 1 pass before the producer change, then 6 passed.
  • Exact-source Windows CI run 39938948424: successful Windows job 120365344219, actual checkout dc597e071e3962fff2c029cb83d1fa4297b5013f, both native Go modules and every required step successful. Authenticated artifact 12495201575, ZIP SHA-256 89ca6bc76b2354321d7a13afdec763de43d4dbde7320ebcd50791a74c2923105; the original receipt was downloaded without modification and its repository/run/attempt/source identity verified.
  • Final authentic Full on this exact source: 13/13 selected commands passed under the unchanged policy and real child task/session, including affected workspace tests, browser/history/Windows regression, local API matrix, UI assertions, lint, typecheck, smoke, full build, distribution and diff checks. Run run-1792751746567-6e50d795-1106-41ad-81b9-44293974dc57; source and delivery stayed unchanged during execution. Gate: needs_review, verification passed and ready for handoff; independent approval remains required.

This remains a Draft for review. Full verification is complete; independent approval has not been recorded. No main/target branch was changed, no force push was used, and no PR was merged.

xuzhiqin1990 and others added 30 commits September 19, 2026 19:52
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
fix(providers): raise default model call timeout to 300s
…opy-v1.2.2

fix(chat): 修复多轮对话中历史助手回复缺少复制按钮 #666
@syzsunshine219 syzsunshine219 changed the title Sync main into v1.2.6 with scan and answer conflict fixes Sync main into v1.2.6 with conflict fixes Oct 23, 2026
@syzsunshine219

Copy link
Copy Markdown
Collaborator Author

Project Harness review handoff marker. Only reviews submitted strictly after this GitHub timestamp qualify.

@syzsunshine219
syzsunshine219 marked this pull request as ready for review October 23, 2026 11:55
@syzsunshine219
syzsunshine219 merged commit 6869705 into v1.2.6 Oct 23, 2026
11 checks passed
@Memtensor-AI

Copy link
Copy Markdown
Collaborator

🤖 Open Code Review

Target: PR #728
Task: aa3f499740daee33
Base: v1.2.6
Head: codex/pr720-sync-main-v126-20261023

✅ OpenCodeReview: Review skipped: no items were selected.

Generated by cloud-assistant via Open Code Review.

@Memtensor-AI

Copy link
Copy Markdown
Collaborator

⚠️ Automated Test Results: NO TEST SCOPE

Automated tests were not run because the changed files do not map to an executable test scope.

Details: No executable test scope maps to the changed files. Automated tests were not run; add env.yaml source_mapping + execution for this path family, then rerun. Changed files: (none detected)
Manual review or env.yaml source_mapping/execution coverage is required before merge.

Branch: codex/pr720-sync-main-v126-20261023

@syzsunshine219
syzsunshine219 deleted the codex/pr720-sync-main-v126-20261023 branch October 26, 2026 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.