FinceptTerminal is a modern finance application offering advanced market analytics, investment research, and economic data tools, designed for interactive exploration and data-driven decision-making in a user-friendly environment.
C++ ai-agentsalgorithmic-tradingbloomberg-terminalcppfinancefinancial-marketsfintechgood-first-issueinvestmentinvestment-researchmachine-learningopensourcepythonqtquantitative-financestock-markettrading
prediction markets update
tilakpatel22b717eddd7bc9
diff --git a/README.md b/README.mdindex 22076ebc1..eebd6593b 100644--- a/README.md+++ b/README.md@@ -79,15 +79,10 @@ cd FinceptTerminalchmod +x setup.sh && ./setup.sh```-```bat-# Windows — run from Developer Command Prompt for VS 2022-git clone https://github.com/Fincept-Corporation/FinceptTerminal.git-cd FinceptTerminal-setup.bat-```-The script handles: compiler check, CMake, Qt6, Python, build, and launch.+> **Windows:** No setup script — use the manual build steps in Option 4 below. It's just two commands.+---### Option 3 — Docker@@ -138,33 +133,47 @@ docker run --rm -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix fincept-ter```bashgit clone https://github.com/Fincept-Corporation/FinceptTerminal.gitcd FinceptTerminal/fincept-qt+```-# Configure + build (pick your platform)-cmake --preset win-release && cmake --build --preset win-release # Windows (Dev Cmd for VS 2022)-cmake --preset linux-release && cmake --build --preset linux-release # Linux-cmake --preset macos-release && cmake --build --preset macos-release # macOS+**Step 1 — Configure** (one-time, or after `CMakeLists.txt` changes):+```powershell+cmake --preset win-release # Windows (PowerShell)+cmake --preset linux-release # Linux+cmake --preset macos-release # macOS```-Debug variants: `win-debug`, `linux-debug`, `macos-debug`.+**Step 2 — Compile** (run this for every code change):+```powershell+cmake --build --preset win-release # Windows+cmake --build --preset linux-release # Linux+cmake --build --preset macos-release # macOS+```++Debug variants: replace `release` with `debug` (e.g. `win-debug`, `linux-debug`, `macos-debug`).++> **Windows prerequisite:** The PowerShell profile at `~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1`+> auto-initializes VS 2022 on every new terminal — open a fresh PowerShell and cmake works directly.#### Build (manual — if presets can't resolve your Qt path)-```bash-# Windows (Developer Command Prompt for VS 2022)-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release ^+```powershell+# Windows (PowerShell)+cmake -B build/win-release -G Ninja -DCMAKE_BUILD_TYPE=Release `-DCMAKE_PREFIX_PATH="C:/Qt/6.8.3/msvc2022_64"-cmake --build build+cmake --build build/win-release+```+```bash# Linux-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \+cmake -B build/linux-release -G Ninja -DCMAKE_BUILD_TYPE=Release \-DCMAKE_PREFIX_PATH="$HOME/Qt/6.8.3/gcc_64"-cmake --build build+cmake --build build/linux-release# macOS-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \+cmake -B build/macos-release -G Ninja -DCMAKE_BUILD_TYPE=Release \-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \-DCMAKE_PREFIX_PATH="$HOME/Qt/6.8.3/macos"-cmake --build build+cmake --build build/macos-release```#### Rundiff --git a/docs/GETTING_STARTED.md b/docs/GETTING_STARTED.mdindex ca54d3caf..8dad57172 100644--- a/docs/GETTING_STARTED.md+++ b/docs/GETTING_STARTED.md@@ -44,7 +44,7 @@ Fincept Terminal is an **open-source financial analysis platform** — a free, o| **C++ compiler** | MSVC 19.38 (VS 2022 17.8) / GCC 12.3 / Apple Clang 15.0 (Xcode 15.2) || **CMake** | 3.27.7 || **Ninja** | 1.11.1 |-| **Qt** | 6.7.2 (LTS) |+| **Qt** | 6.8.3 || **Python** | 3.11.9 || **Platform SDK** | Win10 SDK 10.0.22621.0 / macOS SDK 14.0 (deploy target 11.0) / glibc 2.31+ |@@ -60,14 +60,14 @@ Fincept Terminal is an **open-source financial analysis platform** — a free, o- **Linux**: `sudo apt install -y cmake ninja-build` (verify `cmake --version` ≥ 3.27.7; if not, download from [cmake.org](https://cmake.org/download/))- **macOS**: `brew install cmake ninja`-#### 3. Install Qt 6.7.2+#### 3. Install Qt 6.8.3**Windows / Linux / macOS** — Qt online installer (recommended):- Download from https://www.qt.io/download-qt-installer-- Select exactly **Qt 6.7.2** → platform-appropriate kit (MSVC 2022 64-bit / Desktop gcc 64-bit / macOS)-- Default install paths: `C:/Qt/6.7.2/msvc2022_64`, `~/Qt/6.7.2/gcc_64`, `~/Qt/6.7.2/macos`+- Select exactly **Qt 6.8.3** → platform-appropriate kit (MSVC 2022 64-bit / Desktop gcc 64-bit / macOS)+- Default install paths: `C:/Qt/6.8.3/msvc2022_64`, `~/Qt/6.8.3/gcc_64`, `~/Qt/6.8.3/macos`-**Linux system packages (alternative — may not be exactly 6.7.2):**+**Linux system packages (alternative — may not be exactly 6.8.3):**```bashsudo apt install -y \qt6-base-dev qt6-charts-dev qt6-tools-dev qt6-base-private-dev \@@ -102,7 +102,7 @@ cmake --preset macos-release && cmake --build --preset macos-release # macOS**If CMake presets can't resolve your Qt path**, use the manual configure:```bashcmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \- -DCMAKE_PREFIX_PATH="<path/to/Qt/6.7.2/<kit>>"+ -DCMAKE_PREFIX_PATH="<path/to/Qt/6.8.3/<kit>>"cmake --build build```diff --git a/fincept-qt/.claude/scheduled_tasks.lock b/fincept-qt/.claude/scheduled_tasks.lockdeleted file mode 100644index 19a455c6a..000000000--- a/fincept-qt/.claude/scheduled_tasks.lock+++ /dev/null@@ -1 +0,0 @@-{"sessionId":"54076053-ea32-4933-b1f9-939dc29ceb71","pid":7040,"acquiredAt":1776441988628}\ No newline at end of filediff --git a/fincept-qt/CMakeLists.txt b/fincept-qt/CMakeLists.txtindex bd8fb47c4..404d16684 100644--- a/fincept-qt/CMakeLists.txt+++ b/fincept-qt/CMakeLists.txt@@ -610,6 +610,16 @@ set(SERVICE_SOURCESsrc/services/polymarket/PolymarketService.cppsrc/services/polymarket/PolymarketWebSocket.cpp+ # Prediction Markets — exchange-agnostic abstraction (Polymarket, Kalshi, …)+ src/services/prediction/PredictionExchangeAdapter.cpp+ src/services/prediction/PredictionExchangeRegistry.cpp+ src/services/prediction/PredictionCredentialStore.cpp+ src/services/prediction/polymarket/PolymarketTypeMap.cpp+ src/services/prediction/polymarket/PolymarketAdapter.cpp+ src/services/prediction/kalshi/KalshiRestClient.cpp+ src/services/prediction/kalshi/KalshiWsClient.cpp+ src/services/prediction/kalshi/KalshiAdapter.cpp+# Speech-to-text service (Python speech_recognition + Google API)src/services/stt/SpeechService.cpp@@ -896,7 +906,7 @@ set(SCREEN_SOURCESsrc/screens/economics/panels/BeaPanel.cppsrc/screens/economics/panels/FinceptMacroPanel.cpp- # Polymarket+ # Polymarket / Prediction Marketssrc/screens/polymarket/PolymarketScreen.cppsrc/screens/polymarket/PolymarketCommandBar.cppsrc/screens/polymarket/PolymarketMarketCard.cpp@@ -907,6 +917,8 @@ set(SCREEN_SOURCESsrc/screens/polymarket/PolymarketLeaderboard.cppsrc/screens/polymarket/PolymarketActivityFeed.cppsrc/screens/polymarket/PolymarketStatusBar.cpp+ src/screens/polymarket/PredictionAccountDialog.cpp+ src/screens/polymarket/ExchangePresentation.cpp# Alpha Arenasrc/screens/alpha_arena/AlphaArenaScreen.cpp@@ -1275,6 +1287,7 @@ set_source_files_properties(src/screens/polymarket/PolymarketLeaderboard.cppsrc/screens/polymarket/PolymarketActivityFeed.cppsrc/screens/polymarket/PolymarketStatusBar.cpp+ src/screens/polymarket/PredictionAccountDialog.cppsrc/trading/websocket/ZerodhaWebSocket.cppsrc/trading/websocket/AngelOneWebSocket.cpp# Trading broker files — each defines static now_ts() in same namespacediff --git a/fincept-qt/CMakePresets.json b/fincept-qt/CMakePresets.jsonindex 09bd5ce22..509705f1f 100644--- a/fincept-qt/CMakePresets.json+++ b/fincept-qt/CMakePresets.json@@ -15,56 +15,56 @@{"name": "win-release",- "displayName": "Windows Release (MSVC 2022, Qt 6.7.2)",+ "displayName": "Windows Release (MSVC 2022, Qt 6.8.3)","description": "Pinned Release build for Windows x64","inherits": "base","condition": { "type": "equals", "lhs": "${hostSystemName}", "rhs": "Windows" },"architecture": { "value": "x64", "strategy": "external" },"cacheVariables": {"CMAKE_BUILD_TYPE": "Release",- "CMAKE_PREFIX_PATH": "C:/Qt/6.7.2/msvc2022_64"+ "CMAKE_PREFIX_PATH": "C:/Qt/6.8.3/msvc2022_64"}},{"name": "win-debug",- "displayName": "Windows Debug (MSVC 2022, Qt 6.7.2)",+ "displayName": "Windows Debug (MSVC 2022, Qt 6.8.3)","inherits": "win-release","cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" }},{"name": "linux-release",- "displayName": "Linux Release (GCC 12.3, Qt 6.7.2)",+ "displayName": "Linux Release (GCC 12.3, Qt 6.8.3)","description": "Pinned Release build for Linux x86_64","inherits": "base","condition": { "type": "equals", "lhs": "${hostSystemName}", "rhs": "Linux" },"cacheVariables": {"CMAKE_BUILD_TYPE": "Release",- "CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.7.2/gcc_64"+ "CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.8.3/gcc_64"}},{"name": "linux-debug",- "displayName": "Linux Debug (GCC 12.3, Qt 6.7.2)",+ "displayName": "Linux Debug (GCC 12.3, Qt 6.8.3)","inherits": "linux-release","cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" }},{"name": "macos-release",- "displayName": "macOS Release (Apple Clang 15.0, Qt 6.7.2)",+ "displayName": "macOS Release (Apple Clang 15.0, Qt 6.8.3)","description": "Pinned Release build for macOS 11.0+","inherits": "base","condition": { "type": "equals", "lhs": "${hostSystemName}", "rhs": "Darwin" },"cacheVariables": {"CMAKE_BUILD_TYPE": "Release","CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",- "CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.7.2/macos"+ "CMAKE_PREFIX_PATH": "$env{HOME}/Qt/6.8.3/macos"}},{"name": "macos-debug",- "displayName": "macOS Debug (Apple Clang 15.0, Qt 6.7.2)",+ "displayName": "macOS Debug (Apple Clang 15.0, Qt 6.8.3)","inherits": "macos-release","cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" }}diff --git a/fincept-qt/docs/DATAHUB_TOPICS.md b/fincept-qt/docs/DATAHUB_TOPICS.mdindex 7d2582f51..daf72696e 100644--- a/fincept-qt/docs/DATAHUB_TOPICS.md+++ b/fincept-qt/docs/DATAHUB_TOPICS.md@@ -21,8 +21,10 @@ Topic segments separate with `:`. The first segment is the domain; subsequent se| `ws:kraken:trades:<pair>` | `ExchangeService` | push-only | || `ws:kraken:ohlc:<pair>:<interval>` | `ExchangeService` | push-only | || `ws:hyperliquid:*` | `ExchangeService` | push-only | Same sub-families as Kraken |-| `polymarket:price:<asset_id>` | `PolymarketWebSocket` | push-only | |-| `polymarket:orderbook:<asset_id>` | `PolymarketWebSocket` | push-only | |+| `prediction:polymarket:price:<asset_id>` | `PolymarketWebSocket` | push-only | Was `polymarket:price:*` before the prediction-markets refactor |+| `prediction:polymarket:orderbook:<asset_id>` | `PolymarketWebSocket` | push-only | Was `polymarket:orderbook:*` before the prediction-markets refactor |+| `prediction:kalshi:price:<ticker>:<side>` | `KalshiWsClient` | push-only | `<side>` is `yes` or `no`. Requires credentials — streaming activates in Phase 7 |+| `prediction:kalshi:orderbook:<ticker>:<side>` | `KalshiWsClient` | push-only | Kalshi REST returns yes+no bids only; asks synthesised client-side |## News (Phase 5)diff --git a/fincept-qt/resources/requirements-numpy2.txt b/fincept-qt/resources/requirements-numpy2.txtindex 6b7ea41c1..2860e8424 100644--- a/fincept-qt/resources/requirements-numpy2.txt+++ b/fincept-qt/resources/requirements-numpy2.txt@@ -114,6 +114,13 @@ rdagent==0.8.0deepagents==0.4.12gs-quant==1.4.67+# Prediction Markets — Polymarket + Kalshi trading (Phase 6/7)+# Polymarket uses EIP-712 signing via py_clob_client (Polygon wallet);+# Kalshi uses RSA-PSS signing via the `cryptography` package.+py-clob-client>=0.22.0+eth-account>=0.10.0+cryptography>=42.0.0+# Visualizationplotly>=6.0.0matplotlib>=3.9.3,<4.0diff --git a/fincept-qt/scripts/exchange/cancel_order.py b/fincept-qt/scripts/exchange/cancel_order.pyindex 21de8594f..c4f0bca27 100644--- a/fincept-qt/scripts/exchange/cancel_order.py+++ b/fincept-qt/scripts/exchange/cancel_order.py@@ -35,14 +35,20 @@ def main():credentials = parse_credentials_from_stdin()if not credentials.get("api_key"):output_error("API key required. Pass credentials via stdin JSON.", "AUTH_ERROR")+ if not credentials.get("secret"):+ output_error("API secret required. Pass credentials via stdin JSON.", "AUTH_ERROR")exchange = make_exchange(exchange_id, credentials)result = exchange.cancel_order(order_id, symbol)+ status = result.get("status", "")+ if status not in ("canceled", "cancelled"):+ output_error(f"Order cancellation not confirmed — exchange returned status: '{status}'", "CANCEL_FAILED")+output_success({"id": result.get("id", order_id),"symbol": result.get("symbol", symbol),- "status": result.get("status", "canceled"),+ "status": status or "canceled","exchange": exchange_id,})diff --git a/fincept-qt/scripts/prediction_kalshi.py b/fincept-qt/scripts/prediction_kalshi.pynew file mode 100644index 000000000..94da7a299--- /dev/null+++ b/fincept-qt/scripts/prediction_kalshi.py@@ -0,0 +1,343 @@+#!/usr/bin/env python3+"""Kalshi trading bridge for Fincept Terminal.++Invocation:+ python prediction_kalshi.py <command> <json_payload>++Commands:+ balance — GET /portfolio/balance+ positions — GET /portfolio/positions+ open_orders — GET /portfolio/orders?status=resting+ fills — GET /portfolio/fills+ place_order — POST /portfolio/orders+ cancel_order — DELETE /portfolio/orders/{order_id}+ decrease_order — POST /portfolio/orders/{order_id}/decrease+ settlements — GET /portfolio/settlements++Payload shape for every command:+ {+ "api_key_id": "UUID",+ "private_key_pem": "-----BEGIN …-----\n…\n-----END …-----",+ "use_demo": false,+ …command-specific fields…+ }++place_order fields:+ "ticker": "KXFOO-25DEC-T3.00",+ "action": "buy" | "sell",+ "side": "yes" | "no",+ "count": 10, // number of contracts+ "order_type": "limit" | "market",+ "yes_price_cents": 52, // integer cents 1-99 (limit only)+ "no_price_cents": 48, // alternative — limit sell NO side+ "expiration_ts": 1735689600, // 0/omitted = GTC+ "client_order_id": "uuid-…"++All responses are a single JSON line on stdout.+"""+from __future__ import annotations++import base64+import datetime+import json+import sys+import traceback+import uuid+++def _emit(obj: dict) -> None:+ sys.stdout.write(json.dumps(obj, separators=(",", ":")))+ sys.stdout.write("\n")+ sys.stdout.flush()+++def _fail(msg: str, **extra) -> None:+ _emit({"ok": False, "error": msg, **extra})+++def _require_crypto():+ try:+ from cryptography.hazmat.primitives import hashes # noqa: F401+ import requests # noqa: F401+ return True+ except Exception as exc:+ _fail("cryptography / requests is not installed", detail=str(exc))+ return False+++_API_PREFIX = "/trade-api/v2"+++def _base_url(use_demo: bool) -> str:+ return "https://demo-api.kalshi.co" + _API_PREFIX if use_demo else \+ "https://api.elections.kalshi.com" + _API_PREFIX+++def _load_private_key(pem: str):+ from cryptography.hazmat.primitives.serialization import load_pem_private_key+ return load_pem_private_key(pem.encode("utf-8"), password=None)+++def _sign_text(priv, text: str) -> str:+ from cryptography.hazmat.primitives import hashes+ from cryptography.hazmat.primitives.asymmetric import padding++ sig = priv.sign(+ text.encode("utf-8"),+ padding.PSS(+ mgf=padding.MGF1(hashes.SHA256()),+ salt_length=padding.PSS.DIGEST_LENGTH,+ ),+ hashes.SHA256(),+ )+ return base64.b64encode(sig).decode("utf-8")+++def _auth_headers(payload: dict, method: str, signing_path: str) -> dict:+ api_key_id = payload["api_key_id"]+ pem = payload["private_key_pem"]+ priv = _load_private_key(pem)++ ts = str(int(datetime.datetime.now().timestamp() * 1000))+ # Kalshi signs `timestamp_ms + METHOD + path` where path is the full path+ # under the host *including* the /trade-api/v2 prefix and *excluding* the+ # query string. Confirmed against docs.kalshi.com quickstart (Apr 2026).+ signature = _sign_text(priv, ts + method.upper() + signing_path)+ return {+ "KALSHI-ACCESS-KEY": api_key_id,+ "KALSHI-ACCESS-SIGNATURE": signature,+ "KALSHI-ACCESS-TIMESTAMP": ts,+ "Content-Type": "application/json",+ }+++def _request(payload: dict, method: str, path: str, *, params=None, body=None):+ import requests+ base = _base_url(bool(payload.get("use_demo")))+ url = base + path+ signing_path = _API_PREFIX + path # full path under host, no query string+ headers = _auth_headers(payload, method, signing_path)+ resp = requests.request(method, url, headers=headers, params=params, json=body, timeout=30)+ ok = resp.status_code in (200, 201)+ try:+ data = resp.json()+ except Exception:+ data = {"text": resp.text}+ return ok, resp.status_code, data+++# ── Commands ────────────────────────────────────────────────────────────────+++def cmd_balance(payload: dict) -> None:+ ok, code, data = _request(payload, "GET", "/portfolio/balance")+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ cents = int(data.get("balance", 0))+ _emit({+ "ok": True,+ "available": cents / 100.0,+ "total_value": cents / 100.0,+ "currency": "USD",+ })+++def _to_float(v, default=0.0):+ try:+ return float(v) if v is not None else default+ except (TypeError, ValueError):+ return default+++def cmd_positions(payload: dict) -> None:+ ok, code, data = _request(payload, "GET", "/portfolio/positions",+ params={"limit": 500})+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ positions = []+ # As of Mar 12, 2026 Kalshi removed integer cent fields from responses.+ # Use position_fp (signed contract count, 2dp) and *_dollars (decimal $).+ for p in data.get("market_positions", []) or []:+ position_fp = _to_float(p.get("position_fp"))+ market_exposure = _to_float(p.get("market_exposure_dollars"))+ size = abs(position_fp)+ avg_price = market_exposure / size if size > 0 else 0.0+ positions.append({+ "asset_id": (p.get("ticker") or "") + (":yes" if position_fp >= 0 else ":no"),+ "market_id": p.get("ticker", ""),+ "outcome": "YES" if position_fp >= 0 else "NO",+ "size": size,+ "avg_price": avg_price,+ "realized_pnl": _to_float(p.get("realized_pnl_dollars")),+ "unrealized_pnl": _to_float(p.get("total_traded_dollars")),+ "current_value": market_exposure,+ })+ _emit({"ok": True, "positions": positions})+++def cmd_open_orders(payload: dict) -> None:+ ok, code, data = _request(payload, "GET", "/portfolio/orders",+ params={"status": "resting", "limit": 500})+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ orders = []+ # Mar 12, 2026: bare `count` / `yes_price` / `no_price` removed from order+ # responses. Use `*_fp` for counts and `*_dollars` for prices.+ for o in data.get("orders", []) or []:+ side = (o.get("side") or "yes").lower()+ price_field = "yes_price_dollars" if side == "yes" else "no_price_dollars"+ initial = _to_float(o.get("initial_count_fp"))+ remaining = _to_float(o.get("remaining_count_fp"))+ # ISO 8601 created_time → epoch ms+ created_ms = 0+ ct = o.get("created_time") or ""+ if ct:+ try:+ created_ms = int(datetime.datetime.fromisoformat(+ ct.replace("Z", "+00:00")).timestamp() * 1000)+ except ValueError:+ created_ms = 0+ expires_ms = 0+ et = o.get("expiration_time") or ""+ if et:+ try:+ expires_ms = int(datetime.datetime.fromisoformat(+ et.replace("Z", "+00:00")).timestamp() * 1000)+ except ValueError:+ expires_ms = 0+ orders.append({+ "order_id": o.get("order_id", ""),+ "asset_id": (o.get("ticker") or "") + ":" + side,+ "market_id": o.get("ticker", ""),+ "outcome": side.upper(),+ "side": (o.get("action") or "buy").upper(),+ "order_type": (o.get("type") or "limit").upper(),+ "price": _to_float(o.get(price_field)),+ "size": remaining,+ "filled": max(0.0, initial - remaining),+ "status": (o.get("status") or "").upper(),+ "created_ms": created_ms,+ "expires_ms": expires_ms,+ "client_order_id": o.get("client_order_id", ""),+ })+ _emit({"ok": True, "orders": orders})+++def cmd_fills(payload: dict) -> None:+ ok, code, data = _request(payload, "GET", "/portfolio/fills",+ params={"limit": int(payload.get("limit", 100))})+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ _emit({"ok": True, "fills": data.get("fills", []) or []})+++def cmd_settlements(payload: dict) -> None:+ ok, code, data = _request(payload, "GET", "/portfolio/settlements",+ params={"limit": int(payload.get("limit", 100))})+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ _emit({"ok": True, "settlements": data.get("settlements", []) or []})+++def cmd_place_order(payload: dict) -> None:+ body = {+ "ticker": payload["ticker"],+ "action": str(payload.get("action", "buy")).lower(),+ "side": str(payload.get("side", "yes")).lower(),+ "count": int(payload["count"]),+ "type": str(payload.get("order_type", "limit")).lower(),+ "client_order_id": payload.get("client_order_id") or str(uuid.uuid4()),+ }+ if body["type"] == "limit":+ if "yes_price_cents" in payload:+ body["yes_price"] = int(payload["yes_price_cents"])+ elif "no_price_cents" in payload:+ body["no_price"] = int(payload["no_price_cents"])+ else:+ _fail("limit order requires yes_price_cents or no_price_cents")+ return+ if payload.get("expiration_ts"):+ body["expiration_ts"] = int(payload["expiration_ts"])++ ok, code, data = _request(payload, "POST", "/portfolio/orders", body=body)+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ order = data.get("order", {}) or {}+ _emit({+ "ok": True,+ "order_id": order.get("order_id", ""),+ "status": (order.get("status") or "").upper(),+ "client_order_id": body["client_order_id"],+ "raw": data,+ })+++def cmd_cancel_order(payload: dict) -> None:+ order_id = str(payload["order_id"])+ ok, code, data = _request(payload, "DELETE", f"/portfolio/orders/{order_id}")+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ _emit({"ok": True, "order_id": order_id, "raw": data})+++def cmd_decrease_order(payload: dict) -> None:+ order_id = str(payload["order_id"])+ body = {"reduce_by": int(payload.get("reduce_by", 0))}+ ok, code, data = _request(payload, "POST",+ f"/portfolio/orders/{order_id}/decrease", body=body)+ if not ok:+ _fail(f"HTTP {code}", detail=data)+ return+ _emit({"ok": True, "raw": data})+++COMMANDS = {+ "balance": cmd_balance,+ "positions": cmd_positions,+ "open_orders": cmd_open_orders,+ "fills": cmd_fills,+ "settlements": cmd_settlements,+ "place_order": cmd_place_order,+ "cancel_order": cmd_cancel_order,+ "decrease_order": cmd_decrease_order,+}+++def main() -> int:+ if len(sys.argv) < 2:+ _fail("usage: prediction_kalshi.py <command> [<json_payload>]")+ return 2+ command = sys.argv[1]+ payload_str = sys.argv[2] if len(sys.argv) > 2 else "{}"+ try:+ payload = json.loads(payload_str)+ except json.JSONDecodeError as exc:+ _fail(f"invalid JSON payload: {exc}")+ return 2++ handler = COMMANDS.get(command)+ if handler is None:+ _fail(f"unknown command: {command}", available=list(COMMANDS.keys()))+ return 2++ if not _require_crypto():+ return 3++ try:+ handler(payload)+ return 0+ except Exception as exc:+ traceback.print_exc(file=sys.stderr)+ _fail(f"{type(exc).__name__}: {exc}")+ return 1+++if __name__ == "__main__":+ sys.exit(main())diff --git a/fincept-qt/scripts/prediction_polymarket.py b/fincept-qt/scripts/prediction_polymarket.pynew file mode 100644index 000000000..e5e52718f--- /dev/null+++ b/fincept-qt/scripts/prediction_polymarket.py@@ -0,0 +1,306 @@+#!/usr/bin/env python3+"""Polymarket trading bridge for Fincept Terminal.++Invocation:+ python prediction_polymarket.py <command> <json_payload>++Commands:+ derive_api_creds — POST /auth/api-key via L1 EIP-712 headers; returns {apiKey, secret, passphrase}+ balance — get available USDC + total value+ positions — user's open positions+ open_orders — user's live orders+ activity — trade / split / merge / redeem / reward history+ place_order — sign + submit a limit/market order+ cancel_order — cancel a single order by id+ cancel_market — cancel all user orders in a (market, asset_id) pair++Payload shape for `place_order`:+ {+ "private_key": "0x…", // Polygon signer+ "funder": "0x…", // optional — auto-derived for Proxy+ "signature_type": 0 | 1 | 2, // 0=EOA 1=POLY_PROXY 2=POLY_GNOSIS_SAFE+ "api_key": "…", // L2 creds (from derive_api_creds)+ "api_secret": "…",+ "api_passphrase": "…",+ "token_id": "asset id",+ "price": 0.65,+ "size": 100,+ "side": "BUY" | "SELL",+ "order_type": "GTC" | "FOK" | "GTD" | "FAK",+ "tick_size": "0.01",+ "neg_risk": false,+ "expiration": 0 // 0=GTC; unix seconds for GTD+ }++All responses are a single-line JSON object on stdout. Errors come back as+ {"ok": false, "error": "..."}+Success responses are {"ok": true, ...command-specific fields...}.++The script deliberately avoids raising uncaught exceptions — anything that+slips through is turned into a stderr trace + `ok:false` stdout line so the+C++ caller can still parse it.+"""+from __future__ import annotations++import json+import sys+import traceback+++def _emit(obj: dict) -> None:+ sys.stdout.write(json.dumps(obj, separators=(",", ":")))+ sys.stdout.write("\n")+ sys.stdout.flush()+++def _fail(msg: str, **extra) -> None:+ _emit({"ok": False, "error": msg, **extra})+++def _require_pyclob():+ try:+ from py_clob_client.client import ClobClient # noqa: F401+ return True+ except Exception as exc:+ _fail(+ "py_clob_client is not installed. Run: pip install py-clob-client eth-account",+ detail=str(exc),+ )+ return False+++def _build_client(payload: dict):+ from py_clob_client.client import ClobClient+ from py_clob_client.clob_types import ApiCreds++ host = payload.get("host") or "https://clob.polymarket.com"+ chain_id = int(payload.get("chain_id") or 137)+ private_key = payload.get("private_key") or ""+ if not private_key:+ raise ValueError("private_key is required")+ funder = payload.get("funder") or None+ sig_type = int(payload.get("signature_type", 1))++ creds = None+ if payload.get("api_key") and payload.get("api_secret") and payload.get("api_passphrase"):+ creds = ApiCreds(+ api_key=payload["api_key"],+ api_secret=payload["api_secret"],+ api_passphrase=payload["api_passphrase"],+ )++ # Signature type 0 (EOA) does not need a funder; 1/2 do.+ kwargs = {+ "host": host,+ "chain_id": chain_id,+ "key": private_key,+ }+ if creds is not None:+ kwargs["creds"] = creds+ if sig_type != 0:+ kwargs["signature_type"] = sig_type+ if funder:+ kwargs["funder"] = funder+ return ClobClient(**kwargs)+++# ── Commands ────────────────────────────────────────────────────────────────+++def cmd_derive_api_creds(payload: dict) -> None:+ """Derive L2 API credentials from L1 (EIP-712) signature.++ py_clob_client's `create_or_derive_api_creds()` handles both paths.+ """+ client = _build_client(payload)+ creds = client.create_or_derive_api_creds()+ _emit({+ "ok": True,+ "api_key": creds.api_key,+ "api_secret": creds.api_secret,+ "api_passphrase": creds.api_passphrase,+ })+++def cmd_balance(payload: dict) -> None:+ client = _build_client(payload)+ # get_balance_allowance returns {balance, allowance} for USDC collateral.+ from py_clob_client.clob_types import BalanceAllowanceParams, AssetType+ params = BalanceAllowanceParams(asset_type=AssetType.COLLATERAL)+ ba = client.get_balance_allowance(params)+ # Polymarket balances are in 6-decimal USDC units (microUSDC).+ available = float(ba.get("balance", "0")) / 1_000_000.0+ _emit({+ "ok": True,+ "available": available,+ "total_value": available,+ "currency": "USDC",+ })+++def cmd_positions(payload: dict) -> None:+ import requests++ user = payload.get("user") or ""+ if not user:+ # If user address is not given, derive from private_key via eth_account.+ from eth_account import Account+ user = Account.from_key(payload["private_key"]).address+ r = requests.get(+ "https://data-api.polymarket.com/positions",+ params={"user": user, "sizeThreshold": 0.0001, "limit": 500},+ timeout=30,+ )+ r.raise_for_status()+ items = r.json() or []+ positions = []+ for p in items:+ positions.append({+ "asset_id": p.get("asset"),+ "market_id": p.get("conditionId"),+ "outcome": p.get("outcome", ""),+ "size": float(p.get("size", 0)),+ "avg_price": float(p.get("avgPrice", 0)),+ "realized_pnl": float(p.get("realizedPnl", 0)),+ "unrealized_pnl": float(p.get("cashPnl", 0)),+ "current_value": float(p.get("currentValue", 0)),+ })+ _emit({"ok": True, "positions": positions})+++def cmd_open_orders(payload: dict) -> None:+ client = _build_client(payload)+ orders = client.get_orders() or []+ normalized = []+ for o in orders:+ normalized.append({+ "order_id": o.get("id"),+ "asset_id": o.get("asset_id"),+ "market_id": o.get("market"),+ "outcome": o.get("outcome"),+ "side": o.get("side"),+ "order_type": o.get("order_type", "GTC"),+ "price": float(o.get("price", 0)),+ "size": float(o.get("original_size", 0)) / 1_000_000.0,+ "filled": float(o.get("size_matched", 0)) / 1_000_000.0,+ "status": o.get("status", ""),+ "created_ms": int(o.get("created_at", 0)) * 1000,+ "expires_ms": int(o.get("expiration") or 0) * 1000,+ })+ _emit({"ok": True, "orders": normalized})+++def cmd_activity(payload: dict) -> None:+ import requests+ from eth_account import Account++ user = payload.get("user") or Account.from_key(payload["private_key"]).address+ limit = int(payload.get("limit", 100))+ r = requests.get(+ "https://data-api.polymarket.com/activity",+ params={"user": user, "limit": min(max(limit, 1), 500)},+ timeout=30,+ )+ r.raise_for_status()+ _emit({"ok": True, "activities": r.json() or []})+++def cmd_place_order(payload: dict) -> None:+ from py_clob_client.clob_types import OrderArgs, OrderType++ client = _build_client(payload)++ order_type_map = {+ "GTC": OrderType.GTC,+ "FOK": OrderType.FOK,+ "GTD": OrderType.GTD,+ "FAK": OrderType.FAK,+ }+ order_type = order_type_map.get(payload.get("order_type", "GTC"), OrderType.GTC)++ args = OrderArgs(+ token_id=str(payload["token_id"]),+ price=float(payload["price"]),+ size=float(payload["size"]),+ side=str(payload.get("side", "BUY")).upper(),+ )+ if payload.get("expiration"):+ args.expiration = int(payload["expiration"])++ options = {+ "tick_size": str(payload.get("tick_size", "0.01")),+ "neg_risk": bool(payload.get("neg_risk", False)),+ }++ result = client.create_and_post_order(args, options, order_type=order_type)+ _emit({+ "ok": bool(result.get("success", False)),+ "order_id": result.get("orderID") or result.get("order_id") or "",+ "status": result.get("status", ""),+ "error": result.get("errorMsg", ""),+ "raw": result,+ })+++def cmd_cancel_order(payload: dict) -> None:+ client = _build_client(payload)+ oid = str(payload["order_id"])+ result = client.cancel(order_id=oid)+ _emit({+ "ok": bool(result.get("canceled")),+ "order_id": oid,+ "raw": result,+ })+++def cmd_cancel_market(payload: dict) -> None:+ client = _build_client(payload)+ market = str(payload["market_id"])+ asset_id = str(payload["asset_id"])+ result = client.cancel_market_orders(market=market, asset_id=asset_id)+ _emit({"ok": True, "raw": result})+++COMMANDS = {+ "derive_api_creds": cmd_derive_api_creds,+ "balance": cmd_balance,+ "positions": cmd_positions,+ "open_orders": cmd_open_orders,+ "activity": cmd_activity,+ "place_order": cmd_place_order,+ "cancel_order": cmd_cancel_order,+ "cancel_market": cmd_cancel_market,+}+++def main() -> int:+ if len(sys.argv) < 2:+ _fail("usage: prediction_polymarket.py <command> [<json_payload>]")+ return 2+ command = sys.argv[1]+ payload_str = sys.argv[2] if len(sys.argv) > 2 else "{}"+ try:+ payload = json.loads(payload_str)+ except json.JSONDecodeError as exc:+ _fail(f"invalid JSON payload: {exc}")+ return 2++ handler = COMMANDS.get(command)+ if handler is None:+ _fail(f"unknown command: {command}", available=list(COMMANDS.keys()))+ return 2++ if not _require_pyclob():+ return 3++ try:+ handler(payload)+ return 0+ except Exception as exc:+ traceback.print_exc(file=sys.stderr)+ _fail(f"{type(exc).__name__}: {exc}")+ return 1+++if __name__ == "__main__":+ sys.exit(main())diff --git a/fincept-qt/src/app/DockScreenRouter.cpp b/fincept-qt/src/app/DockScreenRouter.cppindex 5526caf47..371b9c2a2 100644--- a/fincept-qt/src/app/DockScreenRouter.cpp+++ b/fincept-qt/src/app/DockScreenRouter.cpp@@ -38,7 +38,7 @@ QString DockScreenRouter::title_for_id(const QString& id) {{"geopolitics", "Geopolitics"},{"gov_data", "Gov Data"},{"maritime", "Maritime"},- {"polymarket", "Polymarket"},+ {"polymarket", "Prediction Markets"},{"relationship_map", "Relationship Map"},{"derivatives", "Derivatives"},{"alt_investments", "Alt Investments"},@@ -504,7 +504,7 @@ ads::CDockWidget* DockScreenRouter::create_dock_widget(const QString& id) {if (dock_widgets_.contains(id))return dock_widgets_[id];- auto* dw = new ads::CDockWidget(title_for_id(id));+ auto* dw = new ads::CDockWidget(manager_, title_for_id(id));dw->setObjectName(id);// Pinnable is intentionally excluded: the auto-hide pin button converts panelsdiff --git a/fincept-qt/src/app/MainWindow.cpp b/fincept-qt/src/app/MainWindow.cppindex b8f689841..f933fe3fb 100644--- a/fincept-qt/src/app/MainWindow.cpp+++ b/fincept-qt/src/app/MainWindow.cpp@@ -271,8 +271,8 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi});// MCP navigation tool → dock_router (cross-thread safe)- EventBus::instance().subscribe("nav.switch_screen", [this](const QVariantMap& data) {- QString screen_id = data["screen_id"].toString();+ EventBus::instance().subscribe("nav.switch_screen", [this](const QVariantMap& nav_data) {+ QString screen_id = nav_data["screen_id"].toString();if (!screen_id.isEmpty())QMetaObject::invokeMethod(dock_router_, [this, screen_id]() {diff --git a/fincept-qt/src/app/main.cpp b/fincept-qt/src/app/main.cppindex c2b403937..8146144d5 100644--- a/fincept-qt/src/app/main.cpp+++ b/fincept-qt/src/app/main.cpp@@ -26,6 +26,10 @@#include "services/markets/MarketDataService.h"#include "services/news/NewsService.h"#include "services/polymarket/PolymarketWebSocket.h"+#include "services/prediction/PredictionCredentialStore.h"+#include "services/prediction/PredictionExchangeRegistry.h"+#include "services/prediction/kalshi/KalshiAdapter.h"+#include "services/prediction/polymarket/PolymarketAdapter.h"#include "services/relationship_map/RelationshipMapService.h"#include "trading/DataStreamManager.h"#include "trading/ExchangeService.h"@@ -47,6 +51,8 @@#include <QTimer>#include <QUuid>+#include <memory>+#include <singleapplication.h>#ifdef Q_OS_WIN@@ -113,8 +119,31 @@ int main(int argc, char* argv[]) {fincept::services::MarketDataService::instance().ensure_registered_with_hub();// Phase 4: ExchangeService as the ws:kraken:* / ws:hyperliquid:* producer.fincept::trading::ExchangeService::instance().ensure_registered_with_hub();- // Phase 4: PolymarketWebSocket as the polymarket:* producer.+ // Prediction Markets — multi-exchange tab (Polymarket, Kalshi, …).+ // PolymarketWebSocket is the hub producer for `prediction:polymarket:*`;+ // the adapter layer translates exchange-local types into the unified+ // prediction::* data model for the screen.fincept::services::polymarket::PolymarketWebSocket::instance().ensure_registered_with_hub();+ {+ auto& reg = fincept::services::prediction::PredictionExchangeRegistry::instance();+ reg.register_adapter(+ std::make_unique<fincept::services::prediction::polymarket_ns::PolymarketAdapter>());+ reg.register_adapter(+ std::make_unique<fincept::services::prediction::kalshi_ns::KalshiAdapter>());++ // Hydrate credentials from SecureStorage if previously saved. This+ // has to happen after registration so the adapters exist.+ if (auto* pm = dynamic_cast<fincept::services::prediction::polymarket_ns::PolymarketAdapter*>(+ reg.adapter(QStringLiteral("polymarket")))) {+ pm->reload_credentials();+ }+ if (auto* ks = dynamic_cast<fincept::services::prediction::kalshi_ns::KalshiAdapter*>(+ reg.adapter(QStringLiteral("kalshi")))) {+ if (auto creds = fincept::services::prediction::PredictionCredentialStore::load_kalshi()) {+ ks->set_credentials(*creds);+ }+ }+ }// Phase 5: NewsService as the news:general / news:symbol:* /// news:category:* / news:cluster:* producer.fincept::services::NewsService::instance().ensure_registered_with_hub();diff --git a/fincept-qt/src/core/session/ScreenStateManager.cpp b/fincept-qt/src/core/session/ScreenStateManager.cppindex 9ea271ee8..cf85944c5 100644--- a/fincept-qt/src/core/session/ScreenStateManager.cpp+++ b/fincept-qt/src/core/session/ScreenStateManager.cpp@@ -8,6 +8,8 @@#include <QTimer>#include <QtConcurrent/QtConcurrent>+#include <tuple>+namespace fincept {// ── Singleton ────────────────────────────────────────────────────────────────@@ -140,7 +142,7 @@ void ScreenStateManager::flush_pending() {void ScreenStateManager::write_async(const QString& key, const QVariantMap& state, int version,const QString& session_id) {// Capture by value — no raw 'this', no widget pointers (P8 compliant).- QtConcurrent::run([key, state, version, session_id]() {+ std::ignore = QtConcurrent::run([key, state, version, session_id]() {// Convert QVariantMap → QJsonObjectQJsonObject obj;for (auto it = state.constBegin(); it != state.constEnd(); ++it)diff --git a/fincept-qt/src/datahub/DataHubMetaTypes.cpp b/fincept-qt/src/datahub/DataHubMetaTypes.cppindex abc826ffd..9619ea0ca 100644--- a/fincept-qt/src/datahub/DataHubMetaTypes.cpp+++ b/fincept-qt/src/datahub/DataHubMetaTypes.cpp@@ -18,6 +18,23 @@ void register_metatypes() {qRegisterMetaType<fincept::trading::Candle>("fincept::trading::Candle");qRegisterMetaType<fincept::trading::TradeData>("fincept::trading::TradeData");qRegisterMetaType<fincept::services::polymarket::OrderBook>("fincept::services::polymarket::OrderBook");++ // Prediction Markets (Polymarket, Kalshi, …)+ qRegisterMetaType<fincept::services::prediction::MarketKey>("fincept::services::prediction::MarketKey");+ qRegisterMetaType<fincept::services::prediction::PredictionMarket>("fincept::services::prediction::PredictionMarket");+ qRegisterMetaType<fincept::services::prediction::PredictionEvent>("fincept::services::prediction::PredictionEvent");+ qRegisterMetaType<fincept::services::prediction::PredictionOrderBook>("fincept::services::prediction::PredictionOrderBook");+ qRegisterMetaType<fincept::services::prediction::PriceHistory>("fincept::services::prediction::PriceHistory");+ qRegisterMetaType<fincept::services::prediction::PredictionTrade>("fincept::services::prediction::PredictionTrade");+ qRegisterMetaType<fincept::services::prediction::PredictionPosition>("fincept::services::prediction::PredictionPosition");+ qRegisterMetaType<fincept::services::prediction::OpenOrder>("fincept::services::prediction::OpenOrder");+ qRegisterMetaType<fincept::services::prediction::OrderResult>("fincept::services::prediction::OrderResult");+ qRegisterMetaType<fincept::services::prediction::AccountBalance>("fincept::services::prediction::AccountBalance");+ qRegisterMetaType<QVector<fincept::services::prediction::PredictionMarket>>("QVector<fincept::services::prediction::PredictionMarket>");+ qRegisterMetaType<QVector<fincept::services::prediction::PredictionEvent>>("QVector<fincept::services::prediction::PredictionEvent>");+ qRegisterMetaType<QVector<fincept::services::prediction::PredictionTrade>>("QVector<fincept::services::prediction::PredictionTrade>");+ qRegisterMetaType<QVector<fincept::services::prediction::PredictionPosition>>("QVector<fincept::services::prediction::PredictionPosition>");+ qRegisterMetaType<QVector<fincept::services::prediction::OpenOrder>>("QVector<fincept::services::prediction::OpenOrder>");qRegisterMetaType<fincept::services::DbnDataPoint>("fincept::services::DbnDataPoint");qRegisterMetaType<fincept::services::GovDataResult>("fincept::services::GovDataResult");qRegisterMetaType<fincept::trading::BrokerPosition>("fincept::trading::BrokerPosition");diff --git a/fincept-qt/src/datahub/DataHubMetaTypes.h b/fincept-qt/src/datahub/DataHubMetaTypes.hindex a24d1b28a..ab1a790cd 100644--- a/fincept-qt/src/datahub/DataHubMetaTypes.h+++ b/fincept-qt/src/datahub/DataHubMetaTypes.h@@ -25,6 +25,7 @@#include "services/markets/MarketDataService.h" // QuoteData, HistoryPoint, InfoData#include "services/news/NewsService.h" // NewsArticle#include "services/polymarket/PolymarketTypes.h" // OrderBook+#include "services/prediction/PredictionTypes.h" // PredictionOrderBook, PredictionMarket, …#include "trading/TradingTypes.h" // TickerData, OrderBookData, Candle, TradeData, Broker*#include <QMetaType>diff --git a/fincept-qt/src/network/websocket/WebSocketClient.cpp b/fincept-qt/src/network/websocket/WebSocketClient.cppindex ab87f2a89..15659e1bb 100644--- a/fincept-qt/src/network/websocket/WebSocketClient.cpp+++ b/fincept-qt/src/network/websocket/WebSocketClient.cpp@@ -11,8 +11,7 @@ WebSocketClient::WebSocketClient(QObject* parent) : QObject(parent) {connect(&socket_, &QWebSocket::disconnected, this, &WebSocketClient::on_disconnected);connect(&socket_, &QWebSocket::textMessageReceived, this, &WebSocketClient::on_text_received);connect(&socket_, &QWebSocket::binaryMessageReceived, this, &WebSocketClient::on_binary_received);- connect(&socket_, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this,- &WebSocketClient::on_error);+ connect(&socket_, &QWebSocket::errorOccurred, this, &WebSocketClient::on_error);connect(&reconnect_timer_, &QTimer::timeout, this, &WebSocketClient::attempt_reconnect);reconnect_timer_.setSingleShot(true);}diff --git a/fincept-qt/src/screens/agent_config/PlannerViewPanel.cpp b/fincept-qt/src/screens/agent_config/PlannerViewPanel.cppindex 2173f5ee5..162cfb795 100644--- a/fincept-qt/src/screens/agent_config/PlannerViewPanel.cpp+++ b/fincept-qt/src/screens/agent_config/PlannerViewPanel.cpp@@ -89,8 +89,8 @@ QWidget* PlannerViewPanel::build_templates_panel() {{const auto pr = fincept::LlmProfileRepository::instance().list_profiles();const auto profiles = pr.is_ok() ? pr.value() : QVector<fincept::LlmProfile>{};- for (const auto& p : profiles)- llm_profile_combo_->addItem(p.is_default ? p.name + " [default]" : p.name, p.id);+ for (const auto& prof : profiles)+ llm_profile_combo_->addItem(prof.is_default ? prof.name + " [default]" : prof.name, prof.id);}vl->addWidget(llm_profile_combo_);diff --git a/fincept-qt/src/screens/dashboard/widgets/PolymarketPriceWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/PolymarketPriceWidget.cppindex ecf7eb0ab..5f65b2a6e 100644--- a/fincept-qt/src/screens/dashboard/widgets/PolymarketPriceWidget.cpp+++ b/fincept-qt/src/screens/dashboard/widgets/PolymarketPriceWidget.cpp@@ -108,7 +108,7 @@ void PolymarketPriceWidget::hub_resubscribe() {auto& hub = datahub::DataHub::instance();hub.unsubscribe(this);for (const auto& e : entries_) {- const QString topic = QStringLiteral("polymarket:price:") + e.asset_id;+ const QString topic = QStringLiteral("prediction:polymarket:price:") + e.asset_id;const QString asset_copy = e.asset_id;hub.subscribe(this, topic, [this, asset_copy](const QVariant& v) {bool ok = false;diff --git a/fincept-qt/src/screens/docs/DocsScreen.cpp b/fincept-qt/src/screens/docs/DocsScreen.cppindex e7c2b0af7..026b2e7f2 100644--- a/fincept-qt/src/screens/docs/DocsScreen.cpp+++ b/fincept-qt/src/screens/docs/DocsScreen.cpp@@ -1415,7 +1415,7 @@ void DocsScreen::build_sidebar() {auto* geo = add_category("GEOPOLITICS & ALT");add_item(geo, "Geopolitics", "geopolitics");add_item(geo, "Maritime", "maritime");- add_item(geo, "Polymarket", "polymarket");+ add_item(geo, "Prediction Markets", "polymarket");add_item(geo, "Alt Investments", "alt_investments");// ── Tools ────────────────────────────────────────────────────────────────diff --git a/fincept-qt/src/screens/node_editor/canvas/NodeItem.cpp b/fincept-qt/src/screens/node_editor/canvas/NodeItem.cppindex a79d64761..b9876658a 100644--- a/fincept-qt/src/screens/node_editor/canvas/NodeItem.cpp+++ b/fincept-qt/src/screens/node_editor/canvas/NodeItem.cpp@@ -57,9 +57,7 @@ PortItem* NodeItem::find_port(const QString& port_id) const {}void NodeItem::rebuild_layout() {- // Clear existing ports- for (auto* p : input_ports_) { /* owned by scene via parent */- }+ // Ports are owned by scene via parent — just clear the listsinput_ports_.clear();output_ports_.clear();@@ -213,15 +211,7 @@ QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant& value)def_.y = pos.y();emit node_moved(def_.id, pos.x(), pos.y());- // Update connected edges- for (auto* p : input_ports_)- for (auto* e : p->edges())- if (auto* edge = dynamic_cast<class EdgeItem*>(static_cast<QGraphicsItem*>(e)))- ; // edges adjust in NodeScene via signal- for (auto* p : output_ports_)- for (auto* e : p->edges())- if (auto* edge = dynamic_cast<class EdgeItem*>(static_cast<QGraphicsItem*>(e)))- ;+ // Edges adjust in NodeScene via signal — no per-edge action needed here}if (change == ItemSelectedHasChanged) {diff --git a/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cpp b/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cppindex 3beded9cf..93139b61b 100644--- a/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cpp+++ b/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cpp@@ -335,8 +335,8 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&auto res = fincept::LlmProfileRepository::instance().list_profiles();if (res.is_ok()) {for (const auto& p : res.value()) {- QString label = p.name + " [" + p.provider + " / " + p.model_id + "]";- combo->addItem(label, p.id);+ QString display = p.name + " [" + p.provider + " / " + p.model_id + "]";+ combo->addItem(display, p.id);if (p.id == saved)combo->setCurrentIndex(combo->count() - 1);}diff --git a/fincept-qt/src/screens/polymarket/ExchangePresentation.cpp b/fincept-qt/src/screens/polymarket/ExchangePresentation.cppnew file mode 100644index 000000000..d3e34c93b--- /dev/null+++ b/fincept-qt/src/screens/polymarket/ExchangePresentation.cpp@@ -0,0 +1,145 @@+#include "screens/polymarket/ExchangePresentation.h"++#include "services/prediction/PredictionExchangeAdapter.h"+#include "services/prediction/PredictionExchangeRegistry.h"+#include "ui/theme/Theme.h"++namespace fincept::screens::polymarket {++namespace pred = fincept::services::prediction;++// ── Formatters ──────────────────────────────────────────────────────────────++QString ExchangePresentation::format_price(double prob) const {+ // prediction::* always stores outcome price as 0.0–1.0 probability. Both+ // exchanges feed the adapter in that canonical form (Polymarket native,+ // Kalshi cent-prices divided by 100 by the type map). The presentation+ // decides how to render it.+ switch (price_style) {+ case PriceStyle::ProbabilityCents:+ return QStringLiteral("%1\u00A2").arg(qRound(prob * 100.0)); // "52¢"+ case PriceStyle::Dollars:+ return QStringLiteral("$%1").arg(prob, 0, 'f', 2); // "$0.52"+ }+ return QString::number(prob);+}++QString ExchangePresentation::format_volume(double v) const {+ const QString sym = currency_symbol == QStringLiteral("$") ? QStringLiteral("$") : QStringLiteral("$");+ // Currency badges like "USDC" are shown separately (account chip + stats+ // label) so volume formatting always uses a dollar-sign prefix; injecting+ // "USDC" into every cell would be noisy.+ if (v >= 1e9) return QStringLiteral("%1%2B").arg(sym).arg(v / 1e9, 0, 'f', 1);+ if (v >= 1e6) return QStringLiteral("%1%2M").arg(sym).arg(v / 1e6, 0, 'f', 1);+ if (v >= 1e3) return QStringLiteral("%1%2K").arg(sym).arg(v / 1e3, 0, 'f', 1);+ return QStringLiteral("%1%2").arg(sym).arg(v, 0, 'f', 0);+}++QString ExchangePresentation::format_liquidity(double v) const {+ return format_volume(v);+}++// ── Status badge ────────────────────────────────────────────────────────────++ExchangePresentation::StatusBadge ExchangePresentation::status_badge(+ const pred::PredictionMarket& market) const {++ using namespace fincept::ui;++ // Kalshi lifecycle is richer than Polymarket's binary active/closed.+ // The adapter stashes the raw status string in extras["status"] so we+ // can surface "DETERMINED" (contest over, awaiting settlement) vs+ // "SETTLED" cleanly. Polymarket doesn't populate extras["status"] — we+ // fall back to the active/closed bools.+ const QString kalshi_status = market.extras.value(QStringLiteral("status")).toString().toLower();++ if (exchange_id == QStringLiteral("kalshi") && !kalshi_status.isEmpty()) {+ if (kalshi_status == QStringLiteral("settled") || kalshi_status == QStringLiteral("finalized")) {+ return {QStringLiteral("SETTLED"), QColor(colors::POSITIVE()), QColor(22, 163, 74, 38)};+ }+ if (kalshi_status == QStringLiteral("determined")) {+ return {QStringLiteral("DETERMINED"), accent, QColor(accent.red(), accent.green(), accent.blue(), 38)};+ }+ if (kalshi_status == QStringLiteral("closed")) {+ return {QStringLiteral("CLOSED"), QColor(colors::TEXT_SECONDARY()), QColor(0, 0, 0, 0)};+ }+ if (kalshi_status == QStringLiteral("open")) {+ return {QStringLiteral("OPEN"), accent, QColor(accent.red(), accent.green(), accent.blue(), 38)};+ }+ if (kalshi_status == QStringLiteral("initialized")) {+ return {QStringLiteral("PENDING"), QColor(colors::TEXT_DIM()), QColor(0, 0, 0, 0)};+ }+ }++ if (market.closed) {+ return {QStringLiteral("RESOLVED"), QColor(colors::POSITIVE()), QColor(22, 163, 74, 38)};+ }+ if (market.active) {+ return {QStringLiteral("ACTIVE"), accent, QColor(accent.red(), accent.green(), accent.blue(), 38)};+ }+ return {QStringLiteral("INACTIVE"), QColor(colors::TEXT_DIM()), QColor(0, 0, 0, 0)};+}++// ── Factories ───────────────────────────────────────────────────────────────++ExchangePresentation ExchangePresentation::for_polymarket() {+ using namespace fincept::ui;+ ExchangePresentation p;+ p.exchange_id = QStringLiteral("polymarket");+ p.display_name = QStringLiteral("Polymarket");+ // Amber — matches the rest of the terminal's "prediction markets" theme.+ p.accent = QColor(colors::AMBER());+ p.accent_dim = QColor(colors::AMBER_DIM());+ p.currency_symbol = QStringLiteral("USDC");+ p.price_style = PriceStyle::ProbabilityCents;+ p.price_decimal_places = 4;+ p.view_names = {QStringLiteral("TRENDING"), QStringLiteral("MARKETS"),+ QStringLiteral("EVENTS"), QStringLiteral("SPORTS"),+ QStringLiteral("RESOLVED")};+ p.default_view = QStringLiteral("MARKETS");+ p.category_mode = CategoryMode::Chips;+ p.category_visible_cap = 12;+ p.chart_y_label = QStringLiteral("PROBABILITY");+ p.has_open_interest = true;+ p.has_polymarket_extras = true;+ p.has_leaderboard = true;+ return p;+}++ExchangePresentation ExchangePresentation::for_kalshi() {+ ExchangePresentation p;+ p.exchange_id = QStringLiteral("kalshi");+ p.display_name = QStringLiteral("Kalshi");+ // Teal — distinct enough from amber to make the "you're on a different+ // exchange" signal unambiguous at a glance, close enough to the terminal+ // theme that it doesn't clash with the rest of the app.+ p.accent = QColor(0x2DD4BF); // teal-400+ p.accent_dim = QColor(0x14B8A6); // teal-500+ p.currency_symbol = QStringLiteral("USD");+ p.price_style = PriceStyle::Dollars;+ p.price_decimal_places = 2;+ p.view_names = {QStringLiteral("MARKETS"), QStringLiteral("EVENTS"),+ QStringLiteral("SETTLED")};+ p.default_view = QStringLiteral("MARKETS");+ // Kalshi's series catalog can exceed 100 entries — a chip row doesn't+ // scale. Drop into a dropdown so users can scan + filter.+ p.category_mode = CategoryMode::ComboBox;+ p.category_visible_cap = 0; // unused in combobox mode+ p.chart_y_label = QStringLiteral("PRICE");+ p.has_open_interest = false; // Kalshi REST doesn't expose OI per market+ p.has_polymarket_extras = false; // no holders / comments / related+ p.has_leaderboard = false;+ return p;+}++ExchangePresentation ExchangePresentation::for_adapter(const pred::PredictionExchangeAdapter* adapter) {+ if (!adapter) return for_polymarket();+ return for_id(adapter->id());+}++ExchangePresentation ExchangePresentation::for_id(const QString& exchange_id) {+ if (exchange_id == QStringLiteral("kalshi")) return for_kalshi();+ return for_polymarket();+}++} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/ExchangePresentation.h b/fincept-qt/src/screens/polymarket/ExchangePresentation.hnew file mode 100644index 000000000..b4b7689dc--- /dev/null+++ b/fincept-qt/src/screens/polymarket/ExchangePresentation.h@@ -0,0 +1,85 @@+#pragma once++#include "services/prediction/PredictionTypes.h"++#include <QColor>+#include <QString>+#include <QStringList>++namespace fincept::services::prediction {+class PredictionExchangeAdapter;+} // namespace fincept::services::prediction++namespace fincept::screens::polymarket {++/// How a given exchange should be presented to the user. Captures the+/// per-exchange UX knobs that aren't part of the data model — accent color,+/// currency symbol, price display mode, view pill set, status badge mapping,+/// and feature-flags for Polymarket-only tabs.+///+/// One profile is installed into the screen + sub-panels whenever the active+/// exchange changes. Construct via for_polymarket(), for_kalshi(), or+/// for_adapter() to route by adapter id.+struct ExchangePresentation {+ enum class PriceStyle {+ ProbabilityCents, // 0.52 → "52¢" (Polymarket: raw prob × 100 with cents suffix)+ Dollars, // 0.52 → "$0.52" (Kalshi: dollar-denominated contract price)+ };++ enum class CategoryMode {+ Chips, // flat chip row (Polymarket: ~20 tags fits fine)+ ComboBox, // dropdown (Kalshi: 100+ series tickers)+ };++ QString exchange_id; // "polymarket" | "kalshi"+ QString display_name; // "Polymarket" | "Kalshi"++ // Visual identity — a single accent color is the clearest "different+ // screen" signal without a full theme fork.+ QColor accent; // active pill / underline / bar color+ QColor accent_dim; // subtle tint for backgrounds++ // Currency + number formatting.+ QString currency_symbol; // "$" | "USDC"+ PriceStyle price_style = PriceStyle::ProbabilityCents;+ int price_decimal_places = 4; // ActivityFeed raw price column++ // Top command bar.+ QStringList view_names; // ["TRENDING","MARKETS","EVENTS","SPORTS","RESOLVED"] / ["MARKETS","EVENTS","SETTLED"]+ QString default_view;+ CategoryMode category_mode = CategoryMode::Chips;+ int category_visible_cap = 12; // Chips mode: hide overflow++ // Chart.+ QString chart_y_label = QStringLiteral("PROBABILITY");++ // Feature flags (mirror the detail-panel tab visibility decisions).+ bool has_open_interest = true;+ bool has_polymarket_extras = true; // Holders / Comments / Related tabs+ bool has_leaderboard = true;++ // Formatters — helpers that bake the profile's units into rendered text.+ QString format_price(double prob_0_to_1) const; // 0.52 → "52¢" or "$0.52"+ QString format_volume(double v) const; // 1_234_567 → "$1.2M"+ QString format_liquidity(double v) const; // same as volume today; kept as a separate slot for future divergence++ /// Translate the prediction::PredictionMarket.active/closed pair (+ any+ /// exchange-specific hints in extras) into a status badge tuple:+ /// (text, foreground, background). Lets Kalshi surface its+ /// "determined/settled" lifecycle distinctly from Polymarket's binary+ /// active/closed.+ struct StatusBadge {+ QString text;+ QColor fg;+ QColor bg; // may be transparent+ };+ StatusBadge status_badge(const fincept::services::prediction::PredictionMarket& market) const;++ // Factories.+ static ExchangePresentation for_polymarket();+ static ExchangePresentation for_kalshi();+ static ExchangePresentation for_adapter(const fincept::services::prediction::PredictionExchangeAdapter* adapter);+ static ExchangePresentation for_id(const QString& exchange_id);+};++} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.cpp b/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.cppindex 69985e4f7..95384aad5 100644--- a/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.cpp@@ -9,7 +9,7 @@namespace fincept::screens::polymarket {using namespace fincept::ui;-using namespace fincept::services::polymarket;+using namespace fincept::services::prediction;PolymarketActivityFeed::PolymarketActivityFeed(QWidget* parent) : QWidget(parent) {auto* vl = new QVBoxLayout(this);@@ -31,47 +31,27 @@ PolymarketActivityFeed::PolymarketActivityFeed(QWidget* parent) : QWidget(parentvl->addWidget(table_);}-void PolymarketActivityFeed::set_activities(const QVector<Activity>& activities) {+void PolymarketActivityFeed::set_trades(const QVector<PredictionTrade>& trades) {+ last_trades_ = trades;table_->setSortingEnabled(false);- table_->setRowCount(qMin(activities.size(), 200));+ const int count = qMin(trades.size(), 200);+ table_->setRowCount(count);- for (int i = 0; i < qMin(activities.size(), 200); ++i) {- const auto& a = activities[i];- QString time = QDateTime::fromSecsSinceEpoch(a.timestamp, Qt::UTC).toString("HH:mm:ss");- table_->setItem(i, 0, new QTableWidgetItem(time));- table_->setItem(i, 1, new QTableWidgetItem(a.type));-- auto* side_item = new QTableWidgetItem(a.outcome);- table_->setItem(i, 2, side_item);-- auto* price_item = new QTableWidgetItem(QString::number(a.price, 'f', 4));- price_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);- price_item->setForeground(QColor(colors::CYAN()));- table_->setItem(i, 3, price_item);-- auto* size_item = new QTableWidgetItem(QString::number(a.amount, 'f', 2));- size_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);- table_->setItem(i, 4, size_item);- }- table_->resizeColumnsToContents();- table_->setSortingEnabled(true);-}--void PolymarketActivityFeed::set_trades(const QVector<Trade>& trades) {- table_->setSortingEnabled(false);- table_->setRowCount(qMin(trades.size(), 200));-- for (int i = 0; i < qMin(trades.size(), 200); ++i) {+ const int price_decimals = qBound(0, presentation_.price_decimal_places, 6);+ for (int i = 0; i < count; ++i) {const auto& t = trades[i];- QString time = QDateTime::fromSecsSinceEpoch(t.timestamp, Qt::UTC).toString("HH:mm:ss");+ // prediction::PredictionTrade uses ts_ms (milliseconds since epoch).+ QString time = QDateTime::fromMSecsSinceEpoch(t.ts_ms, Qt::UTC).toString("HH:mm:ss");table_->setItem(i, 0, new QTableWidgetItem(time));table_->setItem(i, 1, new QTableWidgetItem("TRADE"));auto* side_item = new QTableWidgetItem(t.side);- side_item->setForeground(QColor(t.side == "BUY" ? colors::POSITIVE() : colors::NEGATIVE()));+ side_item->setForeground(QColor(t.side.compare("BUY", Qt::CaseInsensitive) == 0+ ? colors::POSITIVE()+ : colors::NEGATIVE()));table_->setItem(i, 2, side_item);- auto* price_item = new QTableWidgetItem(QString::number(t.price, 'f', 4));+ auto* price_item = new QTableWidgetItem(QString::number(t.price, 'f', price_decimals));price_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);price_item->setForeground(QColor(colors::CYAN()));table_->setItem(i, 3, price_item);@@ -85,7 +65,14 @@ void PolymarketActivityFeed::set_trades(const QVector<Trade>& trades) {}void PolymarketActivityFeed::clear() {+ last_trades_.clear();table_->setRowCount(0);}+void PolymarketActivityFeed::set_presentation(const ExchangePresentation& p) {+ const bool decimals_changed = p.price_decimal_places != presentation_.price_decimal_places;+ presentation_ = p;+ if (decimals_changed && !last_trades_.isEmpty()) set_trades(last_trades_);+}+} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.h b/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.hindex 49cc91e79..a719f07cf 100644--- a/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.h+++ b/fincept-qt/src/screens/polymarket/PolymarketActivityFeed.h@@ -1,24 +1,34 @@#pragma once-#include "services/polymarket/PolymarketTypes.h"+#include "screens/polymarket/ExchangePresentation.h"+#include "services/prediction/PredictionTypes.h"#include <QTableWidget>#include <QWidget>namespace fincept::screens::polymarket {-/// Activity feed showing trades/splits/merges for a market.+/// Activity feed showing recent trades for a market.+/// Consumes unified prediction::PredictionTrade so both Polymarket and Kalshi+/// render through the same table.class PolymarketActivityFeed : public QWidget {Q_OBJECTpublic:explicit PolymarketActivityFeed(QWidget* parent = nullptr);- void set_activities(const QVector<services::polymarket::Activity>& activities);- void set_trades(const QVector<services::polymarket::Trade>& trades);+ void set_trades(const QVector<fincept::services::prediction::PredictionTrade>& trades);void clear();+ /// Per-exchange number formatting (decimals on the price column).+ void set_presentation(const ExchangePresentation& p);+private:QTableWidget* table_ = nullptr;+ ExchangePresentation presentation_ = ExchangePresentation::for_polymarket();++ // Cached last trades so set_presentation() can re-render with the new+ // decimal places.+ QVector<fincept::services::prediction::PredictionTrade> last_trades_;};} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.cpp b/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.cppindex e886c4cbf..e4f4c663a 100644--- a/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.cpp@@ -9,7 +9,7 @@namespace fincept::screens::polymarket {using namespace fincept::ui;-using namespace fincept::services::polymarket;+using namespace fincept::services::prediction;PolymarketBrowsePanel::PolymarketBrowsePanel(QWidget* parent) : QWidget(parent) {setObjectName("polyBrowsePanel");@@ -73,14 +73,14 @@ PolymarketBrowsePanel::PolymarketBrowsePanel(QWidget* parent) : QWidget(parent)vl->addWidget(page_bar);}-void PolymarketBrowsePanel::set_markets(const QVector<Market>& markets) {+void PolymarketBrowsePanel::set_markets(const QVector<PredictionMarket>& markets) {current_page_ = 0;model_->set_markets(markets);header_->setText(QString("MARKETS (%1)").arg(markets.size()));update_page();}-void PolymarketBrowsePanel::set_events(const QVector<Event>& events) {+void PolymarketBrowsePanel::set_events(const QVector<PredictionEvent>& events) {current_page_ = 0;model_->set_events(events);header_->setText(QString("EVENTS (%1)").arg(events.size()));@@ -92,6 +92,17 @@ void PolymarketBrowsePanel::set_loading(bool loading) {header_->setText("LOADING...");}+void PolymarketBrowsePanel::clear() {+ model_->set_markets({});+ header_->setText("MARKETS");+ current_page_ = 0;+ update_page();+}++void PolymarketBrowsePanel::set_presentation(const ExchangePresentation& p) {+ if (model_) model_->set_presentation(p);+}+void PolymarketBrowsePanel::on_item_clicked(const QModelIndex& index) {if (!index.isValid())return;diff --git a/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.h b/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.hindex d785329fd..03230d103 100644--- a/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.h+++ b/fincept-qt/src/screens/polymarket/PolymarketBrowsePanel.h@@ -1,6 +1,7 @@#pragma once-#include "services/polymarket/PolymarketTypes.h"+#include "screens/polymarket/ExchangePresentation.h"+#include "services/prediction/PredictionTypes.h"#include <QLabel>#include <QListView>@@ -13,18 +14,25 @@ class PolymarketMarketCardModel;class PolymarketMarketCardDelegate;/// Left browse panel: market/event list with pagination.+/// Consumes unified prediction::* types so both Polymarket and Kalshi render+/// through the same delegate.class PolymarketBrowsePanel : public QWidget {Q_OBJECTpublic:explicit PolymarketBrowsePanel(QWidget* parent = nullptr);- void set_markets(const QVector<services::polymarket::Market>& markets);- void set_events(const QVector<services::polymarket::Event>& events);+ void set_markets(const QVector<fincept::services::prediction::PredictionMarket>& markets);+ void set_events(const QVector<fincept::services::prediction::PredictionEvent>& events);void set_loading(bool loading);+ void clear();++ /// Forwarded to the model so the delegate paints with the active+ /// exchange's accent and price formatter.+ void set_presentation(const ExchangePresentation& p);signals:- void market_selected(const services::polymarket::Market& market);- void event_selected(const services::polymarket::Event& event);+ void market_selected(const fincept::services::prediction::PredictionMarket& market);+ void event_selected(const fincept::services::prediction::PredictionEvent& event);private slots:void on_item_clicked(const QModelIndex& index);diff --git a/fincept-qt/src/screens/polymarket/PolymarketCommandBar.cpp b/fincept-qt/src/screens/polymarket/PolymarketCommandBar.cppindex 81267a117..629aa7b39 100644--- a/fincept-qt/src/screens/polymarket/PolymarketCommandBar.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketCommandBar.cpp@@ -3,48 +3,68 @@#include "ui/theme/Theme.h"#include <QHBoxLayout>+#include <QSignalBlocker>#include <QVBoxLayout>namespace fincept::screens::polymarket {using namespace fincept::ui;-static const QStringList VIEW_NAMES = {"TRENDING", "MARKETS", "EVENTS", "SPORTS", "RESOLVED"};static const QStringList SORT_KEYS = {"volume", "liquidity", "startDate"};-static const QString kBarStyle =- QStringLiteral("#polyCommandBar { background: %1; border-bottom: 2px solid %2; }"- "#polyCmdTitle { color: %3; font-size: 12px; font-weight: 700; background: transparent; }"- "#polyViewBtn { background: transparent; color: %4; border: 1px solid %5; "- " font-size: 9px; font-weight: 700; padding: 4px 12px; }"- "#polyViewBtn:hover { color: %3; }"- "#polyViewBtn[active=\"true\"] { background: %2; color: %6; border-color: %2; }"- "#polyCatBtn { background: transparent; color: %4; border: 1px solid %5; "- " font-size: 8px; font-weight: 600; padding: 2px 8px; }"- "#polyCatBtn:hover { color: %3; }"- "#polyCatBtn[active=\"true\"] { background: rgba(217,119,6,0.15); color: %2; border-color: %2; }"- "#polySearchInput { background: %6; color: %3; border: 1px solid %5; "- " padding: 4px 8px; font-size: 11px; }"- "#polySearchInput:focus { border-color: %7; }"- "#polyRefreshBtn { background: %8; color: %4; border: 1px solid %5; "- " padding: 4px 10px; font-size: 9px; font-weight: 700; }"- "#polyRefreshBtn:hover { color: %3; }"- "#polyWsIndicator { font-size: 8px; font-weight: 700; padding: 2px 6px; }"- "#polyCountLabel { color: %4; font-size: 9px; background: transparent; }")- .arg(colors::BG_RAISED()) // %1- .arg(colors::AMBER()) // %2- .arg(colors::TEXT_PRIMARY()) // %3- .arg(colors::TEXT_SECONDARY()) // %4- .arg(colors::BORDER_DIM()) // %5- .arg(colors::BG_BASE()) // %6- .arg(colors::BORDER_BRIGHT()) // %7- .arg(colors::BG_SURFACE()); // %8-PolymarketCommandBar::PolymarketCommandBar(QWidget* parent) : QWidget(parent) {setObjectName("polyCommandBar");- setStyleSheet(kBarStyle);setFixedHeight(72);build_ui();+ apply_accent();+ rebuild_view_pills();+}++static QString accent_css_rgb(const QColor& c) {+ return QStringLiteral("rgba(%1,%2,%3,1.0)").arg(c.red()).arg(c.green()).arg(c.blue());+}+static QString accent_css_rgba(const QColor& c, double a) {+ return QStringLiteral("rgba(%1,%2,%3,%4)").arg(c.red()).arg(c.green()).arg(c.blue()).arg(a);+}++void PolymarketCommandBar::apply_accent() {+ const QString accent = accent_css_rgb(presentation_.accent);+ const QString accent_bg = accent_css_rgba(presentation_.accent, 0.15);++ // The bar uses object-name-scoped styling so the accent can swap live+ // on exchange change without a full stylesheet rebuild further down the+ // tree. Any descendant that also needs the accent (tab underline in the+ // detail panel, outcome row left-border, etc.) picks it up via its own+ // set_presentation() call.+ const QString css =+ QStringLiteral("#polyCommandBar { background: %1; border-bottom: 2px solid %2; }"+ "#polyCmdTitle { color: %3; font-size: 12px; font-weight: 700; background: transparent; }"+ "#polyViewBtn { background: transparent; color: %4; border: 1px solid %5; "+ " font-size: 9px; font-weight: 700; padding: 4px 12px; }"+ "#polyViewBtn:hover { color: %3; }"+ "#polyViewBtn[active=\"true\"] { background: %2; color: %6; border-color: %2; }"+ "#polyCatBtn { background: transparent; color: %4; border: 1px solid %5; "+ " font-size: 8px; font-weight: 600; padding: 2px 8px; }"+ "#polyCatBtn:hover { color: %3; }"+ "#polyCatBtn[active=\"true\"] { background: %7; color: %2; border-color: %2; }"+ "#polySearchInput { background: %6; color: %3; border: 1px solid %5; "+ " padding: 4px 8px; font-size: 11px; }"+ "#polySearchInput:focus { border-color: %8; }"+ "#polyRefreshBtn { background: %9; color: %4; border: 1px solid %5; "+ " padding: 4px 10px; font-size: 9px; font-weight: 700; }"+ "#polyRefreshBtn:hover { color: %3; }"+ "#polyWsIndicator { font-size: 8px; font-weight: 700; padding: 2px 6px; }"+ "#polyCountLabel { color: %4; font-size: 9px; background: transparent; }")+ .arg(colors::BG_RAISED()) // %1+ .arg(accent) // %2+ .arg(colors::TEXT_PRIMARY()) // %3+ .arg(colors::TEXT_SECONDARY()) // %4+ .arg(colors::BORDER_DIM()) // %5+ .arg(colors::BG_BASE()) // %6+ .arg(accent_bg) // %7+ .arg(colors::BORDER_BRIGHT()) // %8+ .arg(colors::BG_SURFACE()); // %9+ setStyleSheet(css);}void PolymarketCommandBar::build_ui() {@@ -52,43 +72,65 @@ void PolymarketCommandBar::build_ui() {vl->setContentsMargins(16, 6, 16, 6);vl->setSpacing(4);- // Row 1: title + refresh + WS status+ // Row 1: title + count + refresh + WS statusauto* row1 = new QHBoxLayout;row1->setSpacing(8);- auto* title = new QLabel("POLYMARKET PREDICTION MARKETS");- title->setObjectName("polyCmdTitle");- row1->addWidget(title);+ title_label_ = new QLabel(tr("PREDICTION MARKETS"));+ title_label_->setObjectName("polyCmdTitle");+ row1->addWidget(title_label_);row1->addStretch(1);count_label_ = new QLabel;count_label_->setObjectName("polyCountLabel");row1->addWidget(count_label_);- refresh_btn_ = new QPushButton("REFRESH");+ refresh_btn_ = new QPushButton(tr("REFRESH"));refresh_btn_->setObjectName("polyRefreshBtn");refresh_btn_->setCursor(Qt::PointingHandCursor);connect(refresh_btn_, &QPushButton::clicked, this, &PolymarketCommandBar::refresh_clicked);row1->addWidget(refresh_btn_);- ws_indicator_ = new QLabel("DISCONNECTED");+ ws_indicator_ = new QLabel(tr("DISCONNECTED"));ws_indicator_->setObjectName("polyWsIndicator");set_ws_status(false);row1->addWidget(ws_indicator_);vl->addLayout(row1);- // Row 2: view pills + categories + search + sort+ // Row 2: exchange dropdown + view pills + categories + search + sortauto* row2 = new QHBoxLayout;row2->setSpacing(4);- for (int i = 0; i < VIEW_NAMES.size(); ++i) {- auto* btn = new QPushButton(VIEW_NAMES[i]);- btn->setObjectName("polyViewBtn");- btn->setCursor(Qt::PointingHandCursor);- btn->setProperty("active", VIEW_NAMES[i] == active_view_);- connect(btn, &QPushButton::clicked, this, [this, i]() { emit view_changed(VIEW_NAMES[i]); });- row2->addWidget(btn);- view_btns_.append(btn);- }+ exchange_combo_ = new QComboBox;+ exchange_combo_->setFixedWidth(130);+ exchange_combo_->setToolTip(tr("Select prediction-market exchange"));+ connect(exchange_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int idx) {+ if (idx < 0) return;+ const QString id = exchange_combo_->itemData(idx).toString();+ if (!id.isEmpty()) emit exchange_changed(id);+ });+ row2->addWidget(exchange_combo_);++ account_chip_ = new QPushButton(tr("⚪ No account"), this);+ account_chip_->setObjectName("polyAccountChip");+ account_chip_->setCursor(Qt::PointingHandCursor);+ account_chip_->setToolTip(tr("Connect a Polymarket or Kalshi account to place orders"));+ account_chip_->setStyleSheet(QString("#polyAccountChip { background: transparent; color: %1; "+ "border: 1px solid %2; font-size: 9px; font-weight: 700; "+ "padding: 4px 10px; } #polyAccountChip:hover { color: %3; }")+ .arg(colors::TEXT_DIM())+ .arg(colors::BORDER_DIM())+ .arg(colors::TEXT_PRIMARY()));+ connect(account_chip_, &QPushButton::clicked, this, &PolymarketCommandBar::account_clicked);+ row2->addWidget(account_chip_);++ row2->addSpacing(8);++ // View pills — rebuilt dynamically from presentation.view_names.+ view_pills_container_ = new QWidget(this);+ auto* pl = new QHBoxLayout(view_pills_container_);+ pl->setContentsMargins(0, 0, 0, 0);+ pl->setSpacing(4);+ row2->addWidget(view_pills_container_);row2->addSpacing(8);@@ -96,25 +138,24 @@ void PolymarketCommandBar::build_ui() {auto* ccl = new QHBoxLayout(category_container_);ccl->setContentsMargins(0, 0, 0, 0);ccl->setSpacing(2);- // Categories populated dynamically via set_categories()+ // Populated by rebuild_categories() per presentation mode.row2->addWidget(category_container_);row2->addSpacing(8);search_input_ = new QLineEdit;search_input_->setObjectName("polySearchInput");- search_input_->setPlaceholderText("SEARCH...");+ search_input_->setPlaceholderText(tr("SEARCH..."));search_input_->setFixedWidth(180);connect(search_input_, &QLineEdit::returnPressed, this,[this]() { emit search_submitted(search_input_->text().trimmed()); });row2->addWidget(search_input_);sort_combo_ = new QComboBox;- sort_combo_->addItems({"VOLUME", "LIQUIDITY", "RECENT"});+ sort_combo_->addItems({tr("VOLUME"), tr("LIQUIDITY"), tr("RECENT")});sort_combo_->setFixedWidth(90);connect(sort_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int idx) {- if (idx >= 0 && idx < SORT_KEYS.size())- emit sort_changed(SORT_KEYS[idx]);+ if (idx >= 0 && idx < SORT_KEYS.size()) emit sort_changed(SORT_KEYS[idx]);});row2->addWidget(sort_combo_);@@ -122,50 +163,143 @@ void PolymarketCommandBar::build_ui() {vl->addLayout(row2);}-void PolymarketCommandBar::set_categories(const QVector<services::polymarket::Tag>& tags) {- auto* layout = category_container_->layout();+// ── Presentation ────────────────────────────────────────────────────────────++void PolymarketCommandBar::set_presentation(const ExchangePresentation& p) {+ const bool accent_changed = p.accent != presentation_.accent;+ const bool views_changed = p.view_names != presentation_.view_names;+ const bool category_mode_changed = p.category_mode != presentation_.category_mode;++ presentation_ = p;+ title_label_->setText(tr("%1 · PREDICTION MARKETS").arg(p.display_name.toUpper()));++ if (accent_changed) apply_accent();+ if (views_changed || view_btns_.isEmpty()) {+ if (!presentation_.default_view.isEmpty())+ active_view_ = presentation_.default_view;+ rebuild_view_pills();+ }+ if (category_mode_changed) rebuild_categories();+}++void PolymarketCommandBar::rebuild_view_pills() {+ auto* layout = qobject_cast<QHBoxLayout*>(view_pills_container_->layout());+ if (!layout) return;+while (layout->count() > 0) {auto* item = layout->takeAt(0);- if (item->widget())- item->widget()->deleteLater();+ if (item->widget()) item->widget()->deleteLater();delete item;}+ view_btns_.clear();- // "ALL" button- auto* all_btn = new QPushButton("ALL");+ for (const QString& name : presentation_.view_names) {+ auto* btn = new QPushButton(name);+ btn->setObjectName("polyViewBtn");+ btn->setCursor(Qt::PointingHandCursor);+ btn->setProperty("active", name == active_view_);+ connect(btn, &QPushButton::clicked, this, [this, name]() { emit view_changed(name); });+ layout->addWidget(btn);+ view_btns_.append(btn);+ }+}++// ── Categories ──────────────────────────────────────────────────────────────++void PolymarketCommandBar::set_categories(const QStringList& tags) {+ current_tags_ = tags;+ rebuild_categories();+}++void PolymarketCommandBar::rebuild_categories() {+ auto* layout = qobject_cast<QHBoxLayout*>(category_container_->layout());+ if (!layout) return;++ while (layout->count() > 0) {+ auto* item = layout->takeAt(0);+ if (item->widget()) item->widget()->deleteLater();+ delete item;+ }+ category_combo_ = nullptr;++ if (presentation_.category_mode == ExchangePresentation::CategoryMode::ComboBox) {+ // Kalshi-style: hundreds of series tickers — a dropdown with a+ // type-ahead is the only layout that scales.+ category_combo_ = new QComboBox;+ category_combo_->setEditable(true);+ category_combo_->setInsertPolicy(QComboBox::NoInsert);+ category_combo_->setFixedWidth(200);+ category_combo_->setStyleSheet(+ QString("QComboBox { background: %1; color: %2; border: 1px solid %3; "+ "padding: 3px 8px; font-size: 10px; }"+ "QComboBox QAbstractItemView { background: %1; color: %2; selection-background-color: %4; }")+ .arg(colors::BG_BASE(), colors::TEXT_PRIMARY(), colors::BORDER_DIM(),+ QString("rgba(%1,%2,%3,0.2)")+ .arg(presentation_.accent.red())+ .arg(presentation_.accent.green())+ .arg(presentation_.accent.blue())));+ category_combo_->addItem(tr("ALL"), QStringLiteral("ALL"));+ for (const QString& t : current_tags_) category_combo_->addItem(t, t);+ // Restore selection.+ const int idx = qMax(0, category_combo_->findData(active_category_));+ {+ QSignalBlocker b(category_combo_);+ category_combo_->setCurrentIndex(idx);+ }+ connect(category_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int i) {+ if (!category_combo_ || i < 0) return;+ const QString slug = category_combo_->itemData(i).toString();+ if (!slug.isEmpty()) emit category_changed(slug);+ });+ layout->addWidget(category_combo_);+ return;+ }++ // Chip row (Polymarket default).+ auto* all_btn = new QPushButton(tr("ALL"));all_btn->setObjectName("polyCatBtn");all_btn->setCursor(Qt::PointingHandCursor);all_btn->setProperty("active", active_category_ == "ALL");connect(all_btn, &QPushButton::clicked, this, [this]() { emit category_changed("ALL"); });layout->addWidget(all_btn);- for (const auto& tag : tags) {- auto* btn = new QPushButton(tag.label.toUpper());+ const int cap = qMin(current_tags_.size(), qMax(0, presentation_.category_visible_cap));+ for (int i = 0; i < cap; ++i) {+ const QString& slug = current_tags_[i];+ auto* btn = new QPushButton(slug.toUpper());btn->setObjectName("polyCatBtn");btn->setCursor(Qt::PointingHandCursor);- btn->setProperty("active", active_category_ == tag.slug);- connect(btn, &QPushButton::clicked, this, [this, slug = tag.slug]() { emit category_changed(slug); });+ btn->setProperty("active", active_category_ == slug);+ connect(btn, &QPushButton::clicked, this, [this, slug]() { emit category_changed(slug); });layout->addWidget(btn);}}+// ── Active-state tracking ───────────────────────────────────────────────────+void PolymarketCommandBar::set_active_view(const QString& view) {active_view_ = view;- for (int i = 0; i < view_btns_.size(); ++i) {- view_btns_[i]->setProperty("active", VIEW_NAMES[i] == view);- view_btns_[i]->style()->unpolish(view_btns_[i]);- view_btns_[i]->style()->polish(view_btns_[i]);+ for (auto* btn : view_btns_) {+ btn->setProperty("active", btn->text() == view);+ btn->style()->unpolish(btn);+ btn->style()->polish(btn);}}void PolymarketCommandBar::set_active_category(const QString& cat) {active_category_ = cat;+ if (category_combo_) {+ const int idx = qMax(0, category_combo_->findData(cat));+ QSignalBlocker b(category_combo_);+ category_combo_->setCurrentIndex(idx);+ return;+ }auto* layout = category_container_->layout();+ if (!layout) return;for (int i = 0; i < layout->count(); ++i) {auto* w = qobject_cast<QPushButton*>(layout->itemAt(i)->widget());- if (!w)- continue;- bool is_active = (cat == "ALL" && i == 0) || (cat != "ALL" && w->text() == cat.toUpper());+ if (!w) continue;+ const bool is_active = (cat == "ALL" && i == 0) || (cat != "ALL" && w->text() == cat.toUpper());w->setProperty("active", is_active);w->style()->unpolish(w);w->style()->polish(w);@@ -174,17 +308,17 @@ void PolymarketCommandBar::set_active_category(const QString& cat) {void PolymarketCommandBar::set_loading(bool loading) {refresh_btn_->setEnabled(!loading);- refresh_btn_->setText(loading ? "LOADING..." : "REFRESH");+ refresh_btn_->setText(loading ? tr("LOADING...") : tr("REFRESH"));}void PolymarketCommandBar::set_ws_status(bool connected) {if (connected) {- ws_indicator_->setText("LIVE");+ ws_indicator_->setText(tr("LIVE"));ws_indicator_->setStyleSheet(QString("color: %1; background: rgba(22,163,74,0.2); ""font-size: 8px; font-weight: 700; padding: 2px 6px;").arg(colors::POSITIVE()));} else {- ws_indicator_->setText("OFFLINE");+ ws_indicator_->setText(tr("OFFLINE"));ws_indicator_->setStyleSheet(QString("color: %1; background: transparent; ""font-size: 8px; font-weight: 700; padding: 2px 6px;").arg(colors::TEXT_DIM()));@@ -195,4 +329,38 @@ void PolymarketCommandBar::set_market_count(int count) {count_label_->setText(QString::number(count) + " markets");}+void PolymarketCommandBar::set_account_status(bool connected, const QString& label) {+ if (!account_chip_) return;+ if (connected) {+ account_chip_->setText(QString("🟢 %1").arg(label.isEmpty() ? tr("Connected") : label));+ account_chip_->setStyleSheet(QString("#polyAccountChip { background: rgba(22,163,74,0.12); "+ "color: %1; border: 1px solid %1; font-size: 9px; "+ "font-weight: 700; padding: 4px 10px; }")+ .arg(colors::POSITIVE()));+ } else {+ account_chip_->setText(tr("⚪ No account"));+ account_chip_->setStyleSheet(QString("#polyAccountChip { background: transparent; "+ "color: %1; border: 1px solid %2; font-size: 9px; "+ "font-weight: 700; padding: 4px 10px; } "+ "#polyAccountChip:hover { color: %3; }")+ .arg(colors::TEXT_DIM())+ .arg(colors::BORDER_DIM())+ .arg(colors::TEXT_PRIMARY()));+ }+}++void PolymarketCommandBar::set_exchanges(const QStringList& ids, const QStringList& labels,+ const QString& active_id) {+ if (!exchange_combo_) return;+ const QSignalBlocker block(exchange_combo_);+ exchange_combo_->clear();+ const int n = qMin(ids.size(), labels.size());+ int active_idx = -1;+ for (int i = 0; i < n; ++i) {+ exchange_combo_->addItem(labels[i], ids[i]);+ if (ids[i] == active_id) active_idx = i;+ }+ if (active_idx >= 0) exchange_combo_->setCurrentIndex(active_idx);+}+} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketCommandBar.h b/fincept-qt/src/screens/polymarket/PolymarketCommandBar.hindex d6197ff5f..8e5e8f10e 100644--- a/fincept-qt/src/screens/polymarket/PolymarketCommandBar.h+++ b/fincept-qt/src/screens/polymarket/PolymarketCommandBar.h@@ -1,6 +1,6 @@#pragma once-#include "services/polymarket/PolymarketTypes.h"+#include "screens/polymarket/ExchangePresentation.h"#include <QComboBox>#include <QLabel>@@ -11,37 +11,73 @@namespace fincept::screens::polymarket {/// Top command bar: view pills, category filters, search, sort, refresh, WS status.+/// Visual identity (accent colors, view pill set, category display mode)+/// is driven by the installed ExchangePresentation so Polymarket and Kalshi+/// render distinctly even though the widget tree is shared.class PolymarketCommandBar : public QWidget {Q_OBJECTpublic:explicit PolymarketCommandBar(QWidget* parent = nullptr);- void set_categories(const QVector<services::polymarket::Tag>& tags);+ /// Install the per-exchange presentation profile. Rebuilds view pills,+ /// swaps the category row between chip layout and dropdown, and applies+ /// the accent color across active-state styling.+ void set_presentation(const ExchangePresentation& p);++ /// Populate the category filter row. `tags` is exchange-agnostic —+ /// each entry is displayed verbatim and passed back through the+ /// category_changed signal. "ALL" is always prepended automatically.+ void set_categories(const QStringList& tags);void set_active_view(const QString& view);void set_active_category(const QString& cat);void set_loading(bool loading);void set_ws_status(bool connected);void set_market_count(int count);+ /// Populate the exchange dropdown. `ids` are adapter ids from+ /// PredictionExchangeRegistry (e.g. ["polymarket", "kalshi"]); `labels`+ /// are the corresponding display names. The selected entry controls+ /// which adapter the screen pulls data from.+ void set_exchanges(const QStringList& ids, const QStringList& labels, const QString& active_id);++ /// Update the account chip shown next to the exchange combo.+ /// `connected == false` renders "⚪ No account" (clickable CTA);+ /// `connected == true` renders "🟢 <label>" in green.+ void set_account_status(bool connected, const QString& label);+signals:void view_changed(const QString& view);void category_changed(const QString& category);void search_submitted(const QString& query);void sort_changed(const QString& sort_by);void refresh_clicked();+ void exchange_changed(const QString& exchange_id);+ void account_clicked();private:void build_ui();+ void rebuild_view_pills();+ void apply_accent();+ void rebuild_categories(); // called when presentation or tag set changes+ QComboBox* exchange_combo_ = nullptr;+ QPushButton* account_chip_ = nullptr;+ QWidget* view_pills_container_ = nullptr;QList<QPushButton*> view_btns_;QWidget* category_container_ = nullptr;+ QComboBox* category_combo_ = nullptr; // used in CategoryMode::ComboBoxQLineEdit* search_input_ = nullptr;QComboBox* sort_combo_ = nullptr;QPushButton* refresh_btn_ = nullptr;QLabel* ws_indicator_ = nullptr;QLabel* count_label_ = nullptr;+ QLabel* title_label_ = nullptr;+QString active_view_ = "MARKETS";QString active_category_ = "ALL";++ ExchangePresentation presentation_ = ExchangePresentation::for_polymarket();+ QStringList current_tags_;};} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.cpp b/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.cppindex e3ba86f4f..cbcd81e17 100644--- a/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.cpp@@ -14,25 +14,15 @@namespace fincept::screens::polymarket {using namespace fincept::ui;-using namespace fincept::services::polymarket;+namespace pmx = fincept::services::polymarket;+using namespace fincept::services::prediction;static const QStringList TAB_NAMES = {"OVERVIEW", "ORDER BOOK", "CHART", "TRADES", "HOLDERS", "COMMENTS", "RELATED"};+// Fallback outcome palette used when the first two slots (green/red) don't+// cover a multi-outcome Polymarket market. The first two entries are+// overridden at paint time by the presentation's accent-aware colors.static const QStringList OUTCOME_COLORS = {"#00D66F", "#FF3B3B", "#FF8800", "#4F8EF7", "#A855F7"};-static QString fmt_vol(double v) {- if (v >= 1e9)- return QString("$%1B").arg(v / 1e9, 0, 'f', 1);- if (v >= 1e6)- return QString("$%1M").arg(v / 1e6, 0, 'f', 1);- if (v >= 1e3)- return QString("$%1K").arg(v / 1e3, 0, 'f', 1);- return QString("$%1").arg(v, 0, 'f', 0);-}--static QString fmt_price(double p) {- return QString("%1c").arg(qRound(p * 100));-}-PolymarketDetailPanel::PolymarketDetailPanel(QWidget* parent) : QWidget(parent) {setObjectName("polyDetailPanel");build_ui();@@ -54,12 +44,6 @@ void PolymarketDetailPanel::build_ui() {for (int i = 0; i < TAB_NAMES.size(); ++i) {auto* btn = new QPushButton(TAB_NAMES[i]);- btn->setStyleSheet(QString("QPushButton { background: transparent; color: %1; border: none; "- " font-size: 9px; font-weight: 700; padding: 6px 10px; "- " border-bottom: 2px solid transparent; }"- "QPushButton:hover { color: %2; }"- "QPushButton[active=\"true\"] { color: %2; border-bottom-color: %3; }")- .arg(colors::TEXT_SECONDARY(), colors::TEXT_PRIMARY(), colors::AMBER()));btn->setCursor(Qt::PointingHandCursor);btn->setProperty("active", i == 0);connect(btn, &QPushButton::clicked, this, [this, i]() { set_active_tab(i); });@@ -68,6 +52,7 @@ void PolymarketDetailPanel::build_ui() {}thl->addStretch(1);vl->addWidget(tab_bar);+ apply_accent_to_tabs();// Stacked pagesstack_ = new QStackedWidget;@@ -118,7 +103,7 @@ QWidget* PolymarketDetailPanel::create_overview_page() {auto val_style =QString("color: %1; font-size: 13px; font-weight: 700; background: transparent;").arg(colors::CYAN());- auto make_stat = [&](const QString& label, QLabel*& val_lbl) {+ auto make_stat = [&](const QString& label, QLabel*& val_lbl, QWidget** out_box = nullptr) {auto* box = new QWidget(this);auto* bvl = new QVBoxLayout(box);bvl->setContentsMargins(0, 0, 0, 0);@@ -130,6 +115,7 @@ QWidget* PolymarketDetailPanel::create_overview_page() {bvl->addWidget(lbl);bvl->addWidget(val_lbl);sgl->addWidget(box);+ if (out_box) *out_box = box;};make_stat("VOLUME", volume_label_);@@ -138,7 +124,7 @@ QWidget* PolymarketDetailPanel::create_overview_page() {make_stat("MIDPOINT", midpoint_label_);make_stat("SPREAD", spread_label_);make_stat("LAST TRADE", last_trade_label_);- make_stat("OPEN INT", oi_label_);+ make_stat("OPEN INT", oi_label_, &oi_box_);status_label_ = new QLabel;sgl->addWidget(status_label_);@@ -227,33 +213,20 @@ void PolymarketDetailPanel::set_active_tab(int tab) {// ── Data setters ────────────────────────────────────────────────────────────-void PolymarketDetailPanel::set_market(const Market& market) {+void PolymarketDetailPanel::set_market(const PredictionMarket& market) {+ last_market_ = market;+ has_last_market_ = true;+question_label_->setText(market.question);- volume_label_->setText(fmt_vol(market.volume));- liquidity_label_->setText(fmt_vol(market.liquidity));- end_date_label_->setText(market.end_date.left(10));+ volume_label_->setText(presentation_.format_volume(market.volume));+ liquidity_label_->setText(presentation_.format_liquidity(market.liquidity));+ end_date_label_->setText(market.end_date_iso.left(10));midpoint_label_->setText("--");spread_label_->setText("--");last_trade_label_->setText("--");oi_label_->setText("--");- // Status badge- if (market.closed) {- status_label_->setText("RESOLVED");- status_label_->setStyleSheet(QString("color: %1; background: rgba(22,163,74,0.15); "- "font-size: 9px; font-weight: 700; padding: 2px 6px;")- .arg(colors::POSITIVE()));- } else if (market.active) {- status_label_->setText("ACTIVE");- status_label_->setStyleSheet(QString("color: %1; background: rgba(217,119,6,0.15); "- "font-size: 9px; font-weight: 700; padding: 2px 6px;")- .arg(colors::AMBER()));- } else {- status_label_->setText("INACTIVE");- status_label_->setStyleSheet(QString("color: %1; background: transparent; "- "font-size: 9px; font-weight: 700; padding: 2px 6px;")- .arg(colors::TEXT_DIM()));- }+ render_status_badge(market);// Outcomesauto* layout = outcome_container_->layout();@@ -267,7 +240,13 @@ void PolymarketDetailPanel::set_market(const Market& market) {for (int i = 0; i < market.outcomes.size(); ++i) {const auto& outcome = market.outcomes[i];auto* row = new QWidget(this);- QString color = (i < OUTCOME_COLORS.size()) ? OUTCOME_COLORS[i] : colors::TEXT_SECONDARY;+ // Slot 0 tracks the exchange accent (Polymarket amber / Kalshi teal)+ // so the primary outcome is visually tied to the current exchange.+ // Slots 1+ fall back to the static palette.+ QString color;+ if (i == 0) color = presentation_.accent.name();+ else if (i < OUTCOME_COLORS.size()) color = OUTCOME_COLORS[i];+ else color = colors::TEXT_SECONDARY();row->setStyleSheet(QString("background: %1; border-left: 3px solid %2; padding: 4px 8px; margin: 2px 0;").arg(colors::BG_RAISED(), color));auto* rl = new QHBoxLayout(row);@@ -277,7 +256,7 @@ void PolymarketDetailPanel::set_market(const Market& market) {auto* name = new QLabel(outcome.name);name->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: 700; background: transparent;").arg(colors::TEXT_PRIMARY()));- auto* price = new QLabel(fmt_price(outcome.price));+ auto* price = new QLabel(presentation_.format_price(outcome.price));price->setStyleSheet(QString("color: %1; font-size: 13px; font-weight: 700; background: transparent;").arg(color));rl->addWidget(name);@@ -286,25 +265,25 @@ void PolymarketDetailPanel::set_market(const Market& market) {layout->addWidget(row);}- // Descriptiondescription_label_->setText(market.description.left(500));- // Token labels for chart+ // Outcome labels for chart — dynamic, read from prediction::Outcome::name.QStringList labels;+ labels.reserve(market.outcomes.size());for (const auto& o : market.outcomes)labels.append(o.name);- price_chart_->set_token_labels(labels);+ price_chart_->set_outcome_labels(labels);set_active_tab(0);}-void PolymarketDetailPanel::set_price_summary(const PriceSummary& summary) {- midpoint_label_->setText(fmt_price(summary.midpoint));- spread_label_->setText(fmt_price(summary.spread));- last_trade_label_->setText(fmt_price(summary.last_trade_price));+void PolymarketDetailPanel::set_price_summary(const pmx::PriceSummary& summary) {+ midpoint_label_->setText(presentation_.format_price(summary.midpoint));+ spread_label_->setText(presentation_.format_price(summary.spread));+ last_trade_label_->setText(presentation_.format_price(summary.last_trade_price));}-void PolymarketDetailPanel::set_order_book(const OrderBook& book) {+void PolymarketDetailPanel::set_order_book(const PredictionOrderBook& book) {orderbook_->set_data(book);}@@ -312,15 +291,15 @@ void PolymarketDetailPanel::set_price_history(const PriceHistory& history) {price_chart_->set_price_history(history);}-void PolymarketDetailPanel::set_trades(const QVector<Trade>& trades) {+void PolymarketDetailPanel::set_trades(const QVector<PredictionTrade>& trades) {activity_feed_->set_trades(trades);}-void PolymarketDetailPanel::set_top_holders(const QVector<TopHolder>& holders) {+void PolymarketDetailPanel::set_top_holders(const QVector<pmx::TopHolder>& holders) {holders_table_->setSortingEnabled(false);holders_table_->setRowCount(holders.size());for (int i = 0; i < holders.size(); ++i) {- const auto& h = holders[i];+ const pmx::TopHolder& h = holders[i];auto* rank = new QTableWidgetItem(QString::number(h.rank > 0 ? h.rank : i + 1));rank->setTextAlignment(Qt::AlignCenter);holders_table_->setItem(i, 0, rank);@@ -336,7 +315,7 @@ void PolymarketDetailPanel::set_top_holders(const QVector<TopHolder>& holders) {holders_table_->setSortingEnabled(true);}-void PolymarketDetailPanel::set_comments(const QVector<Comment>& comments) {+void PolymarketDetailPanel::set_comments(const QVector<pmx::Comment>& comments) {auto* layout = comments_container_->layout();while (layout->count() > 0) {auto* item = layout->takeAt(0);@@ -384,7 +363,7 @@ void PolymarketDetailPanel::set_comments(const QVector<Comment>& comments) {static_cast<QVBoxLayout*>(layout)->addStretch(1);}-void PolymarketDetailPanel::set_related_markets(const QVector<Market>& markets) {+void PolymarketDetailPanel::set_related_markets(const QVector<PredictionMarket>& markets) {auto* layout = related_container_->layout();while (layout->count() > 0) {auto* item = layout->takeAt(0);@@ -401,7 +380,7 @@ void PolymarketDetailPanel::set_related_markets(const QVector<Market>& markets)} else {for (const auto& m : markets) {auto* card = new QPushButton;- card->setText(m.question.left(60) + "\n" + fmt_vol(m.volume));+ card->setText(m.question.left(60) + "\n" + presentation_.format_volume(m.volume));card->setStyleSheet(QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "" text-align: left; padding: 8px; font-size: 11px; }""QPushButton:hover { background: %4; color: %5; }")@@ -417,10 +396,52 @@ void PolymarketDetailPanel::set_related_markets(const QVector<Market>& markets)}void PolymarketDetailPanel::set_open_interest(double oi) {- oi_label_->setText(fmt_vol(oi));+ oi_label_->setText(presentation_.format_volume(oi));+}++void PolymarketDetailPanel::set_polymarket_extras_enabled(bool enabled) {+ // The Holders / Comments / Related tabs exist only for Polymarket.+ // When the active exchange doesn't offer them, hide the tab buttons and+ // wipe any lingering content so stale Polymarket data is never shown+ // under a Kalshi market.+ const int extra_tabs[] = {kTabHolders, kTabComments, kTabRelated};+ for (int idx : extra_tabs) {+ if (idx >= 0 && idx < tab_btns_.size())+ tab_btns_[idx]->setVisible(enabled);+ }+ if (!enabled) {+ if (holders_table_) {+ holders_table_->setRowCount(0);+ }+ auto clear_container = [this](QWidget* container, const QString& empty_msg) {+ if (!container) return;+ auto* layout = container->layout();+ while (layout->count() > 0) {+ auto* item = layout->takeAt(0);+ if (item->widget())+ item->widget()->deleteLater();+ delete item;+ }+ auto* empty = new QLabel(empty_msg);+ empty->setStyleSheet(+ QString("color: %1; font-size: 13px; background: transparent;").arg(colors::TEXT_DIM()));+ empty->setAlignment(Qt::AlignCenter);+ layout->addWidget(empty);+ static_cast<QVBoxLayout*>(layout)->addStretch(1);+ };+ clear_container(comments_container_, tr("Comments are a Polymarket-only feature"));+ clear_container(related_container_, tr("Related markets are a Polymarket-only feature"));+ // If the user is currently sitting on a Polymarket-only tab, bounce+ // them back to Overview so they don't stare at a hidden tab.+ const int current = stack_ ? stack_->currentIndex() : 0;+ if (current == kTabHolders || current == kTabComments || current == kTabRelated)+ set_active_tab(0);+ }}void PolymarketDetailPanel::clear() {+ has_last_market_ = false;+ last_market_ = {};question_label_->setText("Select a market to view details");volume_label_->setText("--");liquidity_label_->setText("--");@@ -435,4 +456,59 @@ void PolymarketDetailPanel::clear() {activity_feed_->clear();}+// ── Presentation wiring ─────────────────────────────────────────────────────++void PolymarketDetailPanel::set_presentation(const ExchangePresentation& p) {+ const bool accent_changed = p.accent != presentation_.accent;+ const bool oi_changed = p.has_open_interest != presentation_.has_open_interest;+ const bool extras_changed = p.has_polymarket_extras != presentation_.has_polymarket_extras;++ presentation_ = p;++ if (accent_changed) apply_accent_to_tabs();+ if (oi_changed) apply_presentation_to_stats();+ if (extras_changed) set_polymarket_extras_enabled(p.has_polymarket_extras);++ // Re-render the currently-selected market so volume / price / status+ // pick up the new formatters. If no market is selected yet, the next+ // set_market() will apply the profile automatically.+ if (has_last_market_) set_market(last_market_);+}++void PolymarketDetailPanel::apply_accent_to_tabs() {+ const QColor& a = presentation_.accent;+ const QString accent_css =+ QStringLiteral("rgba(%1,%2,%3,1.0)").arg(a.red()).arg(a.green()).arg(a.blue());+ const QString css =+ QStringLiteral("QPushButton { background: transparent; color: %1; border: none; "+ " font-size: 9px; font-weight: 700; padding: 6px 10px; "+ " border-bottom: 2px solid transparent; }"+ "QPushButton:hover { color: %2; }"+ "QPushButton[active=\"true\"] { color: %2; border-bottom-color: %3; }")+ .arg(colors::TEXT_SECONDARY(), colors::TEXT_PRIMARY(), accent_css);+ for (auto* btn : tab_btns_) {+ btn->setStyleSheet(css);+ btn->style()->unpolish(btn);+ btn->style()->polish(btn);+ }+}++void PolymarketDetailPanel::apply_presentation_to_stats() {+ if (oi_box_) oi_box_->setVisible(presentation_.has_open_interest);+}++void PolymarketDetailPanel::render_status_badge(const PredictionMarket& market) {+ const auto badge = presentation_.status_badge(market);+ status_label_->setText(badge.text);++ const QString bg_css = badge.bg.alpha() > 0+ ? QStringLiteral("rgba(%1,%2,%3,%4)")+ .arg(badge.bg.red()).arg(badge.bg.green()).arg(badge.bg.blue())+ .arg(badge.bg.alphaF(), 0, 'f', 2)+ : QStringLiteral("transparent");+ status_label_->setStyleSheet(+ QString("color: %1; background: %2; font-size: 9px; font-weight: 700; padding: 2px 6px;")+ .arg(badge.fg.name(), bg_css));+}+} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.h b/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.hindex 751381093..5626486e5 100644--- a/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.h+++ b/fincept-qt/src/screens/polymarket/PolymarketDetailPanel.h@@ -1,6 +1,8 @@#pragma once+#include "screens/polymarket/ExchangePresentation.h"#include "services/polymarket/PolymarketTypes.h"+#include "services/prediction/PredictionTypes.h"#include <QLabel>#include <QPushButton>@@ -15,27 +17,48 @@ class PolymarketPriceChart;class PolymarketActivityFeed;/// Right detail panel: 7-tab stacked widget with embedded sub-widgets.+///+/// Core tabs (Overview/OrderBook/Chart/Trades) consume unified+/// prediction::* types so both Polymarket and Kalshi render through the+/// same surface. The remaining tabs (Holders, Comments, Related) are+/// Polymarket-only enrichments; the screen only populates them when the+/// active exchange is Polymarket, and clears them on exchange switch.class PolymarketDetailPanel : public QWidget {Q_OBJECTpublic:explicit PolymarketDetailPanel(QWidget* parent = nullptr);- void set_market(const services::polymarket::Market& market);- void set_price_summary(const services::polymarket::PriceSummary& summary);- void set_order_book(const services::polymarket::OrderBook& book);- void set_price_history(const services::polymarket::PriceHistory& history);- void set_trades(const QVector<services::polymarket::Trade>& trades);- void set_top_holders(const QVector<services::polymarket::TopHolder>& holders);- void set_comments(const QVector<services::polymarket::Comment>& comments);- void set_related_markets(const QVector<services::polymarket::Market>& markets);+ /// Install a per-exchange presentation profile. Restyles the tab bar+ /// accent, swaps the stats grid layout (hides OPEN INT on Kalshi), and+ /// re-renders the currently-selected market using the new formatters.+ /// Also calls set_polymarket_extras_enabled() based on the profile.+ void set_presentation(const ExchangePresentation& p);++ // Core (unified) setters — consumed for both Polymarket and Kalshi.+ void set_market(const fincept::services::prediction::PredictionMarket& market);+ void set_order_book(const fincept::services::prediction::PredictionOrderBook& book);+ void set_price_history(const fincept::services::prediction::PriceHistory& history);+ void set_trades(const QVector<fincept::services::prediction::PredictionTrade>& trades);++ // Polymarket-only enrichment setters — guarded by active_id at the caller.+ void set_price_summary(const fincept::services::polymarket::PriceSummary& summary);+ void set_top_holders(const QVector<fincept::services::polymarket::TopHolder>& holders);+ void set_comments(const QVector<fincept::services::polymarket::Comment>& comments);+ void set_related_markets(const QVector<fincept::services::prediction::PredictionMarket>& markets);void set_open_interest(double oi);++ /// Hide/disable the Polymarket-only tabs (Holders/Comments/Related) and+ /// clear their contents. Called when the active exchange changes to a+ /// provider that does not support those enrichments.+ void set_polymarket_extras_enabled(bool enabled);+void clear();signals:void tab_changed(int index);void interval_changed(const QString& interval);void outcome_changed(int index);- void related_market_clicked(const services::polymarket::Market& market);+ void related_market_clicked(const fincept::services::prediction::PredictionMarket& market);private:void build_ui();@@ -45,6 +68,9 @@ class PolymarketDetailPanel : public QWidget {QWidget* create_related_page();void set_active_tab(int tab);+ void apply_accent_to_tabs();+ void apply_presentation_to_stats(); // show/hide OPEN INT cell, re-label+ void render_status_badge(const fincept::services::prediction::PredictionMarket& market);QList<QPushButton*> tab_btns_;QStackedWidget* stack_ = nullptr;@@ -75,6 +101,25 @@ class PolymarketDetailPanel : public QWidget {// RelatedQWidget* related_container_ = nullptr;++ // OPEN INT stat cell — hidden on Kalshi (no OI endpoint).+ QWidget* oi_box_ = nullptr;++ // Presentation — determines accent color, price formatting, stat+ // visibility, and status-badge wording. Default is the Polymarket+ // profile so the widget renders correctly before set_presentation()+ // is called (ctor path).+ ExchangePresentation presentation_ = ExchangePresentation::for_polymarket();++ // Cached copy of the last market rendered — needed so set_presentation()+ // can re-render the overview + status badge with new formatters.+ fincept::services::prediction::PredictionMarket last_market_;+ bool has_last_market_ = false;++ // Polymarket-only tab button indices (for enable/disable).+ static constexpr int kTabHolders = 4;+ static constexpr int kTabComments = 5;+ static constexpr int kTabRelated = 6;};} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketMarketCard.cpp b/fincept-qt/src/screens/polymarket/PolymarketMarketCard.cppindex f296a1c10..9de985abd 100644--- a/fincept-qt/src/screens/polymarket/PolymarketMarketCard.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketMarketCard.cpp@@ -7,16 +7,15 @@namespace fincept::screens::polymarket {using namespace fincept::ui;-using namespace fincept::services::polymarket;--static QString fmt_vol(double v) {- if (v >= 1e9)- return QString("$%1B").arg(v / 1e9, 0, 'f', 1);- if (v >= 1e6)- return QString("$%1M").arg(v / 1e6, 0, 'f', 1);- if (v >= 1e3)- return QString("$%1K").arg(v / 1e3, 0, 'f', 1);- return QString("$%1").arg(v, 0, 'f', 0);+using namespace fincept::services::prediction;++// Outcome palette for multi-outcome markets. Slots 0–1 are the primary+// yes/no pair and are accent-colored dynamically at paint time; slots 2++// are fallbacks used only for 3+-way Polymarket markets.+static const char* OUTCOME_BAR_COLORS[] = {"#00D66F", "#FF3B3B", "#FF8800", "#4F8EF7", "#A855F7"};++static QChar outcome_initial(const QString& name) {+ return name.isEmpty() ? QChar('?') : name.at(0).toUpper();}// ── Model ───────────────────────────────────────────────────────────────────@@ -39,16 +38,18 @@ QVariant PolymarketMarketCardModel::data(const QModelIndex& index, int role) conreturn {};}-void PolymarketMarketCardModel::set_markets(const QVector<Market>& markets) {+void PolymarketMarketCardModel::set_markets(const QVector<PredictionMarket>& markets) {beginResetModel();markets_ = markets;+ events_.clear();view_mode_ = "markets";endResetModel();}-void PolymarketMarketCardModel::set_events(const QVector<Event>& events) {+void PolymarketMarketCardModel::set_events(const QVector<PredictionEvent>& events) {beginResetModel();events_ = events;+ markets_.clear();view_mode_ = "events";endResetModel();}@@ -57,14 +58,23 @@ void PolymarketMarketCardModel::set_view_mode(const QString& mode) {view_mode_ = mode;}-const Market* PolymarketMarketCardModel::market_at(int row) const {- if (row >= 0 && row < markets_.size())+void PolymarketMarketCardModel::set_presentation(const ExchangePresentation& p) {+ presentation_ = p;+ // Full reset — the delegate re-paints from scratch and picks up the+ // new accent/formatter. A targeted dataChanged(0..N) would be cheaper+ // but the list is bounded (20/page) so the difference is invisible.+ beginResetModel();+ endResetModel();+}++const PredictionMarket* PolymarketMarketCardModel::market_at(int row) const {+ if (view_mode_ == "markets" && row >= 0 && row < markets_.size())return &markets_[row];return nullptr;}-const Event* PolymarketMarketCardModel::event_at(int row) const {- if (row >= 0 && row < events_.size())+const PredictionEvent* PolymarketMarketCardModel::event_at(int row) const {+ if (view_mode_ == "events" && row >= 0 && row < events_.size())return &events_[row];return nullptr;}@@ -86,7 +96,6 @@ void PolymarketMarketCardDelegate::paint(QPainter* painter, const QStyleOptionVibool selected = option.state & QStyle::State_Selected;bool hovered = option.state & QStyle::State_MouseOver;- // Backgroundif (selected) {painter->fillRect(r, QColor(colors::AMBER()).darker(400));painter->setPen(QPen(QColor(colors::AMBER()), 2));@@ -97,7 +106,6 @@ void PolymarketMarketCardDelegate::paint(QPainter* painter, const QStyleOptionVipainter->fillRect(r, QColor(colors::BG_BASE()));}- // Bottom borderpainter->setPen(QColor(colors::BORDER_DIM()));painter->drawLine(r.left(), r.bottom(), r.right(), r.bottom());@@ -106,18 +114,20 @@ void PolymarketMarketCardDelegate::paint(QPainter* painter, const QStyleOptionVipainter->restore();return;}+ const auto& pres = model->presentation();int row = index.row();int x = r.left() + 10;int y = r.top() + 8;int w = r.width() - 20;- const Market* mkt = model->market_at(row);- const Event* evt = model->event_at(row);+ const PredictionMarket* mkt = model->market_at(row);+ const PredictionEvent* evt = model->event_at(row);QString title;double vol = 0;QVector<Outcome> outcomes;+ int sub_market_count = 0;if (mkt) {title = mkt->question;@@ -126,6 +136,7 @@ void PolymarketMarketCardDelegate::paint(QPainter* painter, const QStyleOptionVi} else if (evt) {title = evt->title;vol = evt->volume;+ sub_market_count = evt->markets.size();if (!evt->markets.isEmpty())outcomes = evt->markets[0].outcomes;} else {@@ -133,51 +144,52 @@ void PolymarketMarketCardDelegate::paint(QPainter* painter, const QStyleOptionVireturn;}- // Title (2 lines max)+ // Title (2 lines max). Selected row gets painted in the exchange accent.QFont font(fonts::DATA_FAMILY, 11);font.setWeight(QFont::Bold);painter->setFont(font);- painter->setPen(QColor(selected ? colors::AMBER() : colors::TEXT_PRIMARY()));+ painter->setPen(QColor(selected ? pres.accent : QColor(colors::TEXT_PRIMARY())));QRect title_rect(x, y, w, 30);painter->drawText(title_rect, Qt::AlignLeft | Qt::TextWordWrap, title.left(80));y += 32;- // Probability bars- if (outcomes.size() >= 2) {- double yes_pct = outcomes[0].price;- double no_pct = outcomes[1].price;- int bar_w = w - 60;- int bar_h = 14;-- // YES bar- int yes_w = static_cast<int>(bar_w * yes_pct);- painter->fillRect(x, y, yes_w, bar_h, QColor("#00D66F"));- painter->fillRect(x + yes_w, y, bar_w - yes_w, bar_h, QColor(colors::BG_RAISED()));-+ // Dynamic outcome bars — read names/prices from prediction::Outcome so+ // Polymarket (Yes/No), Kalshi (yes/no), and custom multi-outcome markets+ // all render without code changes. Render up to 2 rows. Price labels+ // are formatted by the presentation (cents suffix on Polymarket,+ // dollars on Kalshi).+ const int bars_to_draw = qMin(2, outcomes.size());+ if (bars_to_draw >= 2) {+ const int bar_w = w - 80; // wider right gutter for "$0.52" vs "Y 52¢"+ const int bar_h = 14;QFont small_font(fonts::DATA_FAMILY, 9);small_font.setWeight(QFont::Bold);- painter->setFont(small_font);- painter->setPen(QColor(colors::TEXT_PRIMARY()));- painter->drawText(x + bar_w + 4, y, 52, bar_h, Qt::AlignLeft | Qt::AlignVCenter,- QString("Y %1c").arg(qRound(yes_pct * 100)));- y += bar_h + 2;-- // NO bar- int no_w = static_cast<int>(bar_w * no_pct);- painter->fillRect(x, y, no_w, bar_h, QColor("#FF3B3B"));- painter->fillRect(x + no_w, y, bar_w - no_w, bar_h, QColor(colors::BG_RAISED()));- painter->drawText(x + bar_w + 4, y, 52, bar_h, Qt::AlignLeft | Qt::AlignVCenter,- QString("N %1c").arg(qRound(no_pct * 100)));++ for (int i = 0; i < bars_to_draw; ++i) {+ const auto& o = outcomes[i];+ const double pct = qBound(0.0, o.price, 1.0);+ const int filled = static_cast<int>(bar_w * pct);+ // Slot 0 tracks the exchange accent; slot 1 stays red so the+ // primary/secondary outcome split remains readable even when+ // the accent itself shifts.+ QColor bar_color = (i == 0) ? pres.accent : QColor(OUTCOME_BAR_COLORS[qMin(i, 4)]);+ painter->fillRect(x, y, filled, bar_h, bar_color);+ painter->fillRect(x + filled, y, bar_w - filled, bar_h, QColor(colors::BG_RAISED()));++ painter->setFont(small_font);+ painter->setPen(QColor(colors::TEXT_PRIMARY()));+ painter->drawText(x + bar_w + 4, y, 72, bar_h, Qt::AlignLeft | Qt::AlignVCenter,+ QString("%1 %2").arg(outcome_initial(o.name)).arg(pres.format_price(pct)));+ y += bar_h + 2;+ }} else {- // Volume line for events without outcomesQFont small_font(fonts::DATA_FAMILY, 10);painter->setFont(small_font);painter->setPen(QColor(colors::TEXT_SECONDARY()));- painter->drawText(x, y, w, 16, Qt::AlignLeft | Qt::AlignVCenter, fmt_vol(vol));-- if (evt) {+ painter->drawText(x, y, w, 16, Qt::AlignLeft | Qt::AlignVCenter, pres.format_volume(vol));+ if (evt && sub_market_count > 0) {painter->drawText(x + 80, y, w - 80, 16, Qt::AlignLeft | Qt::AlignVCenter,- QString("%1 markets").arg(evt->markets.size()));+ QString("%1 markets").arg(sub_market_count));}}diff --git a/fincept-qt/src/screens/polymarket/PolymarketMarketCard.h b/fincept-qt/src/screens/polymarket/PolymarketMarketCard.hindex 796eb9383..fe1e5afa6 100644--- a/fincept-qt/src/screens/polymarket/PolymarketMarketCard.h+++ b/fincept-qt/src/screens/polymarket/PolymarketMarketCard.h@@ -1,13 +1,15 @@#pragma once-#include "services/polymarket/PolymarketTypes.h"+#include "screens/polymarket/ExchangePresentation.h"+#include "services/prediction/PredictionTypes.h"#include <QAbstractListModel>#include <QStyledItemDelegate>namespace fincept::screens::polymarket {-/// Model for market/event list items.+/// Model for market/event list items. Consumes unified prediction::*+/// types so Polymarket and Kalshi rows render identically.class PolymarketMarketCardModel : public QAbstractListModel {Q_OBJECTpublic:@@ -18,20 +20,26 @@ class PolymarketMarketCardModel : public QAbstractListModel {int rowCount(const QModelIndex& parent = {}) const override;QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;- void set_markets(const QVector<services::polymarket::Market>& markets);- void set_events(const QVector<services::polymarket::Event>& events);+ void set_markets(const QVector<fincept::services::prediction::PredictionMarket>& markets);+ void set_events(const QVector<fincept::services::prediction::PredictionEvent>& events);void set_view_mode(const QString& mode); // "markets" or "events"+ void set_presentation(const ExchangePresentation& p);- const services::polymarket::Market* market_at(int row) const;- const services::polymarket::Event* event_at(int row) const;+ const fincept::services::prediction::PredictionMarket* market_at(int row) const;+ const fincept::services::prediction::PredictionEvent* event_at(int row) const;+ const ExchangePresentation& presentation() const { return presentation_; }private:- QVector<services::polymarket::Market> markets_;- QVector<services::polymarket::Event> events_;+ QVector<fincept::services::prediction::PredictionMarket> markets_;+ QVector<fincept::services::prediction::PredictionEvent> events_;QString view_mode_ = "markets";+ ExchangePresentation presentation_ = ExchangePresentation::for_polymarket();};/// Delegate that paints rich market cards with probability bars.+/// Outcome names are read from the prediction::Outcome vector at paint time,+/// so Polymarket "Yes"/"No", Kalshi "yes"/"no", or custom multi-outcome+/// markets all render without code changes.class PolymarketMarketCardDelegate : public QStyledItemDelegate {Q_OBJECTpublic:diff --git a/fincept-qt/src/screens/polymarket/PolymarketOrderBook.cpp b/fincept-qt/src/screens/polymarket/PolymarketOrderBook.cppindex b869d78bd..f18a255b2 100644--- a/fincept-qt/src/screens/polymarket/PolymarketOrderBook.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketOrderBook.cpp@@ -12,7 +12,7 @@namespace fincept::screens::polymarket {using namespace fincept::ui;-using namespace fincept::services::polymarket;+using namespace fincept::services::prediction;PolymarketOrderBook::PolymarketOrderBook(QWidget* parent) : QWidget(parent) {setMinimumHeight(200);@@ -32,7 +32,7 @@ PolymarketOrderBook::PolymarketOrderBook(QWidget* parent) : QWidget(parent) {});}-void PolymarketOrderBook::set_data(const OrderBook& book) {+void PolymarketOrderBook::set_data(const PredictionOrderBook& book) {QMutexLocker lock(&mutex_);bids_ = book.bids;asks_ = book.asks;diff --git a/fincept-qt/src/screens/polymarket/PolymarketOrderBook.h b/fincept-qt/src/screens/polymarket/PolymarketOrderBook.hindex a0f7d8a40..06e15677a 100644--- a/fincept-qt/src/screens/polymarket/PolymarketOrderBook.h+++ b/fincept-qt/src/screens/polymarket/PolymarketOrderBook.h@@ -1,6 +1,6 @@#pragma once-#include "services/polymarket/PolymarketTypes.h"+#include "services/prediction/PredictionTypes.h"#include <QLabel>#include <QMutex>@@ -17,7 +17,7 @@ class PolymarketOrderBook : public QWidget {public:explicit PolymarketOrderBook(QWidget* parent = nullptr);- void set_data(const services::polymarket::OrderBook& book);+ void set_data(const fincept::services::prediction::PredictionOrderBook& book);void clear();signals:@@ -33,8 +33,8 @@ class PolymarketOrderBook : public QWidget {private:void rebuild_cache();- QVector<services::polymarket::OrderLevel> bids_;- QVector<services::polymarket::OrderLevel> asks_;+ QVector<fincept::services::prediction::OrderLevel> bids_;+ QVector<fincept::services::prediction::OrderLevel> asks_;double spread_ = 0.0;QMutex mutex_;QPixmap cache_;diff --git a/fincept-qt/src/screens/polymarket/PolymarketPriceChart.cpp b/fincept-qt/src/screens/polymarket/PolymarketPriceChart.cppindex 60f96386e..fbfc14357 100644--- a/fincept-qt/src/screens/polymarket/PolymarketPriceChart.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketPriceChart.cpp@@ -9,7 +9,7 @@namespace fincept::screens::polymarket {using namespace fincept::ui;-using namespace fincept::services::polymarket;+using namespace fincept::services::prediction;static const QStringList INTERVAL_LABELS = {"1H", "6H", "1D", "1W", "1M", "ALL"};static const QStringList INTERVAL_VALUES = {"1h", "6h", "1d", "1w", "1m", "max"};@@ -43,9 +43,10 @@ PolymarketPriceChart::PolymarketPriceChart(QWidget* parent) : QWidget(parent) {olbl->setStyleSheet(lbl->styleSheet());toolbar->addWidget(olbl);+ // Outcome combo is populated dynamically via set_outcome_labels() when+ // a market is selected — no hardcoded YES/NO.outcome_combo_ = new QComboBox;- outcome_combo_->addItems({"YES", "NO"});- outcome_combo_->setFixedWidth(70);+ outcome_combo_->setFixedWidth(90);connect(outcome_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this,&PolymarketPriceChart::outcome_changed);toolbar->addWidget(outcome_combo_);@@ -70,6 +71,9 @@ PolymarketPriceChart::PolymarketPriceChart(QWidget* parent) : QWidget(parent) {}void PolymarketPriceChart::set_price_history(const PriceHistory& history) {+ last_history_ = history;+ has_last_history_ = true;+auto* layout = chart_container_->layout();while (layout->count() > 0) {auto* item = layout->takeAt(0);@@ -86,23 +90,37 @@ void PolymarketPriceChart::set_price_history(const PriceHistory& history) {return;}- QVector<ChartFactory::DataPoint> data;- data.reserve(history.points.size());+ QVector<ChartFactory::DataPoint> points;+ points.reserve(history.points.size());for (const auto& pt : history.points) {- data.append({static_cast<double>(pt.timestamp), pt.price * 100.0}); // scale to cents+ // prediction::PricePoint is always in ts_ms + 0..1 probability space+ // (Kalshi cents are divided by 100 in the adapter type map). Y-axis+ // is rendered as 0–100 cents regardless so the chart scale is+ // consistent; the axis *label* comes from the presentation.+ points.append({static_cast<double>(pt.ts_ms), pt.price * 100.0});}- auto* chart_view = ChartFactory::line_chart("PROBABILITY", data, colors::AMBER);+ // Accent-colored series ties the chart back to the active exchange.+ auto* chart_view = ChartFactory::line_chart(presentation_.chart_y_label, points,+ presentation_.accent.name());layout->addWidget(chart_view);}void PolymarketPriceChart::set_current_price(double price) {- price_label_->setText(QString("%1c").arg(qRound(price * 100)));+ price_label_->setText(presentation_.format_price(price));+}++void PolymarketPriceChart::set_presentation(const ExchangePresentation& p) {+ presentation_ = p;+ if (has_last_history_) set_price_history(last_history_);}-void PolymarketPriceChart::set_token_labels(const QStringList& labels) {+void PolymarketPriceChart::set_outcome_labels(const QStringList& labels) {+ const QSignalBlocker block(outcome_combo_);outcome_combo_->clear();outcome_combo_->addItems(labels);+ if (!labels.isEmpty())+ outcome_combo_->setCurrentIndex(0);}} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketPriceChart.h b/fincept-qt/src/screens/polymarket/PolymarketPriceChart.hindex e60bd2de9..3428e51ff 100644--- a/fincept-qt/src/screens/polymarket/PolymarketPriceChart.h+++ b/fincept-qt/src/screens/polymarket/PolymarketPriceChart.h@@ -1,6 +1,7 @@#pragma once-#include "services/polymarket/PolymarketTypes.h"+#include "screens/polymarket/ExchangePresentation.h"+#include "services/prediction/PredictionTypes.h"#include <QComboBox>#include <QLabel>@@ -10,14 +11,20 @@namespace fincept::screens::polymarket {/// Price chart with interval selector and outcome toggle.+/// Outcome names come from prediction::Outcome::name — no hardcoded YES/NO.class PolymarketPriceChart : public QWidget {Q_OBJECTpublic:explicit PolymarketPriceChart(QWidget* parent = nullptr);- void set_price_history(const services::polymarket::PriceHistory& history);+ void set_price_history(const fincept::services::prediction::PriceHistory& history);void set_current_price(double price);- void set_token_labels(const QStringList& labels);+ void set_outcome_labels(const QStringList& labels);++ /// Update the presentation profile. Re-renders the chart with the new+ /// y-axis label and price formatter. Safe to call before any data has+ /// been set.+ void set_presentation(const ExchangePresentation& p);signals:void interval_changed(const QString& interval);@@ -28,6 +35,12 @@ class PolymarketPriceChart : public QWidget {QComboBox* interval_combo_ = nullptr;QComboBox* outcome_combo_ = nullptr;QLabel* price_label_ = nullptr;++ // Cached last history so set_presentation() can re-render.+ fincept::services::prediction::PriceHistory last_history_;+ bool has_last_history_ = false;++ ExchangePresentation presentation_ = ExchangePresentation::for_polymarket();};} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PolymarketScreen.cpp b/fincept-qt/src/screens/polymarket/PolymarketScreen.cppindex 9fa4a1551..a47bd7771 100644--- a/fincept-qt/src/screens/polymarket/PolymarketScreen.cpp+++ b/fincept-qt/src/screens/polymarket/PolymarketScreen.cpp@@ -2,13 +2,20 @@#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"+#include "screens/polymarket/PolymarketActivityFeed.h"#include "screens/polymarket/PolymarketBrowsePanel.h"#include "screens/polymarket/PolymarketCommandBar.h"#include "screens/polymarket/PolymarketDetailPanel.h"#include "screens/polymarket/PolymarketLeaderboard.h"+#include "screens/polymarket/PolymarketPriceChart.h"#include "screens/polymarket/PolymarketStatusBar.h"+#include "screens/polymarket/PredictionAccountDialog.h"#include "services/polymarket/PolymarketService.h"-#include "services/polymarket/PolymarketWebSocket.h"+#include "services/prediction/PredictionCredentialStore.h"+#include "services/prediction/PredictionExchangeAdapter.h"+#include "services/prediction/PredictionExchangeRegistry.h"+#include "services/prediction/kalshi/KalshiAdapter.h"+#include "services/prediction/polymarket/PolymarketAdapter.h"#include "ui/theme/Theme.h"#include <QSplitter>@@ -16,27 +23,37 @@namespace fincept::screens {-using namespace fincept::services::polymarket;+namespace pred = fincept::services::prediction;+namespace pmx = fincept::services::polymarket;using namespace fincept::screens::polymarket;+static QString kPolymarketId() { return QStringLiteral("polymarket"); }+// ── Constructor / Destructor ────────────────────────────────────────────────PolymarketScreen::PolymarketScreen(QWidget* parent) : QWidget(parent) {setObjectName("polyScreen");setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE()));build_ui();- connect_service();- connect_websocket();++ // Polymarket-only enrichments (price summary, top holders, comments,+ // related markets) only fire when the active adapter is Polymarket, but+ // the underlying service signals are always connected so the screen+ // doesn't re-wire every exchange swap. The guard lives at emit time.+ connect_polymarket_extras();refresh_timer_ = new QTimer(this);refresh_timer_->setInterval(60000);connect(refresh_timer_, &QTimer::timeout, this, &PolymarketScreen::on_refresh);- LOG_INFO("Polymarket", "Screen constructed");+ LOG_INFO("PredictionMarkets", "Screen constructed");}PolymarketScreen::~PolymarketScreen() {unsubscribe_current();+ disconnect_active_adapter();+ for (const auto& c : polymarket_extras_connections_) QObject::disconnect(c);+ polymarket_extras_connections_.clear();}// ── Visibility (P3) ─────────────────────────────────────────────────────────@@ -46,11 +63,54 @@ void PolymarketScreen::showEvent(QShowEvent* e) {refresh_timer_->start();if (first_show_) {first_show_ = false;- PolymarketService::instance().fetch_tags();++ auto& reg = pred::PredictionExchangeRegistry::instance();+ const QStringList ids = reg.available_ids();+ QStringList labels;+ labels.reserve(ids.size());+ for (const auto& id : ids) {+ auto* adapter = reg.adapter(id);+ labels.push_back(adapter ? adapter->display_name() : id);+ }+ if (ids.isEmpty()) {+ command_bar_->set_exchanges({kPolymarketId()}, {"Polymarket"}, kPolymarketId());+ } else {+ command_bar_->set_exchanges(ids, labels, reg.active_id());+ }++ // Reflect any previously-saved credentials in the account chip.+ const bool has_pm = pred::PredictionCredentialStore::load_polymarket().has_value();+ const bool has_ks = pred::PredictionCredentialStore::load_kalshi().has_value();+ QString acct_label;+ if (has_pm && has_ks) acct_label = tr("Polymarket + Kalshi");+ else if (has_pm) acct_label = tr("Polymarket");+ else if (has_ks) acct_label = tr("Kalshi");+ command_bar_->set_account_status(has_pm || has_ks, acct_label);++ // Listen for adapter-side credential / error events across every+ // registered adapter so the status bar + account chip stay in sync+ // regardless of which exchange is active.+ for (const QString& id : reg.available_ids()) {+ if (auto* a = reg.adapter(id)) {+ connect(a, &pred::PredictionExchangeAdapter::credentials_changed, this, [this]() {+ const bool pm = pred::PredictionCredentialStore::load_polymarket().has_value();+ const bool ks = pred::PredictionCredentialStore::load_kalshi().has_value();+ QString l;+ if (pm && ks) l = tr("Polymarket + Kalshi");+ else if (pm) l = tr("Polymarket");+ else if (ks) l = tr("Kalshi");+ command_bar_->set_account_status(pm || ks, l);+ });+ }+ }++ // Wire the initially-active adapter and pull the first view.+ connect_active_adapter();load_current_view();}- if (has_selection_ && !subscribed_tokens_.isEmpty()) {- PolymarketWebSocket::instance().subscribe(subscribed_tokens_);+ if (has_selection_ && !subscribed_asset_ids_.isEmpty()) {+ if (auto* a = active_adapter())+ a->subscribe_market(subscribed_asset_ids_);}}@@ -82,7 +142,7 @@ void PolymarketScreen::build_ui() {leaderboard_ = new PolymarketLeaderboard;leaderboard_->setMinimumWidth(280);leaderboard_->setMaximumWidth(340);- leaderboard_->setVisible(false); // shown only in LEADERBOARD view (future)+ leaderboard_->setVisible(false); // shown only when active adapter supports leaderboard.splitter->addWidget(browse_panel_);splitter->addWidget(detail_panel_);@@ -97,62 +157,197 @@ void PolymarketScreen::build_ui() {status_bar_ = new PolymarketStatusBar;root->addWidget(status_bar_);- // Wire command bar signals+ // Command bar signalsconnect(command_bar_, &PolymarketCommandBar::view_changed, this, &PolymarketScreen::on_view_changed);connect(command_bar_, &PolymarketCommandBar::category_changed, this, &PolymarketScreen::on_category_changed);connect(command_bar_, &PolymarketCommandBar::search_submitted, this, &PolymarketScreen::on_search_submitted);connect(command_bar_, &PolymarketCommandBar::sort_changed, this, &PolymarketScreen::on_sort_changed);connect(command_bar_, &PolymarketCommandBar::refresh_clicked, this, &PolymarketScreen::on_refresh);+ connect(command_bar_, &PolymarketCommandBar::exchange_changed, this, &PolymarketScreen::on_exchange_changed);+ connect(command_bar_, &PolymarketCommandBar::account_clicked, this, [this]() {+ auto* dlg = new PredictionAccountDialog(this);+ auto& reg = pred::PredictionExchangeRegistry::instance();+ dlg->set_active_exchange(reg.active_id());+ connect(dlg, &PredictionAccountDialog::credentials_saved, this, [this](const QString& id) {+ auto& reg = pred::PredictionExchangeRegistry::instance();+ if (id == kPolymarketId()) {+ if (auto* pm = dynamic_cast<pred::polymarket_ns::PolymarketAdapter*>(reg.adapter(kPolymarketId())))+ pm->reload_credentials();+ } else if (id == QStringLiteral("kalshi")) {+ if (auto* ks = dynamic_cast<pred::kalshi_ns::KalshiAdapter*>(reg.adapter(QStringLiteral("kalshi")))) {+ if (auto creds = pred::PredictionCredentialStore::load_kalshi()) ks->set_credentials(*creds);+ }+ }+ const bool has_pm = pred::PredictionCredentialStore::load_polymarket().has_value();+ const bool has_ks = pred::PredictionCredentialStore::load_kalshi().has_value();+ const bool any = has_pm || has_ks;+ QString label;+ if (has_pm && has_ks) label = tr("Polymarket + Kalshi");+ else if (has_pm) label = tr("Polymarket");+ else if (has_ks) label = tr("Kalshi");+ command_bar_->set_account_status(any, label);+ LOG_INFO("PredictionMarkets", "Credentials saved for " + id);+ });+ connect(dlg, &PredictionAccountDialog::test_requested, this, [](const QString& id) {+ auto* adapter = pred::PredictionExchangeRegistry::instance().adapter(id);+ if (!adapter) return;+ if (id == kPolymarketId()) {+ if (auto* pm = dynamic_cast<pred::polymarket_ns::PolymarketAdapter*>(adapter))+ pm->reload_credentials();+ } else if (id == QStringLiteral("kalshi")) {+ if (auto* ks = dynamic_cast<pred::kalshi_ns::KalshiAdapter*>(adapter)) {+ if (auto creds = pred::PredictionCredentialStore::load_kalshi()) ks->set_credentials(*creds);+ }+ }+ adapter->fetch_balance();+ });+ dlg->setAttribute(Qt::WA_DeleteOnClose);+ dlg->open();+ });- // Wire browse panel signals+ // Browse panel signalsconnect(browse_panel_, &PolymarketBrowsePanel::market_selected, this, &PolymarketScreen::on_market_selected);connect(browse_panel_, &PolymarketBrowsePanel::event_selected, this, &PolymarketScreen::on_event_selected);- // Wire detail panel signals+ // Detail panel signalsconnect(detail_panel_, &PolymarketDetailPanel::interval_changed, this, &PolymarketScreen::on_interval_changed);connect(detail_panel_, &PolymarketDetailPanel::outcome_changed, this, &PolymarketScreen::on_outcome_changed);connect(detail_panel_, &PolymarketDetailPanel::related_market_clicked, this,&PolymarketScreen::on_related_market_clicked);}-// ── Service Wiring ──────────────────────────────────────────────────────────+// ── Active-adapter wiring ───────────────────────────────────────────────────++pred::PredictionExchangeAdapter* PolymarketScreen::active_adapter() const {+ return pred::PredictionExchangeRegistry::instance().active();+}++bool PolymarketScreen::active_is_polymarket() const {+ return pred::PredictionExchangeRegistry::instance().active_id() == kPolymarketId();+}++void PolymarketScreen::connect_active_adapter() {+ disconnect_active_adapter();++ auto* a = active_adapter();+ if (!a) {+ LOG_WARN("PredictionMarkets", "connect_active_adapter: no active adapter registered");+ return;+ }+ wired_adapter_id_ = a->id();++ // Read-side signals emit prediction::* types — both Polymarket and+ // Kalshi adapters conform, so sub-panels receive identical payloads+ // regardless of the underlying exchange.+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::markets_ready,+ this, &PolymarketScreen::on_markets_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::events_ready,+ this, &PolymarketScreen::on_events_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::search_results_ready,+ this, &PolymarketScreen::on_search_results_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::tags_ready,+ this, &PolymarketScreen::on_tags_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::order_book_ready,+ this, &PolymarketScreen::on_order_book_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::price_history_ready,+ this, &PolymarketScreen::on_price_history_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::recent_trades_ready,+ this, &PolymarketScreen::on_trades_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::leaderboard_ready,+ this, &PolymarketScreen::on_leaderboard_ready);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::error_occurred,+ this, &PolymarketScreen::on_adapter_error);++ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::ws_price_updated,+ this, &PolymarketScreen::on_ws_price_updated);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::ws_orderbook_updated,+ this, &PolymarketScreen::on_ws_orderbook_updated);+ adapter_connections_ << connect(a, &pred::PredictionExchangeAdapter::ws_connection_changed,+ this, &PolymarketScreen::on_ws_connection_changed);++ // Install the per-exchange presentation profile across every sub-panel+ // that has per-exchange visual identity. This fans out accent color,+ // price formatters, view pill set, stat visibility, and status-badge+ // wording in a single call so the whole surface stays internally+ // consistent. Done before `list_tags()` so the command bar's category+ // row is built in the right mode before tags arrive.+ install_presentation(polymarket::ExchangePresentation::for_adapter(a));++ // Leaderboard panel is currently Polymarket-only (Kalshi has no public+ // leaderboard endpoint). Show it only when the adapter advertises it.+ const auto caps = a->capabilities();+ leaderboard_->setVisible(caps.has_leaderboard);++ // Tags are populated per-adapter so the category row reflects the+ // active exchange's taxonomy.+ a->list_tags();++ // WS status resets on adapter swap — the new adapter's connection+ // state takes over.+ on_ws_connection_changed(a->is_ws_connected());+}++void PolymarketScreen::disconnect_active_adapter() {+ for (const auto& c : adapter_connections_) QObject::disconnect(c);+ adapter_connections_.clear();+ wired_adapter_id_.clear();+}++void PolymarketScreen::install_presentation(const polymarket::ExchangePresentation& p) {+ // Fan-out order matters slightly: command bar first so view pills are+ // rebuilt before we reset active_view_; detail panel next so status+ // badge re-renders with the new profile before any data callback lands.+ if (command_bar_) command_bar_->set_presentation(p);+ if (detail_panel_) detail_panel_->set_presentation(p);+ if (browse_panel_) browse_panel_->set_presentation(p);++ // The detail panel's embedded sub-widgets (chart, trades) are built+ // inside the panel and reachable via its own plumbing — set_presentation+ // on the panel is enough. But the panel doesn't expose them, so we+ // reach through here to keep the chart + feed consistent. This is the+ // only cross-widget reach in the refactor; everything else is panel-local.+ // Anchored off named children so we don't bake in a friend relationship.+ if (detail_panel_) {+ if (auto* chart = detail_panel_->findChild<PolymarketPriceChart*>())+ chart->set_presentation(p);+ if (auto* feed = detail_panel_->findChild<PolymarketActivityFeed*>())+ feed->set_presentation(p);+ }-void PolymarketScreen::connect_service() {- auto& svc = PolymarketService::instance();- connect(&svc, &PolymarketService::markets_ready, this, &PolymarketScreen::on_markets_received);- connect(&svc, &PolymarketService::events_ready, this, &PolymarketScreen::on_events_received);- connect(&svc, &PolymarketService::tags_ready, this, &PolymarketScreen::on_tags_received);- connect(&svc, &PolymarketService::order_book_ready, this, &PolymarketScreen::on_order_book_received);- connect(&svc, &PolymarketService::price_history_ready, this, &PolymarketScreen::on_price_history_received);- connect(&svc, &PolymarketService::trades_ready, this, &PolymarketScreen::on_trades_received);- connect(&svc, &PolymarketService::price_summary_ready, this, &PolymarketScreen::on_price_summary_received);- connect(&svc, &PolymarketService::top_holders_ready, this, &PolymarketScreen::on_top_holders_received);- connect(&svc, &PolymarketService::leaderboard_ready, this, &PolymarketScreen::on_leaderboard_received);- connect(&svc, &PolymarketService::comments_ready, this, &PolymarketScreen::on_comments_received);- connect(&svc, &PolymarketService::related_markets_ready, this, &PolymarketScreen::on_related_markets_received);- connect(&svc, &PolymarketService::request_error, this, &PolymarketScreen::on_service_error);+ // If the active view from the previous exchange doesn't exist in the+ // new profile's view list, fall back to its default. Keeps the pill+ // row in a valid state after Polymarket→Kalshi (SPORTS/TRENDING drop).+ if (!p.view_names.contains(active_view_)) {+ active_view_ = p.default_view.isEmpty() ? QStringLiteral("MARKETS") : p.default_view;+ if (command_bar_) command_bar_->set_active_view(active_view_);+ }}-void PolymarketScreen::connect_websocket() {- auto& ws = PolymarketWebSocket::instance();- connect(&ws, &PolymarketWebSocket::price_updated, this, &PolymarketScreen::on_ws_price_updated);- connect(&ws, &PolymarketWebSocket::orderbook_updated, this, &PolymarketScreen::on_ws_orderbook_updated);- connect(&ws, &PolymarketWebSocket::connection_status_changed, this, &PolymarketScreen::on_ws_status_changed);+void PolymarketScreen::connect_polymarket_extras() {+ auto& svc = pmx::PolymarketService::instance();+ polymarket_extras_connections_ << connect(&svc, &pmx::PolymarketService::price_summary_ready,+ this, &PolymarketScreen::on_price_summary_received);+ polymarket_extras_connections_ << connect(&svc, &pmx::PolymarketService::top_holders_ready,+ this, &PolymarketScreen::on_top_holders_received);+ polymarket_extras_connections_ << connect(&svc, &pmx::PolymarketService::comments_ready,+ this, &PolymarketScreen::on_comments_received);+ polymarket_extras_connections_ << connect(&svc, &pmx::PolymarketService::related_markets_ready,+ this, &PolymarketScreen::on_related_markets_received);}// ── Command Bar Slots ───────────────────────────────────────────────────────void PolymarketScreen::on_view_changed(const QString& view) {active_view_ = view;- command_bar_->set_active_view(view);- status_bar_->set_view(view);+ if (command_bar_) command_bar_->set_active_view(view);+ if (status_bar_) status_bar_->set_view(view);load_current_view();- LOG_INFO("Polymarket", "View: " + view);+ LOG_INFO("PredictionMarkets", "View: " + view);}void PolymarketScreen::on_category_changed(const QString& category) {active_category_ = category;- command_bar_->set_active_category(category);+ if (command_bar_) command_bar_->set_active_category(category);ScreenStateManager::instance().notify_changed(this);load_current_view();}@@ -162,220 +357,310 @@ void PolymarketScreen::on_search_submitted(const QString& query) {load_current_view();return;}+ auto* a = active_adapter();+ if (!a) return;command_bar_->set_loading(true);browse_panel_->set_loading(true);++request_generation_;- PolymarketService::instance().search_markets(query, 50);+ a->search(query, 50);}void PolymarketScreen::on_sort_changed(const QString& sort_by) {active_sort_ = sort_by;- if (!first_show_)- load_current_view();+ if (!first_show_) load_current_view();}-void PolymarketScreen::on_refresh() {+void PolymarketScreen::on_refresh() { load_current_view(); }++void PolymarketScreen::on_exchange_changed(const QString& exchange_id) {+ auto& reg = pred::PredictionExchangeRegistry::instance();+ if (reg.active_id() == exchange_id) return;++ // Drop the current market subscription before swapping adapters — the+ // old adapter is the one that owns that WS channel.+ unsubscribe_current();+ has_selection_ = false;+ selected_market_ = {};++ reg.set_active(exchange_id);+ LOG_INFO("PredictionMarkets", "Active exchange -> " + exchange_id);++ // Clear the rendered surface so stale markets from the previous+ // exchange don't sit under the new one.+ browse_panel_->clear();+ detail_panel_->clear();+ if (status_bar_) {+ auto* a = reg.adapter(exchange_id);+ status_bar_->set_selected(tr("Showing %1 data")+ .arg(a ? a->display_name() : exchange_id));+ }++ connect_active_adapter();load_current_view();}// ── Browse Panel Slots ──────────────────────────────────────────────────────-void PolymarketScreen::on_market_selected(const Market& market) {+void PolymarketScreen::on_market_selected(const pred::PredictionMarket& market) {select_market(market);}-void PolymarketScreen::on_event_selected(const Event& event) {- if (!event.markets.isEmpty()) {- select_market(event.markets[0]);- }- // Also fetch related markets from this event- if (event.id > 0) {- PolymarketService::instance().fetch_related_markets(event.id);+void PolymarketScreen::on_event_selected(const pred::PredictionEvent& event) {+ if (!event.markets.isEmpty()) select_market(event.markets.first());+ // Polymarket-only: event-level related markets.+ if (active_is_polymarket()) {+ bool ok = false;+ const int event_id = event.key.event_id.toInt(&ok);+ if (ok && event_id > 0) pmx::PolymarketService::instance().fetch_related_markets(event_id);}}// ── Detail Panel Slots ──────────────────────────────────────────────────────void PolymarketScreen::on_interval_changed(const QString& interval) {- if (!has_selection_ || selected_market_.clob_token_ids.isEmpty())- return;+ if (!has_selection_ || selected_market_.outcomes.isEmpty()) return;+ auto* a = active_adapter();+ if (!a) return;+int fidelity = 5;- if (interval == "1h" || interval == "6h")- fidelity = 1;- else if (interval == "1w")- fidelity = 30;- else if (interval == "1m" || interval == "max")- fidelity = 60;+ if (interval == "1h" || interval == "6h") fidelity = 1;+ else if (interval == "1w") fidelity = 30;+ else if (interval == "1m" || interval == "max") fidelity = 60;- PolymarketService::instance().fetch_price_history(selected_market_.clob_token_ids[0], interval, fidelity);+ a->fetch_price_history(selected_market_.outcomes.first().asset_id, interval, fidelity);}void PolymarketScreen::on_outcome_changed(int index) {- if (!has_selection_ || index >= selected_market_.clob_token_ids.size())- return;- PolymarketService::instance().fetch_price_history(selected_market_.clob_token_ids[index], "1d", 5);+ if (!has_selection_ || index < 0 || index >= selected_market_.outcomes.size()) return;+ if (auto* a = active_adapter())+ a->fetch_price_history(selected_market_.outcomes[index].asset_id, "1d", 5);}-void PolymarketScreen::on_related_market_clicked(const Market& market) {+void PolymarketScreen::on_related_market_clicked(const pred::PredictionMarket& market) {select_market(market);}// ── Data Loading ────────────────────────────────────────────────────────────void PolymarketScreen::load_current_view() {+ auto* a = active_adapter();+ if (!a) {+ LOG_WARN("PredictionMarkets", "load_current_view: no active adapter");+ return;+ }command_bar_->set_loading(true);browse_panel_->set_loading(true);++request_generation_;- auto& svc = PolymarketService::instance();+ const QString category = (active_category_ == "ALL") ? QString() : active_category_;if (active_view_ == "TRENDING") {- svc.fetch_markets("volume", 100, 0, false);+ a->list_markets(QString(), "volume", 100, 0);} else if (active_view_ == "MARKETS") {- if (active_category_ != "ALL") {- svc.fetch_markets_by_tag(active_category_, active_sort_, 100, 0);- } else {- svc.fetch_markets(active_sort_, 100, 0, false);- }+ a->list_markets(category, active_sort_, 100, 0);} else if (active_view_ == "EVENTS") {- svc.fetch_events(active_sort_, 100, 0, false);+ a->list_events(category, active_sort_, 100, 0);} else if (active_view_ == "SPORTS") {- svc.fetch_markets_by_tag("sports", active_sort_, 100, 0);+ a->list_markets(QStringLiteral("sports"), active_sort_, 100, 0);} else if (active_view_ == "RESOLVED") {- svc.fetch_events("endDate", 100, 0, true);+ // The adapter interface doesn't expose a closed-markets filter today —+ // fall back to the default list. Kalshi exposes this via event+ // status; that improvement can land with the API fix pass.+ a->list_events(category, QStringLiteral("endDate"), 100, 0);+ } else {+ a->list_markets(category, active_sort_, 100, 0);}}-void PolymarketScreen::select_market(const Market& market) {+void PolymarketScreen::select_market(const pred::PredictionMarket& market) {unsubscribe_current();-selected_market_ = market;has_selection_ = true;detail_panel_->set_market(market);- status_bar_->set_selected(market.question);+ if (status_bar_) status_bar_->set_selected(market.question);- auto& svc = PolymarketService::instance();+ auto* a = active_adapter();+ if (!a) return;- if (!market.clob_token_ids.isEmpty()) {- QString token = market.clob_token_ids[0];- svc.fetch_order_book(token);- svc.fetch_price_summary(token);- svc.fetch_price_history(token, "1d", 5);- }- if (!market.condition_id.isEmpty()) {- svc.fetch_trades(market.condition_id, 100);- svc.fetch_top_holders(market.condition_id, 20);- svc.fetch_open_interest({market.condition_id});- }- if (!market.slug.isEmpty()) {- svc.fetch_comments(market.slug, 50);+ if (!market.outcomes.isEmpty()) {+ const QString primary = market.outcomes.first().asset_id;+ a->fetch_order_book(primary);+ a->fetch_price_history(primary, "1d", 5);}- if (market.event_id > 0) {- svc.fetch_related_markets(market.event_id);+ a->fetch_recent_trades(market.key, 100);++ if (active_is_polymarket()) {+ // Polymarket-only enrichments. Kalshi exposes none of these today.+ auto& svc = pmx::PolymarketService::instance();+ if (!market.outcomes.isEmpty())+ svc.fetch_price_summary(market.outcomes.first().asset_id);+ const QString condition_id = market.key.market_id; // Polymarket: condition_id+ if (!condition_id.isEmpty()) {+ svc.fetch_top_holders(condition_id, 20);+ svc.fetch_open_interest({condition_id});+ }+ const QString slug = market.extras.value("slug").toString();+ if (!slug.isEmpty()) svc.fetch_comments(slug, 50);+ bool ok = false;+ const int event_id = market.key.event_id.toInt(&ok);+ if (ok && event_id > 0) svc.fetch_related_markets(event_id);}subscribe_to_market(market);}-void PolymarketScreen::subscribe_to_market(const Market& market) {- subscribed_tokens_ = market.clob_token_ids;- if (!subscribed_tokens_.isEmpty()) {- PolymarketWebSocket::instance().subscribe(subscribed_tokens_);+void PolymarketScreen::subscribe_to_market(const pred::PredictionMarket& market) {+ subscribed_asset_ids_.clear();+ subscribed_asset_ids_.reserve(market.outcomes.size());+ for (const auto& o : market.outcomes) {+ if (!o.asset_id.isEmpty()) subscribed_asset_ids_.push_back(o.asset_id);}+ if (subscribed_asset_ids_.isEmpty()) return;+ if (auto* a = active_adapter())+ a->subscribe_market(subscribed_asset_ids_);}void PolymarketScreen::unsubscribe_current() {- if (!subscribed_tokens_.isEmpty()) {- PolymarketWebSocket::instance().unsubscribe(subscribed_tokens_);- subscribed_tokens_.clear();- }+ if (subscribed_asset_ids_.isEmpty()) return;+ if (auto* a = active_adapter())+ a->unsubscribe_market(subscribed_asset_ids_);+ subscribed_asset_ids_.clear();}-// ── Service Response Handlers ───────────────────────────────────────────────+// ── Adapter response handlers ───────────────────────────────────────────────-void PolymarketScreen::on_markets_received(const QVector<Market>& markets) {+void PolymarketScreen::on_markets_ready(const QVector<pred::PredictionMarket>& markets) {command_bar_->set_loading(false);browse_panel_->set_markets(markets);command_bar_->set_market_count(markets.size());status_bar_->set_count(markets.size(), "markets");}-void PolymarketScreen::on_events_received(const QVector<Event>& events) {+void PolymarketScreen::on_events_ready(const QVector<pred::PredictionEvent>& events) {command_bar_->set_loading(false);browse_panel_->set_events(events);command_bar_->set_market_count(events.size());status_bar_->set_count(events.size(), "events");}-void PolymarketScreen::on_tags_received(const QVector<Tag>& tags) {- command_bar_->set_categories(tags);-}--void PolymarketScreen::on_order_book_received(const OrderBook& book) {- detail_panel_->set_order_book(book);-}--void PolymarketScreen::on_price_history_received(const PriceHistory& history) {- detail_panel_->set_price_history(history);-}--void PolymarketScreen::on_trades_received(const QVector<Trade>& trades) {- detail_panel_->set_trades(trades);+void PolymarketScreen::on_search_results_ready(const QVector<pred::PredictionMarket>& markets,+ const QVector<pred::PredictionEvent>& events) {+ command_bar_->set_loading(false);+ if (!markets.isEmpty()) {+ browse_panel_->set_markets(markets);+ command_bar_->set_market_count(markets.size());+ status_bar_->set_count(markets.size(), "markets");+ } else {+ browse_panel_->set_events(events);+ command_bar_->set_market_count(events.size());+ status_bar_->set_count(events.size(), "events");+ }}-void PolymarketScreen::on_price_summary_received(const PriceSummary& summary) {- detail_panel_->set_price_summary(summary);+void PolymarketScreen::on_tags_ready(const QStringList& tags) {+ command_bar_->set_categories(tags);}-void PolymarketScreen::on_top_holders_received(const QVector<TopHolder>& holders) {- detail_panel_->set_top_holders(holders);+void PolymarketScreen::on_order_book_ready(const pred::PredictionOrderBook& book) {+ if (detail_panel_) detail_panel_->set_order_book(book);}-void PolymarketScreen::on_leaderboard_received(const QVector<LeaderboardEntry>& entries) {- leaderboard_->set_entries(entries);+void PolymarketScreen::on_price_history_ready(const pred::PriceHistory& history) {+ if (detail_panel_) detail_panel_->set_price_history(history);}-void PolymarketScreen::on_comments_received(const QVector<Comment>& comments) {- detail_panel_->set_comments(comments);+void PolymarketScreen::on_trades_ready(const QVector<pred::PredictionTrade>& trades) {+ if (detail_panel_) detail_panel_->set_trades(trades);}-void PolymarketScreen::on_related_markets_received(const QVector<Market>& markets) {- detail_panel_->set_related_markets(markets);+void PolymarketScreen::on_leaderboard_ready(const QVariantList& /*entries*/) {+ // Leaderboard shape is exchange-specific and not modeled in prediction::+ // today. The legacy Polymarket leaderboard panel takes services::polymarket::+ // types, so when the active adapter is Polymarket we fetch through the+ // PolymarketService directly. Adapter-emitted QVariantList leaderboards+ // are ignored here until the panel is retyped.}-void PolymarketScreen::on_service_error(const QString& ctx, const QString& msg) {+void PolymarketScreen::on_adapter_error(const QString& ctx, const QString& msg) {command_bar_->set_loading(false);- LOG_ERROR("Polymarket", ctx + ": " + msg);+ LOG_WARN("PredictionMarkets", ctx + ": " + msg);+ if (status_bar_) status_bar_->set_selected(QString("%1: %2").arg(ctx, msg));}-// ── WebSocket Handlers ──────────────────────────────────────────────────────+// ── WebSocket handlers ──────────────────────────────────────────────────────void PolymarketScreen::on_ws_price_updated(const QString& asset_id, double price) {- // Update detail panel if this is our selected market- if (has_selection_) {- for (int i = 0; i < selected_market_.clob_token_ids.size(); ++i) {- if (selected_market_.clob_token_ids[i] == asset_id) {- if (i < selected_market_.outcomes.size()) {- selected_market_.outcomes[i].price = price;- detail_panel_->set_market(selected_market_);- }- break;- }+ if (!detail_panel_ || !has_selection_) return;+ for (int i = 0; i < selected_market_.outcomes.size(); ++i) {+ if (selected_market_.outcomes[i].asset_id == asset_id) {+ selected_market_.outcomes[i].price = price;+ detail_panel_->set_market(selected_market_);+ return;}}}-void PolymarketScreen::on_ws_orderbook_updated(const QString& /*asset_id*/, const OrderBook& book) {- detail_panel_->set_order_book(book);+void PolymarketScreen::on_ws_orderbook_updated(const QString& /*asset_id*/, const pred::PredictionOrderBook& book) {+ if (detail_panel_) detail_panel_->set_order_book(book);}-void PolymarketScreen::on_ws_status_changed(bool connected) {+void PolymarketScreen::on_ws_connection_changed(bool connected) {command_bar_->set_ws_status(connected);status_bar_->set_ws_status(connected);}-// ── IStatefulScreen ───────────────────────────────────────────────────────────+// ── Polymarket-only enrichment handlers ─────────────────────────────────────++void PolymarketScreen::on_price_summary_received(const pmx::PriceSummary& summary) {+ if (!active_is_polymarket() || !detail_panel_) return;+ detail_panel_->set_price_summary(summary);+}++void PolymarketScreen::on_top_holders_received(const QVector<pmx::TopHolder>& holders) {+ if (!active_is_polymarket() || !detail_panel_) return;+ detail_panel_->set_top_holders(holders);+}++void PolymarketScreen::on_comments_received(const QVector<pmx::Comment>& comments) {+ if (!active_is_polymarket() || !detail_panel_) return;+ detail_panel_->set_comments(comments);+}++void PolymarketScreen::on_related_markets_received(const QVector<pmx::Market>& markets) {+ if (!active_is_polymarket() || !detail_panel_) return;+ // Legacy polymarket::Market → prediction::PredictionMarket shim. The+ // detail panel only cares about question + volume for the related-market+ // cards, so we fill in the minimum.+ QVector<pred::PredictionMarket> out;+ out.reserve(markets.size());+ for (const auto& m : markets) {+ pred::PredictionMarket pm;+ pm.key.exchange_id = kPolymarketId();+ pm.key.market_id = m.condition_id;+ pm.question = m.question;+ pm.volume = m.volume;+ pm.liquidity = m.liquidity;+ pm.active = m.active;+ pm.closed = m.closed;+ for (const auto& o : m.outcomes) {+ pred::Outcome po;+ po.name = o.name;+ po.price = o.price;+ pm.outcomes.push_back(po);+ }+ // Map clob_token_ids into outcomes so the user can click through+ // and drive select_market() with a full asset_id list.+ for (int i = 0; i < m.clob_token_ids.size() && i < pm.outcomes.size(); ++i)+ pm.outcomes[i].asset_id = m.clob_token_ids[i];+ pm.extras["slug"] = m.slug;+ pm.key.event_id = QString::number(m.event_id);+ out.push_back(pm);+ }+ detail_panel_->set_related_markets(out);+}++// ── IStatefulScreen ─────────────────────────────────────────────────────────QVariantMap PolymarketScreen::save_state() const {return {diff --git a/fincept-qt/src/screens/polymarket/PolymarketScreen.h b/fincept-qt/src/screens/polymarket/PolymarketScreen.hindex 98e9002ea..391329cfc 100644--- a/fincept-qt/src/screens/polymarket/PolymarketScreen.h+++ b/fincept-qt/src/screens/polymarket/PolymarketScreen.h@@ -1,8 +1,12 @@#pragma once#include "screens/IStatefulScreen.h"+#include "screens/polymarket/ExchangePresentation.h"#include "services/polymarket/PolymarketTypes.h"+#include "services/prediction/PredictionTypes.h"+#include <QList>+#include <QMetaObject>#include <QTimer>#include <QWidget>@@ -16,10 +20,24 @@ class PolymarketLeaderboard;class PolymarketStatusBar;} // namespace fincept::screens::polymarket+namespace fincept::services::prediction {+class PredictionExchangeAdapter;+}+namespace fincept::screens {-/// Production-grade Polymarket Prediction Markets screen.-/// Thin coordinator owning 5 sub-widget panels, wiring service + WebSocket.+/// Production-grade Prediction Markets screen.+///+/// Thin coordinator owning 5 sub-widget panels. Data flows through the+/// active prediction::PredictionExchangeAdapter (Polymarket or Kalshi),+/// resolved via PredictionExchangeRegistry. Switching the exchange in the+/// command bar drops current adapter connections, clears the UI, and+/// reloads the view from the new adapter — no legacy-service coupling.+///+/// Polymarket-only enrichments (price summary, top holders, comments,+/// related markets, open interest) are fetched directly from the+/// PolymarketService singleton when the active exchange is Polymarket.+/// On Kalshi, those detail-panel tabs are hidden.class PolymarketScreen : public QWidget, public fincept::screens::IStatefulScreen {Q_OBJECTpublic:@@ -42,44 +60,53 @@ class PolymarketScreen : public QWidget, public fincept::screens::IStatefulScreevoid on_search_submitted(const QString& query);void on_sort_changed(const QString& sort_by);void on_refresh();+ void on_exchange_changed(const QString& exchange_id);// Browse panel- void on_market_selected(const services::polymarket::Market& market);- void on_event_selected(const services::polymarket::Event& event);+ void on_market_selected(const fincept::services::prediction::PredictionMarket& market);+ void on_event_selected(const fincept::services::prediction::PredictionEvent& event);// Detail panelvoid on_interval_changed(const QString& interval);void on_outcome_changed(int index);- void on_related_market_clicked(const services::polymarket::Market& market);-- // Service responses- void on_markets_received(const QVector<services::polymarket::Market>& markets);- void on_events_received(const QVector<services::polymarket::Event>& events);- void on_tags_received(const QVector<services::polymarket::Tag>& tags);- void on_order_book_received(const services::polymarket::OrderBook& book);- void on_price_history_received(const services::polymarket::PriceHistory& history);- void on_trades_received(const QVector<services::polymarket::Trade>& trades);- void on_price_summary_received(const services::polymarket::PriceSummary& summary);- void on_top_holders_received(const QVector<services::polymarket::TopHolder>& holders);- void on_leaderboard_received(const QVector<services::polymarket::LeaderboardEntry>& entries);- void on_comments_received(const QVector<services::polymarket::Comment>& comments);- void on_related_markets_received(const QVector<services::polymarket::Market>& markets);- void on_service_error(const QString& ctx, const QString& msg);-- // WebSocket+ void on_related_market_clicked(const fincept::services::prediction::PredictionMarket& market);++ // Adapter (unified) responses+ void on_markets_ready(const QVector<fincept::services::prediction::PredictionMarket>& markets);+ void on_events_ready(const QVector<fincept::services::prediction::PredictionEvent>& events);+ void on_search_results_ready(const QVector<fincept::services::prediction::PredictionMarket>& markets,+ const QVector<fincept::services::prediction::PredictionEvent>& events);+ void on_tags_ready(const QStringList& tags);+ void on_order_book_ready(const fincept::services::prediction::PredictionOrderBook& book);+ void on_price_history_ready(const fincept::services::prediction::PriceHistory& history);+ void on_trades_ready(const QVector<fincept::services::prediction::PredictionTrade>& trades);+ void on_leaderboard_ready(const QVariantList& entries);+ void on_adapter_error(const QString& ctx, const QString& msg);void on_ws_price_updated(const QString& asset_id, double price);- void on_ws_orderbook_updated(const QString& asset_id, const services::polymarket::OrderBook& book);- void on_ws_status_changed(bool connected);+ void on_ws_orderbook_updated(const QString& asset_id,+ const fincept::services::prediction::PredictionOrderBook& book);+ void on_ws_connection_changed(bool connected);++ // Polymarket-only (PolymarketService) enrichments+ void on_price_summary_received(const fincept::services::polymarket::PriceSummary& summary);+ void on_top_holders_received(const QVector<fincept::services::polymarket::TopHolder>& holders);+ void on_comments_received(const QVector<fincept::services::polymarket::Comment>& comments);+ void on_related_markets_received(const QVector<fincept::services::polymarket::Market>& markets);private:void build_ui();- void connect_service();- void connect_websocket();+ void connect_active_adapter();+ void disconnect_active_adapter();+ void connect_polymarket_extras();+ void install_presentation(const screens::polymarket::ExchangePresentation& p);void load_current_view();- void select_market(const services::polymarket::Market& market);- void subscribe_to_market(const services::polymarket::Market& market);+ void select_market(const fincept::services::prediction::PredictionMarket& market);+ void subscribe_to_market(const fincept::services::prediction::PredictionMarket& market);void unsubscribe_current();+ bool active_is_polymarket() const;+ fincept::services::prediction::PredictionExchangeAdapter* active_adapter() const;+// Sub-widgetspolymarket::PolymarketCommandBar* command_bar_ = nullptr;polymarket::PolymarketBrowsePanel* browse_panel_ = nullptr;@@ -91,7 +118,7 @@ class PolymarketScreen : public QWidget, public fincept::screens::IStatefulScreeQString active_view_ = "MARKETS";QString active_category_ = "ALL";QString active_sort_ = "volume";- services::polymarket::Market selected_market_;+ fincept::services::prediction::PredictionMarket selected_market_;bool has_selection_ = false;bool first_show_ = true;std::atomic<int> request_generation_{0};@@ -100,7 +127,15 @@ class PolymarketScreen : public QWidget, public fincept::screens::IStatefulScreeQTimer* refresh_timer_ = nullptr;// WS tracking- QStringList subscribed_tokens_;+ QStringList subscribed_asset_ids_;++ // Per-adapter Qt connections, dropped whenever the active exchange+ // changes so the next adapter's signals don't clash with the previous+ // one's. Polymarket-only enrichment connections live separately because+ // they target the PolymarketService singleton (not the active adapter).+ QList<QMetaObject::Connection> adapter_connections_;+ QList<QMetaObject::Connection> polymarket_extras_connections_;+ QString wired_adapter_id_;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/polymarket/PredictionAccountDialog.cpp b/fincept-qt/src/screens/polymarket/PredictionAccountDialog.cppnew file mode 100644index 000000000..9fd12d8ca--- /dev/null+++ b/fincept-qt/src/screens/polymarket/PredictionAccountDialog.cpp@@ -0,0 +1,319 @@+#include "screens/polymarket/PredictionAccountDialog.h"++#include "core/logging/Logger.h"+#include "services/prediction/PredictionCredentialStore.h"+#include "services/prediction/kalshi/KalshiCredentials.h"++#include <QCheckBox>+#include <QComboBox>+#include <QFile>+#include <QFileDialog>+#include <QFileInfo>+#include <QFont>+#include <QFormLayout>+#include <QHBoxLayout>+#include <QLabel>+#include <QLineEdit>+#include <QMessageBox>+#include <QPushButton>+#include <QTabWidget>+#include <QTextEdit>+#include <QVBoxLayout>++namespace fincept::screens::polymarket {++namespace pr = fincept::services::prediction;+namespace ks = fincept::services::prediction::kalshi_ns;++// ── Construction ────────────────────────────────────────────────────────────++PredictionAccountDialog::PredictionAccountDialog(QWidget* parent) : QDialog(parent) {+ setWindowTitle(tr("Prediction Markets — Connect Account"));+ setModal(true);+ resize(640, 520);+ build_ui();+ load_existing();+}++void PredictionAccountDialog::set_active_exchange(const QString& exchange_id) {+ if (!tabs_) return;+ if (exchange_id == QStringLiteral("kalshi")) tabs_->setCurrentIndex(1);+ else tabs_->setCurrentIndex(0);+}++// ── UI ──────────────────────────────────────────────────────────────────────++void PredictionAccountDialog::build_ui() {+ auto* root = new QVBoxLayout(this);+ tabs_ = new QTabWidget(this);+ root->addWidget(tabs_);+ build_polymarket_tab();+ build_kalshi_tab();++ auto* bottom = new QHBoxLayout;+ bottom->addStretch(1);+ auto* close_btn = new QPushButton(tr("Close"), this);+ connect(close_btn, &QPushButton::clicked, this, &QDialog::accept);+ bottom->addWidget(close_btn);+ root->addLayout(bottom);+}++void PredictionAccountDialog::build_polymarket_tab() {+ auto* page = new QWidget(this);+ auto* vl = new QVBoxLayout(page);++ auto* intro = new QLabel(+ tr("<b>Polymarket (Polygon)</b><br>"+ "Trading requires a Polygon-compatible private key. The key is signed locally "+ "via <code>py_clob_client</code> and never leaves your machine in plaintext — "+ "it is stored encrypted in your OS credential manager.<br><br>"+ "<b>⚠ Security:</b> use a dedicated funding wallet, not your primary wallet."),+ page);+ intro->setWordWrap(true);+ vl->addWidget(intro);++ auto* form = new QFormLayout;++ pm_private_key_ = new QLineEdit(page);+ pm_private_key_->setEchoMode(QLineEdit::Password);+ pm_private_key_->setPlaceholderText(tr("0x… (64 hex chars)"));+ form->addRow(tr("Private Key:"), pm_private_key_);++ pm_funder_ = new QLineEdit(page);+ pm_funder_->setPlaceholderText(tr("0x… (optional — derived via CREATE2 for proxy)"));+ form->addRow(tr("Funder Address:"), pm_funder_);++ pm_signature_type_ = new QComboBox(page);+ pm_signature_type_->addItem(tr("Polymarket Proxy Wallet (default)"), 1);+ pm_signature_type_->addItem(tr("Externally Owned Account (EOA)"), 0);+ pm_signature_type_->addItem(tr("Polymarket Gnosis Safe"), 2);+ form->addRow(tr("Signature Type:"), pm_signature_type_);++ pm_derived_status_ = new QLabel(tr("L2 API credentials: not derived"), page);+ pm_derived_status_->setStyleSheet("color: #9ca3af;");+ form->addRow(QString(), pm_derived_status_);++ vl->addLayout(form);++ pm_status_ = new QLabel(page);+ pm_status_->setWordWrap(true);+ vl->addWidget(pm_status_);++ auto* btns = new QHBoxLayout;+ pm_save_btn_ = new QPushButton(tr("Save"), page);+ pm_test_btn_ = new QPushButton(tr("Test Connection"), page);+ pm_clear_btn_ = new QPushButton(tr("Clear"), page);+ btns->addWidget(pm_save_btn_);+ btns->addWidget(pm_test_btn_);+ btns->addStretch(1);+ btns->addWidget(pm_clear_btn_);+ vl->addLayout(btns);++ connect(pm_save_btn_, &QPushButton::clicked, this, &PredictionAccountDialog::on_save_polymarket);+ connect(pm_clear_btn_, &QPushButton::clicked, this, &PredictionAccountDialog::on_clear_polymarket);+ connect(pm_test_btn_, &QPushButton::clicked, this, [this]() {+ emit test_requested(QStringLiteral("polymarket"));+ });++ vl->addStretch(1);+ tabs_->addTab(page, tr("Polymarket"));+}++void PredictionAccountDialog::build_kalshi_tab() {+ auto* page = new QWidget(this);+ auto* vl = new QVBoxLayout(page);++ auto* intro = new QLabel(+ tr("<b>Kalshi (CFTC-regulated)</b><br>"+ "Generate an API key + RSA private key in your Kalshi dashboard "+ "(<code>api.elections.kalshi.com</code>). Requests are signed with RSA-PSS "+ "(key stays local, encrypted in your OS credential manager).<br><br>"+ "Use <b>Demo mode</b> to target <code>demo-api.kalshi.co</code> for testing."),+ page);+ intro->setWordWrap(true);+ vl->addWidget(intro);++ auto* form = new QFormLayout;++ ks_api_key_id_ = new QLineEdit(page);+ ks_api_key_id_->setPlaceholderText(tr("00000000-0000-0000-0000-000000000000"));+ form->addRow(tr("API Key ID:"), ks_api_key_id_);++ ks_private_key_pem_ = new QTextEdit(page);+ ks_private_key_pem_->setPlaceholderText(+ tr("-----BEGIN RSA PRIVATE KEY-----\n…paste PEM contents here…\n-----END RSA PRIVATE KEY-----"));+ ks_private_key_pem_->setFont(QFont("Courier New", 9));+ ks_private_key_pem_->setFixedHeight(160);+ form->addRow(tr("Private Key (PEM):"), ks_private_key_pem_);++ ks_load_pem_btn_ = new QPushButton(tr("Load from file…"), page);+ form->addRow(QString(), ks_load_pem_btn_);++ ks_use_demo_ = new QCheckBox(tr("Use demo (paper trading) environment"), page);+ form->addRow(QString(), ks_use_demo_);++ vl->addLayout(form);++ ks_status_ = new QLabel(page);+ ks_status_->setWordWrap(true);+ vl->addWidget(ks_status_);++ auto* btns = new QHBoxLayout;+ ks_save_btn_ = new QPushButton(tr("Save"), page);+ ks_test_btn_ = new QPushButton(tr("Test Connection"), page);+ ks_clear_btn_ = new QPushButton(tr("Clear"), page);+ btns->addWidget(ks_save_btn_);+ btns->addWidget(ks_test_btn_);+ btns->addStretch(1);+ btns->addWidget(ks_clear_btn_);+ vl->addLayout(btns);++ connect(ks_save_btn_, &QPushButton::clicked, this, &PredictionAccountDialog::on_save_kalshi);+ connect(ks_clear_btn_, &QPushButton::clicked, this, &PredictionAccountDialog::on_clear_kalshi);+ connect(ks_load_pem_btn_, &QPushButton::clicked, this, &PredictionAccountDialog::on_load_kalshi_pem);+ connect(ks_test_btn_, &QPushButton::clicked, this, [this]() {+ emit test_requested(QStringLiteral("kalshi"));+ });++ vl->addStretch(1);+ tabs_->addTab(page, tr("Kalshi"));+}++void PredictionAccountDialog::load_existing() {+ if (auto pm = pr::PredictionCredentialStore::load_polymarket()) {+ pm_private_key_->setText(pm->private_key);+ pm_funder_->setText(pm->funder_address);+ const int idx = pm_signature_type_->findData(pm->signature_type);+ if (idx >= 0) pm_signature_type_->setCurrentIndex(idx);+ if (!pm->api_key.isEmpty()) {+ pm_derived_status_->setText(+ tr("L2 API credentials: derived (%1…)").arg(pm->api_key.left(8)));+ pm_derived_status_->setStyleSheet("color: #16a34a;");+ }+ pm_status_->setText(tr("Polymarket credentials loaded from secure store."));+ }+ if (auto ks_creds = pr::PredictionCredentialStore::load_kalshi()) {+ ks_api_key_id_->setText(ks_creds->api_key_id);+ ks_private_key_pem_->setPlainText(ks_creds->private_key_pem);+ ks_use_demo_->setChecked(ks_creds->use_demo);+ ks_status_->setText(tr("Kalshi credentials loaded from secure store."));+ }+}++// ── Polymarket save/clear ───────────────────────────────────────────────────++void PredictionAccountDialog::on_save_polymarket() {+ pr::PolymarketCredentials c;+ c.private_key = pm_private_key_->text().trimmed();+ c.funder_address = pm_funder_->text().trimmed();+ c.signature_type = pm_signature_type_->currentData().toInt();++ if (c.private_key.isEmpty()) {+ pm_status_->setText(tr("<span style='color:#dc2626'>Private key is required.</span>"));+ return;+ }+ if (!c.private_key.startsWith(QStringLiteral("0x"))) {+ c.private_key.prepend(QStringLiteral("0x"));+ }+ if (c.private_key.size() != 66) {+ pm_status_->setText(tr(+ "<span style='color:#dc2626'>Private key should be 0x + 64 hex chars.</span>"));+ return;+ }++ // Preserve already-derived L2 creds if present.+ if (auto existing = pr::PredictionCredentialStore::load_polymarket()) {+ if (existing->private_key == c.private_key) {+ c.api_key = existing->api_key;+ c.api_secret = existing->api_secret;+ c.api_passphrase = existing->api_passphrase;+ }+ }++ if (pr::PredictionCredentialStore::save_polymarket(c)) {+ pm_status_->setText(tr("<span style='color:#16a34a'>Polymarket credentials saved.</span>"));+ emit credentials_saved(QStringLiteral("polymarket"));+ } else {+ pm_status_->setText(tr("<span style='color:#dc2626'>Save failed — see logs.</span>"));+ }+}++void PredictionAccountDialog::on_clear_polymarket() {+ if (QMessageBox::question(this, tr("Clear Polymarket credentials?"),+ tr("This removes your stored Polymarket private key and API "+ "credentials from this machine. You will need to re-enter "+ "them to resume trading.")) != QMessageBox::Yes) {+ return;+ }+ pr::PredictionCredentialStore::clear_polymarket();+ pm_private_key_->clear();+ pm_funder_->clear();+ pm_derived_status_->setText(tr("L2 API credentials: not derived"));+ pm_derived_status_->setStyleSheet("color: #9ca3af;");+ pm_status_->setText(tr("Polymarket credentials cleared."));+ emit credentials_saved(QStringLiteral("polymarket"));+}++// ── Kalshi save/clear/load PEM ──────────────────────────────────────────────++void PredictionAccountDialog::on_save_kalshi() {+ ks::KalshiCredentials c;+ c.api_key_id = ks_api_key_id_->text().trimmed();+ c.private_key_pem = ks_private_key_pem_->toPlainText().trimmed();+ c.use_demo = ks_use_demo_->isChecked();++ if (c.api_key_id.isEmpty() || c.private_key_pem.isEmpty()) {+ ks_status_->setText(tr(+ "<span style='color:#dc2626'>Both API Key ID and PEM private key are required.</span>"));+ return;+ }+ if (!c.private_key_pem.contains(QStringLiteral("BEGIN"))) {+ ks_status_->setText(tr(+ "<span style='color:#dc2626'>Private key must be a PEM-encoded RSA key.</span>"));+ return;+ }++ if (pr::PredictionCredentialStore::save_kalshi(c)) {+ ks_status_->setText(tr("<span style='color:#16a34a'>Kalshi credentials saved.</span>"));+ emit credentials_saved(QStringLiteral("kalshi"));+ } else {+ ks_status_->setText(tr("<span style='color:#dc2626'>Save failed — see logs.</span>"));+ }+}++void PredictionAccountDialog::on_clear_kalshi() {+ if (QMessageBox::question(this, tr("Clear Kalshi credentials?"),+ tr("This removes your stored Kalshi API key and RSA private key "+ "from this machine.")) != QMessageBox::Yes) {+ return;+ }+ pr::PredictionCredentialStore::clear_kalshi();+ ks_api_key_id_->clear();+ ks_private_key_pem_->clear();+ ks_use_demo_->setChecked(false);+ ks_status_->setText(tr("Kalshi credentials cleared."));+ emit credentials_saved(QStringLiteral("kalshi"));+}++void PredictionAccountDialog::on_load_kalshi_pem() {+ const QString path = QFileDialog::getOpenFileName(+ this, tr("Select Kalshi private key (PEM)"), QString(),+ tr("PEM files (*.pem *.key);;All files (*)"));+ if (path.isEmpty()) return;++ QFile f(path);+ if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) {+ ks_status_->setText(tr("<span style='color:#dc2626'>Could not read %1.</span>").arg(path));+ return;+ }+ const QString content = QString::fromUtf8(f.readAll());+ if (!content.contains(QStringLiteral("BEGIN"))) {+ ks_status_->setText(tr(+ "<span style='color:#dc2626'>%1 does not look like a PEM file.</span>").arg(path));+ return;+ }+ ks_private_key_pem_->setPlainText(content.trimmed());+ ks_status_->setText(tr("Loaded PEM from %1.").arg(QFileInfo(path).fileName()));+}++} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/polymarket/PredictionAccountDialog.h b/fincept-qt/src/screens/polymarket/PredictionAccountDialog.hnew file mode 100644index 000000000..5174ab403--- /dev/null+++ b/fincept-qt/src/screens/polymarket/PredictionAccountDialog.h@@ -0,0 +1,77 @@+#pragma once++#include "services/prediction/PredictionCredentialStore.h"++#include <QDialog>++class QCheckBox;+class QComboBox;+class QLabel;+class QLineEdit;+class QPushButton;+class QStackedWidget;+class QTabWidget;+class QTextEdit;++namespace fincept::screens::polymarket {++/// Credential setup dialog for the Prediction Markets tab.+///+/// Two tabs — one per supported exchange — each with the provider-specific+/// credential fields. "Save" writes to SecureStorage via+/// PredictionCredentialStore; "Clear" removes the stored entry; "Test+/// Connection" is a Phase 6/7 hook (emits test_requested() so the caller+/// can invoke the relevant adapter's fetch_balance()).+class PredictionAccountDialog : public QDialog {+ Q_OBJECT+ public:+ explicit PredictionAccountDialog(QWidget* parent = nullptr);++ /// Select which tab is shown initially.+ void set_active_exchange(const QString& exchange_id);++ signals:+ /// Emitted after the user clicks Save and credentials are persisted.+ /// `exchange_id` is "polymarket" or "kalshi". Screens should reload+ /// their adapter's credentials in response.+ void credentials_saved(const QString& exchange_id);+ /// User clicked Test Connection for the given exchange.+ void test_requested(const QString& exchange_id);++ private slots:+ void on_save_polymarket();+ void on_clear_polymarket();+ void on_save_kalshi();+ void on_clear_kalshi();+ void on_load_kalshi_pem();++ private:+ void build_ui();+ void build_polymarket_tab();+ void build_kalshi_tab();+ void load_existing();++ QTabWidget* tabs_ = nullptr;++ // Polymarket tab+ QLineEdit* pm_private_key_ = nullptr;+ QLineEdit* pm_funder_ = nullptr;+ QComboBox* pm_signature_type_ = nullptr;+ QLabel* pm_derived_status_ = nullptr;+ QLabel* pm_status_ = nullptr;+ QPushButton* pm_save_btn_ = nullptr;+ QPushButton* pm_test_btn_ = nullptr;+ QPushButton* pm_clear_btn_ = nullptr;++ // Kalshi tab+ QLineEdit* ks_api_key_id_ = nullptr;+ QTextEdit* ks_private_key_pem_ = nullptr;+ QPushButton* ks_load_pem_btn_ = nullptr;+ QCheckBox* ks_use_demo_ = nullptr;+ QLabel* ks_status_ = nullptr;+ QPushButton* ks_save_btn_ = nullptr;+ QPushButton* ks_test_btn_ = nullptr;+ QPushButton* ks_clear_btn_ = nullptr;+};++} // namespace fincept::screens::polymarketdiff --git a/fincept-qt/src/screens/profile/ProfileScreen.cpp b/fincept-qt/src/screens/profile/ProfileScreen.cppindex 1e41cbeba..914a57bcc 100644--- a/fincept-qt/src/screens/profile/ProfileScreen.cpp+++ b/fincept-qt/src/screens/profile/ProfileScreen.cpp@@ -259,6 +259,15 @@ QWidget* ProfileScreen::build_overview() {.arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY()));connect(lb, &QPushButton::clicked, this, &ProfileScreen::show_logout_confirm);arl->addWidget(lb);+ auto* dab = new QPushButton("DELETE ACCOUNT");+ dab->setFixedHeight(26);+ dab->setStyleSheet(+ QString("QPushButton{background:rgba(220,38,38,0.15);color:%1;border:1px solid #7f1d1d;padding:0 12px;"+ "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{background:%1;"+ "color:%2;}")+ .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY()));+ connect(dab, &QPushButton::clicked, this, &ProfileScreen::show_delete_account_dialog);+ arl->addWidget(dab);arl->addStretch();act_vl->addWidget(ar);grid->addWidget(actions, 1, 0, 1, 2);@@ -762,4 +771,83 @@ void ProfileScreen::show_regen_confirm() {}}+void ProfileScreen::show_delete_account_dialog() {+ const auto& s = auth::AuthManager::instance().session();+ const QString email = s.user_info.email;++ // First confirmation+ auto first = QMessageBox::warning(+ this, "Delete Account",+ QString("This will permanently delete your Fincept account (%1) and all associated data.\n\n"+ "This action CANNOT be undone. Are you sure?").arg(email),+ QMessageBox::Yes | QMessageBox::No, QMessageBox::No);+ if (first != QMessageBox::Yes)+ return;++ // Second confirmation — type email to confirm+ auto* dlg = new QDialog(this);+ dlg->setWindowTitle("Confirm Account Deletion");+ dlg->setFixedSize(400, 200);+ dlg->setStyleSheet(QString("background:%1;color:%2;font-family:'Consolas',monospace;")+ .arg(ui::colors::BG_SURFACE(), ui::colors::TEXT_PRIMARY()));+ auto* vl = new QVBoxLayout(dlg);+ vl->setContentsMargins(20, 16, 20, 16);+ vl->setSpacing(10);++ auto* warn = new QLabel("TYPE YOUR EMAIL ADDRESS TO CONFIRM:");+ warn->setStyleSheet(QString("color:%1;font-size:11px;font-weight:700;background:transparent;").arg(ui::colors::NEGATIVE()));+ vl->addWidget(warn);++ auto* hint = new QLabel(email);+ hint->setStyleSheet(QString("color:%1;font-size:11px;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));+ vl->addWidget(hint);++ auto* input = new QLineEdit;+ input->setFixedHeight(28);+ input->setPlaceholderText(email);+ vl->addWidget(input);++ auto* brl = new QHBoxLayout;+ brl->addStretch();+ auto* cancel = new QPushButton("CANCEL");+ cancel->setFixedHeight(26);+ connect(cancel, &QPushButton::clicked, dlg, &QDialog::reject);+ brl->addWidget(cancel);++ auto* confirm = new QPushButton("DELETE MY ACCOUNT");+ confirm->setFixedHeight(26);+ confirm->setEnabled(false);+ confirm->setStyleSheet(+ QString("QPushButton{background:%1;color:%2;border:none;padding:0 14px;"+ "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}"+ "QPushButton:disabled{background:#3f1515;color:#7f3333;}")+ .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY()));+ connect(input, &QLineEdit::textChanged, this, [confirm, email](const QString& text) {+ confirm->setEnabled(text.trimmed() == email);+ });++ QPointer<ProfileScreen> self = this;+ QPointer<QDialog> dlg_ptr = dlg;+ connect(confirm, &QPushButton::clicked, this, [self, dlg_ptr]() {+ if (!self) return;+ if (dlg_ptr) dlg_ptr->accept();+ auth::UserApi::instance().delete_user_account([self](auth::ApiResponse r) {+ if (!self) return;+ if (r.success) {+ LOG_INFO("Profile", "Account deleted successfully");+ auth::AuthManager::instance().logout();+ } else {+ LOG_ERROR("Profile", "Account deletion failed: " + r.error);+ QMessageBox::critical(self, "Delete Failed",+ "Account deletion failed: " + r.error + "\n\nPlease contact [email protected]");+ }+ });+ });+ brl->addWidget(confirm);+ vl->addLayout(brl);++ dlg->exec();+ dlg->deleteLater();+}+} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/profile/ProfileScreen.h b/fincept-qt/src/screens/profile/ProfileScreen.hindex e35cd1987..3f264b949 100644--- a/fincept-qt/src/screens/profile/ProfileScreen.h+++ b/fincept-qt/src/screens/profile/ProfileScreen.h@@ -84,6 +84,7 @@ class ProfileScreen : public QWidget {void show_edit_profile_dialog();void show_logout_confirm();void show_regen_confirm();+ void show_delete_account_dialog();private slots:void on_section_changed(int index);diff --git a/fincept-qt/src/services/polymarket/PolymarketService.cpp b/fincept-qt/src/services/polymarket/PolymarketService.cppindex a5ae54077..2d869d00d 100644--- a/fincept-qt/src/services/polymarket/PolymarketService.cpp+++ b/fincept-qt/src/services/polymarket/PolymarketService.cpp@@ -32,6 +32,14 @@ static QJsonArray parse_json_arr(const QJsonValue& val) {return {};}+// CLOB API returns numeric prices/sizes as JSON strings, while Gamma/Data+// generally return real numbers. This helper accepts either form.+static double num_or_str(const QJsonValue& v) {+ if (v.isString())+ return v.toString().toDouble();+ return v.toDouble();+}+// ── Existing type parsing ───────────────────────────────────────────────────Market Market::from_json(const QJsonObject& obj) {@@ -111,17 +119,19 @@ OrderBook OrderBook::from_json(const QJsonObject& obj) {OrderBook book;book.market = obj["market"].toString();book.asset_id = obj["asset_id"].toString();- book.tick_size = obj["tick_size"].toDouble();- book.min_order_size = obj["min_order_size"].toDouble();+ // CLOB returns tick_size and min_order_size as strings (e.g. "0.01").+ book.tick_size = num_or_str(obj["tick_size"]);+ book.min_order_size = num_or_str(obj["min_order_size"]);book.neg_risk = obj["neg_risk"].toBool();+ // Bid/ask price + size are JSON strings on CLOB — coerce both forms.for (const auto& b : obj["bids"].toArray()) {auto bo = b.toObject();- book.bids.append({bo["price"].toDouble(), bo["size"].toDouble()});+ book.bids.append({num_or_str(bo["price"]), num_or_str(bo["size"])});}for (const auto& a : obj["asks"].toArray()) {auto ao = a.toObject();- book.asks.append({ao["price"].toDouble(), ao["size"].toDouble()});+ book.asks.append({num_or_str(ao["price"]), num_or_str(ao["size"])});}return book;}@@ -157,10 +167,16 @@ TopHolder TopHolder::from_json(const QJsonObject& obj) {h.address = obj["proxyWallet"].toString();if (h.address.isEmpty())h.address = obj["address"].toString();+ // Data API returns `pseudonym`/`name`; prefer the displayable one.h.display_name = obj["name"].toString();+ if (h.display_name.isEmpty())+ h.display_name = obj["pseudonym"].toString();if (h.display_name.isEmpty() && !h.address.isEmpty())h.display_name = h.address.left(6) + "..." + h.address.right(4);- h.position_size = obj["size"].toDouble();+ // /holders returns `amount` (token balance). `size` is a legacy fallback.+ h.position_size = obj["amount"].toDouble();+ if (h.position_size == 0.0)+ h.position_size = obj["size"].toDouble();h.entry_price = obj["avgPrice"].toDouble();h.rank = obj["rank"].toInt();return h;@@ -168,10 +184,13 @@ TopHolder TopHolder::from_json(const QJsonObject& obj) {LeaderboardEntry LeaderboardEntry::from_json(const QJsonObject& obj) {LeaderboardEntry e;- e.address = obj["address"].toString();+ // /v1/leaderboard returns proxyWallet + userName; fall back to legacy keys.+ e.address = obj["proxyWallet"].toString();if (e.address.isEmpty())- e.address = obj["proxyWallet"].toString();- e.display_name = obj["name"].toString();+ e.address = obj["address"].toString();+ e.display_name = obj["userName"].toString();+ if (e.display_name.isEmpty())+ e.display_name = obj["name"].toString();if (e.display_name.isEmpty())e.display_name = obj["pseudonym"].toString();if (e.display_name.isEmpty() && !e.address.isEmpty())@@ -180,7 +199,10 @@ LeaderboardEntry LeaderboardEntry::from_json(const QJsonObject& obj) {e.pnl = obj["pnl"].toDouble();if (e.pnl == 0)e.pnl = obj["cashPnl"].toDouble();- e.volume = obj["volume"].toDouble();+ // /v1/leaderboard uses `vol`; legacy `volume` retained for safety.+ e.volume = obj["vol"].toDouble();+ if (e.volume == 0)+ e.volume = obj["volume"].toDouble();e.num_trades = obj["numTrades"].toInt();e.rank = obj["rank"].toInt();return e;@@ -636,7 +658,8 @@ void PolymarketService::fetch_price_summary(const QString& token_id) {get_clob("/midpoint?token_id=" + token_id,[acc, maybe_emit](const QJsonDocument& doc) {- acc->summary.midpoint = doc.object()["mid"].toDouble();+ // CLOB returns { "mid_price": "0.52" } as a string.+ acc->summary.midpoint = num_or_str(doc.object()["mid_price"]);maybe_emit();},"Midpoint");@@ -644,7 +667,7 @@ void PolymarketService::fetch_price_summary(const QString& token_id) {get_clob("/spread?token_id=" + token_id,[acc, maybe_emit](const QJsonDocument& doc) {- acc->summary.spread = doc.object()["spread"].toDouble();+ acc->summary.spread = num_or_str(doc.object()["spread"]);maybe_emit();},"Spread");@@ -652,7 +675,7 @@ void PolymarketService::fetch_price_summary(const QString& token_id) {get_clob("/last-trade-price?token_id=" + token_id,[acc, maybe_emit](const QJsonDocument& doc) {- acc->summary.last_trade_price = doc.object()["price"].toDouble();+ acc->summary.last_trade_price = num_or_str(doc.object()["price"]);maybe_emit();},"LastTradePrice");@@ -678,22 +701,26 @@ void PolymarketService::fetch_trades(const QString& condition_id, int limit) {}void PolymarketService::fetch_top_holders(const QString& condition_id, int limit) {- QString path = "/top-holders?market=" + condition_id + "&limit=" + QString::number(limit);+ // Data API caps `limit` at 20 for /holders.+ const int capped = qBound(1, limit, 20);+ QString path = "/holders?market=" + condition_id + "&limit=" + QString::number(capped);get_data(path,[this](const QJsonDocument& doc) {QVector<TopHolder> result;- QJsonArray arr = doc.isArray() ? doc.array() : QJsonArray();- // Some endpoints wrap in data object- if (arr.isEmpty() && doc.isObject() && doc.object().contains("data"))- arr = doc.object()["data"].toArray();- int rank = 1;- for (const auto& v : arr) {- auto h = TopHolder::from_json(v.toObject());- if (h.rank == 0)- h.rank = rank++;- result.append(h);+ // Response shape: [{ token, holders:[ { proxyWallet, amount, ... } ] }, ...]+ // One entry per asset/outcome (YES/NO). Flatten and rank by amount.+ QJsonArray top = doc.isArray() ? doc.array() : QJsonArray();+ for (const auto& bucket : top) {+ auto holders_arr = bucket.toObject().value("holders").toArray();+ int rank = 1;+ for (const auto& v : holders_arr) {+ auto h = TopHolder::from_json(v.toObject());+ if (h.rank == 0)+ h.rank = rank++;+ result.append(h);+ }}LOG_INFO("Polymarket", "Fetched " + QString::number(result.size()) + " top holders");emit top_holders_ready(result);@@ -718,7 +745,11 @@ void PolymarketService::fetch_leaderboard(int limit) {return;}- QString path = "/leaderboard?limit=" + QString::number(limit);+ // Data API: /v1/leaderboard?category=OVERALL&timePeriod=ALL&orderBy=PNL&limit=N+ // Fields on each entry: rank, proxyWallet, userName, vol, pnl, profileImage.+ const int capped = qBound(1, limit, 50);+ QString path = "/v1/leaderboard?category=OVERALL&timePeriod=ALL&orderBy=PNL&limit=" ++ QString::number(capped);get_data(path,diff --git a/fincept-qt/src/services/polymarket/PolymarketWebSocket.cpp b/fincept-qt/src/services/polymarket/PolymarketWebSocket.cppindex 71ab737ad..b3d2ae140 100644--- a/fincept-qt/src/services/polymarket/PolymarketWebSocket.cpp+++ b/fincept-qt/src/services/polymarket/PolymarketWebSocket.cpp@@ -157,7 +157,7 @@ void PolymarketWebSocket::on_ws_error(const QString& error) {}QStringList PolymarketWebSocket::topic_patterns() const {- return {"polymarket:price:*", "polymarket:orderbook:*"};+ return {"prediction:polymarket:price:*", "prediction:polymarket:orderbook:*"};}void PolymarketWebSocket::refresh(const QStringList& /*topics*/) {@@ -178,22 +178,22 @@ void PolymarketWebSocket::ensure_registered_with_hub() {push_only.ttl_ms = 0;push_only.min_interval_ms = 0;- hub.set_policy_pattern("polymarket:price:*", push_only);- hub.set_policy_pattern("polymarket:orderbook:*", push_only);+ hub.set_policy_pattern("prediction:polymarket:price:*", push_only);+ hub.set_policy_pattern("prediction:polymarket:orderbook:*", push_only);hub_registered_ = true;- LOG_INFO("Polymarket WS", "Registered with DataHub (polymarket:price:*, polymarket:orderbook:*)");+ LOG_INFO("Polymarket WS", "Registered with DataHub (prediction:polymarket:price:*, prediction:polymarket:orderbook:*)");}void PolymarketWebSocket::publish_price_to_hub(const QString& asset_id, double price) {if (asset_id.isEmpty()) return;- const QString topic = QStringLiteral("polymarket:price:") + asset_id;+ const QString topic = QStringLiteral("prediction:polymarket:price:") + asset_id;fincept::datahub::DataHub::instance().publish(topic, QVariant(price));}void PolymarketWebSocket::publish_orderbook_to_hub(const QString& asset_id, const OrderBook& book) {if (asset_id.isEmpty()) return;- const QString topic = QStringLiteral("polymarket:orderbook:") + asset_id;+ const QString topic = QStringLiteral("prediction:polymarket:orderbook:") + asset_id;fincept::datahub::DataHub::instance().publish(topic, QVariant::fromValue(book));}diff --git a/fincept-qt/src/services/prediction/PredictionCredentialStore.cpp b/fincept-qt/src/services/prediction/PredictionCredentialStore.cppnew file mode 100644index 000000000..79137022f--- /dev/null+++ b/fincept-qt/src/services/prediction/PredictionCredentialStore.cpp@@ -0,0 +1,132 @@+#include "services/prediction/PredictionCredentialStore.h"++#include "core/logging/Logger.h"+#include "storage/secure/SecureStorage.h"++#include <QJsonDocument>+#include <QJsonObject>++namespace fincept::services::prediction {++namespace {++constexpr const char* kPolymarketKey = "prediction/polymarket/credentials";+constexpr const char* kKalshiKey = "prediction/kalshi/credentials";++QString json_string(const QJsonObject& obj, const char* key) {+ return obj.value(QLatin1String(key)).toString();+}++QJsonObject to_json(const PolymarketCredentials& c) {+ QJsonObject o;+ o.insert("private_key", c.private_key);+ o.insert("funder_address", c.funder_address);+ o.insert("signature_type", c.signature_type);+ o.insert("api_key", c.api_key);+ o.insert("api_secret", c.api_secret);+ o.insert("api_passphrase", c.api_passphrase);+ return o;+}++PolymarketCredentials from_json_polymarket(const QJsonObject& o) {+ PolymarketCredentials c;+ c.private_key = json_string(o, "private_key");+ c.funder_address = json_string(o, "funder_address");+ c.signature_type = o.value("signature_type").toInt(1);+ c.api_key = json_string(o, "api_key");+ c.api_secret = json_string(o, "api_secret");+ c.api_passphrase = json_string(o, "api_passphrase");+ return c;+}++QJsonObject to_json(const kalshi_ns::KalshiCredentials& c) {+ QJsonObject o;+ o.insert("api_key_id", c.api_key_id);+ o.insert("private_key_pem", c.private_key_pem);+ o.insert("use_demo", c.use_demo);+ return o;+}++kalshi_ns::KalshiCredentials from_json_kalshi(const QJsonObject& o) {+ kalshi_ns::KalshiCredentials c;+ c.api_key_id = json_string(o, "api_key_id");+ c.private_key_pem = json_string(o, "private_key_pem");+ c.use_demo = o.value("use_demo").toBool(false);+ return c;+}++QString encode(const QJsonObject& obj) {+ return QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));+}++std::optional<QJsonObject> decode(const QString& s) {+ if (s.isEmpty()) return std::nullopt;+ QJsonParseError err;+ auto doc = QJsonDocument::fromJson(s.toUtf8(), &err);+ if (doc.isNull() || !doc.isObject()) return std::nullopt;+ return doc.object();+}++} // namespace++// ── Polymarket ──────────────────────────────────────────────────────────────++std::optional<PolymarketCredentials> PredictionCredentialStore::load_polymarket() {+ auto r = fincept::SecureStorage::instance().retrieve(QString::fromLatin1(kPolymarketKey));+ if (r.is_err()) return std::nullopt;+ auto obj = decode(r.value());+ if (!obj) return std::nullopt;+ auto creds = from_json_polymarket(*obj);+ if (!creds.is_valid()) return std::nullopt;+ return creds;+}++bool PredictionCredentialStore::save_polymarket(const PolymarketCredentials& creds) {+ if (!creds.is_valid()) return false;+ auto r = fincept::SecureStorage::instance().store(QString::fromLatin1(kPolymarketKey),+ encode(to_json(creds)));+ if (r.is_err()) {+ LOG_ERROR("PredictionCreds",+ QStringLiteral("SecureStorage.store(polymarket) failed: ") ++ QString::fromStdString(r.error()));+ return false;+ }+ return true;+}++bool PredictionCredentialStore::clear_polymarket() {+ auto r = fincept::SecureStorage::instance().remove(QString::fromLatin1(kPolymarketKey));+ return r.is_ok();+}++// ── Kalshi ──────────────────────────────────────────────────────────────────++std::optional<kalshi_ns::KalshiCredentials> PredictionCredentialStore::load_kalshi() {+ auto r = fincept::SecureStorage::instance().retrieve(QString::fromLatin1(kKalshiKey));+ if (r.is_err()) return std::nullopt;+ auto obj = decode(r.value());+ if (!obj) return std::nullopt;+ auto creds = from_json_kalshi(*obj);+ if (!creds.is_valid()) return std::nullopt;+ return creds;+}++bool PredictionCredentialStore::save_kalshi(const kalshi_ns::KalshiCredentials& creds) {+ if (!creds.is_valid()) return false;+ auto r = fincept::SecureStorage::instance().store(QString::fromLatin1(kKalshiKey),+ encode(to_json(creds)));+ if (r.is_err()) {+ LOG_ERROR("PredictionCreds",+ QStringLiteral("SecureStorage.store(kalshi) failed: ") ++ QString::fromStdString(r.error()));+ return false;+ }+ return true;+}++bool PredictionCredentialStore::clear_kalshi() {+ auto r = fincept::SecureStorage::instance().remove(QString::fromLatin1(kKalshiKey));+ return r.is_ok();+}++} // namespace fincept::services::predictiondiff --git a/fincept-qt/src/services/prediction/PredictionCredentialStore.h b/fincept-qt/src/services/prediction/PredictionCredentialStore.hnew file mode 100644index 000000000..128792886--- /dev/null+++ b/fincept-qt/src/services/prediction/PredictionCredentialStore.h@@ -0,0 +1,54 @@+#pragma once++#include "services/prediction/kalshi/KalshiCredentials.h"++#include <QString>++#include <optional>++namespace fincept::services::prediction {++/// Polymarket credential set. See the plan §C.+///+/// `private_key` is the Polygon/Ethereum private key used to sign EIP-712+/// orders via py_clob_client (Phase 6). `signature_type`:+/// 0 = EOA (direct externally-owned account)+/// 1 = POLY_PROXY (Polymarket proxy wallet — default for UI users)+/// 2 = POLY_GNOSIS_SAFE (Polymarket Gnosis Safe)+/// `funder_address` is optional when signature_type is POLY_PROXY; the+/// Python bridge derives it via CREATE2 if omitted.+/// `api_key`/`api_secret`/`api_passphrase` are the L2 CLOB credentials+/// derived once from `POST /auth/api-key` and cached here to avoid+/// re-deriving on every session.+struct PolymarketCredentials {+ QString private_key;+ QString funder_address;+ int signature_type = 1;++ QString api_key;+ QString api_secret;+ QString api_passphrase;++ bool is_valid() const {+ // Minimum to operate: a private key. The derived L2 creds are+ // populated lazily on first successful derivation.+ return !private_key.isEmpty();+ }+};++/// Load/save credential sets from SecureStorage (OS-backed encrypted+/// store). Keys used:+/// prediction/polymarket/credentials → JSON blob of PolymarketCredentials+/// prediction/kalshi/credentials → JSON blob of KalshiCredentials+class PredictionCredentialStore {+ public:+ static std::optional<PolymarketCredentials> load_polymarket();+ static bool save_polymarket(const PolymarketCredentials& creds);+ static bool clear_polymarket();++ static std::optional<kalshi_ns::KalshiCredentials> load_kalshi();+ static bool save_kalshi(const kalshi_ns::KalshiCredentials& creds);+ static bool clear_kalshi();+};++} // namespace fincept::services::predictiondiff --git a/fincept-qt/src/services/prediction/PredictionExchangeAdapter.cpp b/fincept-qt/src/services/prediction/PredictionExchangeAdapter.cppnew file mode 100644index 000000000..d771543e9--- /dev/null+++ b/fincept-qt/src/services/prediction/PredictionExchangeAdapter.cpp@@ -0,0 +1,10 @@+#include "services/prediction/PredictionExchangeAdapter.h"++// Abstract base class — this translation unit exists only so Qt's AutoMOC+// emits and links the moc-generated Q_OBJECT code (signals, metaObject,+// qt_metacast, qt_metacall, staticMetaObject). The class has no+// implementation of its own; concrete subclasses provide all behaviour.++namespace fincept::services::prediction {+// Intentionally empty.+} // namespace fincept::services::predictiondiff --git a/fincept-qt/src/services/prediction/PredictionExchangeAdapter.h b/fincept-qt/src/services/prediction/PredictionExchangeAdapter.hnew file mode 100644index 000000000..0963ed012--- /dev/null+++ b/fincept-qt/src/services/prediction/PredictionExchangeAdapter.h@@ -0,0 +1,118 @@+#pragma once++#include "services/prediction/PredictionTypes.h"++#include <QObject>+#include <QString>+#include <QStringList>+#include <QVariantList>+#include <QVector>++namespace fincept::services::prediction {++/// Abstract base for every prediction-market exchange integration.+///+/// One instance per exchange exists for the lifetime of the process, owned+/// by PredictionExchangeRegistry. Adapters encapsulate REST, WebSocket,+/// type mapping, credential storage, and DataHub producer registration.+///+/// Lifecycle:+/// * UI calls list_markets/list_events/search/... and listens for the+/// matching *_ready signals. Calls are async; a single inflight+/// generation is enough for the browse panel (results arrive in order+/// the adapter decides).+/// * subscribe_market(asset_ids) triggers WS streaming. Price/orderbook+/// updates flow via DataHub topics AND the ws_*_updated signals.+/// * Authenticated methods no-op + emit error() if has_credentials() is+/// false. Screens must inspect has_credentials() before showing the+/// order ticket / portfolio panel.+class PredictionExchangeAdapter : public QObject {+ Q_OBJECT+ public:+ explicit PredictionExchangeAdapter(QObject* parent = nullptr) : QObject(parent) {}+ ~PredictionExchangeAdapter() override = default;++ // ── Identity ─────────────────────────────────────────────────────────++ virtual QString id() const = 0; // "polymarket" | "kalshi"+ virtual QString display_name() const = 0; // "Polymarket", "Kalshi"+ virtual ExchangeCapabilities capabilities() const = 0;++ // ── Public / unsigned endpoints ──────────────────────────────────────++ virtual void list_markets(const QString& category, const QString& sort_by, int limit, int offset) = 0;+ virtual void list_events(const QString& category, const QString& sort_by, int limit, int offset) = 0;+ virtual void search(const QString& query, int limit) = 0;+ virtual void list_tags() = 0;+ virtual void fetch_market(const MarketKey& key) = 0;+ virtual void fetch_event(const MarketKey& key) = 0;+ virtual void fetch_order_book(const QString& asset_id) = 0;+ virtual void fetch_price_history(const QString& asset_id, const QString& interval, int fidelity) = 0;+ virtual void fetch_recent_trades(const MarketKey& key, int limit) = 0;++ /// Optional — adapters without this endpoint may emit a "not supported"+ /// error() and return. Default impl is a no-op.+ virtual void fetch_top_holders(const MarketKey& key, int limit) {+ Q_UNUSED(key);+ Q_UNUSED(limit);+ }+ virtual void fetch_leaderboard(int limit) { Q_UNUSED(limit); }++ // ── Real-time (WebSocket) ────────────────────────────────────────────++ virtual void subscribe_market(const QStringList& asset_ids) = 0;+ virtual void unsubscribe_market(const QStringList& asset_ids) = 0;+ virtual bool is_ws_connected() const = 0;++ // ── Authenticated / trading ──────────────────────────────────────────++ virtual bool has_credentials() const = 0;+ virtual QString account_label() const = 0; // e.g. truncated wallet address+ virtual void fetch_balance() = 0;+ virtual void fetch_positions() = 0;+ virtual void fetch_open_orders() = 0;+ virtual void fetch_user_activity(int limit) = 0;+ virtual void place_order(const OrderRequest& req) = 0;+ virtual void cancel_order(const QString& order_id) = 0;+ virtual void cancel_all_for_market(const MarketKey& key, const QString& asset_id) = 0;++ // ── Hub registration ─────────────────────────────────────────────────++ /// Register this adapter's producers (WS + REST) with DataHub and+ /// install topic policies. Idempotent. Called from main.cpp once+ /// per adapter.+ virtual void ensure_registered_with_hub() = 0;++ signals:+ // Read+ void markets_ready(const QVector<fincept::services::prediction::PredictionMarket>& markets);+ void events_ready(const QVector<fincept::services::prediction::PredictionEvent>& events);+ void search_results_ready(const QVector<fincept::services::prediction::PredictionMarket>& markets,+ const QVector<fincept::services::prediction::PredictionEvent>& events);+ void tags_ready(const QStringList& tags);+ void market_detail_ready(const fincept::services::prediction::PredictionMarket& market);+ void event_detail_ready(const fincept::services::prediction::PredictionEvent& event);+ void order_book_ready(const fincept::services::prediction::PredictionOrderBook& book);+ void price_history_ready(const fincept::services::prediction::PriceHistory& history);+ void recent_trades_ready(const QVector<fincept::services::prediction::PredictionTrade>& trades);+ void top_holders_ready(const QVariantList& holders);+ void leaderboard_ready(const QVariantList& entries);++ // WebSocket+ void ws_price_updated(const QString& asset_id, double price);+ void ws_orderbook_updated(const QString& asset_id, const fincept::services::prediction::PredictionOrderBook& book);+ void ws_connection_changed(bool connected);++ // Account / trading+ void credentials_changed(); // emitted when user adds/removes a credential set+ void balance_ready(const fincept::services::prediction::AccountBalance& balance);+ void positions_ready(const QVector<fincept::services::prediction::PredictionPosition>& positions);+ void open_orders_ready(const QVector<fincept::services::prediction::OpenOrder>& orders);+ void order_placed(const fincept::services::prediction::OrderResult& result);+ void order_cancelled(const QString& order_id, bool ok, const QString& error_message);+ void account_activity_ready(const QVariantList& activities);++ void error_occurred(const QString& context, const QString& message);+};++} // namespace fincept::services::predictiondiff --git a/fincept-qt/src/services/prediction/PredictionExchangeRegistry.cpp b/fincept-qt/src/services/prediction/PredictionExchangeRegistry.cppnew file mode 100644index 000000000..6f7fddb33--- /dev/null+++ b/fincept-qt/src/services/prediction/PredictionExchangeRegistry.cpp@@ -0,0 +1,63 @@+#include "services/prediction/PredictionExchangeRegistry.h"++#include "core/logging/Logger.h"+#include "services/prediction/PredictionExchangeAdapter.h"++namespace fincept::services::prediction {++PredictionExchangeRegistry& PredictionExchangeRegistry::instance() {+ static PredictionExchangeRegistry s;+ return s;+}++PredictionExchangeRegistry::PredictionExchangeRegistry() : QObject(nullptr) {}+PredictionExchangeRegistry::~PredictionExchangeRegistry() = default;++void PredictionExchangeRegistry::register_adapter(std::unique_ptr<PredictionExchangeAdapter> adapter) {+ if (!adapter) return;+ const QString id = adapter->id();+ for (const auto& e : entries_) {+ if (e.id == id) {+ LOG_WARN("PredictionRegistry", "Adapter already registered: " + id);+ return;+ }+ }+ if (active_id_.isEmpty()) active_id_ = id;+ entries_.push_back({id, std::move(adapter)});+ LOG_INFO("PredictionRegistry", "Registered adapter: " + id);+}++QStringList PredictionExchangeRegistry::available_ids() const {+ QStringList out;+ out.reserve(entries_.size());+ for (const auto& e : entries_) out.push_back(e.id);+ return out;+}++PredictionExchangeAdapter* PredictionExchangeRegistry::adapter(const QString& id) const {+ for (const auto& e : entries_) {+ if (e.id == id) return e.adapter.get();+ }+ return nullptr;+}++PredictionExchangeAdapter* PredictionExchangeRegistry::active() const {+ return adapter(active_id_);+}++QString PredictionExchangeRegistry::active_id() const {+ return active_id_;+}++void PredictionExchangeRegistry::set_active(const QString& id) {+ if (id == active_id_) return;+ if (!adapter(id)) {+ LOG_WARN("PredictionRegistry", "Attempt to activate unknown adapter: " + id);+ return;+ }+ active_id_ = id;+ LOG_INFO("PredictionRegistry", "Active exchange: " + id);+ emit active_changed(id);+}++} // namespace fincept::services::predictiondiff --git a/fincept-qt/src/services/prediction/PredictionExchangeRegistry.h b/fincept-qt/src/services/prediction/PredictionExchangeRegistry.hnew file mode 100644index 000000000..70bacd998--- /dev/null+++ b/fincept-qt/src/services/prediction/PredictionExchangeRegistry.h@@ -0,0 +1,56 @@+#pragma once++#include <QObject>+#include <QString>+#include <QStringList>++#include <memory>+#include <vector>++namespace fincept::services::prediction {++class PredictionExchangeAdapter;++/// Singleton registry of prediction-market exchange adapters.+///+/// Owns one adapter instance per exchange id for the process lifetime.+/// Screens do NOT own adapters — they look up the active adapter via+/// active() and listen for active_changed() when the user switches+/// exchanges in the command bar.+class PredictionExchangeRegistry : public QObject {+ Q_OBJECT+ public:+ static PredictionExchangeRegistry& instance();++ /// Register an adapter. Takes ownership. Must be called from main.cpp+ /// once per supported exchange, before any screen is constructed.+ void register_adapter(std::unique_ptr<PredictionExchangeAdapter> adapter);++ QStringList available_ids() const;+ PredictionExchangeAdapter* adapter(const QString& id) const;+ PredictionExchangeAdapter* active() const;+ QString active_id() const;++ /// Switch the active exchange. Emits active_changed() on transition.+ /// No-op if id is already active or not registered.+ void set_active(const QString& id);++ signals:+ void active_changed(const QString& new_id);++ private:+ PredictionExchangeRegistry();+ ~PredictionExchangeRegistry() override;++ struct Entry {+ QString id;+ std::unique_ptr<PredictionExchangeAdapter> adapter;+ };+ // std::vector (not QVector/QList) because Entry is move-only —+ // QList's instantiation pulls in copy-based QGenericArrayOps paths+ // that static_assert-fail on std::unique_ptr fields.+ std::vector<Entry> entries_;+ QString active_id_;+};++} // namespace fincept::services::predictiondiff --git a/fincept-qt/src/services/prediction/PredictionTypes.h b/fincept-qt/src/services/prediction/PredictionTypes.hnew file mode 100644index 000000000..91ce8226d--- /dev/null+++ b/fincept-qt/src/services/prediction/PredictionTypes.h@@ -0,0 +1,211 @@+#pragma once++// Unified data model for the Prediction Markets tab (Polymarket, Kalshi, …).+//+// Fields shared across exchanges are first-class members. Exchange-scoped+// identifiers live in MarketKey. Exchange-specific flags (neg-risk, tick+// size, series ticker, etc.) live in `extras`. Each adapter translates its+// native structs into these types via its TypeMap translation unit.++#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QMetaType>+#include <QString>+#include <QStringList>+#include <QVariantList>+#include <QVariantMap>+#include <QVector>++namespace fincept::services::prediction {++// ── Market keys ─────────────────────────────────────────────────────────────++/// Exchange-scoped identifier for a market. Opaque to the UI; interpreted+/// only by the owning adapter.+///+/// exchange_id — "polymarket" | "kalshi"+/// market_id — Polymarket: condition_id (0x…). Kalshi: market_ticker.+/// event_id — Polymarket: event slug/id. Kalshi: event_ticker. May be empty.+/// asset_ids — Polymarket: clob_token_ids (one per outcome).+/// Kalshi: ["<ticker>:yes", "<ticker>:no"] synthetic IDs.+struct MarketKey {+ QString exchange_id;+ QString market_id;+ QString event_id;+ QStringList asset_ids;++ bool is_empty() const noexcept {+ return exchange_id.isEmpty() && market_id.isEmpty() && event_id.isEmpty();+ }+};++struct Outcome {+ QString name; // "Yes" / "No" / free-form for multi-outcome markets.+ QString asset_id; // Exchange-opaque ID for subscribing / ordering.+ double price = 0.0; // 0.0–1.0 probability.+};++struct PredictionMarket {+ MarketKey key;+ QString question;+ QString description;+ QString category;+ QString image_url;+ QString end_date_iso;+ double volume = 0.0;+ double liquidity = 0.0;+ double open_interest = 0.0;+ bool active = false;+ bool closed = false;+ QVector<Outcome> outcomes; // size ≥ 2; binary markets have 2.+ QStringList tags;+ QVariantMap extras; // exchange-specific: "neg_risk", "tick_size", "series_ticker", etc.+};++struct PredictionEvent {+ MarketKey key; // key.market_id is empty for pure events.+ QString title;+ QString description;+ QString category;+ double volume = 0.0;+ double liquidity = 0.0;+ bool active = false;+ bool closed = false;+ QVector<PredictionMarket> markets;+ QStringList tags;+ QVariantMap extras;+};++// ── Order book / price history / trades ─────────────────────────────────────++struct OrderLevel {+ double price = 0.0;+ double size = 0.0;+};++struct PredictionOrderBook {+ QString asset_id;+ QVector<OrderLevel> bids; // highest first+ QVector<OrderLevel> asks; // lowest first+ double tick_size = 0.01;+ double min_order_size = 0.0;+ qint64 last_update_ms = 0;+};++struct PricePoint {+ qint64 ts_ms = 0;+ double price = 0.0;+};++struct PriceHistory {+ QString asset_id;+ QVector<PricePoint> points;+};++struct PredictionTrade {+ QString asset_id;+ QString side; // "BUY" | "SELL"+ double price = 0.0;+ double size = 0.0;+ qint64 ts_ms = 0;+ QString maker; // Polymarket address or empty (Kalshi).+};++// ── Account / trading ───────────────────────────────────────────────────────++struct PredictionPosition {+ QString asset_id;+ QString market_id;+ QString outcome; // resolved outcome name, e.g. "YES" / "NO" / custom.+ double size = 0.0;+ double avg_price = 0.0;+ double realized_pnl = 0.0;+ double unrealized_pnl = 0.0;+ double current_value = 0.0;+};++struct OpenOrder {+ QString order_id;+ QString asset_id;+ QString market_id;+ QString outcome;+ QString side; // "BUY" | "SELL"+ QString order_type; // "GTC" | "GTD" | "FOK" | "FAK" | "LIMIT" | "MARKET"+ double price = 0.0;+ double size = 0.0;+ double filled = 0.0;+ QString status; // normalized: "LIVE" | "PARTIAL" | "FILLED" | "CANCELED"+ qint64 created_ms = 0;+ qint64 expires_ms = 0;+};++struct OrderRequest {+ MarketKey key;+ QString asset_id;+ QString side; // "BUY" | "SELL"+ QString order_type; // see OpenOrder::order_type+ double price = 0.0;+ double size = 0.0;+ qint64 expires_ms = 0; // 0 = GTC+ QString client_order_id; // adapter fills if empty+ QVariantMap extras; // per-exchange hints, e.g. {"tick_size": 0.01, "neg_risk": false}+};++struct OrderResult {+ bool ok = false;+ QString order_id;+ QString status;+ QString error_code;+ QString error_message;+ double filled = 0.0;+};++struct AccountBalance {+ double available = 0.0; // USDC (Polymarket) or USD (Kalshi)+ double total_value = 0.0; // includes open positions + collateral+ QString currency; // "USDC" / "USD"+};++// ── Capability flags ────────────────────────────────────────────────────────++struct ExchangeCapabilities {+ bool has_events = true;+ bool has_multi_outcome = false;+ bool has_orderbook_ws = true;+ bool has_trade_ws = false;+ bool has_rewards = false; // Polymarket liquidity rewards+ bool has_maker_rebates = false; // Polymarket+ bool has_leaderboard = false;++ bool supports_limit_orders = true;+ bool supports_market_orders = true;+ bool supports_gtd = false;+ bool supports_fok = true;+ bool supports_fak = true;+ bool supports_decrease_order = false; // Kalshi only+ bool supports_batch_orders = false;++ QString quote_currency = "USD";+ double min_order_size = 1.0;+ double default_tick_size = 0.01;+ int max_requests_per_sec = 10;+};++} // namespace fincept::services::prediction++Q_DECLARE_METATYPE(fincept::services::prediction::MarketKey)+Q_DECLARE_METATYPE(fincept::services::prediction::PredictionMarket)+Q_DECLARE_METATYPE(fincept::services::prediction::PredictionEvent)+Q_DECLARE_METATYPE(fincept::services::prediction::PredictionOrderBook)+Q_DECLARE_METATYPE(fincept::services::prediction::PriceHistory)+Q_DECLARE_METATYPE(fincept::services::prediction::PredictionTrade)+Q_DECLARE_METATYPE(fincept::services::prediction::PredictionPosition)+Q_DECLARE_METATYPE(fincept::services::prediction::OpenOrder)+Q_DECLARE_METATYPE(fincept::services::prediction::OrderResult)+Q_DECLARE_METATYPE(fincept::services::prediction::AccountBalance)+Q_DECLARE_METATYPE(QVector<fincept::services::prediction::PredictionMarket>)+Q_DECLARE_METATYPE(QVector<fincept::services::prediction::PredictionEvent>)+Q_DECLARE_METATYPE(QVector<fincept::services::prediction::PredictionTrade>)+Q_DECLARE_METATYPE(QVector<fincept::services::prediction::PredictionPosition>)+Q_DECLARE_METATYPE(QVector<fincept::services::prediction::OpenOrder>)diff --git a/fincept-qt/src/services/prediction/kalshi/KalshiAdapter.cpp b/fincept-qt/src/services/prediction/kalshi/KalshiAdapter.cppnew file mode 100644index 000000000..f983a577d--- /dev/null+++ b/fincept-qt/src/services/prediction/kalshi/KalshiAdapter.cpp@@ -0,0 +1,478 @@+#include "services/prediction/kalshi/KalshiAdapter.h"++#include "core/logging/Logger.h"+#include "python/PythonRunner.h"+#include "services/prediction/kalshi/KalshiRestClient.h"+#include "services/prediction/kalshi/KalshiWsClient.h"++#include <QDateTime>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QPointer>+#include <QUuid>++#include <cmath>++namespace fincept::services::prediction::kalshi_ns {++namespace pr = fincept::services::prediction;++// ── Construction ────────────────────────────────────────────────────────────++KalshiAdapter::KalshiAdapter(QObject* parent)+ : fincept::services::prediction::PredictionExchangeAdapter(parent),+ rest_(std::make_unique<KalshiRestClient>(this)),+ ws_(std::make_unique<KalshiWsClient>(this)) {+ wire();+}++KalshiAdapter::~KalshiAdapter() = default;++// ── Identity ────────────────────────────────────────────────────────────────++QString KalshiAdapter::id() const { return QStringLiteral("kalshi"); }+QString KalshiAdapter::display_name() const { return QStringLiteral("Kalshi"); }++pr::ExchangeCapabilities KalshiAdapter::capabilities() const {+ pr::ExchangeCapabilities c;+ c.has_events = true;+ c.has_multi_outcome = false; // binary yes/no only+ c.has_orderbook_ws = true;+ c.has_trade_ws = true;+ c.has_rewards = false;+ c.has_maker_rebates = false;+ c.has_leaderboard = false;+ c.supports_limit_orders = true;+ c.supports_market_orders = true;+ c.supports_gtd = true;+ c.supports_fok = true;+ c.supports_fak = true;+ c.supports_decrease_order = true;+ c.supports_batch_orders = true;+ c.quote_currency = QStringLiteral("USD");+ c.min_order_size = 1.0; // 1 contract+ c.default_tick_size = 0.01; // 1 cent+ c.max_requests_per_sec = 2; // conservative for standard tier+ return c;+}++// ── Asset ID helpers ────────────────────────────────────────────────────────++std::pair<QString, QString> KalshiAdapter::split_asset_id(const QString& asset_id) {+ const int colon = asset_id.lastIndexOf(':');+ if (colon <= 0) return {};+ return {asset_id.left(colon), asset_id.mid(colon + 1)};+}++// ── Read endpoints ──────────────────────────────────────────────────────────++void KalshiAdapter::list_markets(const QString& category, const QString& /*sort_by*/,+ int limit, int /*offset*/) {+ // Kalshi uses cursor-based pagination. For MVP we serve the first page;+ // pagination wiring is Phase 8 polish.+ const QString series = (category.isEmpty() || category == QStringLiteral("ALL")) ? QString() : category;+ rest_->fetch_markets(QStringLiteral("open"), QString(), series, QString(), limit, QString());+}++void KalshiAdapter::list_events(const QString& category, const QString& /*sort_by*/,+ int limit, int /*offset*/) {+ const QString series = (category.isEmpty() || category == QStringLiteral("ALL")) ? QString() : category;+ rest_->fetch_events(QStringLiteral("open"), series, /*with_nested_markets=*/true, limit, QString());+}++void KalshiAdapter::search(const QString& query, int limit) {+ // Kalshi doesn't offer a free-text search endpoint. As a best-effort,+ // treat the query as a series_ticker filter. If the user enters a+ // full ticker like "KXPRES" it'll pull matching markets. For richer+ // search we'd need to list + client-side filter, which is Phase 8.+ rest_->fetch_markets(QStringLiteral("open"), QString(), query.toUpper(), QString(), limit, QString());+}++void KalshiAdapter::list_tags() {+ rest_->fetch_series(QStringLiteral("open"));+}++void KalshiAdapter::fetch_market(const pr::MarketKey& key) {+ if (key.market_id.isEmpty()) {+ emit error_occurred(QStringLiteral("fetch_market"),+ QStringLiteral("Kalshi fetch_market requires a ticker"));+ return;+ }+ rest_->fetch_market(key.market_id);+}++void KalshiAdapter::fetch_event(const pr::MarketKey& key) {+ if (key.event_id.isEmpty()) {+ emit error_occurred(QStringLiteral("fetch_event"),+ QStringLiteral("Kalshi fetch_event requires an event_ticker"));+ return;+ }+ rest_->fetch_event(key.event_id);+}++void KalshiAdapter::fetch_order_book(const QString& asset_id) {+ const auto [ticker, side] = split_asset_id(asset_id);+ if (ticker.isEmpty()) {+ emit error_occurred(QStringLiteral("fetch_order_book"),+ QStringLiteral("Kalshi asset_id must be '<ticker>:yes|no'"));+ return;+ }+ rest_->fetch_order_book(ticker, 20);+}++void KalshiAdapter::fetch_price_history(const QString& asset_id, const QString& interval, int /*fidelity*/) {+ const auto [ticker, side] = split_asset_id(asset_id);+ if (ticker.isEmpty()) {+ emit error_occurred(QStringLiteral("fetch_price_history"),+ QStringLiteral("Kalshi asset_id must be '<ticker>:yes|no'"));+ return;+ }+ last_history_asset_id_ = asset_id;++ // Map UI interval to Kalshi's period_interval (minutes). Kalshi only+ // supports 1, 60, 1440.+ int period = 60;+ if (interval == QStringLiteral("1h") || interval == QStringLiteral("6h")) period = 60;+ else if (interval == QStringLiteral("1d")) period = 60;+ else if (interval == QStringLiteral("1w") || interval == QStringLiteral("1m") ||+ interval == QStringLiteral("max")) period = 1440;+ else if (interval == QStringLiteral("1min") || interval == QStringLiteral("5min")) period = 1;++ // Default to last 7 days if the caller didn't give us a range.+ const qint64 end = QDateTime::currentSecsSinceEpoch();+ qint64 start = end - (7 * 24 * 3600);+ if (interval == QStringLiteral("1w")) start = end - (7 * 24 * 3600);+ else if (interval == QStringLiteral("1m")) start = end - (30 * 24 * 3600);+ else if (interval == QStringLiteral("6h")) start = end - (6 * 3600);+ else if (interval == QStringLiteral("1h")) start = end - 3600;++ // Kalshi candlestick endpoint requires the series ticker. For tickers+ // of the form "KXFOO-23DEC-T3.00", the series is the prefix before+ // the first dash (e.g. "KXFOO"). Fallback to the whole ticker.+ const int dash = ticker.indexOf('-');+ const QString series = (dash > 0) ? ticker.left(dash) : ticker;++ rest_->fetch_candlesticks(series, ticker, period, start, end);+}++void KalshiAdapter::fetch_recent_trades(const pr::MarketKey& key, int limit) {+ if (key.market_id.isEmpty()) {+ emit error_occurred(QStringLiteral("fetch_recent_trades"),+ QStringLiteral("Kalshi trades require a ticker"));+ return;+ }+ rest_->fetch_market_trades(key.market_id, limit);+}++// ── WebSocket ───────────────────────────────────────────────────────────────++void KalshiAdapter::subscribe_market(const QStringList& asset_ids) {+ // Kalshi WS subscribes per market ticker, not per YES/NO asset. Dedup+ // the ticker portion of the asset IDs before forwarding.+ QStringList tickers;+ tickers.reserve(asset_ids.size());+ for (const auto& aid : asset_ids) {+ const auto [t, s] = split_asset_id(aid);+ if (!t.isEmpty() && !tickers.contains(t)) tickers.push_back(t);+ }+ ws_->subscribe(tickers);+}++void KalshiAdapter::unsubscribe_market(const QStringList& asset_ids) {+ QStringList tickers;+ tickers.reserve(asset_ids.size());+ for (const auto& aid : asset_ids) {+ const auto [t, s] = split_asset_id(aid);+ if (!t.isEmpty() && !tickers.contains(t)) tickers.push_back(t);+ }+ ws_->unsubscribe(tickers);+}++bool KalshiAdapter::is_ws_connected() const { return ws_->is_connected(); }++// ── Auth / trading (Python bridge) ──────────────────────────────────────────++bool KalshiAdapter::has_credentials() const { return creds_.is_valid(); }++QString KalshiAdapter::account_label() const {+ if (!creds_.is_valid()) return {};+ return QStringLiteral("Kalshi:") + creds_.api_key_id.left(8);+}++void KalshiAdapter::stub_unsupported(const QString& ctx) {+ emit error_occurred(ctx, QStringLiteral("Kalshi adapter: not supported in this call"));+}++QJsonObject KalshiAdapter::creds_to_json() const {+ QJsonObject o;+ o.insert("api_key_id", creds_.api_key_id);+ o.insert("private_key_pem", creds_.private_key_pem);+ o.insert("use_demo", creds_.use_demo);+ return o;+}++void KalshiAdapter::run_py(const QString& command, const QJsonObject& extra,+ std::function<void(const QJsonObject&)> on_ok, const QString& ctx) {+ if (!creds_.is_valid()) {+ emit error_occurred(ctx, QStringLiteral("No Kalshi credentials — connect an account first"));+ return;+ }+ QJsonObject payload = creds_to_json();+ for (auto it = extra.begin(); it != extra.end(); ++it) {+ payload.insert(it.key(), it.value());+ }+ const QString payload_str =+ QString::fromUtf8(QJsonDocument(payload).toJson(QJsonDocument::Compact));+ QPointer<KalshiAdapter> self = this;+ fincept::python::PythonRunner::instance().run(+ QStringLiteral("prediction_kalshi.py"),+ {command, payload_str},+ [self, on_ok, ctx](fincept::python::PythonResult r) {+ if (!self) return;+ if (!r.success) {+ emit self->error_occurred(ctx, r.error.isEmpty() ? r.output : r.error);+ return;+ }+ const QString json_str = fincept::python::extract_json(r.output);+ QJsonParseError perr;+ auto doc = QJsonDocument::fromJson(json_str.toUtf8(), &perr);+ if (doc.isNull() || !doc.isObject()) {+ emit self->error_occurred(+ ctx, QStringLiteral("Kalshi bridge: non-JSON response — ") + perr.errorString());+ return;+ }+ const auto obj = doc.object();+ if (!obj.value("ok").toBool()) {+ emit self->error_occurred(ctx, obj.value("error").toString(+ QStringLiteral("Kalshi command failed")));+ return;+ }+ on_ok(obj);+ });+}++void KalshiAdapter::fetch_balance() {+ QPointer<KalshiAdapter> self = this;+ run_py(QStringLiteral("balance"), {},+ [self](const QJsonObject& resp) {+ if (!self) return;+ pr::AccountBalance b;+ b.available = resp.value("available").toDouble();+ b.total_value = resp.value("total_value").toDouble();+ b.currency = resp.value("currency").toString("USD");+ emit self->balance_ready(b);+ },+ QStringLiteral("fetch_balance"));+}++void KalshiAdapter::fetch_positions() {+ QPointer<KalshiAdapter> self = this;+ run_py(QStringLiteral("positions"), {},+ [self](const QJsonObject& resp) {+ if (!self) return;+ QVector<pr::PredictionPosition> out;+ const auto arr = resp.value("positions").toArray();+ out.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ pr::PredictionPosition p;+ p.asset_id = o.value("asset_id").toString();+ p.market_id = o.value("market_id").toString();+ p.outcome = o.value("outcome").toString();+ p.size = o.value("size").toDouble();+ p.avg_price = o.value("avg_price").toDouble();+ p.realized_pnl = o.value("realized_pnl").toDouble();+ p.unrealized_pnl = o.value("unrealized_pnl").toDouble();+ p.current_value = o.value("current_value").toDouble();+ out.push_back(p);+ }+ emit self->positions_ready(out);+ },+ QStringLiteral("fetch_positions"));+}++void KalshiAdapter::fetch_open_orders() {+ QPointer<KalshiAdapter> self = this;+ run_py(QStringLiteral("open_orders"), {},+ [self](const QJsonObject& resp) {+ if (!self) return;+ QVector<pr::OpenOrder> out;+ const auto arr = resp.value("orders").toArray();+ out.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ pr::OpenOrder ord;+ ord.order_id = o.value("order_id").toString();+ ord.asset_id = o.value("asset_id").toString();+ ord.market_id = o.value("market_id").toString();+ ord.outcome = o.value("outcome").toString();+ ord.side = o.value("side").toString();+ ord.order_type = o.value("order_type").toString();+ ord.price = o.value("price").toDouble();+ ord.size = o.value("size").toDouble();+ ord.filled = o.value("filled").toDouble();+ ord.status = o.value("status").toString();+ ord.expires_ms = qint64(o.value("expires_ms").toDouble());+ out.push_back(ord);+ }+ emit self->open_orders_ready(out);+ },+ QStringLiteral("fetch_open_orders"));+}++void KalshiAdapter::fetch_user_activity(int limit) {+ QPointer<KalshiAdapter> self = this;+ QJsonObject extra;+ extra.insert("limit", limit);+ run_py(QStringLiteral("fills"), extra,+ [self](const QJsonObject& resp) {+ if (!self) return;+ emit self->account_activity_ready(resp.value("fills").toArray().toVariantList());+ },+ QStringLiteral("fetch_user_activity"));+}++void KalshiAdapter::place_order(const pr::OrderRequest& req) {+ const auto [ticker, side] = split_asset_id(req.asset_id);+ if (ticker.isEmpty()) {+ emit error_occurred(QStringLiteral("place_order"),+ QStringLiteral("Kalshi asset_id must be '<ticker>:yes|no'"));+ return;+ }++ QJsonObject extra;+ extra.insert("ticker", ticker);+ extra.insert("side", side);+ extra.insert("action", req.side.toLower() == QStringLiteral("sell") ? QStringLiteral("sell")+ : QStringLiteral("buy"));+ extra.insert("count", int(req.size));+ extra.insert("order_type", req.order_type.isEmpty() ? QStringLiteral("limit")+ : req.order_type.toLower());+ // Kalshi limit price is integer cents 1-99.+ const int price_cents = qBound(1, int(std::round(req.price * 100.0)), 99);+ if (side == QStringLiteral("yes")) extra.insert("yes_price_cents", price_cents);+ else extra.insert("no_price_cents", price_cents);+ if (req.expires_ms > 0) extra.insert("expiration_ts", qint64(req.expires_ms / 1000));+ extra.insert("client_order_id", req.client_order_id.isEmpty()+ ? QUuid::createUuid().toString(QUuid::WithoutBraces)+ : req.client_order_id);++ QPointer<KalshiAdapter> self = this;+ run_py(QStringLiteral("place_order"), extra,+ [self](const QJsonObject& resp) {+ if (!self) return;+ pr::OrderResult out;+ out.ok = resp.value("ok").toBool();+ out.order_id = resp.value("order_id").toString();+ out.status = resp.value("status").toString();+ emit self->order_placed(out);+ },+ QStringLiteral("place_order"));+}++void KalshiAdapter::cancel_order(const QString& order_id) {+ const QString oid = order_id;+ QJsonObject extra;+ extra.insert("order_id", oid);+ QPointer<KalshiAdapter> self = this;+ run_py(QStringLiteral("cancel_order"), extra,+ [self, oid](const QJsonObject& /*resp*/) {+ if (!self) return;+ emit self->order_cancelled(oid, true, QString());+ },+ QStringLiteral("cancel_order"));+}++void KalshiAdapter::cancel_all_for_market(const pr::MarketKey& key, const QString& /*asset_id*/) {+ // Kalshi has no single bulk-cancel-by-market endpoint; iterate open+ // orders filtered by ticker and cancel each.+ if (key.market_id.isEmpty()) {+ emit error_occurred(QStringLiteral("cancel_all_for_market"),+ QStringLiteral("Kalshi cancel-all requires a ticker"));+ return;+ }+ const QString ticker = key.market_id;+ QPointer<KalshiAdapter> self = this;+ QJsonObject extra;+ extra.insert("ticker", ticker);+ run_py(QStringLiteral("open_orders"), extra,+ [self](const QJsonObject& resp) {+ if (!self) return;+ const auto arr = resp.value("orders").toArray();+ for (const auto& v : arr) {+ const QString oid = v.toObject().value("order_id").toString();+ if (!oid.isEmpty()) self->cancel_order(oid);+ }+ },+ QStringLiteral("cancel_all_for_market"));+}++// ── Credentials plumbing ────────────────────────────────────────────────────++void KalshiAdapter::set_credentials(const KalshiCredentials& creds) {+ creds_ = creds;+ ws_->set_credentials(creds);+ rest_->set_demo_mode(creds.use_demo);+ emit credentials_changed();+}++// ── Hub registration ────────────────────────────────────────────────────────++void KalshiAdapter::ensure_registered_with_hub() {+ if (hub_registered_) return;+ ws_->ensure_registered_with_hub();+ hub_registered_ = true;+}++// ── Signal wiring ───────────────────────────────────────────────────────────++void KalshiAdapter::wire() {+ // REST → adapter signal forwarding.+ connect(rest_.get(), &KalshiRestClient::markets_ready, this,+ [this](const QVector<pr::PredictionMarket>& markets, const QString& /*cursor*/) {+ emit markets_ready(markets);+ });+ connect(rest_.get(), &KalshiRestClient::events_ready, this,+ [this](const QVector<pr::PredictionEvent>& events, const QString& /*cursor*/) {+ emit events_ready(events);+ });+ connect(rest_.get(), &KalshiRestClient::market_detail_ready,+ this, &KalshiAdapter::market_detail_ready);+ connect(rest_.get(), &KalshiRestClient::event_detail_ready,+ this, &KalshiAdapter::event_detail_ready);+ connect(rest_.get(), &KalshiRestClient::tags_ready,+ this, &KalshiAdapter::tags_ready);+ connect(rest_.get(), &KalshiRestClient::trades_ready,+ this, &KalshiAdapter::recent_trades_ready);+ connect(rest_.get(), &KalshiRestClient::request_error,+ this, &KalshiAdapter::error_occurred);++ // Kalshi REST returns two books (yes + no) in a single response.+ // We emit both books as order_book_ready events. Consumers should+ // filter on asset_id if they only want one side.+ connect(rest_.get(), &KalshiRestClient::order_book_ready, this,+ [this](const pr::PredictionOrderBook& yes_book,+ const pr::PredictionOrderBook& no_book, const QString& /*ticker*/) {+ emit order_book_ready(yes_book);+ emit order_book_ready(no_book);+ });++ connect(rest_.get(), &KalshiRestClient::price_history_ready, this,+ [this](const pr::PriceHistory& hist, const QString& /*ticker*/) {+ // Retag with the originally-requested asset id (could be :yes or :no).+ pr::PriceHistory out = hist;+ if (!last_history_asset_id_.isEmpty()) out.asset_id = last_history_asset_id_;+ emit price_history_ready(out);+ });++ // WebSocket → adapter.+ connect(ws_.get(), &KalshiWsClient::price_updated,+ this, &KalshiAdapter::ws_price_updated);+ connect(ws_.get(), &KalshiWsClient::orderbook_updated,+ this, &KalshiAdapter::ws_orderbook_updated);+ connect(ws_.get(), &KalshiWsClient::connection_status_changed,+ this, &KalshiAdapter::ws_connection_changed);+}++} // namespace fincept::services::prediction::kalshi_nsdiff --git a/fincept-qt/src/services/prediction/kalshi/KalshiAdapter.h b/fincept-qt/src/services/prediction/kalshi/KalshiAdapter.hnew file mode 100644index 000000000..3423f4621--- /dev/null+++ b/fincept-qt/src/services/prediction/kalshi/KalshiAdapter.h@@ -0,0 +1,96 @@+#pragma once++#include "services/prediction/PredictionExchangeAdapter.h"+#include "services/prediction/kalshi/KalshiCredentials.h"++#include <QJsonObject>+#include <QString>+#include <QStringList>++#include <functional>+#include <memory>++namespace fincept::services::prediction::kalshi_ns {++class KalshiRestClient;+class KalshiWsClient;++/// Kalshi exchange adapter.+///+/// Owns its own REST client + WS client (unlike Polymarket which wraps+/// existing global singletons). Kalshi has no global singletons today —+/// this class IS the singleton-of-concerns for the Kalshi integration.+///+/// Phase 4 implements public read endpoints. Phase 7 wires RSA-PSS signed+/// trading methods via a Python bridge (py `cryptography` package).+class KalshiAdapter : public fincept::services::prediction::PredictionExchangeAdapter {+ Q_OBJECT+ public:+ explicit KalshiAdapter(QObject* parent = nullptr);+ ~KalshiAdapter() override;++ // Identity+ QString id() const override;+ QString display_name() const override;+ fincept::services::prediction::ExchangeCapabilities capabilities() const override;++ // Read+ void list_markets(const QString& category, const QString& sort_by, int limit, int offset) override;+ void list_events(const QString& category, const QString& sort_by, int limit, int offset) override;+ void search(const QString& query, int limit) override;+ void list_tags() override;+ void fetch_market(const fincept::services::prediction::MarketKey& key) override;+ void fetch_event(const fincept::services::prediction::MarketKey& key) override;+ void fetch_order_book(const QString& asset_id) override;+ void fetch_price_history(const QString& asset_id, const QString& interval, int fidelity) override;+ void fetch_recent_trades(const fincept::services::prediction::MarketKey& key, int limit) override;++ // WebSocket+ void subscribe_market(const QStringList& asset_ids) override;+ void unsubscribe_market(const QStringList& asset_ids) override;+ bool is_ws_connected() const override;++ // Auth / trading (Phase 7 — stubs here)+ bool has_credentials() const override;+ QString account_label() const override;+ void fetch_balance() override;+ void fetch_positions() override;+ void fetch_open_orders() override;+ void fetch_user_activity(int limit) override;+ void place_order(const fincept::services::prediction::OrderRequest& req) override;+ void cancel_order(const QString& order_id) override;+ void cancel_all_for_market(const fincept::services::prediction::MarketKey& key,+ const QString& asset_id) override;++ void ensure_registered_with_hub() override;++ // Credential injection (Phase 5 will wire this via the account dialog).+ void set_credentials(const KalshiCredentials& creds);++ private:+ void wire();+ void stub_unsupported(const QString& ctx);++ /// Run a command against prediction_kalshi.py with the stored creds+ /// merged into `extra`. Invokes `on_ok` with the parsed JSON on+ /// success; emits error_occurred() on failure.+ void run_py(const QString& command, const QJsonObject& extra,+ std::function<void(const QJsonObject&)> on_ok, const QString& ctx);+ QJsonObject creds_to_json() const;++ /// Kalshi asset IDs look like "TICKER:yes" / "TICKER:no". Split into+ /// (ticker, side). Returns ("", "") if malformed.+ static std::pair<QString, QString> split_asset_id(const QString& asset_id);++ std::unique_ptr<KalshiRestClient> rest_;+ std::unique_ptr<KalshiWsClient> ws_;+ KalshiCredentials creds_;+ bool hub_registered_ = false;++ // Tracks the last-requested price-history asset id so REST callbacks+ // can attach it to the emitted PriceHistory (Kalshi REST only returns+ // YES-side candles).+ QString last_history_asset_id_;+};++} // namespace fincept::services::prediction::kalshi_nsdiff --git a/fincept-qt/src/services/prediction/kalshi/KalshiCredentials.h b/fincept-qt/src/services/prediction/kalshi/KalshiCredentials.hnew file mode 100644index 000000000..9ef89ea1a--- /dev/null+++ b/fincept-qt/src/services/prediction/kalshi/KalshiCredentials.h@@ -0,0 +1,21 @@+#pragma once++#include <QString>++namespace fincept::services::prediction::kalshi_ns {++/// Kalshi API credentials. Kalshi authenticates with RSA-PSS signatures+/// (private key) + API key ID. Stored encrypted in SecureStorage under+/// the key "prediction/kalshi/credentials" once Phase 5 wires the account+/// dialog.+struct KalshiCredentials {+ QString api_key_id; // UUID-style string from the Kalshi dashboard+ QString private_key_pem; // PEM-encoded RSA private key contents+ bool use_demo = false; // target demo-api.kalshi.co vs api.elections.kalshi.com++ bool is_valid() const {+ return !api_key_id.isEmpty() && !private_key_pem.isEmpty();+ }+};++} // namespace fincept::services::prediction::kalshi_nsdiff --git a/fincept-qt/src/services/prediction/kalshi/KalshiRestClient.cpp b/fincept-qt/src/services/prediction/kalshi/KalshiRestClient.cppnew file mode 100644index 000000000..6d2e82fdc--- /dev/null+++ b/fincept-qt/src/services/prediction/kalshi/KalshiRestClient.cpp@@ -0,0 +1,395 @@+#include "services/prediction/kalshi/KalshiRestClient.h"++#include "core/logging/Logger.h"++#include <QDateTime>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QNetworkAccessManager>+#include <QNetworkReply>+#include <QNetworkRequest>+#include <QPointer>+#include <QUrl>+#include <QUrlQuery>++namespace fincept::services::prediction::kalshi_ns {++namespace pr = fincept::services::prediction;++static const QString kProdBase = QStringLiteral("https://api.elections.kalshi.com/trade-api/v2");+static const QString kDemoBase = QStringLiteral("https://demo-api.kalshi.co/trade-api/v2");+static constexpr const char* kExchangeId = "kalshi";++// ── Fixed-point helpers ─────────────────────────────────────────────────────+//+// Kalshi expresses contract counts in fixed-point strings (_fp suffix)+// with 2 decimal places (1.00 == 1 contract). Convert to double at the+// boundary.++static double fp_to_double(const QJsonValue& v) {+ if (v.isString()) return v.toString().toDouble();+ if (v.isDouble()) return v.toDouble();+ return 0.0;+}++static double str_or_num(const QJsonValue& v) {+ if (v.isString()) return v.toString().toDouble();+ return v.toDouble();+}++// ── Market mapping ──────────────────────────────────────────────────────────++static pr::PredictionMarket parse_market(const QJsonObject& obj) {+ pr::PredictionMarket m;+ m.key.exchange_id = QString::fromLatin1(kExchangeId);+ m.key.market_id = obj.value("ticker").toString();+ m.key.event_id = obj.value("event_ticker").toString();+ m.key.asset_ids = {m.key.market_id + QStringLiteral(":yes"),+ m.key.market_id + QStringLiteral(":no")};++ // Kalshi has title + yes_sub_title / no_sub_title. We use title as the+ // question and fall back to the combined sub-titles if title is missing.+ m.question = obj.value("title").toString();+ if (m.question.isEmpty()) m.question = obj.value("yes_sub_title").toString();+ m.description = obj.value("rules_primary").toString();+ m.category = obj.value("event_ticker").toString(); // Kalshi has no real category field+ m.image_url = QString();+ m.end_date_iso = obj.value("close_time").toString();++ m.volume = fp_to_double(obj.value("volume_fp"));+ m.open_interest = fp_to_double(obj.value("open_interest_fp"));+ m.liquidity = str_or_num(obj.value("liquidity_dollars"));++ const QString status = obj.value("status").toString();+ m.active = (status == QStringLiteral("active"));+ m.closed = (status == QStringLiteral("closed") || status == QStringLiteral("determined") ||+ status == QStringLiteral("finalized"));++ pr::Outcome yes;+ yes.name = QStringLiteral("Yes");+ yes.asset_id = m.key.asset_ids[0];+ yes.price = str_or_num(obj.value("yes_bid_dollars"));+ pr::Outcome no;+ no.name = QStringLiteral("No");+ no.asset_id = m.key.asset_ids[1];+ no.price = str_or_num(obj.value("no_bid_dollars"));+ m.outcomes = {yes, no};++ m.extras.insert(QStringLiteral("yes_ask_dollars"), str_or_num(obj.value("yes_ask_dollars")));+ m.extras.insert(QStringLiteral("no_ask_dollars"), str_or_num(obj.value("no_ask_dollars")));+ m.extras.insert(QStringLiteral("last_price_dollars"), str_or_num(obj.value("last_price_dollars")));+ m.extras.insert(QStringLiteral("volume_24h_fp"), fp_to_double(obj.value("volume_24h_fp")));+ m.extras.insert(QStringLiteral("can_close_early"), obj.value("can_close_early").toBool());+ m.extras.insert(QStringLiteral("market_type"), obj.value("market_type").toString());+ m.extras.insert(QStringLiteral("yes_sub_title"), obj.value("yes_sub_title").toString());+ m.extras.insert(QStringLiteral("no_sub_title"), obj.value("no_sub_title").toString());+ m.extras.insert(QStringLiteral("settlement_ts"), qint64(obj.value("settlement_ts").toDouble()));+ return m;+}++static pr::PredictionEvent parse_event(const QJsonObject& obj) {+ pr::PredictionEvent e;+ e.key.exchange_id = QString::fromLatin1(kExchangeId);+ e.key.event_id = obj.value("event_ticker").toString();+ e.title = obj.value("title").toString();+ if (e.title.isEmpty()) e.title = obj.value("sub_title").toString();+ e.description = obj.value("sub_title").toString();+ e.category = obj.value("series_ticker").toString();+ // Kalshi doesn't give event-level volume; aggregate from markets below.+ e.volume = 0.0;++ const QString status = obj.value("status").toString();+ e.active = status == QStringLiteral("active") || status == QStringLiteral("open");+ e.closed = status == QStringLiteral("closed") || status == QStringLiteral("settled");++ const auto mk_arr = obj.value("markets").toArray();+ e.markets.reserve(mk_arr.size());+ for (const auto& v : mk_arr) {+ auto m = parse_market(v.toObject());+ e.volume += m.volume;+ e.markets.push_back(m);+ }+ return e;+}++// ── KalshiRestClient ────────────────────────────────────────────────────────++KalshiRestClient::KalshiRestClient(QObject* parent) : QObject(parent) {+ nam_ = new QNetworkAccessManager(this);+}++KalshiRestClient::~KalshiRestClient() = default;++void KalshiRestClient::set_demo_mode(bool demo) { demo_ = demo; }++QString KalshiRestClient::base_url() const { return demo_ ? kDemoBase : kProdBase; }++QString KalshiRestClient::absolute_url(const QString& path) const {+ if (path.startsWith(QStringLiteral("http"))) return path;+ return base_url() + (path.startsWith('/') ? path : QStringLiteral("/") + path);+}++void KalshiRestClient::get_json(const QString& path, JsonCallback on_success, const QString& error_ctx) {+ QNetworkRequest req{QUrl(absolute_url(path))};+ req.setHeader(QNetworkRequest::UserAgentHeader, QStringLiteral("FinceptTerminal/4.0"));+ auto* reply = nam_->get(req);+ QPointer<KalshiRestClient> self = this;+ connect(reply, &QNetworkReply::finished, this, [self, reply, on_success, error_ctx]() {+ reply->deleteLater();+ if (!self) return;+ const auto data = reply->readAll();+ if (reply->error() != QNetworkReply::NoError) {+ const QString msg = QStringLiteral("%1: %2").arg(reply->errorString(),+ QString::fromUtf8(data.left(200)));+ emit self->request_error(error_ctx, msg);+ return;+ }+ QJsonParseError perr;+ auto doc = QJsonDocument::fromJson(data, &perr);+ if (doc.isNull()) {+ emit self->request_error(error_ctx, QStringLiteral("JSON parse: ") + perr.errorString());+ return;+ }+ on_success(doc);+ });+}++// ── fetch_markets ───────────────────────────────────────────────────────────++void KalshiRestClient::fetch_markets(const QString& status, const QString& event_ticker,+ const QString& series_ticker, const QString& tickers,+ int limit, const QString& cursor) {+ QUrlQuery q;+ if (!status.isEmpty()) q.addQueryItem("status", status);+ if (!event_ticker.isEmpty()) q.addQueryItem("event_ticker", event_ticker);+ if (!series_ticker.isEmpty()) q.addQueryItem("series_ticker", series_ticker);+ if (!tickers.isEmpty()) q.addQueryItem("tickers", tickers);+ q.addQueryItem("limit", QString::number(qBound(1, limit, 1000)));+ if (!cursor.isEmpty()) q.addQueryItem("cursor", cursor);+ QUrl u(base_url() + QStringLiteral("/markets"));+ u.setQuery(q);++ QPointer<KalshiRestClient> self = this;+ get_json(u.toString(base_url().startsWith(QStringLiteral("https")) ?+ QUrl::FullyEncoded : QUrl::PrettyDecoded),+ [self](const QJsonDocument& doc) {+ if (!self) return;+ const auto obj = doc.object();+ QVector<pr::PredictionMarket> markets;+ const auto arr = obj.value("markets").toArray();+ markets.reserve(arr.size());+ for (const auto& v : arr) markets.push_back(parse_market(v.toObject()));+ emit self->markets_ready(markets, obj.value("cursor").toString());+ },+ QStringLiteral("Kalshi.fetch_markets"));+}++void KalshiRestClient::fetch_market(const QString& ticker) {+ QPointer<KalshiRestClient> self = this;+ get_json(QStringLiteral("/markets/") + ticker,+ [self](const QJsonDocument& doc) {+ if (!self) return;+ const auto m = parse_market(doc.object().value("market").toObject());+ emit self->market_detail_ready(m);+ },+ QStringLiteral("Kalshi.fetch_market"));+}++// ── fetch_events ────────────────────────────────────────────────────────────++void KalshiRestClient::fetch_events(const QString& status, const QString& series_ticker,+ bool with_nested_markets, int limit, const QString& cursor) {+ QUrlQuery q;+ if (!status.isEmpty()) q.addQueryItem("status", status);+ if (!series_ticker.isEmpty()) q.addQueryItem("series_ticker", series_ticker);+ q.addQueryItem("with_nested_markets", with_nested_markets ? "true" : "false");+ q.addQueryItem("limit", QString::number(qBound(1, limit, 1000)));+ if (!cursor.isEmpty()) q.addQueryItem("cursor", cursor);+ QUrl u(base_url() + QStringLiteral("/events"));+ u.setQuery(q);++ QPointer<KalshiRestClient> self = this;+ get_json(u.toString(),+ [self](const QJsonDocument& doc) {+ if (!self) return;+ const auto obj = doc.object();+ QVector<pr::PredictionEvent> events;+ const auto arr = obj.value("events").toArray();+ events.reserve(arr.size());+ for (const auto& v : arr) events.push_back(parse_event(v.toObject()));+ emit self->events_ready(events, obj.value("cursor").toString());+ },+ QStringLiteral("Kalshi.fetch_events"));+}++void KalshiRestClient::fetch_event(const QString& event_ticker) {+ QPointer<KalshiRestClient> self = this;+ get_json(QStringLiteral("/events/") + event_ticker + QStringLiteral("?with_nested_markets=true"),+ [self](const QJsonDocument& doc) {+ if (!self) return;+ auto obj = doc.object();+ auto ev_obj = obj.value("event").toObject();+ // Depending on with_nested_markets, markets may live at the+ // top level or inside the event object. Normalise.+ if (!ev_obj.contains("markets")) {+ ev_obj.insert("markets", obj.value("markets"));+ }+ emit self->event_detail_ready(parse_event(ev_obj));+ },+ QStringLiteral("Kalshi.fetch_event"));+}++// ── fetch_series (used as tags) ─────────────────────────────────────────────++void KalshiRestClient::fetch_series(const QString& status) {+ QUrlQuery q;+ if (!status.isEmpty()) q.addQueryItem("status", status);+ QUrl u(base_url() + QStringLiteral("/series"));+ u.setQuery(q);++ QPointer<KalshiRestClient> self = this;+ get_json(u.toString(),+ [self](const QJsonDocument& doc) {+ if (!self) return;+ const auto arr = doc.object().value("series").toArray();+ QStringList tickers;+ tickers.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ const QString t = o.value("ticker").toString();+ if (!t.isEmpty()) tickers.push_back(t);+ }+ emit self->tags_ready(tickers);+ },+ QStringLiteral("Kalshi.fetch_series"));+}++// ── fetch_order_book ────────────────────────────────────────────────────────++static void fill_book_from_levels(pr::PredictionOrderBook& book, const QJsonArray& levels_bids,+ const QJsonArray& opposite_bids) {+ // `levels_bids` are this side's bids (best first). Convert directly.+ for (const auto& v : levels_bids) {+ const auto arr = v.toArray();+ if (arr.size() < 2) continue;+ book.bids.push_back({str_or_num(arr[0]), fp_to_double(arr[1])});+ }+ // Asks are synthesised from the opposite side's bids:+ // "a YES ask at $X is equivalent to a NO bid at $(1 - X)."+ for (const auto& v : opposite_bids) {+ const auto arr = v.toArray();+ if (arr.size() < 2) continue;+ const double opp_price = str_or_num(arr[0]);+ book.asks.push_back({1.0 - opp_price, fp_to_double(arr[1])});+ }+ // Asks naturally come out ascending after this inversion, because+ // Kalshi returns NO bids best-first (highest NO price), which maps+ // to the lowest YES ask first.+}++void KalshiRestClient::fetch_order_book(const QString& ticker, int depth) {+ QUrlQuery q;+ if (depth > 0) q.addQueryItem("depth", QString::number(depth));+ QUrl u(base_url() + QStringLiteral("/markets/") + ticker + QStringLiteral("/orderbook"));+ u.setQuery(q);++ const QString ticker_copy = ticker;+ QPointer<KalshiRestClient> self = this;+ get_json(u.toString(),+ [self, ticker_copy](const QJsonDocument& doc) {+ if (!self) return;+ const auto ob = doc.object().value("orderbook_fp").toObject();+ const auto yes_bids = ob.value("yes_dollars").toArray();+ const auto no_bids = ob.value("no_dollars").toArray();++ pr::PredictionOrderBook yes_book;+ yes_book.asset_id = ticker_copy + QStringLiteral(":yes");+ fill_book_from_levels(yes_book, yes_bids, no_bids);++ pr::PredictionOrderBook no_book;+ no_book.asset_id = ticker_copy + QStringLiteral(":no");+ fill_book_from_levels(no_book, no_bids, yes_bids);++ emit self->order_book_ready(yes_book, no_book, ticker_copy);+ },+ QStringLiteral("Kalshi.fetch_order_book"));+}++// ── fetch_candlesticks ──────────────────────────────────────────────────────++void KalshiRestClient::fetch_candlesticks(const QString& series_ticker, const QString& ticker,+ int period_interval_min, qint64 start_ts, qint64 end_ts) {+ QUrlQuery q;+ q.addQueryItem("period_interval", QString::number(period_interval_min));+ if (start_ts > 0) q.addQueryItem("start_ts", QString::number(start_ts));+ if (end_ts > 0) q.addQueryItem("end_ts", QString::number(end_ts));+ QUrl u(base_url() + QStringLiteral("/series/") + series_ticker ++ QStringLiteral("/markets/") + ticker + QStringLiteral("/candlesticks"));+ u.setQuery(q);++ const QString ticker_copy = ticker;+ QPointer<KalshiRestClient> self = this;+ get_json(u.toString(),+ [self, ticker_copy](const QJsonDocument& doc) {+ if (!self) return;+ pr::PriceHistory h;+ h.asset_id = ticker_copy + QStringLiteral(":yes");+ const auto arr = doc.object().value("candlesticks").toArray();+ h.points.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ const qint64 ts = qint64(o.value("end_period_ts").toDouble()) * 1000;+ const auto price = o.value("price").toObject();+ // Fall back to yes_bid close if no trades happened.+ QJsonValue close = price.value("close_dollars");+ if (close.isNull() || close.isUndefined()) {+ close = o.value("yes_bid").toObject().value("close_dollars");+ }+ const double p = str_or_num(close);+ if (ts > 0 && p > 0) h.points.push_back({ts, p});+ }+ emit self->price_history_ready(h, ticker_copy);+ },+ QStringLiteral("Kalshi.fetch_candlesticks"));+}++// ── fetch_market_trades ─────────────────────────────────────────────────────++void KalshiRestClient::fetch_market_trades(const QString& ticker, int limit, const QString& cursor) {+ QUrlQuery q;+ q.addQueryItem("ticker", ticker);+ q.addQueryItem("limit", QString::number(qBound(1, limit, 1000)));+ if (!cursor.isEmpty()) q.addQueryItem("cursor", cursor);+ QUrl u(base_url() + QStringLiteral("/markets/trades"));+ u.setQuery(q);++ QPointer<KalshiRestClient> self = this;+ get_json(u.toString(),+ [self](const QJsonDocument& doc) {+ if (!self) return;+ QVector<pr::PredictionTrade> trades;+ const auto arr = doc.object().value("trades").toArray();+ trades.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ pr::PredictionTrade t;+ t.asset_id = o.value("ticker").toString() + QStringLiteral(":yes");+ t.side = o.value("taker_side").toString().toUpper();+ if (t.side.isEmpty()) t.side = QStringLiteral("BUY");+ t.price = str_or_num(o.value("yes_price_dollars"));+ if (t.price <= 0) t.price = str_or_num(o.value("price_dollars"));+ t.size = fp_to_double(o.value("count_fp"));+ t.ts_ms = qint64(o.value("created_time_ts").toDouble()) * 1000;+ if (t.ts_ms <= 0) {+ const QString iso = o.value("created_time").toString();+ t.ts_ms = QDateTime::fromString(iso, Qt::ISODate).toMSecsSinceEpoch();+ }+ trades.push_back(t);+ }+ emit self->trades_ready(trades);+ },+ QStringLiteral("Kalshi.fetch_market_trades"));+}++} // namespace fincept::services::prediction::kalshi_nsdiff --git a/fincept-qt/src/services/prediction/kalshi/KalshiRestClient.h b/fincept-qt/src/services/prediction/kalshi/KalshiRestClient.hnew file mode 100644index 000000000..092c1c87e--- /dev/null+++ b/fincept-qt/src/services/prediction/kalshi/KalshiRestClient.h@@ -0,0 +1,95 @@+#pragma once++#include "services/prediction/PredictionTypes.h"++#include <QObject>+#include <QString>+#include <QStringList>++#include <functional>++class QJsonDocument;+class QJsonObject;+class QNetworkAccessManager;++namespace fincept::services::prediction::kalshi_ns {++/// Public (unsigned) REST client for the Kalshi v2 API.+///+/// Base URL : https://api.elections.kalshi.com/trade-api/v2+/// Demo URL : https://demo-api.kalshi.co/trade-api/v2+///+/// This client owns one QNetworkAccessManager for all public calls. Each+/// method emits its own `*_ready` signal on success and `request_error`+/// on failure. Authenticated endpoints (orders, positions, fills, balance)+/// are NOT implemented here — Phase 7 adds them via a Python bridge that+/// signs requests with the user's RSA private key.+class KalshiRestClient : public QObject {+ Q_OBJECT+ public:+ explicit KalshiRestClient(QObject* parent = nullptr);+ ~KalshiRestClient() override;++ /// Swap base URL between production and demo environments.+ void set_demo_mode(bool demo);+ bool demo_mode() const { return demo_; }+ QString base_url() const;++ // ── Public endpoints ─────────────────────────────────────────────────++ /// GET /markets — paginated; pass empty cursor on first call.+ void fetch_markets(const QString& status = QStringLiteral("open"),+ const QString& event_ticker = QString(),+ const QString& series_ticker = QString(),+ const QString& tickers = QString(),+ int limit = 100,+ const QString& cursor = QString());+ /// GET /markets/{ticker} — single market detail.+ void fetch_market(const QString& ticker);+ /// GET /events — paginated; event_list with optional status filter.+ void fetch_events(const QString& status = QStringLiteral("open"),+ const QString& series_ticker = QString(),+ bool with_nested_markets = true,+ int limit = 100,+ const QString& cursor = QString());+ /// GET /events/{event_ticker} — single event + nested markets.+ void fetch_event(const QString& event_ticker);+ /// GET /series — used as Kalshi's "tag/category" list.+ void fetch_series(const QString& status = QStringLiteral("open"));+ /// GET /markets/{ticker}/orderbook — depth 0 = all levels.+ void fetch_order_book(const QString& ticker, int depth = 20);+ /// GET /markets/{ticker}/candlesticks — period_interval in minutes (1, 60, 1440).+ void fetch_candlesticks(const QString& series_ticker, const QString& ticker,+ int period_interval_min, qint64 start_ts, qint64 end_ts);+ /// GET /markets/{ticker}/trades — recent trades on a single market.+ void fetch_market_trades(const QString& ticker, int limit = 100,+ const QString& cursor = QString());++ signals:+ // Each signal carries (markets, cursor) so callers can paginate.+ void markets_ready(const QVector<fincept::services::prediction::PredictionMarket>& markets,+ const QString& next_cursor);+ void market_detail_ready(const fincept::services::prediction::PredictionMarket& market);+ void events_ready(const QVector<fincept::services::prediction::PredictionEvent>& events,+ const QString& next_cursor);+ void event_detail_ready(const fincept::services::prediction::PredictionEvent& event);+ void tags_ready(const QStringList& series_tickers);+ void order_book_ready(const fincept::services::prediction::PredictionOrderBook& yes_book,+ const fincept::services::prediction::PredictionOrderBook& no_book,+ const QString& ticker);+ void price_history_ready(const fincept::services::prediction::PriceHistory& yes_history,+ const QString& ticker);+ void trades_ready(const QVector<fincept::services::prediction::PredictionTrade>& trades);++ void request_error(const QString& context, const QString& message);++ private:+ using JsonCallback = std::function<void(const QJsonDocument&)>;+ void get_json(const QString& path, JsonCallback on_success, const QString& error_ctx);+ QString absolute_url(const QString& path) const;++ QNetworkAccessManager* nam_ = nullptr;+ bool demo_ = false;+};++} // namespace fincept::services::prediction::kalshi_nsdiff --git a/fincept-qt/src/services/prediction/kalshi/KalshiWsClient.cpp b/fincept-qt/src/services/prediction/kalshi/KalshiWsClient.cppnew file mode 100644index 000000000..777264854--- /dev/null+++ b/fincept-qt/src/services/prediction/kalshi/KalshiWsClient.cpp@@ -0,0 +1,227 @@+#include "services/prediction/kalshi/KalshiWsClient.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "datahub/DataHubMetaTypes.h"+#include "datahub/TopicPolicy.h"+#include "network/websocket/WebSocketClient.h"++#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>++namespace fincept::services::prediction::kalshi_ns {++namespace pr = fincept::services::prediction;++static constexpr int kPingIntervalMs = 20000;++static double kalshi_fp_to_double(const QJsonValue& v) {+ if (v.isString()) return v.toString().toDouble();+ return v.toDouble();+}++// ── Construction / lifecycle ────────────────────────────────────────────────++KalshiWsClient::KalshiWsClient(QObject* parent) : QObject(parent) {+ ws_ = new fincept::WebSocketClient(this);+ connect(ws_, &fincept::WebSocketClient::connected, this, &KalshiWsClient::on_connected);+ connect(ws_, &fincept::WebSocketClient::disconnected, this, &KalshiWsClient::on_disconnected);+ connect(ws_, &fincept::WebSocketClient::message_received, this, &KalshiWsClient::on_message);+ connect(ws_, &fincept::WebSocketClient::error_occurred, this, &KalshiWsClient::on_error);++ ping_timer_ = new QTimer(this);+ ping_timer_->setInterval(kPingIntervalMs);+ connect(ping_timer_, &QTimer::timeout, this, &KalshiWsClient::send_ping);+}++KalshiWsClient::~KalshiWsClient() = default;++// ── Credentials ─────────────────────────────────────────────────────────────++void KalshiWsClient::set_credentials(const KalshiCredentials& creds) {+ const bool had = creds_.is_valid();+ creds_ = creds;+ if (had && !creds_.is_valid()) {+ disconnect();+ }+ if (creds_.is_valid() && !subscribed_tickers_.isEmpty()) {+ ensure_connected();+ }+}++bool KalshiWsClient::has_credentials() const { return creds_.is_valid(); }++// ── Subscribe ───────────────────────────────────────────────────────────────++void KalshiWsClient::subscribe(const QStringList& market_tickers) {+ for (const auto& t : market_tickers) subscribed_tickers_.insert(t);+ if (!creds_.is_valid()) {+ LOG_INFO("KalshiWS",+ "Subscribe deferred — no credentials configured (Phase 7 will enable streaming)");+ return;+ }+ ensure_connected();+ if (connected_) send_subscribe(market_tickers);+}++void KalshiWsClient::unsubscribe(const QStringList& market_tickers) {+ for (const auto& t : market_tickers) subscribed_tickers_.remove(t);+ if (subscribed_tickers_.isEmpty()) disconnect();+}++void KalshiWsClient::unsubscribe_all() {+ subscribed_tickers_.clear();+ disconnect();+}++void KalshiWsClient::disconnect() {+ ping_timer_->stop();+ ws_->disconnect();+}++void KalshiWsClient::ensure_connected() {+ // Phase 4 keeps this a stub that logs what *would* happen. Phase 7+ // wires in the RSA-PSS signing via the Python bridge and flips the+ // ws_->connect_to() call live. The connect needs KALSHI-ACCESS-KEY /+ // -SIGNATURE / -TIMESTAMP headers which fincept::WebSocketClient+ // doesn't expose — adding that is also Phase 7 work.+ if (ws_->is_connected()) return;+ if (!creds_.is_valid()) return;+ LOG_DEBUG("KalshiWS",+ QStringLiteral("Ready to connect to ") + (creds_.use_demo ? kDemoWs : kProdWs) ++ QStringLiteral(" (connect deferred to Phase 7)"));+}++void KalshiWsClient::send_subscribe(const QStringList& tickers) {+ QJsonObject params;+ QJsonArray channels;+ channels.append("orderbook_delta");+ channels.append("ticker");+ params.insert("channels", channels);+ QJsonArray tarr;+ for (const auto& t : tickers) tarr.append(t);+ params.insert("market_tickers", tarr);++ QJsonObject msg;+ msg.insert("id", next_msg_id_++);+ msg.insert("cmd", "subscribe");+ msg.insert("params", params);++ ws_->send(QString::fromUtf8(QJsonDocument(msg).toJson(QJsonDocument::Compact)));+ LOG_INFO("KalshiWS", "Subscribed to " + QString::number(tickers.size()) + " tickers");+}++void KalshiWsClient::send_ping() {+ if (!connected_) return;+ QJsonObject ping;+ ping.insert("id", next_msg_id_++);+ ping.insert("cmd", "ping");+ ws_->send(QString::fromUtf8(QJsonDocument(ping).toJson(QJsonDocument::Compact)));+}++// ── Socket handlers ─────────────────────────────────────────────────────────++void KalshiWsClient::on_connected() {+ connected_ = true;+ ping_timer_->start();+ LOG_INFO("KalshiWS", "Connected");+ emit connection_status_changed(true);+ if (!subscribed_tickers_.isEmpty()) {+ send_subscribe(QStringList(subscribed_tickers_.begin(), subscribed_tickers_.end()));+ }+}++void KalshiWsClient::on_disconnected() {+ connected_ = false;+ ping_timer_->stop();+ LOG_WARN("KalshiWS", "Disconnected");+ emit connection_status_changed(false);+}++void KalshiWsClient::on_error(const QString& err) {+ LOG_ERROR("KalshiWS", "Error: " + err);+}++void KalshiWsClient::on_message(const QString& msg) {+ if (msg.isEmpty()) return;+ QJsonParseError perr;+ auto doc = QJsonDocument::fromJson(msg.toUtf8(), &perr);+ if (doc.isNull()) return;+ const auto obj = doc.object();+ const QString type = obj.value("type").toString();+ if (type != QStringLiteral("orderbook_snapshot") &&+ type != QStringLiteral("orderbook_delta") &&+ type != QStringLiteral("ticker")) {+ return;+ }++ const auto payload = obj.value("msg").toObject();+ const QString ticker = payload.value("market_ticker").toString();+ if (ticker.isEmpty()) return;++ if (type == QStringLiteral("ticker")) {+ const double yes_price = kalshi_fp_to_double(payload.value("yes_bid_dollars"));+ if (yes_price > 0) publish_price(ticker + QStringLiteral(":yes"), yes_price);+ const double no_price = kalshi_fp_to_double(payload.value("no_bid_dollars"));+ if (no_price > 0) publish_price(ticker + QStringLiteral(":no"), no_price);+ return;+ }++ // Snapshot / delta path — callers should rebuild their local book from+ // the snapshot then apply deltas. Phase 4 ships only the transport;+ // full reconciliation (seq gap detection, REST resnapshot) lands with+ // Phase 7 trading work when live streaming is genuinely exercised.+ pr::PredictionOrderBook book;+ const QString side = payload.value("side").toString();+ book.asset_id = ticker + QStringLiteral(":") + (side.isEmpty() ? "yes" : side);+ book.last_update_ms = payload.value("ts").toVariant().toLongLong() * 1000;+ publish_orderbook(book.asset_id, book);+}++// ── Hub publish helpers ─────────────────────────────────────────────────────++void KalshiWsClient::publish_price(const QString& asset_id, double price) {+ emit price_updated(asset_id, price);+ const QString topic = QStringLiteral("prediction:kalshi:price:") + asset_id;+ fincept::datahub::DataHub::instance().publish(topic, QVariant(price));+}++void KalshiWsClient::publish_orderbook(const QString& asset_id, const pr::PredictionOrderBook& book) {+ emit orderbook_updated(asset_id, book);+ const QString topic = QStringLiteral("prediction:kalshi:orderbook:") + asset_id;+ fincept::datahub::DataHub::instance().publish(topic, QVariant::fromValue(book));+}++// ── DataHub producer ────────────────────────────────────────────────────────++QStringList KalshiWsClient::topic_patterns() const {+ return {+ QStringLiteral("prediction:kalshi:price:*"),+ QStringLiteral("prediction:kalshi:orderbook:*"),+ };+}++void KalshiWsClient::refresh(const QStringList& /*topics*/) {+ // push_only: scheduler never calls this.+}++void KalshiWsClient::ensure_registered_with_hub() {+ if (hub_registered_) return;+ auto& hub = fincept::datahub::DataHub::instance();+ hub.register_producer(this);++ fincept::datahub::TopicPolicy push_only;+ push_only.push_only = true;+ push_only.ttl_ms = 0;+ push_only.min_interval_ms = 0;++ hub.set_policy_pattern(QStringLiteral("prediction:kalshi:price:*"), push_only);+ hub.set_policy_pattern(QStringLiteral("prediction:kalshi:orderbook:*"), push_only);++ hub_registered_ = true;+ LOG_INFO("KalshiWS",+ "Registered with DataHub (prediction:kalshi:price:*, prediction:kalshi:orderbook:*)");+}++} // namespace fincept::services::prediction::kalshi_nsdiff --git a/fincept-qt/src/services/prediction/kalshi/KalshiWsClient.h b/fincept-qt/src/services/prediction/kalshi/KalshiWsClient.hnew file mode 100644index 000000000..85845c8ad--- /dev/null+++ b/fincept-qt/src/services/prediction/kalshi/KalshiWsClient.h@@ -0,0 +1,99 @@+#pragma once++#include "datahub/Producer.h"+#include "services/prediction/PredictionTypes.h"+#include "services/prediction/kalshi/KalshiCredentials.h"++#include <QObject>+#include <QSet>+#include <QString>+#include <QStringList>+#include <QTimer>++namespace fincept {+class WebSocketClient;+}++namespace fincept::services::prediction::kalshi_ns {++/// Kalshi v2 WebSocket client.+///+/// URL : wss://api.elections.kalshi.com/trade-api/ws/v2+///+/// Unlike Polymarket, Kalshi's WS requires an authenticated connection+/// even for public market data (orderbook_delta, ticker, trade channels).+/// Connection is deferred until KalshiCredentials are supplied; without+/// credentials this client silently no-ops and screens fall back to REST+/// polling.+///+/// Hub producer for:+/// prediction:kalshi:price:<ticker>:<side> (push-only)+/// prediction:kalshi:orderbook:<ticker>:<side> (push-only)+///+/// Wire protocol (subscribe):+/// {"id":1,"cmd":"subscribe","params":{+/// "channels":["orderbook_delta","ticker"],+/// "market_tickers":["<ticker>", …]+/// }}+///+/// Delta reconciliation: Kalshi emits `orderbook_snapshot` once per+/// subscription, then incremental `orderbook_delta`. Messages include a+/// monotonic `seq`; on gap we re-request a snapshot via REST.+class KalshiWsClient : public QObject, public fincept::datahub::Producer {+ Q_OBJECT+ public:+ explicit KalshiWsClient(QObject* parent = nullptr);+ ~KalshiWsClient() override;++ /// Update / clear credentials. Passing an invalid set disconnects.+ void set_credentials(const KalshiCredentials& creds);+ bool has_credentials() const;++ void subscribe(const QStringList& market_tickers);+ void unsubscribe(const QStringList& market_tickers);+ void unsubscribe_all();+ void disconnect();+ bool is_connected() const { return connected_; }++ /// Register with the hub + install prediction:kalshi:* policies.+ void ensure_registered_with_hub();++ // datahub::Producer+ QStringList topic_patterns() const override;+ void refresh(const QStringList& topics) override;+ int max_requests_per_sec() const override { return 2; }++ signals:+ void price_updated(const QString& asset_id, double price);+ void orderbook_updated(const QString& asset_id,+ const fincept::services::prediction::PredictionOrderBook& book);+ void connection_status_changed(bool connected);++ private slots:+ void on_connected();+ void on_disconnected();+ void on_message(const QString& msg);+ void on_error(const QString& err);+ void send_ping();++ private:+ void ensure_connected();+ void send_subscribe(const QStringList& tickers);+ void publish_price(const QString& asset_id, double price);+ void publish_orderbook(const QString& asset_id,+ const fincept::services::prediction::PredictionOrderBook& book);++ fincept::WebSocketClient* ws_ = nullptr;+ QTimer* ping_timer_ = nullptr;++ KalshiCredentials creds_;+ QSet<QString> subscribed_tickers_;+ bool connected_ = false;+ bool hub_registered_ = false;+ int next_msg_id_ = 1;++ static constexpr const char* kProdWs = "wss://api.elections.kalshi.com/trade-api/ws/v2";+ static constexpr const char* kDemoWs = "wss://demo-api.kalshi.co/trade-api/ws/v2";+};++} // namespace fincept::services::prediction::kalshi_nsdiff --git a/fincept-qt/src/services/prediction/polymarket/PolymarketAdapter.cpp b/fincept-qt/src/services/prediction/polymarket/PolymarketAdapter.cppnew file mode 100644index 000000000..c134ae42a--- /dev/null+++ b/fincept-qt/src/services/prediction/polymarket/PolymarketAdapter.cpp@@ -0,0 +1,587 @@+#include "services/prediction/polymarket/PolymarketAdapter.h"++#include "core/logging/Logger.h"+#include "python/PythonRunner.h"+#include "services/polymarket/PolymarketService.h"+#include "services/polymarket/PolymarketWebSocket.h"+#include "services/prediction/PredictionCredentialStore.h"+#include "services/prediction/polymarket/PolymarketTypeMap.h"++#include <QDateTime>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QPointer>+#include <QUuid>++namespace fincept::services::prediction::polymarket_ns {++namespace pm = fincept::services::polymarket;+namespace pr = fincept::services::prediction;+namespace pmap = fincept::services::prediction::polymarket_map;++PolymarketAdapter::PolymarketAdapter(QObject* parent)+ : fincept::services::prediction::PredictionExchangeAdapter(parent) {+ service_ = &pm::PolymarketService::instance();+ ws_ = &pm::PolymarketWebSocket::instance();+ wire_service();+ wire_ws();+}++PolymarketAdapter::~PolymarketAdapter() = default;++// ── Identity ────────────────────────────────────────────────────────────────++QString PolymarketAdapter::id() const { return QStringLiteral("polymarket"); }+QString PolymarketAdapter::display_name() const { return QStringLiteral("Polymarket"); }++pr::ExchangeCapabilities PolymarketAdapter::capabilities() const {+ pr::ExchangeCapabilities c;+ c.has_events = true;+ c.has_multi_outcome = true; // neg-risk events+ c.has_orderbook_ws = true;+ c.has_trade_ws = false;+ c.has_rewards = true;+ c.has_maker_rebates = true;+ c.has_leaderboard = true;+ c.supports_limit_orders = true;+ c.supports_market_orders = true;+ c.supports_gtd = true;+ c.supports_fok = true;+ c.supports_fak = true;+ c.supports_decrease_order = false;+ c.supports_batch_orders = false;+ c.quote_currency = QStringLiteral("USDC");+ c.min_order_size = 5.0;+ c.default_tick_size = 0.01;+ c.max_requests_per_sec = 10;+ return c;+}++// ── Read endpoints ──────────────────────────────────────────────────────────++void PolymarketAdapter::list_markets(const QString& category, const QString& sort_by,+ int limit, int offset) {+ if (category.isEmpty() || category == QStringLiteral("ALL")) {+ service_->fetch_markets(sort_by, limit, offset, /*closed=*/false);+ } else {+ service_->fetch_markets_by_tag(category, sort_by, limit, offset);+ }+}++void PolymarketAdapter::list_events(const QString& /*category*/, const QString& sort_by,+ int limit, int offset) {+ service_->fetch_events(sort_by, limit, offset, /*closed=*/false);+}++void PolymarketAdapter::search(const QString& query, int limit) {+ service_->search_markets(query, limit);+}++void PolymarketAdapter::list_tags() {+ service_->fetch_tags();+}++void PolymarketAdapter::fetch_market(const pr::MarketKey& key) {+ bool ok = false;+ const int id = key.market_id.toInt(&ok);+ if (ok && id > 0) {+ service_->fetch_market_by_id(id);+ } else {+ emit error_occurred(QStringLiteral("fetch_market"),+ QStringLiteral("Polymarket fetch_market requires numeric market id"));+ }+}++void PolymarketAdapter::fetch_event(const pr::MarketKey& key) {+ bool ok = false;+ const int id = key.event_id.toInt(&ok);+ if (ok && id > 0) {+ service_->fetch_event_by_id(id);+ } else {+ emit error_occurred(QStringLiteral("fetch_event"),+ QStringLiteral("Polymarket fetch_event requires numeric event id"));+ }+}++void PolymarketAdapter::fetch_order_book(const QString& asset_id) {+ service_->fetch_order_book(asset_id);+}++void PolymarketAdapter::fetch_price_history(const QString& asset_id,+ const QString& interval, int fidelity) {+ last_history_asset_id_ = asset_id;+ service_->fetch_price_history(asset_id, interval, fidelity);+}++void PolymarketAdapter::fetch_recent_trades(const pr::MarketKey& key, int limit) {+ if (key.market_id.isEmpty()) {+ emit error_occurred(QStringLiteral("fetch_recent_trades"),+ QStringLiteral("Polymarket trades require condition id"));+ return;+ }+ service_->fetch_trades(key.market_id, limit);+}++void PolymarketAdapter::fetch_top_holders(const pr::MarketKey& key, int limit) {+ if (key.market_id.isEmpty()) return;+ service_->fetch_top_holders(key.market_id, limit);+}++void PolymarketAdapter::fetch_leaderboard(int limit) {+ service_->fetch_leaderboard(limit);+}++// ── WebSocket ───────────────────────────────────────────────────────────────++void PolymarketAdapter::subscribe_market(const QStringList& asset_ids) {+ ws_->subscribe(asset_ids);+}++void PolymarketAdapter::unsubscribe_market(const QStringList& asset_ids) {+ ws_->unsubscribe(asset_ids);+}++bool PolymarketAdapter::is_ws_connected() const {+ return ws_->is_connected();+}++// ── Auth ────────────────────────────────────────────────────────────────────++bool PolymarketAdapter::has_credentials() const {+ return creds_.has_value() && creds_->is_valid();+}++QString PolymarketAdapter::account_label() const {+ if (!creds_) return {};+ if (!cached_wallet_address_.isEmpty()) {+ return QStringLiteral("Poly:") + cached_wallet_address_.left(6) ++ QStringLiteral("…") + cached_wallet_address_.right(4);+ }+ return QStringLiteral("Polymarket");+}++void PolymarketAdapter::reload_credentials() {+ creds_ = pr::PredictionCredentialStore::load_polymarket();+ if (creds_) {+ LOG_INFO("PolymarketAdapter", "Credentials loaded from SecureStorage");+ } else {+ LOG_INFO("PolymarketAdapter", "No Polymarket credentials in SecureStorage");+ cached_wallet_address_.clear();+ }+ emit credentials_changed();+}++void PolymarketAdapter::stub_unsupported(const QString& ctx) {+ emit error_occurred(ctx, QStringLiteral("Polymarket adapter: not supported in this call"));+}++// ── Python bridge ───────────────────────────────────────────────────────────++QJsonObject PolymarketAdapter::creds_to_json(const pr::PolymarketCredentials& c) const {+ QJsonObject o;+ o.insert("private_key", c.private_key);+ if (!c.funder_address.isEmpty()) o.insert("funder", c.funder_address);+ o.insert("signature_type", c.signature_type);+ if (!c.api_key.isEmpty()) o.insert("api_key", c.api_key);+ if (!c.api_secret.isEmpty()) o.insert("api_secret", c.api_secret);+ if (!c.api_passphrase.isEmpty()) o.insert("api_passphrase", c.api_passphrase);+ return o;+}++void PolymarketAdapter::run_py(const QString& command, const QJsonObject& payload,+ std::function<void(const QJsonObject&)> on_ok, const QString& ctx) {+ const QString payload_str =+ QString::fromUtf8(QJsonDocument(payload).toJson(QJsonDocument::Compact));+ QPointer<PolymarketAdapter> self = this;+ fincept::python::PythonRunner::instance().run(+ QStringLiteral("prediction_polymarket.py"),+ {command, payload_str},+ [self, on_ok, ctx](fincept::python::PythonResult r) {+ if (!self) return;+ if (!r.success) {+ emit self->error_occurred(ctx, r.error.isEmpty() ? r.output : r.error);+ return;+ }+ const QString json_str = fincept::python::extract_json(r.output);+ QJsonParseError perr;+ auto doc = QJsonDocument::fromJson(json_str.toUtf8(), &perr);+ if (doc.isNull() || !doc.isObject()) {+ emit self->error_occurred(+ ctx,+ QStringLiteral("Python response is not JSON: ") + perr.errorString());+ return;+ }+ const auto obj = doc.object();+ if (!obj.value("ok").toBool()) {+ emit self->error_occurred(ctx, obj.value("error").toString(+ QStringLiteral("Python command failed")));+ return;+ }+ on_ok(obj);+ });+}++void PolymarketAdapter::ensure_api_creds(+ std::function<void(const pr::PolymarketCredentials&)> then, const QString& ctx) {+ if (!creds_ || !creds_->is_valid()) {+ emit error_occurred(ctx, QStringLiteral("No Polymarket credentials — connect an account first"));+ return;+ }+ if (!creds_->api_key.isEmpty()) {+ then(*creds_);+ return;+ }+ // Derive L2 creds via L1 EIP-712 signature and cache them.+ QPointer<PolymarketAdapter> self = this;+ run_py(QStringLiteral("derive_api_creds"), creds_to_json(*creds_),+ [self, then](const QJsonObject& resp) {+ if (!self || !self->creds_) return;+ self->creds_->api_key = resp.value("api_key").toString();+ self->creds_->api_secret = resp.value("api_secret").toString();+ self->creds_->api_passphrase = resp.value("api_passphrase").toString();+ pr::PredictionCredentialStore::save_polymarket(*self->creds_);+ LOG_INFO("PolymarketAdapter", "L2 API credentials derived and persisted");+ then(*self->creds_);+ },+ ctx);+}++// ── Authenticated endpoints ─────────────────────────────────────────────────++void PolymarketAdapter::fetch_balance() {+ const QString ctx = QStringLiteral("fetch_balance");+ QPointer<PolymarketAdapter> self = this;+ ensure_api_creds(+ [self](const pr::PolymarketCredentials& c) {+ if (!self) return;+ self->run_py(QStringLiteral("balance"), self->creds_to_json(c),+ [self](const QJsonObject& resp) {+ if (!self) return;+ pr::AccountBalance b;+ b.available = resp.value("available").toDouble();+ b.total_value = resp.value("total_value").toDouble();+ b.currency = resp.value("currency").toString("USDC");+ emit self->balance_ready(b);+ },+ QStringLiteral("fetch_balance"));+ },+ ctx);+}++void PolymarketAdapter::fetch_positions() {+ const QString ctx = QStringLiteral("fetch_positions");+ QPointer<PolymarketAdapter> self = this;+ ensure_api_creds(+ [self](const pr::PolymarketCredentials& c) {+ if (!self) return;+ self->run_py(QStringLiteral("positions"), self->creds_to_json(c),+ [self](const QJsonObject& resp) {+ if (!self) return;+ QVector<pr::PredictionPosition> out;+ const auto arr = resp.value("positions").toArray();+ out.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ pr::PredictionPosition p;+ p.asset_id = o.value("asset_id").toString();+ p.market_id = o.value("market_id").toString();+ p.outcome = o.value("outcome").toString();+ p.size = o.value("size").toDouble();+ p.avg_price = o.value("avg_price").toDouble();+ p.realized_pnl = o.value("realized_pnl").toDouble();+ p.unrealized_pnl = o.value("unrealized_pnl").toDouble();+ p.current_value = o.value("current_value").toDouble();+ out.push_back(p);+ }+ emit self->positions_ready(out);+ },+ QStringLiteral("fetch_positions"));+ },+ ctx);+}++void PolymarketAdapter::fetch_open_orders() {+ const QString ctx = QStringLiteral("fetch_open_orders");+ QPointer<PolymarketAdapter> self = this;+ ensure_api_creds(+ [self](const pr::PolymarketCredentials& c) {+ if (!self) return;+ self->run_py(QStringLiteral("open_orders"), self->creds_to_json(c),+ [self](const QJsonObject& resp) {+ if (!self) return;+ QVector<pr::OpenOrder> out;+ const auto arr = resp.value("orders").toArray();+ out.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ pr::OpenOrder ord;+ ord.order_id = o.value("order_id").toString();+ ord.asset_id = o.value("asset_id").toString();+ ord.market_id = o.value("market_id").toString();+ ord.outcome = o.value("outcome").toString();+ ord.side = o.value("side").toString();+ ord.order_type = o.value("order_type").toString();+ ord.price = o.value("price").toDouble();+ ord.size = o.value("size").toDouble();+ ord.filled = o.value("filled").toDouble();+ ord.status = o.value("status").toString();+ ord.created_ms = qint64(o.value("created_ms").toDouble());+ ord.expires_ms = qint64(o.value("expires_ms").toDouble());+ out.push_back(ord);+ }+ emit self->open_orders_ready(out);+ },+ QStringLiteral("fetch_open_orders"));+ },+ ctx);+}++void PolymarketAdapter::fetch_user_activity(int limit) {+ const QString ctx = QStringLiteral("fetch_user_activity");+ const int lim = limit;+ QPointer<PolymarketAdapter> self = this;+ ensure_api_creds(+ [self, lim](const pr::PolymarketCredentials& c) {+ if (!self) return;+ QJsonObject p = self->creds_to_json(c);+ p.insert("limit", lim);+ self->run_py(QStringLiteral("activity"), p,+ [self](const QJsonObject& resp) {+ if (!self) return;+ emit self->account_activity_ready(+ resp.value("activities").toArray().toVariantList());+ },+ QStringLiteral("fetch_user_activity"));+ },+ ctx);+}++void PolymarketAdapter::place_order(const pr::OrderRequest& req) {+ const QString ctx = QStringLiteral("place_order");+ // Copy into a struct that can be captured by value.+ struct Req {+ QString asset_id; QString side; QString order_type;+ double price; double size; qint64 expires_ms;+ QString tick_size; bool neg_risk;+ };+ Req r{req.asset_id, req.side, req.order_type, req.price, req.size, req.expires_ms,+ req.extras.value(QStringLiteral("tick_size"), QStringLiteral("0.01")).toString(),+ req.extras.value(QStringLiteral("neg_risk"), false).toBool()};++ QPointer<PolymarketAdapter> self = this;+ ensure_api_creds(+ [self, r](const pr::PolymarketCredentials& c) {+ if (!self) return;+ QJsonObject p = self->creds_to_json(c);+ p.insert("token_id", r.asset_id);+ p.insert("price", r.price);+ p.insert("size", r.size);+ p.insert("side", r.side);+ p.insert("order_type", r.order_type.isEmpty() ? QStringLiteral("GTC") : r.order_type);+ p.insert("tick_size", r.tick_size);+ p.insert("neg_risk", r.neg_risk);+ if (r.expires_ms > 0) p.insert("expiration", qint64(r.expires_ms / 1000));++ self->run_py(QStringLiteral("place_order"), p,+ [self](const QJsonObject& resp) {+ if (!self) return;+ pr::OrderResult out;+ out.ok = resp.value("ok").toBool();+ out.order_id = resp.value("order_id").toString();+ out.status = resp.value("status").toString();+ out.error_message = resp.value("error").toString();+ emit self->order_placed(out);+ },+ QStringLiteral("place_order"));+ },+ ctx);+}++void PolymarketAdapter::cancel_order(const QString& order_id) {+ const QString ctx = QStringLiteral("cancel_order");+ const QString oid = order_id;+ QPointer<PolymarketAdapter> self = this;+ ensure_api_creds(+ [self, oid](const pr::PolymarketCredentials& c) {+ if (!self) return;+ QJsonObject p = self->creds_to_json(c);+ p.insert("order_id", oid);+ self->run_py(QStringLiteral("cancel_order"), p,+ [self, oid](const QJsonObject& resp) {+ if (!self) return;+ emit self->order_cancelled(oid, resp.value("ok").toBool(),+ resp.value("error").toString());+ },+ QStringLiteral("cancel_order"));+ },+ ctx);+}++void PolymarketAdapter::cancel_all_for_market(const pr::MarketKey& key, const QString& asset_id) {+ const QString ctx = QStringLiteral("cancel_all_for_market");+ const QString market_id = key.market_id;+ const QString aid = asset_id;+ QPointer<PolymarketAdapter> self = this;+ ensure_api_creds(+ [self, market_id, aid](const pr::PolymarketCredentials& c) {+ if (!self) return;+ QJsonObject p = self->creds_to_json(c);+ p.insert("market_id", market_id);+ p.insert("asset_id", aid);+ self->run_py(QStringLiteral("cancel_market"), p,+ [self](const QJsonObject& /*resp*/) {+ if (!self) return;+ emit self->credentials_changed(); // triggers portfolio refresh+ },+ QStringLiteral("cancel_all_for_market"));+ },+ ctx);+}++// ── Hub registration ────────────────────────────────────────────────────────+// The hub producer for prediction:polymarket:* is PolymarketWebSocket — it+// registers itself from main.cpp. This method is a no-op but kept idempotent+// so screens can call it unconditionally on the active adapter.++void PolymarketAdapter::ensure_registered_with_hub() {+ if (hub_registered_) return;+ pm::PolymarketWebSocket::instance().ensure_registered_with_hub();+ hub_registered_ = true;+}++// ── Service wiring ──────────────────────────────────────────────────────────++void PolymarketAdapter::wire_service() {+ connect(service_, &pm::PolymarketService::markets_ready,+ this, &PolymarketAdapter::on_markets);+ connect(service_, &pm::PolymarketService::events_ready,+ this, &PolymarketAdapter::on_events);+ connect(service_, &pm::PolymarketService::tags_ready,+ this, &PolymarketAdapter::on_tags);+ connect(service_, &pm::PolymarketService::market_detail_ready,+ this, &PolymarketAdapter::on_market_detail);+ connect(service_, &pm::PolymarketService::event_detail_ready,+ this, &PolymarketAdapter::on_event_detail);+ connect(service_, &pm::PolymarketService::order_book_ready,+ this, &PolymarketAdapter::on_order_book);+ connect(service_, &pm::PolymarketService::price_history_ready,+ this, &PolymarketAdapter::on_price_history);+ connect(service_, &pm::PolymarketService::trades_ready,+ this, &PolymarketAdapter::on_trades);+ connect(service_, &pm::PolymarketService::request_error,+ this, &PolymarketAdapter::on_service_error);++ // Search results forward unchanged (converted to prediction types).+ connect(service_, &pm::PolymarketService::search_results_ready,+ this, [this](const QVector<pm::Market>& markets, const QVector<pm::Event>& events) {+ emit search_results_ready(pmap::to_prediction(markets),+ pmap::to_prediction(events));+ });++ // Leaderboard / holders forward as QVariantList — keep exchange-shaped+ // so the leaderboard widget can choose to upgrade to a typed model later.+ connect(service_, &pm::PolymarketService::leaderboard_ready,+ this, [this](const QVector<pm::LeaderboardEntry>& entries) {+ QVariantList out;+ out.reserve(entries.size());+ for (const auto& e : entries) {+ QVariantMap m;+ m.insert(QStringLiteral("rank"), e.rank);+ m.insert(QStringLiteral("address"), e.address);+ m.insert(QStringLiteral("display_name"), e.display_name);+ m.insert(QStringLiteral("profile_image"), e.profile_image);+ m.insert(QStringLiteral("pnl"), e.pnl);+ m.insert(QStringLiteral("volume"), e.volume);+ m.insert(QStringLiteral("num_trades"), e.num_trades);+ out.push_back(m);+ }+ emit leaderboard_ready(out);+ });+ connect(service_, &pm::PolymarketService::top_holders_ready,+ this, [this](const QVector<pm::TopHolder>& holders) {+ QVariantList out;+ out.reserve(holders.size());+ for (const auto& h : holders) {+ QVariantMap m;+ m.insert(QStringLiteral("rank"), h.rank);+ m.insert(QStringLiteral("address"), h.address);+ m.insert(QStringLiteral("display_name"), h.display_name);+ m.insert(QStringLiteral("position_size"), h.position_size);+ m.insert(QStringLiteral("entry_price"), h.entry_price);+ out.push_back(m);+ }+ emit top_holders_ready(out);+ });+}++void PolymarketAdapter::wire_ws() {+ connect(ws_, &pm::PolymarketWebSocket::price_updated,+ this, &PolymarketAdapter::on_ws_price);+ connect(ws_, &pm::PolymarketWebSocket::orderbook_updated,+ this, &PolymarketAdapter::on_ws_orderbook);+ connect(ws_, &pm::PolymarketWebSocket::connection_status_changed,+ this, &PolymarketAdapter::on_ws_status);+}++// ── Service slot handlers ───────────────────────────────────────────────────++void PolymarketAdapter::on_markets(const QVector<pm::Market>& markets) {+ emit markets_ready(pmap::to_prediction(markets));+}++void PolymarketAdapter::on_events(const QVector<pm::Event>& events) {+ emit events_ready(pmap::to_prediction(events));+}++void PolymarketAdapter::on_tags(const QVector<pm::Tag>& tags) {+ QStringList out;+ out.reserve(tags.size());+ for (const auto& t : tags) out.push_back(t.label);+ emit tags_ready(out);+}++void PolymarketAdapter::on_market_detail(const pm::Market& market) {+ emit market_detail_ready(pmap::to_prediction(market));+}++void PolymarketAdapter::on_event_detail(const pm::Event& event) {+ emit event_detail_ready(pmap::to_prediction(event));+}++void PolymarketAdapter::on_order_book(const pm::OrderBook& book) {+ emit order_book_ready(pmap::to_prediction(book));+}++void PolymarketAdapter::on_price_history(const pm::PriceHistory& history) {+ emit price_history_ready(pmap::to_prediction(history, last_history_asset_id_));+}++void PolymarketAdapter::on_trades(const QVector<pm::Trade>& trades) {+ emit recent_trades_ready(pmap::to_prediction(trades));+}++void PolymarketAdapter::on_service_error(const QString& ctx, const QString& msg) {+ emit error_occurred(ctx, msg);+}++// ── WebSocket slot handlers ─────────────────────────────────────────────────++void PolymarketAdapter::on_ws_price(const QString& asset_id, double price) {+ if (asset_id.isEmpty()) return;+ emit ws_price_updated(asset_id, price);+ // Hub publish is done by PolymarketWebSocket (the Producer).+}++void PolymarketAdapter::on_ws_orderbook(const QString& asset_id, const pm::OrderBook& book) {+ if (asset_id.isEmpty()) return;+ auto predicted = pmap::to_prediction(book);+ predicted.asset_id = asset_id;+ emit ws_orderbook_updated(asset_id, predicted);+}++void PolymarketAdapter::on_ws_status(bool connected) {+ emit ws_connection_changed(connected);+}++} // namespace fincept::services::prediction::polymarket_nsdiff --git a/fincept-qt/src/services/prediction/polymarket/PolymarketAdapter.h b/fincept-qt/src/services/prediction/polymarket/PolymarketAdapter.hnew file mode 100644index 000000000..f74268b70--- /dev/null+++ b/fincept-qt/src/services/prediction/polymarket/PolymarketAdapter.h@@ -0,0 +1,126 @@+#pragma once++#include "services/polymarket/PolymarketTypes.h"+#include "services/prediction/PredictionCredentialStore.h"+#include "services/prediction/PredictionExchangeAdapter.h"++#include <QSet>+#include <QString>+#include <QStringList>++#include <optional>++namespace fincept::services::polymarket {+class PolymarketService;+class PolymarketWebSocket;+} // namespace fincept::services::polymarket++namespace fincept::services::prediction::polymarket_ns {++/// Polymarket exchange adapter.+///+/// Translates the exchange-local services::polymarket::PolymarketService+/// (REST) and ::PolymarketWebSocket (WS) singletons into the unified+/// prediction::* types.+///+/// Hub topic ownership: PolymarketWebSocket is the DataHub producer for+/// `prediction:polymarket:*` — it registers itself in main.cpp via+/// ensure_registered_with_hub(). This adapter does NOT publish to the+/// hub; screens that want the typed PredictionOrderBook listen on the+/// adapter's Qt signals instead.+///+/// Authenticated endpoints are stubbed here and implemented in Phase 6+/// via the py_clob_client Python bridge.+class PolymarketAdapter : public fincept::services::prediction::PredictionExchangeAdapter {+ Q_OBJECT+ public:+ explicit PolymarketAdapter(QObject* parent = nullptr);+ ~PolymarketAdapter() override;++ // Identity+ QString id() const override;+ QString display_name() const override;+ fincept::services::prediction::ExchangeCapabilities capabilities() const override;++ // Read+ void list_markets(const QString& category, const QString& sort_by, int limit, int offset) override;+ void list_events(const QString& category, const QString& sort_by, int limit, int offset) override;+ void search(const QString& query, int limit) override;+ void list_tags() override;+ void fetch_market(const fincept::services::prediction::MarketKey& key) override;+ void fetch_event(const fincept::services::prediction::MarketKey& key) override;+ void fetch_order_book(const QString& asset_id) override;+ void fetch_price_history(const QString& asset_id, const QString& interval, int fidelity) override;+ void fetch_recent_trades(const fincept::services::prediction::MarketKey& key, int limit) override;+ void fetch_top_holders(const fincept::services::prediction::MarketKey& key, int limit) override;+ void fetch_leaderboard(int limit) override;++ // WebSocket+ void subscribe_market(const QStringList& asset_ids) override;+ void unsubscribe_market(const QStringList& asset_ids) override;+ bool is_ws_connected() const override;++ // Auth (Phase 6 — stubs here)+ bool has_credentials() const override;+ QString account_label() const override;+ void fetch_balance() override;+ void fetch_positions() override;+ void fetch_open_orders() override;+ void fetch_user_activity(int limit) override;+ void place_order(const fincept::services::prediction::OrderRequest& req) override;+ void cancel_order(const QString& order_id) override;+ void cancel_all_for_market(const fincept::services::prediction::MarketKey& key,+ const QString& asset_id) override;++ void ensure_registered_with_hub() override;++ /// Reload creds from SecureStorage — screens call this after the+ /// account dialog saves.+ void reload_credentials();++ private slots:+ // From PolymarketService+ void on_markets(const QVector<fincept::services::polymarket::Market>& markets);+ void on_events(const QVector<fincept::services::polymarket::Event>& events);+ void on_tags(const QVector<fincept::services::polymarket::Tag>& tags);+ void on_market_detail(const fincept::services::polymarket::Market& market);+ void on_event_detail(const fincept::services::polymarket::Event& event);+ void on_order_book(const fincept::services::polymarket::OrderBook& book);+ void on_price_history(const fincept::services::polymarket::PriceHistory& history);+ void on_trades(const QVector<fincept::services::polymarket::Trade>& trades);+ void on_service_error(const QString& ctx, const QString& msg);++ // From PolymarketWebSocket+ void on_ws_price(const QString& asset_id, double price);+ void on_ws_orderbook(const QString& asset_id, const fincept::services::polymarket::OrderBook& book);+ void on_ws_status(bool connected);++ private:+ void wire_service();+ void wire_ws();+ void stub_unsupported(const QString& ctx);++ /// Ensure we have L2 api_key/secret/passphrase cached; derive from L1+ /// if not. Returns the creds (with api_key populated) or nullopt on+ /// failure. `then` fires on the main thread with the creds or the+ /// error emitted via error_occurred().+ void ensure_api_creds(std::function<void(const fincept::services::prediction::PolymarketCredentials&)> then,+ const QString& ctx);+ void run_py(const QString& command, const QJsonObject& payload,+ std::function<void(const QJsonObject&)> on_ok, const QString& ctx);+ QJsonObject creds_to_json(const fincept::services::prediction::PolymarketCredentials& c) const;++ fincept::services::polymarket::PolymarketService* service_ = nullptr; // singleton ptr, not owned+ fincept::services::polymarket::PolymarketWebSocket* ws_ = nullptr; // singleton ptr, not owned++ // Per-request context kept between service callback and our signal.+ QString last_history_asset_id_;++ bool hub_registered_ = false;++ // Authenticated-path state.+ std::optional<fincept::services::prediction::PolymarketCredentials> creds_;+ QString cached_wallet_address_; // derived once from private key+};++} // namespace fincept::services::prediction::polymarket_nsdiff --git a/fincept-qt/src/services/prediction/polymarket/PolymarketTypeMap.cpp b/fincept-qt/src/services/prediction/polymarket/PolymarketTypeMap.cppnew file mode 100644index 000000000..b292ca817--- /dev/null+++ b/fincept-qt/src/services/prediction/polymarket/PolymarketTypeMap.cpp@@ -0,0 +1,109 @@+#include "services/prediction/polymarket/PolymarketTypeMap.h"++namespace fincept::services::prediction::polymarket_map {++namespace pm = fincept::services::polymarket;+namespace pr = fincept::services::prediction;++static pr::MarketKey make_market_key(const pm::Market& m) {+ pr::MarketKey k;+ k.exchange_id = QString::fromLatin1(kExchangeId);+ k.market_id = m.condition_id;+ k.event_id = m.event_id > 0 ? QString::number(m.event_id) : QString();+ k.asset_ids = m.clob_token_ids;+ return k;+}++pr::PredictionMarket to_prediction(const pm::Market& src) {+ pr::PredictionMarket out;+ out.key = make_market_key(src);+ out.question = src.question;+ out.description = src.description;+ out.category = src.category;+ out.image_url = src.image;+ out.end_date_iso = src.end_date;+ out.volume = src.volume;+ out.liquidity = src.liquidity;+ out.active = src.active;+ out.closed = src.closed;+ out.tags = src.tags;++ out.outcomes.reserve(src.outcomes.size());+ for (int i = 0; i < src.outcomes.size(); ++i) {+ pr::Outcome o;+ o.name = src.outcomes[i].name;+ o.price = src.outcomes[i].price;+ o.asset_id = (i < src.clob_token_ids.size()) ? src.clob_token_ids[i] : QString();+ out.outcomes.push_back(o);+ }+ return out;+}++pr::PredictionEvent to_prediction(const pm::Event& src) {+ pr::PredictionEvent out;+ out.key.exchange_id = QString::fromLatin1(kExchangeId);+ out.key.event_id = src.id > 0 ? QString::number(src.id) : src.slug;+ out.title = src.title;+ out.description = src.description;+ out.category = src.category;+ out.volume = src.volume;+ out.liquidity = src.liquidity;+ out.active = src.active;+ out.closed = src.closed;+ out.tags = src.tags;+ out.markets = to_prediction(src.markets);+ return out;+}++pr::PredictionOrderBook to_prediction(const pm::OrderBook& src) {+ pr::PredictionOrderBook out;+ out.asset_id = src.asset_id;+ out.tick_size = src.tick_size;+ out.min_order_size = src.min_order_size;+ out.bids.reserve(src.bids.size());+ for (const auto& l : src.bids) out.bids.push_back({l.price, l.size});+ out.asks.reserve(src.asks.size());+ for (const auto& l : src.asks) out.asks.push_back({l.price, l.size});+ return out;+}++pr::PriceHistory to_prediction(const pm::PriceHistory& src, const QString& asset_id) {+ pr::PriceHistory out;+ out.asset_id = asset_id;+ out.points.reserve(src.points.size());+ for (const auto& p : src.points) out.points.push_back({p.timestamp * 1000, p.price});+ return out;+}++pr::PredictionTrade to_prediction(const pm::Trade& src) {+ pr::PredictionTrade out;+ out.asset_id = src.condition_id;+ out.side = src.side;+ out.price = src.price;+ out.size = src.size;+ out.ts_ms = src.timestamp * 1000;+ return out;+}++QVector<pr::PredictionMarket> to_prediction(const QVector<pm::Market>& src) {+ QVector<pr::PredictionMarket> out;+ out.reserve(src.size());+ for (const auto& m : src) out.push_back(to_prediction(m));+ return out;+}++QVector<pr::PredictionEvent> to_prediction(const QVector<pm::Event>& src) {+ QVector<pr::PredictionEvent> out;+ out.reserve(src.size());+ for (const auto& e : src) out.push_back(to_prediction(e));+ return out;+}++QVector<pr::PredictionTrade> to_prediction(const QVector<pm::Trade>& src) {+ QVector<pr::PredictionTrade> out;+ out.reserve(src.size());+ for (const auto& t : src) out.push_back(to_prediction(t));+ return out;+}++} // namespace fincept::services::prediction::polymarket_mapdiff --git a/fincept-qt/src/services/prediction/polymarket/PolymarketTypeMap.h b/fincept-qt/src/services/prediction/polymarket/PolymarketTypeMap.hnew file mode 100644index 000000000..44d8dde61--- /dev/null+++ b/fincept-qt/src/services/prediction/polymarket/PolymarketTypeMap.h@@ -0,0 +1,24 @@+#pragma once++#include "services/polymarket/PolymarketTypes.h"+#include "services/prediction/PredictionTypes.h"++#include <QVector>++namespace fincept::services::prediction::polymarket_map {++/// Stable adapter id used for MarketKey::exchange_id and hub topics.+inline constexpr const char* kExchangeId = "polymarket";++prediction::PredictionMarket to_prediction(const services::polymarket::Market& src);+prediction::PredictionEvent to_prediction(const services::polymarket::Event& src);+prediction::PredictionOrderBook to_prediction(const services::polymarket::OrderBook& src);+prediction::PriceHistory to_prediction(const services::polymarket::PriceHistory& src,+ const QString& asset_id);+prediction::PredictionTrade to_prediction(const services::polymarket::Trade& src);++QVector<prediction::PredictionMarket> to_prediction(const QVector<services::polymarket::Market>& src);+QVector<prediction::PredictionEvent> to_prediction(const QVector<services::polymarket::Event>& src);+QVector<prediction::PredictionTrade> to_prediction(const QVector<services::polymarket::Trade>& src);++} // namespace fincept::services::prediction::polymarket_mapdiff --git a/fincept-qt/src/ui/navigation/CommandBar.cpp b/fincept-qt/src/ui/navigation/CommandBar.cppindex 5c89f4664..c166bced7 100644--- a/fincept-qt/src/ui/navigation/CommandBar.cpp+++ b/fincept-qt/src/ui/navigation/CommandBar.cpp@@ -233,11 +233,11 @@ void CommandBar::build_commands() {"",{"alpha", "competition", "leaderboard"}},{"polymarket",- "Polymarket",- "Prediction markets",- {"poly", "polymarket", "prediction"},+ "Prediction Markets",+ "Polymarket + Kalshi prediction markets",+ {"poly", "polymarket", "kalshi", "prediction"},"",- {"polymarket", "prediction", "markets"}},+ {"polymarket", "kalshi", "prediction", "markets"}},{"derivatives","Derivatives","Options and derivatives",diff --git a/fincept-qt/src/ui/navigation/ToolBar.cpp b/fincept-qt/src/ui/navigation/ToolBar.cppindex e5a97bba3..2fb9abfc8 100644--- a/fincept-qt/src/ui/navigation/ToolBar.cpp+++ b/fincept-qt/src/ui/navigation/ToolBar.cpp@@ -319,7 +319,7 @@ QMenu* ToolBar::build_navigate_menu() {auto* trd = add_sub("Trading & Portfolio");nav(trd, "Equity Trading", "equity_trading");nav(trd, "Alpha Arena", "alpha_arena");- nav(trd, "Polymarket", "polymarket");+ nav(trd, "Prediction Markets", "polymarket");nav(trd, "Derivatives", "derivatives");nav(trd, "Watchlist", "watchlist");