GitWand: Skill for Claude Code

Skill: add-resolver

Guide the agent through adding a format-specific resolver to packages/core end to end — file creation, dispatcher wiring, tests, and docs — without missing any of the four required touch points.

---

Step 1 — Qualify the need

Answer these before writing any code:

1. Format / extension? (e.g. .prisma, composer.lock, .tf, .toml)
2. Is it a lockfile? If yes → confidence is 0.95 by convention. Lockfile conflicts are almost always trivially re-generable, so high confidence is appropriate.
3. Resolution strategy? Examples:
   • Structured config (key = value) → merge non-conflicting keys
   • Lockfile → accept one side; file is regenerable
   • Source code → be conservative, 0.70–0.80 max
4. Browser-compatible parsing available? packages/core must run in browsers — no Node.js imports (fs, path, child_process). If no parser lib is available, write a pure string-manipulation parser.

Confidence score guidelines:

File type	Score
Lockfile	0.95
Structured config (JSON, YAML, TOML, dotenv)	0.85–0.90
Source code	0.70–0.80
Never exceed 0.95 unless perfectly deterministic	—

---

Step 2 — Create the resolver file

Create packages/core/src/resolvers/<format>.ts. Follow this exact shape, which mirrors all existing resolvers in the directory:

/**
 * GitWand — <FORMAT> resolver
 *
 * Strategy: [describe the resolution strategy precisely]
 *
 * Handled cases:
 *  - [case 1]
 *  - [case 2]
 *  - [non-resolvable case → return null]
 */

// ✅ Allowed: pure string manipulation, parsing, algorithms
// ❌ FORBIDDEN: import * as fs from 'fs' / import * as path from 'path'

export interface ResolveResult {
  /** Resolved lines, or null if not resolvable */
  lines: string[] | null;
  /** Human-readable description of what was done (or why it failed) */
  reason: string;
}

/**
 * Attempts to resolve a <format> conflict.
 * Confidence: 0.XX — [justify the score here]
 */
export function tryResolve<Format>Conflict(
  baseLines: string[],
  oursLines: string[],
  theirsLines: string[],
): ResolveResult {
  // ... resolution logic ...

  return { lines: null, reason: "Non-resolvable: [reason]." };
}