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(desktop): 用户显式配置的 ENABLE_TOOL_SEARCH 不再被 Cindy 默认值覆盖

Saurabh Pathak40a046ab6091
diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts
index ac1c2d7b92..935892e92f 100644
--- a/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts
@@ -1,6 +1,10 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
import { describe, expect, it, vi } from 'vitest';
import { claudeBehaviorFlagsForSpawn, claudeToolSearchMode } from '../claude-behavior-flags.js';
+import { readUserToolSearchOverride } from '../claude-user-tool-search.js';
import { shouldCloseSessionForCredentialSwitch } from '../codex-credential-switch.js';
describe('claudeBehaviorFlagsForSpawn', () => {
@@ -107,4 +111,31 @@ describe('claudeBehaviorFlagsForSpawn', () => {
nextModel: 'openai/gpt-5.4',
})).toBe(false);
});
+
+ // issue #7524:自定义供应商默认 'false'(#2929 防线),但用户在 settings.json / 宿主环境
+ // 里显式写下的 ENABLE_TOOL_SEARCH 不能被静默覆盖;未显式配置时默认值不变。
+ it('lets an explicit user ENABLE_TOOL_SEARCH override the fail-closed default', () => {
+ const base = { credentialMode: 'provider-oauth', providerId: 'openrouter-custom', oauthConnected: () => false } as const;
+ expect(claudeBehaviorFlagsForSpawn({ ...base, userToolSearch: () => 'true' }).ENABLE_TOOL_SEARCH).toBe('true');
+ expect(claudeBehaviorFlagsForSpawn({ ...base, userToolSearch: () => undefined }).ENABLE_TOOL_SEARCH).toBe('false');
+ expect(claudeBehaviorFlagsForSpawn(base).ENABLE_TOOL_SEARCH).toBe('false');
+ });
+
+ it('reads the user override from host env first, then ~/.claude/settings.json env; ignores junk', () => {
+ const home = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-toolsearch-'));
+ try {
+ expect(readUserToolSearchOverride({}, home)).toBeUndefined();
+ fs.mkdirSync(path.join(home, '.claude'));
+ const write = (body: string) => fs.writeFileSync(path.join(home, '.claude', 'settings.json'), body);
+ write(JSON.stringify({ env: { ENABLE_TOOL_SEARCH: ' TRUE ' } }));
+ expect(readUserToolSearchOverride({}, home)).toBe('true');
+ expect(readUserToolSearchOverride({ ENABLE_TOOL_SEARCH: 'auto:10' }, home)).toBe('auto:10');
+ write(JSON.stringify({ env: { ENABLE_TOOL_SEARCH: 'banana' } }));
+ expect(readUserToolSearchOverride({}, home)).toBeUndefined();
+ write('{ not json');
+ expect(readUserToolSearchOverride({}, home)).toBeUndefined();
+ } finally {
+ fs.rmSync(home, { recursive: true, force: true });
+ }
+ });
});
diff --git a/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts b/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts
index 947abf013b..ac43b19892 100644
--- a/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts
@@ -155,6 +155,8 @@ it('never treats a retired independent Claude account as a connected subscriptio
{ id: 'claude-work', auth: { method: 'oauth', native: 'claude' } },
] }) }));
vi.doMock('../claude-native-auth.js', () => ({ hasClaudeNativeLogin: readBuiltin }));
+ // 不读开发机真实的 ~/.claude/settings.json(用户显式 ENABLE_TOOL_SEARCH 会改写断言)。
+ vi.doMock('../claude-user-tool-search.js', () => ({ readUserToolSearchOverride: () => undefined }));
try {
const { buildDesktopClaudeRuntimeConfig } = await import('../runtime-configs.js');
const flags = buildDesktopClaudeRuntimeConfig(() => 'http://localhost').behaviorFlags;
@@ -169,6 +171,7 @@ it('never treats a retired independent Claude account as a connected subscriptio
} finally {
vi.doUnmock('../active-catalog.js');
vi.doUnmock('../claude-native-auth.js');
+ vi.doUnmock('../claude-user-tool-search.js');
vi.resetModules();
}
});
diff --git a/apps/desktop/src/main/maker-host/claude-behavior-flags.ts b/apps/desktop/src/main/maker-host/claude-behavior-flags.ts
index 0bce1de137..3ff284b91f 100644
--- a/apps/desktop/src/main/maker-host/claude-behavior-flags.ts
+++ b/apps/desktop/src/main/maker-host/claude-behavior-flags.ts
@@ -49,6 +49,12 @@ export interface ClaudeSpawnFlagsContext {
nativeAuth?: string;
/** 是否连了 Claude.ai 订阅。惰性回调:gateway-key 分支不调用、不产生钥匙串读。 */
oauthConnected: () => boolean;
+ /**
+ * 用户显式配置的 ENABLE_TOOL_SEARCH(宿主环境或 settings.json env,issue #7524)。
+ * 有值时压过按来源推导的默认值;未提供 / 返回 undefined 时保持 fail-closed 默认。
+ * 惰性回调,远端 spawn 不传(远端机器的用户配置不归本机读取)。
+ */
+ userToolSearch?: () => string | undefined;
}
export function claudeBehaviorFlagsForSpawn(ctx: ClaudeSpawnFlagsContext): Record<string, string> {
@@ -63,7 +69,10 @@ export function claudeBehaviorFlagsForSpawn(ctx: ClaudeSpawnFlagsContext): Recor
// '0'/'false'/'no'/'off' 视为禁用,'1' = 保留归因,与未设置同义。
return {
...STATIC_CLAUDE_BEHAVIOR_FLAGS,
- ENABLE_TOOL_SEARCH: claudeToolSearchMode(ctx.providerId, ctx.credentialMode, ctx.nativeAuth),
+ // 用户显式配置优先:否则 Cindy 的 'false' 默认会静默覆盖 settings.json 里的选择(#7524)。
+ // 默认值仍是 #2929 的 fail-closed 防线,只有用户明确写了才放开。
+ ENABLE_TOOL_SEARCH:
+ ctx.userToolSearch?.() ?? claudeToolSearchMode(ctx.providerId, ctx.credentialMode, ctx.nativeAuth),
CLAUDE_CODE_ATTRIBUTION_HEADER: keepAttribution ? '1' : '0',
};
}
diff --git a/apps/desktop/src/main/maker-host/claude-user-tool-search.ts b/apps/desktop/src/main/maker-host/claude-user-tool-search.ts
new file mode 100644
index 0000000000..93cff2bc56
--- /dev/null
+++ b/apps/desktop/src/main/maker-host/claude-user-tool-search.ts
@@ -0,0 +1,41 @@
+/**
+ * 读取用户**显式**配置的 ENABLE_TOOL_SEARCH(issue #7524)。
+ *
+ * Cindy 对未知兼容性的上游默认把 ENABLE_TOOL_SEARCH 注入为 'false'(见
+ * claude-behavior-flags.ts,#2929 的 fail-closed 防线)。但 flags 合并进子进程环境后优先级
+ * 高于 settings.json 的 `env` 块,用户主动写下的 `"ENABLE_TOOL_SEARCH": "true"` 会被静默
+ * 覆盖,且无处可改。这里只读这一个键,让用户的显式选择能压过 Cindy 的默认值。
+ *
+ * 优先级与终端里直接运行 claude 一致:宿主进程环境 > ~/.claude/settings.json 的 env。
+ * 只读 `env.ENABLE_TOOL_SEARCH` 一个键,不读取、不记录该文件的其它内容;读不到、解析失败
+ * 或值不合法一律视为未配置(回到 Cindy 默认)。
+ */
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+// Claude Code 接受 true / false / auto / auto:N(阈值百分比)。其它值按未配置处理,
+// 避免把任意字符串写进子进程环境。
+const TOOL_SEARCH_VALUE = /^(?:true|false|auto(?::\d{1,3})?)$/i;
+
+function normalize(value: unknown): string | undefined {
+ if (typeof value !== 'string') return undefined;
+ const trimmed = value.trim();
+ return TOOL_SEARCH_VALUE.test(trimmed) ? trimmed.toLowerCase() : undefined;
+}
+
+export function readUserToolSearchOverride(
+ env: NodeJS.ProcessEnv = process.env,
+ homeDir: string = os.homedir(),
+): string | undefined {
+ const fromEnv = normalize(env.ENABLE_TOOL_SEARCH);
+ if (fromEnv) return fromEnv;
+ try {
+ const raw = fs.readFileSync(path.join(homeDir, '.claude', 'settings.json'), 'utf8');
+ const parsed: unknown = JSON.parse(raw);
+ const settingsEnv = (parsed as { env?: Record<string, unknown> } | null)?.env;
+ return normalize(settingsEnv?.ENABLE_TOOL_SEARCH);
+ } catch {
+ return undefined;
+ }
+}
diff --git a/apps/desktop/src/main/maker-host/runtime-configs.ts b/apps/desktop/src/main/maker-host/runtime-configs.ts
index 00461aa2a0..b1b656d47c 100644
--- a/apps/desktop/src/main/maker-host/runtime-configs.ts
+++ b/apps/desktop/src/main/maker-host/runtime-configs.ts
@@ -23,6 +23,7 @@ import { readModelDisableOverrides } from './model-disable-store.js';
import { claudeBehaviorFlagsForSpawn } from './claude-behavior-flags.js';
import { isAnthropicWireModel } from './claude-gateway-config.js';
import { hasClaudeNativeLogin } from './claude-native-auth.js';
+import { readUserToolSearchOverride } from './claude-user-tool-search.js';
import claudeSystemPrompt from './claude-system-prompt.md?raw';
import codexSystemPrompt from './codex-system-prompt.md?raw';
import hostSystemPrompt from './host-system-prompt.md?raw';
@@ -180,6 +181,8 @@ export function buildDesktopClaudeRuntimeConfig(endpointFn: () => string): Agent
// 独立 Claude 账号已停用,只有本机 Claude Code 登录算「连了订阅」。
oauthConnected: () => getActiveCatalog().providers.find(p => p.id === ctx.sessionProviderId)?.auth.native === 'claude'
? false : hasClaudeNativeLogin(),
+ // 用户显式配置的 ENABLE_TOOL_SEARCH 压过来源默认值(#7524);只对本机 spawn 读。
+ userToolSearch: ctx.spawnMode === 'remote' ? undefined : () => readUserToolSearchOverride(),
}),
// 工具链限核 env(agent 资源占用治理):只对本机 spawn 注入 —— 值按本机
// 核数算,远端机器的资源不归本设置管。设置关闭时为空对象,零影响。