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): skip unrelated capability availability reads

zcinta051433b34052a90e
diff --git a/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.ts b/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.ts
index b8aa619f4f..17dd16f049 100644
--- a/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.ts
@@ -98,6 +98,29 @@ describe('shared runtime capability discovery', () => {
expect(JSON.stringify(failed)).not.toContain('private-environment-secret');
});
+ // #7636 review: an unrelated companion read can queue behind environment
+ // writes. Unit tier: only the full index may request every provider's status.
+ it.each(['requested', 'codex_apps', 'unknown'])('does not read unrelated availability for a direct query: %s', async (server) => {
+ let release!: (reason: null) => void;
+ const saving = new Promise<null>((resolve) => { release = resolve; });
+ const availability = vi.fn((provider: { name: string }) => provider.name === 'companion_connections' ? saving : null);
+ const read = vi.fn(async () => ({ state: 'connected' as const, tools: [{ name: 'fixture_tool' }] }));
+ const pending = readAgentCapabilityCatalog([{ name: 'requested' }, { name: 'companion_connections' }],
+ { ...context, agentKind: 'codex' }, { server }, availability, read);
+ const checked = availability.mock.calls.map(([provider]) => provider.name);
+ release(null);
+ const result = await pending;
+ expect(checked).toEqual(server === 'requested' ? ['requested'] : []);
+ if (server === 'unknown') {
+ expect(result).toMatchObject({ ok: false, errorCode: 'UNKNOWN_CAPABILITY',
+ available: ['requested', 'companion_connections', 'codex_apps'] });
+ expect(read).not.toHaveBeenCalled();
+ } else {
+ expect(result).toMatchObject({ ok: true, tools: [{ name: 'fixture_tool' }] });
+ expect(read).toHaveBeenCalledWith(server);
+ }
+ });
+
it('reads real schemas and builtin progressive metadata without executing business tools', async () => {
const execute = vi.fn();
const factory = () => {
diff --git a/apps/desktop/src/main/maker-host/agentCapabilityCatalog.ts b/apps/desktop/src/main/maker-host/agentCapabilityCatalog.ts
index 2669e5e754..267c58aef0 100644
--- a/apps/desktop/src/main/maker-host/agentCapabilityCatalog.ts
+++ b/apps/desktop/src/main/maker-host/agentCapabilityCatalog.ts
@@ -40,10 +40,14 @@ export async function readAgentCapabilityCatalog(
const declarations = [...await Promise.all(providers.filter((provider) => !harness.some((entry) => entry.name === provider.name)).map(async (provider) => {
let reason: string | null = null;
try {
- const mounted = context.vendorOptions?.[RUNTIME_MCP_NAMES_KEY];
- reason = Array.isArray(mounted) && !mounted.includes(provider.name)
- ? 'not-mounted-in-current-runtime' : await availability(provider);
- if (!reason && provider.isEnabled?.(context) === false) reason = 'provider-not-enabled-for-session';
+ // Only the index needs every status. Direct queries must not wait for
+ // unrelated environment reads; unknown queries still return all names.
+ if (!query.server || query.server === provider.name) {
+ const mounted = context.vendorOptions?.[RUNTIME_MCP_NAMES_KEY];
+ reason = Array.isArray(mounted) && !mounted.includes(provider.name)
+ ? 'not-mounted-in-current-runtime' : await availability(provider);
+ if (!reason && provider.isEnabled?.(context) === false) reason = 'provider-not-enabled-for-session';
+ }
} catch { reason = 'provider-status-unavailable'; }
return {
server: provider.name,