use std::path::Path;
use anyhow::{Result, anyhow};
use objects::{
object::{Principal, ThreadName},
worktree::WorktreeStatus,
};
use repo::{CommitGraphIndex, Repository, RepositoryCapability, thread_flag};
use super::{
advice::RecoveryAdvice,
command_catalog::ActionFields,
git_overlay_health::{
GitOverlayMutationPreflight, RepositoryVerificationState,
build_repository_verification_state,
build_repository_verification_state_with_worktree_status,
git_overlay_mutation_preflight_advice_with_worktree_status,
plain_git_mutation_preflight_advice, repository_verification_blocked_advice,
},
snapshot::resolve_principal,
thread_landing::land_local_command,
};
use crate::{
bridge::git_core::{git_config_identity_with_global_fallback, principal_is_default_unknown},
config::UserConfig,
};
pub(crate) type GitOverlayWorktreeStatus = repo::Result<Option<WorktreeStatus>>;
pub(crate) struct GitOverlayMutationFacts {
worktree_status: GitOverlayWorktreeStatus,
}
impl GitOverlayMutationFacts {
pub(crate) fn worktree_status(&self) -> &GitOverlayWorktreeStatus {
&self.worktree_status
}
}
pub(crate) fn preflight_plain_git_mutation(start: &Path, action: &str) -> Result<()> {
if let Some(advice) = plain_git_mutation_preflight_advice(start, action)? {
return Err(anyhow!(advice));
}
Ok(())
}
pub(crate) fn gather_mutation_facts(repo: &Repository) -> GitOverlayMutationFacts {
GitOverlayMutationFacts {
worktree_status: repo.git_overlay_worktree_status(),
}
}
pub(crate) fn preflight_checkpoint(
repo: &Repository,
action: &str,
facts: &GitOverlayMutationFacts,
) -> Result<()> {
preflight_checkpoint_with_worktree_status(repo, action, facts.worktree_status())
}
pub(crate) fn preflight_checkpoint_with_worktree_status(
repo: &Repository,
action: &str,
worktree_status: &GitOverlayWorktreeStatus,
) -> Result<()> {
preflight_checkpoint_like_with_worktree_status(repo, action, worktree_status)
}
pub(crate) fn preflight_commit(repo: &Repository, facts: &GitOverlayMutationFacts) -> Result<()> {
preflight_commit_like_with_worktree_status(repo, facts.worktree_status())
}
pub(crate) fn preflight_commit_checkpoint_ref_update(
repo: &Repository,
facts: &GitOverlayMutationFacts,
) -> Result<()> {
preflight_checkpoint_ref_update_with_worktree_status(repo, "commit", facts.worktree_status())
}
pub(crate) fn preflight_land_checkpoint(repo: &Repository, thread_id: &str) -> Result<()> {
if let Some(advice) = land_checkpoint_preflight_advice(repo, thread_id) {
return Err(anyhow!(advice));
}
Ok(())
}
fn preflight_checkpoint_like_with_worktree_status(
repo: &Repository,
action: &str,
worktree_status: &GitOverlayWorktreeStatus,
) -> Result<()> {
preflight_checkpoint_ref_update_with_worktree_status(repo, action, worktree_status)?;
if let Some(advice) = git_overlay_mutation_preflight_advice_with_worktree_status(
repo,
action,
GitOverlayMutationPreflight::checkpoint_like(),
worktree_status,
)? {
return Err(anyhow!(advice));
}
Ok(())
}
fn preflight_commit_like_with_worktree_status(
repo: &Repository,
worktree_status: &GitOverlayWorktreeStatus,
) -> Result<()> {
if let Some(advice) = git_overlay_mutation_preflight_advice_with_worktree_status(
repo,
"commit",
GitOverlayMutationPreflight::commit_like(),
worktree_status,
)? {
return Err(anyhow!(advice));
}
Ok(())
}
fn preflight_checkpoint_ref_update_with_worktree_status(
repo: &Repository,
action: &str,
worktree_status: &GitOverlayWorktreeStatus,
) -> Result<()> {
if repo.capability() != RepositoryCapability::GitOverlay {
return Ok(());
}
let trust = preflight_verify_with_worktree_status(repo, worktree_status);
preflight_checkpoint_ref_update_with_trust(repo, action, trust)
}
pub(crate) fn preflight_git_checkpoint_identity(
repo: &Repository,
user_config: &UserConfig,
action: &str,
retry_command: &str,
) -> Result<()> {
let principal = resolve_principal(repo, user_config)?;
preflight_git_checkpoint_identity_for_principal(repo, &principal, action, retry_command)
}
pub(crate) fn preflight_git_checkpoint_identity_for_principal(
repo: &Repository,
principal: &Principal,
action: &str,
retry_command: &str,
) -> Result<()> {
if !principal_is_default_unknown(principal) {
return Ok(());
}
if git_config_identity_with_global_fallback(repo.root())?.is_some() {
return Ok(());
}
Err(anyhow!(missing_git_checkpoint_identity_advice(
action,
retry_command,
)))
}
pub(crate) fn preflight_verify(repo: &Repository) -> RepositoryVerificationState {
build_repository_verification_state(repo)
}
pub(crate) fn preflight_verify_with_worktree_status(
repo: &Repository,
worktree_status: &GitOverlayWorktreeStatus,
) -> RepositoryVerificationState {
build_repository_verification_state_with_worktree_status(repo, worktree_status)
}
pub(crate) fn post_verify(repo: &Repository) -> RepositoryVerificationState {
build_repository_verification_state(repo)
}
pub(crate) fn post_verify_commit(repo: &Repository) -> RepositoryVerificationState {
commit_safe_trust(post_verify(repo))
}
fn land_checkpoint_preflight_advice(repo: &Repository, thread_id: &str) -> Option<RecoveryAdvice> {
if repo.capability() != RepositoryCapability::GitOverlay {
return None;
}
let trust = preflight_verify(repo);
if trust.remote_drift == "remote_diverged" {
let remote_decision = repo
.git_remote_tracking_status()
.ok()
.flatten()
.map(|remote| super::git_overlay_health::remote_drift_decision(repo, &remote));
let primary_command = remote_decision
.as_ref()
.and_then(|decision| decision.primary_action.clone())
.unwrap_or_else(|| {
if trust.recommended_action.trim().is_empty() {
"heddle pull".to_string()
} else {
trust.recommended_action.clone()
}
});
let recovery_commands = if trust.recovery_commands.is_empty() {
let mut commands = remote_decision
.map(|decision| decision.recovery_commands)
.unwrap_or_else(|| vec![primary_command.clone()]);
commands.push(format!("heddle sync {}", thread_flag(thread_id)));
commands.push(land_local_command(thread_id));
commands
} else {
trust.recovery_commands.clone()
};
return Some(RecoveryAdvice::safety_refusal(
"land_requires_current_upstream",
format!("Refusing to land '{thread_id}': upstream work must be integrated first"),
format!("Run `{primary_command}`, then retry the land."),
format!(
"repository verification reports {}: {}",
trust.remote_drift, trust.summary
),
"land would first integrate Heddle state locally, then fail while writing the Git checkpoint because the checkout branch is behind its upstream",
"thread refs, Heddle refs, Git refs, index, and worktree files were left unchanged",
primary_command,
recovery_commands,
));
}
if repo.root().join(".git/index.lock").exists() {
return Some(RecoveryAdvice::safety_refusal(
"land_checkpoint_preflight_blocked",
format!("Refusing to land '{thread_id}': Git index is locked"),
"Remove the stale Git index lock or wait for the active Git operation to finish, then retry the land.",
".git/index.lock exists in the parent checkout",
"land would first integrate Heddle state locally, then fail while writing the Git checkpoint because the Git index is locked",
"thread refs, Heddle refs, Git refs, index, and worktree files were left unchanged",
"heddle status",
vec!["heddle status".to_string()],
));
}
None
}
pub(crate) fn native_checkpoint_unavailable_advice(repo: &Repository) -> RecoveryAdvice {
RecoveryAdvice::safety_refusal(
"checkpoint_requires_git_overlay",
"`heddle checkpoint` is only for Git-overlay repositories",
"Use `heddle commit -m \"...\"` to save native Heddle work, or `heddle capture -m \"...\"` for a recoverable step without a Git checkpoint.",
format!("repository mode is {}", repo.storage_model_label()),
"checkpoint would need to write a Git commit, but this checkout has no Git-overlay branch/index",
"Heddle refs and worktree files were left unchanged",
"heddle commit -m \"...\"",
vec![
"heddle commit -m \"...\"".to_string(),
"heddle capture -m \"...\"".to_string(),
"heddle status".to_string(),
],
)
}
pub(crate) fn checkpoint_git_write_skipped_advice(reason: String) -> RecoveryAdvice {
RecoveryAdvice::safety_refusal(
"checkpoint_git_write_skipped",
format!("Checkpoint could not update the Git checkout: {reason}"),
"Resolve the Git checkout issue, then retry with `heddle checkpoint -m \"...\"`.",
reason,
"checkpoint would need to write the current Heddle state into the Git branch and index",
"the current Heddle state was preserved; no Git checkpoint record was written",
"heddle checkpoint -m \"...\"",
vec!["heddle checkpoint -m \"...\"".to_string()],
)
}
pub(crate) fn commit_checkpoint_failed_advice(
change_id: &str,
message: Option<&str>,
err: &anyhow::Error,
index_only: bool,
) -> RecoveryAdvice {
let recovery = checkpoint_recovery_command(message, index_only);
RecoveryAdvice::safety_refusal(
"commit_checkpoint_failed",
format!("capture {change_id} was preserved, but checkpoint failed: {err}"),
format!("Resolve the checkpoint issue, then run `{recovery}`."),
"the Heddle capture succeeded but the Git checkpoint step failed",
"retrying through the canonical save path keeps the Git checkpoint repair on the supported surface",
format!("captured Heddle state {change_id} was preserved"),
recovery.clone(),
vec![recovery],
)
}
pub(crate) fn commit_blocked_by_trust_advice(
trust: &RepositoryVerificationState,
) -> RecoveryAdvice {
repository_verification_blocked_advice(
"commit_blocked_by_verification",
format!(
"refusing to report nothing to commit: repository verification is blocked ({})",
trust.status
),
"retrying `heddle commit`",
trust,
format!(
"repository verification status is {}: {}",
trust.status, trust.summary
),
"claiming nothing to commit could hide a Git/Heddle/import/operation disagreement",
"no capture, Git checkpoint, refs, or worktree files were changed",
None,
)
}
fn preflight_checkpoint_ref_update_with_trust(
repo: &Repository,
action: &str,
trust: RepositoryVerificationState,
) -> Result<()> {
if checkpoint_trust_allows_ref_update(&trust)
|| checkpoint_can_close_integrated_remote_gap(repo, &trust)
{
return Ok(());
}
Err(anyhow!(checkpoint_preflight_advice(repo, &trust, action)))
}
fn checkpoint_trust_allows_ref_update(trust: &RepositoryVerificationState) -> bool {
let status_allows_checkpoint = matches!(
trust.status.as_str(),
"clean" | "dirty_worktree" | "needs_checkpoint" | "remote_ahead" | "remote_untracked"
);
let remote_allows_checkpoint = matches!(
trust.remote_drift.as_str(),
"clean" | "remote_ahead" | "remote_untracked"
);
status_allows_checkpoint && remote_allows_checkpoint
}
fn checkpoint_can_close_integrated_remote_gap(
repo: &Repository,
trust: &RepositoryVerificationState,
) -> bool {
if trust.status != "needs_checkpoint"
|| !matches!(
trust.remote_drift.as_str(),
"remote_behind" | "remote_diverged"
)
{
return false;
}
let Some(remote) = repo.git_remote_tracking_status().ok().flatten() else {
return false;
};
let upstream = remote.upstream.trim();
if upstream.is_empty() {
return false;
}
let Ok(Some(upstream_state)) = repo.refs().get_thread(&ThreadName::new(upstream)) else {
return false;
};
let Ok(Some(current_state)) = repo.head() else {
return false;
};
let mut graph = CommitGraphIndex::new(repo);
graph
.is_ancestor(&upstream_state, ¤t_state)
.unwrap_or(false)
}
fn checkpoint_preflight_advice(
repo: &Repository,
trust: &RepositoryVerificationState,
action: &str,
) -> RecoveryAdvice {
let primary_command = super::git_overlay_health::remote_drift_primary_action(repo)
.unwrap_or_else(|| {
if trust.recommended_action.trim().is_empty() {
"heddle verify".to_string()
} else {
trust.recommended_action.clone()
}
});
repository_verification_blocked_advice(
"git_checkpoint_preflight_blocked",
format!("Refusing to {action}: Git checkpoint preflight is blocked"),
format!("retrying `heddle {action}`"),
trust,
format!(
"repository verification status is {}; remote drift is {}: {}",
trust.status, trust.remote_drift, trust.summary
),
format!(
"{action} would capture Heddle state before the Git checkpoint ref update is known to be safe"
),
"Git refs, Heddle refs, Git checkpoint metadata, and worktree files were left unchanged",
Some(primary_command),
)
}
fn missing_git_checkpoint_identity_advice(action: &str, retry_command: &str) -> RecoveryAdvice {
RecoveryAdvice::safety_refusal(
"git_checkpoint_identity_required",
format!("Refusing to {action}: no accountable identity is configured for the Git commit"),
"Configure `HEDDLE_PRINCIPAL_NAME` and `HEDDLE_PRINCIPAL_EMAIL`, set .heddle principal, or configure Git user.name/user.email before retrying.",
"Heddle would otherwise have to write Unknown <unknown@example.com> into the Git commit",
format!("{action} would create an auditable Git checkpoint without a real author identity"),
"Git refs, Heddle refs, Git checkpoint metadata, and worktree files were left unchanged",
"heddle init --principal-name <name> --principal-email <email>",
vec![
"heddle init --principal-name <name> --principal-email <email>".to_string(),
retry_command.to_string(),
],
)
}
fn commit_safe_trust(mut trust: RepositoryVerificationState) -> RepositoryVerificationState {
if is_commit_action(&trust.recommended_action) {
super::git_overlay_health::override_trust_recommended_action(&mut trust, "heddle status");
}
let status_action = "heddle status".to_string();
let status_template = ActionFields::from_action(&status_action).template;
for check in &mut trust.checks {
if check
.recommended_action
.as_deref()
.is_some_and(is_commit_action)
{
check.recommended_action = Some(status_action.clone());
check.recommended_action_template = status_template.clone();
}
}
trust
}
fn is_commit_action(action: &str) -> bool {
matches!(
action.trim(),
"heddle commit"
| "heddle commit -m \"...\""
| "heddle commit -m \"...\" --confidence <confidence>"
) || action.trim().starts_with("heddle commit ")
}
fn checkpoint_recovery_command(message: Option<&str>, index_only: bool) -> String {
let scope = if index_only {
" --from-index-snapshot"
} else {
""
};
format!(
"heddle checkpoint{scope} -m {}",
shell_double_quoted(message.unwrap_or("commit"))
)
}
fn shell_double_quoted(value: &str) -> String {
let mut quoted = String::from("\"");
for ch in value.chars() {
match ch {
'\\' | '"' | '$' | '`' => {
quoted.push('\\');
quoted.push(ch);
}
'\n' => quoted.push_str("\\n"),
_ => quoted.push(ch),
}
}
quoted.push('"');
quoted
}
#[cfg(test)]
mod tests {
use anyhow::anyhow;
use super::*;
#[test]
fn commit_checkpoint_failure_advice_preserves_capture_and_exact_recovery() {
let error = anyhow!("git write failed");
let advice =
commit_checkpoint_failed_advice("change-123", Some("say \"hello\""), &error, false);
assert_eq!(advice.kind, "commit_checkpoint_failed");
assert!(advice.error.contains("capture change-123 was preserved"));
assert!(advice.error.contains("git write failed"));
assert_eq!(
advice.primary_command,
"heddle checkpoint -m \"say \\\"hello\\\"\""
);
assert_eq!(
advice.recovery_commands,
vec!["heddle checkpoint -m \"say \\\"hello\\\"\""]
);
assert!(advice.preserved.contains("change-123"));
}
#[test]
fn commit_checkpoint_failure_advice_retries_index_snapshot_checkpoint() {
let error = anyhow!("git write failed");
let advice =
commit_checkpoint_failed_advice("change-456", Some("index only"), &error, true);
assert_eq!(
advice.primary_command,
"heddle checkpoint --from-index-snapshot -m \"index only\""
);
assert_eq!(
advice.recovery_commands,
vec!["heddle checkpoint --from-index-snapshot -m \"index only\""]
);
}
#[test]
fn commit_blocked_by_trust_advice_uses_trust_recovery() {
let machine_contract_coverage =
crate::cli::commands::git_overlay_health::machine_contract_coverage();
let trust = RepositoryVerificationState {
verified: false,
status: "operation_in_progress".to_string(),
repository_mode: "git-overlay".to_string(),
heddle_initialized: true,
git_branch: Some("main".to_string()),
heddle_thread: Some("main".to_string()),
worktree_dirty: false,
worktree_state: "clean".to_string(),
import_state: "clean".to_string(),
mapping_state: "clean".to_string(),
remote_drift: "clean".to_string(),
active_operation: Some("Git merge (in-progress)".to_string()),
default_remote: None,
clone_verification: "not_applicable".to_string(),
machine_contract: crate::cli::commands::git_overlay_health::machine_contract_status(
&machine_contract_coverage,
)
.to_string(),
machine_contract_coverage,
workflow_status: "clean".to_string(),
workflow_summary: "no ready threads are waiting to land".to_string(),
summary: "Git merge is in progress".to_string(),
recommended_action: "heddle continue".to_string(),
recommended_action_template: None,
recovery_commands: vec!["heddle continue".to_string()],
recovery_action_templates: Vec::new(),
checks: Vec::new(),
};
let advice = commit_blocked_by_trust_advice(&trust);
assert_eq!(advice.kind, "commit_blocked_by_verification");
assert_eq!(advice.primary_command, "heddle continue");
assert_eq!(advice.recovery_commands, vec!["heddle continue"]);
assert!(advice.error.contains("repository verification is blocked"));
assert!(advice.unsafe_condition.contains("Git merge is in progress"));
}
}