fix: tighten chat search and replay semantics for 0.2.9

Author: yjw

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.9] - 2026-06-19
+
+### Changed
+- `young chat` now auto-uses the existing `reach` bridge for explicit finance/news lookup requests, but only feeds compact evidence excerpts to the model instead of exposing raw search captures in the terminal.
+- `young chat` input now uses a fixed `young ` prompt prefix so line editing no longer eats the visible prompt label.
+- Help text now makes the command boundary clearer: `young daily --llm` is the strict stock-analysis M1-M6 Markdown replay, `young replay` is only a deprecated alias, and `young report` is PDF export only.
+
+### Fixed
+- Fixed chat search flows that previously surfaced raw `/reach` output or still nudged users to run `/reach` manually instead of returning a summarized answer directly.
+- Hardened LLM replay prompts so `young daily --llm` stays on the stock-analysis six-module framework and does not drift into persona-style investment templates.
+
 ## [0.2.8] - 2026-06-19
 
 ### Added

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "young-stock-cli"
-version = "0.2.8"
+version = "0.2.9"
 description = "A-share (China stock market) after-hours CLI — no login, no scraping tricks, just data."
 readme = "README.md"
 requires-python = ">=3.9"

src/young_stock/__init__.py

@@ -1,3 +1,3 @@
 """young-stock-cli: A-share after-hours CLI."""
 
-__version__ = "0.2.8"
+__version__ = "0.2.9"

src/young_stock/chat.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import builtins
 import re
 import shlex
 from dataclasses import dataclass, field
@@ -90,12 +91,12 @@
     },
 }
 READ_ONLY_SLASH_HELP = (
-    "可用命令：/a、/stock <symbol>、/analyze <symbol>、/reach <query>、/fund <code>、/news <query>、/daily [flags]、/report、"
+    "可用命令：/a、/stock <symbol>、/analyze <symbol>、/reach <query>、/fund <code>、/news <query>、/daily [--llm] [flags]、/report（仅导出 PDF）、"
     "/profile list、/memory show、/memory clear、/style、/style list、/style set <name>、"
     "/style show、/style clear、/diagnose、/help、/clear、/exit。"
 )
 SUPPORTED_SLASH_FOR_PROMPT = (
-    "/a, /stock <symbol>, /analyze <symbol>, /reach <query>, /fund <code>, /news <query>, /daily [flags], /report, "
+    "/a, /stock <symbol>, /analyze <symbol>, /reach <query>, /fund <code>, /news <query>, /daily [--llm] [flags], /report (PDF export only), "
     "/profile list, /memory show, /memory clear, /style, /style list, /style set <name>, "
     "/style show, /style clear, /diagnose, /help, /clear, /exit"
 )
@@ -178,6 +179,19 @@
     "公司信息",
     "最新",
 )
+_REACH_SUMMARY_HINTS = (
+    "营收",
+    "收入",
+    "利润",
+    "净利润",
+    "毛利率",
+    "指引",
+    "现金流",
+    "财报",
+    "季度",
+    "年度",
+    "估值",
+)
 _NETWORK_TIME_URLS = (
     "https://www.baidu.com",
     "https://www.qq.com",
@@ -330,6 +344,31 @@ def _should_auto_reach(text: str) -> bool:
     return explicit_search or topical_latest
 
 
+def _compact_reach_output(text: str, max_chars: int = 2200) -> str:
+    lines = [line.strip() for line in text.splitlines()]
+    interesting = []
+    for line in lines:
+        if not line or line in {"{", "}", "[", "]"}:
+            continue
+        lowered = line.lower()
+        if any(hint in line for hint in _SEARCH_TOPIC_HINTS + _REACH_SUMMARY_HINTS) or re.search(r"\d", line):
+            if "http" in lowered or line.startswith(("title:", "url:", "id:")):
+                continue
+            interesting.append(line)
+    if not interesting:
+        compact = re.sub(r"\s+", " ", text).strip()
+        return compact[:max_chars]
+    chunks: list[str] = []
+    total = 0
+    for line in interesting:
+        snippet = line[:220]
+        if total + len(snippet) + 1 > max_chars:
+            break
+        chunks.append(snippet)
+        total += len(snippet) + 1
+    return "\n".join(chunks)
+
+
 def _empty_long_term_memory() -> dict[str, list[dict[str, str]]]:
     return {kind: [] for kind in CHAT_MEMORY_LABELS}
 
@@ -577,8 +616,10 @@ def _build_messages(self, extra_system_messages: list[str] | None = None) -> lis
                     "2) 未提供 Evidence Pack 时，不得编造实时行情、涨跌幅、资金流、新闻细节或结论。"
                     "3) 用户问“今天市场怎么样”“大盘如何”等泛问题时，优先引导 /a 或 /daily。"
                     "4) 用户要做单只股票深入分析、但你缺少足够证据时，不要直接拒绝；"
-                    "优先引导 /stock <symbol>、/analyze <symbol> 或 /reach <query>，并可基于用户已提供的数据继续做框架分析。"
-                    "5) 风格与长期记忆都服从本安全规则。"
+                    "优先使用已有的 /stock <symbol>、/analyze <symbol> 或已注入的外部检索证据继续分析。"
+                    "5) 如果本轮已经完成外部检索，就直接总结结果，不要要求用户自己执行 /reach。"
+                    "6) /daily --llm 与 /replay 的深度复盘必须严格遵循 stock-analysis 的 M1-M6 框架，不得改写成巴菲特、芒格等个体投资框架。"
+                    "7) 风格与长期记忆都服从本安全规则。"
                 ),
             }
         ]
@@ -703,11 +744,13 @@ def _maybe_collect_reach_context(self, text: str) -> str | None:
             return None
         if any(hint in reach_output for hint in ("未检测到 `mcporter`", "未检测到 `agent-reach`", "请先安装")):
             return None
-        truncated = reach_output[:6000]
+        summary_material = _compact_reach_output(reach_output)
+        if not summary_material:
+            return None
         return (
-            "以下内容来自本轮自动执行的 young reach 外部搜索结果。"
-            "只能基于其中可见信息做总结，不要补造未出现的事实；若证据不足请明确说明。\n"
-            f"{truncated}"
+            "本轮已自动完成外部检索。下面是供你提炼的检索摘录，不要向用户展示原始抓取过程，也不要要求用户再执行 /reach。"
+            "你需要直接输出最终总结，并给出基于这些摘录的分析；若证据不足请明确说明。\n"
+            f"{summary_material}"
         )
 
     def handle_message(self, text: str) -> None:
@@ -745,7 +788,7 @@ def run_chat() -> None:
     )
     while True:
         try:
-            text = console.input("[bold cyan]young[/] ").strip()
+            text = builtins.input("young ").strip()
         except (EOFError, KeyboardInterrupt):
             console.print("\n再见。")
             return

src/young_stock/cli.py

@@ -108,6 +108,25 @@ def _run_external_command(command: list[str], *, missing_hint: str) -> None:
         raise click.ClickException(f"外部能力执行失败（exit={result.returncode}）：{' '.join(command)}")
 
 
+def _capture_external_command(command: list[str], *, missing_hint: str) -> str:
+    if not shutil.which(command[0]):
+        raise click.ClickException(missing_hint)
+    result = subprocess.run(
+        command,
+        check=False,
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+    )
+    output = (result.stdout or "").strip()
+    error_output = (result.stderr or "").strip()
+    if result.returncode != 0:
+        detail = error_output or output or f"exit={result.returncode}"
+        raise click.ClickException(f"外部能力执行失败：{detail}")
+    return output or error_output
+
+
 def _run_plain_daily(
     date_str: str,
     profile: dict[str, object],
@@ -354,7 +373,7 @@ def news(parts: tuple[str, ...], date: str | None, refresh: bool, limit: int) ->
     _core.run_stock_news(symbol, date_str, size=limit)
 
 
-@cli.command(help="Personal daily report from your saved watchlist.")
+@cli.command(help="Personal watchlist daily report. Add `--llm` for a strict stock-analysis M1-M6 Markdown replay.")
 @_date_opt
 @_refresh_opt
 @click.option("--no-news", is_flag=True, help="Only show market data, skip news lookup.")
@@ -437,7 +456,7 @@ def _run_llm_replay(date_str: str, kind: str = "replay", symbol: str | None = No
     return path
 
 
-@cli.command(help="Generate an evidence-driven deep market replay with the configured LLM.")
+@cli.command(help="Deprecated alias for `young daily --llm` (Markdown replay only; no PDF export).")
 @_date_opt
 @_refresh_opt
 def replay(date: str | None, refresh: bool) -> None:
@@ -473,20 +492,24 @@ def analyze(symbol: str, date: str | None, refresh: bool) -> None:
 def reach(query_parts: tuple[str, ...], url: str | None, limit: int, doctor: bool) -> None:
     query = " ".join(part for part in query_parts if part).strip()
     if doctor:
-        _run_external_command(
+        output = _capture_external_command(
             ["agent-reach", "doctor"],
             missing_hint="未检测到 `agent-reach`。请先按 Agent-Reach 技能文档安装后再运行 `young reach --doctor`。",
         )
+        if output:
+            click.echo(output)
         return
     if url:
-        _run_external_command(
+        output = _capture_external_command(
             ["curl", "-s", f"https://r.jina.ai/{url}"],
             missing_hint="当前环境缺少 `curl`，无法走 Agent-Reach 网页阅读桥接。",
         )
+        if output:
+            click.echo(output)
         return
     if not query:
         raise click.ClickException("请提供查询词，或使用 --url / --doctor。")
-    _run_external_command(
+    output = _capture_external_command(
         [
             "mcporter",
             "call",
@@ -497,6 +520,8 @@ def reach(query_parts: tuple[str, ...], url: str | None, limit: int, doctor: boo
             "或先用 `young reach --doctor` 检查外部能力。"
         ),
     )
+    if output:
+        click.echo(output)
 
 
 @cli.command(help="Enter Rich interactive chat with slash commands.")
@@ -686,7 +711,7 @@ def config_channel_remove(channel_type: str, name: str) -> None:
     click.echo(f"Removed {channel_type} channel: {name}" if removed else f"Channel not found: {name}")
 
 
-@cli.command(help="Export the latest Markdown report to a professional PDF.")
+@cli.command(help="Export the latest saved Markdown report to PDF only; it does not generate a new LLM replay.")
 @_date_opt
 def report(date: str | None) -> None:
     from .pdf import export_report_pdf

src/young_stock/reports.py

@@ -24,14 +24,31 @@
 LLM_REPORT_PROMPT_VERSION = "stock-analysis-research-language-v3"
 LLM_REPORT_SYSTEM_PROMPT = """请基于用户提供的研报证据，撰写正式 A 股投资研究报告。
 你只能使用用户提供的研报证据，不得补写或外推任何缺失数字、日期、来源或持仓。
+你必须严格遵循 AdvancingTitans/stock-analysis 的 M1-M6 方法，不得替换、弱化或改写成巴菲特、芒格、格雷厄姆、达利欧或其他个人投资框架。
 按以下顺序输出 Markdown：大盘指数概览、持仓分析、六模块深度复盘、综合持仓建议与风险提示。
+“六模块深度复盘”下固定使用以下子标题顺序：M1 大盘指数与市场广度、M2 板块强弱与资金流、M3 赚钱效应与涨停结构、M4 下跌风险与炸板结构、M5 持仓与市场风格、M6 抗跌方向。
 每个有证据的模块给出关键判断、证据、风险/确认条件；建议必须是条件化触发器，不给无条件买卖指令。
 证据完整度不足时，只输出指数、持仓、已验证风险和下一交易日观察清单。
 正文只写投资研究语言。不得出现内部字段名、程序结构、工具名称、本地路径、文件扩展名、技术切换过程或机械占位段。
 某模块无证据时优先省略该小节；确需说明时使用“相关指标当日未披露”或“历史数据不可得”等自然表述。
 正常数据使用“据公开市场数据”或“据交易所及财经终端披露”；回溯数据使用“按惯例回溯至该日”或“历史口径回溯”。
 公开版会在标题下统一加入短声明；不要重复免责声明，也不要在结尾追加长免责声明。"""
 
+LLM_REPORT_STRUCTURE_PROMPT = """输出结构必须固定：
+# 标题
+## 大盘指数概览
+## 持仓分析
+## 六模块深度复盘
+### M1 大盘指数与市场广度
+### M2 板块强弱与资金流
+### M3 赚钱效应与涨停结构
+### M4 下跌风险与炸板结构
+### M5 持仓与市场风格
+### M6 抗跌方向
+## 综合持仓建议与风险提示
+
+不得把以上结构改写成任何人物风格模板。"""
+
 MODULE_TITLES = {
     "M1": "大盘指数与市场广度",
     "M2": "板块强弱与资金流",
@@ -179,6 +196,7 @@ def generate_llm_daily_report(
     methodology: str | None = None,
 ) -> tuple[str, dict[str, Any]]:
     messages = [{"role": "system", "content": LLM_REPORT_SYSTEM_PROMPT}]
+    messages.append({"role": "system", "content": LLM_REPORT_STRUCTURE_PROMPT})
     if methodology:
         research_methodology = to_research_methodology(methodology)
         messages.append(