Skip to content

Add theme dev reconciliation strategy flag#7634

Draft
gonzaloriestra wants to merge 1 commit into
cli-interactivity/theme-profile-tokenfrom
cli-interactivity/theme-dev-reconciliation
Draft

Add theme dev reconciliation strategy flag#7634
gonzaloriestra wants to merge 1 commit into
cli-interactivity/theme-profile-tokenfrom
cli-interactivity/theme-dev-reconciliation

Conversation

@gonzaloriestra
Copy link
Copy Markdown
Contributor

@gonzaloriestra gonzaloriestra commented May 25, 2026

WHY are these changes introduced?

The interactivity audit found that theme dev with --theme-editor-sync could still prompt when JSON files needed reconciliation.

WHAT is this pull request doing?

  • Adds --reconciliation-strategy with keep-local, keep-remote, and abort options.
  • Threads the strategy through theme editor sync reconciliation and refreshes generated command docs.

How to test your changes?

  • pnpm vitest run packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.test.ts packages/theme/src/cli/utilities/theme-environment/theme-environment.test.ts
  • pnpm refresh-manifests

Checklist

  • I've considered possible cross-platform impacts (Mac, Linux, Windows)
  • I've considered possible documentation changes
  • I've considered analytics changes to measure impact
  • The change is user-facing, so I've added a changelog entry with pnpm changeset add

Copy link
Copy Markdown
Contributor Author

gonzaloriestra commented May 25, 2026

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

This stack of pull requests is managed by Graphite. Learn more about stacking.

@gonzaloriestra gonzaloriestra force-pushed the cli-interactivity/theme-dev-reconciliation branch from 3e88970 to bc8df22 Compare May 25, 2026 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-changelog This PR doesn't include a changeset entry. Is an internal only change not relevant to end users.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant