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
Generated __pycache__ files were already ignored in some paths but remained tracked in the repository, which caused merge noise and binary conflicts. This removes the tracked bytecode from the index and adds an explicit recursive ignore rule so future Python runs do not reintroduce them.
Constraint: Existing repository history already tracked pycache files across app, backend, and source_code
Rejected: Delete local pycache directories from disk | only repository tracking needed to be removed
Confidence: high
Scope-risk: narrow
Directive: Do not force-add __pycache__ or *.pyc files unless there is a documented runtime packaging reason
Tested: git ls-files shows no remaining paths containing __pycache__/
Not-tested: Application runtime; change only affects tracked generated artifacts and ignore rules
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
The patrol-delete flow now waits for country and listing-status controls before acting, uses the dedicated PatrolDeleteTask entry point, and includes the browser helper scripts required by the bulk-delete path. Tests cover delayed dropdown readiness, payload rejection/retry behavior, complete-draft normalization, filtered bulk deletion, and asset fallback lookup.
Constraint: Amazon listing UI exposes status controls through dynamic KAT components and delayed option rendering
Rejected: Keep row-by-row delete flow | bulk selection is the current implemented path and is covered by the added helper scripts
Confidence: high
Scope-risk: moderate
Directive: Do not remove the patrol_delete JS helper files without checking app/amazon/patrol_delete.py script loading
Tested: uv run --group dev pytest tests\\test_amazon_base.py tests\\test_patrol_delete.py
Tested: uv run python -m py_compile amazon\\base.py amazon\\main.py blueprints\\main.py
Not-tested: Real Amazon Seller Central browser session
Patrol delete can spend a long time switching countries, reading listing states, and confirming deletes, so the flow now emits concise progress logs around each high-value step. The logs avoid full DOM dumps outside existing diagnostics and focus on task, shop, country, status, deletion counts, and callback boundaries.
Constraint: Existing patrol delete runs are browser-driven and need observable progress without changing deletion behavior
Rejected: Log every DOM probe | too noisy for routine task monitoring
Confidence: high
Scope-risk: narrow
Tested: uv run --group dev pytest tests\\test_patrol_delete.py
Tested: uv run --group dev ruff check amazon\\patrol_delete.py
Tested: uv run python -m py_compile amazon\\patrol_delete.py
Not-tested: Live Seller Central browser run
Keep the patrol deletion test module aligned with the renamed patrol_delete implementation and update test function names so future searches no longer point at the old product module name.
Constraint: This is a naming-only follow-up to the patrol_delete module rename
Confidence: high
Scope-risk: narrow
Tested: uv run pytest tests/test_patrol_delete.py
Rename the patrol deletion implementation and browser helper scripts away from the generic product name so the filesystem matches the queued patrol-delete task domain. Update imports, script loading, and tests to use the patrol_delete module path.
Constraint: Existing task class remains ProductTask to avoid broad API churn beyond the requested file and script naming
Rejected: Rename ProductTask class now | would expand the change into a larger API update across tests and task dispatch
Confidence: high
Scope-risk: narrow
Directive: Keep patrol-delete script paths under app/amazon/scripts/patrol_delete when adding new helper scripts
Tested: uv run pytest tests/test_product.py
Not-tested: Remote push before this commit due previous SSH publickey failure
Merge origin/master into dev/koko while preserving the patrol delete task added on dev/koko. The task dispatcher now recognizes both patrol deletion and appearance patent collection, and the master-side SpiderTask implementation is included.
Constraint: origin fetch and push over SSH are blocked in this environment by Gitee publickey authentication
Rejected: Overwrite dev/koko with master | would drop the patrol delete branch work
Confidence: medium
Scope-risk: moderate
Directive: Do not remove either patrol-delete-run or appearance-patent-run without checking queued task producers
Tested: python -m py_compile app/amazon/approve.py app/amazon/asin_status.py app/amazon/detail_spider.py app/amazon/main.py app/amazon/match_action.py app/amazon/price_match.py
Not-tested: Remote push, blocked by SSH publickey authentication
Update the README so new contributors start from the latest patrol-delete automation flow instead of treating delete-brand as the primary example. Keep the older delete-brand path as contrast for the file-driven workflow.
Constraint: Recent repository changes made patrol-delete the newest automation module, so the onboarding example needed to match current development reality
Rejected: Leave delete-brand as the primary example | would mislead readers about the latest automation entry point
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Revisit this section when a newer automation module replaces patrol-delete as the primary example
Tested: README diff review
Not-tested: lint, typecheck, unit/integration tests not run (documentation-only change)
Add a root README that explains the active runtime layers and onboarding path, and keep local OMX session state out of version control so developer tooling does not interfere with pulls.
Constraint: Local OMX state is developer-specific and should not block branch sync or appear in shared history
Rejected: Keep onboarding notes untracked | easy to lose and hard to share with the team
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Keep the README aligned with the active app/backend-java/frontend-vue execution path; revisit if the runtime architecture changes
Tested: git diff review; git status after staging
Not-tested: lint, typecheck, unit/integration tests not run (docs and ignore rules only)
new file: assets/_plugin-vue_export-helper-xvHHTGU_.css
new file: assets/convert-1dkFPbKa.css
new file: assets/convert-6b0yq-M0.css
new file: assets/convert-BxkpMHO9.css
new file: assets/convert-D4Yv2oRy.css
new file: assets/convert-DwbQug2y.css
modified: assets/convert.js
new file: assets/dedupe-B0eqpVpj.css
new file: assets/dedupe-BHE_BCAJ.css
new file: assets/dedupe-Day_nGxq.css
new file: assets/dedupe-DzFvTfoj.css
new file: assets/dedupe-rhGu1E8E.css
modified: assets/dedupe.js
new file: assets/el-alert-Ct0RpqUD.css
new file: assets/pywebview-B6ZNXusn.css
new file: assets/pywebview-BRrok0pS.js
new file: assets/pywebview-BnpJyyGZ.js
new file: assets/pywebview-CGwF8TuM.js
new file: assets/pywebview-Chz98E9c.css
new file: assets/pywebview-D-PKWjUg.js
new file: assets/pywebview-DVgP2-kW.js
new file: assets/pywebview-IqgMfeBe.css
new file: assets/pywebview-Rm5Hhqpf.js
new file: assets/pywebview-leZCedEt.js
new file: assets/split-BsJfbBqn.css
new file: assets/split-DAa_Usoh.css
new file: assets/split-DidKJ84l.css
new file: assets/split-R_8V5xgh.css
new file: assets/split-_O6NHqDj.css
modified: assets/split.js
modified: blueprints/__pycache__/brand.cpython-311.pyc
modified: blueprints/__pycache__/brand.cpython-39.pyc
modified: blueprints/brand.py
modified: config.py
modified: main.py
modified: new_web_source/convert.html
modified: new_web_source/dedupe.html
modified: new_web_source/split.html
new file: app/assets/_plugin-vue_export-helper-xvHHTGU_.css
new file: app/assets/convert-1dkFPbKa.css
new file: app/assets/convert-BxkpMHO9.css
new file: app/assets/convert-DwbQug2y.css
modified: app/assets/convert.js
new file: app/assets/dedupe-B0eqpVpj.css
new file: app/assets/dedupe-DzFvTfoj.css
new file: app/assets/dedupe-rhGu1E8E.css
modified: app/assets/dedupe.js
new file: app/assets/el-alert-Ct0RpqUD.css
new file: app/assets/pywebview-B6ZNXusn.css
new file: app/assets/pywebview-BnpJyyGZ.js
new file: app/assets/pywebview-CGwF8TuM.js
new file: app/assets/pywebview-D-PKWjUg.js
new file: app/assets/pywebview-IqgMfeBe.css
new file: app/assets/split-DAa_Usoh.css
new file: app/assets/split-DidKJ84l.css
new file: app/assets/split-R_8V5xgh.css
modified: app/assets/split.js
modified: app/blueprints/__pycache__/main.cpython-39.pyc
modified: app/blueprints/main.py
modified: app/main.py
modified: app/new_web_source/convert.html
modified: app/new_web_source/dedupe.html
modified: app/new_web_source/split.html
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
new file: app.py
new file: app/ali_oss.py
new file: app/app.py
new file: app/app_common.py
new file: app/config.py
new file: app/coze.py
new file: app/generate_api.py
new file: app/html_crypto.py
new file: app/main.py
new file: app/web_source/admin.html
new file: app/web_source/brand.html
new file: app/web_source/home.html
new file: app/web_source/index.html
new file: app/web_source/login.html
new file: app_common.py
new file: blueprints/__init__.py
new file: blueprints/__pycache__/__init__.cpython-311.pyc
new file: blueprints/__pycache__/__init__.cpython-39.pyc
new file: blueprints/__pycache__/admin.cpython-311.pyc
new file: blueprints/__pycache__/admin.cpython-39.pyc
new file: blueprints/__pycache__/auth.cpython-311.pyc
new file: blueprints/__pycache__/auth.cpython-39.pyc
new file: blueprints/__pycache__/brand.cpython-311.pyc
new file: blueprints/__pycache__/brand.cpython-39.pyc
new file: blueprints/__pycache__/image.cpython-311.pyc
new file: blueprints/__pycache__/image.cpython-39.pyc
new file: blueprints/__pycache__/main.cpython-311.pyc
new file: blueprints/__pycache__/main.cpython-39.pyc
new file: blueprints/admin.py
new file: blueprints/auth.py
new file: blueprints/brand.py
new file: blueprints/image.py
new file: blueprints/main.py
new file: brand_spider/__pycache__/main.cpython-39.pyc
new file: brand_spider/__pycache__/web_dec.cpython-39.pyc
new file: brand_spider/main.py
new file: brand_spider/web_dec.py
new file: config.py
new file: coze.py
new file: generate_api.py
new file: html_crypto.py
new file: main.py
new file: static/bg.jpg
new file: "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: "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: tool/.device_id
new file: tool/__pycache__/devices.cpython-311.pyc
new file: tool/__pycache__/devices.cpython-39.pyc
new file: tool/devices.py
2026-03-20 11:23:57 +08:00
2 changed files with 549 additions and 541 deletions
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
