feat: add option to hide conflict warnings for multiple Claude Code installations#400
Open
erbanku wants to merge 14 commits intoop7418:mainfrom
Open
feat: add option to hide conflict warnings for multiple Claude Code installations#400erbanku wants to merge 14 commits intoop7418:mainfrom
erbanku wants to merge 14 commits intoop7418:mainfrom
Conversation
|
@erbanku is attempting to deploy a commit to the op7418's projects Team on Vercel. A member of the Team first needs to authorize it. |
…7418#398) Agent-Logs-Url: https://github.com/erbanku/code-pilot/sessions/531462e5-e30b-4196-bcd2-514589a021e0 Co-authored-by: erbanku <79493862+erbanku@users.noreply.github.com>
…rtial GeneralSection state Adds the foundation for issue op7418#398 (disable conflict checking): - Added 'disable_conflict_checking' to ALLOWED_KEYS in settings API - Added i18n strings in en.ts and zh.ts for the toggle - Added state variables in GeneralSection.tsx and fetch logic Still needed: toggle save handler, UI rendering, and updating ConnectionStatus/ClaudeCodeCard/InstallWizard to respect the setting. Agent-Logs-Url: https://github.com/erbanku/code-pilot/sessions/531462e5-e30b-4196-bcd2-514589a021e0 Co-authored-by: erbanku <79493862+erbanku@users.noreply.github.com>
…771-ce9e68558382
erbanku
changed the title
Temporarily deactivate non-test providers during assertions in the stale-default-provider test to prevent interference from existing active providers in the CI database. This ensures consistent test outcomes.
- Replace npm/npx with bun/bunx in package.json scripts - Add packageManager: bun@1.3.12 and engines.bun >= 1.3.0 - Replace actions/setup-node with oven-sh/setup-bun@v2 (pinned to 1.3.12) in CI - Replace npm ci / npm run / npx with bun install / bun run / bunx in CI - Generate bun.lock from package-lock.json via bun pm migrate - Delete package-lock.json Agent-Logs-Url: https://github.com/erbanku/code-pilot/sessions/55f7804b-023d-4749-8a30-4563445b1bb8 Co-authored-by: erbanku <79493862+erbanku@users.noreply.github.com>
- electron ^40.2.1 → ^40.8.0: fixes Context Isolation bypass (CVE), Use-after-free in offscreen child window, WebContents fullscreen/pointer-lock/keyboard-lock callbacks, PowerMonitor Use-after-free, and commandLineSwitches renderer injection CVEs - next 16.2.1 → 16.2.3: fixes DoS via Server Components (CVE) - next 15.5.14 → 15.5.15 (apps/site): same DoS CVE fix - eslint-config-next 16.2.1 → 16.2.3: keep in sync with next - engines.bun tightened to >=1.3.12 for consistency with packageManager - bun.lock deleted: regenerated on next bun install with patched versions - CI: bun install without --frozen-lockfile during lockfile transition Agent-Logs-Url: https://github.com/erbanku/code-pilot/sessions/55f7804b-023d-4749-8a30-4563445b1bb8 Co-authored-by: erbanku <79493862+erbanku@users.noreply.github.com>
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.
Adds a "Hide Conflict Warnings" toggle in Settings → General that lets users suppress the multiple-installation conflict warning without uninstalling any version.
Changes
src/app/api/settings/app/route.ts— allowdisable_conflict_checkingkey in settings APIsrc/components/settings/GeneralSection.tsx— add toggle UI and save handlersrc/components/layout/ConnectionStatus.tsx— respect the setting when computinghasConflictssrc/components/layout/InstallWizard.tsx— same guard in the install wizard prereq checksrc/components/setup/ClaudeCodeCard.tsx— hide conflict block when setting is enabledsrc/i18n/en.ts/src/i18n/zh.ts— i18n strings for the new toggleMotivation
Users who intentionally run Claude Code in multiple clients (e.g. Cherry Studio + CodePilot) should not be forced to uninstall one. This gives them an explicit opt-out for the warning.
Fixes #398