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。

chore: 合并上游 main,解决冲突

Zhang Yunjin86ec3cb32043
diff --cc apps/desktop/src/main/__tests__/makerSendToSessionOrdering.test.ts
index 093be38f6a,383f8985e3..c9970a558e
--- a/apps/desktop/src/main/__tests__/makerSendToSessionOrdering.test.ts
+++ b/apps/desktop/src/main/__tests__/makerSendToSessionOrdering.test.ts
@@@ -627,10 -627,12 +627,15 @@@ describe('sendToSession ordering', () =
'restoreControlStores();',
'throw persistenceError;',
);
- // #5044 在 selection 上加了可选 thinking 载体;upstream 用例的旧字符串同步。
- expect(preloadSource).toContain('selection?: { effort: string | null; fastMode: boolean; thinking?: boolean },');
+ // Protect the SET_MODEL wire argument order. Other preload APIs (including
+ // voice preferences) also accept `selection` and are outside this contract.
+ const preloadSetModel = extractBetween(preloadSource, ' setModel: (', ' switchSessionAgent: (');
- expect(preloadSetModel).toContain("selection?: { effort: string | null; fastMode: boolean | 'ultrafast' },");
++ // #5044 在 selection 上加了可选 thinking 载体;上游已把 fastMode 扩成 ultrafast。
++ expect(preloadSetModel).toContain(
++ "selection?: { effort: string | null; fastMode: boolean | 'ultrafast'; thinking?: boolean },",
++ );
expectOrder(
- preloadSource,
+ preloadSetModel,
'expectedAgentSwitchRevision,',
'selection,',
);
diff --cc apps/desktop/src/main/maker-ipc/register.ts
index c7d1388d01,39ad974be7..9610d7398a
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@@ -10214,14 -10642,9 +10656,14 @@@ export function registerMakerIpc(maker
model: row.model ?? undefined,
providerId: row.providerId,
effort: (row.effort ?? undefined) as CreateOpts['effort'],
- fastMode: !!row.fastMode,
+ fastMode: (row.fastMode ?? false),
permissionMode: (row.permissionMode ?? 'ask') as CreateOpts['permissionMode'],
planMode: false,
+ // 跨引擎意图期内改的思考开关必须显式带入:否则 createSession 只能读被控端
+ // 镜像/默认值,与用户刚选的不一致(device-link 远程场景)。
+ ...(opts?.thinkingEnabled !== undefined
+ ? { thinkingEnabled: opts.thinkingEnabled }
+ : {}),
title: row.title ?? undefined,
resumeSessionId: row.sdkSessionId ?? undefined,
// 远端会话切换引擎后仍是远端:带回 remoteHostId 并走 ensure (SSH
@@@ -14844,10 -15601,8 +15622,10 @@@
providerId: string | null | undefined,
selection: {
effort: SessionRuntimeProfile['effort'];
- fastMode: boolean;
+ fastMode: boolean | 'ultrafast';
confirmedContextWindow?: number;
+ /** Pi-only:目标模型的思考开关意图;随暂存选择/换窗重试一并回放。 */
+ thinking?: boolean;
},
options: InternalRuntimeSelectionOptions,
) => Promise<{
@@@ -20644,7 -21779,7 +21809,7 @@@
);
}
let atomicSelection = selection as
- { effort: SessionRuntimeProfile['effort']; fastMode: boolean; thinking?: boolean } | undefined;
- { effort: SessionRuntimeProfile['effort']; fastMode: boolean | 'ultrafast' } | undefined;
++ { effort: SessionRuntimeProfile['effort']; fastMode: boolean | 'ultrafast'; thinking?: boolean } | undefined;
const runtimeOwnerEpoch = captureSessionRuntimeControlOwnerEpoch();
const assertSharedTaskCurrent = captureSharedTaskSettingGuard(sessionId);
const assertRuntimeOwnerCurrent = (): void => {
diff --cc apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts
index 5edcd324e1,d6505ea18d..ece45007d0
--- a/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts
@@@ -817,8 -792,7 +836,8 @@@ export async function performSessionAge
model,
providerId: normalizedProviderId,
...(typeof params.effort === 'string' ? { effort: params.effort } : {}),
- ...(typeof params.fastMode === 'boolean' ? { fastMode: params.fastMode } : {}),
+ ...((typeof params.fastMode === 'boolean' || params.fastMode === 'ultrafast') ? { fastMode: params.fastMode } : {}),
+ ...(typeof thinking === 'boolean' ? { thinking } : {}),
sameAgentSelection: true,
...(confirmedContextWindow !== undefined ? { confirmedContextWindow } : {}),
...(params.runtimeSource ? { runtimeSource: params.runtimeSource } : {}),
@@@ -899,8 -859,7 +918,8 @@@
model,
providerId: normalizedProviderId,
...(typeof params.effort === 'string' && params.effort ? { effort: params.effort } : {}),
- ...(typeof params.fastMode === 'boolean' ? { fastMode: params.fastMode } : {}),
+ ...((typeof params.fastMode === 'boolean' || params.fastMode === 'ultrafast') ? { fastMode: params.fastMode } : {}),
+ ...(typeof thinking === 'boolean' ? { thinking } : {}),
...(agentDeviceChanges ? { targetAgentDeviceId } : {}),
};
deps.pendingSwitches.set(sessionId, intent);
diff --cc apps/desktop/src/preload/preload.ts
index 10a4801cff,228ad4784e..432104d0f3
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@@ -7111,7 -7198,7 +7200,7 @@@ contextBridge.exposeInMainWorld('electr
model: string,
providerId?: string | null,
expectedAgentSwitchRevision?: number,
- selection?: { effort: string | null; fastMode: boolean; thinking?: boolean },
- selection?: { effort: string | null; fastMode: boolean | 'ultrafast' },
++ selection?: { effort: string | null; fastMode: boolean | 'ultrafast'; thinking?: boolean },
): Promise<{ deferred: boolean; superseded?: boolean } | undefined> =>
ipcRenderer.invoke(
'maker:set-model',
@@@ -7133,10 -7220,9 +7222,10 @@@
model: string,
providerId?: string | null,
effort?: string,
- fastMode?: boolean,
+ fastMode?: boolean | 'ultrafast',
// 远程 Agent:同时换 Agent 所在电脑(null = 任务所在电脑)。不传 = 位置不变。
options?: { agentDeviceId?: string | null; confirmedContextWindow?: number },
+ thinking?: boolean,
): Promise<{
switched: boolean;
agentKind: 'claude-code' | 'codex' | 'pi';
diff --cc apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
index b811e72b47,7d57c5eb1a..709088cdd9
--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
@@@ -1177,30 -1199,9 +1199,31 @@@ function deriveSyntheticAtQuery(editor
return text;
}
+/**
+ * Pi 切模/切来源时随 selection 携带的目标模型思考开关意图。
+ *
+ * 与思考开关展示同一口径:记忆缺失按 UI 默认(开)处理;引擎/来源/模型未知时
+ * 返回 undefined(不猜、不改 Pi 现状)。Pi 的 set_model 不重置 thinking level,
+ * 不带上这个意图就会让上一个模型的 off/旧档位漂移到新模型。
+ */
+function resolveModelThinkingIntent(input: {
+ kind: Parameters<typeof getProviderModelThinking>[0] | null | undefined;
+ providerId: string | null | undefined;
+ modelId: string | null | undefined;
+ memory: ModelMemoryAccessors | undefined;
+ deviceLinkDeviceId: string | null | undefined;
+}): boolean | undefined {
+ const { kind, providerId, modelId, memory, deviceLinkDeviceId } = input;
+ if (!kind || !providerId || !modelId) return undefined;
+ const remembered =
+ memory?.getThinking?.(kind, providerId, modelId) ??
+ (!deviceLinkDeviceId ? getProviderModelThinking(kind, providerId, modelId) : undefined);
+ return remembered ?? true;
+}
+
export function ChatInput({
onSend,
+ onComposerTyping,
sessionId,
runtimeAgentKind,
runtimeEffective,
@@@ -6782,10 -6943,10 +6965,10 @@@
targetAgentKind: 'claude-code' | 'codex' | 'pi',
newModelId: string,
providerId: string | null = null,
- // 意图期内的档位/Fast 改动经此显式覆盖(用户手选优先于记忆/默认解析)。
+ // 意图期内的档位/Fast/思考开关改动经此显式覆盖(用户手选优先于记忆/默认解析)。
overrides?: {
effort?: Effort;
- fastMode?: boolean;
+ fastMode?: boolean | 'ultrafast';
/** Editing only axes keeps the existing route's window acknowledgement. */
axesOnly?: boolean;
/**
@@@ -6896,23 -7061,11 +7084,19 @@@
providerId,
modelId: newModelId,
agentKind: targetAgentKind,
+ fastMode: requestedFast,
});
const targetFast = fromOtherCatalog
- ? overrides?.fastMode === true
- : overrides?.fastMode !== undefined
- ? overrides.fastMode && fastCapable
- : fastCapable &&
- !!providerId &&
- !!modelMemory &&
- (modelMemory.getFast(targetAgentKind, providerId, newModelId) ?? false);
+ ? overrides?.fastMode ?? false
+ : fastCapable ? requestedFast : false;
+ // Pi 的思考开关意图:显式 override 优先,否则按目标 (引擎,来源,模型) 记忆,
+ // 缺记忆按 UI 默认开;没有来源/记忆时不猜(不传该参)。
+ const targetThinking =
+ overrides?.thinking !== undefined
+ ? overrides.thinking
+ : providerId && modelMemory
+ ? (modelMemory.getThinking?.(targetAgentKind, providerId, newModelId) ?? true)
+ : undefined;
// 会话级操作按来源路由:device-link 远程会话隧道到被控端(意图注册表与引擎
// 交接都在那边),本机会话零变化直连本机 maker。
@@@ -7631,8 -7770,7 +7815,8 @@@
? ({
effort: atomicEffort,
fastMode: atomicFast,
- } as { effort: string | null; fastMode: boolean | 'ultrafast' })
+ ...(nextThinking !== undefined ? { thinking: nextThinking } : {}),
- } as { effort: string | null; fastMode: boolean; thinking?: boolean })
++ } as { effort: string | null; fastMode: boolean | 'ultrafast'; thinking?: boolean })
: undefined,
);
if (remoteSetModelResult?.superseded) {
@@@ -7693,14 -7831,8 +7877,14 @@@
{
effort: atomicEffort,
fastMode: atomicFast,
+ ...(nextThinking !== undefined ? { thinking: nextThinking } : {}),
...(confirmedContextWindow ? { confirmedContextWindow } : {}),
- } as { effort: string | null; fastMode: boolean | 'ultrafast' },
+ } as {
+ effort: string | null;
- fastMode: boolean;
++ fastMode: boolean | 'ultrafast';
+ thinking?: boolean;
+ confirmedContextWindow?: number;
+ },
);
},
);
@@@ -8238,8 -8352,7 +8421,8 @@@
? ({
effort: remoteAtomicEffort,
fastMode: restoredFast,
- } as { effort: string | null; fastMode: boolean | 'ultrafast' })
+ ...(targetThinking !== undefined ? { thinking: targetThinking } : {}),
- } as { effort: string | null; fastMode: boolean; thinking?: boolean })
++ } as { effort: string | null; fastMode: boolean | 'ultrafast'; thinking?: boolean })
: undefined,
);
if (remoteSetModelResult?.superseded) {
@@@ -8343,14 -8449,8 +8526,14 @@@
{
effort: atomicEffort,
fastMode: restoredFast,
+ ...(targetThinking !== undefined ? { thinking: targetThinking } : {}),
...(confirmedContextWindow ? { confirmedContextWindow } : {}),
- } as { effort: string | null; fastMode: boolean | 'ultrafast' },
+ } as {
+ effort: string | null;
- fastMode: boolean;
++ fastMode: boolean | 'ultrafast';
+ thinking?: boolean;
+ confirmedContextWindow?: number;
+ },
);
},
);
diff --cc apps/desktop/src/renderer/vite-env.d.ts
index 801484850b,732ccc0aa6..84950d1c00
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@@ -6383,7 -6455,7 +6455,7 @@@ interface ElectronAPI
model: string,
providerId?: string | null,
expectedAgentSwitchRevision?: number,
- selection?: { effort: string | null; fastMode: boolean; thinking?: boolean },
- selection?: { effort: string | null; fastMode: boolean | 'ultrafast' },
++ selection?: { effort: string | null; fastMode: boolean | 'ultrafast'; thinking?: boolean },
) => Promise<{ deferred: boolean; superseded?: boolean } | undefined>;
/**
* session-agent-switch:同一会话切换 agent 引擎(claude-code ↔ codex)。
@@@ -6398,10 -6470,9 +6470,10 @@@
model: string,
providerId?: string | null,
effort?: string,
- fastMode?: boolean,
+ fastMode?: boolean | 'ultrafast',
/** 远程 Agent:同时换 Agent 所在电脑(null = 任务所在电脑)。不传 = 位置不变。 */
options?: { agentDeviceId?: string | null; confirmedContextWindow?: number },
+ thinking?: boolean,
) => Promise<{
switched: boolean;
agentKind: 'claude-code' | 'codex' | 'pi';
diff --cc packages/maker-core/src/agents/base-agent.ts
index 395ca4da76,c56072f607..6bbeb59f9e
--- a/packages/maker-core/src/agents/base-agent.ts
+++ b/packages/maker-core/src/agents/base-agent.ts
@@@ -2448,8 -2475,11 +2475,11 @@@ export interface AgentSessionHandle
/** Host tool approval uses the same live intent/model/scope as native tool approval. */
reviewAutoPermissionAction?(action: ReviewableAction): Promise<AutoReviewDecision>;
+ /** Actual runtime reviewer, not subscription availability. Only applies to harness-dispatched tools. */
+ getAutoReviewOwner?(): 'native' | 'cindy';
+
- /** 运行时切换模型 —— 不支持时抛 NotSupportedError */
- setModel?(model: string, opts?: { providerId?: string | null; effort?: Effort }): Promise<void>;
+ /** 运行时切换模型 —— 不支持时抛 NotSupportedError。thinkingEnabled = 目标模型的思考开关意图(Pi 用它收敛切模后的 thinking level)。 */
+ setModel?(model: string, opts?: { providerId?: string | null; effort?: Effort; thinkingEnabled?: boolean }): Promise<void>;
/** Read-only Pi preflight before the host changes its persisted route or context. */
previewModelSwitch?(
diff --cc packages/maker-core/src/agents/pi/index.ts
index d771986701,29c68483dd..2e706441b3
--- a/packages/maker-core/src/agents/pi/index.ts
+++ b/packages/maker-core/src/agents/pi/index.ts
@@@ -4061,12 -4133,12 +4133,16 @@@ export class PiAgent extends BaseAgent
// null/订阅来源会归一到 cindy,setModel 未显式传来源时也必须跟随本次解析结果。
let mutablePiProviderId = initialProvider;
let mutableProviderId: string | null | undefined = opts.providerId ?? authProviderId;
+ ctx.getCacheCompatibility = () => {
+ const route = appliedCacheRoutes.get(JSON.stringify([mutablePiProviderId, mutableWireModel]));
+ return route ? { ...route, modelId: mutableModel ?? route.modelId } : undefined;
+ };
let activeEffortSnapshot = initialEffortSnapshot;
let mutableEffort: Effort | null = startupEffort ?? null;
+ // 用户明确关掉思考(setThinkingEnabled(false) / 切模显式 thinkingEnabled:false /
+ // 启动 opts.thinkingEnabled === false)的意图标记:无载体切模不得据此悄悄重新开启。
+ // 只跟随显式意图变化;目标不支持思考而下发 off 不算用户意图,不置位。
+ let thinkingExplicitlyOff = false;
let currentAutoReviewIntent: AutoReviewUserIntent = '';
let autoReviewIntentInitialized = false;
const autoReviewActionContext = createAutoReviewActionContext();