feat: add position-aware daily advice

Author: AdvancingTitans

CHANGELOG.md

@@ -5,14 +5,23 @@ 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.1.15] - 2026-06-04
+
+### Added
+- Added optional position memory on `young profile add-stock/add-fund` through `--buy-date` and `--quantity`; reports automatically look up the buy-date stock close or fund NAV instead of asking users to enter cost price.
+- Added personalized fund-only, stock-only, and combined portfolio analysis in daily reports, including estimated return since purchase, news trend, holding stance, and portfolio concentration guidance.
+
+### Changed
+- Reworked daily advice from generic framework language into separate `基金分析`, `个股分析`, and `综合持仓` sections.
+
 ## [0.1.14] - 2026-06-03
 
 ### Added
 - Added `young uninstall` to remove the package from the current Python environment with one command.
 - Added `young profile clear-stocks` and `young profile clear-funds` for one-click stock/fund memory cleanup without deleting the other side.
 
 ### Changed
-- Daily report advice now uses a Buffett-style framework: circle of competence, margin of safety, moat durability, valuation discipline, and Mr. Market. Summary/key-points/full modes now tie risk notes to the user's watched symbols, fund estimates, and available news instead of printing generic caution text.
+- Daily report summary/key-points/full modes now tie risk notes to the user's watched symbols, fund estimates, and available news instead of printing generic caution text.
 
 ## [0.1.13] - 2026-06-03
 

README.md

@@ -34,7 +34,9 @@ young global            # A + HK + US in one view
 young stock 600519      # one stock snapshot (A-share / HK / US)
 young fund 161725       # fund estimate + top holdings quote/news
 young profile add-stock 600519
+young profile add-stock NVDA --buy-date 2026-01-15 --quantity 10
 young profile add-fund 161725
+young profile add-fund 021528 --buy-date 2026-01-10 --quantity 1000
 young profile list
 young profile clear-stocks  # clear all saved stocks/ETFs only
 young profile clear-funds   # clear all saved funds only
@@ -88,7 +90,7 @@ The internals are being split into focused modules: `young_stock.calendar` handl
 - **Multiple public quote sources** — Tencent Finance, Sina Finance, and Eastmoney are tried in sequence so temporary source failures can be filled by another no-login endpoint.
 - **Single-stock lookup** — `young stock 600519`, `young stock 0700.HK`, or `young stock AAPL` prints a compact quote snapshot with source, trade date, price, change, volume, turnover when available, and optional news.
 - **Fund holding lookup** — `young fund 161725` prints the fund's same-day estimated change, latest NAV date, top holdings, holding-stock quotes, rough contribution estimate, and same-day holding-stock news. Official fund NAVs usually update at night, so intraday/close values are clearly labeled as estimates.
-- **Personal daily report** — `young daily` reads your local investment memory from `~/.young_stock/profile.json`, then prints saved stock/ETF trends, fund estimates, global indices, A-share sentiment, and Buffett-style risk-oriented suggestions grounded in your symbols, fund estimates, and available news. First use: add symbols with `young profile add-stock 600519` and `young profile add-fund 161725`.
+- **Personal daily report** — `young daily` reads your local investment memory from `~/.young_stock/profile.json`, then prints saved stock/ETF trends, fund estimates, global indices, A-share sentiment, and portfolio-style suggestions grounded in your funds, stocks, holding dates, quantities, and available news. First use: add symbols with `young profile add-stock 600519` and `young profile add-fund 161725`; add `--buy-date` and `--quantity` to estimate return since purchase.
 - **Short report modes** — `young daily --format summary` keeps terminal output compact; `--format key-points` adds a few trend/risk bullets; `--only`, `--order`, and `--quick` trim slower or irrelevant sections.
 - **Investment memory management** — list, remove, clear, and group saved stocks/funds with `young profile list`, `remove-stock`, `remove-fund`, `clear`, `clear-stocks`, `clear-funds`, and `profile group create/add`.
 - **Local workflow helpers** — lightweight `portfolio`, `alert`, `note`, and `diary` commands store local records for portfolio experiments, reminder rules, investment notes, and saved daily-report text.

pyproject.toml

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

src/young_stock/__init__.py

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

src/young_stock/_core.py

@@ -177,6 +177,16 @@
     "https://fundf10.eastmoney.com/FundArchivesDatas.aspx"
     "?type=jjcc&code={code}&topline={topline}&year=&month=&rt={ts}"
 )
+FUND_NAV_HISTORY_URL = (
+    "https://api.fund.eastmoney.com/f10/lsjz"
+    "?fundCode={code}&pageIndex=1&pageSize=20&startDate={start}&endDate={end}&_={ts}"
+)
+EM_KLINE_URL = (
+    "https://push2his.eastmoney.com/api/qt/stock/kline/get"
+    "?secid={secid}&fields1=f1,f2,f3,f4,f5,f6"
+    "&fields2=f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61"
+    "&klt=101&fqt=1&beg={beg}&end={end}&_={ts}"
+)
 
 # 新浪财经（免登录、GBK 编码、对美股/港股最稳，作为 stock/get 之外的主路径）
 SINA_HQ_URL = "https://hq.sinajs.cn/list={codes}"
@@ -2613,6 +2623,91 @@ def normalize_fund_code(code: str) -> str:
     return code
 
 
+def _compact_date(value: str) -> str:
+    return re.sub(r"\D", "", str(value or ""))[:8]
+
+
+def _date_plus_days(date_str: str, days: int) -> str:
+    return (datetime.strptime(_compact_date(date_str), "%Y%m%d") + timedelta(days=days)).strftime("%Y%m%d")
+
+
+def _stock_secid_for_history(symbol: str) -> tuple[str, str, str]:
+    normalized, market = normalize_stock_symbol(symbol)
+    if market == "cn_market":
+        return normalized, market, _cn_secid(normalized)
+    if market == "hk_market":
+        return normalized, market, _hk_secid(normalized)
+    secid = _us_secid(normalized)
+    if not secid:
+        raise ValueError(f"暂不支持自动回溯该美股历史价格: {symbol}")
+    return normalized, market, secid
+
+
+def fetch_stock_close_on_or_after(symbol: str, buy_date: str) -> dict[str, Any]:
+    """Fetch first available split-adjusted daily close on/after buy_date."""
+    compact = _compact_date(buy_date)
+    if not re.fullmatch(r"\d{8}", compact):
+        return {"_error": "买入日期应为 YYYYMMDD 或 YYYY-MM-DD"}
+    try:
+        normalized, market, secid = _stock_secid_for_history(symbol)
+    except ValueError as e:
+        return {"_error": str(e)}
+    end = _date_plus_days(compact, 10)
+    cached = cache_load(f"stock_buy_{normalized}", compact, "eastmoney_kline", ttl=86400)
+    if cached:
+        return cached
+    url = EM_KLINE_URL.format(secid=secid, beg=compact, end=end, ts=int(time.time() * 1000))
+    data = fetch_json(url, {"Referer": "https://quote.eastmoney.com/"})
+    if "_error" in data:
+        return data
+    klines = (data.get("data") or {}).get("klines") or []
+    for row in klines:
+        parts = str(row).split(",")
+        if len(parts) >= 3:
+            result = {
+                "symbol": normalized,
+                "market": market,
+                "date": parts[0],
+                "close": _safe_float(parts[2]),
+                "_source": "东方财富历史K线",
+            }
+            if result["close"] is not None:
+                cache_save(f"stock_buy_{normalized}", compact, "eastmoney_kline", result)
+                return result
+    return {"_error": "买入日附近未获取到可用股票收盘价"}
+
+
+def fetch_fund_nav_on_or_after(fund_code: str, buy_date: str) -> dict[str, Any]:
+    """Fetch first available fund NAV on/after buy_date."""
+    fund_code = normalize_fund_code(fund_code)
+    compact = _compact_date(buy_date)
+    if not re.fullmatch(r"\d{8}", compact):
+        return {"_error": "买入日期应为 YYYYMMDD 或 YYYY-MM-DD"}
+    start = datetime.strptime(compact, "%Y%m%d").strftime("%Y-%m-%d")
+    end = datetime.strptime(_date_plus_days(compact, 20), "%Y%m%d").strftime("%Y-%m-%d")
+    cached = cache_load(f"fund_buy_{fund_code}", compact, "eastmoney_fund_nav", ttl=86400)
+    if cached:
+        return cached
+    url = FUND_NAV_HISTORY_URL.format(code=fund_code, start=start, end=end, ts=int(time.time() * 1000))
+    data = fetch_json(url, {"Referer": f"https://fundf10.eastmoney.com/jjjz_{fund_code}.html"})
+    if "_error" in data:
+        return data
+    rows = ((data.get("Data") or {}).get("LSJZList") or [])
+    rows = sorted(rows, key=lambda row: str(row.get("FSRQ") or ""))
+    for row in rows:
+        nav = _safe_float(row.get("DWJZ"))
+        if nav is not None:
+            result = {
+                "fundcode": fund_code,
+                "date": row.get("FSRQ") or "",
+                "nav": nav,
+                "_source": "东方财富历史净值",
+            }
+            cache_save(f"fund_buy_{fund_code}", compact, "eastmoney_fund_nav", result)
+            return result
+    return {"_error": "买入日附近未获取到可用基金净值"}
+
+
 def fetch_fund_estimate(fund_code: str, date_str: str) -> dict[str, Any]:
     fund_code = normalize_fund_code(fund_code)
     cached = cache_load(f"fund_estimate_{fund_code}", date_str, "eastmoney_fund")

src/young_stock/cli.py

@@ -222,25 +222,41 @@ def profile() -> None:
 
 @profile.command("add-stock", help="Add a stock/ETF symbol to your daily watchlist.")
 @click.argument("symbol")
-def profile_add_stock(symbol: str) -> None:
-    data = add_profile_item("stocks", symbol)
+@click.option("--buy-date", default=None, help="Buy date YYYYMMDD or YYYY-MM-DD for return analysis.")
+@click.option("--quantity", type=float, default=None, help="Holding quantity/shares.")
+def profile_add_stock(symbol: str, buy_date: str | None, quantity: float | None) -> None:
+    data = add_profile_item("stocks", symbol, buy_date=buy_date, quantity=quantity)
     click.echo(f"Added stock: {symbol.strip()}")
     click.echo(f"Stocks: {', '.join(data.get('stocks', [])) or '-'}")
+    if buy_date or quantity is not None:
+        click.echo("Position: buy_date=" + (buy_date or "-") + f"; quantity={quantity:g}" if quantity is not None else "Position: buy_date=" + (buy_date or "-"))
 
 
 @profile.command("add-fund", help="Add a fund code to your daily watchlist.")
 @click.argument("code")
-def profile_add_fund(code: str) -> None:
-    data = add_profile_item("funds", code)
+@click.option("--buy-date", default=None, help="Buy date YYYYMMDD or YYYY-MM-DD for return analysis.")
+@click.option("--quantity", type=float, default=None, help="Holding shares/units.")
+def profile_add_fund(code: str, buy_date: str | None, quantity: float | None) -> None:
+    data = add_profile_item("funds", code, buy_date=buy_date, quantity=quantity)
     click.echo(f"Added fund: {code.strip()}")
     click.echo(f"Funds: {', '.join(data.get('funds', [])) or '-'}")
+    if buy_date or quantity is not None:
+        click.echo("Position: buy_date=" + (buy_date or "-") + f"; quantity={quantity:g}" if quantity is not None else "Position: buy_date=" + (buy_date or "-"))
 
 
 @profile.command("list", help="Show saved daily-report investment memory.")
 def profile_show() -> None:
     data = load_profile()
     click.echo(f"Stocks: {', '.join(data.get('stocks', [])) or '-'}")
     click.echo(f"Funds: {', '.join(data.get('funds', [])) or '-'}")
+    positions = data.get("positions", {})
+    if positions.get("stocks") or positions.get("funds"):
+        click.echo("Positions:")
+        for kind, label in (("stocks", "stock"), ("funds", "fund")):
+            for code, position in positions.get(kind, {}).items():
+                buy_date = position.get("buy_date", "-")
+                quantity = position.get("quantity", "-")
+                click.echo(f"  {label} {code}: buy_date={buy_date}; quantity={quantity}")
     groups = data.get("groups", {})
     if groups:
         click.echo("Groups:")

src/young_stock/profile.py

@@ -6,7 +6,7 @@
 import os
 from pathlib import Path
 
-EMPTY_PROFILE = {"stocks": [], "funds": [], "groups": {}}
+EMPTY_PROFILE = {"stocks": [], "funds": [], "groups": {}, "positions": {"stocks": {}, "funds": {}}}
 
 
 def profile_path() -> Path:
@@ -19,15 +19,16 @@ def profile_path() -> Path:
 def load_profile() -> dict[str, list[str]]:
     path = profile_path()
     if not path.exists():
-        return {k: list(v) for k, v in EMPTY_PROFILE.items()}
+        return _empty_profile()
     try:
         data = json.loads(path.read_text(encoding="utf-8"))
     except (OSError, json.JSONDecodeError):
-        return {k: list(v) for k, v in EMPTY_PROFILE.items()}
+        return _empty_profile()
     return {
         "stocks": [str(v) for v in data.get("stocks", []) if str(v).strip()],
         "funds": [str(v) for v in data.get("funds", []) if str(v).strip()],
         "groups": _normalize_groups(data.get("groups", {})),
+        "positions": _normalize_positions(data.get("positions", {})),
     }
 
 
@@ -37,14 +38,25 @@ def save_profile(profile: dict[str, list[str]]) -> None:
     path.write_text(json.dumps(profile, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
 
 
-def add_profile_item(kind: str, value: str) -> dict[str, list[str]]:
+def add_profile_item(
+    kind: str,
+    value: str,
+    buy_date: str | None = None,
+    quantity: float | None = None,
+) -> dict[str, list[str]]:
     if kind not in {"stocks", "funds"}:
         raise ValueError(f"unknown profile item kind: {kind}")
     profile = load_profile()
     items = profile.setdefault(kind, [])
     normalized = value.strip()
     if normalized and normalized not in items:
         items.append(normalized)
+    if normalized and (buy_date or quantity is not None):
+        position = profile.setdefault("positions", {}).setdefault(kind, {}).setdefault(normalized, {})
+        if buy_date:
+            position["buy_date"] = buy_date.strip()
+        if quantity is not None:
+            position["quantity"] = quantity
     save_profile(profile)
     return profile
 
@@ -55,12 +67,13 @@ def remove_profile_item(kind: str, value: str) -> dict[str, list[str]]:
     profile = load_profile()
     normalized = value.strip()
     profile[kind] = [item for item in profile.get(kind, []) if item != normalized]
+    profile.setdefault("positions", {}).setdefault(kind, {}).pop(normalized, None)
     save_profile(profile)
     return profile
 
 
 def clear_profile() -> dict[str, list[str]]:
-    profile = {k: ({} if k == "groups" else []) for k in EMPTY_PROFILE}
+    profile = _empty_profile()
     save_profile(profile)
     return profile
 
@@ -70,6 +83,7 @@ def clear_profile_kind(kind: str) -> dict[str, list[str]]:
         raise ValueError(f"unknown profile item kind: {kind}")
     profile = load_profile()
     profile[kind] = []
+    profile.setdefault("positions", {})[kind] = {}
     for group in profile.get("groups", {}).values():
         if isinstance(group, dict):
             group[kind] = []
@@ -109,3 +123,31 @@ def _normalize_groups(groups) -> dict[str, dict[str, list[str]]]:
                 "funds": [str(v) for v in data.get("funds", []) if str(v).strip()],
             }
     return result
+
+
+def _normalize_positions(positions) -> dict[str, dict[str, dict[str, float | str]]]:
+    result: dict[str, dict[str, dict[str, float | str]]] = {"stocks": {}, "funds": {}}
+    if not isinstance(positions, dict):
+        return result
+    for kind in ("stocks", "funds"):
+        raw_items = positions.get(kind, {})
+        if not isinstance(raw_items, dict):
+            continue
+        for code, raw_position in raw_items.items():
+            if not isinstance(raw_position, dict):
+                continue
+            position: dict[str, float | str] = {}
+            buy_date = str(raw_position.get("buy_date") or "").strip()
+            if buy_date:
+                position["buy_date"] = buy_date
+            try:
+                position["quantity"] = float(raw_position["quantity"])
+            except (KeyError, TypeError, ValueError):
+                pass
+            if position:
+                result[kind][str(code)] = position
+    return result
+
+
+def _empty_profile() -> dict[str, list[str]]:
+    return {"stocks": [], "funds": [], "groups": {}, "positions": {"stocks": {}, "funds": {}}}