Add theme dev reconciliation strategy flag

[gonzaloriestra]

WHY are these changes introduced?

Fixes https://github.com/shop/issues-develop/issues/22873

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?

Make a change in a theme file (like templates/404.json) locally and remotely and run:

• shopify theme dev --theme-editor-sync
• shopify theme dev --theme-editor-sync --reconciliation-strategy keep-local
• shopify theme dev --theme-editor-sync --reconciliation-strategy keep-remote
• shopify theme dev --theme-editor-sync --reconciliation-strategy abort

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

[gonzaloriestra]

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

• Error before app config link prompts in non-TTY #7687
• Add theme dev reconciliation strategy flag #7634 👈 (View in Graphite)
• Add non-interactive app dev prompt bypasses #7632 : 1 other dependent PR (#7633 )
• Allow app config validate to target config by client ID #7631
• Add flags to avoid prompts in app config link #7630
• main

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

[github-actions]

Differences in type declarations

We detected differences in the type declarations generated by Typescript for this branch compared to the baseline ('main' branch). Please, review them to ensure they are backward-compatible. Here are some important things to keep in mind:

• Some seemingly private modules might be re-exported through public modules.
• If the branch is behind main you might see odd diffs, rebase main into this branch.

New type declarations

We found no new type declarations in this PR

Existing type declarations

packages/cli-kit/dist/private/node/constants.d.ts

@@ -7,6 +7,7 @@ export declare const environmentVariables: {
     enableCliRedirect: string;
     env: string;
     firstPartyDev: string;
+    hostedApps: string;
     noAnalytics: string;
     optOutInstrumentation: string;
     appAutomationToken: string;

packages/cli-kit/dist/public/common/version.d.ts

@@ -1 +1 @@
-export declare const CLI_KIT_VERSION = "4.1.0";
\ No newline at end of file
+export declare const CLI_KIT_VERSION = "4.0.0";
\ No newline at end of file

packages/cli-kit/dist/public/node/context/local.d.ts

@@ -42,6 +42,13 @@ export declare function isShopify(env?: NodeJS.ProcessEnv): Promise<boolean>;
  * @returns True if the SHOPIFY_UNIT_TEST environment variable is truthy.
  */
 export declare function isUnitTest(env?: NodeJS.ProcessEnv): boolean;
+/**
+ * Returns true if the CLI is running in hosted apps mode.
+ *
+ * @param env - The environment variables from the environment of the current process.
+ * @returns True if the HOSTED_APPS environment variable is truthy.
+ */
+export declare function isHostedAppsMode(env?: NodeJS.ProcessEnv): boolean;
 /**
  * Returns true if reporting analytics is enabled.
  *

[lucyxiang]

---

Review assisted by pair-review

[lucyxiang]

theme dev --reconciliation-strategy keep-local on its own does nothing and emits no warning, shall we add dependency on theme-editor-sync?

Suggestion: Consider declaring the dependency so oclif surfaces an error instead of silently ignoring the flag:

Suggested change

	'reconciliation-strategy': Flags.string({
	'reconciliation-strategy': Flags.string({
	description:
	'How to resolve JSON conflicts when --theme-editor-sync is enabled. Use keep-local to keep local files, keep-remote to keep remote files, or abort to fail instead of prompting.',
	options: ['keep-local', 'keep-remote', 'abort'],
	env: 'SHOPIFY_FLAG_RECONCILIATION_STRATEGY',
	dependsOn: ['theme-editor-sync'],
	}),

[lucyxiang]

Can we check that local files do get deleted

[lucyxiang]

Similarly check than remote files are deleted

[lucyxiang]

How about collecting all files and throwing one AbortError that lists every file needing reconciliation, rather than throwing inside the per-category callback on the first hit.