Repository navigation
Merge upstream main bd7f202 (proper history) - #9
Merged
Merged
Conversation
- 全部账户处在套餐限额或每日限额冷却时，同一请求依次发往这些账户、每个账户一次 - 全部启用账户都已尝试后结束重试，返回最后一次的错误 - 协议与开发文档说明这一顺序
fix: 全部账户额度冷却时逐个尝试冷却中的账户
- 续写轮沿用首轮写入的 proof，Camoufox 后端沿用页面为首轮写入的 proof 直接发送 - 续写轮遇到可换账户的错误时换到其他账户，以同一续写 token 重发该轮，额度失败的账户进入冷却 - 换账户后转发、认证检查与用量明细跟随当前账户，被换下的账户立即释放 - 账户运行状态锁在请求期限内等到释放 - 协议、开发与日志文档说明续写轮的 proof、换账户与锁等待
- 公开 API 读取 X-AIStudio-Account 请求头，账户池只在该账户上选号并与 API key 绑定取交集 - 视频后台生成与 Gemini 可续传上传沿用请求指定的账户，可续传上传完成时沿用开始请求的 key 绑定 - 指定账户不存在或不在本次请求可用的账户中时返回写明该账户的错误，补齐六种语言译文 - README 与协议文档说明请求头的用法
fix: 完善 Carbon 长回答的自动续写
feat: 支持以请求头指定处理账户
- 写代码助手追加任务改用 continuationPrefixStripper 去掉重复前缀，删除重复的末尾截取函数 - 重新生成循环去掉空分支，按写代码助手、从头重新生成与续写三种情况判断 - 写代码助手在截断处仍在运行的任务于追加用户轮之前取消，动作数组只解析一次，两个重写提示共用调用格式说明 - 流中断后续写的用量计入中断那一次最近一帧的用量 - 模拟上游流的用例移出正式仓库，保留调用块尾随逗号修正的单元测试
…n-recovery fix(aistudio): 支持输出纯文本后的工具调用异常续写与写代码助手调用块恢复
- 接入 Gemini Decision 的公开入口、目录方法、单价与管理端能力示例，输入被拦截时按官方返回 400 与拦截类别 - 修正写代码助手取消已结束任务与截断后取消的条件，追问任务没有模型回复即结束时再追加一轮 - 让续写轮换账户后的续写恢复与失败归属跟随新账户，账户耗尽时返回上游原始错误 - 保留续写去重时尚未确认重复的短正文，续接其他账户创建的 agent 任务时对请求头指定的账户报错 - 只保留上游在同一流中交错发出的第一条生成，避免重复输出正文与工具调用 - 以单次扫描改写 Gemini 请求的 snake_case 字段名，降低大附件请求的内存峰值并拒绝根值之后的多余内容 - 把 Windows 桌面版的 WebView2 数据写入本机应用数据目录，缩短磁盘繁忙时的窗口创建时间
xiaohai1314-sys
added a commit
that referenced
this pull request
Nov 12, 2026
xiaohai1314-sys
added a commit
that referenced
this pull request
Nov 12, 2026
xiaohai1314-sys
added a commit
that referenced
this pull request
Nov 12, 2026
xiaohai1314-sys
added a commit
that referenced
this pull request
Nov 12, 2026
This workflow automates the merging of pull request 9 into the main branch, resolving conflicts and verifying changes. It includes steps for checking out the repository, merging upstream changes, and handling specific conflict resolutions for multiple files.
xiaohai1314-sys
added a commit
that referenced
this pull request
Nov 12, 2026
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.
Real merge of upstream Mag1cFall/AIStudio2API main @ bd7f202 so the upstream commits become ancestors of fork main (the earlier snapshot-based sync PR #8 brought the tree but not the history). Same 10 commits as PR #8; conflicts resolved the same way: keep fork account-hardening and unary-RPC timeout/environment binding, adopt upstream cleanup.cancel / prepareProtectedRequest proof / accountContextMiddleware.