Repository navigation
Conversation
…elop-after-1.0.3b4 chore: sync main into develop after 1.0.3b4
…d#2865) GitHub retired the macos-14 runner on 2026-11-02, so the v1.0.3b4 desktop job was cancelled before a runner was assigned.
…ab failures (TencentCloud#2874) * fix(models,bridge): keep pool preference out of chat and explain collab failures The starred model is only a harness auto-route preference, so the chat picker shows an expert default or an explicit choice. Permanent cloud-collab rejections now fail immediately with a readable error instead of a raw close frame. * docs: record preferred-model and bridge error fixes * fix(db): close SQLite only after in-flight queries finish Windows aborted the process when server shutdown closed the shared connection while the idle reclaim sweep was still reading agents. * test(agents): initialize the reclaim sweep handle on stub managers * test(bridge): wait for both listen frames before cancelling
…TencentCloud#2878) Keep pauses, themes, citations, backups, and chat chrome from colliding, and show the templates that shipped before the expert market as the default featured set.
* feat(chat): share conversations on a shared expert Owners can mark a thread as shared so anyone who can open that expert can read it, follow up, and handle pending approvals. Composer settings stay with the owner, and the chat expert menu can open the existing edit drawer. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(chat): satisfy mypy on shared-thread author and HITL lookup Author ids from message JSON are narrowed before the profile map lookup, and a shared thread may resolve a pending approval without a user filter. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(chat): keep private threads private when the share flag is absent Visibility checks treat a missing contributed flag as not shared, and dashboard tests read the author-stamped HumanMessage instead of a plain dict. Co-authored-by: Cursor <cursoragent@cursor.com> * docs: describe projects alongside experts and teams Record the agreed project shape: group visibility, owner-backed default context, and tasks that everyone who can open the project can see. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: jubaoliang <jubaoliang@tencent.com> Co-authored-by: Cursor <cursoragent@cursor.com>
…encentCloud#2880) An empty default model was discarded, chat chips hid which vendor a model came from, and a waiting frontend never reached people without update permission. PostgreSQL backup now explains a missing client instead of failing as an internal error.
…entCloud#2852) The browser host's CDP client uses websockets.connect(), which raises "python-socks is required to use a SOCKS proxy" when a SOCKS proxy env var is set and the package is absent. The portable runtime's site-packages are built from this repo's lockfile, and python-socks was not a dependency — dev machines masked the gap because the package happened to be manually installed in the dev venv. Fixes TencentCloud#2836 Verification: uv lock --check consistent; uv export --frozen --no-dev now emits python-socks==3.2.1.
Per-user provider API keys (bring-your-own-key), stored in the secrets
KV (user_provider_key:{user_id}:{provider_name}, Fernet-sealed, no
schema change) and served at /api/me/provider-keys (Settings -> Model
Keys). Implicit policy: a provider without a global key demands a
personal key (PROVIDER_KEY_REQUIRED), a personal key otherwise overrides
the global key for that user's turns (configurable.api_key_override into
harness requests). User/provider deletion cleans up stored keys.
Also folds a regression test asserting PATCH {"api_key": null} really
clears the stored global key, and the required-key tag copy tweak.
Fixes TencentCloud#2907
Contributor
|
请把这个变更重新提交到 Please open this change against |
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.
Note
This PR has been recreated as #2932
Summary
Per-user provider API keys (bring-your-own-key), stored in the secrets KV (
user_provider_key:{user_id}:{provider_name}, Fernet-sealed, no schema change) and served at/api/me/provider-keys(Settings → Model Keys).Implicit policy: a provider without a global key demands a personal key (
PROVIDER_KEY_REQUIRED); a personal key otherwise overrides the global key for that user's turns (configurable.api_key_overrideinto harness requests). User/provider deletion cleans up stored keys.Note: depends on the harness per-call
api_key_overrideseam (TencentCloud/octop-harness#242) and on the stream error envelope keepingerror_code(#2908). After the harness PR releases, bump theoctop-harnesspin.Fixes #2907
Target branch
develop(feature / fix — default)main(release/*orhotfix/*only)Type of change
Test plan
Verified locally on this branch:
make allpasses locally (5471 passed / 27 skipped);tsc -band vitest passtests/unit/agents/test_user_key_resolution.py,tests/unit/db/test_user_provider_keys.py,tests/integration/test_user_provider_keys.py,tests/unit/api/test_provider_patch_rehydrate.py)Checklist
CHANGELOG.md(if user-facing)概要
每用户供应商 API Key(bring-your-own-key),存于 secrets KV(
user_provider_key:{user_id}:{provider_name},Fernet 密封,无 schema 变更),经/api/me/provider-keys(设置 → 模型密钥)提供服务。隐式策略:无全局 Key 的供应商必须配置个人 Key(缺失报
PROVIDER_KEY_REQUIRED);否则该用户的调用以个人 Key 覆盖全局 Key(configurable.api_key_override传入 harness 请求)。删除用户/供应商时级联清理已存 Key。说明:依赖 harness 的按调用
api_key_override缝隙(TencentCloud/octop-harness#242)与错误帧保留error_code(#2908);harness 发版后 bumpoctop-harnesspin。修复 #2907
目标分支
develop(feature / fix — 默认)main(仅release/*或hotfix/*)变更类型
测试计划
已在本分支本地验证:
make all通过(5471 passed / 27 skipped);tsc -b与 vitest 通过tests/unit/agents/test_user_key_resolution.py、tests/unit/db/test_user_provider_keys.py、tests/integration/test_user_provider_keys.py、tests/unit/api/test_provider_patch_rehydrate.py)检查清单
CHANGELOG.md(如涉及用户可见变更)