Draft
Conversation
Owner
Author
|
/resolve |
Contributor
|
🚀 cc-resolve started: View logs |
- Resolves all merge conflicts across 6 source files - Deletes legacy files removed by origin/main (pieceResolver.ts, projectConfigFile.ts, pieceLoader.test.ts, project-config-collision-pieceResolver.test.ts) - Removes deprecated piece-terminology exports (getGlobalPiecesDir, getBuiltinPiecesDir) to satisfy terminology guard - Adds isProjectConfigEnabled guard to loadProjectConfig so collision skips the project config file while still applying env overrides - Restores collision guard in agentLoader.validatePersonaPromptPath using literal path check (without symlink resolution) for project config dir - Adds collision guard to workflowPackageScope.buildCandidateDirsWithPackage - Updates collision test to import buildCandidateDirsWithPackage from workflowPackageScope.js (not resource-resolver.js per API boundary contract) and renames pieceDir to workflowDir to fix terminology violations Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Contributor
|
✅ cc-resolve completed. View logs |
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
1 participant
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
背景
cd ~ && taktのように HOME 直下で起動したとき、初回セットアップ後に~/.takt/config.yamlを global config として作成した直後、それを project config としても読んで strict validation に失敗するケースがある。典型的には次のようなエラーになる。
原因
現状の設定パス解決では、
~/.takt/config.yaml<cwd>/.takt/config.yamlとなっている。
このため
cwd === ~のとき、global config dir と project config dir がどちらも~/.taktを指し、同じconfig.yamlを両用途で扱ってしまう。その結果、global-only key を含む global config を project config schema が弾いて失敗する。
仕様提案
project config dirとglobal config dirが同一になる場合は、project config を無効化する。具体的には:
getProjectConfigDir(cwd) === getGlobalConfigDir()の場合~/.takt/config.yamlは global config としてのみ扱うこの方針にしたい理由
HOMEを特別扱いするのではなく、原因そのものである「パス衝突」を防げる期待挙動
cd ~ && taktでも初回セットアップが正常終了する~/.takt/config.yamlは global config としてのみ扱われる.takt設定は無効化される再現手順
言語とプロバイダーを選択したあと、global config 作成直後に project config validation へ入らず、そのまま続行できること。
Execution Report
Piece
takt-defaultcompleted successfully.Closes #541