Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(pi): 同路由重选不支持思考的模型不再下发 xhigh、不改档位记忆

Zhang Yunjinbb3a3fd9d181
diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts
index 56262181a0..688afc0c8b 100644
--- a/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts
+++ b/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts
@@ -4789,6 +4789,61 @@ describe("Pi provider-aware model routing", () => {
await handle.close();
});
+ it("keeps thinking off and the remembered tier on a same-route select of a non-thinking model", async () => {
+ // 同路由重选不支持思考的模型:下发 xhigh 会让请求"成功"但改动档位记忆,
+ // 用户之后切回支持 xhigh 的模型就被静默改成 xhigh。
+ const denseMap = {
+ minimal: "minimal",
+ low: "low",
+ medium: "medium",
+ high: "high",
+ xhigh: "xhigh",
+ max: "max",
+ } as const;
+ const agent = new PiAgent(
+ byomDeps(
+ async () => ({
+ providers: [
+ {
+ id: "native-a",
+ name: "Native A",
+ baseUrl: "http://a.test",
+ api: "openai-responses",
+ models: [
+ { id: "model-a", reasoning: true, thinkingLevelMap: { ...denseMap } },
+ { id: "model-plain", reasoning: false },
+ ],
+ },
+ ],
+ env: {},
+ }),
+ [
+ { id: "model-a", displayName: "A", contextWindow: 200_000, efforts: ["low", "high"], defaultEffort: "low" },
+ { id: "model-plain", displayName: "Plain", contextWindow: 200_000, efforts: [], defaultEffort: null },
+ ],
+ ),
+ );
+ const handle = await agent.startSession({
+ sessionId: "same-route-non-thinking-model",
+ workingDir: cwd,
+ model: "model-a",
+ providerId: "native-a",
+ effort: "high",
+ });
+ await handle.setModel!("model-plain", { providerId: "native-a" });
+ const beforeSwitch = captured.requests.length;
+
+ await handle.setModel!("model-plain", { providerId: "native-a", thinkingEnabled: true });
+
+ const levels = captured.requests
+ .slice(beforeSwitch)
+ .filter((request) => request.type === "set_thinking_level")
+ .map((request) => String(request.level));
+ expect(levels).toEqual(["off"]);
+ expect(handle.getEffort!()).toBe("high");
+ await handle.close();
+ });
+
it("picks a tier the current model supports when re-enabling thinking", () => {
// 用户先在 high 关闭思考、再不带到档位切到不支持 high 的模型:记忆档位仍是 high,
// 重新开启时直接下发会被拒(开启失败)或与当前能力对不上。
diff --git a/packages/maker-core/src/agents/pi/index.ts b/packages/maker-core/src/agents/pi/index.ts
index b171cd5eab..84292ac173 100644
--- a/packages/maker-core/src/agents/pi/index.ts
+++ b/packages/maker-core/src/agents/pi/index.ts
@@ -7050,14 +7050,19 @@ export class PiAgent extends BaseAgent {
* Pi 拒绕(开启失败)或与当前能力对不上。
*/
const applyThinkingEnabled = async (enabled: boolean): Promise<void> => {
+ // 目标模型不支持思考(快照为空)时没有什么可开:下发 off 并**保留**用户原来的
+ // 档位记忆。否则同路由重选这类模型会发 xhigh、成功后还把 mutableEffort 改成
+ // xhigh,用户之后切回支持 xhigh 的模型就被静默改了档。
+ const thinkingUnsupported = activeEffortSnapshot !== undefined && activeEffortSnapshot.length === 0;
+ const wanted = enabled && !thinkingUnsupported;
const remembered = pickSupportedEffort(activeEffortSnapshot, mutableEffort, startupEffort);
// 打开时回到会话当前的期望档位,而不是固定 xhigh:显式开关不该把用户选好的
// max/medium 抹平——否则紧随其后的切模按 mutableEffort 归一化时又会把它降档。
// 没有可用期望档位时才回到历史默认 xhigh。
- const targetEffort = enabled ? remembered : null;
+ const targetEffort = wanted ? remembered : null;
const level = targetEffort
? effortToPiThinkingLevel(targetEffort)
- : enabled
+ : wanted
? 'xhigh'
: 'off';
const resp = await proc.request({
@@ -7067,10 +7072,10 @@ export class PiAgent extends BaseAgent {
if (!resp.success) throw new Error(`pi set_thinking_level failed: ${resp.error ?? 'unknown'}`);
// 意图标记只在 RPC 成功后更新:失败时 Pi 仍是旧状态,提前改标记会让之后的
// 无载体切模误判(2026-10-06 Greptile P1:已报错的操作在之后意外生效)。
- thinkingExplicitlyOff = !enabled;
- // 只在打开时更新档位记忆:关掉思考不丢档位——档位是用户的独立选择,
+ thinkingExplicitlyOff = !wanted;
+ // 只在真的打开时更新档位记忆:关掉思考不丢档位——档位是用户的独立选择,
// 再打开应回到原档位,而不是回落到启动时的档位。
- if (enabled) mutableEffort = targetEffort ?? 'xhigh';
+ if (wanted) mutableEffort = targetEffort ?? 'xhigh';
};
const switchModel = async (
model: string,