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): 无载体切模不重新开启用户已关的思考(Greptile P1)

Zhang Yunjin3bed8c602f14
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/runtimeSetModel.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/runtimeSetModel.test.ts
index 0e41a75c28..34c2636aba 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/runtimeSetModel.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/runtimeSetModel.test.ts
@@ -431,6 +431,11 @@ describe('applyRuntimeSetModelChange', () => {
remoteHostId: null,
model: 'local-model',
setModel,
+ previewModelSwitch: vi.fn(async () => ({
+ action: 'hot' as const,
+ targetContextWindow: null,
+ windowVerified: false,
+ })),
}),
listActiveSessions: () => [],
closeSession: vi.fn(async () => {}),
@@ -460,6 +465,11 @@ describe('applyRuntimeSetModelChange', () => {
remoteHostId: null,
model: 'local-model',
setModel,
+ previewModelSwitch: vi.fn(async () => ({
+ action: 'hot' as const,
+ targetContextWindow: null,
+ windowVerified: false,
+ })),
}),
listActiveSessions: () => [],
closeSession: vi.fn(async () => {}),
diff --git a/docs/dev-rules/pi-harness.md b/docs/dev-rules/pi-harness.md
index bf9eacd64e..c9ba0e135a 100644
--- a/docs/dev-rules/pi-harness.md
+++ b/docs/dev-rules/pi-harness.md
@@ -99,9 +99,11 @@ Cindy 显式设置:models.json、`settings.json` 的 `transport:sse` 与 `retry.
回归见 `pi-provider-routing.test.ts` 的 thinking-level 用例。跨引擎切换提交时还会把这次选择写进
本机偏好镜像(普通 send 走 lazy-create 只读镜像、不经过 bootstrap),避免远端推送未回流时新建会话
用旧值。**仍未覆盖**:Bot 设置保存、agent/scheduler/IM 回滚等**旁路入口**热切 Pi 模型时没有 thinking
-载体(`SessionRuntimeProfile` 不含该字段),按目标快照收敛能保证推理模型不丢通道,但无法区分
-「用户本想关思考」;要完全对齐用户意图仍需给这些入口补载体(本机偏好镜像已有
-`getThinkingEnabledFromMemory`,目前只在会话启动钩子接入)。
+载体(`SessionRuntimeProfile` 不含该字段)。按目标快照收敛保证推理模型不丢通道;用户明确关过的
+思考(`setThinkingEnabled(false)` / 显式 `thinkingEnabled:false` / 启动关闭)由运行期意图标记
+保护,无载体切换不会重新开启。剩下的是本机偏好镜像里的 per-model 开关意图(记忆里关了、运行期
+从未显式下发过)仍无法携带,要完全对齐需给这些入口补载体(镜像已有 `getThinkingEnabledFromMemory`,
+目前只在会话启动钩子接入)。
Pi 原生负责 threshold 与 overflow 压缩;
Cindy 消费 compaction 事件做 UI、usage、digest 投影,并只在本机原生自动压缩确定性失败后锁存
下一次发送前换窗。设置页的 Pi 百分比默认 90%(已有显式 override 保留),在每次启动或恢复
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 8785a44935..43868cbf57 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
@@ -4245,6 +4245,60 @@ describe("Pi provider-aware model routing", () => {
await handle.close();
});
+ it("keeps thinking off after a carrier-less switch when the user had turned it off", async () => {
+ 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-b", reasoning: true, thinkingLevelMap: { ...denseMap } },
+ ],
+ },
+ ],
+ env: {},
+ }),
+ [
+ { id: "model-a", displayName: "A", contextWindow: 200_000, efforts: ["low", "high"], defaultEffort: "low" },
+ { id: "model-b", displayName: "B", contextWindow: 200_000, efforts: ["low", "high"], defaultEffort: "low" },
+ ],
+ ),
+ );
+ const handle = await agent.startSession({
+ sessionId: "thinking-stays-off-without-intent",
+ workingDir: cwd,
+ model: "model-a",
+ providerId: "native-a",
+ effort: "high",
+ });
+ await handle.setThinkingEnabled!(false);
+ const beforeSwitch = captured.requests.length;
+
+ await handle.setModel!("model-b", { providerId: "native-a" });
+
+ // 用户明确关过思考:无载体切换不得悄悄重新开启(scheduler 复用会话即此类入口),
+ // 也不得把用户关掉后的关闭状态改写成档位。
+ expect(
+ captured.requests
+ .slice(beforeSwitch)
+ .some((request) => request.type === "set_thinking_level"),
+ ).toBe(false);
+ await handle.close();
+ });
+
it("keeps the model switch successful when the post-switch thinking level is rejected", async () => {
const denseMap = {
minimal: "minimal",
diff --git a/packages/maker-core/src/agents/pi/index.ts b/packages/maker-core/src/agents/pi/index.ts
index 41e270542f..57f5d76224 100644
--- a/packages/maker-core/src/agents/pi/index.ts
+++ b/packages/maker-core/src/agents/pi/index.ts
@@ -3819,6 +3819,10 @@ export class PiAgent extends BaseAgent {
let mutableProviderId: string | null | undefined = opts.providerId ?? authProviderId;
let activeEffortSnapshot = initialEffortSnapshot;
let mutableEffort: Effort | null = startupEffort ?? null;
+ // 用户明确关掉思考(setThinkingEnabled(false) / 切模显式 thinkingEnabled:false /
+ // 启动 opts.thinkingEnabled === false)的意图标记:无载体切模不得据此悄悄重新开启。
+ // 只跟随显式意图变化;目标不支持思考而下发 off 不算用户意图,不置位。
+ let thinkingExplicitlyOff = false;
let currentAutoReviewIntent: AutoReviewUserIntent = '';
const autoReviewActionContext = createAutoReviewActionContext();
const autoReviewContext = () => activeTurnPermissionPolicy?.autoReviewContext
@@ -5859,6 +5863,7 @@ export class PiAgent extends BaseAgent {
}
if (opts.thinkingEnabled === false) {
+ thinkingExplicitlyOff = true;
const resp = await proc.request({
type: 'set_thinking_level',
level: 'off',
@@ -6624,6 +6629,9 @@ export class PiAgent extends BaseAgent {
// 制造「Pi 已切模、宿主认为没切」的分裂。用户可在 UI 上重新选择。
const explicitThinking =
setOpts && typeof setOpts.thinkingEnabled === 'boolean' ? setOpts.thinkingEnabled : undefined;
+ // 显式意图即权威:关掉/打开都落成用户意图标记,供无载体切换判断能否重开思考。
+ if (explicitThinking === true) thinkingExplicitlyOff = false;
+ else if (explicitThinking === false) thinkingExplicitlyOff = true;
{
const requestedEffort = setOpts?.effort ?? mutableEffort ?? startupEffort ?? null;
const nativeTarget = provider !== PI_PROVIDER_ID
@@ -6640,6 +6648,14 @@ export class PiAgent extends BaseAgent {
let appliedEffort: Effort | null = null;
if (explicitThinking === false || (explicitThinking === true && targetReasoning === false)) {
level = 'off';
+ } else if (explicitThinking === undefined && thinkingExplicitlyOff) {
+ // 用户明确关过思考:无载体切换保留这个关闭状态,不得悄悄重新开启(即使只是
+ // 重下发同一模型路由)。有能力的旁路入口应补 thinking 载体;这里只保证不违背
+ // 用户意图,与 2026-10-06 Greptile P1 同口径。
+ deps.logger.info('pi: thinking kept off after a model switch without an intent carrier', {
+ model,
+ provider,
+ });
} else if (targetReasoning === true) {
const usable = nextEffortSnapshot && nextEffortSnapshot.length > 0
? nextEffortSnapshot
@@ -7385,6 +7401,7 @@ export class PiAgent extends BaseAgent {
async setThinkingEnabled(enabled: boolean): Promise<void> {
if (reviewMode) return;
+ thinkingExplicitlyOff = !enabled;
// 打开时回到会话当前的期望档位,而不是固定 xhigh:显式开关不该把用户选好的
// max/medium 抹平——否则紧随其后的切模按 mutableEffort 归一化时又会把它降档。
// 没有期望档位时才回到历史默认 xhigh。