skills.rest
AtaraxiaEpiphany
AtaraxiaEpiphanyCOMMUNITY
Explore all skills by this author →
GitHub

reconcile

Synchronize track-state.json with plan.md by mapping tasks via phase and name identifiers.

Updated May 7, 2026
Search Tags:#git#workflow#tdd#conductor#reconciliation#state-management
One-click install
npx skills add https://github.com/AtaraxiaEpiphany/conductor --skill reconcile-ataraxiaepiphany
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: reconcile
Source: https://github.com/AtaraxiaEpiphany/conductor/tree/main/skills/reconcile
Command: npx skills add https://github.com/AtaraxiaEpiphany/conductor --skill reconcile-ataraxiaepiphany

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill resolves state drift when a user manually modifies the project plan after a git reset, ensuring that task progress and commit history remain correctly aligned without losing work.

Core Features & Use Cases

  • State Reconciliation: Matches plan.md changes to track-state.json by task name and phase rather than position.
  • SHA Preservation: Protects existing commit SHAs on completed tasks even when the task order or structure changes.
  • Conflict Resolution: Provides a safe dry-run mechanism to identify unmatched nodes, renames, or dangling commits before applying changes.

Quick Start

Run the reconcile skill for the current track to dry-run the state synchronization and review the proposed changes.

Frequently Asked Questions about reconcile

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I sync track-state.json with plan.md after manually editing my project plan?▼

To sync track-state.json with plan.md, the reconcile skill matches tasks by phase and name identifiers, preserving commit SHAs and ensuring task progress stays aligned after manual plan edits or git reset operations.

Can I dry-run state synchronization before applying changes to track-state.json?▼

Yes, you can dry-run state synchronization to identify unmatched nodes, renames, or dangling commits safely before applying atomic state mutations to track-state.json via the track-state CLI.

Does the reconcile skill preserve commit SHAs when task order changes in plan.md?▼

Yes, the reconcile skill preserves existing commit SHAs on completed tasks even when task order or structure changes in plan.md, matching tasks by phase and name rather than position to protect your commit history.

Do I need the track-state CLI to reconcile plan.md changes with track-state.json?▼

Yes, the track-state CLI is required to perform atomic state mutations and validation checks during plan.md reconciliation, ensuring safe synchronization within the Conductor development lifecycle.

Related Skills

Explore More Software Engineering Skills→
AtaraxiaEpiphanyAtaraxiaEpiphany

revert

Revert Git commits and synchronize track-state.json and plan.md markers.

Community
Advanced
WesleyMFrederickWesleyMFrederick

merging-feature-branches-to-main

Squashes Git feature-branch history into a single commit when merging to main.

Community
Basic
JhabbigJhabbig

workflow-patterns

Coordinates TDD workflow execution and phase checkpoint management for Conductor-based implementation tasks.

Community
Advanced
benjaminshoemakerbenjaminshoemaker
39

populate-state

Generate .claude/phase-state.json from EXECUTION_PLAN.md and git history.

Community
Intermediate