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 读取兼容 JSONC/BOM,并补 runtime-configs 接线测试

Saurabh Pathaka8a4bac97ea4
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 935892e92f..83bd4e052b 100644
--- a/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts
@@ -132,6 +132,9 @@ describe('claudeBehaviorFlagsForSpawn', () => {
expect(readUserToolSearchOverride({ ENABLE_TOOL_SEARCH: 'auto:10' }, home)).toBe('auto:10');
write(JSON.stringify({ env: { ENABLE_TOOL_SEARCH: 'banana' } }));
expect(readUserToolSearchOverride({}, home)).toBeUndefined();
+ // CLI 照常应用带 BOM / 注释 / 尾逗号的设置,这里也必须读到(否则显式 override 仍被覆盖)。
+ write(`\uFEFF{\n // keep tool search on\n "env": { /* note */ "ENABLE_TOOL_SEARCH": "true", },\n}`);
+ expect(readUserToolSearchOverride({}, home)).toBe('true');
write('{ not json');
expect(readUserToolSearchOverride({}, home)).toBeUndefined();
} finally {
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 ac43b19892..04c956b03f 100644
--- a/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts
@@ -175,3 +175,27 @@ it('never treats a retired independent Claude account as a connected subscriptio
vi.resetModules();
}
});
+
+it('wires the user ENABLE_TOOL_SEARCH override into local spawns only (issue #7524)', async () => {
+ vi.resetModules();
+ const readOverride = vi.fn(() => 'true');
+ vi.doMock('../active-catalog.js', () => ({ getActiveCatalog: () => ({ providers: [] }) }));
+ vi.doMock('../claude-native-auth.js', () => ({ hasClaudeNativeLogin: () => false }));
+ vi.doMock('../claude-user-tool-search.js', () => ({ readUserToolSearchOverride: readOverride }));
+ try {
+ const { buildDesktopClaudeRuntimeConfig } = await import('../runtime-configs.js');
+ const flags = buildDesktopClaudeRuntimeConfig(() => 'http://localhost').behaviorFlags;
+ if (typeof flags !== 'function') throw new Error('expected spawn flags');
+ const custom = { credentialMode: 'provider-oauth', sessionProviderId: 'openrouter-custom' };
+ expect(flags({ ...custom, spawnMode: 'local' } as never)).toMatchObject({ ENABLE_TOOL_SEARCH: 'true' });
+ // 远端 spawn 不读本机配置:回到来源默认值,且读取函数不被调用。
+ readOverride.mockClear();
+ expect(flags({ ...custom, spawnMode: 'remote' } as never)).toMatchObject({ ENABLE_TOOL_SEARCH: 'false' });
+ expect(readOverride).not.toHaveBeenCalled();
+ } 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-user-tool-search.ts b/apps/desktop/src/main/maker-host/claude-user-tool-search.ts
index 93cff2bc56..6cb5d0df05 100644
--- a/apps/desktop/src/main/maker-host/claude-user-tool-search.ts
+++ b/apps/desktop/src/main/maker-host/claude-user-tool-search.ts
@@ -9,6 +9,10 @@
* 优先级与终端里直接运行 claude 一致:宿主进程环境 > ~/.claude/settings.json 的 env。
* 只读 `env.ENABLE_TOOL_SEARCH` 一个键,不读取、不记录该文件的其它内容;读不到、解析失败
* 或值不合法一律视为未配置(回到 Cindy 默认)。
+ *
+ * 解析口径与 Claude CLI 一致:接受 BOM、注释与尾逗号(JSONC)。maker-core 的
+ * workspace-settings-guard 里有同样的 stripJsonc,但它没有从包里导出;为避免为此改动共享包
+ * 的 exports,这里保留一份同逻辑的小函数,两处改动时需同步。
*/
import fs from 'node:fs';
import os from 'node:os';
@@ -18,6 +22,39 @@ import path from 'node:path';
// 避免把任意字符串写进子进程环境。
const TOOL_SEARCH_VALUE = /^(?:true|false|auto(?::\d{1,3})?)$/i;
+/** 去掉 JSONC 的注释与尾逗号(字符串里的内容原样保留)。 */
+function stripJsonc(text: string): string {
+ let out = '';
+ let inString = false;
+ for (let i = 0; i < text.length; i += 1) {
+ const ch = text[i]!;
+ if (inString) {
+ out += ch;
+ if (ch === '\\') {
+ out += text[i + 1] ?? '';
+ i += 1;
+ } else if (ch === '"') {
+ inString = false;
+ }
+ continue;
+ }
+ if (ch === '"') {
+ inString = true;
+ out += ch;
+ } else if (ch === '/' && text[i + 1] === '/') {
+ while (i < text.length && text[i] !== '\n') i += 1;
+ out += '\n';
+ } else if (ch === '/' && text[i + 1] === '*') {
+ const end = text.indexOf('*/', i + 2);
+ i = end === -1 ? text.length : end + 1;
+ out += ' ';
+ } else {
+ out += ch;
+ }
+ }
+ return out.replace(/,(\s*[}\]])/g, '$1');
+}
+
function normalize(value: unknown): string | undefined {
if (typeof value !== 'string') return undefined;
const trimmed = value.trim();
@@ -32,7 +69,8 @@ export function readUserToolSearchOverride(
if (fromEnv) return fromEnv;
try {
const raw = fs.readFileSync(path.join(homeDir, '.claude', 'settings.json'), 'utf8');
- const parsed: unknown = JSON.parse(raw);
+ const text = raw.startsWith('\uFEFF') ? raw.slice(1) : raw;
+ const parsed: unknown = JSON.parse(stripJsonc(text));
const settingsEnv = (parsed as { env?: Record<string, unknown> } | null)?.env;
return normalize(settingsEnv?.ENABLE_TOOL_SEARCH);
} catch {