Repository navigation
fix(config): merge custom toolPaths tool by tool over defaults (#1185) - #1204
Open
legend91019 wants to merge 2 commits into
Open
legend91019 wants to merge 2 commits into
legend91019 wants to merge 2 commits into
Conversation
No other confident findings in the specified diff. No PR code was run, built, or installed. |
Author
|
Resolved in commit 7a7cc4f. Added a dedicated real-CLI end-to-end test in src/tests/e2e/toolpaths-sparse-merge-1185.test.ts exercising the compiled CLI artifact (dist/index.js) against a local Git bare remote fixture configured with sparse oolPaths (zcode: { skills: '.zcode/skills', rules: '.zcode/rules' }). Representative real-CLI execution verifies that:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Extracts
DEFAULT_TOOL_PATHSinto an exported constant and updatesTeamaiConfigBaseSchema.toolPathsto merge user-providedtoolPathstool-by-tool over defaults, preventing partial tool definitions from discarding default configurations for all other built-in tools (such as Claude Code, Cursor, Codex, and CodeBuddy).Type of Change
Test Plan
npx tsc --noEmitpassesnpm run lintpasses (oxlint 0 errors, 0 warnings)npx vitest runpasses for affected test suites (types.test.ts,tool-roots.test.ts)src/__tests__/types.test.tsverifyingDEFAULT_TOOL_PATHSexport and default parse equivalencesrc/__tests__/types.test.tsverifying tool-by-tool merging preserves unmentioned built-in toolssrc/__tests__/types.test.tsverifying third-party custom agents can be declared alongside default toolssrc/__tests__/tool-roots.test.tsverifying sparse declarations override only the named tool while retaining default paths for other toolsnpm run build->node dist/index.js):src/__tests__/e2e/toolpaths-sparse-merge-1185.test.tsexercising compiled CLI (dist/index.js) against a local Git bare remote fixture with sparsetoolPathsdefinition (zcode: { skills: '.zcode/skills', rules: '.zcode/rules' }).init --provider git --agent claude,zcodeandpull):npm run test:e2e -- toolpaths-sparse-merge-1185.test.tspasses:Related Issues
Fixes #1185
Notes for Reviewers
src/types.ts,toolPathspreviously relied on.default({...})on the whole record. Supplying anytoolPathsinteamai.yamlbypassed.default(), wiping out all unmentioned tools.DEFAULT_TOOL_PATHSand used.default({}).transform((custom) => ({ ...DEFAULT_TOOL_PATHS, ...custom }))so that:mcpProject: .mcp.json).