Skip to content

feat: add ignoreConflicts param for deploy/retrieve W-20002028#321

Merged
soridalac merged 30 commits intomainfrom
sl/W-20002028
Jan 29, 2026
Merged

feat: add ignoreConflicts param for deploy/retrieve W-20002028#321
soridalac merged 30 commits intomainfrom
sl/W-20002028

Conversation

@soridalac
Copy link
Copy Markdown
Contributor

@soridalac soridalac commented Nov 4, 2025

What does this PR do?

Add support ignoreConflicts param for project deploy/retrieve

What issues does this PR fix or reference?

@W-20002028@

GH discussion: forcedotcom/mcp#24

soridalac and others added 10 commits November 3, 2025 15:27
* Add telemetry to list_devops_projects tool

* Address PR feedback: Use throw pattern and remove PII

- Convert fetchProjects to throw errors instead of returning them
- Remove duplicate telemetry tracking (eliminates instanceof check)
- Remove username field from telemetry events (PII concern)
- Update tests to match throw pattern behavior
- Simplifies error handling from 3 paths to 2 paths (-19 lines)

---------

Co-authored-by: Manan Dey <manan.dey@salesforce.com>
* feat: add e2e test for AFV

* fix: update e2e and reinstall deps

* fix: update AFV e2e

* chore: Add GH_TOKEN to e2e workflow (#316)

* chore: update main/merge

* chore: skip test for win

---------

Co-authored-by: Cristian Dominguez <6853656+cristiand391@users.noreply.github.com>
Co-authored-by: Willhoit <iowillhoit@users.noreply.github.com>
Auto-update dependency after provider package publish.

Related release: mcp-provider-dx-core@0.4.0
Auto-update dependency after provider package publish.

Related release: mcp-provider-devops@0.1.9
@soridalac soridalac requested a review from a team as a code owner November 6, 2025 22:55
@soridalac soridalac requested a review from a team as a code owner November 7, 2025 17:35
Comment thread packages/mcp-provider-dx-core/test/e2e/deploy_metadata.test.ts
@cristiand391
Copy link
Copy Markdown
Member

QA notes:

🔴 re-deploying with ignoreConflicts: true still fails with conflicts detected
copilot:
Screenshot 2025-11-18 at 10 42 31

mcp-inspector:

  1. deploy without ignoreConflicts, the code defaults to false internally:
Screenshot 2025-11-18 at 10 48 25
  1. re-deploy with ignoreConflicts: true, same error
Screenshot 2025-11-18 at 10 49 12

it does work If I restart the server and the first deploy sets ignoreConflicts: true, that might be why the E2E test works 🤔
Screenshot 2025-11-18 at 10 51 01

soridalac and others added 2 commits January 23, 2026 15:14
* chore: update nut

* chore: bump deps + fix deploy/retrieve

* test: better e2e test coverage

* chore: bump STL lib to latest

* chore: bump sdr lib to latest

* fix: update copyright header

* fix: update more copyright header

* fix: update copyright header

* chore: bump deps

* chore(ci): use stable sf

* Revert "chore(ci): use stable sf"

This reverts commit 86aa6ac.

---------

Co-authored-by: soridalac <sorida.lac@salesforce.com>
Co-authored-by: Sorida Lac <96142310+soridalac@users.noreply.github.com>
@soridalac soridalac requested review from a team as code owners January 28, 2026 23:04
@soridalac soridalac merged commit 63c764b into main Jan 29, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants