The merge keeps dev/koko patrol-delete asset fallback behavior while accepting the latest master feature work. Conflicts were limited to ignore rules, local environment/config artifacts, tracked pycache binaries, and the Flask main blueprint.
Constraint: master and dev/koko both edited app/blueprints/main.py around brand and asset serving
Rejected: Drop dev/koko asset fallback logic | patrol delete and rebuilt Vite assets still need hashed asset resolution across app/new_web_source locations
Confidence: medium
Scope-risk: broad
Directive: app/.env remains a tracked local-config file in this repository; do not print or normalize secrets during conflict handling
Tested: uv run python -m py_compile blueprints\\main.py amazon\\base.py amazon\\main.py
Tested: uv run --group dev pytest tests\\test_amazon_base.py tests\\test_patrol_delete.py
Not-tested: Full backend-java/frontend-vue test suites
new file: app/blueprints/__pycache__/__init__.cpython-311.pyc
new file: app/blueprints/__pycache__/__init__.cpython-39.pyc
new file: app/blueprints/__pycache__/admin.cpython-311.pyc
new file: app/blueprints/__pycache__/admin.cpython-39.pyc
new file: app/blueprints/__pycache__/auth.cpython-311.pyc
new file: app/blueprints/__pycache__/auth.cpython-39.pyc
new file: app/blueprints/__pycache__/brand.cpython-311.pyc
new file: app/blueprints/__pycache__/brand.cpython-39.pyc
new file: app/blueprints/__pycache__/image.cpython-311.pyc
new file: app/blueprints/__pycache__/image.cpython-39.pyc
new file: app/blueprints/__pycache__/main.cpython-311.pyc
new file: app/blueprints/__pycache__/main.cpython-39.pyc
new file: app/blueprints/admin.py
new file: app/blueprints/auth.py
new file: app/blueprints/brand.py
new file: app/blueprints/image.py
new file: app/blueprints/main.py
new file: app/brand_spider/__pycache__/main.cpython-39.pyc
new file: app/brand_spider/__pycache__/web_dec.cpython-39.pyc
new file: app/brand_spider/main.py
new file: app/brand_spider/web_dec.py
new file: app/static/bg.jpg
new file: "app/static/\345\223\201\347\211\214\346\226\207\346\241\243\346\240\274\345\274\217_\346\250\241\346\235\277.xlsx"
new file: "app/static/\346\250\241\346\235\2772-\344\273\245\346\226\207\344\273\266\345\244\271\346\226\271\345\274\217\344\270\212\344\274\240.zip"
new file: app/tool/.device_id
new file: app/tool/__pycache__/devices.cpython-311.pyc
new file: app/tool/__pycache__/devices.cpython-39.pyc
new file: app/tool/devices.py
