diff --git a/REBASE_ANALYSIS.md b/REBASE_ANALYSIS.md
new file mode 100644
index 0000000000..98b70d7e47
--- /dev/null
+++ b/REBASE_ANALYSIS.md
@@ -0,0 +1,447 @@
+# Analysis: Impact of Commit d1aed19 on OpSi Siren Tasks
+
+## Summary
+
+Commit `d1aed19f8f3157eee8beb83d2ea1c15746cc8187` from LmeSzinc/AzurLaneAutoScript is a **major refactoring** of Operation Siren (OpSi) task management. This document analyzes its impact on your branch merge and provides recommendations for rebase/re-merge strategies.
+
+---
+
+## What Commit d1aed19 Changed
+
+### Overview
+- **Commit Message**: "Refactor: Opsi task managing"
+- **Author**: LmeSzinc
+- **Date**: 2026-01-17
+- **Stats**: +996 additions, -890 deletions (1886 total changes)
+
+### Key Changes
+
+1. **`module/os/operation_siren.py` - Major Refactoring**
+   - **Before**: ~965 lines containing all OpSi task logic
+   - **After**: ~43 lines acting as a multi-inheritance facade
+
+2. **New `module/os/tasks/` Directory Created**
+   The monolithic `operation_siren.py` was split into 12 separate task modules:
+
+   | File | Purpose |
+   |------|---------|
+   | `abyssal.py` | Abyssal zone handling (`OpsiAbyssal`) |
+   | `archive.py` | Archive zone handling (`OpsiArchive`) |
+   | `cross_month.py` | Cross-month reset handling (`OpsiCrossMonth`) |
+   | `daily.py` | Daily mission handling (`OpsiDaily`) |
+   | `explore.py` | Zone exploration (`OpsiExplore`) |
+   | `hazard_leveling.py` | Hazard level 1 grinding (`OpsiHazard1Leveling`) |
+   | `meowfficer_farming.py` | Meowfficer farming (`OpsiMeowfficerFarming`) |
+   | `month_boss.py` | Monthly boss battles (`OpsiMonthBoss`) |
+   | `obscure.py` | Obscure zone handling (`OpsiObscure`) |
+   | `shop.py` | Port shop interactions (`OpsiShop`) |
+   | `stronghold.py` | Stronghold clearing (`OpsiStronghold`) |
+   | `voucher.py` | Voucher shop handling (`OpsiVoucher`) |
+
+3. **New `operation_siren.py` Structure**
+   ```python
+   from module.os.tasks.abyssal import OpsiAbyssal
+   from module.os.tasks.archive import OpsiArchive
+   # ... (more imports)
+
+   class OperationSiren(
+       OpsiDaily,
+       OpsiShop,
+       OpsiVoucher,
+       OpsiMeowfficerFarming,
+       OpsiHazard1Leveling,
+       OpsiObscure,
+       OpsiAbyssal,
+       OpsiArchive,
+       OpsiStronghold,
+       OpsiMonthBoss,
+       OpsiExplore,
+       OpsiCrossMonth,
+   ):
+       """
+       Operation Siren main class that combines all task modules.
+       """
+       pass
+   ```
+
+---
+
+## Impact on Your Branch
+
+### Current State
+- Your `test` branch was merged with `upstream/master` on **2026-01-17 05:26:33 UTC**
+- The upstream commit d1aed19 was made on **2026-01-17 15:48:59 UTC** (about 10 hours later)
+- This means your branch **does NOT contain** the OpSi refactoring
+
+### Your `operation_siren.py`
+- Still contains the **old monolithic structure** (~965 lines)
+- All OpSi task methods are inline in one file
+- No `module/os/tasks/` directory exists
+
+### Potential Conflicts
+If you had made modifications to any of these methods in `operation_siren.py`:
+- `os_daily()` → now in `tasks/daily.py`
+- `os_cross_month()` → now in `tasks/cross_month.py`
+- `os_shop()` → now in `tasks/shop.py`
+- `os_voucher()` / `_os_voucher_enter()` → now in `tasks/voucher.py`
+- `os_meowfficer_farming()` → now in `tasks/meowfficer_farming.py`
+- `clear_month_boss()` → now in `tasks/month_boss.py`
+- `os_explore()` → now in `tasks/explore.py`
+- `run_abyssal()` → now in `tasks/abyssal.py`
+- Obscure zone logic → now in `tasks/obscure.py`
+- Archive zone logic → now in `tasks/archive.py`
+- Stronghold clearing → now in `tasks/stronghold.py`
+- Hazard leveling → now in `tasks/hazard_leveling.py`
+
+---
+
+## Rebase/Re-Merge Recommendations
+
+### Option 1: Fresh Re-Merge (Recommended if no OpSi changes)
+
+If you haven't made significant changes to OpSi-related code:
+
+```bash
+# Fetch latest upstream
+git fetch upstream
+
+# Create a new branch from your work
+git checkout test
+git checkout -b test-backup  # Keep a backup
+
+# Reset and re-merge
+git checkout test
+git reset --hard <your-commit-before-merge>
+git merge upstream/master
+
+# Resolve any conflicts (should be minimal if no OpSi changes)
+```
+
+### Option 2: Rebase Your Changes (Recommended if you have OpSi changes)
+
+If you have custom OpSi modifications:
+
+1. **Identify your custom commits**:
+   ```bash
+   git log --oneline test ^upstream/master
+   ```
+
+2. **Cherry-pick your custom commits onto latest upstream**:
+   ```bash
+   git fetch upstream
+   git checkout -b test-rebased upstream/master
+   
+   # For each of your custom commits:
+   git cherry-pick <commit-hash>
+   ```
+
+3. **When conflicts arise with `operation_siren.py`**:
+   - Identify which method/functionality you modified
+   - Find the corresponding file in `module/os/tasks/`
+   - Apply your changes to the new location
+   - Skip the old `operation_siren.py` changes
+
+### Option 3: Manual Conflict Resolution
+
+If you need to do a traditional merge:
+
+```bash
+git fetch upstream
+git checkout test
+git merge upstream/master
+```
+
+**When resolving conflicts in `operation_siren.py`**:
+1. Accept the upstream version (new minimal facade)
+2. Move your custom changes to the appropriate `tasks/*.py` file
+3. Ensure imports are correct in the new modular structure
+
+---
+
+## Conflict Resolution Guide
+
+### If you modified `os_daily()`:
+- Your changes should go to `module/os/tasks/daily.py`
+- Class `OpsiDaily` contains this functionality
+
+### If you modified `os_shop()` or `_os_shop_delay()`:
+- Your changes should go to `module/os/tasks/shop.py`
+- Class `OpsiShop` contains this functionality
+
+### If you modified `os_cross_month()`:
+- Your changes should go to `module/os/tasks/cross_month.py`
+- Class `OpsiCrossMonth` contains this functionality
+
+### If you added new OpSi functionality:
+1. Create a new file in `module/os/tasks/` (or add to existing relevant file)
+2. Create a mixin class that inherits from `OSMap`
+3. Add your class to the multiple inheritance chain in `operation_siren.py`
+
+---
+
+## Timeline Summary
+
+```
+2026-01-16 09:08:56 - PR #5445 merged (your merge base point)
+2026-01-17 05:26:33 - Your test branch merged upstream/master
+2026-01-17 15:48:59 - Commit d1aed19 (OpSi refactoring) pushed
+2026-01-19 04:20:44 - Additional fixes pushed
+2026-01-20 02:24:28 - Latest upstream (PR #5459)
+```
+
+Your branch is now **4 commits behind** upstream master, with the OpSi refactoring being the most impactful change.
+
+---
+
+## Verification Steps After Rebase/Merge
+
+1. **Check that `module/os/tasks/` directory exists**
+2. **Verify `operation_siren.py` is the new minimal version** (~43 lines)
+3. **Test OpSi tasks**:
+   - `OpsiDaily`
+   - `OpsiShop`
+   - `OpsiCrossMonth`
+   - Any functionality you customized
+4. **Run linting/tests** if available
+
+---
+
+## Detailed Instructions for Your Three Branches
+
+Based on your request, here are step-by-step instructions for rebasing each of your three branches:
+
+---
+
+### Branch 1: `os_ap_optimize`
+
+**Branch Info:**
+- **Commit**: `b112131de0d42dbaa8c57baba5a3f94e691b841d`
+- **Message**: "Opt: call all ap consuming tasks when cl1 cannot continue"
+- **Files Modified**: `module/os/operation_siren.py` (+10 lines)
+
+**Analysis:**
+This branch adds logic for calling AP-consuming tasks when CL1 cannot continue. The changes likely affect the `os_hazard1_leveling()` method or related CL1 logic.
+
+**Rebase Steps:**
+
+```bash
+# 1. Fetch latest upstream
+git fetch upstream
+
+# 2. Create a new branch based on upstream/master
+git checkout -b os_ap_optimize_rebased upstream/master
+
+# 3. View your original changes
+git show b112131de0d42dbaa8c57baba5a3f94e691b841d --stat
+
+# 4. Cherry-pick your commit
+git cherry-pick b112131de0d42dbaa8c57baba5a3f94e691b841d
+```
+
+**Conflict Resolution:**
+When conflicts arise in `operation_siren.py`:
+1. Your changes should now go to `module/os/tasks/hazard_leveling.py`
+2. Open both files and locate the `os_hazard1_leveling()` method in the new file
+3. Apply your AP optimization logic to the `OpsiHazard1Leveling` class
+4. Complete the merge:
+   ```bash
+   git add module/os/tasks/hazard_leveling.py
+   git cherry-pick --continue
+   ```
+
+**Your Change Context:**
+Your commit adds 10 lines to handle AP-consuming tasks when CL1 cannot continue. This should be added to the loop in `os_hazard1_leveling()` method in `module/os/tasks/hazard_leveling.py`, likely near the action point checking logic.
+
+---
+
+### Branch 2: `cl1_level_check` (Note: Branch name is `cl1_level_check`, not `cl1_level_checking`)
+
+**Branch Info:**
+- **Commit**: `71a086f4504a436049d14fb11aaf8c8d89139d34`
+- **Message**: "Add: check leveling in cl1 daily"
+- **Files Modified**: Multiple files including:
+  - `module/os/operation_siren.py` (+52 lines)
+  - `module/os/ship_exp.py` (new file, +83 lines)
+  - `module/os/ship_exp_data.py` (new file, +130 lines)
+  - `module/os/assets.py` (+1 line)
+  - Config files and assets
+
+**Analysis:**
+This is a larger feature that adds ship level/exp checking for CL1 daily tasks. It introduces new modules (`ship_exp.py`, `ship_exp_data.py`) and modifies the OpSi logic.
+
+**Rebase Steps:**
+
+```bash
+# 1. Fetch latest upstream
+git fetch upstream
+
+# 2. Create a new branch based on upstream/master
+git checkout -b cl1_level_check_rebased upstream/master
+
+# 3. Cherry-pick your commit
+git cherry-pick 71a086f4504a436049d14fb11aaf8c8d89139d34
+```
+
+**Conflict Resolution:**
+The new files (`ship_exp.py`, `ship_exp_data.py`) should apply cleanly. For `operation_siren.py` conflicts:
+
+1. **New files** (`module/os/ship_exp.py`, `module/os/ship_exp_data.py`) - These should apply without conflicts
+2. **`module/os/operation_siren.py`** conflicts:
+   - Your CL1 level checking logic should go to `module/os/tasks/hazard_leveling.py`
+   - Add necessary imports at the top of `hazard_leveling.py` (verify these match your actual function/constant names in your branch):
+     ```python
+     from module.os.ship_exp import ship_info_get_level_exp
+     from module.os.ship_exp_data import LIST_SHIP_EXP
+     ```
+   - Add your level checking methods to the `OpsiHazard1Leveling` class
+
+3. **Alternative approach** - Create a new task file:
+   ```python
+   # module/os/tasks/cl1_leveling.py
+   from module.logger import logger
+   from module.os.ship_exp import ship_info_get_level_exp
+   from module.os.ship_exp_data import LIST_SHIP_EXP
+   from module.os.tasks.hazard_leveling import OpsiHazard1Leveling
+
+   class OpsiCL1Leveling(OpsiHazard1Leveling):
+       # Your level checking methods here
+       pass
+   ```
+   Then update `operation_siren.py` to include your new class in the inheritance chain.
+
+4. Complete the merge:
+   ```bash
+   git add module/os/tasks/hazard_leveling.py  # or your new task file
+   git add module/os/ship_exp.py
+   git add module/os/ship_exp_data.py
+   # ... add other files
+   git cherry-pick --continue
+   ```
+
+---
+
+### Branch 3: `os_collective`
+
+**Branch Info:**
+- **Commit**: `d203e6d95404f060095ee4f1f0462848ee9f4cd9`
+- **Message**: "Feature: Opsi Target"
+- **Files Modified**: Multiple new asset files + new OpSi target functionality
+  - Many new PNG assets in `assets/cn/os_handler/`, `assets/en/os_handler/`, `assets/jp/os_handler/`
+  - Target zone navigation features
+
+**Analysis:**
+This feature adds OpSi Target functionality (zone navigation via targets). The assets should apply cleanly, but any Python code changes need to be migrated.
+
+**Rebase Steps:**
+
+```bash
+# 1. Fetch latest upstream
+git fetch upstream
+
+# 2. Create a new branch based on upstream/master
+git checkout -b os_collective_rebased upstream/master
+
+# 3. Cherry-pick your commit
+git cherry-pick d203e6d95404f060095ee4f1f0462848ee9f4cd9
+```
+
+**Conflict Resolution:**
+1. **Asset files** - Should apply cleanly (they're new files)
+2. **Python code** - If you added target-related methods to `operation_siren.py`:
+   - Create a new task file: `module/os/tasks/target.py`
+   ```python
+   # module/os/tasks/target.py
+   from module.logger import logger
+   from module.os.map import OSMap
+
+   class OpsiTarget(OSMap):
+       # Your target zone navigation methods here
+       pass
+   ```
+   - Update `module/os/operation_siren.py` to include `OpsiTarget`:
+   ```python
+   from module.os.tasks.target import OpsiTarget
+
+   class OperationSiren(
+       OpsiDaily,
+       OpsiShop,
+       OpsiVoucher,
+       OpsiMeowfficerFarming,
+       OpsiHazard1Leveling,
+       OpsiObscure,
+       OpsiAbyssal,
+       OpsiArchive,
+       OpsiStronghold,
+       OpsiMonthBoss,
+       OpsiExplore,
+       OpsiCrossMonth,
+       OpsiTarget,  # Add your new class
+   ):
+       pass
+   ```
+
+3. Complete the merge:
+   ```bash
+   git add module/os/tasks/target.py
+   git add module/os/operation_siren.py
+   # ... add asset files
+   git cherry-pick --continue
+   ```
+
+---
+
+## Merging All Three Branches into `test`
+
+After rebasing all three branches:
+
+```bash
+# 1. Update test branch to latest upstream first
+git checkout test
+git fetch upstream
+git merge upstream/master
+
+# 2. Merge each rebased branch
+git merge os_ap_optimize_rebased
+git merge cl1_level_check_rebased
+git merge os_collective_rebased
+
+# If there are conflicts between your branches, resolve them manually
+```
+
+**Alternative: Single Combined Rebase**
+
+If you prefer to combine all changes in one go:
+
+```bash
+# 1. Create combined branch from upstream
+git checkout -b combined_features upstream/master
+
+# 2. Cherry-pick all your commits in order
+git cherry-pick b112131de0d42dbaa8c57baba5a3f94e691b841d  # os_ap_optimize
+git cherry-pick 71a086f4504a436049d14fb11aaf8c8d89139d34  # cl1_level_check
+git cherry-pick d203e6d95404f060095ee4f1f0462848ee9f4cd9  # os_collective
+
+# 3. Resolve conflicts as they come up
+```
+
+---
+
+## Quick Reference: File Mapping
+
+| Your Branch | Original Location | New Location |
+|-------------|-------------------|--------------|
+| `os_ap_optimize` | `module/os/operation_siren.py` (CL1 AP logic) | `module/os/tasks/hazard_leveling.py` |
+| `cl1_level_check` | `module/os/operation_siren.py` (level checking) | `module/os/tasks/hazard_leveling.py` or new `module/os/tasks/cl1_leveling.py` |
+| `os_collective` | `module/os/operation_siren.py` (target features) | New `module/os/tasks/target.py` |
+
+---
+
+## Questions to Consider
+
+1. **Did you modify any OpSi-related methods?** If yes, identify which ones.
+2. **Do you have uncommitted changes?** Save them before rebasing.
+3. **Do you need to preserve your commit history?** If not, a fresh merge is simpler.
+
+---
+
+*This analysis was generated based on examining commit d1aed19 and comparing repository states.*