feat(pull): add granular drift resolution

[dhruva-reddy]

Describe your changes

Adds granular both-diverged pull resolution so operators can mix git and dashboard choices without hand-merging files.

• Supports whole-run, per-resource, and selected-path resolution choices during pull.
• Keeps path-level merges aligned with the existing content-hash baseline behavior.
• Documents the new workflow in the agent guide, README, and improvements log.
• Adds unit coverage for mixed resource decisions and path-level merges.

Relevant Context (linear ticket, slack link, etc)

Problem: GitOps pull conflicts were only resolvable at whole-run and whole-resource granularity.

Tracked in PRISM-852 after the mudflap-prod iForm drift workflow exposed cases where one command needed to keep some git fields and take some dashboard fields.

API Changes

• Is this changing the public API?

  • Yes
  • No

• If yes, is it backward‐compatible?

  • Yes
  • No

N/A.

Non backward-compatible changes might break customers' agents. Please proceed with care and notify the team.

How did you test this?

Added unit coverage for mixed drift resolution parsing and path-level resource merging.

Ran node --import tsx --test tests/drift-resolve.test.ts, npm test, npm run build, and Biome checks on the changed TypeScript files.

[dhruva-reddy]

• feat(pull): add granular drift resolution #40 👈 (View in Graphite)
• main

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