diff --git a/DEVLOG.md b/DEVLOG.md index 3500474..f8cf89a 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -3160,3 +3160,8 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发 先读总体设计与11月5日、10日、11日明确决定,发现6c5afe2把试探预算扩展为整轮自动新增禁令,与既定规则冲突。用户明确按既定规则修正:原建仓预算保持硬限,后续补仓、网格和做T独立审批;同时恢复预算内分批合并。用户另确认人工止损价按总体设计触价清仓,复用退出流程,保存命令与有效行情,遵守全局暂停、撤单和入账收尾、T+1、部分成交及迟到买入,不等第二条模型信号。 11:19在155只读核验四方新择时以来7条相关审计:11月12日首次QRS加资金异动,随后资金异动失效,13日和16日仅QRS看空,没有保存的第二个有效合成看空。当前四只持仓均无人工止损价命令,不替用户补设。规则来源、测试矩阵和证据已入[建平仓规则对齐](docs/建平仓规则对齐与人工止损验收_2026-11-16.md)。开发机预算45例、二次确认19例、人工止损19例及最终88组断网隔离回归通过;候选镜像和发布另记,不将本地通过当作真机成交判收。 + + +11:57:10将最终代码`7c60cdc`定向发布155 web与worker。开发机最终88组、预算45例、二次确认19例、人工止损19例及页面三道护栏通过;候选web断网88组、worker87组通过。保留角色原ETF参数和页面差异,22个补丁文件实际核验;停止消费并排空后复查健康再重建。其他28容器与唯一WS保持,参数及发布前后持仓、历史批次全部字段不变。 + +11:57新worker只读确认雷赛、宁德、四方仍因首次信号停买,中文在线仍待当日复核且原预算17226元;四只持仓无人工止损价。11:58九类自然任务到达,盘中执行等明确休市跳过,不能当成盘中规则或触价成交判收。11:59:26连续确认与接收1894916一致,缺口、待入账、孤儿、在途均0,资金年龄27.8秒,数量及现金差为0。镜像、证据、回退条件和未完成项已更新[整改接续](docs/交易计划与风险约束整改接续_2026-11-16.md)。没有改参数、补设止损价、人工触发模型或交易tick。 diff --git a/docs/evidence/entry_exit_rules_release_20261116.json b/docs/evidence/entry_exit_rules_release_20261116.json new file mode 100644 index 0000000..fa8543d --- /dev/null +++ b/docs/evidence/entry_exit_rules_release_20261116.json @@ -0,0 +1,570 @@ +{ + "code": "7c60cdc7cc49b818815247dec4f3251a2535f67a", + "scope": "155模拟PMS;仅web和worker", + "final_verified_at": "2026-11-16T11:59:26.872660+08:00", + "candidate": { + "code": "7c60cdc7cc49b818815247dec4f3251a2535f67a", + "patch_sha256": "06b7316d67f9a2d48db4b23386ff1835a6592fe8ce41e6d590570dd2b3084d38", + "targets": { + "web": { + "base": "pms:remediation-budget-6c5afe2-web", + "base_id": "sha256:dc04b401c1640d914d2f8321114c9bd1dbccf3948a152dd7a882ddaafcfd7949", + "candidate": "pms:remediation-rules-7c60cdc-web", + "image_id": "sha256:e53225e9eb8126d344514e14250af4b26608aa03d254be9e9a5fa412b970c092", + "files": { + "app/core/action_engine.py": "70057466fa03f8cec0819b0139a509fe8bc35bb328a73c0a475d8a65fb82db2b", + "app/core/buy_budget.py": "cd41279044f3014b290f9bb00ddbf0db3580798a3f9c2a3fe8a98c6cc24656a6", + "app/core/command_spec.py": "09ca357f73ec630caccd3fcfe740abe88810b36a53eb1f2246f09fa1e084d0dc", + "app/core/risk_exit.py": "8ae6ebe1d5c7f77847806d9d8cc65785e7dba6400364991a616413af210ab930", + "app/core/rule_gate.py": "bfce46ac973e96fd2a8b34b59d1f8c23904d1b75264ec6aac0c7c0054cff7500", + "app/services/buy_budget.py": "8fd2023c4a47ae64647c7591ec6b6a78bf1914b825fc272ccd01fd33266af3d7", + "app/services/command_service.py": "9eedb85db6d9aa28576949957aa62481b17bd0e0063388f6d78c3c2a1fe2a6ce", + "app/services/executor.py": "5b3c198380c8990ba148036053053b073b7197e6be2f5432db42fa82aaa9f1c2", + "app/services/param_store.py": "51eed308b53a5e702cb71bd553560925c361ebf5b8046d501feb083d69e0f50c", + "app/services/proposal_service.py": "d557b3e069fd9a67c0f493762f7ce3dcc8183a648dbd264a0208c59ddb89eb9b", + "app/services/risk_exit.py": "bb27523efdbc1f98cd985732f5a868995427c906c61c54b0f2badc59f236d84f", + "app/services/strategy_advisor.py": "434bbad07847cc3a86501048a808b0dc150c76bcf6cdf038ad11493b90833dcb", + "app/services/strategy_runner.py": "560dc9afca5190325b8fd1a75c28fc3b4c19f19e57f7baabdc136b0c40002dd0", + "app/web/main.py": "803949fcf7f2e6a88938c64c01e4f33ceb308a020dbba63ec67f1f261926dac2", + "app/web/static/index.html": "66be6b3c2c011b360e41a381502817e93bfe1324e2f8f21cdedea9816f4fc598", + "scripts/run_tests.py": "e6c431ac2036aedb4adf4529f3ca79a259a1c187bcc2acc7d09b2c3bda22dfa5", + "scripts/test_batch3_units.py": "323d9023d680a666508dde41344c0912463f2f26b79216d7124455660e42e65f", + "scripts/test_buy_budget.py": "c8c8d6ea52a9b5333fa776ceb8f4109e0b3f4829eb1ac631b94f3afc69f6d7f9", + "scripts/test_risk_exit.py": "675789e20faa9e0bc58cc3c557c9b2a3ce9c1830dfa4f4548790421ddeafa25a", + "scripts/test_timing_fusion.py": "2dbe99229debe5a783582bdfffb667e37a7c9d58fb1a468a8ae8dc038c5e563b", + "scripts/test_trade_correction_strategy.py": "5320cbb7c77b50a329d278114951d7a78f8861e1bca921396d63f3ac58a96d04", + "scripts/test_user_stop.py": "62b2d5ff066884170bae7ee80eee33f1ca858050271ea7633e7e179620ae601e" + }, + "suites": 88, + "passed": true + }, + "worker": { + "base": "pms:remediation-budget-6c5afe2-worker", + "base_id": "sha256:96bfd729fc83cdebf7a87393795898f893f7c16c4296fc152f15cac6840d42fd", + "candidate": "pms:remediation-rules-7c60cdc-worker", + "image_id": "sha256:5397eadc2c74b40848d99ed9aeb925a00ff9013a6fc10f6a837d75df16e6bc7e", + "files": { + "app/core/action_engine.py": "70057466fa03f8cec0819b0139a509fe8bc35bb328a73c0a475d8a65fb82db2b", + "app/core/buy_budget.py": "cd41279044f3014b290f9bb00ddbf0db3580798a3f9c2a3fe8a98c6cc24656a6", + "app/core/command_spec.py": "09ca357f73ec630caccd3fcfe740abe88810b36a53eb1f2246f09fa1e084d0dc", + "app/core/risk_exit.py": "8ae6ebe1d5c7f77847806d9d8cc65785e7dba6400364991a616413af210ab930", + "app/core/rule_gate.py": "bfce46ac973e96fd2a8b34b59d1f8c23904d1b75264ec6aac0c7c0054cff7500", + "app/services/buy_budget.py": "8fd2023c4a47ae64647c7591ec6b6a78bf1914b825fc272ccd01fd33266af3d7", + "app/services/command_service.py": "9eedb85db6d9aa28576949957aa62481b17bd0e0063388f6d78c3c2a1fe2a6ce", + "app/services/executor.py": "5b3c198380c8990ba148036053053b073b7197e6be2f5432db42fa82aaa9f1c2", + "app/services/param_store.py": "4dcd5098cd76787c63443547a5dabc28f17b7268c2313d6353c939a6dd6a915e", + "app/services/proposal_service.py": "d557b3e069fd9a67c0f493762f7ce3dcc8183a648dbd264a0208c59ddb89eb9b", + "app/services/risk_exit.py": "bb27523efdbc1f98cd985732f5a868995427c906c61c54b0f2badc59f236d84f", + "app/services/strategy_advisor.py": "434bbad07847cc3a86501048a808b0dc150c76bcf6cdf038ad11493b90833dcb", + "app/services/strategy_runner.py": "560dc9afca5190325b8fd1a75c28fc3b4c19f19e57f7baabdc136b0c40002dd0", + "app/web/main.py": "9025a17547a7589b5763c57e1dcd6c6f4fc4eb76f6b37e35f1a5d4f3c029e0ac", + "app/web/static/index.html": "b95f3f97871c1841fa7b9d6804a25df3a5a1d7a24de439e27f2892783ab3cf93", + "scripts/run_tests.py": "6fbe821105f2e459a895411355a14278375f21705880a0e6da4b50bd1fb95d82", + "scripts/test_batch3_units.py": "323d9023d680a666508dde41344c0912463f2f26b79216d7124455660e42e65f", + "scripts/test_buy_budget.py": "c8c8d6ea52a9b5333fa776ceb8f4109e0b3f4829eb1ac631b94f3afc69f6d7f9", + "scripts/test_risk_exit.py": "675789e20faa9e0bc58cc3c557c9b2a3ce9c1830dfa4f4548790421ddeafa25a", + "scripts/test_timing_fusion.py": "2dbe99229debe5a783582bdfffb667e37a7c9d58fb1a468a8ae8dc038c5e563b", + "scripts/test_trade_correction_strategy.py": "5320cbb7c77b50a329d278114951d7a78f8861e1bca921396d63f3ac58a96d04", + "scripts/test_user_stop.py": "62b2d5ff066884170bae7ee80eee33f1ca858050271ea7633e7e179620ae601e" + }, + "suites": 87, + "passed": true + } + }, + "completed_at": "2026-11-16T11:54:32.238195+08:00" + }, + "local_tests": { + "source_commit": "7c60cdc7cc49b818815247dec4f3251a2535f67a", + "machine": "开发机Python3.12.14", + "isolation": "unit_test_guard清除业务环境、临时工作目录、阻断联网", + "logs": { + "full": { + "local_path": "/private/tmp/pms-rules-release-full.log", + "sha256": "540267477c7844b743376a7ae7d2fe94b6f23bf25f5aeaed916ee970cc91c4af", + "passed": true, + "suites": 88, + "tests": null + }, + "budget": { + "local_path": "/private/tmp/pms-rules-budget-tests.log", + "sha256": "05834b0e7f6ce1f7ec588fbab9d4fa5bb1384bedd0b78562ccebde1a60af8a34", + "passed": true, + "suites": null, + "tests": [ + "45" + ] + }, + "timing": { + "local_path": "/private/tmp/pms-rules-timing-tests.log", + "sha256": "0405c2b2553b81fd5722481ef25ef71247bba1ad735ed56147284cbfa6e1ba12", + "passed": true, + "suites": null, + "tests": [ + "19" + ] + }, + "user_stop": { + "local_path": "/private/tmp/pms-user-stop-tests.log", + "sha256": "8093c82e6c3fa7d2d3cfa02c255939fe0e748c2ebb474b52d31b7f6f5903ac66", + "passed": true, + "suites": null, + "tests": [ + "19" + ] + } + } + }, + "role_differences_preserved": { + "web": [ + "scripts/run_tests.py" + ], + "worker": [ + "app/services/param_store.py", + "app/web/main.py", + "app/web/static/index.html", + "scripts/run_tests.py" + ] + }, + "deployment": { + "deployed_at": "2026-11-16T11:57:10.363659+08:00", + "targets": [ + "pms-web", + "pms-worker" + ], + "drained": { + "active": 0, + "reserved": 0, + "scheduled": 0, + "active_queues": 0 + }, + "images": { + "web": "pms:remediation-rules-7c60cdc-web", + "worker": "pms:remediation-rules-7c60cdc-worker" + } + }, + "configuration_backup": "/home/factor/project/tradingSystem/backups/remediation-rules-20261116-7c60cdc", + "after_drain_health": { + "at": "2026-11-16T11:57:05.251183+08:00", + "prefix": "", + "scope": "pms-sim-155", + "params": { + "PMS_DISPATCH_MODE": "ws", + "PMS_GLOBAL_BUY_HALT": false, + "PMS_GLOBAL_EXEC_HALT": false, + "PMS_AUTO_GRID_STEP_PCT": 0.04, + "PMS_RISK_EXIT_ENABLED": true, + "PMS_TIMING_FUSION_ENABLED": true, + "PMS_TIMING_FUSION_START_AT": "2026-11-11T16:17:11.269641+08:00", + "PMS_SELF_DECIDE_TRIAL": true + }, + "ws": { + "conn_state": "ONLINE", + "last_seq": 1894880, + "acked_seq": 1894880, + "resync_flag": 0, + "heartbeat_at": "2026-11-16 11:57:04", + "last_error": "", + "stat": { + "rx": 252884, + "tx": 460933, + "trades": 10, + "rejects": 0, + "reconnects": 2, + "dropped": 0, + "last_rx_at": "11:57:02", + "last_tx_at": "11:57:03", + "hs_server_seq": 1738206, + "hs_last_seq": 1738206, + "snap_positions_at": "11:56:59", + "snap_positions_n": 4, + "snap_funds_at": "11:56:59", + "seq_hwm": 1894880, + "peer_skew_ms": 11, + "ooo": 0, + "pending_gap": 0, + "funds_update_at": "10:00:54", + "funds_update_n": 10, + "position_update_at": "09:47:45", + "position_update_n": 6, + "last_close": "TimeoutError: timed out during handshake", + "peer_skew_min": -128, + "peer_skew_max": 2721 + } + }, + "funds": { + "seq": 1894879, + "received_at": "2026-11-16 11:56:59", + "age_sec": 6.1 + }, + "pending": 0, + "orphan": 0, + "open_orders": 0, + "reconciliation": { + "ok": true, + "diffs": [], + "fixes": [], + "errors": [], + "severity": "OK", + "source": "ws", + "note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略" + }, + "cash_difference": 0.0, + "valuation_ready": true, + "positions": [ + { + "strategy_book": null, + "ts_code": "002979.SZ", + "total_qty": 100, + "avg_cost": null, + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "300750.SZ", + "total_qty": 100, + "avg_cost": "252.880", + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "601126.SH", + "total_qty": 2700, + "avg_cost": "31.313", + "base_qty": 700 + }, + { + "strategy_book": null, + "ts_code": "603259.SH", + "total_qty": 100, + "avg_cost": "150.580", + "base_qty": 100 + } + ], + "files": { + "app/core/grid_inventory.py": "e72ef0b16bee924a4fc26ad6e30bc3608096cbc5176044adb27e644c74b335c8", + "app/services/strategy_runner.py": "5ae8a87757b17ca03d8a4492cc637017382c1491b0734242c340779b2aa6fd8f", + "scripts/test_grid_execution.py": "55ca2b7c298a48f65e940238f8def173f247079f6601f7f68342fd58a80d7888" + }, + "http_health": 200, + "health": { + "status": "ok", + "version": "0.2.0-dev", + "service": "pms-web", + "now": "2026-11-16 11:57:05", + "trade_day": true, + "calendar_degraded": false, + "db_ok": true + } + }, + "post_deploy_verify": { + "at": "2026-11-16T11:57:47.479160+08:00", + "total_containers": 30, + "unchanged_other_containers": 28, + "targets": [ + { + "name": "pms-web", + "id": "95591a2e14f521a82164b289119ca7125ed621120ec9cb8035e1e233b7b38e69", + "image": "sha256:e53225e9eb8126d344514e14250af4b26608aa03d254be9e9a5fa412b970c092", + "tag": "pms:remediation-rules-7c60cdc-web", + "started": "2026-11-16T03:57:09.760711117Z", + "health": "healthy", + "files_match_candidate": true + }, + { + "name": "pms-worker", + "id": "c7c006f911affe164a99d08f91bbebf5d08887a12b28d672a13521538f3d11d8", + "image": "sha256:5397eadc2c74b40848d99ed9aeb925a00ff9013a6fc10f6a837d75df16e6bc7e", + "tag": "pms:remediation-rules-7c60cdc-worker", + "started": "2026-11-16T03:57:09.759823863Z", + "health": null, + "files_match_candidate": true + } + ], + "private_configuration_unchanged": true, + "worker": { + "queues": [ + "celery" + ], + "tasks": [ + "pms.command_poll", + "pms.daily_report", + "pms.daily_settle", + "pms.execution_basis_refresh", + "pms.execution_cancel_confirm", + "pms.intraday_exec", + "pms.macro_scan", + "pms.monitor_watch_sync", + "pms.nav_snapshot", + "pms.plan_pull", + "pms.premarket", + "pms.proposal_scan", + "pms.replay_fills", + "pms.rotation_tick", + "pms.signal_digest", + "pms.strategy_attach", + "pms.t0_close", + "pms.tech_pull" + ] + } + }, + "final_health": { + "at": "2026-11-16T11:59:26.872660+08:00", + "prefix": "", + "scope": "pms-sim-155", + "params": { + "PMS_DISPATCH_MODE": "ws", + "PMS_GLOBAL_BUY_HALT": false, + "PMS_GLOBAL_EXEC_HALT": false, + "PMS_AUTO_GRID_STEP_PCT": 0.04, + "PMS_RISK_EXIT_ENABLED": true, + "PMS_TIMING_FUSION_ENABLED": true, + "PMS_TIMING_FUSION_START_AT": "2026-11-11T16:17:11.269641+08:00", + "PMS_SELF_DECIDE_TRIAL": true + }, + "ws": { + "conn_state": "ONLINE", + "last_seq": 1894916, + "acked_seq": 1894916, + "resync_flag": 0, + "heartbeat_at": "2026-11-16 11:59:26", + "last_error": "", + "stat": { + "rx": 252920, + "tx": 461001, + "trades": 10, + "rejects": 0, + "reconnects": 2, + "dropped": 0, + "last_rx_at": "11:59:22", + "last_tx_at": "11:59:24", + "hs_server_seq": 1738206, + "hs_last_seq": 1738206, + "snap_positions_at": "11:58:59", + "snap_positions_n": 4, + "snap_funds_at": "11:58:59", + "seq_hwm": 1894916, + "peer_skew_ms": 10, + "ooo": 0, + "pending_gap": 0, + "funds_update_at": "10:00:54", + "funds_update_n": 10, + "position_update_at": "09:47:45", + "position_update_n": 6, + "last_close": "TimeoutError: timed out during handshake", + "peer_skew_min": -128, + "peer_skew_max": 2721 + } + }, + "funds": { + "seq": 1894911, + "received_at": "2026-11-16 11:58:59", + "age_sec": 27.8 + }, + "pending": 0, + "orphan": 0, + "open_orders": 0, + "reconciliation": { + "ok": true, + "diffs": [], + "fixes": [], + "errors": [], + "severity": "OK", + "source": "ws", + "note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略" + }, + "cash_difference": 0.0, + "valuation_ready": true, + "positions": [ + { + "strategy_book": null, + "ts_code": "002979.SZ", + "total_qty": 100, + "avg_cost": null, + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "300750.SZ", + "total_qty": 100, + "avg_cost": "252.880", + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "601126.SH", + "total_qty": 2700, + "avg_cost": "31.313", + "base_qty": 700 + }, + { + "strategy_book": null, + "ts_code": "603259.SH", + "total_qty": 100, + "avg_cost": "150.580", + "base_qty": 100 + } + ], + "files": { + "app/core/grid_inventory.py": "e72ef0b16bee924a4fc26ad6e30bc3608096cbc5176044adb27e644c74b335c8", + "app/services/strategy_runner.py": "560dc9afca5190325b8fd1a75c28fc3b4c19f19e57f7baabdc136b0c40002dd0", + "scripts/test_grid_execution.py": "55ca2b7c298a48f65e940238f8def173f247079f6601f7f68342fd58a80d7888" + }, + "http_health": 200, + "health": { + "status": "ok", + "version": "0.2.0-dev", + "service": "pms-web", + "now": "2026-11-16 11:59:27", + "trade_day": true, + "calendar_degraded": false, + "db_ok": true + } + }, + "natural_receipts": { + "at": "2026-11-16T11:58:27.434724+08:00", + "success_counts": { + "pms.replay_fills": 1, + "pms.execution_basis_refresh": 1, + "pms.signal_digest": 1, + "pms.rotation_tick": 1, + "pms.proposal_scan": 1, + "pms.command_poll": 1, + "pms.intraday_exec": 1, + "pms.execution_cancel_confirm": 1, + "pms.monitor_watch_sync": 1 + }, + "failed_task_names": [], + "results": { + "pms.replay_fills": { + "task_id": "9b888310-995a-46c1-a9a2-68ba812b6d66", + "status": "SUCCESS", + "result": { + "skipped": "not_in_session" + } + }, + "pms.execution_basis_refresh": { + "task_id": "084f3081-063a-4963-a0cc-e873f409630c", + "status": "SUCCESS", + "result": { + "skipped": "not_in_session" + } + }, + "pms.intraday_exec": { + "task_id": "461a9461-2503-4445-8e03-351ee51ae131", + "status": "SUCCESS", + "result": { + "skipped": "not_in_session" + } + } + } + }, + "natural_receipts_limit": "午间休市,盘中执行、回放和依据刷新返回not_in_session;仅验证自然调度到达,不是盘中规则或触价成交判收。", + "live_rule_check": { + "at": "2026-11-16T11:57:53.814557", + "scope": "pms-sim-155", + "positions": { + "002979.SZ": { + "total_qty": 100, + "exit_buy_blocker": "第一次清仓信号已确认,停止新增买入,等待第二次独立信号", + "user_stop_price": null, + "strategies": [ + { + "strategy_id": "STR_20261104_002979SZ_756400", + "type": "GRID", + "status": "ACTIVE", + "params": { + "center": 47.18, + "lower": 46.035, + "upper": 52.823, + "step_pct": 0.04, + "per_lot": 1600, + "max_capital": 76358.11 + } + } + ] + }, + "300750.SZ": { + "total_qty": 100, + "exit_buy_blocker": "第一次清仓信号已确认,停止新增买入,等待第二次独立信号", + "user_stop_price": null, + "strategies": [] + }, + "601126.SH": { + "total_qty": 2700, + "exit_buy_blocker": "第一次清仓信号已确认,停止新增买入,等待第二次独立信号", + "user_stop_price": null, + "strategies": [ + { + "strategy_id": "STR_20261109_601126SH_188403", + "type": "GRID", + "status": "ACTIVE", + "params": { + "center": 31.39, + "lower": 30.116, + "upper": 32.825, + "step_pct": 0.04, + "per_lot": 1000, + "max_capital": 67730.61 + } + } + ] + }, + "603259.SH": { + "total_qty": 100, + "exit_buy_blocker": null, + "user_stop_price": null, + "strategies": [] + } + }, + "open_budgets": { + "INS_20261112_300364SZ_OPEN_001_b8a67bfde6f2": { + "ts_code": "300364.SZ", + "status": "WAIT_REVIEW", + "qty": 600, + "budget": { + "version": 1, + "ts_code": "300364.SZ", + "amount": "17226.00", + "scale": "1.72260E+6", + "target_pct": "0.010", + "quantity_limit": 600, + "tier": "试探仓", + "min_lot_merge": true, + "basis": "买入成交金额,不含另记的交易费用", + "revision": "4b045986bec9cd911cf87131" + } + } + }, + "params": { + "PMS_SELF_DECIDE": "full", + "PMS_MIN_LOT_MERGE": true, + "PMS_PORTFOLIO_CAP": 0.7, + "PMS_STOCK_CAP": 0.08, + "PMS_RISK_EXIT_ENABLED": true, + "PMS_EXEC_MINUTE_MAX_AGE_SEC": 90 + } + }, + "unchanged_facts": { + "before_at": "2026-11-16T11:42:20.048411", + "after_at": "2026-11-16T11:58:32.367962", + "positions_equal": true, + "historical_lots_equal": true, + "params_equal": true, + "codes": [ + "002979.SZ", + "300364.SZ", + "300750.SZ", + "601126.SH", + "603259.SH" + ], + "snapshot_sha256": { + "pre": "b65162f1e3fff57af26239ac3b0931b3dfaf0576148cd143f2690ef785fbcddd", + "post": "d5084f20e37fa72a9b51e6ebdd6b2ce0049e5595549ddee086d1c26539030028" + } + }, + "not_validated_naturally": [ + "人工止损触价及T+1实际成交", + "试探预算自然最低量拒绝和报价、部分成交续单", + "网格实际库存阻断和完整卖出后的同价循环" + ] +} diff --git a/docs/交易计划与风险约束整改接续_2026-11-16.md b/docs/交易计划与风险约束整改接续_2026-11-16.md index df30b13..826995c 100644 --- a/docs/交易计划与风险约束整改接续_2026-11-16.md +++ b/docs/交易计划与风险约束整改接续_2026-11-16.md @@ -1,6 +1,6 @@ # 交易计划与风险约束整改接续 -最新规则核验:2026年11月16日11:19,北京时间。本批已按用户决定修正原试探建仓预算的适用范围,并恢复人工止损触价清仓;开发机验证与候选发布正在推进,尚不能把本批记作已上线。前次11:08运行回执仅属历史。 +最新运行核验时间:2026年11月16日11:59:26,北京时间。最终代码`7c60cdc`已于11:57:10定向发布155模拟PMS的web与worker,原建仓预算范围已纠正,人工止损触价清仓已恢复。健康、连续确认与资金数量对账通过;午间回执仅验证自然调度,盘中与触价成交仍待自然判收。 规则来源、四方证据时间线、开发落点与验收标准见[建平仓规则对齐与人工止损验收](建平仓规则对齐与人工止损验收_2026-11-16.md)。上一版“一律暂停试探持仓自动新增”的扩展错误,已由用户明确纠正,原预算保护保留,后续策略独立审批。 @@ -19,11 +19,32 @@ | 工作包 | 状态 | 下一项证据 | | --- | --- | --- | | 关键交易核验 | 主要路径已确认 | 杰普特两次模型完整输入仍缺;不阻塞确定性数量与库存修复 | -| 试探预算约束 | 已开发并发布155,隔离回归与自然调度通过 | 自然最低申报拒绝、报价变化及部分成交后的预算限制 | +| 试探预算约束 | 已发布155,按本次用户决定修正适用范围,隔离回归通过 | 自然最低申报拒绝、报价变化及部分成交后的预算限制 | | 网格库存约束 | 已开发并发布155,隔离回归与自然调度通过 | 自然行情触发库存限制,以及卖出入账后恢复同价循环 | -| 退出方案 | 二次确认可达性与四方真实证据已核验;人工止损恢复开发完成 | 本批发布、自然触价场景与价格失效比较 | +| 退出方案 | 二次确认可达性已核验,人工止损恢复已发布155 | 午后自然盘中回执、自然触价场景与价格失效比较 | | 分层评价与产品验收 | 待实施 | 历史冻结名单覆盖与当前页面任务检查 | +## 建平仓规则修正与人工止损发布 + +最终代码为`7c60cdc7cc49b818815247dec4f3251a2535f67a`,包含`35838b8`规则修正和既有清仓衔接补充。已推送整改分支并直接核对远程。开发机Python3.12最终全量88组通过,含预算45例、多源二次确认19例、人工止损19例和页面三道护栏;最终日志为`/private/tmp/pms-rules-release-full.log`。页面只修改止损说明,没有布局或交互改动。 + +| 服务 | 当前镜像 | 镜像摘要 | 候选断网全量 | +| --- | --- | --- | --- | +| web | `pms:remediation-rules-7c60cdc-web` | `sha256:e53225e9eb8126d344514e14250af4b26608aa03d254be9e9a5fa412b970c092` | 88组通过 | +| worker | `pms:remediation-rules-7c60cdc-worker` | `sha256:5397eadc2c74b40848d99ed9aeb925a00ff9013a6fc10f6a837d75df16e6bc7e` | 87组通过 | + +分别从两个角色现用预算镜像叠加22个应用与测试文件,不追平无关版本。web保留原测试登记说明;worker保留原ETF参数、页面、页面后端与测试登记差异。本次新涉及的worker参数文件和静态页面已再次与运行底层逐字比较,只有人工止损说明变化;不能声称所有角色文件都与本地HEAD逐字相同。 + +发布前备份有效私有配置,确认有效配置仅改变两项镜像。停止目标worker领取任务后,active、reserved、scheduled、active_queues均为0;排空后再核验无在途、待入账或对账差异,才重建web与worker。其他28个容器的身份、镜像和启动时间保持,唯一WS未重建。环境、挂载、ParamStore与私有配置保持,18项任务注册且恢复原celery队列。服务器源码HEAD仍为`8413bce`,本次应用代码以实际镜像和文件摘要为准。 + +11:57:53在新worker只读核验:雷赛100股、宁德100股、四方2700股仍由第一次有效清仓信号停买;去除试探整轮禁令没有解除它们的退出纪律。药明100股不再受试探标签总禁令,仍须满足自身后续审批条件。中文在线600股父指令继续WAIT_REVIEW,原预算17226元、数量上限600股。四只持仓都无有效人工止损价,没有替用户新增价格条件。发布前后五只相关股票的持仓记录、历史批次全部字段及所核参数相同。 + +11:58:27读取到9类自然任务成功回执,无任务失败。其中盘中执行、成交回放与执行依据刷新明确返回`not_in_session`,因为当前午间休市;这证明新worker恢复接收自然调度,不能当作盘中交易、人工触价或实际成交验收。禁止手动运行交易tick补造样本。 + +11:59:26最终接口200;接收与连续确认均1894916,缺口、待入账、孤儿、在途委托均为0;资金快照年龄27.8秒,数量与现金差异均0。完整脱敏证据见[规则发布回执](evidence/entry_exit_rules_release_20261116.json)。私有备份为服务器`/home/factor/project/tradingSystem/backups/remediation-rules-20261116-7c60cdc`。 + +回退前须核对期间人工止损意图、成交与在途,保留已生成清仓和账本,先用现有暂停控制阻断新增风险。恢复备份镜像会重新引入试探整轮禁令,且旧版不能识别新人工止损意图;存在人工止损待收尾时不能直接退回后放行,应优先修复或明确人工接管既有清仓。不删除退出文档、不重置次数、不覆盖历史,不重建WS。 + ## 155试探预算发布与实际回执(历史,整轮禁买口径已纠正) 代码`6c5afe2`于11:05:35完成定向发布。开发机Python3.12全量87组、预算专项41项与batch51的38项隔离通过。155候选web断网全量87组、worker断网全量86组通过。实现和预算01至09映射见[试探预算验收记录](试探预算约束实现与验收_2026-11-16.md)。 @@ -64,8 +85,8 @@ ## 下一步开发入口 -本批先完成已确认规则的纠偏和人工止损命令恢复。四方自11月12日第一次有效看空后,已保存记录中没有第二个有效合成看空,不修改退出次数、不把缺数据改成中性或看空。首批二次确认可达性用例已覆盖同日与跨日证据组合。 +本批已完成已确认规则的纠偏和人工止损命令恢复及155发布。四方自11月12日第一次有效看空后,已保存记录中没有第二个有效合成看空,不修改退出次数、不把缺数据改成中性或看空。首批二次确认可达性用例已覆盖同日与跨日证据组合。 -发布完成后补退出等待状态的业务表达,再按规格离线比较入场支撑或网格下沿失效、超期转人工复核。完整最大亏损、失效价与等待期限尚未确定,不凭单一个股选固定止损比例。分层收益评价及自然交易样本仍待完成。 +下一步补退出等待状态的业务表达,再按规格离线比较入场支撑或网格下沿失效、超期转人工复核。完整最大亏损、失效价与等待期限尚未确定,不凭单一个股选固定止损比例。分层收益评价及自然交易样本仍待完成。 本轮不修改运行参数,不调用模型或交易tick,不注入测试委托。当前四只持仓均没有有效人工止损价命令,不能把本次恢复解释成替它们补设了止损价。 diff --git a/docs/建平仓规则对齐与人工止损验收_2026-11-16.md b/docs/建平仓规则对齐与人工止损验收_2026-11-16.md index 7bd2c58..006e85d 100644 --- a/docs/建平仓规则对齐与人工止损验收_2026-11-16.md +++ b/docs/建平仓规则对齐与人工止损验收_2026-11-16.md @@ -76,7 +76,7 @@ EXIT保留总清仓数量,发单仍限当前可卖量。部分成交和跨日 | 止损05 | 审计失败回滚,指令失败保留退出意图,重试幂等;人工撤销不自动重开 | `test_user_stop.py` | | 产品01 | 设置止损弹窗明确触价清仓、暂停与T+1;不再显示“只提醒、不自动卖”,沿用现有样式 | 页面三道护栏;本次无布局或交互改动 | -开发机已完成预算45例、二次确认19例、人工止损19例隔离检查;最终全量和155候选镜像、自然调度结果在[整改接续](交易计划与风险约束整改接续_2026-11-16.md)登记。代码通过不等于真实触价成交判收,当前没有止损命令,保留自然场景待验。 +开发机预算45例、二次确认19例、人工止损19例及最终全量88组通过。最终代码`7c60cdc`于11:57:10发布155;候选web断网88组、worker87组通过,11:59对账正常。午间自然任务返回休市跳过,盘中执行另待验证。完整结果在[整改接续](交易计划与风险约束整改接续_2026-11-16.md)登记。代码通过不等于真实触价成交判收,当前没有止损命令,保留自然场景待验。 ## 后续推进 diff --git a/docs/开发入口.md b/docs/开发入口.md index 6264ba5..3cbdf3f 100644 --- a/docs/开发入口.md +++ b/docs/开发入口.md @@ -1,8 +1,8 @@ # 开发资料入口 -11月16日继续整改前已完成[建平仓规则对齐](建平仓规则对齐与人工止损验收_2026-11-16.md):用户确认原试探预算仅限本次建仓,后续策略独立审批;人工止损恢复触价清仓。四方仍只有首次有效看空,后续两组证据不足。本批开发验证及最新发布状态以[整改接续](交易计划与风险约束整改接续_2026-11-16.md)为准。下列11:05试探整轮禁买回执保留为历史,该口径已纠正。 +11月16日11:57:10已发布[建平仓规则对齐与人工止损恢复](建平仓规则对齐与人工止损验收_2026-11-16.md):试探原预算只限本次建仓,后续策略独立审批;人工止损触价清仓遵守全局暂停、撤单与T+1。11:59健康和对账通过,午间自然任务到达,盘中与触价场景待自然判收。镜像、验证和剩余工作见[整改接续](交易计划与风险约束整改接续_2026-11-16.md)。下列11:05整轮禁买回执为历史,该口径已纠正。 -11月16日11:05:35已在155发布试探预算约束,范围与预算01至09验收见[实现与验收](试探预算约束实现与验收_2026-11-16.md)。11:08对账正常,雷赛自然回执已识别试探新增限制;报价及部分成交自然样本仍待判收。实际镜像与后续退出工作入口见[整改接续](交易计划与风险约束整改接续_2026-11-16.md)。 +历史记录:11月16日11:05:35在155发布试探预算约束,范围与预算01至09验收见[实现与验收](试探预算约束实现与验收_2026-11-16.md)。11:08对账正常,雷赛自然回执已识别试探新增限制;报价及部分成交自然样本仍待判收。实际镜像与后续退出工作入口见[整改接续](交易计划与风险约束整改接续_2026-11-16.md)。 11月13日宽基查询、当日分时和类别简称见[最新接续](宽基查询接口与分时展示接续_2026-11-13.md)。13:17仅更新web为etf-names-975fa5a,177只ETF按8类跟踪指数显示简称,取消前置标签和名称悬停,点击保留原基金详情。日内只显示北京时间当日,每日净额与60日趋势保持;13:18线上映射、页面及只读对账通过。