modified: amazon/approve.py
modified: amazon/asin_status.py
new file: amazon/chrome_base.py
modified: amazon/del_brand.py
modified: amazon/detail_spider.py
new file: "amazon/detail_spider_\345\244\207\344\273\275.py"
modified: amazon/main.py
modified: amazon/match_action.py
modified: amazon/price_match.py
new file: amazon/similar_asin.py
modified: app.py
new file: assets/appearance-patent-Br1dtmol.css
new file: assets/appearance-patent-D1DgeYhe.css
new file: assets/delete-brand-BfMLVSQU.css
new file: assets/patrol-delete-BAzbYtgc.css
new file: assets/price-track-Hozgt_em.css
new file: assets/product-risk-CbX7bwZi.css
new file: assets/query-asin-B4RsOiza.css
new file: assets/shop-match-B2HWAgBY.css
modified: main.py
Master still tracked a small set of generated __pycache__ artifacts after merging dev/koko. The ignore rules already match dev/koko, so this commit only removes the remaining bytecode files from the Git index while leaving local files on disk.
Constraint: dev/koko .gitignore already contains recursive __pycache__ ignore coverage
Rejected: Delete local cache directories | repository tracking cleanup only requires --cached removal
Confidence: high
Scope-risk: narrow
Tested: git ls-files shows no remaining paths containing __pycache__/
Not-tested: Application runtime; generated bytecode tracking only
Conflict resolution kept master-side changes for non-patrol-delete files as requested. No app/amazon/patrol_delete.py conflict was present. Existing dev/koko assets were retained so /assets resources required by new_web_source pages resolve in the Flask app.
Constraint: User requested authentication-requiring git operations be reported as commands only
Rejected: Rework non-conflicting dev/koko changes during merge | scope was conflict resolution, not feature review
Confidence: high
Scope-risk: moderate
Tested: uv run python -c Flask test client returned 200 for /new_web_source/patrol-delete.html, /assets/patrol-delete.js, /assets/pywebview-C66x_2Dh.js
Tested: uv run python -m py_compile amazon\\patrol_delete.py amazon\\detail_spider.py amazon\\price_match.py main.py
Tested: uv run --group dev pytest tests\\test_patrol_delete.py tests\\test_amazon_base.py
Not-tested: authenticated Git push/pull; Java backend build
