Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): distinguish inapplicable companion connections from failures
zcinta05143fa41d505b69
diff --git a/apps/desktop/src/main/bot-import/__tests__/connectionProvider.test.ts b/apps/desktop/src/main/bot-import/__tests__/connectionProvider.test.tsindex 67119eca50..6bea4a9df0 100644--- a/apps/desktop/src/main/bot-import/__tests__/connectionProvider.test.ts+++ b/apps/desktop/src/main/bot-import/__tests__/connectionProvider.test.ts@@ -11,7 +11,8 @@ vi.mock('../host.js', () => ({ continueCompanionImport: vi.fn(), getCompanionImpvi.mock('../runtime.js', () => ({ readCompanionSessionDiscovery: vi.fn(), readCompanionSessionEnvironment: vi.fn(), readCompanionSessionScope: vi.fn() }));import { readCompanionSessionDiscovery, readCompanionSessionEnvironment, readCompanionSessionScope } from '../runtime.js';import { projectEnvironmentDiscovery } from '../environmentJson.js';-import { createCompanionConnectionsProvider } from '../connectionProvider.js';+import { createCompanionConnectionsProvider, readCompanionConnectionsAvailability } from '../connectionProvider.js';+import { readAgentCapabilityCatalog } from '../../maker-host/agentCapabilityCatalog.js';import { redactEnvironmentData } from '../process.js';import { withImportedConnection } from '../connections.js';import * as connectionModule from '../connections.js';@@ -26,6 +27,40 @@ beforeEach(() => {});afterEach(async () => { vi.unstubAllEnvs(); if (root) await fs.rm(root, { recursive: true, force: true }); });+// #7629: the old provider advertised registered for an ordinary task, then+// reported its legitimate empty list as a connection outage. Unit tier:+// real provider + catalog entry points, only the caller environment is a fixture.+it.each([false, true])('reports caller environment applicability without executing imported tools: %s', async available => {+ vi.mocked(readCompanionSessionEnvironment).mockReset().mockRejectedValue(new Error('must not load full environment'));+ vi.mocked(readCompanionSessionDiscovery).mockResolvedValue(available ? {+ identity: 'fixture', botId: 'bot', userData: '/fixture', assertOwner() {},+ environment: { env: {}, mcp: [], identity: 'fixture', pendingImport: false },+ } : undefined);+ const provider = createCompanionConnectionsProvider();+ const runtime = { agentKind: 'codex' as const, workingDir: '/fixture', sessionId: 'fixture-session' };+ const factory = vi.spyOn(provider, 'toClaudeSdkConfig');+ const read = vi.fn(async () => ({ state: 'connected' as const, tools: [{ name: 'run_command' }] }));+ const availability = () => readCompanionConnectionsAvailability(runtime);+ const index = await readAgentCapabilityCatalog([provider], runtime, {}, availability, read);+ expect(index).toMatchObject({ capabilities: expect.arrayContaining([expect.objectContaining({+ server: 'companion_connections', title: '伙伴环境连接', source: 'custom',+ status: available ? 'registered' : 'unavailable',+ })]) });+ const result = await readAgentCapabilityCatalog([provider], runtime, { server: provider.name }, availability, read);+ if (available) {+ expect(result).toMatchObject({ ok: true, tools: [{ name: 'run_command' }] });+ expect(await readAgentCapabilityCatalog([provider], runtime, { server: provider.name }, availability,+ async () => ({ state: 'failed', tools: [] })))+ .toMatchObject({ ok: false, errorCode: 'HARNESS_MCP_NOT_READY', engineState: 'failed' });+ } else {+ expect(result).toMatchObject({ ok: false, capability: { status: 'unavailable',+ reason: 'not-applicable-without-companion-environment' } });+ expect(read).not.toHaveBeenCalled();+ }+ expect(factory).not.toHaveBeenCalled();+ expect(readCompanionSessionEnvironment).not.toHaveBeenCalled();+});+it('lists and refreshes pending setup tools without loading the retry archive', async () => {vi.mocked(readCompanionSessionEnvironment).mockReset().mockRejectedValue(new Error('must not load full environment'));const assertOwner = vi.fn();diff --git a/apps/desktop/src/main/bot-import/connectionProvider.ts b/apps/desktop/src/main/bot-import/connectionProvider.tsindex f1e0237b63..593076b8bf 100644--- a/apps/desktop/src/main/bot-import/connectionProvider.ts+++ b/apps/desktop/src/main/bot-import/connectionProvider.ts@@ -3,7 +3,7 @@ import { importedProcessEnvironment, runImportedProcess, redactEnvironmentValuesimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';import { CallToolRequestSchema, ListToolsRequestSchema, type Tool } from '@modelcontextprotocol/sdk/types.js';import type { McpProvider } from '@cindy/maker-core';-import { resolveLiziMcpSessionContext } from '@cindy/mcps';+import { resolveLiziMcpSessionContext, type LiziMcpSessionContext } from '@cindy/mcps';import { readCompanionSessionDiscovery, readCompanionSessionEnvironment, readCompanionSessionScope } from './runtime.js';import { IMPORTED_TOOL_LIMIT, listImportedTools, withImportedConnection } from './connections.js';import { fingerprint } from './files.js';@@ -13,10 +13,22 @@ import { withImportedSkillResources } from './skillResources.js';export const COMPANION_CONNECTIONS_MCP_NAME = 'companion_connections';+/** Discovery checks the same caller scope as tools/list without opening connections. */+export async function readCompanionConnectionsAvailability(context: LiziMcpSessionContext): Promise<string | null> {+ const session = resolveLiziMcpSessionContext(context);+ const scope = session.sessionId ? await readCompanionSessionDiscovery(session.sessionId) : undefined;+ return scope ? null : 'not-applicable-without-companion-environment';+}+/** The shared bridge recovers the caller for every operation, including tools/list. */export function createCompanionConnectionsProvider(): McpProvider {return {name: COMPANION_CONNECTIONS_MCP_NAME,+ capability: {+ title: '伙伴环境连接',+ description: '仅适用于当前任务关联有效伙伴且该伙伴已保存环境的情况,用于访问该环境的命令和连接;不提供创建、邀请伙伴或群分工的通用入口。当前任务不适用时无需修复连接或新建任务。',+ source: 'custom',+ },toClaudeSdkConfig(context) {const server = new McpServer({ name: COMPANION_CONNECTIONS_MCP_NAME, version: '1.0.0' }, { capabilities: { tools: {} } });const resolve = async <T>(read: (sessionId: string) => Promise<T>) => {diff --git a/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.ts b/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.tsindex f7270e571d..b8aa619f4f 100644--- a/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/agentCapabilityCatalog.test.ts@@ -78,6 +78,26 @@ describe('shared runtime capability discovery', () => {expect(factory).not.toHaveBeenCalled();});+ // #7629: a session-scoped bridge legitimately has no tools outside its+ // teammate environment. Unit tier: exercise index and query through the+ // production catalog, not a second catalog implementation.+ it('awaits session applicability for both the index and a direct query', async () => {+ const provider = { name: 'session_bridge', toClaudeSdkConfig: vi.fn() };+ const unavailable = async () => 'not-applicable-without-companion-environment';+ const read = vi.fn(async () => ({ state: 'no-tools' as const, tools: [] }));+ const index = await readAgentCapabilityCatalog([provider], context, {}, unavailable, read);+ expect(index).toMatchObject({ capabilities: [{ server: 'session_bridge',+ status: 'unavailable', reason: 'not-applicable-without-companion-environment' }] });+ expect(await readAgentCapabilityCatalog([provider], context, { server: 'session_bridge' }, unavailable, read))+ .toMatchObject({ ok: false, capability: { reason: 'not-applicable-without-companion-environment' } });+ expect(read).not.toHaveBeenCalled();+ expect(provider.toClaudeSdkConfig).not.toHaveBeenCalled();+ const failed = await readAgentCapabilityCatalog([provider], context, {},+ async () => { throw new Error('private-environment-secret'); });+ expect(failed).toMatchObject({ capabilities: [{ status: 'unavailable', reason: 'provider-status-unavailable' }] });+ expect(JSON.stringify(failed)).not.toContain('private-environment-secret');+ });+it('reads real schemas and builtin progressive metadata without executing business tools', async () => {const execute = vi.fn();const factory = () => {@@ -112,6 +132,13 @@ describe('shared runtime capability discovery', () => {describe('servers the engine connects itself', () => {const custom = [{ name: 'custom_omc', toClaudeSdkConfig: vi.fn() }];+ it('does not prescribe connection repair or a new task from an ambiguous empty catalog', async () => {+ const result = await readAgentCapabilityCatalog(custom, context, { server: 'custom_omc' }, undefined,+ async () => ({ state: 'no-tools', tools: [] }));+ expect(result).toMatchObject({ ok: false, errorCode: 'HARNESS_MCP_NOT_READY', engineState: 'no-tools' });+ expect((result as { message: string }).message).not.toMatch(/修正后新建任务|检查该 MCP 的地址/);+ });+// Live Apps discovery produced ~60K tokens. Page/filter the actual engine// result so discovery stays bounded without hiding the remaining tools.it('pages and searches large engine catalogs without dropping access to the tail', async () => {diff --git a/apps/desktop/src/main/maker-host/agentCapabilityCatalog.ts b/apps/desktop/src/main/maker-host/agentCapabilityCatalog.tsindex facd628964..2669e5e754 100644--- a/apps/desktop/src/main/maker-host/agentCapabilityCatalog.ts+++ b/apps/desktop/src/main/maker-host/agentCapabilityCatalog.ts@@ -21,7 +21,7 @@ const TOOL_DESCRIPTION_MAX_CHARS = 300;const HARNESS_STATE_MESSAGES: Record<Exclude<AgentMcpServerToolsState, 'connected'>, string> = {'not-mounted': '当前任务的引擎中没有挂载此服务,通常是任务开始后才添加或修改了它;新建任务后再试。',- 'no-tools': '引擎已配置此服务,但在当前任务中没有报告任何工具:可能启动时连接失败(地址错误、服务未运行或鉴权失败)、仍在启动,或服务本身没有工具。请在设置中检查该 MCP 的地址与连接状态,修正后新建任务再试。',+ 'no-tools': '当前任务未报告此服务的工具,可能是服务不适用于当前任务、尚未连接完成、连接失败或服务本身没有工具。仅凭空工具列表无法判断连接故障;请先核对服务用途和适用条件。',failed: '引擎连接此服务失败。请在设置中检查该 MCP 的地址与连接状态,修正后新建任务再试。','needs-auth': '此服务需要先完成授权,引擎才能取得它的工具。',pending: '引擎仍在连接此服务,稍后再查询。',@@ -33,16 +33,16 @@ export async function readAgentCapabilityCatalog(providers: readonly McpProvider[],context: McpProviderContext & { remoteHostId?: string | null },query: AgentCapabilityQuery,- availability: (provider: McpProvider) => string | null = () => null,+ availability: (provider: McpProvider) => string | null | Promise<string | null> = () => null,readHarnessTools?: HarnessMcpToolsReader,) {const harness = getHarnessMcpCatalog(context);- const declarations = [...providers.filter((provider) => !harness.some((entry) => entry.name === provider.name)).map((provider) => {+ 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' : availability(provider);+ ? '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 {@@ -54,7 +54,7 @@ export async function readAgentCapabilityCatalog(...(reason ? { reason } : {}),...(provider.capability?.discovery ? { discovery: provider.capability.discovery } : {}),};- }), ...harness+ })), ...harness.map((entry) => ({server: entry.name, title: entry.title, description: entry.description, source: entry.source,status: entry.available ? 'engine-managed' : 'unavailable',diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.tsindex 8685d86e4f..dca52867be 100644--- a/apps/desktop/src/main/maker-host/index.ts+++ b/apps/desktop/src/main/maker-host/index.ts@@ -5,7 +5,7 @@ import { readAgentCapabilityCatalog, RUNTIME_MCP_NAMES_KEY, type AgentCapabilityimport { listCindyManagedSkills, prepareCindyCodexSkills } from './managed-skills.js';import { scanLocalCustomizations } from '../skillhub/customizationScanHost';import { createCompanionImportProvider } from '../bot-import/importProvider.js';-import { createCompanionConnectionsProvider } from '../bot-import/connectionProvider.js';+import { COMPANION_CONNECTIONS_MCP_NAME, createCompanionConnectionsProvider, readCompanionConnectionsAvailability } from '../bot-import/connectionProvider.js';import { resolveCompanionRuntimeEnvironment } from '../bot-import/runtime.js';import { registerCodexTextOnlyPolicy } from './codex-text-only-policy.js';import { ensureCodexCliLauncher } from '../agent-binaries/codex-cli-launcher.js';@@ -1068,8 +1068,9 @@ export function getMaker(): Maker {const entry = catalog.find((item) => item.name === provider.name);const remoteBridgeMissing = context.remoteHostId && agentKind !== 'pi'&& entry?.source === 'builtin' && !REMOTE_ALLOWED_SERVER_NAMES.has(provider.name);- return entry?.available === false || remoteBridgeMissing- ? 'transport-unavailable-for-current-runtime' : null;+ if (entry?.available === false || remoteBridgeMissing) return 'transport-unavailable-for-current-runtime';+ return provider.name === COMPANION_CONNECTIONS_MCP_NAME+ ? readCompanionConnectionsAvailability(context) : null;},// The caller's own engine is the only evidence of what this task can call.(server) => session.readMcpServerTools(server));