Add guarded conflict recovery plans

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
         with:
           components: clippy, rustfmt
 
-      - name: Validate release workflow
+      - name: Validate workflows
         shell: bash
         run: |
           set -euo pipefail
@@ -65,6 +65,7 @@ jobs:
           echo "8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc387b349a3d8  ${tool_dir}/${archive}" | sha256sum -c -
           tar -C "${tool_dir}" -xzf "${tool_dir}/${archive}" actionlint
           "${tool_dir}/actionlint"
+          bash scripts/test-ci-workflow.sh
           bash scripts/test-release-workflow.sh
 
       - name: Validate Linux installation documentation
@@ -83,6 +84,29 @@ jobs:
       - name: Build
         run: cargo build --locked --workspace
 
+  recovery-platforms:
+    name: Recovery safety (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Test end-to-end recovery support
+        run: cargo test --locked -p bitbygit-git recovery_platform_
+
+      - name: Build workspace
+        run: cargo build --locked --workspace
+
   installation-docs-macos:
     name: macOS installation docs
     runs-on: macos-15

README.md

@@ -53,12 +53,13 @@ Package-manager distribution is not currently available.
 Prerequisites:
 
 - Rust 1.85 or newer.
-- `git` available on `PATH`.
+- Git 2.42 or newer available on `PATH` (required for guarded conflict recovery).
 - `gh` is optional and required only for GitHub-specific workflows.
 
 Run local checks:
 
 ```sh
+bash scripts/test-ci-workflow.sh
 bash scripts/test-release-workflow.sh
 bash scripts/test-installation-docs.sh
 cargo fmt --all --check

crates/bitbygit-core/src/lib.rs

@@ -41,6 +41,7 @@ pub enum OperationRequest {
     Rebase {
         base: String,
     },
+    Recover(RecoveryRequest),
     OpenPullRequest {
         base: Option<String>,
     },
@@ -49,6 +50,32 @@ pub enum OperationRequest {
     },
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum RecoveryRequest {
+    MergeContinue,
+    MergeAbort,
+    RebaseContinue,
+    RebaseAbort,
+    RebaseSkip,
+}
+
+impl RecoveryRequest {
+    pub const fn operation_label(self) -> &'static str {
+        match self {
+            Self::MergeContinue | Self::MergeAbort => "merge",
+            Self::RebaseContinue | Self::RebaseAbort | Self::RebaseSkip => "rebase",
+        }
+    }
+
+    pub const fn action_label(self) -> &'static str {
+        match self {
+            Self::MergeContinue | Self::RebaseContinue => "continue",
+            Self::MergeAbort | Self::RebaseAbort => "abort",
+            Self::RebaseSkip => "skip",
+        }
+    }
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum OperationKind {
     RefreshStatus,
@@ -68,6 +95,11 @@ pub enum OperationKind {
     CreateBranch,
     MergeFastForward,
     Rebase,
+    MergeContinue,
+    MergeAbort,
+    RebaseContinue,
+    RebaseAbort,
+    RebaseSkip,
     OpenPullRequest,
 }
 
@@ -90,6 +122,11 @@ impl OperationKind {
             Self::CreateBranch => "create branch",
             Self::MergeFastForward => "merge",
             Self::Rebase => "rebase",
+            Self::MergeContinue => "merge continue",
+            Self::MergeAbort => "merge abort",
+            Self::RebaseContinue => "rebase continue",
+            Self::RebaseAbort => "rebase abort",
+            Self::RebaseSkip => "rebase skip",
             Self::OpenPullRequest => "open pull request",
         }
     }
@@ -113,6 +150,11 @@ impl OperationKind {
             Self::CreateBranch => "create_branch",
             Self::MergeFastForward => "merge_ff_only",
             Self::Rebase => "rebase",
+            Self::MergeContinue => "merge_continue",
+            Self::MergeAbort => "merge_abort",
+            Self::RebaseContinue => "rebase_continue",
+            Self::RebaseAbort => "rebase_abort",
+            Self::RebaseSkip => "rebase_skip",
             Self::OpenPullRequest => "open_pull_request",
         }
     }