Repository navigation
Conversation
coulsontl
added a commit
to coulsontl/agent2api
that referenced
this pull request
Oct 18, 2026
…刷新间隔） - aimod-cc#305（406722575）：商汤日日新预置 Base URL 改为 https://token.sensenova.cn/v1 - aimod-cc#310（coulsontl）：AI 助手工具链对自定义提供商支持不完整 - aimod-cc#278（YouYangDaShu）：报表页默认自动刷新由 1 秒改 30 秒 （该 PR 的聚合索引与缓存查询精简已被上游后续版本以更优方案覆盖）
xiarunjie
added a commit
to xiarunjie/Agent2API
that referenced
this pull request
Nov 3, 2026
xiarunjie
added a commit
to xiarunjie/Agent2API
that referenced
this pull request
Nov 4, 2026
本提交把 main 的内容整体切到上游 v3.4.0 的发布状态（tag v3.4.0 = 31bc7bd，其后 0add462 重建了手机端与 Service Worker 产物并把版本号跟到 3.4.0）： · 此前在 beta.6 基线上同步进来的 8 条上游 PR 内容（aimod-cc#305 aimod-cc#311 aimod-cc#343 aimod-cc#415 aimod-cc#417 aimod-cc#418 aimod-cc#434 aimod-cc#449）不再出现在 main 上 —— 它们都改在 beta.6 的旧落点，其中相当 一部分与 3.4.0 自带的实现（路由工作台、会话图片压缩）在同一批文件上各走了 一条路（实测 43 个文件内容分叉）。旧状态完整保留在 archive-main-pre-340 （分支与 tag 同名），需要时可逐条取回。 · 前端产物取自上游 3.4.0 自己的构建结果，与上游源码逐字节同源。 · 基线切齐后，「哪些上游 PR 还能合」可用硬证据重新判定，而不是在分叉状态上叠。 上游对照：aimod-cc/Agent2API @ 0add462（tree 4ffbf15）
xiarunjie
added a commit
to xiarunjie/Agent2API
that referenced
this pull request
Nov 4, 2026
…n/v1 来源 aimod-cc#305（相对 v3.4.0 基线 mergeable=true，逐文件取该 PR head 内容组装）。
xiarunjie
added a commit
to xiarunjie/Agent2API
that referenced
this pull request
Nov 4, 2026
合并 aimod-cc#305 / aimod-cc#434 时用的是「取 PR head 的整个文件」，而这两个 PR 的 base 分别是 `a55e1eb1` / `bd36938d`（比 3.4.0 早），整文件覆盖把基线里更新的实现一起退回了 旧版本，后果是库编译报错（`adapter.host()` / `leased()` / `deferred()` / `error_policy_async` / 参数个数不符），warm-cache 在 Windows 上直接编译失败。 现在这 4 个文件改为三方合并的结果： ours = 3.4.0 基线（094c6e1b） base = 该 PR 自己声明的 base 提交 theirs= 该 PR 的 head 对 rpc.rs 再做一次阶段二合并（base = 0add462，head = aimod-cc#453），把 aimod-cc#434 与 aimod-cc#453 两处增量都留住（实测合并无冲突）。 教训已记：跨基线的 PR 不能整文件搬，必须三方合并后再落。
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.
预置提供商卡片「商汤日日新」（
desktop-tauri/ui/preset-providers.js第 250 行）的默认 Base URL 写成了https://api.sensenova.cn/compatible-mode/v1，商汤日日新实际可用的 OpenAI 兼容端点是https://token.sensenova.cn/v1。本 PR 仅更正这一行。余额查询链路（
platform.sensenova.cn/iam.sensecoreapi.cn，见sensenova_auth.rs）不受影响。