diff --git a/UPSTREAM_PLAN_API.md b/UPSTREAM_PLAN_API.md
index d6cf5ec..22ec83a 100644
--- a/UPSTREAM_PLAN_API.md
+++ b/UPSTREAM_PLAN_API.md
@@ -690,3 +690,24 @@ make changes # 页面同款结论
- PMS meta.kind 区分 received、consumed、rechecked;消费记录包括真实顺序、有效参数和过滤原因。
- 采纳核验由 PMS_PLAN_VERSION_RECHECK 控制,默认关闭;内容更新时接口返回 ok=false、原因及更新后的 proposal,页面必须重新确认其 proposal_revision。
- 旧消费者可忽略新增字段,新消费者接受旧字段为空;无版本旧数据不能通过已启用的自主采纳核验。
+
+## 2026-11-03 补充:在选股计划中添加关注股票
+
+PMS 在原选股计划抽屉提供“添加股票”。支持按名称或代码搜索、批量输入沪深 A 股代码、填写理由和关注截止日。北交所在登记入口排除。同一股票的有效登记不重复创建,移除和到期保留历史;不会由此生成卖出或撤单命令。
+
+| 上游接口 | 用途 |
+| --- | --- |
+| `GET /plan/user-candidates/search?q=名称或代码` | 返回最多 30 个匹配的沪深 A 股名称和前缀代码 |
+| `GET /plan/user-candidates` | 返回登记及其等待评估、已评估、已到期、已移除状态 |
+| `POST /plan/user-candidates` | 登记 `codes`、`reason`、`expires_on` 和服务端提供的 `actor` |
+| `POST /plan/user-candidates/{id}/remove` | 停止该条人工关注,保留原记录 |
+
+PMS 对应路径统一为 `/api/plan/user-candidates`,沿用交易员登录权限并记操作日志。写请求以环境变量 `PMS_PLAN_WRITE_KEY` 作为 `X-Job-Key` 调用上游;值须与上游既有 `XXL_TRIGGER_KEY` 一致,仅通过环境注入,禁止进入 ParamStore、页面和日志。未配置或上游未升级时明确提示不可用。
+
+登记先持久化,再由上游计划修订任务评估。每次最多 30 只,理由最多 300 字,截止日为北京当天至未来 90 个自然日,页面默认未来 7 日。登记成功表示已保存,不等于候选合格或已下单。非修订时段等待后续有效生成或修订,不倒填晨版。
+
+人工来源仅补充原有发现条件,`pointed` 继续表示真实产业传导状态。券商覆盖、估值空间、风险、吸筹、基本面、技术面、择时及资金约束仍走原逻辑;不加分、不插队、不放大仓位,也不绕过当前前列数量和档位配置。没有原分数时返回 `score=null`,不生成虚构档位。证券名称资料缺失时仅展示。
+
+完整计划顶层 `user_candidates` 保存本版采用的登记;对应行带 `user_candidate` 和 `user_required`。后者表示候选需要人工来源才能成立。移除、到期及重新登记但尚未发布时,最新计划和逐票核验的 `pending_codes` 阻止旧来源继续被采纳。来源信息进入 PMS 依据指纹、提议与评审材料,既有版本核验和跨日复核继续生效。
+
+人工来源只接入自主建仓候选链。资金投放命令不会额外吸收仅靠人工来源新增的股票;已有系统来源仍正常参与。盘中加入的合格基础候选可补读已有技术面数据,并进入现有盘中扫描关注范围,不自行生成技术面或择时结论。到期或移除不改变已经建立的持仓管理规则。
diff --git a/app/AGENTS.md b/app/AGENTS.md
new file mode 100644
index 0000000..6937ad0
--- /dev/null
+++ b/app/AGENTS.md
@@ -0,0 +1,25 @@
+# 后端目录规则
+
+本文件适用于`app/`及其子目录;根目录规则继续适用。
+
+## 分层与契约
+
+- `core/`只放纯逻辑,不接数据库或网络。`repo/`负责单表访问,`services/`编排取数、判断、落表和动作。跨表数据分次读取,在服务层组合。
+- `db/session.py`会拒绝JOIN、逗号连表和跨表子查询。不要绕过守卫;修改upsert时检查`ON DUPLICATE KEY UPDATE`兼容性。
+- `executor`在worker中把委托写入出口表,`ws/runner.py`只负责传输与回报落库,不直接改策略账本。回放服务按委托归属记账,兼顾重复、迟到和部分成交。
+- 业务参数走`services/param_store.py`;`config/settings.py`只是业务初值和基础设施配置。新密钥同时登记`SECRET_KEYS`和相应测试,不进入参数快照。
+- 资金冻结、在途买入、卖出释放及策略划拨使用既有统一占用口径。新增执行路径不能另算一份余额;划拨不是盈利。
+- 关键写入和下发函数可能返回`ok=False`或影响0行而不抛异常,必须检查返回值并处理失败。新软失败函数同步登记`test_batch10_units.py`的`SOFT_FAIL`。
+- 内部股票代码使用Tushare点式,例如`600000.SH`;访问上游时在边界转换。改`core/ws_codec.py`后验证协议签名向量,不能只看连接成功。
+- 修改接口先查对应契约:QMT用[协议](../QMT_WS_PROTOCOL.md),bionic用[接口说明](../BIONIC_PMS_INTERFACE.md),上游选股用[计划接口](../UPSTREAM_PLAN_API.md)。架构定位见[README](../README.md)。
+
+## 数据与时间
+
+- 数据源由`db/session.py`选择,表前缀区分实例。不要硬编码生产前缀,也不要凭旧文档判断某库“当前不用”。
+- 交易日期按北京日期处理。时间戳先核对列类型、写入代码、会话时区及实际读数,不能统一加八小时。容器日志使用北京时间;已核验的`pms_ws_state.heartbeat_at`为北京时间DATETIME原值。
+- 区分数据日期、计算时间、冻结时间和执行日期。修订另存版本,空结果不解释为退出,展示重算结果不冒充历史执行记录。
+- Redis客户端保持`redis` 5.x约束。升级前须验证现网服务端协议兼容性,不能直接放开到默认RESP3的版本。
+
+## 验证入口
+
+后端、DDL、路由或调度变化,按[scripts目录规则](../scripts/AGENTS.md)检查测试桩和哨兵。改`web/`时还要读该目录的规则。临时日志不得输出密钥、完整连接串或登录凭据。
diff --git a/app/core/action_engine.py b/app/core/action_engine.py
index cb09e52..d17af89 100644
--- a/app/core/action_engine.py
+++ b/app/core/action_engine.py
@@ -882,6 +882,7 @@ def eval_open(c: dict, params: dict, caps: dict, room_amt: float):
"valuation_text": c.get("valuation_text"),
# 催化事件与定价状态 (2026-09-08 量价研判链 3.5): 原值进账本与提议卡; 两句整句另送研判
# (它们是事件与量价, 不是产业逻辑, 见 judge.OPEN_JUDGE_KEYS)。不参与任何判定。
+ 'user_candidate': c.get('user_candidate'), 'user_required': c.get('user_required'),
"events": c.get("events"), "events_text": c.get("events_text"),
"pricing_state": c.get("pricing_state"), "pricing_text": c.get("pricing_text"),
# 相关快讯 (2026-09-08 台账 050): 原值进账本与提议卡, 整句另送研判。只是上下文, 不进判定。
diff --git a/app/core/plan_revision.py b/app/core/plan_revision.py
index b7eefd9..ad4ee14 100644
--- a/app/core/plan_revision.py
+++ b/app/core/plan_revision.py
@@ -13,6 +13,8 @@ def basis(row):
result = {k: row.get(k) for k in ('score', 'tier', 'upside', 'heat', 'theme',
'verdict', 'risk', 'missing', 'reasons', 'logic_state', 'company_gate',
'company_review', 'company_review_text', 'events', 'pricing_state', 'news')}
+ if row.get('user_candidate'):
+ result.update(user_candidate=row['user_candidate'], user_required=bool(row.get('user_required')))
if row.get('candidate_source') == 'dividend':
result.update({k: row.get(k) for k in ('candidate_source', 'dividend_ref', 'dividend_policy_version')})
# 资料年龄不是研究变化;固定报告引用和研究内容才是。
diff --git a/app/services/command_service.py b/app/services/command_service.py
index 92829c3..11d10f1 100644
--- a/app/services/command_service.py
+++ b/app/services/command_service.py
@@ -797,7 +797,7 @@ def _candidates(view: dict) -> list:
if src in (plan_feed.SRC_PLAN_API, plan_feed.SRC_BOTH):
try:
- sel = plan_feed.candidates(held=held, black=black)
+ sel = plan_feed.candidates(held=held, black=black, allow_user=False)
for r in sel["items"]:
_push(r["ts_code"], r["score"], "plan_api", theme=r.get("theme"),
plan_provenance={k: r.get(k) for k in ('decision', 'consumption_id',
diff --git a/app/services/param_store.py b/app/services/param_store.py
index 8eea0be..2d02e87 100644
--- a/app/services/param_store.py
+++ b/app/services/param_store.py
@@ -36,7 +36,7 @@ INFRA_PREFIX = ("PROXY_DB", "SOURCE_DB", "DB_MYSQL", "SIGNAL_REDIS", "PMS_REDIS"
# 2026-09-03 补进会话票签名密钥 PMS_SESSION_SECRET: 它 2026-08 随登录一起加进 settings,
# 当时漏了这份名单, 于是参数设置页把它当普通业务参数原文显示出来 (登录中间件读的是
# settings, 功能没受影响, 但密钥不该出现在页面上)。
-SECRET_KEYS = ("PMS_QMT_SIGN_SEED_HEX", "PMS_QMT_PEER_PUBKEY_B64", "PMS_SESSION_SECRET")
+SECRET_KEYS = ("PMS_QMT_SIGN_SEED_HEX", "PMS_QMT_PEER_PUBKEY_B64", "PMS_SESSION_SECRET", "PMS_PLAN_WRITE_KEY")
# 运行态开关: key -> (默认值, 类型, 说明)
RUNTIME_EXTRA = {
diff --git a/app/services/plan_candidates.py b/app/services/plan_candidates.py
new file mode 100644
index 0000000..0163007
--- /dev/null
+++ b/app/services/plan_candidates.py
@@ -0,0 +1,51 @@
+"""选股计划的用户候选入口;只登记来源,不创建交易命令。"""
+import re
+
+from app.services import param_store, plan_feed
+from config.settings import settings
+
+
+def request(method='GET', *, payload=None, identity=None, actor='user', query=None):
+ import requests
+ base = str(param_store.get('PMS_PLAN_API_BASE', '') or '').rstrip('/')
+ if not base:
+ raise ValueError('选股计划暂不可用,请稍后重试')
+ secret = settings.PMS_PLAN_WRITE_KEY
+ if method != 'GET' and not secret:
+ raise ValueError('添加功能尚未启用,请联系管理员')
+ path = '/plan/user-candidates'
+ if query is not None:
+ path += '/search'
+ if identity is not None:
+ if not re.fullmatch(r'[0-9a-f]{32}', str(identity)):
+ raise ValueError('添加记录无效,请刷新后重试')
+ path += '/' + identity + '/remove'
+ body = {k: (payload or {}).get(k) for k in ('codes', 'reason', 'expires_on')}
+ body['actor'] = actor
+ try:
+ response = requests.request(method, base + path,
+ json=body if method != 'GET' else None,
+ headers={'X-Job-Key': secret} if method != 'GET' else {},
+ params={'q': str(query)[:40]} if query is not None else None,
+ timeout=15, allow_redirects=False)
+ except requests.RequestException as exc:
+ raise ValueError('选股系统暂未回应,请刷新列表核对后再试') from None
+ if response.status_code in (404, 405):
+ raise ValueError('选股系统暂不支持添加,请联系管理员完成更新')
+ if response.status_code in (401, 403, 503):
+ raise ValueError('选股系统暂不能处理添加,请联系管理员检查连接')
+ if response.status_code != 200:
+ if response.status_code == 400:
+ detail = response.json().get('detail')
+ if isinstance(detail, str):
+ raise ValueError(detail[:300])
+ raise ValueError('操作未完成,请刷新列表核对后再试')
+ try:
+ result = response.json()
+ except ValueError:
+ raise ValueError('选股系统返回异常,请稍后重试') from None
+ if not isinstance(result, dict) or result.get('ok') is not True:
+ raise ValueError('操作未完成,请刷新列表核对后再试')
+ if method != 'GET':
+ plan_feed.invalidate()
+ return dict(result, writable=bool(secret))
diff --git a/app/services/plan_feed.py b/app/services/plan_feed.py
index d14d9b6..046eb03 100644
--- a/app/services/plan_feed.py
+++ b/app/services/plan_feed.py
@@ -343,6 +343,8 @@ def _rows(raw, bucket: str) -> list:
"research_rank": _int_or_none(it.get('research_rank')),
"research": it.get('research') if isinstance(it.get('research'), dict) else None,
"review_ref": _text_or_none(it.get('review_ref')),
+ 'user_candidate': it.get('user_candidate') if isinstance(it.get('user_candidate'), dict) else None,
+ 'user_required': bool(it.get('user_required')),
})
return out
@@ -496,6 +498,9 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N
规则闸按 PMS_SECTOR_MAX_NAMES 一拦就剩 4 只, 白瞎 26 个名额且**日志上看不出来**。
在候选阶段先按主题摊开, top_n 切出来的才是能用的票。
"""
+ from datetime import datetime
+ from zoneinfo import ZoneInfo
+ today = datetime.now(ZoneInfo('Asia/Shanghai')).date().isoformat()
held = {normalize_code(c) for c in (held or []) if c}
black = {normalize_code(c) for c in (black or []) if c}
tiers = {str(t).strip() for t in (tiers or []) if str(t).strip()}
@@ -541,6 +546,10 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N
drop('dup', c)
continue
seen.add(c)
+ if r.get('user_required') and str((r.get('user_candidate') or {}).get('expires_on') or '') < today:
+ drop('display', c)
+ display_only.append({'ts_code': c, 'basis': '用户关注已到期'})
+ continue
if c in held:
drop('held', c)
continue
@@ -609,7 +618,7 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N
# 排序轴四键 (2026-09-17 工作包乙): 原样透传给动作引擎与提议卡, 缺就是 None。
"quality_band": r.get("quality_band"), "pointed": r.get("pointed"),
"rank_axis": r.get("rank_axis"), "rank_old": r.get("rank_old"),
- **{k: r.get(k) for k in ('research_rank', 'research', 'review_ref')}}
+ **{k: r.get(k) for k in ('research_rank', 'research', 'review_ref', 'user_candidate', 'user_required')}}
for r in passed[:n]]
for i, item in enumerate(items, 1):
item.update(selection_rank=i, decision=plan.get('decision'),
@@ -1179,7 +1188,7 @@ def snapshot_log(*, plan_date=None, limit: int = 50) -> dict:
# ================================================================ 对外: 候选与状态
def candidates(*, held=(), black=(), route_by_verdict: bool = False, force=False,
- record=True, recheck_code=None, plan_override=None) -> dict:
+ record=True, recheck_code=None, plan_override=None, allow_user=True) -> dict:
"""参数驱动的候选清单 (不含价格 —— 价格由调用方用 market.get_price 现取)。
route_by_verdict 默认 False: 命令驱动建仓 (command_service._candidates) 不传, 于是用户
@@ -1191,6 +1200,8 @@ def candidates(*, held=(), black=(), route_by_verdict: bool = False, force=False
p = _params()
plan = plan_override if plan_override is not None else (get_plan(force=force) if force else get_plan())
route = bool(route_by_verdict)
+ if not allow_user:
+ plan = dict(plan, **{b: [r for r in plan.get(b, []) if not r.get('user_required')] for b in ('main', 'observe')})
out = select_candidates(plan, held=held, black=black, top_n=0 if recheck_code else p["top_n"], tiers=p["tiers"],
include_observe=p["include_observe"],
min_score=(p["min_score"] or None),
diff --git a/app/services/proposal_service.py b/app/services/proposal_service.py
index 479f15d..2cee9ba 100644
--- a/app/services/proposal_service.py
+++ b/app/services/proposal_service.py
@@ -229,9 +229,10 @@ def scan_and_route(*, now=None, dry_run: bool = False, review_instruction=None,
# 候选池发布给择时决策系统 (2026-09-09, 台账 004): 它的盘中强势扫描拿这份当覆盖面,
# 读不到就本轮不扫、绝不回退全市场。这里只写代码不写别的; 写失败只记日志, 不影响本轮。
# 落点选在候选产出之后、分流之前: 发布的是"今天该盯哪几只", 与它们最后买没买无关。
- if not dry_run and open_cands:
+ monitor_codes = {x.get('ts_code') for x in open_cands} | set(out.get('user_monitor_codes') or [])
+ if not dry_run and monitor_codes:
try:
- candidate_pub.publish([x.get("ts_code") for x in open_cands])
+ candidate_pub.publish(monitor_codes)
except Exception as e:
logger.warning("[新建仓] 候选池发布失败 (不影响本轮): %s", e)
@@ -411,6 +412,7 @@ def _scan_open(view, params, stock_params, skip, mkt, out, now=None,
out["skipped"].append({"action": ae.A_OPEN, "why": _no_candidate_why(sel)})
return []
+ out.setdefault('user_monitor_codes', []).extend(x['ts_code'] for x in items if x.get('user_candidate'))
codes = [x["ts_code"] for x in items]
prices = market.get_prices(codes)
if review_instruction and review_instruction['ts_code'] in codes and not prices.get(review_instruction['ts_code']):
@@ -586,6 +588,10 @@ def _attach_consensus(cands, out=None, now=None) -> None:
codes = [c.get("ts_code") for c in cands if c.get("ts_code")]
nightly = consensus_service.nightly_map(codes)
tech_states = consensus_service.state_map()
+ missing_user = [r['ts_code'] for r in cands if r.get('user_candidate') and r['ts_code'] not in tech_states]
+ if missing_user:
+ from app.services import tech_service
+ tech_states = dict(tech_states, **tech_service.read_states_for(missing_user))
except Exception as e: # noqa: BLE001
logger.warning("[合议] 批量取数失败, 本轮候选不装配合议: %s", e)
return
diff --git a/app/services/tech_service.py b/app/services/tech_service.py
index ad5c8c9..7ed2559 100644
--- a/app/services/tech_service.py
+++ b/app/services/tech_service.py
@@ -444,3 +444,18 @@ def status() -> dict:
"states": len(m.get("states") or {}), "fresh": bool(state_map(m)),
"note": m.get("note"), "error": m.get("error"), "stale": m.get("stale")}
return out
+
+
+def read_states_for(codes):
+ """盘中新加入的股票读取已有日线,按原规则合成立场,不重算行情或改写整份映射。"""
+ codes = list(dict.fromkeys(codes))
+ if not codes or not enabled():
+ return {}
+ p = _params()
+ dd = tech_repo.latest_date()
+ if not dd or _tdays_elapsed(dd, tradedays.ymd()) > int(p['stale_tdays']):
+ return {}
+ since = tradedays.ymd(tradedays.prev_trade_day(dd, tech_rules.CHOPPY_WINDOW + 5))
+ history = tech_repo.history_multi(codes, since=since)
+ return {code: _compact(tech_rules.synthesize(rows, params=p['rules']))
+ for code, rows in history.items() if rows and int(rows[-1].get('data_date') or 0) == dd}
diff --git a/app/web/AGENTS.md b/app/web/AGENTS.md
new file mode 100644
index 0000000..2db34fd
--- /dev/null
+++ b/app/web/AGENTS.md
@@ -0,0 +1,12 @@
+# 页面目录规则
+
+本文件补充`app/AGENTS.md`,适用于`app/web/`。
+
+- 页面是Vue3与ElementPlus直接加载的HTML,无构建步骤。自定义标签必须显式闭合,例如``,不能写成自闭合标签。
+- `setup()`中供模板使用的变量与函数必须在返回值中导出。新增后端枚举要同时维护前端翻译及对应守卫名单。
+- 每次页面修改都跑`test_page_enum_guard.py`、`test_page_wiring_guard.py`、`test_page_copy_guard.py`,经仓库隔离入口执行。布局或交互变化还需浏览器检查相关桌面与窄屏尺寸、控制台、点击和关闭行为。
+- 使用真实只读响应重放页面时,明确这是浏览器复现,不称为真实登录验收。检查展示不得误触发写接口。
+- 用交易员能理解的短句。统一称基本面、技术面、择时,必要说明放悬停;表格操作列在页面内可见,不堆内部实现词。
+- 看多红、看空绿、中性灰、无读数虚框。指标的冷暖阈值柱图沿用现有蓝、金、灰,不把阈值高低强行解释成看多看空。
+- 策略展示为“主观量化”和“微盘轮动”,持仓分别用标签页。数量和阈值来自当前规则,不能把30或50写死;策略详情新标签页打开,不替换当前管理页。
+- 明确区分计划数量、实际委托、受理、成交与入账。没有出口委托不能显示“已下单”,请求失败或旧行情不能显示成正常完成。
diff --git a/app/web/main.py b/app/web/main.py
index 4f245e5..0978652 100644
--- a/app/web/main.py
+++ b/app/web/main.py
@@ -1029,6 +1029,33 @@ def api_strategy_attach_scan(dry_run: bool = Query(False)):
params={"dry_run": dry_run})
+@app.get('/api/plan/user-candidates/search')
+def api_search_user_candidates(q: str = ''):
+ from app.services import plan_candidates
+ return ok(plan_candidates.request, query=q)
+
+
+@app.get('/api/plan/user-candidates')
+def api_user_candidates():
+ from app.services import plan_candidates
+ return ok(plan_candidates.request)
+
+
+@app.post('/api/plan/user-candidates')
+def api_add_user_candidates(request: Request, payload: dict = Body(...)):
+ from app.services import plan_candidates
+ return ok_logged('add_plan_candidates', plan_candidates.request, 'POST',
+ payload=payload, actor=_actor(request), by=_actor(request),
+ params={k: payload.get(k) for k in ('codes', 'reason', 'expires_on')})
+
+
+@app.post('/api/plan/user-candidates/{identity}/remove')
+def api_remove_user_candidate(identity: str, request: Request):
+ from app.services import plan_candidates
+ return ok_logged('remove_plan_candidate', plan_candidates.request, 'POST',
+ identity=identity, actor=_actor(request), by=_actor(request), params={'id': identity})
+
+
@app.get("/api/upstream/plan")
def api_upstream_plan(limit: int = Query(30), date: str = Query(None),
bucket: str = Query("main")):
diff --git a/app/web/static/index.html b/app/web/static/index.html
index 70047e2..09d23a5 100644
--- a/app/web/static/index.html
+++ b/app/web/static/index.html
@@ -569,6 +569,17 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
.research-source dl{display:grid;grid-template-columns:90px minmax(0,1fr);gap:8px 12px;margin:14px 0 0;}
.research-source dt,.research-source dd{margin:0;overflow-wrap:anywhere;line-height:1.65;}
.prop-badge{font-size:11px;font-family:ui-monospace,Menlo,monospace;background:var(--surface-2);padding:2px 7px;border-radius:5px;}
+
+.plan-add-panel{margin:14px 0 18px;padding:18px;background:var(--surface-2);border:1px solid var(--hair);border-radius:10px}
+.plan-add-panel .el-form-item{margin-bottom:14px}.plan-add-panel .el-select{width:100%}
+.plan-add-panel .el-form-item__content>.muted{width:100%;line-height:1.6}
+.plan-user-list{margin:16px 0 20px;border:1px solid var(--hair);border-radius:10px;overflow:hidden}
+.plan-user-head{display:flex;align-items:center;justify-content:space-between;padding:11px 14px;background:var(--surface-2);font-weight:600}
+.plan-user-item{padding:12px 14px;border-top:1px solid var(--hair)}
+.plan-user-top{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.plan-user-top .el-button{margin-left:auto}
+.plan-user-note{margin-top:5px;font-size:12.5px;color:var(--ink-2);overflow-wrap:anywhere}
+.plan-add-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:16px}
+@media(max-width:640px){.plan-add-panel{padding:14px}.plan-user-top{gap:6px}.plan-user-item{padding:10px}.plan-add-actions .el-button{flex:1}}
@@ -2562,9 +2573,10 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
-
+
-
+ 添加股票
+
更新计划与行业映射
刷新显示
@@ -2576,6 +2588,50 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
行情截至 {{ planStatus.date || '—' }} · {{ planFetchedText.replace('拉取','更新') }}
+ {{ planUserError }}
+
+
添加关注股票
+
添加后按现有规则评估,满足条件时按当前执行档位处理。
+
+
+
+
+
+ 仅支持沪深 A 股。批量代码可用空格或逗号分隔,每次最多 30 只。
+
+
+
+
+
+
+ 到期停止人工关注,已有持仓继续按原规则管理。
+
+
+
{{ planAddError }}
+
+ 取消
+ 添加到计划
+
+
+
+
用户添加 {{ planUserActiveCount }} 只关注中
+ {{ planUserHistory ? '收起历史' : '查看历史' }}
+
+
+
+ {{ r.name || r.code }}{{ r.code }}
+ {{ planUserState(r) }}
+ 移除关注
+
+
{{ r.reason }}
+
{{ planUserDetail(r) }} · 截至 {{ r.expires_on }}
+
+
暂无关注中的股票
+
数据来源与筛选记录
数据日 {{ planStatus.date }}(上游每个交易日早上用上一交易日收盘后的证据出计划,日龄 {{ planStatus.age_tdays }} 交易日 planRaw.value.status || {});
const planRows = computed(() => planRaw.value.rows || []);
const planCand = computed(() => planRaw.value.candidates_raw || null);
+ const planAddOpen = ref(false), planUserBusy = ref(false), planAddError = ref(''), planUserError = ref('');
+ const planUserRows = ref([]), planUserHistory = ref(false), planUserWritable = ref(false);
+ const planSearchRows = ref([]), planSearchBusy = ref(false);
+ const planAdd = reactive({codes: [], reason: '', expires_on: ''});
+ const planUserActiveCount = computed(() => planUserRows.value.filter(r => !r.removed_at && r.status!=='expired').length);
+ const planUserShown = computed(() => planUserRows.value.filter(r => planUserHistory.value || (!r.removed_at && r.status!=='expired')));
+ const planUserState = r => ({pending:'等待评估', evaluated:'已评估', expired:'已到期', removed:'已移除'}[r.status] || '待更新');
+ const planUserDetail = r => r.status==='pending' ? '资料更新完成后进入评估' : r.status==='removed' ? '已停止人工关注' : r.status==='expired' ? '关注已到期' : (r.basis || '继续按现有候选条件筛选');
+ const planDateDisabled = d => {
+ const today = new Date(new Date().toLocaleString('en-US', {timeZone:'Asia/Shanghai'})); today.setHours(0,0,0,0);
+ return d.getTime() < today.getTime() || d.getTime() > today.getTime()+90*86400000;
+ };
+ async function loadPlanUsers() {
+ const d = await call('get', '/api/plan/user-candidates');
+ if (d && d.ok) { planUserRows.value=d.rows||[]; planUserWritable.value=!!d.writable; planUserError.value=''; }
+ else { planUserError.value=(d||{}).error||'添加记录暂不可用'; planUserWritable.value=false; }
+ }
+ async function openPlanAdd() {
+ planAddError.value=''; planAddOpen.value=true;
+ if (!planAdd.expires_on) { const d=new Date(Date.now()+7*86400000); planAdd.expires_on=new Intl.DateTimeFormat('en-CA',{timeZone:'Asia/Shanghai',year:'numeric',month:'2-digit',day:'2-digit'}).format(d); }
+ await loadPlanUsers();
+ if (!planUserWritable.value) planAddError.value=planUserError.value||'添加功能尚未启用,请联系管理员';
+ }
+ let planSearchSerial=0;
+ async function searchPlanStocks(q) {
+ const serial=++planSearchSerial;
+ if (!q || !q.trim()) { planSearchRows.value=[]; planSearchBusy.value=false; return; }
+ planSearchBusy.value=true;
+ const d=await call('get','/api/plan/user-candidates/search?q='+encodeURIComponent(q.trim()));
+ if(serial!==planSearchSerial)return;
+ planSearchRows.value=(d&&d.ok)?(d.items||[]):[]; planSearchBusy.value=false;
+ }
+ async function submitPlanAdd() {
+ if(planUserBusy.value)return;
+ const codes=[...new Set(planAdd.codes.flatMap(x=>String(x).trim().split(/[\s,,;;]+/)).filter(Boolean))];
+ if(!codes.length || codes.length>30){planAddError.value='请选择 1 至 30 只股票';return;}
+ if(!planAdd.reason.trim()){planAddError.value='请填写添加理由';return;}
+ if(!planAdd.expires_on){planAddError.value='请选择关注截止日期';return;}
+ planUserBusy.value=true; planAddError.value='';
+ try {
+ const d=await call('post','/api/plan/user-candidates',{codes,reason:planAdd.reason.trim(),expires_on:planAdd.expires_on});
+ if(!d||!d.ok){planAddError.value=(d||{}).error||'添加未完成,请刷新列表核对';return;}
+ ElementPlus.ElMessage.success(d.added ? '已保存,等待更新评估' : '所选股票已在关注中');
+ planAdd.codes=[];planAdd.reason='';planAddOpen.value=false;
+ await loadPlanUsers();
+ } finally {planUserBusy.value=false;}
+ }
+ async function removePlanUser(row) {
+ if(planUserBusy.value)return;
+ planUserBusy.value=true;
+ try {
+ const d=await call('post','/api/plan/user-candidates/'+row.id+'/remove');
+ if(!d||!d.ok){planUserError.value=(d||{}).error||'移除未完成,请刷新后核对';return;}
+ await loadPlanUsers();
+ } finally {planUserBusy.value=false;}
+ }
// 计划拉取时刻 (2026-09-16): fetched_at 是持仓系统自己记的时间戳, 按浏览器本地时区显示, 不猜上游容器的时区。
const planFetchedText = computed(() => {
const ts = Number((planStatus.value || {}).fetched_at || 0); if (!ts) return '';
@@ -3155,6 +3267,7 @@ createApp({
// 这些码同时是账本里的字面值, **只改显示不改值**。
const OP_CN = {
decide_proposal: '处理提议', cancel_command: '撤销这条命令',
+ add_plan_candidates: '添加关注股票', remove_plan_candidate: '移除关注股票',
cancel_instruction: '撤销一笔还没执行的下单', replan_command: '重新算这条命令的执行方案',
resume_strategy_buy: '恢复这个方案的买入',
macro_scan: '重算大盘信号(只算,不下单)', macro_adopt: '采纳今天的大盘建议',
@@ -4803,8 +4916,10 @@ createApp({
}
async function loadPlan() {
planLoading.value = true;
+ const users = loadPlanUsers();
const d = await call('get', '/api/upstream/plan?limit=50');
planRaw.value = (d && d.ok) ? d : { status: { ok: false, hint: (d||{}).error || '取数失败' } };
+ await users;
planLoading.value = false;
}
async function loadChanges() {
@@ -5169,6 +5284,9 @@ createApp({
cancelCmd, replan, decide, decideDlg, decideCodes, submitDecide, ops, loadSchema, openReport, cancelIns, researchData, researchSections, researchMaterials, researchSource, openResearch,
planDrawer, planLoading, planStatus, planFetchedText, planRows, planCand, planResult,
loadPlan, openPlan, refreshPlan,
+ planAddOpen, planUserBusy, planAddError, planUserError, planUserRows, planUserHistory,
+ planUserShown, planUserActiveCount, planUserState, planUserDetail, planDateDisabled,
+ planSearchRows, planSearchBusy, planAdd, openPlanAdd, searchPlanStocks, submitPlanAdd, removePlanUser,
techStatus, techChipText, techChipCls,
chgRaw, chgSt, chgLoading, chgTab, chg, chgHeld, chgLog, chgRevised, chgWatch,
loadChanges,
diff --git a/config/settings.py b/config/settings.py
index bae40c9..765f55c 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -156,6 +156,7 @@ class Settings(BaseSettings):
# 若日后计划服务搬到别的机器, 这里直接填那台的 IP:端口。空=停用, 候选池恒为空。
PMS_PLAN_API_BASE: str = "http://host.docker.internal:8300"
PMS_PLAN_API_PATH: str = "/plan"
+ PMS_PLAN_WRITE_KEY: str = "" # 仅环境注入;匹配桥侧写接口密钥,不进入参数中心。
PMS_PLAN_TIMEOUT: int = 10 # 单次请求超时 (秒)
PMS_PLAN_CACHE_SEC: int = 300 # 计划缓存秒数 (上游日频产出, 没必要每跳都拉)
# 下面三个是**发给上游的请求参数** (对方 api.py: top=20/obs_top=10/theme_cap=5 都是
diff --git a/scripts/AGENTS.md b/scripts/AGENTS.md
new file mode 100644
index 0000000..da4f5a8
--- /dev/null
+++ b/scripts/AGENTS.md
@@ -0,0 +1,26 @@
+# 测试与运维脚本规则
+
+本文件适用于`scripts/`;其他目录修改代码时,按根规则来此查测试入口。
+
+## 单测隔离
+
+- `run_tests.py`逐批调用`unit_test_guard.py`,清除业务环境变量,在无`.env`的临时目录运行并阻断套接字。只跑一批也必须走同一隔离入口;新增可直接运行的测试沿用现有安装护栏方式。
+- 新增服务调用需补`test_wiring.py`中的`install_fakes`或对应内存桩;真实连接尝试即失败,不能靠业务层吞异常让测试通过。
+- 新增`test_batch*.py`同时登记`run_tests.py`的`SUITES`和例数说明。缺失测试文件必须失败,不能当跳过。
+- DDL、调度、API、密钥、动作求值顺序及仓储签名变化,检查`run_tests.py`顶部哨兵位置清单及实际断言,不照抄历史表数或测试总数。
+- 合并分支时检查测试文件是否重名,不能让一批测试覆盖另一批;缺项不能靠删登记解决。
+
+开发机在安装了项目依赖的独立虚拟环境中、从仓库根目录执行:
+
+```bash
+python scripts/run_tests.py
+python scripts/unit_test_guard.py scripts/test_batch48_units.py
+```
+
+全量预期末行为`ALL SUITES PASS`。单批编号按改动选择,不固定只跑微盘。纯文档修改不要求全量回归。页面三道护栏由全量入口覆盖,也可分别经隔离入口运行。
+
+## 运行脚本
+
+`make help`是命令目录,不能把每个目标都当只读探针。`make test`用于部署服务器,发布前还须对匹配的候选镜像断网验证,步骤见[pms-release](../.agents/skills/pms-release/SKILL.md)。
+
+新脚本应区分只读检查和实际写入,并验证重复执行及失败后的状态。`tick`、回放、建表、清账和重建账本都有业务副作用,不在活跃交易账户上当作普通单测。隔离演练使用独立数据库与前缀,不使用会认领真实成交的shadow路径。历史探针文件和文档中的日期不自动构成今天的执行授权。
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index dc77b2f..cfb8521 100644
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -4,6 +4,8 @@
======================================
运行: docker compose run --rm pms-web python scripts/run_tests.py
+ test_batch54_units.py 用户候选来源、到期核验、权限与技术面补读 (8例)
+
包含 (例数按 2026-10-26 隔离回归实跑校正):
test_sim_reset_units.py 双账本重置、空仓证据、配置与去重保留、幂等及SQL回滚 (9例)
test_batch53_units.py QMT下单策略类型、原字段与签名、双策略买卖归属及读取故障保留队列 (8例)
@@ -184,7 +186,7 @@ import sys
HERE = os.path.dirname(os.path.abspath(__file__))
ROOT = os.path.dirname(HERE)
-SUITES = [
+SUITES = ["test_batch54_units.py",
"test_sim_reset_units.py",
"test_batch53_units.py",
"test_batch52_units.py",
diff --git a/scripts/test_batch54_units.py b/scripts/test_batch54_units.py
new file mode 100644
index 0000000..f21bd0b
--- /dev/null
+++ b/scripts/test_batch54_units.py
@@ -0,0 +1,97 @@
+"""用户候选沿用原评估链路,不创建命令、不修改资格结论。"""
+import unit_test_guard
+import unittest
+from unittest.mock import patch, Mock
+from datetime import datetime
+from test_wiring import install_fakes
+from app.services import plan_feed as pf, plan_candidates as pc, tech_service as tech
+from app.core import plan_revision, consensus
+from config.settings import settings
+
+CODE='600001.SH'
+
+def payload(expiry='2099-01-01'):
+ return {'date':'2026-11-02','decision':{'id':'v1'},'main':[
+ {'code':'SH600001','name':'甲','rank':2,'research_rank':2,'score':240,'verdict':'候选',
+ 'user_candidate':{'id':'a'*32,'reason':'需求变化','expires_on':expiry},'user_required':True},
+ {'code':'SH600002','name':'乙','rank':1,'research_rank':1,'score':250,'verdict':'候选'}], 'observe':[], 'rank_axis':'quality'}
+
+class UserCandidateTests(unittest.TestCase):
+ def setUp(self):
+ self.fake=install_fakes(params={'PMS_PLAN_API_BASE':'http://plan.test','PMS_PLAN_TIERS':'',
+ 'PMS_PLAN_MIN_UPSIDE':0,'PMS_PLAN_MIN_SCORE':0,'PMS_PLAN_TOP_N':30})
+
+ def test_source_passes_through_without_priority_or_score_change(self):
+ plan=pf.parse_plan(payload())
+ rows=pf.select_candidates(plan,rank_by_upstream=True,top_n=2)['items']
+ self.assertEqual([r['ts_code'] for r in rows],['600002.SH',CODE])
+ self.assertEqual(rows[1]['score'],240)
+ self.assertTrue(rows[1]['user_required'])
+ self.assertEqual(pf.select_candidates(plan,rank_by_upstream=True,top_n=1)['items'][0]['ts_code'],'600002.SH')
+
+ def test_expired_source_not_used_but_system_source_survives(self):
+ plan=pf.parse_plan(payload('2000-01-01'))
+ self.assertNotIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan)['items']])
+ plan['main'][0]['user_required']=False
+ self.assertIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan)['items']])
+
+ def test_blacklist_and_display_still_reject_user_candidate(self):
+ plan=pf.parse_plan(payload())
+ self.assertNotIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan,black=[CODE])['items']])
+ plan['main'][0]['verdict']='仅展示'
+ self.assertNotIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan,route_by_verdict=True)['items']])
+ self.assertEqual(consensus.decide('无读数','看多','看多',fund_required=True)['route'],'跳过')
+ self.assertEqual(consensus.decide('中性','看多','看空')['route'],'观察')
+
+ def test_user_metadata_changes_invalidate_basis(self):
+ row=pf.parse_plan(payload())['main'][0]
+ old=plan_revision.basis(row)
+ row['user_candidate']=dict(row['user_candidate'],id='b'*32)
+ row['decision']={'id':'v2'}
+ self.assertEqual(plan_revision.compare(old,row,CODE),'material')
+
+ def test_command_source_does_not_gain_user_only_candidates(self):
+ plan=pf.parse_plan(payload())
+ with patch.object(pf,'get_plan',return_value=plan):
+ rows=pf.candidates(record=False,allow_user=False)['items']
+ self.assertNotIn(CODE,[r['ts_code'] for r in rows])
+ self.assertEqual(len(plan['main']),2)
+
+ def test_proxy_secret_actor_failure_and_redirect(self):
+ import requests
+ from app.services import param_store
+ self.assertIn('PMS_PLAN_WRITE_KEY',param_store.SECRET_KEYS)
+ response=Mock(status_code=200)
+ response.json.return_value={'ok':True,'added':1}
+ with patch.object(settings,'PMS_PLAN_WRITE_KEY','test-key'),patch.object(requests,'request',return_value=response) as send:
+ self.assertTrue(pc.request('POST',payload={'codes':['600001'],'actor':'冒名'},actor='会话用户')['ok'])
+ self.assertEqual(send.call_args.kwargs['json']['actor'],'会话用户')
+ self.assertEqual(send.call_args.kwargs['headers'],{'X-Job-Key':'test-key'})
+ self.assertFalse(send.call_args.kwargs['allow_redirects'])
+ response.status_code=302
+ with self.assertRaises(ValueError):pc.request('POST')
+ with patch.object(settings,'PMS_PLAN_WRITE_KEY',''),patch.object(requests,'request') as send:
+ with self.assertRaises(ValueError):pc.request('POST')
+ send.assert_not_called()
+
+ def test_on_demand_technical_read_rejects_stale_or_missing_today(self):
+ from app.repo import tech_repo
+ with patch.object(tech_repo,'latest_date',return_value=20261102),patch.object(tech,'_tdays_elapsed',return_value=9):
+ self.assertEqual(tech.read_states_for([CODE]),{})
+ with patch.object(tech_repo,'latest_date',return_value=20261102),patch.object(tech,'_tdays_elapsed',return_value=1),\
+ patch.object(tech.tradedays,'prev_trade_day',return_value=20261001),\
+ patch.object(tech_repo,'history_multi',return_value={CODE:[{'data_date':20261030}]}) as read:
+ self.assertEqual(tech.read_states_for([CODE]),{})
+ self.assertEqual(read.call_args.args[0],[CODE])
+
+ def test_trader_route_and_server_actor(self):
+ from app.web import auth, main
+ self.assertNotEqual(auth.authz_decision('POST','/api/plan/user-candidates'),'admin')
+ request=Mock();request.state.user={'username':'交易员甲'}
+ with patch.object(pc,'request',return_value={'ok':True,'added':1}) as send, \
+ patch.object(main.pms_repo,'insert_op_log',return_value=1) as log:
+ result=main.api_add_user_candidates(request,{'codes':['600001'],'by':'冒名'})
+ self.assertTrue(result['ok']);self.assertEqual(send.call_args.kwargs['actor'],'交易员甲')
+ self.assertEqual(log.call_args.kwargs['by'],'交易员甲')
+
+if __name__=='__main__':unittest.main()
diff --git a/scripts/test_wiring.py b/scripts/test_wiring.py
index 2aa4db5..4fdc6d5 100644
--- a/scripts/test_wiring.py
+++ b/scripts/test_wiring.py
@@ -767,6 +767,8 @@ def _():
"/api/ops/reconcile", "/api/ops/daily-settle", "/api/ops/report",
"/api/ops/downstream-schema", "/api/industry",
"/api/upstream/plan", "/api/ops/plan-refresh",
+ "/api/plan/user-candidates", "/api/plan/user-candidates/search",
+ "/api/plan/user-candidates/{identity}/remove",
"/api/upstream/signals/{ts_code}", # 2026-09-09 点股票看它今天全部信号
"/api/tech/status", "/api/ops/tech-pull", # 2026-09-11 技术面状态与手动拉取
"/api/research/{ts_code}", # 2026-09-11 单票研究面 (工作包一给技术面块)