Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lockfile broken by hand-resolved merge conflict

Browse Source 
The web-editor conflict resolution renamed the cordis snapshot keys to
rc.7 but left the mcp-client importer pointing at the deleted
cordis@4.0.0-rc.6(...rc.4) key, so every CI lane failed at
'pnpm install --frozen-lockfile' with ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY.

Align the mcp-client cordis range with the repo-wide ^4.0.0-rc.7 sweep
from master and re-resolve the lockfile with pnpm.
This commit is contained in:
lintianle
2026-07-15 15:40:02 +08:00
parent 905b8ead9f
commit b9eeb2162c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mcp/mcp-client/package.json
View File

@@ -24,7 +24,7 @@
"peerDependencies": { "peerDependencies": {
"@deepseek-ai/dsh-tools": "^0.0.1", "@deepseek-ai/dsh-tools": "^0.0.1",
"@deepseek-ai/dsh-llm": "^0.0.1", "@deepseek-ai/dsh-llm": "^0.0.1",
"cordis": "^4.0.0-rc.6" "cordis": "^4.0.0-rc.7"
}, },
"dependencies": { "dependencies": {
"@modelcontextprotocol/sdk": "^1.12.0", "@modelcontextprotocol/sdk": "^1.12.0",
@@ -35,7 +35,7 @@
"@deepseek-ai/dsh-llm": "workspace:^", "@deepseek-ai/dsh-llm": "workspace:^",
"@modelcontextprotocol/server-everything": "^2026.7.4", "@modelcontextprotocol/server-everything": "^2026.7.4",
"@modelcontextprotocol/server-filesystem": "^2026.7.4", "@modelcontextprotocol/server-filesystem": "^2026.7.4",
"cordis": "^4.0.0-rc.6", "cordis": "^4.0.0-rc.7",
"zod": "^4.4.3" "zod": "^4.4.3"
} }
} }

4
pnpm-lock.yaml generated
View File

@@ -746,8 +746,8 @@ importers:
specifier: ^2026.7.4 specifier: ^2026.7.4
version: 2026.7.10(zod@4.4.3) version: 2026.7.10(zod@4.4.3)
cordis: cordis:
specifier: ^4.0.0-rc.6 specifier: ^4.0.0-rc.7
version: 4.0.0-rc.6(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.4) version: 4.0.0-rc.7(@cordisjs/plugin-include@1.0.4)(@cordisjs/plugin-loader@1.0.0-rc.5)
zod: zod:
specifier: ^4.4.3 specifier: ^4.4.3
version: 4.4.3 version: 4.4.3