diff --git a/apps/cli/tests/profiles/headless/tests/mcp-pagination.expected.e2e.ts b/apps/cli/tests/profiles/headless/tests/mcp-pagination.expected.e2e.ts index e9e08bb302..dd0730e6f5 100644 --- a/apps/cli/tests/profiles/headless/tests/mcp-pagination.expected.e2e.ts +++ b/apps/cli/tests/profiles/headless/tests/mcp-pagination.expected.e2e.ts @@ -6,24 +6,32 @@ import { LOADER_SMOKE_TEST_TIMEOUT_MS, runLoaderSmoke } from '@deepseek-ai/dsh-l const fixtureRoot = new URL('../../../../../../packages/mcp/mcp-client/tests/fixtures/', import.meta.url) const configPath = fileURLToPath(new URL('repeated-cursor.patch.yml', fixtureRoot)) +const headlessOverlayPath = fileURLToPath(new URL('./fixtures/headless-profile.patch.yml', import.meta.url)) const expectedPath = fileURLToPath(new URL('./expected/mcp-pagination/stderr-cause.txt', import.meta.url)) -it('reports a repeated MCP discovery cursor and exits before starting a turn', async () => { +it('warns about a repeated MCP discovery cursor and completes the headless task', async () => { const { stdout, stderr } = await runLoaderSmoke({ label: 'MCP discovery pagination cycle', tempDirPrefix: 'dsh-mcp-pagination-', binScript: fileURLToPath(new URL('../../../../src/bin.ts', import.meta.url)), libBinScript: fileURLToPath(new URL('../../../../lib/bin.js', import.meta.url)), configPath, - binArgs: ['--profile', 'headless', '--patch', configPath, 'unreachable task'], + binArgs: [ + '--profile', 'headless', + '--patch', headlessOverlayPath, + '--patch', configPath, + 'Complete the task without the failed MCP server.', + ], tsconfigPath: fileURLToPath(new URL('../../../../../../tsconfig.json', import.meta.url)), - expectedExitCode: 1, env: { DSH_MCP_PAGINATION_FIXTURE: fileURLToPath(new URL('repeated-cursor-server.ts', fixtureRoot)), + DSH_PERMISSION_MODE: 'danger-full-access', DSH_TELEMETRY_DISABLED: '1', }, }) - expect(stdout).toBe('') + expect(stdout).toBe('CLI tool round trip complete: CLI_TOOL_ROUND_TRIP\n') + expect(stderr).toContain('dsh: warning: 1 entry did not activate') + expect(stderr).toContain('mcp-pagination-cycle (@deepseek-ai/dsh-mcp-client)') expect(stderr).toContain('initial connection or tool synchronization failed') const cause = stderr.split('\n').find(line => line.startsWith('Error: mcp-client(pagination-cycle):')) await expect(`${cause}\n`).toMatchFileSnapshot(expectedPath) diff --git a/packages/mcp/mcp-client/README.i18n.yaml b/packages/mcp/mcp-client/README.i18n.yaml index 74afb59465..b9f167d303 100644 --- a/packages/mcp/mcp-client/README.i18n.yaml +++ b/packages/mcp/mcp-client/README.i18n.yaml @@ -2,5 +2,5 @@ # side as of the last confirmed-consistent state. Both languages carry equal authority; # after editing either side, bring the other along and re-record with: # pnpm run verify-translation-pairing --write packages/mcp/mcp-client/README.md -README.md: de646256888f1c271ad94a4c863338dfb02551e6 -README.zh.md: fe9aadfa00d68b5cea9d5c1f201731544b963b7e +README.md: 591b93c4bdb922151d246d1eebf46ad0b582cb01 +README.zh.md: 41938dc61b50eaa468cc1915f47bc371107c87e1 diff --git a/packages/mcp/mcp-client/README.md b/packages/mcp/mcp-client/README.md index de64625688..591b93c4bd 100644 --- a/packages/mcp/mcp-client/README.md +++ b/packages/mcp/mcp-client/README.md @@ -67,7 +67,7 @@ Add one entry per server; nothing else is required. After the harness starts, th The generated [configuration catalog](../../../docs/config-catalog.md#deepseek-aidsh-mcp-client) is the exhaustive source for every accepted field. -After startup, the server's tools appear as `mcp____` — try a prompt that uses one. If the initial connection fails, the harness still starts but no tools from that server appear, and an error is logged; set `failOnStartupError: true` to make a startup failure abort the harness instead. +After startup, the server's tools appear as `mcp____` — try a prompt that uses one. If the initial connection fails, the harness still starts but no tools from that server appear, and an error is logged. Setting `failOnStartupError: true` rejects plugin activation; [app-boot's startup policy](../../boot/app-boot/README.md) still permits an optional MCP entry to fail without aborting the harness. ### Tool naming and coexistence diff --git a/packages/mcp/mcp-client/README.zh.md b/packages/mcp/mcp-client/README.zh.md index fe9aadfa00..41938dc61b 100644 --- a/packages/mcp/mcp-client/README.zh.md +++ b/packages/mcp/mcp-client/README.zh.md @@ -67,7 +67,7 @@ kind: "package-reference" 生成的[配置目录](../../../docs/config-catalog.zh.md#deepseek-aidsh-mcp-client)是每个受支持字段的穷尽式真源。 -启动后,服务器的工具会以 `mcp____` 形式出现——试着用一条提示词调用其中一个。如果初始连接失败,harness 仍会启动,但该服务器的工具不会出现,并会记录一条错误;设置 `failOnStartupError: true` 可让启动失败改为中止 harness。 +启动后,服务器的工具会以 `mcp____` 形式出现——试着用一条提示词调用其中一个。如果初始连接失败,harness 仍会启动,但该服务器的工具不会出现,并会记录一条错误。设置 `failOnStartupError: true` 会拒绝插件激活;[app-boot 的启动策略](../../boot/app-boot/README.zh.md)仍允许可选 MCP 配置项失败,而不中止 harness。 ### 工具命名与共存 diff --git a/packages/mcp/mcp-client/tests/fixtures/repeated-cursor.patch.yml b/packages/mcp/mcp-client/tests/fixtures/repeated-cursor.patch.yml index 1a4d033b5b..aedd2d0e8e 100644 --- a/packages/mcp/mcp-client/tests/fixtures/repeated-cursor.patch.yml +++ b/packages/mcp/mcp-client/tests/fixtures/repeated-cursor.patch.yml @@ -1,9 +1,3 @@ -- id: headless-startup - disabled: true - -- id: headless-runner - disabled: true - - insert: - id: mcp-pagination-cycle name: '@deepseek-ai/dsh-mcp-client'