backend-infra-engineer: Release v0.3.9-hotfix7 snapshot

docs/internal/plans/branch_recovery_plan.md

@@ -0,0 +1,112 @@
+# Branch Recovery Plan
+
+**Date**: 2024-11-22
+**Status**: COMPLETED - All changes organized
+**Context**: Gemini 3 was interrupted, Claude 4.5 and GPT-OSS 120 attempted to help. Claude (Sonnet 4.5) completed reorganization.
+
+## Final State Summary
+
+All ~112 files have been organized into logical branches. Each branch has a clean, focused commit.
+
+### Branch Status
+
+| Branch | Commit | Files | Description |
+|--------|--------|-------|-------------|
+| `feature/agent-ui-improvements` | `29931139f5` | 19 files | Agent UI, tool dispatcher, dev assist tools |
+| `infra/ci-test-overhaul` | `aa411a5d1b` | 23 files | CI/CD workflows, test infrastructure, docs |
+| `test/e2e-dungeon-coverage` | `28147624a3` | 18 files | Dungeon E2E and integration tests |
+| `chore/misc-cleanup` | `a01a630c7f` | 39 files | Misc cleanup, docs, unit tests, style |
+| `fix/overworld-logic` | `00fef1169d` | 2 files | Overworld test fixes |
+| `backup/all-uncommitted-work-2024-11-22` | `5e32a8983f` | 112 files | Full backup (safety net) |
+
+### What's in Each Branch
+
+**`feature/agent-ui-improvements`** (Ready for review)
+- `src/app/editor/agent/agent_chat_widget.cc`
+- `src/app/editor/agent/agent_editor.cc`
+- `src/app/editor/system/proposal_drawer.cc`
+- `src/cli/service/agent/tool_dispatcher.cc/.h`
+- `src/cli/service/agent/dev_assist_agent.cc/.h`
+- `src/cli/service/agent/tools/*` (new tool modules)
+- `src/cli/service/agent/emulator_service_impl.cc/.h`
+- `src/cli/service/ai/prompt_builder.cc`
+- `src/cli/tui/command_palette.cc`
+- `test/integration/agent/tool_dispatcher_test.cc`
+
+**`infra/ci-test-overhaul`** (Ready for review)
+- `.github/workflows/ci.yml`, `release.yml`, `nightly.yml`
+- `.github/actions/run-tests/action.yml`
+- `cmake/options.cmake`, `cmake/packaging/cpack.cmake`
+- `AGENTS.md`, `CLAUDE.md`
+- `docs/internal/agents/*` (coordination docs)
+- `docs/internal/ci-and-testing.md`
+- `docs/internal/CI-TEST-STRATEGY.md`
+- `test/test.cmake`, `test/README.md`
+
+**`test/e2e-dungeon-coverage`** (Ready for review)
+- `test/e2e/dungeon_canvas_interaction_test.cc/.h`
+- `test/e2e/dungeon_e2e_tests.cc/.h`
+- `test/e2e/dungeon_layer_rendering_test.cc/.h`
+- `test/e2e/dungeon_object_drawing_test.cc/.h`
+- `test/e2e/dungeon_visual_verification_test.cc/.h`
+- `test/integration/zelda3/dungeon_*`
+- `test/unit/zelda3/dungeon/object_rendering_test.cc`
+- `docs/internal/testing/dungeon-gui-test-design.md`
+
+**`chore/misc-cleanup`** (Ready for review)
+- `src/CMakeLists.txt`, `src/app/editor/editor_library.cmake`
+- `src/app/controller.cc`, `src/app/main.cc`
+- `src/app/service/canvas_automation_service.cc`
+- `src/app/gui/style/theme.h`
+- `docs/internal/architecture/*`
+- `docs/internal/plans/*` (including this file)
+- `test/yaze_test.cc`, `test/test_utils.cc`, `test/test_editor.cc`
+- Various unit tests updates
+
+**`fix/overworld-logic`** (Ready for review)
+- `test/integration/zelda3/overworld_integration_test.cc`
+- `test/unit/zelda3/overworld_test.cc`
+
+## Items NOT Committed (Still Untracked)
+
+These items remain untracked and need manual attention:
+- `.tmp/` - Contains ZScreamDungeon submodule (should be in .gitignore?)
+- `third_party/bloaty` - Another git repo (should be submodule?)
+- `CIRCULAR_DEPENDENCY_*.md` - Temporary analysis artifacts (delete?)
+- `FIX_CIRCULAR_DEPS.patch` - Temporary patch (delete?)
+- `debug_crash.lldb` - Debug file (delete)
+- `fix_dungeon_colors.py` - One-off script (delete?)
+- `test_grpc_server.sh` - Test script (keep or delete?)
+
+## Recommended Merge Order
+
+1. **First**: `infra/ci-test-overhaul` - Updates CI and test infrastructure
+2. **Second**: `test/e2e-dungeon-coverage` - Adds new tests
+3. **Third**: `feature/agent-ui-improvements` - Agent improvements
+4. **Fourth**: `fix/overworld-logic` - Small test fix
+5. **Last**: `chore/misc-cleanup` - Docs and cleanup (may need rebasing)
+
+## Notes for Gemini 3
+
+- All branches are based on `master` at commit `0d18c521a1`
+- The `feature/debugger-disassembler` branch still has its original commit - preserved
+- Stashes are still available if needed (`git stash list`)
+- The `backup/all-uncommitted-work-2024-11-22` branch has EVERYTHING as a safety net
+- Consider creating PRs for review before merging
+
+## Quick Commands
+
+```bash
+# See all organized branches
+git branch -a | grep -E '(feature|infra|test|chore|fix|backup)/'
+
+# View commits on a branch
+git log --oneline master..branch-name
+
+# Merge a branch (after review)
+git checkout master
+git merge --no-ff branch-name
+
+# Delete backup after all merges confirmed
+git branch -D backup/all-uncommitted-work-2024-11-22
+```